Skip to content

Commit ddf421d

Browse files
committed
#169 - Update recently changed flags
1 parent c442062 commit ddf421d

6 files changed

Lines changed: 65 additions & 56 deletions

File tree

CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [0.0.21] - 2025-05-14
11+
12+
### Fixed in 0.0.21
13+
14+
- Flag SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS was changed to SZ_ENTITY_INCLUDE_RECORD_FEATURES in the SDK, update in sz_explorer and sz_export
15+
- Update help examples in sz_command
16+
1017
## [0.0.20] - 2025-05-06
1118

1219
### Added in 0.0.20

development-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sphinx-prompt==1.9.0
1818
sphinxext-remoteliteralinclude==0.5.0
1919
sphinx-rtd-theme==3.0.2
2020
sphinx-tabs==3.4.7
21-
sphinx-toolbox==4.0.0
21+
sphinx-toolbox==3.0.0
2222
sphinx==8.2.3
2323
sphinxcontrib-applehelp==2.0.0
2424
sphinxcontrib-devhelp==2.0.0

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.20
3+
version = 0.0.21
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.10
25-
senzing-core >= 0.3.9
24+
senzing >= 0.2.12
25+
senzing-core >= 0.3.11
2626

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

sz_tools/sz_command

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,6 @@ class SzCmdShell(cmd.Cmd):
16281628
16291629
Examples:
16301630
preprocess_record '{"NAME_FULL":"Robert Smith", "DATE_OF_BIRTH":"7/4/1976", "PHONE_NUMBER":"787-767-2088"}'
1631-
preprocess_record '{"NAME_FULL":"Robert Smith", "DATE_OF_BIRTH":"7/4/1976", "PHONE_NUMBER":"787-767-2088"}' -f SZ_RECORD_DEFAULT_FLAGS
16321631
16331632
Arguments:
16341633
record_definition = Senzing mapped JSON representation of a record
@@ -1712,14 +1711,15 @@ class SzCmdShell(cmd.Cmd):
17121711
Search for entities
17131712
17141713
Syntax:
1715-
search_by_attributes attributes [-f FLAG ...]
1714+
search_by_attributes attributes [search_profile] [-f FLAG ...]
17161715
17171716
Examples:
17181717
search_by_attributes '{"name_full":"Robert Smith", "date_of_birth":"11/12/1978"}'
17191718
search_by_attributes '{"name_full":"Robert Smith", "date_of_birth":"11/12/1978"}' -f SZ_SEARCH_BY_ATTRIBUTES_MINIMAL_ALL
17201719
17211720
Arguments:
17221721
attributes = Senzing mapped JSON containing the attributes to search on
1722+
search_profile = A configured search profile (don't specify for default)
17231723
flag = Space separated list of engine flag(s) to determine output (don't specify for defaults)
17241724
17251725
Notes:
@@ -1749,7 +1749,7 @@ class SzCmdShell(cmd.Cmd):
17491749
17501750
Examples:
17511751
why_entities 96 200011
1752-
why_entities 96 200011 -f SZ_WHY_ENTITY_DEFAULT_FLAGS SZ_ENTITY_INCLUDE_RECORD_RECORD_DEFINITION
1752+
why_entities 96 200011 -f SZ_WHY_ENTITIES_DEFAULT_FLAGS SZ_INCLUDE_MATCH_KEY_DETAILS
17531753
17541754
Arguments:
17551755
entity_id_1 = Identifier for first entity
@@ -1778,7 +1778,7 @@ class SzCmdShell(cmd.Cmd):
17781778
17791779
Examples:
17801780
why_record_in_entity reference 2121
1781-
why_record_in_entity reference 2121 -f SZ_WHY_ENTITY_DEFAULT_FLAGS SZ_ENTITY_INCLUDE_RECORD_RECORD_DEFINITION
1781+
why_record_in_entity reference 2121 -f SZ_WHY_RECORD_IN_ENTITY_DEFAULT_FLAGS SZ_INCLUDE_MATCH_KEY_DETAILS
17821782
17831783
Arguments:
17841784
data_source_code = Data source code
@@ -1807,7 +1807,7 @@ class SzCmdShell(cmd.Cmd):
18071807
18081808
Examples:
18091809
why_records reference 2121 watchlist 2092
1810-
why_records reference 2121 watchlist 2092 -f SZ_WHY_ENTITY_DEFAULT_FLAGS SZ_ENTITY_INCLUDE_RECORD_RECORD_DEFINITION
1810+
why_records reference 2121 watchlist 2092 -f SZ_WHY_RECORDS_DEFAULT_FLAGS SZ_INCLUDE_MATCH_KEY_DETAILS
18111811
18121812
Arguments:
18131813
data_source_code_1 = Data source code for first record
@@ -1840,7 +1840,7 @@ class SzCmdShell(cmd.Cmd):
18401840
18411841
Examples:
18421842
why_search '{"name_full":"Robert Smith", "date_of_birth":"11/12/1978"}' 1
1843-
why_search '{"name_full":"Robert Smith", "date_of_birth":"11/12/1978"}' 1 -f SZ_SEARCH_BY_ATTRIBUTES_MINIMAL_ALL
1843+
why_search '{"name_full":"Robert Smith", "date_of_birth":"11/12/1978"}' 1 -f SZ_WHY_SEARCH_DEFAULT_FLAGS SZ_INCLUDE_MATCH_KEY_DETAILS
18441844
18451845
Arguments:
18461846
attributes = Senzing mapped JSON containing the attributes to search on

sz_tools/sz_explorer

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ class EdaReports:
420420
return review_features
421421

422422
def show_audit_sample(self, audit_records, use_color=True):
423-
get_flag_list = ["SZ_ENTITY_INCLUDE_ALL_FEATURES", "SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS"]
423+
get_flag_list = ["SZ_ENTITY_INCLUDE_ALL_FEATURES", "SZ_ENTITY_INCLUDE_RECORD_FEATURES"]
424424
features_by_record = {}
425425
entity_list = set([x["NEWER_ID"] for x in audit_records])
426426
for entity_id in entity_list:
@@ -1406,7 +1406,7 @@ class EdaSdkWrapper:
14061406
"SZ_ENTITY_INCLUDE_INTERNAL_FEATURES",
14071407
"SZ_ENTITY_INCLUDE_FEATURE_STATS",
14081408
"SZ_ENTITY_INCLUDE_RECORD_DATA",
1409-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS",
1409+
"SZ_ENTITY_INCLUDE_RECORD_FEATURES",
14101410
"SZ_INCLUDE_MATCH_KEY_DETAILS",
14111411
]
14121412
try:
@@ -1895,7 +1895,7 @@ class EdaSdkWrapper:
18951895
"SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME",
18961896
"SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO",
18971897
"SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY",
1898-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS",
1898+
"SZ_ENTITY_INCLUDE_RECORD_FEATURES",
18991899
"SZ_ENTITY_INCLUDE_ALL_FEATURES",
19001900
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
19011901
]
@@ -2114,7 +2114,7 @@ class EdaSdkWrapper:
21142114
"SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME",
21152115
"SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO",
21162116
"SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY",
2117-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS",
2117+
"SZ_ENTITY_INCLUDE_RECORD_FEATURES",
21182118
"SZ_ENTITY_INCLUDE_ALL_FEATURES",
21192119
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
21202120
]
@@ -2445,7 +2445,7 @@ class EdaSdkWrapper:
24452445
def why_records(self, entity_list, **kwargs):
24462446
whyFlagList = [
24472447
"SZ_WHY_ENTITIES_DEFAULT_FLAGS",
2448-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS",
2448+
"SZ_ENTITY_INCLUDE_RECORD_FEATURES",
24492449
"SZ_INCLUDE_MATCH_KEY_DETAILS",
24502450
]
24512451
try:
@@ -2538,7 +2538,7 @@ class EdaSdkWrapper:
25382538
"SZ_ENTITY_INCLUDE_FEATURE_STATS",
25392539
"SZ_ENTITY_INCLUDE_RECORD_DATA",
25402540
"SZ_ENTITY_INCLUDE_RECORD_JSON_DATA",
2541-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS",
2541+
"SZ_ENTITY_INCLUDE_RECORD_FEATURES",
25422542
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
25432543
"SZ_ENTITY_INCLUDE_ALL_RELATIONS",
25442544
"SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME",

