Merge pull request #73 from Senzing/issue-2.dockter.2

SenzingAPI 2.4.1
senzing-garage · Jun 7, 2021 · 041dbd0 · 041dbd0
2 parents cd52dc1 + cc26488
commit 041dbd0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/bin/01-user-variables.sh.template b/bin/01-user-variables.sh.template
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SENZING_VERSION=2.4.0
+SENZING_VERSION=2.4.1
 
 SOURCE_PYTHON_DIR=/opt/senzing-${SENZING_VERSION}/g2/python
 

diff --git a/bin/05-commit-repositories.md b/bin/05-commit-repositories.md
@@ -6,15 +6,15 @@
 
 ```console
 git status
-git commit -a -m "#3 2.4.0"
+git commit -a -m "#3 2.4.1"
 git push
 git status
 ```
 
 3. Create pull request with the following title:
 
 ```console
-Shipped with SenzingAPI 2.4.0
+Shipped with SenzingAPI 2.4.1
 ```
 
 4. Pull request, but do not delete branch

diff --git a/bin/07-submodules.sh b/bin/07-submodules.sh
@@ -15,9 +15,9 @@ SUBMODULES=(
     "g2createproject;1.7.0;G2CreateProject.py"
     "g2database;1.6.0;G2Database.py"
     "g2diagnostic;1.9.0;G2Diagnostic.py"
-    "g2engine;1.14.0;G2Engine.py"
+    "g2engine;1.15.0;G2Engine.py"
     "g2exception;1.2.0;G2Exception.py"
-    "g2explorer;1.2.0;G2Explorer.py"
+    "g2explorer;1.3.0;G2Explorer.py"
     "g2export;1.13.0;G2Export.py"
     "g2health;1.1.0;G2Health.py"
     "g2hasher;1.5.0;G2Hasher.py"

diff --git a/bin/13-create-g2-python-version.md b/bin/13-create-g2-python-version.md
@@ -5,7 +5,7 @@ In https://github.com/Senzing/g2-python:
 1. Create a Pull Request with the title:
 
 ```console
-SenzingAPI 2.4.0
+SenzingAPI 2.4.1
 ```
 
 2. Create a new version that matches SenzingAPI version

diff --git a/g2/python/G2Engine.py b/g2/python/G2Engine.py
@@ -126,6 +126,13 @@ class G2Engine(object):
     # flag for including search result information
     G2_SEARCH_INCLUDE_FEATURE_SCORES = ( 1 << 26 )
 
+    # flags for exporting entity data
+    G2_SEARCH_INCLUDE_RESOLVED = G2_EXPORT_INCLUDE_RESOLVED
+    G2_SEARCH_INCLUDE_POSSIBLY_SAME = G2_EXPORT_INCLUDE_POSSIBLY_SAME
+    G2_SEARCH_INCLUDE_POSSIBLY_RELATED = G2_EXPORT_INCLUDE_POSSIBLY_RELATED
+    G2_SEARCH_INCLUDE_NAME_ONLY = G2_EXPORT_INCLUDE_NAME_ONLY
+    G2_SEARCH_INCLUDE_ALL_ENTITIES = G2_SEARCH_INCLUDE_RESOLVED | G2_SEARCH_INCLUDE_POSSIBLY_SAME | G2_SEARCH_INCLUDE_POSSIBLY_RELATED | G2_SEARCH_INCLUDE_NAME_ONLY
+
 
     # recommended settings
     G2_RECORD_DEFAULT_FLAGS = G2_ENTITY_INCLUDE_RECORD_JSON_DATA
@@ -135,10 +142,10 @@ class G2Engine(object):
     G2_FIND_PATH_DEFAULT_FLAGS = G2_ENTITY_INCLUDE_ALL_RELATIONS | G2_ENTITY_INCLUDE_ENTITY_NAME | G2_ENTITY_INCLUDE_RECORD_SUMMARY | G2_ENTITY_INCLUDE_RELATED_MATCHING_INFO
     G2_WHY_ENTITY_DEFAULT_FLAGS = G2_ENTITY_DEFAULT_FLAGS | G2_ENTITY_INCLUDE_RECORD_FEATURE_IDS | G2_ENTITY_OPTION_INCLUDE_INTERNAL_FEATURES | G2_ENTITY_OPTION_INCLUDE_FEATURE_STATS
 
-    G2_SEARCH_BY_ATTRIBUTES_ALL = G2_EXPORT_INCLUDE_ALL_ENTITIES | G2_EXPORT_INCLUDE_ALL_RELATIONSHIPS | G2_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES | G2_ENTITY_INCLUDE_ENTITY_NAME | G2_ENTITY_INCLUDE_RECORD_SUMMARY | G2_SEARCH_INCLUDE_FEATURE_SCORES
-    G2_SEARCH_BY_ATTRIBUTES_STRONG = G2_EXPORT_INCLUDE_RESOLVED | G2_EXPORT_INCLUDE_POSSIBLY_SAME | G2_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES | G2_ENTITY_INCLUDE_ENTITY_NAME | G2_ENTITY_INCLUDE_RECORD_SUMMARY | G2_SEARCH_INCLUDE_FEATURE_SCORES
-    G2_SEARCH_BY_ATTRIBUTES_MINIMAL_ALL = G2_EXPORT_INCLUDE_ALL_ENTITIES | G2_EXPORT_INCLUDE_ALL_RELATIONSHIPS
-    G2_SEARCH_BY_ATTRIBUTES_MINIMAL_STRONG = G2_EXPORT_INCLUDE_RESOLVED | G2_EXPORT_INCLUDE_POSSIBLY_SAME
+    G2_SEARCH_BY_ATTRIBUTES_ALL = G2_SEARCH_INCLUDE_ALL_ENTITIES | G2_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES | G2_ENTITY_INCLUDE_ENTITY_NAME | G2_ENTITY_INCLUDE_RECORD_SUMMARY | G2_SEARCH_INCLUDE_FEATURE_SCORES
+    G2_SEARCH_BY_ATTRIBUTES_STRONG = G2_SEARCH_INCLUDE_RESOLVED | G2_SEARCH_INCLUDE_POSSIBLY_SAME | G2_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES | G2_ENTITY_INCLUDE_ENTITY_NAME | G2_ENTITY_INCLUDE_RECORD_SUMMARY | G2_SEARCH_INCLUDE_FEATURE_SCORES
+    G2_SEARCH_BY_ATTRIBUTES_MINIMAL_ALL = G2_SEARCH_INCLUDE_ALL_ENTITIES
+    G2_SEARCH_BY_ATTRIBUTES_MINIMAL_STRONG = G2_SEARCH_INCLUDE_RESOLVED | G2_SEARCH_INCLUDE_POSSIBLY_SAME
     G2_SEARCH_BY_ATTRIBUTES_DEFAULT_FLAGS = G2_SEARCH_BY_ATTRIBUTES_ALL
 
 

diff --git a/g2/python/G2Explorer.py b/g2/python/G2Explorer.py
@@ -1603,9 +1603,8 @@ def do_search(self,arg):
             searchJson = parmData
             searchFlags = 0
             if apiVersion['VERSION'][0:1] > '1':
-                searchFlags = searchFlags | g2Engine.G2_EXPORT_INCLUDE_ALL_ENTITIES 
+                searchFlags = searchFlags | g2Engine.G2_SEARCH_INCLUDE_ALL_ENTITIES 
                 searchFlags = searchFlags | g2Engine.G2_SEARCH_INCLUDE_FEATURE_SCORES
-                searchFlags = searchFlags | g2Engine.G2_EXPORT_INCLUDE_ALL_RELATIONSHIPS
                 searchFlags = searchFlags | g2Engine.G2_ENTITY_INCLUDE_ENTITY_NAME
                 searchFlags = searchFlags | g2Engine.G2_ENTITY_INCLUDE_RECORD_DATA
             else:
@@ -2780,9 +2779,8 @@ def whyNotMany(self, entityList):
             #--search for this entity to get the scores against the others
             searchFlags = 0
             if apiVersion['VERSION'][0:1] > '1':
-                searchFlags = searchFlags | g2Engine.G2_EXPORT_INCLUDE_ALL_ENTITIES 
+                searchFlags = searchFlags | g2Engine.G2_SEARCH_INCLUDE_ALL_ENTITIES 
                 searchFlags = searchFlags | g2Engine.G2_SEARCH_INCLUDE_FEATURE_SCORES
-                searchFlags = searchFlags | g2Engine.G2_EXPORT_INCLUDE_ALL_RELATIONSHIPS
                 searchFlags = searchFlags | g2Engine.G2_ENTITY_INCLUDE_ENTITY_NAME
                 searchFlags = searchFlags | g2Engine.G2_ENTITY_INCLUDE_RECORD_DATA
             else:

diff --git a/g2engine b/g2engine
diff --git a/g2explorer b/g2explorer