splight-lib 4.5.2__tar.gz → 4.5.4__tar.gz

{splight_lib-4.5.2 → splight_lib-4.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 4.5.2
+Version: 4.5.4
 Summary: Splight Library
 Author: Splight Dev
 Author-email: dev@splight-ae.com
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: apscheduler (==3.10.4)
 Requires-Dist: concurrent-log-handler (==0.9.21)
-Requires-Dist: cryptography (==35.0.0)
+Requires-Dist: cryptography (==41.0.7)
 Requires-Dist: email-validator (>=2.1.0.post1,<3.0.0)
 Requires-Dist: furl (==2.1.3)
 Requires-Dist: geojson-pydantic (==1.0.1)
@@ -24,7 +24,7 @@ Requires-Dist: pandas (==1.4.0)
 Requires-Dist: parameterized (==0.8.1)
 Requires-Dist: pathspec (==0.11.1)
 Requires-Dist: protobuf (==4.21.6)
-Requires-Dist: py7zr (==0.18.5)
+Requires-Dist: py7zr (==0.20.8)
 Requires-Dist: pydantic (==2.4.2)
 Requires-Dist: pydantic-settings (==2.0.3)
 Requires-Dist: pysher (==1.0.8)

{splight_lib-4.5.2 → splight_lib-4.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-lib"
-version = "4.5.2"
+version = "4.5.4"
 description = "Splight Library"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"
@@ -8,7 +8,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4"
 concurrent-log-handler = "0.9.21"
-cryptography = "35.0.0"
+cryptography = "41.0.7"
 furl = "2.1.3"
 geojson-pydantic = "1.0.1"
 hexbytes = "0.2.2"
@@ -19,7 +19,7 @@ pandas = "1.4.0"
 parameterized = "0.8.1"
 pathspec = "0.11.1"
 protobuf = "4.21.6"
-py7zr = "0.18.5"
+py7zr = "0.20.8"
 pydantic = "2.4.2"
 pysher = "1.0.8"
 pytz = "2021.3"

{splight_lib-4.5.2 → splight_lib-4.5.4}/splight_lib/client/tests/test_database.py

@@ -1,3 +1,4 @@
+import os
 from unittest.mock import patch  # noqa E402
 
 import pytest  # noqa E402
@@ -10,8 +11,8 @@ from splight_lib.client.database.remote_client import (  # noqa E402
 from splight_lib.client.exceptions import InvalidModelName  # noqa E402
 
 base_url = "http://test.com"
-access_id = "access_id"
-secret_key = "secret_key"
+os.environ["ACCESS_ID"] = "access_id"
+os.environ["SECRET_KEY"] = "secret_key"
 
 
 class MockResponse:
@@ -30,6 +31,9 @@ class MockResponse:
 @patch("splight_lib.client.database.remote_client.SplightAuthToken")
 @patch("splight_lib.client.database.remote_client.SplightRestClient")
 def test_initialization(mock_rest_client, mock_auth_token):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatabaseClient(
         base_url=base_url,
         access_id=access_id,
@@ -49,6 +53,9 @@ def test_initialization(mock_rest_client, mock_auth_token):
     return_value=MockResponse({"name": "instance_name", "id": "some_id"}),
 )
 def test_save_without_id(mock_post):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatabaseClient(
         base_url=base_url,
         access_id=access_id,
@@ -70,6 +77,9 @@ def test_save_without_id(mock_post):
     return_value=MockResponse({"name": "instance_name", "id": "instance_id"}),
 )
 def test_save_with_id(mock_put):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatabaseClient(
         base_url=base_url,
         access_id=access_id,
@@ -88,6 +98,9 @@ def test_save_with_id(mock_put):
 
 @patch.object(SplightRestClient, "delete")
 def test_delete(mock_delete):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatabaseClient(
         base_url=base_url,
         access_id=access_id,
@@ -98,6 +111,9 @@ def test_delete(mock_delete):
 
 
 def test_delete_invalid_model_name():
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatabaseClient(
         base_url=base_url,
         access_id=access_id,
@@ -110,6 +126,9 @@ def test_delete_invalid_model_name():
 
 @patch.object(SplightRestClient, "get")
 def test_get_with_id(mock_get):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     mock_instance_id = "123"
     mock_get.return_value = MockResponse(
         {"name": "instance_name", "id": mock_instance_id}
@@ -127,6 +146,9 @@ def test_get_with_id(mock_get):
 
 @patch.object(SplightRestClient, "get")
 def test_get_without_id(mock_get):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     mock_get.return_value = MockResponse(
         {
             "results": [{"name": "instance_name", "id": "instance_id"}],
@@ -146,6 +168,9 @@ def test_get_without_id(mock_get):
 
 @patch.object(SplightRestClient, "get")
 def test_get_without_id_and_set_first(mock_get):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     mock_get.return_value = MockResponse(
         {
             "results": [{"name": "instance_name", "id": "instance_id"}],

{splight_lib-4.5.2 → splight_lib-4.5.4}/splight_lib/client/tests/test_datalake.py

@@ -9,8 +9,8 @@ from splight_lib.client.datalake.remote_client import (  # noqa E402
 )
 
 base_url = "http://test.com"
-access_id = "access_id"
-secret_key = "secret_key"
+os.environ["ACCESS_ID"] = "access_id"
+os.environ["SECRET_KEY"] = "secret_key"
 
 
 class MockResponse:
@@ -29,6 +29,9 @@ class MockResponse:
 @patch("splight_lib.client.datalake.remote_client.SplightAuthToken")
 @patch("splight_lib.client.datalake.remote_client.SplightRestClient")
 def test_initialization(mock_rest_client, mock_auth_token):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(
         base_url=base_url,
         access_id=access_id,
@@ -45,6 +48,9 @@ def test_initialization(mock_rest_client, mock_auth_token):
     SplightRestClient, "post", return_value=MockResponse(({"key": "value"}))
 )
 def test_save(mock_post):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(
         base_url=base_url,
         access_id=access_id,
@@ -63,6 +69,9 @@ def test_save(mock_post):
     return_value=MockResponse({"results": [{"key": "value"}]}),
 )
 def test_raw_get(mock_get):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(base_url, access_id, secret_key)
     collection = "collection_name"
     result = client._raw_get("resource", collection)
@@ -72,6 +81,9 @@ def test_raw_get(mock_get):
 
 @patch.object(SplightRestClient, "delete", return_value=MockResponse(None))
 def test_delete(mock_delete):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(base_url, access_id, secret_key)
     collection = "collection_name"
     client.delete(collection)
@@ -80,6 +92,9 @@ def test_delete(mock_delete):
 
 @patch.object(SplightRestClient, "post", return_value=MockResponse(None))
 def test_save_dataframe(mock_post):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(base_url, access_id, secret_key)
     collection = "collection_name"
     dataframe = pd.DataFrame({"A": [1, 2], "B": [3, 4]})
@@ -89,6 +104,9 @@ def test_save_dataframe(mock_post):
 
 @patch.object(SplightRestClient, "post", return_value=MockResponse(None))
 def test_create_index(mock_post):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(base_url, access_id, secret_key)
     collection = "collection_name"
     indexes = [{"key": 1}]
@@ -100,6 +118,9 @@ def test_create_index(mock_post):
     SplightRestClient, "post", return_value=MockResponse([{"key": "value"}])
 )
 def test_raw_aggregate(mock_post):
+    secret_key = os.getenv("SECRET_KEY")
+    access_id = os.getenv("ACCESS_ID")
+
     client = RemoteDatalakeClient(base_url, access_id, secret_key)
     collection = "collection_name"
     pipeline = [{"$match": {"key": "value"}}]

{splight_lib-4.5.2 → splight_lib-4.5.4}/splight_lib/models/component.py

@@ -12,6 +12,7 @@ from pydantic import (
     PrivateAttr,
     create_model,
     field_validator,
+    model_validator,
 )
 from strenum import LowercaseStrEnum, PascalCaseStrEnum
 
@@ -96,6 +97,16 @@ class DataAddress(Parameter):
 class InputDataAddress(DataAddress):
     value: Optional[Union[List[DLDataAddress], DLDataAddress]] = None
 
+    # NOTE: this is a patch.
+    # API returns [] as default for InputDataAddress with multiple set
+    # to true.
+    @model_validator(mode="after")
+    def validate_file(self):
+        if self.multiple and self.value is None:
+            self.value = []
+
+        return self
+
 
 class OutputParameter(BaseModel):
     name: str