sz_tools/sz_export

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,47 @@ from senzing import SzEngineFlags, SzError
2121
from senzing_core import SzAbstractFactoryCore
2222

2323
MODULE_NAME = pathlib.Path(__file__).stem
24+
VALID_FLAGS = [
25+
"SZ_ENTITY_BRIEF_DEFAULT_FLAGS",
26+
"SZ_ENTITY_CORE_FLAGS",
27+
"SZ_ENTITY_DEFAULT_FLAGS",
28+
"SZ_ENTITY_INCLUDE_ALL_FEATURES",
29+
"SZ_ENTITY_INCLUDE_ALL_RELATIONS",
30+
"SZ_ENTITY_INCLUDE_DISCLOSED_RELATIONS",
31+
"SZ_ENTITY_INCLUDE_ENTITY_NAME",
32+
"SZ_ENTITY_INCLUDE_INTERNAL_FEATURES",
33+
"SZ_ENTITY_INCLUDE_FEATURE_STATS",
34+
"SZ_ENTITY_INCLUDE_NAME_ONLY_RELATIONS",
35+
"SZ_ENTITY_INCLUDE_POSSIBLY_RELATED_RELATIONS",
36+
"SZ_ENTITY_INCLUDE_POSSIBLY_SAME_RELATIONS",
37+
"SZ_ENTITY_INCLUDE_RECORD_DATA",
38+
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_DETAILS",
39+
"SZ_ENTITY_INCLUDE_RECORD_FEATURES",
40+
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_STATS",
41+
"SZ_ENTITY_INCLUDE_RECORD_JSON_DATA",
42+
"SZ_ENTITY_INCLUDE_RECORD_MATCHING_INFO",
43+
"SZ_ENTITY_INCLUDE_RECORD_SUMMARY",
44+
"SZ_ENTITY_INCLUDE_RECORD_TYPES",
45+
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
46+
"SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME",
47+
"SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO",
48+
"SZ_ENTITY_INCLUDE_RELATED_RECORD_DATA",
49+
"SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY",
50+
"SZ_ENTITY_INCLUDE_RELATED_RECORD_TYPES",
51+
"SZ_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES",
52+
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
53+
"SZ_EXPORT_DEFAULT_FLAGS",
54+
"SZ_EXPORT_INCLUDE_ALL_ENTITIES",
55+
"SZ_EXPORT_INCLUDE_ALL_HAVING_RELATIONSHIPS",
56+
"SZ_EXPORT_INCLUDE_NAME_ONLY",
57+
"SZ_EXPORT_INCLUDE_DISCLOSED",
58+
"SZ_EXPORT_INCLUDE_MULTI_RECORD_ENTITIES",
59+
"SZ_EXPORT_INCLUDE_POSSIBLY_RELATED",
60+
"SZ_EXPORT_INCLUDE_POSSIBLY_SAME",
61+
"SZ_EXPORT_INCLUDE_SINGLE_RECORD_ENTITIES",
62+
"SZ_INCLUDE_MATCH_KEY_DETAILS",
63+
"SZ_RECORD_DEFAULT_FLAGS",
64+
]
2465

