splight-lib 5.8.0.dev0__tar.gz → 5.8.1__tar.gz

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/PKG-INFO

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

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/pyproject.toml

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

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/splight_lib/client/database/remote_client.py

@@ -212,7 +212,9 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         InvalidModelName thrown when the model name is not correct.
         """
         if resource_name.lower() not in ["file", "hubsolutionversion"]:
-            raise InvalidModel("Only files can be downloaded.")
+            raise InvalidModel(
+                "Only files and hub solution can be downloaded."
+            )
         api_path = self._get_api_path(resource_name)
         resource_id = instance.get("id")
         url = self._base_url / api_path / f"{resource_id}/download_url/"

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/splight_lib/models/alert.py

@@ -52,20 +52,22 @@ class AlertItem(BaseModel):
 
     ref_id: str = Field(max_length=5)
     type: AlertItemType = AlertItemType.QUERY
+    label: Optional[str] = None
 
-    expression: str = ""
-    expression_plain: str = ""
+    expression: Optional[str] = None
+    expression_plain: Optional[str] = ""
 
     query_filter_asset: Optional[QueryFilter] = None
     query_filter_attribute: Optional[QueryFilter] = None
+    query_filter_metadata: Optional[QueryFilter] = None
 
-    query_group_function: GroupCriteria = GroupCriteria.EMPTY
-    query_group_unit: GroupUnit = GroupUnit.EMPTY
+    query_group_function: Optional[GroupCriteria] = None
+    query_group_unit: Optional[GroupUnit] = None
 
-    query_sort_field: str = ""
-    query_sort_direction: int = Field(-1, ge=-1, le=1)
+    query_sort_field: Optional[str] = None
+    query_sort_direction: Optional[int] = Field(-1, ge=-1, le=1)
 
-    query_plain: str = ""
+    query_plain: Optional[str] = ""
     query_limit: int = Field(10000, ge=1, le=10000)
 
     @model_validator(mode="after")

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/splight_lib/models/asset.py

@@ -22,9 +22,9 @@ class AssetRelationship(BaseModel):
     id: str
     name: str
     description: Optional[str] = None
-    related_asset_kind: Optional[str] = None
+    related_asset_kind: Optional[AssetRepr] = None
     asset: AssetRepr
-    related_asset: AssetRepr
+    related_asset: Optional[AssetRepr] = None
 
 
 class AssetKind(SplightDatabaseBaseModel):

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/splight_lib/models/base.py

@@ -48,7 +48,9 @@ class SplightDatabaseBaseModel(BaseModel):
             self.model_dump(exclude_none=True, mode="json"),
             files=files_dict,
         )
-        return self.model_validate(saved)
+        instance = self.model_validate(saved)
+        for key, field in self.model_fields.items():
+            setattr(self, key, getattr(instance, key))
 
     def delete(self):
         self._db_client.delete(

{splight_lib-5.8.0.dev0 → splight_lib-5.8.1}/splight_lib/models/solution.py

@@ -61,25 +61,10 @@ def load_solution_resources(
     return resources
 
 
-# class Solution(BaseModel):
-#     id: str
-#     name: str
-#     description: str
-#     hub_solution: HubSolution
-#
-#     @classmethod
-#     def list(cls) -> list[Self]:
-#         return [solution.parse() for solution in RawSolution.list()]
-#
-#     @classmethod
-#     def retrieve(cls, solution_id: str) -> Self:
-#         return RawSolution.retrieve(solution_id).parse()
-
-
 class Solution(SplightDatabaseBaseModel):
     id: Optional[str] = None
     name: str
-    description: str
+    description: Optional[str] = None
     hub_solution: HubSolution
     raw_config: list[dict] = Field(alias="config")
     raw_resources: list[dict] = Field(alias="resources")
@@ -135,27 +120,3 @@ class Solution(SplightDatabaseBaseModel):
                 if item["name"] == key:
                     item["value"] = value
                     break
-
-    # def parse(self) -> Solution:
-    #     config = load_solution_config(self.config)
-    #     config_type = NamedTuple(
-    #         "Config", [(x["name"], Any) for x in self.config]
-    #     )
-    #     resources = load_solution_resources(self.resources)
-    #     resouces_type = NamedTuple(
-    #         "Resources", [(x["name"], Any) for x in self.resources]
-    #     )
-    #     model = create_model(
-    #         "Solution",
-    #         __base__=Solution,
-    #         config=(config_type, ...),
-    #         resources=(resouces_type, ...),
-    #     )
-    #     return model(
-    #         id=self.id,
-    #         name=self.name,
-    #         description=self.description,
-    #         hub_solution=self.hub_solution,
-    #         config=config,
-    #         resources=resources,
-    #     )