Skip to content

Commit a2a45ba

Browse files
authored
Merge pull request #154 from neo4j/fix-ci
Fix CI issues
2 parents be22acc + 4cc7455 commit a2a45ba

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

python-wrapper/src/neo4j_viz/resources/nvl_entrypoint/base.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-wrapper/tests/gds_helper.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import os
22

33
from graphdatascience import GraphDataScience
4+
from graphdatascience.semantic_version.semantic_version import SemanticVersion
45
from graphdatascience.session import DbmsConnectionInfo, SessionMemory
56
from graphdatascience.session.aura_api import AuraApi
67
from graphdatascience.session.aura_api_responses import InstanceCreateDetails
8+
from graphdatascience.version import __version__
9+
10+
GDS_VERSION = SemanticVersion.from_string(__version__)
711

812

913
def connect_to_plugin_gds(uri: str) -> GraphDataScience:
@@ -15,11 +19,18 @@ def connect_to_plugin_gds(uri: str) -> GraphDataScience:
1519

1620

1721
def aura_api() -> AuraApi:
18-
return AuraApi(
19-
client_id=os.environ["AURA_API_CLIENT_ID"],
20-
client_secret=os.environ["AURA_API_CLIENT_SECRET"],
21-
tenant_id=os.environ.get("AURA_API_TENANT_ID"),
22-
)
22+
if GDS_VERSION >= SemanticVersion(1, 15, 0):
23+
return AuraApi(
24+
client_id=os.environ["AURA_API_CLIENT_ID"],
25+
client_secret=os.environ["AURA_API_CLIENT_SECRET"],
26+
project_id=os.environ.get("AURA_API_TENANT_ID"),
27+
)
28+
else:
29+
return AuraApi(
30+
client_id=os.environ["AURA_API_CLIENT_ID"],
31+
client_secret=os.environ["AURA_API_CLIENT_SECRET"],
32+
tenant_id=os.environ.get("AURA_API_TENANT_ID"), # type: ignore
33+
)
2334

2435

2536
def create_aurads_instance(api: AuraApi) -> tuple[str, DbmsConnectionInfo]:

0 commit comments

Comments
 (0)