#10 - Save point

antaenc · antaenc · commit 49690425b3ee · 2025-01-09T18:24:16.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ 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 imports to use senzing and senzing_core
+
 ### Added to 0.0.1
 
 - Initial for V4
diff --git a/python/configuration/add_data_sources.py b/python/configuration/add_data_sources.py
@@ -4,7 +4,8 @@
 import sys
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/deleting/delete_futures.py b/python/deleting/delete_futures.py
@@ -7,13 +7,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
diff --git a/python/deleting/delete_loop.py b/python/deleting/delete_loop.py
@@ -5,13 +5,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
diff --git a/python/deleting/delete_with_info_futures.py b/python/deleting/delete_with_info_futures.py
@@ -7,14 +7,14 @@
 import sys
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
+from senzing import (
     SzBadInputError,
     SzEngineFlags,
     SzError,
     SzRetryableError,
     SzUnrecoverableError,
 )
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
diff --git a/python/information/check_datastore_performance.py b/python/information/check_datastore_performance.py
@@ -3,7 +3,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/information/get_datastore_info.py b/python/information/get_datastore_info.py
@@ -3,7 +3,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/information/get_license.py b/python/information/get_license.py
@@ -3,7 +3,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/information/get_stats.py b/python/information/get_stats.py
@@ -7,16 +7,11 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
-INPUT_FILE = Path("../../resources/data/load-500.json").resolve()
+INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
 INSTANCE_NAME = Path(__file__).stem
 
 
diff --git a/python/information/get_version.py b/python/information/get_version.py
@@ -3,7 +3,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/initialization/engine_priming.py b/python/initialization/engine_priming.py
@@ -3,7 +3,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/initialization/factory_and_engines.py b/python/initialization/factory_and_engines.py
@@ -3,7 +3,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/initialization/purge_repository.py b/python/initialization/purge_repository.py
@@ -4,7 +4,8 @@
 import sys
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
@@ -17,15 +18,15 @@
 
 *****************************************************************************************
 
-Are you sure you want to continue and purge the Senzing datastore? (y/n) """
+Are you sure you want to continue and purge the Senzing datastore? Type YESPURGESENZING to purge: """
 
-if input(PURGE_MSG) not in ["y", "Y", "yes", "YES"]:
+if input(PURGE_MSG) != "YESPURGESENZING":
     sys.exit()
 
 try:
     sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_diagnostic = sz_factory.create_diagnostic()
     sz_diagnostic.purge_repository()
-    print("\nSenzing repository purged")
+    print("\nSenzing datastore purged")
 except SzError as err:
     print(f"\n{err.__class__.__name__} - {err}")
diff --git a/python/loading/add_futures.py b/python/loading/add_futures.py
@@ -7,13 +7,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
diff --git a/python/loading/add_queue.py b/python/loading/add_queue.py
@@ -7,13 +7,8 @@
 from multiprocessing import Process, Queue
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
-    SzBadInputError,
-    SzError,
-    SzRetryableError,
-    SzUnrecoverableError,
-)
+from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
diff --git a/python/loading/add_records.py b/python/loading/add_records.py
@@ -4,7 +4,8 @@
 import os
 from pathlib import Path
 
-from senzing_core import SzAbstractFactory, SzError
+from senzing import SzError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/loading/add_records_loop.py b/python/loading/add_records_loop.py
@@ -5,13 +5,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
diff --git a/python/loading/add_truthset_loop.py b/python/loading/add_truthset_loop.py
@@ -5,13 +5,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILES = [
diff --git a/python/loading/add_with_info_futures.py b/python/loading/add_with_info_futures.py
@@ -7,14 +7,14 @@
 import sys
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
+from senzing import (
     SzBadInputError,
     SzEngineFlags,
     SzError,
     SzRetryableError,
     SzUnrecoverableError,
 )
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500-with-errors.jsonl").resolve()
diff --git a/python/redo/add_with_redo.py b/python/redo/add_with_redo.py
@@ -5,13 +5,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
diff --git a/python/redo/redo_continuous.py b/python/redo/redo_continuous.py
@@ -5,13 +5,8 @@
 import time
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
-    SzBadInputError,
-    SzError,
-    SzRetryableError,
-    SzUnrecoverableError,
-)
+from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/redo/redo_continuous_futures.py b/python/redo/redo_continuous_futures.py
@@ -6,13 +6,8 @@
 import time
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
-    SzBadInputError,
-    SzError,
-    SzRetryableError,
-    SzUnrecoverableError,
-)
+from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
diff --git a/python/redo/redo_with_info_continuous.py b/python/redo/redo_with_info_continuous.py
@@ -1,24 +1,30 @@
 #! /usr/bin/env python3
 
 import os
+import signal
 import sys
 import time
 from pathlib import Path
 
-from senzing_core import (
-    SzAbstractFactory,
+from senzing import (
     SzBadInputError,
     SzEngineFlags,
     SzError,
     SzRetryableError,
     SzUnrecoverableError,
 )
+from senzing_core import SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 OUTPUT_FILE = Path("../../resources/output/redo_with_info_continuous.jsonl").resolve()
 INSTANCE_NAME = Path(__file__).stem
 
 
+def signal_handler(signum, frame):
+    print(f"\nWith info responses written to {OUTPUT_FILE}")
+    sys.exit()
+
+
 def mock_logger(level, error, error_record=None):
     print(f"\n{level}: {error.__class__.__name__} - {error}", file=sys.stderr)
     if error_record:
@@ -60,6 +66,8 @@ def process_redo(engine, output_file):
             raise err
 
 
+signal.signal(signal.SIGINT, signal_handler)
+
 try:
     sz_factory = SzAbstractFactory(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
     sz_engine = sz_factory.create_engine()
diff --git a/python/searching/search_futures.py b/python/searching/search_futures.py
@@ -7,13 +7,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INPUT_FILE = Path("../../resources/data/search-50.jsonl").resolve()
diff --git a/python/searching/search_records.py b/python/searching/search_records.py
@@ -5,13 +5,8 @@
 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 SzAbstractFactory
 
 ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
 INSTANCE_NAME = Path(__file__).stem
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
diff --git a/resources/output/add_file_with_info.jsonl b/resources/output/add_file_with_info.jsonl
diff --git a/resources/output/delete_file_with_info.jsonl b/resources/output/delete_file_with_info.jsonl
diff --git a/resources/output/redo_with_info_continuous.jsonl b/resources/output/redo_with_info_continuous.jsonl
