splight-lib 5.7.0__tar.gz → 5.7.2__tar.gz

{splight_lib-5.7.0 → splight_lib-5.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 5.7.0
+Version: 5.7.2
 Summary: Splight Library
 Author: Splight Dev
 Author-email: dev@splight-ae.com

{splight_lib-5.7.0 → splight_lib-5.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-lib"
-version = "5.7.0"
+version = "5.7.2"
 description = "Splight Library"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/client/database/__init__.py

@@ -1,13 +1,7 @@
 from splight_lib.client.database.builder import DatabaseClientBuilder
-from splight_lib.client.database.local_client import (
-    LOCAL_DB_FILE,
-    LocalDatabaseClient,
-)
 from splight_lib.client.database.remote_client import RemoteDatabaseClient
 
 __all__ = [
-    LocalDatabaseClient,
     DatabaseClientBuilder,
     RemoteDatabaseClient,
-    LOCAL_DB_FILE,
 ]

splight_lib-5.7.2/splight_lib/client/database/builder.py

@@ -0,0 +1,11 @@
+from typing import Any, Dict
+
+from splight_lib.client.database.abstract import AbstractDatabaseClient
+from splight_lib.client.database.remote_client import RemoteDatabaseClient
+
+
+class DatabaseClientBuilder:
+    @staticmethod
+    def build(parameters: Dict[str, Any] = {}) -> AbstractDatabaseClient:
+        db_client = RemoteDatabaseClient(**parameters)
+        return db_client

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/client/datalake/__init__.py

@@ -1,5 +1,4 @@
 from splight_lib.client.datalake.builder import DatalakeClientBuilder
-from splight_lib.client.datalake.local_client import LocalDatalakeClient
 from splight_lib.client.datalake.remote_client import (
     BufferedAsyncRemoteDatalakeClient,
     BufferedSyncRemoteDataClient,
@@ -11,5 +10,4 @@ __all__ = [
     SyncRemoteDatalakeClient,
     BufferedAsyncRemoteDatalakeClient,
     BufferedSyncRemoteDataClient,
-    LocalDatalakeClient,
 ]

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/client/datalake/builder.py

@@ -1,7 +1,6 @@
 from typing import Any, Dict
 
 from splight_lib.client.datalake.abstract import AbstractDatalakeClient
-from splight_lib.client.datalake.local_client import LocalDatalakeClient
 from splight_lib.client.datalake.remote_client import (
     BufferedAsyncRemoteDatalakeClient,
     BufferedSyncRemoteDataClient,
@@ -13,7 +12,6 @@ DL_CLIENT_TYPE_MAP = {
     DatalakeClientType.BUFFERED_ASYNC: BufferedAsyncRemoteDatalakeClient,
     DatalakeClientType.BUFFERED_SYNC: BufferedSyncRemoteDataClient,
     DatalakeClientType.SYNC: SyncRemoteDatalakeClient,
-    DatalakeClientType.LOCAL: LocalDatalakeClient,
 }
 
 

splight_lib-5.7.2/splight_lib/conftest.py

@@ -0,0 +1,10 @@
+import pytest
+
+from splight_lib.client.database.abstract import AbstractDatabaseClient
+from splight_lib.client.datalake.abstract import AbstractDatalakeClient
+
+
+@pytest.fixture(autouse=True)
+def reset_singletons():
+    AbstractDatabaseClient._instances = {}
+    AbstractDatalakeClient._instances = {}

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/models/base.py

@@ -67,9 +67,7 @@ class SplightDatabaseBaseModel(BaseModel):
     @staticmethod
     def __get_database_client() -> AbstractDatabaseClient:
         db_client = DatabaseClientBuilder.build(
-            local=settings.LOCAL_ENVIRONMENT,
             parameters={
-                "path": settings.CURRENT_DIR,
                 "base_url": settings.SPLIGHT_PLATFORM_API_HOST,
                 "access_id": settings.SPLIGHT_ACCESS_ID,
                 "secret_key": settings.SPLIGHT_SECRET_KEY,
@@ -182,7 +180,6 @@ class SplightDatalakeBaseModel(BaseModel):
         db_client = DatalakeClientBuilder.build(
             dl_client_type=settings.DL_CLIENT_TYPE,
             parameters={
-                "path": settings.CURRENT_DIR,
                 "base_url": settings.SPLIGHT_PLATFORM_API_HOST,
                 "access_id": settings.SPLIGHT_ACCESS_ID,
                 "secret_key": settings.SPLIGHT_SECRET_KEY,

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/models/hub_solution.py

@@ -1,11 +1,18 @@
+from enum import auto
 from typing import Dict, List, Optional
 
 from pydantic import Field
+from strenum import LowercaseStrEnum
 
 from splight_lib.constants import DESCRIPTION_MAX_LENGTH
 from splight_lib.models.base import FilePath, SplightDatabaseBaseModel
 
 
+class PrivacyPolicy(LowercaseStrEnum):
+    PUBLIC = auto()
+    PRIVATE = auto()
+
+
 class HubSolution(SplightDatabaseBaseModel):
     id: Optional[str] = None
     name: str
@@ -14,6 +21,7 @@ class HubSolution(SplightDatabaseBaseModel):
         default=None, max_length=DESCRIPTION_MAX_LENGTH
     )
     tags: Optional[List[str]] = Field(default=None)
+    privacy_policy: PrivacyPolicy = PrivacyPolicy.PUBLIC
 
     main_file: Optional[FilePath] = Field(default=None, exclude=True)
     variables_file: Optional[FilePath] = Field(default=None, exclude=True)

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/models/pipeline.py

@@ -14,7 +14,6 @@ def get_datalake_client() -> AbstractDatalakeClient:
     client = DatalakeClientBuilder.build(
         dl_client_type=settings.DL_CLIENT_TYPE,
         parameters={
-            "path": settings.CURRENT_DIR,
             "base_url": settings.SPLIGHT_PLATFORM_API_HOST,
             "access_id": settings.SPLIGHT_ACCESS_ID,
             "secret_key": settings.SPLIGHT_SECRET_KEY,

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/models/tests/test_component_object_instance.py

@@ -15,9 +15,7 @@ from splight_lib.models.component import (  # noqa: E402
     CustomType,
 )
 from splight_lib.models.exceptions import InvalidObjectInstance  # noqa: E402
-from splight_lib.settings import settings  # noqa: E402
 
-settings.configure(LOCAL_ENVIRONMENT=True)
 warnings.filterwarnings("ignore", category=RuntimeWarning)
 
 

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/models/tests/test_database_model.py

@@ -13,9 +13,6 @@ from splight_lib.client.database.remote_client import (  # noqa: E402
     RemoteDatabaseClient,
 )
 from splight_lib.models.base import SplightDatabaseBaseModel  # noqa: E402
-from splight_lib.settings import settings  # noqa: E402
-
-settings.configure(LOCAL_ENVIRONMENT=True)
 
 
 class Resource(SplightDatabaseBaseModel):

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/settings.py

@@ -1,9 +1,9 @@
 import os
 from enum import Enum
-from typing import Any, Dict, Optional, Tuple, Type
+from typing import Any, Dict, Tuple, Type
 
 import yaml
-from pydantic import ConfigDict, model_validator
+from pydantic import ConfigDict
 from pydantic.fields import FieldInfo
 from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
 
@@ -65,11 +65,6 @@ class SplightSettings(BaseSettings, Singleton):
     SPLIGHT_SECRET_KEY: str = ""
     SPLIGHT_PLATFORM_API_HOST: str = "https://api.splight-ai.com"
 
-    # Parameters for local environment
-    # TODO: to deprecate this and its effects
-    LOCAL_ENVIRONMENT: bool = False
-    CURRENT_DIR: Optional[str] = None
-
     # Parameters for the datalake client
     # Review if is better to use another class for only the DL Client settings
     DL_CLIENT_TYPE: DatalakeClientType = DatalakeClientType.BUFFERED_ASYNC
@@ -78,15 +73,6 @@ class SplightSettings(BaseSettings, Singleton):
 
     model_config = ConfigDict(extra="ignore")
 
-    @model_validator(mode="after")
-    @classmethod
-    def validate_local_environment(
-        cls, instance: "SplightSettings"
-    ) -> "SplightSettings":
-        if instance.LOCAL_ENVIRONMENT:
-            instance.CURRENT_DIR = os.getcwd()
-        return instance
-
     def configure(self, **params: Dict):
         self.model_validate(params)
 

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/testing/__init__.py

@@ -14,9 +14,6 @@ from splight_lib.models import (
     File,
 )
 from splight_lib.models.component import CustomType, Parameter
-from splight_lib.settings import settings
-
-settings.configure(LOCAL_ENVIRONMENT=True)
 
 FAKE_NATIVE_VALUES = {
     "int": 1,

{splight_lib-5.7.0 → splight_lib-5.7.2}/splight_lib/tests/test_api_contracts.py

@@ -13,7 +13,7 @@ from openapi_schema_validator import validate
 from polyfactory import Use
 from polyfactory.factories.pydantic_factory import ModelFactory
 
-from splight_lib.models import (  # Component,; Function,
+from splight_lib.models import (
     Asset,
     Attribute,
     Function,
@@ -145,21 +145,7 @@ def read_swagger(url: str) -> Dict[str, Any]:
     return yaml.safe_load(response.text)
 
 
-# if __name__ == "__main__":
 def test_api_contract():
-    # if len(sys.argv) == 1:
-    #     models_to_validate = list(MODEL_MAPPING.keys())
-    # elif len(sys.argv) == 2:
-    #     model_name = sys.argv[1]
-    #     if model_name not in MODEL_MAPPING:
-    #         valid_names = list(MODEL_MAPPING.keys())
-    #         raise ValueError(
-    #             f"Got invalid model name. Valid models are {valid_names}"
-    #         )
-    #     models_to_validate = [sys.argv[1]]
-    # elif len(sys.argv) > 2:
-    #     raise ValueError("Invalid number of arguments")
-
     api_url = os.getenv(
         "SPLIGHT_PLATFORM_API_HOST", "https://integrationapi.splight-ai.com"
     )

splight_lib-5.7.0/splight_lib/client/database/builder.py

@@ -1,17 +0,0 @@
-from typing import Any, Dict
-
-from splight_lib.client.database.abstract import AbstractDatabaseClient
-from splight_lib.client.database.local_client import LocalDatabaseClient
-from splight_lib.client.database.remote_client import RemoteDatabaseClient
-
-
-class DatabaseClientBuilder:
-    @staticmethod
-    def build(
-        local: bool = False, parameters: Dict[str, Any] = {}
-    ) -> AbstractDatabaseClient:
-        if local:
-            db_client = LocalDatabaseClient(**parameters)
-        else:
-            db_client = RemoteDatabaseClient(**parameters)
-        return db_client

splight_lib-5.7.0/splight_lib/client/database/local_client.py

@@ -1,187 +0,0 @@
-import json
-import os
-from functools import partial
-from tempfile import NamedTemporaryFile
-from typing import Dict, List, Union
-from uuid import uuid4
-
-from splight_lib.client.database.abstract import AbstractDatabaseClient
-from splight_lib.client.exceptions import InstanceNotFound
-from splight_lib.client.filter import value_filter_on_tuple
-from splight_lib.logging._internal import LogTags, get_splight_logger
-
-logger = get_splight_logger()
-
-LOCAL_DB_FILE = "splight-db.json"
-
-
-class LocalDatabaseClient(AbstractDatabaseClient):
-    """Database Client implementation for a local database that uses a
-    JSON file.
-    """
-
-    def __init__(self, path: str, *args, **kwargs):
-        super().__init__()
-        self._db_file = os.path.join(path, LOCAL_DB_FILE)
-
-        if not os.path.exists(self._db_file):
-            self._save_db(self._db_file, {})
-        logger.debug(
-            "Local database client initialized.", tags=LogTags.DATABASE
-        )
-
-    def save(self, resource_name: str, instance: Dict) -> Dict:
-        """Creates or updates a resource depending on the name if
-        it contains the id or not.
-
-        Parameters
-        ----------
-        resource_name: str
-            The name of the resource to be created or updated.
-        instance : Dict
-            A dictionary with resource to be created or updated
-
-        Returns
-        -------
-        Dict with the created or updated resource.
-
-        Raises
-        ------
-        InvalidModelName thrown when the model name is not correct.
-        """
-        logger.debug("Saving instance", tags=LogTags.DATABASE)
-
-        model_name = resource_name.lower()
-        if instance.get("id"):
-            saved_instance = self._update(model_name, instance)
-        else:
-            saved_instance = self._create(model_name, instance)
-        return saved_instance
-
-    def delete(self, resource_name: str, id: str):
-        """Deletes a resource from the database
-
-        Parameters
-        ----------
-        resource_name : str
-            The resource name
-        id : str
-            The resource's id.
-
-        Raises
-        ------
-        InvalidModelName thrown when the model name is not correct.
-        """
-        logger.debug("Deleting instance %s.", id, tags=LogTags.DATABASE)
-        model_name = resource_name.lower()
-        db = self._load_db_file(self._db_file)
-        db_instances = db.get(model_name, {})
-
-        if id not in db_instances:
-            raise InstanceNotFound(model_name, id)
-
-        _ = db_instances.pop(id)
-        self._save_db(self._db_file, db)
-
-    def operate(self, resource_name: str, instance: Dict) -> Dict:
-        raise NotImplementedError("Method not allowed for Local Database")
-
-    def _get(
-        self,
-        resource_name: str,
-        first: bool = False,
-        **kwargs,
-    ) -> Union[Dict, List[Dict]]:
-        """Retrieves one or multiple resources. If the parameter id is passed
-        as a kwarg, the instance with that id will be retrieved.
-
-        Parameters
-        ----------
-        resource_name : str
-            The name of the resource.
-        first: bool
-            Whether to retrieve first element or not.
-
-        Returns
-        -------
-        Union[Dict, List[Dict]] list of resource or single resource.
-        """
-        resource_id = kwargs.pop("id", None)
-        model_name = resource_name.lower()
-        if resource_id:
-            result = self._retrieve_single(model_name, resource_id)
-        else:
-            result = self._retrieve_multiple(model_name, first=first, **kwargs)
-        return result
-
-    def _retrieve_single(self, model_name: str, resource_id: str) -> Dict:
-        db = self._load_db_file(self._db_file)
-        db_instances = db.get(model_name, {})
-        if resource_id not in db_instances:
-            raise InstanceNotFound(model_name, resource_id)
-        return db_instances.get(resource_id)
-
-    def _retrieve_multiple(
-        self, model_name: str, first: bool = False, **kwargs
-    ) -> List[Dict]:
-        db = self._load_db_file(self._db_file)
-        db_instances = db.get(model_name, {})
-
-        filters = self._validate_filters(kwargs)
-        filtered = self._filter(db_instances, filters=filters)
-        instances = list(filtered.values())
-        if first:
-            return [instances[0]]
-        return instances
-
-    def download(
-        self, instances: Dict, decrtypt: bool = True, **kwargs
-    ) -> NamedTemporaryFile:
-        raise NotImplementedError("Method not implemented for Local Database")
-
-    def _create(self, resource_name: str, instance: Dict) -> Dict:
-        db = self._load_db_file(self._db_file)
-        db_instances = db.get(resource_name, {})
-        instance["id"] = str(uuid4())
-        db_instances.update({instance["id"]: instance})
-        db[resource_name] = db_instances
-        self._save_db(self._db_file, db)
-        return instance
-
-    def _update(self, resource_name: str, instance: Dict) -> Dict:
-        db = self._load_db_file(self._db_file)
-        db_instances = db.get(resource_name, {})
-
-        if instance["id"] not in db_instances:
-            raise InstanceNotFound(resource_name, instance["id"])
-        db_instances[instance["id"]] = instance
-        self._save_db(self._db_file, db)
-        return instance
-
-    def _filter(
-        self, instances: Dict[str, Dict], filters: Dict
-    ) -> Dict[str, Dict]:
-        filtered = instances
-        for key, value in filters.items():
-            filtered = filter(
-                partial(value_filter_on_tuple, key, value), filtered.items()
-            )
-            filtered = {item[0]: item[1] for item in filtered}
-        return filtered
-
-    def _load_db_file(self, file_path: str) -> Dict:
-        with open(file_path, "r") as fid:
-            data = json.load(fid)
-        return data
-
-    def _save_db(self, file_path: str, db: Dict):
-        with open(file_path, "w") as fid:
-            json.dump(db, fid, indent=2)
-
-    def _validate_filters(self, filters_raw: Dict):
-        invalid_filters = ["ignore_hook"]
-        return {
-            key: value
-            for key, value in filters_raw.items()
-            if key not in invalid_filters
-        }

splight_lib-5.7.0/splight_lib/client/datalake/local_client.py

@@ -1,119 +0,0 @@
-import json
-import os
-from datetime import datetime, timedelta, timezone
-from functools import partial
-from typing import Dict, List, Optional, Union
-
-import pandas as pd
-
-from splight_lib.client.datalake.abstract import AbstractDatalakeClient
-from splight_lib.client.file_handler import FixedLineNumberFileHandler
-from splight_lib.client.filter import value_filter
-from splight_lib.logging._internal import LogTags, get_splight_logger
-
-logger = get_splight_logger()
-
-
-class LocalDatalakeClient(AbstractDatalakeClient):
-    """Datalake client implementation for a storing locally documents
-    in different files.
-    """
-
-    _DEFAULT = "default"
-    _PREFIX = "splight-dl_"
-    _SUFFIX = ".json"
-    _TOTAL_DOCS = 10000
-
-    def __init__(self, path: str, *args, **kwargs):
-        super().__init__()
-        self._base_path = path
-        logger.info(
-            "Local datalake client initialized.", tags=LogTags.DATALAKE
-        )
-
-    def save(
-        self,
-        collection: str,
-        instances: Union[List[Dict], Dict],
-    ) -> List[Dict]:
-        instances = instances if isinstance(instances, list) else [instances]
-
-        logger.debug("Saving instances %s.", instances, tags=LogTags.DATALAKE)
-        instances = [json.dumps(instance) for instance in instances]
-
-        file_path = os.path.join(
-            self._base_path, self._get_file_name(collection)
-        )
-        handler = FixedLineNumberFileHandler(
-            file_path=file_path, total_lines=self._TOTAL_DOCS
-        )
-        handler.write(instances)
-        return instances
-
-    def _raw_get(
-        self,
-        resource_name: str,
-        collection: str,
-        limit_: int = 1000,
-        skip_: int = 0,
-        sort: Union[List, str] = ["timestamp__desc"],
-        group_id: Optional[Union[List, str]] = None,
-        group_fields: Optional[Union[List, str]] = None,
-        tzinfo: timezone = timezone(timedelta()),
-        **filters,
-    ) -> List[Dict]:
-        filters.update(
-            {
-                "output_format": resource_name,
-            }
-        )
-        filters = self._parse_filters(filters)
-
-        file_path = os.path.join(
-            self._base_path, self._get_file_name(collection)
-        )
-        handler = FixedLineNumberFileHandler(
-            file_path=file_path, total_lines=self._TOTAL_DOCS
-        )
-        documents = [
-            json.loads(doc) for doc in handler.read()[skip_ : skip_ + limit_]
-        ]
-        documents = self._filter(documents, filters=filters)
-
-        reverse = False
-        if "__desc" not in sort:
-            reverse = True
-        documents.sort(key=lambda x: x["timestamp"], reverse=reverse)
-
-        return documents
-
-    def delete(self, collection: str, **kwargs) -> None:
-        logger.debug(
-            "Skipping deleting objects when using Local datalake client."
-        )
-
-    def execute_query(
-        self,
-        from_timestamp: datetime,
-        to_timestamp: Optional[datetime],
-        query: Dict,
-    ) -> pd.DataFrame:
-        raise NotImplementedError("Method not available for the local client")
-
-    def _filter(self, instances: List[dict], filters: Dict) -> List[dict]:
-        filtered = instances
-        for key, value in filters.items():
-            filtered = filter(partial(value_filter, key, value), filtered)
-            filtered = list(filtered)
-        return filtered
-
-    def _parse_filters(self, filters: List[dict]):
-        new_filters = {}
-        for key, value in filters.items():
-            if value is None:
-                continue
-            new_filters[key] = value
-        return new_filters
-
-    def _get_file_name(self, collection: str) -> str:
-        return f"{self._PREFIX}{collection}{self._SUFFIX}"