Add Obelisk CORE URLs

Author: Epse

src/obelisk/asynchronous/base.py

@@ -32,13 +32,6 @@ class BaseClient:
 
     log: logging.Logger
 
-    _token_url = 'https://obelisk.ilabt.imec.be/api/v3/auth/token'
-    _root_url = 'https://obelisk.ilabt.imec.be/api/v3'
-    _metadata_url = 'https://obelisk.ilabt.imec.be/api/v3/catalog/graphql'
-    _events_url = 'https://obelisk.ilabt.imec.be/api/v3/data/query/events'
-    _ingest_url = 'https://obelisk.ilabt.imec.be/api/v3/data/ingest'
-    _streams_url = 'https://obelisk.ilabt.imec.be/api/v3/data/streams'
-
     def __init__(self, client: str, secret: str,
                  retry_strategy: RetryStrategy = NoRetryStrategy(),
                  kind: ObeliskKind = ObeliskKind.CLASSIC) -> None:
@@ -49,12 +42,6 @@ def __init__(self, client: str, secret: str,
 
         self.log = logging.getLogger('obelisk')
 
-        self._token_url = kind.token_url
-        self._root_url = kind.root_url
-        self._events_url = kind.query_url
-        self._ingest_url = kind.ingest_url
-        self._streams_url = kind.stream_url
-
     async def _get_token(self):
         auth_string = str(base64.b64encode(
             f'{self._client}:{self._secret}'.encode('utf-8')), 'utf-8')
@@ -74,7 +61,7 @@ async def _get_token(self):
             while not response or await retry.should_retry():
                 try:
                     request = await client.post(
-                        self._token_url,
+                        self.kind.token_url,
                         json=payload if self.kind.use_json_auth else None,
                         data=payload if not self.kind.use_json_auth else None,
                         headers=headers)

src/obelisk/asynchronous/client.py

@@ -90,7 +90,7 @@ async def fetch_single_chunk(
             "limitBy": limit_by,
         }
         response = await self.http_post(
-            self._events_url, data={k: v for k, v in payload.items() if v is not None}
+            self.kind.query_url, data={k: v for k, v in payload.items() if v is not None}
         )
         if response.status_code != 200:
             self.log.warning(f"Unexpected status code: {response.status_code}")
@@ -274,7 +274,7 @@ async def send(
         }
 
         response = await self.http_post(
-            f"{self._ingest_url}/{dataset}", data=data, params=params
+            f"{self.kind.ingest_url}/{dataset}", data=data, params=params
         )
         if response.status_code != 204:
             msg = f"An error occured during data ingest. Status {response.status_code}, message: {response.text}"

src/obelisk/asynchronous/core.py

@@ -193,7 +193,7 @@ async def send(
         """
 
         response = await self.http_post(
-            f"{self._ingest_url}/{dataset}/data/ingest", data=[x.model_dump(mode='json') for x in data]
+            f"{self.kind.root_url}/{dataset}/data/ingest", data=[x.model_dump(mode='json') for x in data]
         )
         if response.status_code != 204:
             msg = f"An error occured during data ingest. Status {response.status_code}, message: {response.text}"
@@ -206,7 +206,7 @@ async def fetch_single_chunk(
             params: QueryParams
     ) -> QueryResult:
         response = await self.http_get(
-            f"{self._events_url}/{params.dataset}/data/query",
+            f"{self.kind.root_url}/{params.dataset}/data/query",
             params=params.to_dict()
         )
 

src/obelisk/types/__init__.py

@@ -63,7 +63,7 @@ def token_url(self) -> str:
             case ObeliskKind.HFS:
                 return 'https://obelisk-hfs.discover.ilabt.imec.be/auth/realms/obelisk-hfs/protocol/openid-connect/token'
             case ObeliskKind.CORE:
-                raise NotImplementedError()
+                return 'https://auth.obelisk.discover.ilabt.imec.be/realms/obelisk/protocol/openid-connect/token'
 
     @property
     def root_url(self) -> str:
@@ -73,7 +73,7 @@ def root_url(self) -> str:
             case ObeliskKind.HFS:
                 return 'https://obelisk-hfs.discover.ilabt.imec.be'
             case ObeliskKind.CORE:
-                raise NotImplementedError()
+                return 'https://obelisk.discover.ilabt.imec.be/datasets'
 
     @property
     def query_url(self) -> str: