Skip to content

Commit c308ae6

Browse files
antaencantaenc
committed
#10 - Save point
1 parent 2500998 commit c308ae6

35 files changed

+238
-136
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ When using a bare metal install, the initialization parameters used by the Senzi
8484
- Python one liner
8585

8686
- ```python
87-
python3 -c $'import configparser; ini_file_name = "<project_path>/etc/G2Module.ini";engine_config_json = {};cfgp = configparser.ConfigParser();cfgp.optionxform = str;cfgp.read(ini_file_name)\nfor section in cfgp.sections(): engine_config_json[section] = dict(cfgp.items(section))\nprint(engine_config_json)'
87+
python3 -c $'import configparser; ini_file_name = "<project_path>/etc/G2Module.ini";settings = {};cfgp = configparser.ConfigParser();cfgp.optionxform = str;cfgp.read(ini_file_name)\nfor section in cfgp.sections(): settings[section] = dict(cfgp.items(section))\nprint(settings)'
8888
```
8989

9090
:pencil2: `<project_path>` in the above example should point to your project.

‎python/configuration/add_data_sources.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
from senzing import SzError
88
from senzing_core import SzAbstractFactoryCore
99

10-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1110
INSTANCE_NAME = Path(__file__).stem
11+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1212

1313

1414
try:
15-
sz_factory = SzAbstractFactoryCore("add_records", ENGINE_CONFIG_JSON, verbose_logging=False)
15+
sz_factory = SzAbstractFactoryCore("add_records", SETTINGS, verbose_logging=False)
1616
sz_config = sz_factory.create_config()
1717
sz_configmanager = sz_factory.create_configmanager()
1818

‎python/deleting/delete_futures.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
1111
from senzing_core import SzAbstractFactoryCore
1212

13-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1413
INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
1514
INSTANCE_NAME = Path(__file__).stem
15+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1616

1717

1818
def mock_logger(level, error, error_record=None):
@@ -68,7 +68,7 @@ def futures_del(engine, input_file):
6868

6969

7070
try:
71-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
71+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
7272
sz_engine = sz_factory.create_engine()
7373
futures_del(sz_engine, INPUT_FILE)
7474
except SzError as err:

‎python/deleting/delete_loop.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
99
from senzing_core import SzAbstractFactoryCore
1010

11-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1211
INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
1312
INSTANCE_NAME = Path(__file__).stem
13+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1414

1515

1616
def mock_logger(level, error, error_record=None):
@@ -49,7 +49,7 @@ def del_records_from_file(engine, input_file):
4949

5050

5151
try:
52-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
52+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
5353
sz_engine = sz_factory.create_engine()
5454
del_records_from_file(sz_engine, INPUT_FILE)
5555
except SzError as err:

‎python/deleting/delete_with_info_futures.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
)
1717
from senzing_core import SzAbstractFactoryCore
1818

19-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
2019
INPUT_FILE = Path("../../resources/data/del-500.jsonl").resolve()
2120
INSTANCE_NAME = Path(__file__).stem
2221
OUTPUT_FILE = Path("../../resources/output/delete_file_with_info.jsonl").resolve()
22+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
2323

2424

2525
def mock_logger(level, error, error_record=None):
@@ -79,7 +79,7 @@ def futures_del(engine, input_file, output_file):
7979

8080

8181
try:
82-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
82+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
8383
sz_engine = sz_factory.create_engine()
8484
futures_del(sz_engine, INPUT_FILE, OUTPUT_FILE)
8585
except SzError as err:

‎python/information/check_datastore_performance.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
from senzing import SzError
77
from senzing_core import SzAbstractFactoryCore
88

9-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
9+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1010
INSTANCE_NAME = Path(__file__).stem
1111
SECONDS_TO_RUN = 3
1212

1313
try:
14-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
14+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
1515
sz_diagnostic = sz_factory.create_diagnostic()
1616
print(sz_diagnostic.check_datastore_performance(SECONDS_TO_RUN))
1717
except SzError as err:

