splight-lib 4.6.2__tar.gz → 4.6.4__tar.gz

{splight_lib-4.6.2 → splight_lib-4.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 4.6.2
+Version: 4.6.4
 Summary: Splight Library
 Author: Splight Dev
 Author-email: dev@splight-ae.com
@@ -34,6 +34,7 @@ Requires-Dist: requests (>=2.26.0)
 Requires-Dist: retry (==0.9.2)
 Requires-Dist: simplejson (==3.17.6)
 Requires-Dist: strenum (==0.4.9)
+Requires-Dist: typer (==0.9.0)
 Requires-Dist: typing-extensions (>=4.6.1,<5.0.0)
 Description-Content-Type: text/markdown
 

{splight_lib-4.6.2 → splight_lib-4.6.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-lib"
-version = "4.6.2"
+version = "4.6.4"
 description = "Splight Library"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"
@@ -32,6 +32,7 @@ typing-extensions = "^4.6.1"
 pydantic-settings = "2.0.3"
 email-validator = "^2.1.0.post1"
 apscheduler = "3.10.4"
+typer = "0.9.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "23.3.0"

{splight_lib-4.6.2 → splight_lib-4.6.4}/splight_lib/component/abstract.py

@@ -8,6 +8,7 @@ from time import sleep
 from typing import Callable, Dict, Optional, Type
 
 from pydantic import BaseModel
+from pydantic_core import ValidationError
 
 from splight_lib.component.spec import Spec
 from splight_lib.execution.engine import EngineStatus, ExecutionEngine
@@ -80,6 +81,26 @@ class SplightBaseComponent(ABC):
             daemon=False,
         )
 
+        self._spec = None
+        self._input = None
+        self._output = None
+        self._custom_types = None
+        self._routines = None
+        try:
+            self._setup_component(component_id)
+        except ValidationError as exc:
+            logger.debug(
+                "There was an error validating the component configuration"
+            )
+            logger.exception(exc, tags=LogTags.COMPONENT)
+            self.stop()
+        except Exception as exc:
+            logger.exception(exc, tags=LogTags.COMPONENT)
+            self.stop()
+
+        self.start = self._wrap_start(self.start)
+
+    def _setup_component(self, component_id: str):
         self._spec = self._load_spec()
         self._input = self._spec.component_input(component_id)
         self._output = self._spec.get_output_models(component_id)
@@ -99,8 +120,6 @@ class SplightBaseComponent(ABC):
         self._custom_types = self._get_custom_type_model(component_objects)
         self._routines = self._get_routine_model(routine_objects)
 
-        self.start = self._wrap_start(self.start)
-
     @property
     def input(self) -> BaseModel:
         return self._input

{splight_lib-4.6.2 → splight_lib-4.6.4}/splight_lib/execution/engine.py

@@ -1,4 +1,4 @@
-from enum import Enum, auto
+from enum import auto
 from typing import Set, Tuple
 
 import pytz
@@ -25,16 +25,21 @@ class ExecutionEngine:
         self._logger.info(
             "Execution client initialized.", tags=LogTags.RUNTIME
         )
-        self._blocking_sch = BlockingScheduler(timezone=pytz.UTC)
+        self._blocking_sch = BlockingScheduler(
+            job_defaults={"misfire_grace_time": None},
+            timezone=pytz.UTC,
+        )
         self._background_sch = BackgroundScheduler(
-            timezone=pytz.UTC, daemon=True
+            job_defaults={"misfire_grace_time": None},
+            timezone=pytz.UTC,
+            daemon=True,
         )
         self._critical_jobs: Set[str] = set()
         self._blocking_sch.add_listener(
-            self._task_fail_callbak, EVENT_JOB_ERROR
+            self._task_fail_callback, EVENT_JOB_ERROR
         )
         self._background_sch.add_listener(
-            self._task_fail_callbak, EVENT_JOB_ERROR
+            self._task_fail_callback, EVENT_JOB_ERROR
         )
         self._running = True
         self._state = EngineStatus.INITIALIZED
@@ -75,6 +80,7 @@ class ExecutionEngine:
         task: BaseTask,
         in_background: bool = True,
         exit_on_fail: bool = False,
+        max_instances: int = 1,
     ):
         """Adds new task to the corresponding scheduler.
 
@@ -88,16 +94,23 @@ class ExecutionEngine:
         exit_on_fail: bool
             Used to stop the engine if the task execution failed. This
             parameter is usefull to declare critical tasks.
+        max_instances: int = 1
+            Maximum number of concurrently running instances allowed for this
+            job
         """
         if in_background:
-            job = self._background_sch.add_job(**task.as_job())
+            job = self._background_sch.add_job(
+                **task.as_job(), max_instances=max_instances
+            )
         else:
-            job = self._blocking_sch.add_job(**task.as_job())
+            job = self._blocking_sch.add_job(
+                **task.as_job(), max_instances=max_instances
+            )
         if exit_on_fail:
             self._critical_jobs.add(job.id)
         self._logger.info(f"Job {job.id} added", tags=LogTags.RUNTIME)
 
-    def _task_fail_callbak(self, event: JobExecutionEvent):
+    def _task_fail_callback(self, event: JobExecutionEvent):
         if event.job_id in self._critical_jobs:
             self._logger.error(
                 "An error ocurred in job execution. Stopping engine"

{splight_lib-4.6.2 → splight_lib-4.6.4}/splight_lib/models/file.py

@@ -13,7 +13,8 @@ from splight_lib.models.base import SplightDatabaseBaseModel
 class File(SplightDatabaseBaseModel):
     id: Optional[str] = None
     assets: List[Asset] = []
-    file: str
+    file: Optional[str] = None
+    name: Optional[str] = None
     description: Optional[str] = Field(
         default=None, max_length=DESCRIPTION_MAX_LENGTH
     )
@@ -24,28 +25,24 @@ class File(SplightDatabaseBaseModel):
 
     @model_validator(mode="after")
     def validate_file(self):
-        self.file = self.file.replace("/", os.sep)
-        self.file = self.file.replace("\\", os.sep)
-
-        # Compute the checksum if missing
-        if self.checksum is None:
-            hasher = hashlib.md5()
-            with open(self.file, "rb") as file:
-                # Read in chunks of 8KiB for large files
-                while chunk := file.read(8192):
-                    hasher.update(chunk)
-            self.checksum = hasher.hexdigest()
+        if self.file:
+            self.file = self.file.replace("/", os.sep)
+            self.file = self.file.replace("\\", os.sep)
 
+            # Compute the checksum if missing
+            if self.checksum is None:
+                hasher = hashlib.md5()
+                with open(self.file, "rb") as file:
+                    # Read in chunks of 8KiB for large files
+                    while chunk := file.read(8192):
+                        hasher.update(chunk)
+                self.checksum = hasher.hexdigest()
         return self
 
     @field_validator("metadata", mode="before")
     def validate_metadata(cls, v):
         return json.loads(v) if isinstance(v, str) else v
 
-    @property
-    def name(self):
-        return self.file.split(os.sep)[-1]
-
     def download(self):
         file = self._db_client.download(
             resource_name=self.__class__.__name__,
@@ -55,12 +52,25 @@ class File(SplightDatabaseBaseModel):
 
     def model_dump(self, *args, **kwargs):
         res = super().model_dump(*args, **kwargs)
-        res["metadata"] = json.dumps(self.metadata)
+        if self.metadata:
+            res["metadata"] = json.dumps(self.metadata)
         return res
 
     def model_dump_json(self, *args, **kwargs):
-        prev_metadata = self.metadata
-        self.metadata = json.dumps(self.metadata)
         res = super().model_dump_json(*args, **kwargs)
-        self.metadata = prev_metadata
+        if self.metadata:
+            prev_metadata = self.metadata
+            self.metadata = json.dumps(self.metadata)
+            self.metadata = prev_metadata
         return res
+
+    def save(self):
+        saved = self._db_client.save(
+            self.__class__.__name__, self.model_dump(exclude_none=True)
+        )
+        if not self.id:
+            self.id = saved["id"]
+        self.name = saved["name"]
+        self.content_type = saved["content_type"]
+        self.checksum = saved["checksum"]
+        self.url = saved["url"]