#10 - Save point

antaenc · antaenc · commit 250099822b0d · 2025-01-17T16:19:23.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -127,4 +127,11 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-.history
+.history
+
+# VSCode
+.vscode/
+.history
+
+# Output folder used by examples
+resources/output/
diff --git a/python/configuration/add_data_sources.py b/python/configuration/add_data_sources.py
@@ -5,14 +5,14 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
 
 
 try:
-    sz_factory = SzAbstractFactory("add_records", ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore("add_records", ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_config = sz_factory.create_config()
     sz_configmanager = sz_factory.create_configmanager()
 
diff --git a/python/deleting/delete_futures.py b/python/deleting/delete_futures.py
@@ -8,7 +8,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
@@ -68,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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_del(sz_engine, INPUT_FILE)
 except SzError as err:
diff --git a/python/deleting/delete_loop.py b/python/deleting/delete_loop.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
@@ -49,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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     del_records_from_file(sz_engine, INPUT_FILE)
 except SzError as err:
diff --git a/python/deleting/delete_with_info_futures.py b/python/deleting/delete_with_info_futures.py
@@ -14,7 +14,7 @@
     SzRetryableError,
     SzUnrecoverableError,
 )
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
@@ -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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_del(sz_engine, INPUT_FILE, OUTPUT_FILE)
 except SzError as err:
diff --git a/python/information/check_datastore_performance.py b/python/information/check_datastore_performance.py
@@ -4,14 +4,14 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = 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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_diagnostic = sz_factory.create_diagnostic()
     print(sz_diagnostic.check_datastore_performance(SECONDS_TO_RUN))
 except SzError as err:
diff --git a/python/information/get_datastore_info.py b/python/information/get_datastore_info.py
@@ -4,13 +4,13 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = 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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_diagnostic = sz_factory.create_diagnostic()
     print(sz_diagnostic.get_datastore_info())
 except SzError as err:
diff --git a/python/information/get_license.py b/python/information/get_license.py
@@ -4,13 +4,13 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = 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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_product = sz_factory.create_product()
     print(sz_product.get_license())
 except SzError as err:
diff --git a/python/information/get_stats.py b/python/information/get_stats.py
@@ -8,7 +8,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
@@ -81,7 +81,7 @@ def futures_add(engine, input_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_add(sz_engine, INPUT_FILE)
 except SzError as err:
diff --git a/python/information/get_version.py b/python/information/get_version.py
@@ -4,13 +4,13 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = 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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_product = sz_factory.create_product()
     print(sz_product.get_version())
 except SzError as err:
diff --git a/python/initialization/README.md b/python/initialization/README.md
@@ -2,6 +2,8 @@
 
 ## Snippets
 
+- **abstract_factory_parameters.py**
+  - Used to create a dictionary that can be unpacked when creating an SzAbstractFactoryCore, also useful for type annotations
 - **engine_priming.py**
   - Priming the Senzing engine before use loads resource intensive assets upfront. Without priming the first SDK call to the engine will appear slower than usual as it causes these assets to be loaded
 - **factory_and_engines.py**
diff --git a/python/initialization/abstract_factory_parameters.py b/python/initialization/abstract_factory_parameters.py
@@ -0,0 +1,29 @@
+#! /usr/bin/env python3
+
+
+from senzing import SzError
+from senzing_core import SzAbstractFactoryCore, SzAbstractFactoryParametersCore
+
+FACTORY_PARAMETERS: SzAbstractFactoryParametersCore = {
+    "instance_name": "abstract_factory_parameters",
+    "settings": {
+        "PIPELINE": {
+            "CONFIGPATH": "/etc/opt/senzing",
+            "RESOURCEPATH": "/opt/senzing/er/resources",
+            "SUPPORTPATH": "/opt/senzing/data",
+        },
+        "SQL": {"CONNECTION": "sqlite3://na:na@/tmp/sqlite/G2C.db"},
+    },
+    "verbose_logging": 0,
+}
+
+try:
+    sz_factory = SzAbstractFactoryCore(**FACTORY_PARAMETERS)
+    sz_config = sz_factory.create_config()
+    sz_configmgr = sz_factory.create_configmanager()
+    sz_diagnostic = sz_factory.create_diagnostic()
+    sz_engine = sz_factory.create_engine()
+    sz_product = sz_factory.create_product()
+    # Do work...
+except SzError as err:
+    print(f"\n{err.__class__.__name__} - {err}")
diff --git a/python/initialization/engine_priming.py b/python/initialization/engine_priming.py
@@ -4,13 +4,13 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = 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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     print("Priming Senzing engine...")
     sz_engine.prime_engine()
diff --git a/python/initialization/factory_and_engines.py b/python/initialization/factory_and_engines.py
@@ -4,13 +4,13 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = 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, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_config = sz_factory.create_config()
     sz_configmgr = sz_factory.create_configmanager()
     sz_diagnostic = sz_factory.create_diagnostic()
diff --git a/python/initialization/purge_repository.py b/python/initialization/purge_repository.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
@@ -24,7 +24,7 @@
     sys.exit()
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_diagnostic = sz_factory.create_diagnostic()
     sz_diagnostic.purge_repository()
     print("\nSenzing datastore purged")
diff --git a/python/loading/add_futures.py b/python/loading/add_futures.py
@@ -8,7 +8,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
@@ -68,7 +68,7 @@ def futures_add(engine, input_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_add(sz_engine, INPUT_FILE)
 except SzError as err:
diff --git a/python/loading/add_queue.py b/python/loading/add_queue.py
@@ -8,7 +8,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
@@ -70,7 +70,7 @@ def consumer(engine, queue):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
 
     input_queue = Queue(maxsize=200)  # type: ignore
diff --git a/python/loading/add_records.py b/python/loading/add_records.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 
 from senzing import SzError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
@@ -94,7 +94,7 @@
 ]
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
 
     for record in RECORDS:
diff --git a/python/loading/add_records_loop.py b/python/loading/add_records_loop.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
@@ -49,7 +49,7 @@ def add_records_from_file(engine, input_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     add_records_from_file(sz_engine, INPUT_FILE)
 except SzError as err:
diff --git a/python/loading/add_truthset_loop.py b/python/loading/add_truthset_loop.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILES = [
@@ -55,7 +55,7 @@ def add_records_from_file(engine, input_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     for load_file in INPUT_FILES:
         add_records_from_file(sz_engine, load_file)
diff --git a/python/loading/add_with_info_futures.py b/python/loading/add_with_info_futures.py
@@ -14,7 +14,7 @@
     SzRetryableError,
     SzUnrecoverableError,
 )
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500-with-errors.jsonl").resolve()
@@ -92,7 +92,7 @@ def futures_add(engine, input_file, output_file):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     futures_add(sz_engine, INPUT_FILE, OUTPUT_FILE)
 except SzError as err:
diff --git a/python/redo/add_with_redo.py b/python/redo/add_with_redo.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
-from senzing_core import SzAbstractFactory
+from senzing_core import SzAbstractFactoryCore
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
@@ -79,7 +79,7 @@ def process_redo(engine):
 
 
 try:
-    sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
+    sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
     add_records_from_file(sz_engine, INPUT_FILE)
     redo_count = sz_engine.count_redo_records()
diff --git a/python/redo/redo_continuous.py b/python/redo/redo_continuous.py
diff --git a/python/redo/redo_continuous_futures.py b/python/redo/redo_continuous_futures.py
diff --git a/python/redo/redo_with_info_continuous.py b/python/redo/redo_with_info_continuous.py
diff --git a/python/searching/search_futures.py b/python/searching/search_futures.py
diff --git a/python/searching/search_records.py b/python/searching/search_records.py
diff --git a/python/stewardship/force_resolve.py b/python/stewardship/force_resolve.py
diff --git a/python/stewardship/force_unresolve.py b/python/stewardship/force_unresolve.py
