Skip to content

Commit d38e88e

Browse files
committed
#209 - Rename changed SDK methods
1 parent 59538e6 commit d38e88e

6 files changed

Lines changed: 59 additions & 56 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning].
77

88
## [Unreleased]
99

10+
## [0.0.26] - 2025-07-11
11+
12+
### Changed in 0.0.26
13+
14+
- Rename some methods changed in the Python SDK
15+
1016
## [0.0.25] - 2025-06-21
1117

1218
### Removed in 0.0.25

development-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sphinx-jinja2-compat==0.3.0
1717
sphinx-prompt==1.9.0
1818
sphinxext-remoteliteralinclude==0.6.0
1919
sphinx-rtd-theme==3.0.2
20-
sphinx-tabs==3.4.7
20+
sphinx-tabs==3.4.5
2121
sphinx-toolbox==4.0.0
2222
sphinx==8.2.3
2323
sphinxcontrib-applehelp==2.0.0

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
senzing==0.2.16
2-
senzing-core==0.3.16
1+
senzing==0.2.17
2+
senzing-core==0.3.17

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = python-tools
3-
version = 0.0.25
3+
version = 0.0.26
44
author = senzing
55
author_email = support@senzing.com
66
description = Python Tools
@@ -21,8 +21,8 @@ package_dir =
2121
packages = find:
2222
python_requires = >=3.9
2323
install_requires =
24-
senzing >= 0.2.16
25-
senzing-core >= 0.3.15
24+
senzing >= 0.2.17
25+
senzing-core >= 0.3.17
2626

2727
[options.packages.find]
2828
where = src

sz_tools/sz_command

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,10 @@ class SzCmdShell(cmd.Cmd):
376376

377377
# szdiagnostic parsers
378378