‎python/information/engine_flags.py‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#! /usr/bin/env python3
2+
3+
import os
4+
from pathlib import Path
5+
6+
# TODO class method?ƒ
7+
from senzing import SzEngineFlags, SzError
8+
9+
# from senzing import combine_flags2
10+
# from senzing import combine_flags2 as senzing_combine_flags2
11+
from senzing_core import SzAbstractFactoryCore
12+
13+
# TODO
14+
# import senzing
15+
16+
17+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
18+
INSTANCE_NAME = Path(__file__).stem
19+
20+
try:
21+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
22+
sz_product = sz_factory.create_engine()
23+
24+
COMBINED_WITH_ENUM = SzEngineFlags.combine_flags(
25+
[
26+
SzEngineFlags.SZ_ENTITY_CORE_FLAGS,
27+
SzEngineFlags.SZ_ENTITY_INCLUDE_ALL_RELATIONS,
28+
SzEngineFlags.SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME,
29+
SzEngineFlags.SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY,
30+
SzEngineFlags.SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO,
31+
SzEngineFlags.SZ_ENTITY_INCLUDE_ALL_FEATURES,
32+
]
33+
)
34+
35+
COMBINED_WITH_STR = SzEngineFlags.combine_flags(
36+
# [
37+
"SZ_ENTITY_CORE_FLAGS",
38+
"SZ_ENTITY_INCLUDE_ALL_RELATIONS",
39+
"SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME",
40+
"SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY",
41+
"SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO",
42+
"SZ_ENTITY_INCLUDE_ALL_FEATURES",
43+
# ]
44+
)
45+
46+
print(f"\n{SzEngineFlags.SZ_ENTITY_DEFAULT_FLAGS.value = }", flush=True)
47+
print(f"\n{COMBINED_WITH_ENUM.value = }")
48+
print(f"\n{COMBINED_WITH_STR.value = }")
49+
50+
except SzError as err:
51+
print(f"\n{err.__class__.__name__} - {err}")
52+
53+
54+
# COMBINED_WITH_NEW = senzing.combine_flags2(
55+
# SzEngineFlags.SZ_ENTITY_CORE_FLAGS,
56+
# SzEngineFlags.SZ_ENTITY_INCLUDE_ALL_RELATIONS,
57+
# SzEngineFlags.SZ_ENTITY_INCLUDE_RELATED_ENTITY_NAME,
58+
# SzEngineFlags.SZ_ENTITY_INCLUDE_RELATED_RECORD_SUMMARY,
59+
# SzEngineFlags.SZ_ENTITY_INCLUDE_RELATED_MATCHING_INFO,
60+
# SzEngineFlags.SZ_ENTITY_INCLUDE_ALL_FEATURES,
61+
# )
62+
63+
# print(f"\n{COMBINED_WITH_NEW = }", flush=True)
64+
# print(f"\n{COMBINED_WITH_NEW.value = }", flush=True)

‎python/information/get_datastore_info.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
from senzing import SzError
77
from senzing_core import SzAbstractFactoryCore
88

9-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
9+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1010
INSTANCE_NAME = Path(__file__).stem
1111

1212
try:
13-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
13+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
1414
sz_diagnostic = sz_factory.create_diagnostic()
1515
print(sz_diagnostic.get_datastore_info())
1616
except SzError as err:

‎python/information/get_license.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
from senzing import SzError
77
from senzing_core import SzAbstractFactoryCore
88

9-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
9+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1010
INSTANCE_NAME = Path(__file__).stem
1111

1212
try:
13-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
13+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
1414
sz_product = sz_factory.create_product()
1515
print(sz_product.get_license())
1616
except SzError as err:

‎python/information/get_stats.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from senzing import SzBadInputError, SzError, SzRetryableError, SzUnrecoverableError
1111
from senzing_core import SzAbstractFactoryCore
1212

13-
ENGINE_CONFIG_JSON = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
13+
SETTINGS = os.getenv("SENZING_ENGINE_CONFIGURATION_JSON", "{}")
1414
INPUT_FILE = Path("../../resources/data/load-500.jsonl").resolve()
1515
INSTANCE_NAME = Path(__file__).stem
1616

@@ -81,7 +81,7 @@ def futures_add(engine, input_file):
8181

8282

8383
try:
84-
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, ENGINE_CONFIG_JSON, verbose_logging=False)
84+
sz_factory = SzAbstractFactoryCore(INSTANCE_NAME, SETTINGS, verbose_logging=False)
8585
sz_engine = sz_factory.create_engine()
8686
futures_add(sz_engine, INPUT_FILE)
8787
except SzError as err:

0 commit comments

Comments
 (0)