splight-lib 2.3.22__tar.gz → 2.3.24__tar.gz

{splight-lib-2.3.22/splight_lib.egg-info → splight-lib-2.3.24}/PKG-INFO

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

{splight-lib-2.3.22 → splight-lib-2.3.24}/setup.py

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

{splight-lib-2.3.22 → splight-lib-2.3.24}/splight_lib/client/database/remote_client.py

@@ -56,6 +56,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         ------
         InvalidModel thrown when the model name is not correct.
         """
+
         logger.debug("Saving instance %s.", instance.id, tags=LogTags.DATABASE)
 
         constructor = type(instance)
@@ -205,6 +206,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
     def _create(self, path: str, instance: BaseModel) -> Dict:
         url = self._base_url / f"{path}/"
         data = json.loads(instance.json(exclude_none=True))
+
         if isinstance(instance, File):
             with open(instance.file, "rb") as f:
                 file = {"file": f}

{splight-lib-2.3.22 → splight-lib-2.3.24}/splight_lib/component/abstract.py

@@ -584,7 +584,7 @@ class ParametersMixin:
         return ids
 
     def _fetch_objects(self, ids_to_fetch: Dict) -> Dict[str, BaseModel]:
-        res: Dict = {None: None}
+        res: Dict = {None: None, "": None}
         for type, ids_ in ids_to_fetch["database"].items():
             objs = self.database_client.get(DATABASE_TYPES[type], id__in=ids_)
             res.update({obj.id: obj for obj in objs})

{splight-lib-2.3.22 → splight-lib-2.3.24}/splight_lib/logging/_internal.py

@@ -4,15 +4,17 @@ from logging import INFO, Formatter, Handler
 from typing import Optional
 
 from concurrent_log_handler import ConcurrentRotatingFileHandler
+from splight_lib.logging.constants import LOGGING_DEV
 from splight_lib.logging.logging import (
+    ElasticDocumentFormatter,
     SplightFormatter,
     SplightLogger,
+    elastic_document_handler,
     standard_output_handler,
 )
 from strenum import UppercaseStrEnum
 
 
-
 # TODO: add more tags
 class LogTags(UppercaseStrEnum):
     RUNTIME = auto()
@@ -53,9 +55,13 @@ def get_splight_logger(name: Optional[str] = None):
         name = "splight-dev"
     logger = SplightLogger(name=name)
     logger.propagate = False
-    handler = standard_output_handler(log_level=logger.level)
-    logger.addHandler(handler)
-
+    stdout_handler = standard_output_handler(log_level=logger.level)
+    logger.addHandler(stdout_handler)
+    es_handler = elastic_document_handler(
+        formatter=ElasticDocumentFormatter(type=LOGGING_DEV),
+        log_level=logger.level,
+    )
+    logger.addHandler(es_handler)
     # Add logger.level to root logger
     logger.setLevel(logger.level)
     return logger

{splight-lib-2.3.22 → splight-lib-2.3.24}/splight_lib/logging/component.py

@@ -3,9 +3,12 @@ from logging import INFO, Formatter, Handler, basicConfig
 from typing import Optional
 
 from concurrent_log_handler import ConcurrentRotatingFileHandler
+from splight_lib.logging.constants import LOGGING_COMPONENTS
 from splight_lib.logging.logging import (
+    ElasticDocumentFormatter,
     SplightFormatter,
     SplightLogger,
+    elastic_document_handler,
     standard_output_handler,
 )
 
@@ -36,6 +39,11 @@ def get_component_logger(name: Optional[str] = None):
     logger.addHandler(stdout_handler)
     file_handler = component_file_handler(log_level=logger.level)
     logger.addHandler(file_handler)
+    es_handler = elastic_document_handler(
+        formatter=ElasticDocumentFormatter(type=LOGGING_COMPONENTS),
+        log_level=logger.level,
+    )
+    logger.addHandler(es_handler)
 
     # Add logger.level to root logger
     logger.setLevel(logger.level)

splight-lib-2.3.24/splight_lib/logging/constants.py

@@ -0,0 +1,5 @@
+from typing import Literal, get_args
+
+LogType = Literal["dev", "components"]
+
+LOGGING_DEV, LOGGING_COMPONENTS = get_args(LogType)

{splight-lib-2.3.22 → splight-lib-2.3.24}/splight_lib/logging/logging.py

@@ -1,3 +1,4 @@
+import json
 import os
 import sys
 import time
@@ -14,7 +15,11 @@ from logging import (
     StreamHandler,
 )
 from logging import root as rootLogger
-from typing import Dict, Optional
+from typing import Dict, Literal, Optional
+
+from concurrent_log_handler import ConcurrentRotatingFileHandler
+from pydantic import BaseSettings
+from splight_lib.logging.constants import LOGGING_DEV, LogType
 
 TAGS_KEY = "tags"
 
@@ -36,6 +41,21 @@ class SplightFormatter(Formatter):
         return formatter.format(record)
 
 
+class ElasticDocumentFormatter(Formatter):
+    def __init__(self, fmt: str = None, type: LogType = LOGGING_DEV) -> None:
+        super().__init__(fmt=fmt)
+        self.type = type
+
+    @property
+    def _extra_fields(self) -> Dict:
+        return {
+            "type": self.type,
+        }
+
+    def format(self, record):
+        return json.dumps({**record.__dict__, **self._extra_fields})
+
+
 class SplightLogger(Logger):
     def __init__(self, name: str = None) -> None:
         # this is to avoid adding handlers to root logger
@@ -145,3 +165,30 @@ def standard_output_handler(
     handler.setFormatter(formatter)
     handler.setLevel(log_level)
     return handler
+
+
+class ElasticDocumentHandlerSettings(BaseSettings):
+    splight_elastic_logs_filename: str = "/tmp/splight_elastic_logs.log"
+    splight_elastic_logs_max_bytes: int = 5e6
+    splight_elastic_logs_backup_count: int = 5
+
+    @property
+    def file_handler_settings(self) -> Dict:
+        return {
+            "filename": self.splight_elastic_logs_filename,
+            "maxBytes": self.splight_elastic_logs_max_bytes,
+            "backupCount": self.splight_elastic_logs_backup_count,
+            "encoding": "utf-8",
+        }
+
+
+def elastic_document_handler(
+    formatter: Optional[Formatter] = SplightFormatter(),
+    log_level: Optional[str] = INFO,
+) -> Handler:
+    settings = ElasticDocumentHandlerSettings()
+    handler = ConcurrentRotatingFileHandler(**settings.file_handler_settings)
+
+    handler.setFormatter(formatter)
+    handler.setLevel(log_level)
+    return handler

{splight-lib-2.3.22 → splight-lib-2.3.24/splight_lib.egg-info}/PKG-INFO

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

{splight-lib-2.3.22 → splight-lib-2.3.24}/splight_lib.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ splight_lib/component/abstract.py
 splight_lib/logging/__init__.py
 splight_lib/logging/_internal.py
 splight_lib/logging/component.py
+splight_lib/logging/constants.py
 splight_lib/logging/logging.py
 splight_lib/restclient/__init__.py
 splight_lib/restclient/client.py