Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SenzingAPI 2.4.1 #73

Merged
merged 2 commits into from
Jun 7, 2021
Merged

SenzingAPI 2.4.1 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca27ed1
#2 Update submodules for SenzingAPI 2.4.1
docktermj Jun 7, 2021
cc26488
#2 SenzingAPI 2.4.1
docktermj Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/01-user-variables.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions bin/05-commit-repositories.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bin/07-submodules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bin/13-create-g2-python-version.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 11 additions & 4 deletions g2/python/G2Engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Expand Down
6 changes: 2 additions & 4 deletions g2/python/G2Explorer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion g2engine
Open in desktop
Submodule g2engine updated from fa358d to e31127
2 changes: 1 addition & 1 deletion g2explorer
Open in desktop
Submodule g2explorer updated from ecf53b to 11d157