splight-lib 5.19.3.dev0__tar.gz → 5.19.4__tar.gz

{splight_lib-5.19.3.dev0 → splight_lib-5.19.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: splight-lib
-Version: 5.19.3.dev0
+Version: 5.19.4
 Summary: Splight Library
 Author: Splight Dev
 Author-email: dev@splight-ae.com

{splight_lib-5.19.3.dev0 → splight_lib-5.19.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "splight-lib"
-version = "5.19.3.dev0"
+version = "5.19.4"
 description = "Splight Library"
 authors = [
     {name = "Splight Dev",email = "dev@splight-ae.com"}

splight_lib-5.19.4/splight_lib/client/datalake/classmap.py

@@ -0,0 +1 @@
+COLLECTION_PREFIXS_MAP = {"routineEvaluations": "telemetry"}

{splight_lib-5.19.3.dev0 → splight_lib-5.19.4}/splight_lib/client/datalake/remote_client.py

@@ -11,6 +11,7 @@ from splight_lib.client.datalake.abstract import (
     Records,
 )
 from splight_lib.client.datalake.buffer import DatalakeDocumentBuffer
+from splight_lib.client.datalake.classmap import COLLECTION_PREFIXS_MAP
 from splight_lib.client.datalake.exceptions import DatalakeRequestError
 from splight_lib.client.exceptions import SPLIGHT_REQUEST_EXCEPTIONS
 from splight_lib.logging._internal import LogTags, get_splight_logger
@@ -38,9 +39,8 @@ class SyncRemoteDatalakeClient(AbstractDatalakeClient):
             access_key=access_id,
             secret_key=secret_key,
         )
-        # TODO: In the future we should use the API_VERSION parameter
-        # self._prefix = f"{api_version}/data"
-        self._prefix = "v3/data"
+        self._api_version = "v3"
+        self._default_path = "data"
 
         self._restclient = SplightRestClient(
             transport=HTTPTransport(retries=3)
@@ -52,7 +52,8 @@ class SyncRemoteDatalakeClient(AbstractDatalakeClient):
 
     @retry(EXCEPTIONS, tries=3, delay=2, jitter=1)
     def save(self, records: Records) -> list[dict]:
-        url = self._base_url / f"{self._prefix}/write/"
+        prefix = self._get_prefix(records["collection"])
+        url = self._base_url / f"{prefix}/write/"
         response = self._restclient.post(url, json=records)
         if response.is_error:
             raise DatalakeRequestError(response.status_code, response.text)
@@ -64,7 +65,8 @@ class SyncRemoteDatalakeClient(AbstractDatalakeClient):
         records: Records,
     ) -> list[dict]:
         # POST /data/write
-        url = self._base_url / f"{self._prefix}/write/"
+        prefix = self._get_prefix(records["collection"])
+        url = self._base_url / f"{prefix}/write/"
         response = await self._restclient.async_post(url, json=records)
         if response.is_error:
             raise DatalakeRequestError(response.status_code, response.text)
@@ -72,7 +74,9 @@ class SyncRemoteDatalakeClient(AbstractDatalakeClient):
 
     @retry(EXCEPTIONS, tries=3, delay=2, jitter=1)
     def _get(self, request: dict) -> list[dict]:
-        url = self._base_url / f"{self._prefix}/read/"
+        url = (
+            self._base_url / f"{self._api_version}/{self._default_path}/read/"
+        )
         response = self._restclient.post(url, json=request)
         if response.is_error:
             raise DatalakeRequestError(response.status_code, response.text)
@@ -80,12 +84,17 @@ class SyncRemoteDatalakeClient(AbstractDatalakeClient):
 
     @retry(EXCEPTIONS, tries=3, delay=2, jitter=1)
     async def _async_get(self, request: dict) -> list[dict]:
-        url = self._base_url / f"{self._prefix}/read/"
+        url = (
+            self._base_url / f"{self._api_version}/{self._default_path}/read/"
+        )
         response = await self._restclient.async_post(url, json=request)
         if response.is_error:
             raise DatalakeRequestError(response.status_code, response.text)
         return response.json()
 
+    def _get_prefix(self, collection: str) -> str:
+        return f"{self._api_version}/{COLLECTION_PREFIXS_MAP.get(collection, self._default_path)}"
+
 
 class BufferedAsyncRemoteDatalakeClient(SyncRemoteDatalakeClient):
     def __init__(
@@ -123,7 +132,7 @@ class BufferedAsyncRemoteDatalakeClient(SyncRemoteDatalakeClient):
         )
         self._data_buffers = {
             "default": DatalakeDocumentBuffer(buffer_size, buffer_timeout),
-            "routine_evaluations": DatalakeDocumentBuffer(
+            "routineEvaluations": DatalakeDocumentBuffer(
                 buffer_size, buffer_timeout
             ),
         }
@@ -174,7 +183,9 @@ class BufferedAsyncRemoteDatalakeClient(SyncRemoteDatalakeClient):
 
     @retry(EXCEPTIONS, tries=3, delay=2, jitter=1)
     def _send_documents(self, collection: str, docs: list[dict]) -> list[dict]:
-        url = self._base_url / f"{self._prefix}/write/"
+        prefix = self._get_prefix(collection)
+
+        url = self._base_url / f"{prefix}/write/"
         data = {
             "collection": collection,
             "records": docs,
@@ -250,7 +261,8 @@ class BufferedSyncRemoteDataClient(SyncRemoteDatalakeClient):
 
     @retry(EXCEPTIONS, tries=3, delay=2, jitter=1)
     def _send_documents(self, collection: str, docs: list[dict]) -> list[dict]:
-        url = self._base_url / f"{self._prefix}/write/"
+        prefix = self._get_prefix(collection)
+        url = self._base_url / f"{prefix}/write/"
         data = {
             "collection": collection,
             "records": docs,

{splight_lib-5.19.3.dev0 → splight_lib-5.19.4}/splight_lib/models/_v3/component.py

@@ -156,7 +156,7 @@ class ComponentObject(SplightObject):
 
 
 class RoutineEvaluation(SplightDatalakeBaseModel):
-    _collection_name = "routine_evaluations"
+    _collection_name = "routineEvaluations"
 
     routine: str
     status: RoutineStatus

{splight_lib-5.19.3.dev0 → splight_lib-5.19.4}/splight_lib/models/_v4/component.py

@@ -152,7 +152,7 @@ class ComponentObject(SplightObject):
 
 
 class RoutineEvaluation(SplightDatalakeBaseModel):
-    _collection_name = "routine_evaluations"
+    _collection_name = "routineEvaluations"
 
     routine: str
     status: RoutineStatus