10 ant 1 (#17)

* #10 - Save point

* #10 - Save point

* #10 - Save point

* #10

* #10

Author: antaenc

.gitignore

@@ -127,4 +127,11 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-.history
+.history
+
+# VSCode
+.vscode/
+.history
+
+# Output folder used by examples
+resources/output/

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog], [markdownlint],
 and this project adheres to [Semantic Versioning].
 
+### Changed in 0.0.2
+
+- Modify Python imports to use senzing and senzing_core
+
+### Added to 0.0.1
+
+- Couple of new examples
+
+
 ### Added to 0.0.1
 
 - Initial for V4

README.md

@@ -84,7 +84,7 @@ When using a bare metal install, the initialization parameters used by the Senzi
 - Python one liner
 
   - ```python
-    python3 -c $'import configparser; ini_file_name = "<project_path>/etc/G2Module.ini";engine_config_json = {};cfgp = configparser.ConfigParser();cfgp.optionxform = str;cfgp.read(ini_file_name)\nfor section in cfgp.sections(): engine_config_json[section] = dict(cfgp.items(section))\nprint(engine_config_json)'
+    python3 -c $'import configparser; ini_file_name = "<project_path>/etc/G2Module.ini";settings = {};cfgp = configparser.ConfigParser();cfgp.optionxform = str;cfgp.read(ini_file_name)\nfor section in cfgp.sections(): settings[section] = dict(cfgp.items(section))\nprint(settings)'
     ```
 
 :pencil2: `<project_path>` in the above example should point to your project.

python/configuration/add_data_sources.py

@@ -4,14 +4,15 @@
 import sys
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactoryCore
 
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 
 
 try:
-    sz_factory = SzAbstractFactory("add_records", ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore("add_records", SETTINGS, verbose_logging=False)
     sz_config = sz_factory.create_config()
     sz_configmanager = sz_factory.create_configmanager()
 

python/deleting/delete_futures.py

@@ -7,17 +7,12 @@
 import sys
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
-    SzBadInputError,
-    SzError,
-    SzRetryableError,
-    SzUnrecoverableError,
-)
+from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
+from senzing_core import SzAbstractFactoryCore
 
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
 INSTANCE_NAME = Path(__file__).stem
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 
 
 def mock_logger(level, error, error_record=None):
@@ -73,7 +68,7 @@ def futures_del(engine, input_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_del(sz_engine, INPUT_FILE)
 except SzError as err:

python/deleting/delete_loop.py

@@ -5,17 +5,12 @@
 import sys
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
-    SzBadInputError,
-    SzError,
-    SzRetryableError,
-    SzUnrecoverableError,
-)
-
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
+from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
+from senzing_core import SzAbstractFactoryCore
+
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
 INSTANCE_NAME = Path(__file__).stem
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 
 
 def mock_logger(level, error, error_record=None):
@@ -54,7 +49,7 @@ def del_records_from_file(engine, input_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     del_records_from_file(sz_engine, INPUT_FILE)
 except SzError as err:

python/deleting/delete_with_info_futures.py

@@ -7,19 +7,19 @@
 import sys
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
+from senzing import (
     SzBadInputError,
     SzEngineFlags,
     SzError,
     SzRetryableError,
     SzUnrecoverableError,
 )
+from senzing_core import SzAbstractFactoryCore
 
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
 INSTANCE_NAME = Path(__file__).stem
 OUTPUT_FILE = Path("../../resources/output/delete_file_with_info.jsonl").resolve()
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 
 
 def mock_logger(level, error, error_record=None):
@@ -79,7 +79,7 @@ def futures_del(engine, input_file, output_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_del(sz_engine, INPUT_FILE, OUTPUT_FILE)
 except SzError as err:

python/information/check_datastore_performance.py

@@ -3,14 +3,15 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactoryCore
 
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
 SECONDS_TO_RUN = 3
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
     sz_diagnostic = sz_factory.create_diagnostic()
     print(sz_diagnostic.check_datastore_performance(SECONDS_TO_RUN))
 except SzError as err:

python/information/get_datastore_info.py

@@ -3,13 +3,14 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactoryCore
 
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
     sz_diagnostic = sz_factory.create_diagnostic()
     print(sz_diagnostic.get_datastore_info())
 except SzError as err:

python/information/get_license.py

@@ -3,13 +3,14 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactoryCore
 
-ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
+SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
     sz_product = sz_factory.create_product()
     print(sz_product.get_license())
 except SzError as err: