Skip to content

Commit 0bc09f3

Browse files
committed
Fetch tenant after session init
1 parent b6e25d4 commit 0bc09f3

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

graphdatascience/session/aura_api.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@ def __init__(self, client_id: str, client_secret: str, tenant_id: Optional[str]
4242

4343
self._auth = AuraApi.Auth(oauth_url=f"{self._base_uri}/oauth/token", credentials=(client_id, client_secret))
4444
self._logger = logging.getLogger()
45-
self._tenant_id = tenant_id if tenant_id else self._get_tenant_id()
46-
self._tenant_details: Optional[TenantDetails] = None
45+
4746
self._request_session = requests.Session()
4847
self._request_session.headers = {"User-agent": f"neo4j-graphdatascience-v{__version__}"}
4948
self._request_session.auth = self._auth
5049

50+
self._tenant_id = tenant_id if tenant_id else self._get_tenant_id()
51+
self._tenant_details: Optional[TenantDetails] = None
52+
5153
@staticmethod
5254
def extract_id(uri: str) -> str:
5355
host = urlparse(uri).hostname

graphdatascience/tests/unit/test_aura_api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33

44
import pytest
55
from _pytest.logging import LogCaptureFixture
6-
from requests import HTTPError
76
from requests_mock import Mocker
87

98
from graphdatascience.session import SessionMemory
109
from graphdatascience.session.algorithm_category import AlgorithmCategory
11-
from graphdatascience.session.aura_api import AuraApi
10+
from graphdatascience.session.aura_api import AuraApi, AuraApiError
1211
from graphdatascience.session.aura_api_responses import (
1312
EstimationDetails,
1413
InstanceCreateDetails,
@@ -303,7 +302,7 @@ def test_delete_that_fails(requests_mock: Mocker) -> None:
303302
json={"errors": [{"message": "some failure happened", "reason": "unknown", "field": "string"}]},
304303
)
305304

306-
with pytest.raises(HTTPError, match="Internal Server Error"):
305+
with pytest.raises(AuraApiError, match="Internal Server Error"):
307306
api.delete_instance("id0")
308307

309308

0 commit comments

Comments
 (0)