2566

2667
def csv_fetch_next(handle, csv_header=None):
@@ -207,45 +248,6 @@ def open_file(file_name):
207248

208249

209250
if __name__ == "__main__":
210-
SZ_VALID_FLAGS = [
211-
"SZ_ENTITY_BRIEF_DEFAULT_FLAGS",
212-
"SZ_ENTITY_DEFAULT_FLAGS",
213-
"SZ_ENTITY_INCLUDE_ALL_FEATURES",
214-
"SZ_ENTITY_INCLUDE_ALL_RELATIONS",
215-
"SZ_ENTITY_INCLUDE_DISCLOSED_RELATIONS",
216-
"SZ_ENTITY_INCLUDE_ENTITY_NAME",
217-
"SZ_ENTITY_INCLUDE_INTERNAL_FEATURES",
218-
"SZ_ENTITY_INCLUDE_FEATURE_STATS",
219-
"SZ_ENTITY_INCLUDE_NAME_ONLY_RELATIONS",
220-
"SZ_ENTITY_INCLUDE_POSSIBLY_RELATED_RELATIONS",
221-
"SZ_ENTITY_INCLUDE_POSSIBLY_SAME_RELATIONS",
222-
"SZ_ENTITY_INCLUDE_RECORD_DATA",
223-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_DETAILS",
224-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_IDS",
225-
"SZ_ENTITY_INCLUDE_RECORD_FEATURE_STATS",
226-
"SZ_ENTITY_INCLUDE_RECORD_JSON_DATA",
227-
"SZ_ENTITY_INCLUDE_RECORD_MATCHING_INFO",
228-
"SZ_ENTITY_INCLUDE_RECORD_SUMMARY",
229-
"SZ_ENTITY_INCLUDE_RECORD_TYPES",
230-
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
231-
"SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME",
232-
"SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO",
233-
"SZ_ENTITY_INCLUDE_RELATED_RECORD_DATA",
234-
"SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY",
235-
"SZ_ENTITY_INCLUDE_RELATED_RECORD_TYPES",
236-
"SZ_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES",
237-
"SZ_ENTITY_INCLUDE_RECORD_UNMAPPED_DATA",
238-
"SZ_EXPORT_DEFAULT_FLAGS",
239-
"SZ_EXPORT_INCLUDE_ALL_ENTITIES",
240-
"SZ_EXPORT_INCLUDE_ALL_HAVING_RELATIONSHIPS",
241-
"SZ_EXPORT_INCLUDE_NAME_ONLY",
242-
"SZ_EXPORT_INCLUDE_DISCLOSED",
243-
"SZ_EXPORT_INCLUDE_MULTI_RECORD_ENTITIES",
244-
"SZ_EXPORT_INCLUDE_POSSIBLY_RELATED",
245-
"SZ_EXPORT_INCLUDE_POSSIBLY_SAME",
246-
"SZ_EXPORT_INCLUDE_SINGLE_RECORD_ENTITIES",
247-
]
248-
249251
cli_args = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter, allow_abbrev=False)
250252
cli_args.add_argument(
251253
"-o",
@@ -481,7 +483,7 @@ if __name__ == "__main__":
481483

482484
# Get only the string flags to check against accepted flags
483485
string_flags = [flag for flag in flags if isinstance(flag, str)]
484-
invalid_string_flags = set(string_flags).difference(SZ_VALID_FLAGS)
486+
invalid_string_flags = set(string_flags).difference(VALID_FLAGS)
485487
if invalid_string_flags:
486488
print_warning("Ignoring invalid flag(s): ", end_str=" ")
487489
print(", ".join(invalid_string_flags))

0 commit comments

Comments
 (0)