splight-lib 4.0.0.dev4__tar.gz → 4.0.0.dev6__tar.gz

{splight-lib-4.0.0.dev4 → splight-lib-4.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 4.0.0.dev4
+Version: 4.0.0.dev6
 Summary: Library for public use. Splight
 Home-page: UNKNOWN
 Author: Splight

{splight-lib-4.0.0.dev4 → splight-lib-4.0.0.dev6}/setup.py

@@ -14,7 +14,7 @@ test_requires = [
 
 setup(
     name="splight-lib",
-    version="4.0.0.dev4",
+    version="4.0.0.dev6",
     author="Splight",
     author_email="factory@splight-ae.com",
     packages=find_packages(),

{splight-lib-4.0.0.dev4 → splight-lib-4.0.0.dev6}/splight_lib/component/abstract.py

@@ -1,16 +1,13 @@
+from abc import abstractmethod
 import os
 import sys
-import traceback
 from functools import partial
 from tempfile import NamedTemporaryFile
 from time import sleep
 from typing import Dict, List, Optional, Type
 
-from furl import furl
 from pydantic import BaseModel, create_model
-from retry import retry
 
-from splight_lib.auth import SplightAuthToken
 from splight_lib.client.communication import RemoteCommunicationClient
 from splight_lib.communication.event_handler import (
     command_event_handler,
@@ -18,7 +15,6 @@ from splight_lib.communication.event_handler import (
     setpoint_event_handler,
 )
 from splight_lib.component.exceptions import (
-    DuplicatedComponentException,
     InvalidBidingObject,
     MissingBindingCallback,
     MissingCommandCallback,
@@ -44,7 +40,6 @@ from splight_lib.models.setpoint import SetPoint
 from splight_lib.restclient import (
     ConnectError,
     HTTPError,
-    SplightRestClient,
     Timeout,
 )
 from splight_lib.settings import settings
@@ -83,16 +78,16 @@ class HealthCheckProcessor:
             if not is_alive:
                 exc = self._engine.get_last_exception()
                 self._log_exception(exc)
-                self._logger.error(
-                    "Healthcheck task failed.", tags=LogTags.RUNTIME
+                self._logger.info(
+                    "Healthcheck finished", tags=LogTags.RUNTIME
                 )
                 self._health_file.close()
-                self._logger.error(
+                self._logger.info(
                     "Healthcheck file removed: %s",
                     self._health_file,
                     tags=LogTags.RUNTIME,
                 )
-                sys.exit(1)
+                break
             sleep(self._HEALTHCHECK_INTERVAL)
 
     def stop(self):
@@ -113,8 +108,6 @@ class SplightBaseComponent:
     ):
         self._component_id = component_id
 
-        if not settings.LOCAL_ENVIRONMENT:
-            self._check_duplicated_component()
         # TODO: Change to use builder patter
         self._comm_client = RemoteCommunicationClient(
             url=settings.SPLIGHT_PLATFORM_API_HOST,
@@ -123,9 +116,9 @@ class SplightBaseComponent:
             instance_id=component_id,
         )
         self._execution_engine = ExecutionClient()
-        health_check = HealthCheckProcessor(self._execution_engine)
+        self._health_check = HealthCheckProcessor(self._execution_engine)
         self._health_check_thread = Thread(
-            target=health_check.start, args=(), daemon=False
+            target=self._health_check.start, args=(), daemon=False
         )
         # We can't add the healthcheck thread into the execution engine
         # because that thread should stop if any of the registered threads
@@ -186,6 +179,12 @@ class SplightBaseComponent:
     def execution_engine(self) -> ExecutionClient:
         return self._execution_engine
 
+    def _register_exit(self):
+        if self._execution_engine.get_last_exception():
+            sys.exit(1)
+        else:
+            sys.exit(0)
+
     def _get_custom_type_model(
         self, component_object: Dict[str, Type[ComponentObjectInstance]]
     ) -> BaseModel:
@@ -301,37 +300,20 @@ class SplightBaseComponent:
                 ),
             )
 
-    @retry(REQUEST_EXCEPTIONS, tries=3, delay=2, jitter=1)
-    def _check_duplicated_component(self):
-        """
-        Validates that there are no other connections to communication client
-        """
-        token = SplightAuthToken(
-            access_key=settings.SPLIGHT_ACCESS_ID,
-            secret_key=settings.SPLIGHT_SECRET_KEY,
-        )
-        rest_client = SplightRestClient()
-        rest_client.update_headers(token.header)
-        base_url = furl(settings.SPLIGHT_PLATFORM_API_HOST)
-        base_path = "v2/engine/component/components"
-        api_url = base_url / f"{base_path}/{self._component_id}/connections/"
-        response = rest_client.get(api_url)
-        if response.status_code == 200:
-            connections = response.json()["subscription_count"]
-            if int(connections) > 0:
-                raise DuplicatedComponentException(self._component_id)
-        else:
-            raise Exception(
-                (
-                    "Error checking if component is already running. "
-                    f"Status: {response.status_code}"
-                )
-            )
-
     def start(self):
-        raise NotImplementedError()
+        self.run_component()
+
+        # The following it for waiting for all threads to finish
+        for thread in self._execution_engine.threads:
+            thread.join()
+
+        self._health_check_thread.join()
+        self._register_exit()
 
     def stop(self):
-        self._execution_engine.stop(self._health_check_thread)
         self._execution_engine.terminate_all()
         sys.exit(1)
+
+    @abstractmethod
+    def run_component(self) -> None:
+        raise NotImplementedError()

{splight-lib-4.0.0.dev4 → splight-lib-4.0.0.dev6}/splight_lib/execution.py

@@ -294,21 +294,38 @@ class ExecutionClient(AbstractClient):
         self._register_exit_functions()
         super(ExecutionClient, self).__init__(*args, **kwargs)
         logger.info("Execution client initialized.", tags=LogTags.RUNTIME)
+        self._exc = None
+        self._thread_exc = None
 
     def _register_exit_functions(self) -> None:
         excepthook = sys.excepthook
+        thread_exchook = threading.excepthook
 
         def wrap_excepthook(type, value, traceback):
+            self._exc = (type, value, traceback)
             self.terminate_all()
             excepthook(type, value, traceback)
 
-        atexit.register(self.terminate_all)
+        def wrap_thread_excepthook(args):
+            self._thread_exc = (
+                args.exc_type,
+                args.exc_value,
+                args.exc_traceback,
+            )
+            self.terminate_all()
+            thread_exchook(args)
+
+        # atexit.register(self.terminate_all)
         sys.excepthook = wrap_excepthook
+        threading.excepthook = wrap_thread_excepthook
 
     def __del__(self) -> None:
         self.terminate_all()
 
     def terminate_all(self) -> None:
+        if hasattr(self, "_scheduler"):
+            self._scheduler.stop()
+
         for p in self.processes:
             p.terminate()
 
@@ -360,15 +377,19 @@ class ExecutionClient(AbstractClient):
         # not using the execution client explicitly and is doing some
         # processing directly in the main thread so the healtcheck should
         # say the component is healthy.
-        main_thread = threading.main_thread()
+        # main_thread = threading.main_thread()
+        # threads_status = [
+        #     p.is_alive() or p.exit_ok() for p in self.processes + self.threads
+        # ]
         threads_status = [
-            p.is_alive() or p.exit_ok() for p in self.processes + self.threads
+            p.is_alive() for p in self.processes + self.threads
         ]
-        return (
-            main_thread.is_alive() or all(threads_status)
-            if threads_status
-            else main_thread.is_alive()
-        )
+        return all(threads_status)
+        # (
+        #     main_thread.is_alive() or all(threads_status)
+        #     if threads_status
+        #     else main_thread.is_alive()
+        # )
 
     def healthcheck(self) -> Tuple[bool, ComponentStatus]:
         """Check if the component is alive and return the status.
@@ -395,7 +416,14 @@ class ExecutionClient(AbstractClient):
         It assumes that there is only one thread that crashed
         Also, only works for the thread not the processes.
         """
-        broken_thread = [x.exc for x in self.threads if x.exc]
-        if broken_thread:
-            return broken_thread[0]
+        # broken_thread = [x.exc for x in self.threads if x.exc]
+        if self._exc:
+            return self._exc[1]
+        if self._thread_exc:
+            return self._thread_exc[1]
+        # if broken_thread:
+        #     print("THREAD EXC")
+        #     print(self._thread_exc)
+        #     print()
+        #     return broken_thread[0]
         return None

{splight-lib-4.0.0.dev4 → splight-lib-4.0.0.dev6}/splight_lib/models/component.py

@@ -5,7 +5,14 @@ from datetime import datetime
 from enum import auto
 from typing import Any, ClassVar, Dict, List, Optional, Type, Union
 
-from pydantic import AnyUrl, BaseModel, Field, PrivateAttr, create_model
+from pydantic import (
+    AnyUrl,
+    BaseModel,
+    Field,
+    PrivateAttr,
+    create_model,
+    validator,
+)
 from strenum import LowercaseStrEnum, PascalCaseStrEnum
 
 from splight_lib.models.asset import Asset
@@ -67,6 +74,12 @@ class DataAddress(Parameter):
     type: str = Field("DataAddress", const=True)
     value_type: str = "Number"
 
+    @validator("type", pre=True)
+    def check_wrong_name(cls, value: str) -> str:
+        if value == "DataAdress":
+            value = "DataAddress"
+        return value
+
 
 class InputDataAddress(DataAddress):
     value: Optional[Union[List[Dict[str, str]], Dict[str, str]]]

{splight-lib-4.0.0.dev4 → splight-lib-4.0.0.dev6}/splight_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 4.0.0.dev4
+Version: 4.0.0.dev6
 Summary: Library for public use. Splight
 Home-page: UNKNOWN
 Author: Splight