diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f11d375..11f3563e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning]. ## [Unreleased] -## [0.3.3] - 2024-11-04 +## [0.3.5] - 2024-11-26 + +### Changed in 0.3.5 + +- In SzFactoryAbstract change `create_sz_` to `create_` + +## [0.3.4] - 2024-11-04 + +### Changed in 0.3.4 + +## [0.3.4] - 2024-11-04 ### Changed in 0.3.4 diff --git a/README.md b/README.md index 7a95eb26..fb41710e 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ and access it using the `senzing_grpc` Python package. import grpc from senzing_grpc import SzAbstractFactory sz_abstract_factory = SzAbstractFactory(grpc_channel=grpc.insecure_channel("localhost:8261")) - sz_product = sz_abstract_factory.create_sz_product() + sz_product = sz_abstract_factory.create_product() print(sz_product.get_version()) ``` diff --git a/examples/misc/add_truthset_data.py b/examples/misc/add_truthset_data.py index 2ae99591..79189191 100644 --- a/examples/misc/add_truthset_data.py +++ b/examples/misc/add_truthset_data.py @@ -20,7 +20,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() record_sets = [ TRUTHSET_CUSTOMER_RECORDS, TRUTHSET_REFERENCE_RECORDS, diff --git a/examples/misc/add_truthset_datasources.py b/examples/misc/add_truthset_datasources.py index 1328a0e2..a5ef8f9f 100644 --- a/examples/misc/add_truthset_datasources.py +++ b/examples/misc/add_truthset_datasources.py @@ -11,10 +11,10 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() - sz_engine = sz_abstract_factory.create_sz_engine() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() + sz_diagnostic = sz_abstract_factory.create_diagnostic() + sz_engine = sz_abstract_factory.create_engine() current_default_config_id = sz_configmanager.get_default_config_id() OLD_CONFIG_DEFINITION = sz_configmanager.get_config(current_default_config_id) diff --git a/examples/misc/individual_classes.py b/examples/misc/individual_classes.py index aedfce91..076ff599 100644 --- a/examples/misc/individual_classes.py +++ b/examples/misc/individual_classes.py @@ -50,11 +50,11 @@ def try_sz_product(sz_product_local: SzProduct) -> None: try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() - sz_engine = sz_abstract_factory.create_sz_engine() - sz_product = sz_abstract_factory.create_sz_product() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() + sz_diagnostic = sz_abstract_factory.create_diagnostic() + sz_engine = sz_abstract_factory.create_engine() + sz_product = sz_abstract_factory.create_product() try_sz_abstract_factory(sz_abstract_factory) try_sz_config(sz_config) diff --git a/examples/szabstractfactory/create_sz_config.py b/examples/szabstractfactory/create_sz_config.py index 477d885d..d4a528dc 100755 --- a/examples/szabstractfactory/create_sz_config.py +++ b/examples/szabstractfactory/create_sz_config.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() except SzError as err: print(f"\nError:\n{err}\n") diff --git a/examples/szabstractfactory/create_sz_configmanager.py b/examples/szabstractfactory/create_sz_configmanager.py index e625b056..fc36a3e4 100755 --- a/examples/szabstractfactory/create_sz_configmanager.py +++ b/examples/szabstractfactory/create_sz_configmanager.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_configmanager = sz_abstract_factory.create_configmanager() except SzError as err: print(f"\nError:\n{err}\n") diff --git a/examples/szabstractfactory/create_sz_diagnostic.py b/examples/szabstractfactory/create_sz_diagnostic.py index 61524c6b..bc6bef56 100755 --- a/examples/szabstractfactory/create_sz_diagnostic.py +++ b/examples/szabstractfactory/create_sz_diagnostic.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() + sz_diagnostic = sz_abstract_factory.create_diagnostic() except SzError as err: print(f"\nError:\n{err}\n") diff --git a/examples/szabstractfactory/create_sz_engine.py b/examples/szabstractfactory/create_sz_engine.py index 23765ef2..325469e5 100755 --- a/examples/szabstractfactory/create_sz_engine.py +++ b/examples/szabstractfactory/create_sz_engine.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() except SzError as err: print(f"\nError:\n{err}\n") diff --git a/examples/szabstractfactory/create_sz_product.py b/examples/szabstractfactory/create_sz_product.py index 3cc1f0d3..6c24cb9a 100755 --- a/examples/szabstractfactory/create_sz_product.py +++ b/examples/szabstractfactory/create_sz_product.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_product = sz_abstract_factory.create_sz_product() + sz_product = sz_abstract_factory.create_product() except SzError as err: print(f"\nError:\n{err}\n") diff --git a/examples/szabstractfactory/initialize_with_config_id.py b/examples/szabstractfactory/initialize_with_config_id.py index ee122e77..270a5e9a 100644 --- a/examples/szabstractfactory/initialize_with_config_id.py +++ b/examples/szabstractfactory/initialize_with_config_id.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_configmanager = sz_abstract_factory.create_configmanager() config_id = sz_configmanager.get_default_config_id() sz_abstract_factory.reinitialize(config_id) except SzError as err: diff --git a/examples/szabstractfactory/reinitialize.py b/examples/szabstractfactory/reinitialize.py index cb8b3f19..d20fb65d 100644 --- a/examples/szabstractfactory/reinitialize.py +++ b/examples/szabstractfactory/reinitialize.py @@ -11,7 +11,7 @@ try: # Using get_active_config_id for demonstrations purposes. sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() config_id = sz_engine.get_active_config_id() sz_abstract_factory.reinitialize(config_id) except SzError as err: diff --git a/examples/szconfig/add_data_source.py b/examples/szconfig/add_data_source.py index 790e220c..72008ea2 100755 --- a/examples/szconfig/add_data_source.py +++ b/examples/szconfig/add_data_source.py @@ -11,7 +11,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() config_handle = sz_config.create_config() RESULT = sz_config.add_data_source(config_handle, DATA_SOURCE_CODE) sz_config.close_config(config_handle) diff --git a/examples/szconfig/create_and_close.py b/examples/szconfig/create_and_close.py index e9b10504..1a5ef89c 100755 --- a/examples/szconfig/create_and_close.py +++ b/examples/szconfig/create_and_close.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() config_handle = sz_config.create_config() # Do work. diff --git a/examples/szconfig/create_export_import_close.py b/examples/szconfig/create_export_import_close.py index 4c08dc05..f5da0e86 100755 --- a/examples/szconfig/create_export_import_close.py +++ b/examples/szconfig/create_export_import_close.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() config_handle_1 = sz_config.create_config() # Create first in-memory. CONFIG_DEFINITION = sz_config.export_config(config_handle_1) # Save in-memory to string. config_handle_2 = sz_config.import_config(CONFIG_DEFINITION) # Create second in-memory. diff --git a/examples/szconfig/delete_data_source.py b/examples/szconfig/delete_data_source.py index a832f3bb..b4f93771 100755 --- a/examples/szconfig/delete_data_source.py +++ b/examples/szconfig/delete_data_source.py @@ -11,7 +11,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() config_handle = sz_config.create_config() sz_config.delete_data_source(config_handle, DATA_SOURCE_CODE) sz_config.close_config(config_handle) diff --git a/examples/szconfig/export_config.py b/examples/szconfig/export_config.py index 2b8ad44c..861c661b 100755 --- a/examples/szconfig/export_config.py +++ b/examples/szconfig/export_config.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() config_handle = sz_config.create_config() # Create first in-memory. CONFIG_DEFINITION = sz_config.export_config(config_handle) # Save in-memory to string. sz_config.close_config(config_handle) diff --git a/examples/szconfig/get_data_sources.py b/examples/szconfig/get_data_sources.py index 92e806df..b16d02be 100755 --- a/examples/szconfig/get_data_sources.py +++ b/examples/szconfig/get_data_sources.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() config_handle = sz_config.create_config() RESULT = sz_config.get_data_sources(config_handle) sz_config.close_config(config_handle) diff --git a/examples/szconfig/import_config.py b/examples/szconfig/import_config.py index 722e9244..a56a554c 100755 --- a/examples/szconfig/import_config.py +++ b/examples/szconfig/import_config.py @@ -10,8 +10,8 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() config_id = sz_configmanager.get_default_config_id() CONFIG_DEFINITION = sz_configmanager.get_config(config_id) config_handle = sz_config.import_config(CONFIG_DEFINITION) diff --git a/examples/szconfig/szconfig_constructor.py b/examples/szconfig/szconfig_constructor.py index bc41d695..170884bb 100755 --- a/examples/szconfig/szconfig_constructor.py +++ b/examples/szconfig/szconfig_constructor.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() + sz_config = sz_abstract_factory.create_config() except SzError as err: print(f"\nError in {__file__}:\n{err}\n") diff --git a/examples/szconfigmanager/add_config.py b/examples/szconfigmanager/add_config.py index 658b093d..bb6f2f56 100755 --- a/examples/szconfigmanager/add_config.py +++ b/examples/szconfigmanager/add_config.py @@ -11,8 +11,8 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() config_handle = sz_config.create_config() CONFIG_DEFINITION = sz_config.export_config(config_handle) config_id = sz_configmanager.add_config(CONFIG_DEFINITION, CONFIG_COMMENT) diff --git a/examples/szconfigmanager/get_config.py b/examples/szconfigmanager/get_config.py index 71ab2ffb..4ee5c443 100755 --- a/examples/szconfigmanager/get_config.py +++ b/examples/szconfigmanager/get_config.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_configmanager = sz_abstract_factory.create_configmanager() config_id = sz_configmanager.get_default_config_id() CONFIG_DEFINITION = sz_configmanager.get_config(config_id) print(f"\nFile {__file__}:\n{CONFIG_DEFINITION}\n") diff --git a/examples/szconfigmanager/get_configs.py b/examples/szconfigmanager/get_configs.py index 6d1cb25d..b36df083 100755 --- a/examples/szconfigmanager/get_configs.py +++ b/examples/szconfigmanager/get_configs.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_configmanager = sz_abstract_factory.create_configmanager() CONFIG_LIST = sz_configmanager.get_configs() print(f"\nFile {__file__}:\n{CONFIG_LIST}\n") except SzError as err: diff --git a/examples/szconfigmanager/get_default_config_id.py b/examples/szconfigmanager/get_default_config_id.py index f2ef8c23..146b930a 100755 --- a/examples/szconfigmanager/get_default_config_id.py +++ b/examples/szconfigmanager/get_default_config_id.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_configmanager = sz_abstract_factory.create_configmanager() CONFIG_ID = sz_configmanager.get_default_config_id() print(f"\nFile {__file__}:\n{CONFIG_ID}\n") except SzError as err: diff --git a/examples/szconfigmanager/replace_default_config_id.py b/examples/szconfigmanager/replace_default_config_id.py index d6e92be9..76ee5051 100755 --- a/examples/szconfigmanager/replace_default_config_id.py +++ b/examples/szconfigmanager/replace_default_config_id.py @@ -14,8 +14,8 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() current_default_config_id = sz_configmanager.get_default_config_id() # Create a new config. diff --git a/examples/szconfigmanager/set_default_config_id.py b/examples/szconfigmanager/set_default_config_id.py index 0816ce73..ac2fcf4a 100755 --- a/examples/szconfigmanager/set_default_config_id.py +++ b/examples/szconfigmanager/set_default_config_id.py @@ -14,8 +14,8 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() old_config_id = sz_configmanager.get_default_config_id() # Create a new config. diff --git a/examples/szconfigmanager/szconfigmanager_constructor.py b/examples/szconfigmanager/szconfigmanager_constructor.py index 41c95d5b..675aaa80 100755 --- a/examples/szconfigmanager/szconfigmanager_constructor.py +++ b/examples/szconfigmanager/szconfigmanager_constructor.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_configmanager = sz_abstract_factory.create_configmanager() except SzError as err: print(f"\nError in {__file__}:\n{err}\n") diff --git a/examples/szdiagnostic/check_datastore_performance.py b/examples/szdiagnostic/check_datastore_performance.py index 8f112709..59511a4c 100755 --- a/examples/szdiagnostic/check_datastore_performance.py +++ b/examples/szdiagnostic/check_datastore_performance.py @@ -11,7 +11,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() + sz_diagnostic = sz_abstract_factory.create_diagnostic() RESULT = sz_diagnostic.check_datastore_performance(SECONDS_TO_RUN) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szdiagnostic/get_datastore_info.py b/examples/szdiagnostic/get_datastore_info.py index 97133593..a1eb07ba 100755 --- a/examples/szdiagnostic/get_datastore_info.py +++ b/examples/szdiagnostic/get_datastore_info.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() + sz_diagnostic = sz_abstract_factory.create_diagnostic() RESULT = sz_diagnostic.get_datastore_info() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szdiagnostic/get_feature.py b/examples/szdiagnostic/get_feature.py index 20dfe9a9..089c4fca 100644 --- a/examples/szdiagnostic/get_feature.py +++ b/examples/szdiagnostic/get_feature.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() + sz_diagnostic = sz_abstract_factory.create_diagnostic() RESULT = sz_diagnostic.get_feature(1) print(RESULT) except SzError as err: diff --git a/examples/szdiagnostic/purge_repository.py b/examples/szdiagnostic/purge_repository.py index 9116f832..d3914afc 100644 --- a/examples/szdiagnostic/purge_repository.py +++ b/examples/szdiagnostic/purge_repository.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() + sz_diagnostic = sz_abstract_factory.create_diagnostic() # WARNING # WARNING - This will remove all loaded and entity resolved data from the Senzing repository, use with caution! # WARNING diff --git a/examples/szdiagnostic/szdiagnostic_constructor.py b/examples/szdiagnostic/szdiagnostic_constructor.py index f8f714f6..32d7a2d0 100755 --- a/examples/szdiagnostic/szdiagnostic_constructor.py +++ b/examples/szdiagnostic/szdiagnostic_constructor.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_diagnostic = sz_abstract_factory.create_sz_diagnostic() + sz_diagnostic = sz_abstract_factory.create_diagnostic() except SzError as err: print(f"\nError in {__file__}:\n{err}\n") diff --git a/examples/szengine/a_header_szengine.py b/examples/szengine/a_header_szengine.py index f1a2ea9b..910e1935 100644 --- a/examples/szengine/a_header_szengine.py +++ b/examples/szengine/a_header_szengine.py @@ -63,5 +63,5 @@ def add_records(sz_engine_local: SzEngine, record_id_list: List[Tuple[str, str]] print("\n---- szengine --------------------------------------------------------\n") sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) -sz_engine = sz_abstract_factory.create_sz_engine() +sz_engine = sz_abstract_factory.create_engine() add_records(sz_engine, TEST_RECORDS) diff --git a/examples/szengine/add_record.py b/examples/szengine/add_record.py index c0d1f455..51fe6b98 100755 --- a/examples/szengine/add_record.py +++ b/examples/szengine/add_record.py @@ -35,7 +35,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.add_record(DATA_SOURCE_CODE, RECORD_ID, RECORD_DEFINITION, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/count_redo_records.py b/examples/szengine/count_redo_records.py index 031f128e..b9bc7229 100755 --- a/examples/szengine/count_redo_records.py +++ b/examples/szengine/count_redo_records.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.count_redo_records() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/delete_record.py b/examples/szengine/delete_record.py index daea09ce..ffa355a6 100755 --- a/examples/szengine/delete_record.py +++ b/examples/szengine/delete_record.py @@ -18,7 +18,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.delete_record(DATA_SOURCE_CODE, RECORD_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/export_csv_fetch_close.py b/examples/szengine/export_csv_fetch_close.py index a50ad0cc..ff064bc2 100755 --- a/examples/szengine/export_csv_fetch_close.py +++ b/examples/szengine/export_csv_fetch_close.py @@ -19,7 +19,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() export_handle = sz_engine.export_csv_entity_report(CSV_COLUMN_LIST, FLAGS) RESULT = "" while True: diff --git a/examples/szengine/export_json_fetch_close.py b/examples/szengine/export_json_fetch_close.py index 0879af18..1c012da3 100755 --- a/examples/szengine/export_json_fetch_close.py +++ b/examples/szengine/export_json_fetch_close.py @@ -16,7 +16,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() export_handle = sz_engine.export_json_entity_report(FLAGS) RESULT = "" while True: diff --git a/examples/szengine/find_network_by_entity_id.py b/examples/szengine/find_network_by_entity_id.py index 06c7fefb..2f5989e0 100755 --- a/examples/szengine/find_network_by_entity_id.py +++ b/examples/szengine/find_network_by_entity_id.py @@ -20,7 +20,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.find_network_by_entity_id(ENTITY_LIST, MAX_DEGREES, BUILD_OUT_DEGREES, MAX_ENTITIES, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/find_network_by_record_id.py b/examples/szengine/find_network_by_record_id.py index c16c4671..9433bb30 100755 --- a/examples/szengine/find_network_by_record_id.py +++ b/examples/szengine/find_network_by_record_id.py @@ -20,7 +20,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.find_network_by_record_id(RECORD_LIST, MAX_DEGREES, BUILD_OUT_DEGREES, MAX_ENTITIES, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/find_path_by_entity_id.py b/examples/szengine/find_path_by_entity_id.py index bdcd6589..ca87f4b3 100755 --- a/examples/szengine/find_path_by_entity_id.py +++ b/examples/szengine/find_path_by_entity_id.py @@ -23,7 +23,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.find_path_by_entity_id( START_ENTITY_ID, END_ENTITY_ID, diff --git a/examples/szengine/find_path_by_record_id.py b/examples/szengine/find_path_by_record_id.py index 15464131..22d0fd3f 100755 --- a/examples/szengine/find_path_by_record_id.py +++ b/examples/szengine/find_path_by_record_id.py @@ -25,7 +25,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.find_path_by_record_id( START_DATA_SOURCE_CODE, START_RECORD_ID, diff --git a/examples/szengine/get_active_config_id.py b/examples/szengine/get_active_config_id.py index c822123e..0fc02e9c 100755 --- a/examples/szengine/get_active_config_id.py +++ b/examples/szengine/get_active_config_id.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_active_config_id() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/get_entity_by_entity_id.py b/examples/szengine/get_entity_by_entity_id.py index 48fe992c..900b5de0 100755 --- a/examples/szengine/get_entity_by_entity_id.py +++ b/examples/szengine/get_entity_by_entity_id.py @@ -17,7 +17,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_entity_by_entity_id(ENTITY_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/get_entity_by_record_id.py b/examples/szengine/get_entity_by_record_id.py index 16822778..b7d940f0 100755 --- a/examples/szengine/get_entity_by_record_id.py +++ b/examples/szengine/get_entity_by_record_id.py @@ -18,7 +18,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_entity_by_record_id(DATA_SOURCE_CODE, RECORD_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/get_record.py b/examples/szengine/get_record.py index f37677f0..b2951112 100755 --- a/examples/szengine/get_record.py +++ b/examples/szengine/get_record.py @@ -18,7 +18,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_record(DATA_SOURCE_CODE, RECORD_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/get_redo_record.py b/examples/szengine/get_redo_record.py index 4326a1ea..e65899c5 100755 --- a/examples/szengine/get_redo_record.py +++ b/examples/szengine/get_redo_record.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_redo_record() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/get_stats.py b/examples/szengine/get_stats.py index 1969f200..d43fbbf7 100755 --- a/examples/szengine/get_stats.py +++ b/examples/szengine/get_stats.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_stats() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/get_virtual_entity_by_record_id.py b/examples/szengine/get_virtual_entity_by_record_id.py index 08473517..0528c066 100755 --- a/examples/szengine/get_virtual_entity_by_record_id.py +++ b/examples/szengine/get_virtual_entity_by_record_id.py @@ -20,7 +20,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.get_virtual_entity_by_record_id(RECORD_LIST, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/how_entity_by_entity_id.py b/examples/szengine/how_entity_by_entity_id.py index 65355e8e..374924e7 100755 --- a/examples/szengine/how_entity_by_entity_id.py +++ b/examples/szengine/how_entity_by_entity_id.py @@ -17,7 +17,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.how_entity_by_entity_id(ENTITY_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/preprocess_record.py b/examples/szengine/preprocess_record.py index 64728a40..94a551a9 100644 --- a/examples/szengine/preprocess_record.py +++ b/examples/szengine/preprocess_record.py @@ -16,7 +16,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() # TODO: Implement example. diff --git a/examples/szengine/prime_engine.py b/examples/szengine/prime_engine.py index 34edc0b3..5c9e5968 100755 --- a/examples/szengine/prime_engine.py +++ b/examples/szengine/prime_engine.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() sz_engine.prime_engine() except SzError as err: print(f"\nError in {__file__}:\n{err}\n") diff --git a/examples/szengine/process_redo_record.py b/examples/szengine/process_redo_record.py index 3119bdb6..c97e17b6 100755 --- a/examples/szengine/process_redo_record.py +++ b/examples/szengine/process_redo_record.py @@ -16,7 +16,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() while sz_engine.count_redo_records() > 0: REDO_RECORD = sz_engine.get_redo_record() RESULT = sz_engine.process_redo_record(REDO_RECORD, FLAGS) diff --git a/examples/szengine/reevaluate_entity.py b/examples/szengine/reevaluate_entity.py index cd5d7e60..d276678a 100755 --- a/examples/szengine/reevaluate_entity.py +++ b/examples/szengine/reevaluate_entity.py @@ -17,7 +17,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.reevaluate_entity(ENTITY_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/reevaluate_record.py b/examples/szengine/reevaluate_record.py index fb767906..8a48d0ef 100644 --- a/examples/szengine/reevaluate_record.py +++ b/examples/szengine/reevaluate_record.py @@ -18,7 +18,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.reevaluate_record(DATA_SOURCE_CODE, RECORD_ID, FLAGS) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/search_by_attributes.py b/examples/szengine/search_by_attributes.py index f5590cc1..7101f28d 100755 --- a/examples/szengine/search_by_attributes.py +++ b/examples/szengine/search_by_attributes.py @@ -20,7 +20,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.search_by_attributes(ATTRIBUTES, FLAGS, SEARCH_PROFILE) print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szengine/szengine_constructor.py b/examples/szengine/szengine_constructor.py index ec471dc6..1d58ad06 100755 --- a/examples/szengine/szengine_constructor.py +++ b/examples/szengine/szengine_constructor.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() except SzError as err: print(f"\nError in {__file__}:\n{err}\n") diff --git a/examples/szengine/why_entities.py b/examples/szengine/why_entities.py index 325df77e..dd532414 100755 --- a/examples/szengine/why_entities.py +++ b/examples/szengine/why_entities.py @@ -18,7 +18,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.why_entities( ENTITY_ID_1, ENTITY_ID_2, diff --git a/examples/szengine/why_record_in_entity.py b/examples/szengine/why_record_in_entity.py index 80012006..e66b3e3f 100755 --- a/examples/szengine/why_record_in_entity.py +++ b/examples/szengine/why_record_in_entity.py @@ -18,7 +18,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.why_record_in_entity( DATA_SOURCE_CODE, RECORD_ID, diff --git a/examples/szengine/why_records.py b/examples/szengine/why_records.py index 1f1aa82c..2e00df35 100755 --- a/examples/szengine/why_records.py +++ b/examples/szengine/why_records.py @@ -20,7 +20,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_engine = sz_abstract_factory.create_sz_engine() + sz_engine = sz_abstract_factory.create_engine() RESULT = sz_engine.why_records( DATA_SOURCE_CODE_1, RECORD_ID_1, diff --git a/examples/szproduct/get_license.py b/examples/szproduct/get_license.py index 04cef8e8..f950934d 100755 --- a/examples/szproduct/get_license.py +++ b/examples/szproduct/get_license.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_product = sz_abstract_factory.create_sz_product() + sz_product = sz_abstract_factory.create_product() RESULT = sz_product.get_license() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szproduct/get_version.py b/examples/szproduct/get_version.py index 8ba4ad9c..5e75043a 100755 --- a/examples/szproduct/get_version.py +++ b/examples/szproduct/get_version.py @@ -10,7 +10,7 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_product = sz_abstract_factory.create_sz_product() + sz_product = sz_abstract_factory.create_product() RESULT = sz_product.get_version() print(f"\nFile {__file__}:\n{RESULT}\n") except SzError as err: diff --git a/examples/szproduct/szproduct_constructor.py b/examples/szproduct/szproduct_constructor.py index 5e30bb87..b7967d5c 100755 --- a/examples/szproduct/szproduct_constructor.py +++ b/examples/szproduct/szproduct_constructor.py @@ -10,6 +10,6 @@ try: sz_abstract_factory = SzAbstractFactory(**FACTORY_PARAMETERS) - sz_product = sz_abstract_factory.create_sz_product() + sz_product = sz_abstract_factory.create_product() except SzError as err: print(f"\nError in {__file__}:\n{err}\n") diff --git a/requirements.txt b/requirements.txt index ae843ef8..d9b0ab7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ grpcio==1.68.0 protobuf==5.28.3 -senzing-abstract==0.1.10 +senzing-abstract==0.1.11 diff --git a/setup.cfg b/setup.cfg index b23ce0d4..3a6dd2a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = senzing_grpc -version = 0.3.4 +version = 0.3.5 author = senzing author_email = support@senzing.com description = Python SDK for Senzing API over gRPC @@ -21,9 +21,9 @@ package_dir = packages = find: python_requires = >=3.9 install_requires = - grpcio >= 1.67.1 + grpcio >= 1.68.0 protobuf >= 5.28.3 - senzing-abstract >= 0.1.10 + senzing-abstract >= 0.1.11 [options.packages.find] where = src diff --git a/src/senzing_grpc/szabstractfactory.py b/src/senzing_grpc/szabstractfactory.py index b6ddd106..134b7798 100644 --- a/src/senzing_grpc/szabstractfactory.py +++ b/src/senzing_grpc/szabstractfactory.py @@ -89,23 +89,23 @@ def __exit__( # SzAbstractFactory methods # ------------------------------------------------------------------------- - def create_sz_config(self, **kwargs: Any) -> SzConfigAbstract: + def create_config(self, **kwargs: Any) -> SzConfigAbstract: _ = kwargs return SzConfig(grpc_channel=self.channel) - def create_sz_configmanager(self, **kwargs: Any) -> SzConfigManagerAbstract: + def create_configmanager(self, **kwargs: Any) -> SzConfigManagerAbstract: _ = kwargs return SzConfigManager(grpc_channel=self.channel) - def create_sz_diagnostic(self, **kwargs: Any) -> SzDiagnosticAbstract: + def create_diagnostic(self, **kwargs: Any) -> SzDiagnosticAbstract: _ = kwargs return SzDiagnostic(grpc_channel=self.channel) - def create_sz_engine(self, **kwargs: Any) -> SzEngineAbstract: + def create_engine(self, **kwargs: Any) -> SzEngineAbstract: _ = kwargs return SzEngine(grpc_channel=self.channel) - def create_sz_product(self, **kwargs: Any) -> SzProductAbstract: + def create_product(self, **kwargs: Any) -> SzProductAbstract: _ = kwargs return SzProduct(grpc_channel=self.channel) diff --git a/tests/szabstractfactory_test.py b/tests/szabstractfactory_test.py index a5f4bcdb..1e7108a4 100755 --- a/tests/szabstractfactory_test.py +++ b/tests/szabstractfactory_test.py @@ -22,33 +22,33 @@ # ----------------------------------------------------------------------------- -def test_create_sz_config(sz_abstract_factory: SzAbstractFactory) -> None: +def test_create_config(sz_abstract_factory: SzAbstractFactory) -> None: """Create SzConfig.""" - actual = sz_abstract_factory.create_sz_config() + actual = sz_abstract_factory.create_config() assert isinstance(actual, SzConfig) -def test_create_sz_configmanager(sz_abstract_factory: SzAbstractFactory) -> None: +def test_create_configmanager(sz_abstract_factory: SzAbstractFactory) -> None: """Create SzConfigManager.""" - actual = sz_abstract_factory.create_sz_configmanager() + actual = sz_abstract_factory.create_configmanager() assert isinstance(actual, SzConfigManager) -def test_create_sz_diagnostic(sz_abstract_factory: SzAbstractFactory) -> None: +def test_create_diagnostic(sz_abstract_factory: SzAbstractFactory) -> None: """Create SzDiagnostic.""" - actual = sz_abstract_factory.create_sz_diagnostic() + actual = sz_abstract_factory.create_diagnostic() assert isinstance(actual, SzDiagnostic) -def test_create_sz_engine(sz_abstract_factory: SzAbstractFactory) -> None: +def test_create_engine(sz_abstract_factory: SzAbstractFactory) -> None: """Create SzEngine.""" - actual = sz_abstract_factory.create_sz_engine() + actual = sz_abstract_factory.create_engine() assert isinstance(actual, SzEngine) -def test_create_sz_product(sz_abstract_factory: SzAbstractFactory) -> None: +def test_create_product(sz_abstract_factory: SzAbstractFactory) -> None: """Create SzProduct.""" - actual = sz_abstract_factory.create_sz_product() + actual = sz_abstract_factory.create_product() assert isinstance(actual, SzProduct) @@ -59,8 +59,8 @@ def test_reinitialize(sz_abstract_factory: SzAbstractFactory) -> None: # Create Senzing objects. - sz_config = sz_abstract_factory.create_sz_config() - sz_configmanager = sz_abstract_factory.create_sz_configmanager() + sz_config = sz_abstract_factory.create_config() + sz_configmanager = sz_abstract_factory.create_configmanager() # Get existing Senzing configuration. @@ -103,7 +103,7 @@ def test_context() -> None: grpc_channel = grpc.insecure_channel(grpc_url) with SzAbstractFactory(grpc_channel=grpc_channel) as actual: assert isinstance(actual, SzAbstractFactory) - sz_config = actual.create_sz_config() + sz_config = actual.create_config() assert isinstance(sz_config, SzConfig)