Merge branch 'main' into 188-ant-1

Author: antaenc

CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.0.23] - 2025-06-12
+
+### Fixed in 0.0.23
+
+- Support for all versions of prettytable
+- Update for default flags
+- Multi_source_summary renamed to entity_source_summary
+
+### Added in 0.0.23
+
+- New search_feature command
+
 ## [0.0.22] - 2025-06-06
 
 ### Fixed in 0.0.22

development-requirements.txt

@@ -1,16 +1,16 @@
-bandit==1.8.3
+bandit==1.8.5
 black==25.1.0
 build==1.2.2.post1
-coverage==7.8.2
+coverage==7.9.1
 flake8==7.2.0
 fpvs==0.3.0
 isort==6.0.1
-mypy==1.16.0
+mypy==1.16.1
 psutil==7.0.0
 pylint==3.3.7
-pytest-cov==6.1.1
+pytest-cov==6.2.1
 pytest-schema==0.1.2
-pytest==8.4.0
+pytest==8.4.1
 sphinx-autodoc-typehints==3.1.0
 sphinx-gallery==0.19.0
 sphinx-jinja2-compat==0.3.0

requirements.txt

@@ -1,2 +1,2 @@
 senzing==0.2.2
-senzing-core==0.3.12
+senzing-core==0.3.15

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = python-tools
-version = 0.0.22
+version = 0.0.23
 author = senzing
 author_email = support@senzing.com
 description = Python Tools

sz_tools/sz_configtool

@@ -6129,7 +6129,9 @@ class SzCfgShell(cmd.Cmd):
             table_object.add_row(tblRow)
 
         table_object.align = "l"
-        if hasattr(prettytable, "SINGLE_BORDER"):
+        if hasattr(prettytable, "TableStyle"):
+            table_object.set_style(prettytable.TableStyle.SINGLE_BORDER)
+        else:
             table_object.set_style(prettytable.SINGLE_BORDER)
         table_object.hrules = 1
         render_string = table_object.get_string()

sz_tools/sz_snapshot

@@ -369,7 +369,7 @@ class SnapshotWriter:
             "TOTALS": {"ENTITY_COUNT": 0, "RECORD_COUNT": 0},
             "DATA_SOURCES": {},
             "CROSS_SOURCES": {},
-            "MULTI_SOURCES": {},
+            "ENTITY_SOURCES": {},
             "ENTITY_SIZES": {},
         }
         self.initialize_match_levels(["TOTALS"])
@@ -482,7 +482,7 @@ class SnapshotWriter:
                 # if len(entity0_sources) > 1:
                 # include single source so can find non-matches, ie customers not on watch list or in reference file
                 multi_source_key = "||".join(sorted(entity0_sources.keys()))
-                self.update_stat_pack(["MULTI_SOURCES", multi_source_key], {"ENTITY_COUNT": 1, "SAMPLE": [entity_id]})
+                self.update_stat_pack(["ENTITY_SOURCES", multi_source_key], {"ENTITY_COUNT": 1, "SAMPLE": [entity_id]})
             elif related_id > entity_id:
                 sample = f"{entity_id} {related_id}"
                 principle_matchkey = list(resume_data[related_id]["PRINCIPLES"].keys())[0]
@@ -510,10 +510,11 @@ def check_stat_pack(stats_file_name, csv_file_name, args):
     abort = False
     stat_pack = json.load(open(stats_file_name))
     prior_status = "unknown"
-    entity_count = 0
+    entity_count = "?"
     if stat_pack.get("PROCESS"):
         prior_status = stat_pack["PROCESS"]["STATUS"]
-        entity_count = stat_pack["TOTALS"]["ENTITY_COUNT"]
+    if stat_pack.get("TOTALS"):
+        entity_count = stat_pack["TOTALS"].get("ENTITY_COUNT", "?")
     print(f"\n{prior_status} snapshot file exists with {entity_count} entities processed!")
     if args.quiet:
         print("PRIOR FILES WILL BE OVERWRITTEN")