379-
check_datastore_performance_parser = self.subparsers.add_parser(
380-
"check_datastore_performance", usage=argparse.SUPPRESS
379+
check_repository_performance_parser = self.subparsers.add_parser(
380+
"check_repository_performance", usage=argparse.SUPPRESS
381381
)
382-
check_datastore_performance_parser.add_argument("seconds_to_run", default=3, nargs="?", type=int)
382+
check_repository_performance_parser.add_argument("seconds_to_run", default=3, nargs="?", type=int)
383383

384384
get_feature_parser = self.subparsers.add_parser("get_feature", usage=argparse.SUPPRESS)
385385
get_feature_parser.add_argument("featureID", type=int)
@@ -495,6 +495,10 @@ class SzCmdShell(cmd.Cmd):
495495
get_record_parser.add_argument("record_id")
496496
get_record_parser.add_argument("-f", "--flags", nargs="+", required=False)
497497

498+
get_record_preview_parser = self.subparsers.add_parser("get_record_preview", usage=argparse.SUPPRESS)
499+
get_record_preview_parser.add_argument("record_definition")
500+
get_record_preview_parser.add_argument("-f", "--flags", nargs="+", required=False)
501+
498502
get_virtual_entity_by_record_id_parser = self.subparsers.add_parser(
499503
"get_virtual_entity_by_record_id", usage=argparse.SUPPRESS
500504
)
@@ -505,10 +509,6 @@ class SzCmdShell(cmd.Cmd):
505509
how_entity_by_entity_id_parser.add_argument("entity_id", type=int)
506510
how_entity_by_entity_id_parser.add_argument("-f", "--flags", nargs="+", required=False)
507511

508-
preprocess_record_parser = self.subparsers.add_parser("preprocess_record", usage=argparse.SUPPRESS)
509-
preprocess_record_parser.add_argument("record_definition")
510-
preprocess_record_parser.add_argument("-f", "--flags", nargs="+", required=False)
511-
512512
process_redo_record_parser = self.subparsers.add_parser("process_redo_record", usage=argparse.SUPPRESS)
513513
process_redo_record_parser.add_argument("redo_record")
514514
process_redo_record_parser.add_argument("-f", "--flags", nargs="+", required=False)
@@ -923,29 +923,29 @@ class SzCmdShell(cmd.Cmd):
923923
# -----------------------------------------------------------------------------
924924

925925
@do_methods_decorator
926-
def do_check_datastore_performance(self, **kwargs: Any) -> None:
926+
def do_check_repository_performance(self, **kwargs: Any) -> None:
927927
"""
928-
Run a performance check on the database
928+
Run a performance check on the repository
929929
930930
Syntax:
931-
check_datastore_performance [seconds_to_run]
932-
check_datastore_performance
931+
check_repository_performance [seconds_to_run]
932+
check_repository_performance
933933
934934
Arguments:
935935
seconds_to_run = Time in seconds to run the check, default is 3"""
936936

937-
response = self.sz_diagnostic.check_datastore_performance(kwargs["parsed_args"].seconds_to_run)
937+
response = self.sz_diagnostic.check_repository_performance(kwargs["parsed_args"].seconds_to_run)
938938
self.last_response = self.output_response(response)
939939

940940
@do_methods_decorator
941-
def do_get_datastore_info(self) -> None:
941+
def do_get_repository_info(self) -> None:
942942
"""
943-
Get data store information
943+
Get repository information
944944
945945
Syntax:
946-
get_datastore_info"""
946+
get_repository_info"""
947947

948-
response = self.sz_diagnostic.get_datastore_info()
948+
response = self.sz_diagnostic.get_repository_info()
949949
self.last_response = self.output_response(response)
950950

951951
@do_methods_decorator
@@ -1137,7 +1137,7 @@ class SzCmdShell(cmd.Cmd):
11371137
rec_cnt += 1
11381138
if rec_cnt % 1000 == 0:
11391139
print(f"Exported {rec_cnt} records...", flush=True)
1140-
self.sz_engine.close_export(export_handle)
1140+
self.sz_engine.close_export_report(export_handle)
11411141
except (SzError, IOError) as err:
11421142
print_error(err)
11431143
else:
@@ -1187,7 +1187,7 @@ class SzCmdShell(cmd.Cmd):
11871187
rec_cnt += 1
11881188
if rec_cnt % 1000 == 0:
11891189
print(f"Exported {rec_cnt} records...", flush=True)
1190-
self.sz_engine.close_export(export_handle)
1190+
self.sz_engine.close_export_report(export_handle)
11911191
except (SzError, IOError) as err:
11921192
print_error(err)
11931193
else:
@@ -1501,6 +1501,27 @@ class SzCmdShell(cmd.Cmd):
15011501
response = get_record(kwargs["flags"]) if "flags" in kwargs else get_record()
15021502
self.last_response = self.output_response(response)
15031503

1504+
@do_methods_decorator
1505+
def do_get_record_preview(self, **kwargs: Any) -> None:
1506+
"""
1507+
Describe the features resulting from the hypothetical load of a record
1508+
1509+
Syntax:
1510+
get_record_preview record_definition [-f flag ...]
1511+
1512+
Examples:
1513+
get_record_preview '{"NAME_FULL":"Robert Smith", "DATE_OF_BIRTH":"7/4/1976", "PHONE_NUMBER":"787-767-2088"}'
1514+
1515+
Arguments:
1516+
record_definition = Senzing mapped JSON representation of a record
1517+
flag = Optional space separated list of engine flag(s) to determine output (don't specify for defaults)
1518+
"""
1519+
1520+
preview_record = functools.partial(self.sz_engine.get_record_preview, kwargs["parsed_args"].record_definition)
1521+
1522+
response = preview_record(kwargs["flags"]) if "flags" in kwargs else preview_record()
1523+
self.last_response = self.output_response(response)
1524+
15041525
@do_methods_decorator
15051526
def do_get_redo_record(self) -> None:
15061527
"""
@@ -1614,30 +1635,6 @@ class SzCmdShell(cmd.Cmd):
16141635
response = process_redo(kwargs["flags"]) if "flags" in kwargs else process_redo()
16151636
self.last_response = self.output_response(response)
16161637

1617-
@do_methods_decorator
1618-
def do_preprocess_record(self, **kwargs: Any) -> None:
1619-
"""
1620-
Pre-process a record
1621-
1622-
Syntax:
1623-
preprocess_record record_definition [-f flag ...]
1624-
1625-
Examples:
1626-
preprocess_record '{"NAME_FULL":"Robert Smith", "DATE_OF_BIRTH":"7/4/1976", "PHONE_NUMBER":"787-767-2088"}'
1627-
1628-
Arguments:
1629-
record_definition = Senzing mapped JSON representation of a record
1630-
flag = Optional space separated list of engine flag(s) to determine output (don't specify for defaults)
1631-
"""
1632-
1633-
preprocess_record = functools.partial(
1634-
self.sz_engine.preprocess_record,
1635-
kwargs["parsed_args"].record_definition,
1636-
)
1637-
1638-
response = preprocess_record(kwargs["flags"]) if "flags" in kwargs else preprocess_record()
1639-
self.last_response = self.output_response(response)
1640-
16411638
@do_methods_decorator
16421639
def do_reevaluate_entity(self, **kwargs: Any) -> None:
16431640
"""
@@ -2238,7 +2235,7 @@ class SzCmdShell(cmd.Cmd):
22382235
return self.flags_completes(text, line) + kwargs["cmd_settings"]
22392236

22402237
@cmd_settings_decorator
2241-
def complete_check_datastore_performance(
2238+
def complete_check_repository_performance(
22422239
self, text: str, line: str, begidx: int, endidx: int, **kwargs
22432240
) -> List[str]:
22442241
return kwargs["cmd_settings"]
@@ -2300,7 +2297,7 @@ class SzCmdShell(cmd.Cmd):
23002297
return kwargs["cmd_settings"]
23012298

23022299
@cmd_settings_decorator
2303-
def complete_get_datastore_info(self, text: str, line: str, begidx: int, endidx: int, **kwargs) -> List[str]:
2300+
def complete_get_repository_info(self, text: str, line: str, begidx: int, endidx: int, **kwargs) -> List[str]:
23042301
return kwargs["cmd_settings"]
23052302

23062303
@cmd_settings_decorator
@@ -2342,7 +2339,7 @@ class SzCmdShell(cmd.Cmd):
23422339
return self.flags_completes(text, line) + kwargs["cmd_settings"]
23432340

23442341
@cmd_settings_decorator
2345-
def complete_preprocess_record(self, text: str, line: str, begidx: int, endidx: int, **kwargs) -> List[str]:
2342+
def complete_get_record_preview(self, text: str, line: str, begidx: int, endidx: int, **kwargs) -> List[str]:
23462343
return self.flags_completes(text, line) + kwargs["cmd_settings"]
23472344

23482345
@cmd_settings_decorator

sz_tools/sz_file_loader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ def startup_info(
606606
ver_info = _json_loads(product.get_version())
607607
config_list = _json_loads(configmgr.get_config_registry())
608608
active_cfg_id = engine.get_active_config_id()
609-
ds_info = _json_loads(diag.get_datastore_info())
609+
ds_info = _json_loads(diag.get_repository_info())
610610
except SzError as err:
611611
raise err
612612

@@ -657,11 +657,11 @@ def startup_info(
657657
db_tune_article = "https://senzing.zendesk.com/hc/en-us/articles/360016288254-Tuning-Your-Database"
658658

659659
logger.info("")
660-
logger.info("Datastore Performance")
660+
logger.info("Repository Performance")
661661
logger.info("---------------------")
662662
logger.info("")
663663

664-
ds_perf = _json_loads(diag.check_datastore_performance(3))
664+
ds_perf = _json_loads(diag.check_repository_performance(3))
665665
num_recs_inserted = ds_perf.get("numRecordsInserted", None)
666666
if num_recs_inserted:
667667
insert_time = ds_perf["insertTime"]
@@ -671,11 +671,11 @@ def startup_info(
671671
logger.info("Average per insert: %s ms", f"{time_per_insert:.3f}")
672672
logger.info("")
673673
else:
674-
logger.error("Datastore performance test failed!")
674+
logger.error("Repository performance test failed!")
675675

676676
if time_per_insert > max_time_per_insert:
677677
logger.warning(
678-
"Datastore performance of %s ms per insert is slower than the recommended minimum of %s ms per insert",
678+
"Repository performance of %s ms per insert is slower than the recommended minimum of %s ms per insert",
679679
f"{time_per_insert:.1f}",
680680
f"{max_time_per_insert:.1f}",
681681
)

0 commit comments

Comments
 (0)