digitalkin 0.2.21__py3-none-any.whl → 0.2.23__py3-none-any.whl

digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "0.2.21"
+    __version__ = "0.2.23"

digitalkin/grpc_servers/module_server.py

@@ -79,10 +79,10 @@ class ModuleServer(BaseServer):
 
     def start(self) -> None:
         """Start the module server and register with the registry if configured."""
-        logger.info(self.server_config)
+        logger.info("Starting module server",extra={"server_config": self.server_config})
         super().start()
 
-        logger.info(self.server_config)
+        logger.debug("Starting module server",extra={"server_config": self.server_config})
         # If a registry address is provided, register the module
         if self.server_config.registry_address:
             try:
@@ -91,17 +91,15 @@ class ModuleServer(BaseServer):
                 logger.exception("Failed to register with registry")
 
         if self.module_servicer is not None:
-            logger.info(
-                "Setup post init started with config: %s", self.client_config
+            logger.debug(
+                "Setup post init started",extra={"client_config": self.client_config}
             )
             self.module_servicer.setup.__post_init__(self.client_config)
 
     async def start_async(self) -> None:
         """Start the module server and register with the registry if configured."""
-        logger.info(self.server_config)
+        logger.info("Starting module server",extra={"server_config": self.server_config})
         await super().start_async()
-
-        logger.info(self.server_config)
         # If a registry address is provided, register the module
         if self.server_config.registry_address:
             try:
@@ -111,7 +109,7 @@ class ModuleServer(BaseServer):
 
         if self.module_servicer is not None:
             logger.info(
-                "Setup post init started with config: %s", self.client_config
+                "Setup post init started",extra={"client_config": self.client_config}
             )
             await self.module_servicer.job_manager._start()
             self.module_servicer.setup.__post_init__(self.client_config)

digitalkin/grpc_servers/module_servicer.py

@@ -99,9 +99,14 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
         Raises:
             ServicerError: if the setup data is not returned or job creation fails.
         """
-        logger.info("ConfigSetupVersion called for module: '%s'", self.module_class.__name__)
         logger.info(
-            "Context : %s, setup_version: %s, mission_id: %s", context, request.setup_version, request.mission_id
+            "ConfigSetupVersion called for module: '%s'",
+            self.module_class.__name__,
+            extra={
+                "module_class": self.module_class,
+                "setup_version": request.setup_version,
+                "mission_id": request.mission_id,
+            },
         )
         # Process the module input
         # TODO: Secret should be used here as well
@@ -134,7 +139,8 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
             return lifecycle_pb2.ConfigSetupModuleResponse(success=False)
 
         updated_setup_data = await self.job_manager.generate_config_setup_module_response(job_id)
-        logger.warning(f"Updated setup data: {updated_setup_data=}")
+        logger.info("Setup updated")
+        logger.debug(f"Updated setup data: {updated_setup_data=}")
         setup_version.content = json_format.ParseDict(
             updated_setup_data,
             struct_pb2.Struct(),
@@ -159,8 +165,11 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
         Raises:
             ServicerError: the necessary query didn't work.
         """
-        logger.info("StartModule called for module: '%s'", self.module_class.__name__)
-        logger.info("Context : %s, setup_id: %s, mission_id: %s", context, request.setup_id, request.mission_id)
+        logger.info(
+            "StartModule called for module: '%s'",
+            self.module_class.__name__,
+            extra={"module_class": self.module_class, "setup_id": request.setup_id, "mission_id": request.mission_id},
+        )
         # Process the module input
         # TODO: Check failure of input data format
         input_data = self.module_class.create_input_model(dict(request.input.items()))

digitalkin/grpc_servers/utils/grpc_client_wrapper.py

@@ -43,9 +43,9 @@ class GrpcClientWrapper:
                 private_key=private_key,
             )
 
-            return grpc.secure_channel(config.address, channel_credentials)
+            return grpc.secure_channel(config.address, channel_credentials, options=config.channel_options)
         # Insecure channel
-        return grpc.insecure_channel(config.address)
+        return grpc.insecure_channel(config.address, options=config.channel_options)
 
     def exec_grpc_query(self, query_endpoint: str, request: Any) -> Any:  # noqa: ANN401
         """Execute a gRPC query with from the query's rpc endpoint name.
@@ -65,8 +65,8 @@ class GrpcClientWrapper:
             logger.debug("send request to %s", query_endpoint)
             response = getattr(self.stub, query_endpoint)(request)
             logger.debug("receive response from request to registry: %s", response)
-        except grpc.RpcError:
-            logger.exception("RPC error during registration:")
+        except grpc.RpcError as e:
+            logger.exception("RPC error during %s: %s", query_endpoint, e.details())
             raise ServerError
         else:
             return response

digitalkin/grpc_servers/utils/models.py

@@ -169,9 +169,17 @@ class ClientConfig(ChannelConfig):
         mode: Client operation mode (sync/async)
         security: Security mode (secure/insecure)
         credentials: Client credentials for secure mode
+        channel_options: Additional channel options
     """
 
     credentials: ClientCredentials | None = Field(None, description="Client credentials for secure mode")
+    channel_options: list[tuple[str, Any]] = Field(
+        default_factory=lambda: [
+            ("grpc.max_receive_message_length", 50 * 1024 * 1024),  # 50MB
+            ("grpc.max_send_message_length", 50 * 1024 * 1024),  # 50MB
+        ],
+        description="Additional channel options",
+    )
 
     @field_validator("credentials")
     @classmethod
@@ -213,7 +221,13 @@ class ServerConfig(ChannelConfig):
 
     max_workers: int = Field(10, description="Maximum number of workers for sync mode")
     credentials: ServerCredentials | None = Field(None, description="Server credentials for secure mode")
-    server_options: list[tuple[str, Any]] = Field(default_factory=list, description="Additional server options")
+    server_options: list[tuple[str, Any]] = Field(
+        default_factory=lambda: [
+            ("grpc.max_receive_message_length", 50 * 1024 * 1024),  # 50MB
+            ("grpc.max_send_message_length", 50 * 1024 * 1024),  # 50MB
+        ],
+        description="Additional server options",
+    )
     enable_reflection: bool = Field(default=True, description="Enable reflection for the server")
     enable_health_check: bool = Field(default=True, description="Enable health check service")
 

digitalkin/logger.py

@@ -1,12 +1,15 @@
 """This module sets up a logger."""
 
+import json
 import logging
+import os
 import sys
-from typing import ClassVar
+from datetime import datetime, timezone
+from typing import Any, ClassVar
 
 
-class ColorFormatter(logging.Formatter):
-    """Color formatter for logging."""
+class ColorJSONFormatter(logging.Formatter):
+    """Color JSON formatter for development (pretty-printed with colors)."""
 
     grey = "\x1b[38;20m"
     green = "\x1b[32;20m"
@@ -15,28 +18,73 @@ class ColorFormatter(logging.Formatter):
     red = "\x1b[31;20m"
     bold_red = "\x1b[31;1m"
     reset = "\x1b[0m"
-    format: str = "%(asctime)s - %(name)s - %(levelname)s - %(message)s (%(filename)s:%(lineno)d)"  # type: ignore
-
-    FORMATS: ClassVar[dict[int, str]] = {
-        logging.DEBUG: grey + format + reset + "\n",  # type: ignore
-        logging.INFO: green + format + reset + "\n",  # type: ignore
-        logging.WARNING: yellow + format + reset + "\n",  # type: ignore
-        logging.ERROR: red + format + reset + "\n",  # type: ignore
-        logging.CRITICAL: bold_red + format + reset + "\n",  # type: ignore
+
+    COLORS: ClassVar[dict[int, str]] = {
+        logging.DEBUG: grey,
+        logging.INFO: green,
+        logging.WARNING: yellow,
+        logging.ERROR: red,
+        logging.CRITICAL: bold_red,
     }
 
-    def format(self, record: logging.LogRecord) -> str:  # type: ignore
-        """Format the log record.
+    def format(self, record: logging.LogRecord) -> str:
+        """Format the log record as colored JSON for development.
 
         Args:
             record: The log record to format.
 
         Returns:
-            str: The formatted log record.
+            str: The colored JSON formatted log record.
         """
-        log_fmt = self.FORMATS.get(record.levelno)
-        formatter = logging.Formatter(log_fmt)
-        return formatter.format(record)
+        log_obj: dict[str, Any] = {
+            "timestamp": datetime.fromtimestamp(record.created, tz=timezone.utc).isoformat(),
+            "level": record.levelname.lower(),
+            "logger": record.name,
+            "message": record.getMessage(),
+            "location": f"{record.filename}:{record.lineno}",
+            "function": record.funcName,
+        }
+
+        # Add exception info if present
+        if record.exc_info:
+            log_obj["exception"] = self.formatException(record.exc_info)
+
+        # Add any extra fields
+        skip_attrs = {
+            "name",
+            "msg",
+            "args",
+            "created",
+            "filename",
+            "funcName",
+            "levelname",
+            "levelno",
+            "lineno",
+            "module",
+            "msecs",
+            "message",
+            "pathname",
+            "process",
+            "processName",
+            "relativeCreated",
+            "thread",
+            "threadName",
+            "exc_info",
+            "exc_text",
+            "stack_info",
+        }
+
+        extras = {key: value for key, value in record.__dict__.items() if key not in skip_attrs}
+
+        if extras:
+            log_obj["extra"] = extras
+
+        # Pretty print with color
+        color = self.COLORS.get(record.levelno, self.grey)
+        json_str = json.dumps(log_obj, indent=2, default=str)
+        if os.getenv("RAILWAY_SERVICE_NAME"):
+            json_str.replace("\\n", "\n")
+        return f"{color}{json_str}{self.reset}"
 
 
 logging.basicConfig(
@@ -54,8 +102,7 @@ logger = logging.getLogger("digitalkin")
 if not logger.handlers:
     ch = logging.StreamHandler()
     ch.setLevel(logging.INFO)
-
-    ch.setFormatter(ColorFormatter())
+    ch.setFormatter(ColorJSONFormatter())
 
     logger.addHandler(ch)
     logger.propagate = False

digitalkin/services/filesystem/grpc_filesystem.py

@@ -327,9 +327,14 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         Returns:
             tuple[list[FilesystemRecord], int]: List of files and total count
         """
+        match filters.context:
+            case "setup":
+                context_id = self.setup_id
+            case "mission":
+                context_id = self.mission_id
         with GrpcFilesystem._handle_grpc_errors("GetFiles"):
             request = filesystem_pb2.GetFilesRequest(
-                context=filters.context,
+                context=context_id,
                 filters=self._filter_to_proto(filters),
                 include_content=include_content,
                 list_size=list_size,

{digitalkin-0.2.21.dist-info → digitalkin-0.2.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.2.21
+Version: 0.2.23
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International

{digitalkin-0.2.21.dist-info → digitalkin-0.2.23.dist-info}/RECORD

@@ -7,19 +7,19 @@ base_server/mock/__init__.py,sha256=YZFT-F1l_TpvJYuIPX-7kTeE1CfOjhx9YmNRXVoi-jQ,
 base_server/mock/mock_pb2.py,sha256=sETakcS3PAAm4E-hTCV1jIVaQTPEAIoVVHupB8Z_k7Y,1843
 base_server/mock/mock_pb2_grpc.py,sha256=BbOT70H6q3laKgkHfOx1QdfmCS_HxCY4wCOX84YAdG4,3180
 digitalkin/__init__.py,sha256=7LLBAba0th-3SGqcpqFO-lopWdUkVLKzLZiMtB-mW3M,162
-digitalkin/__version__.py,sha256=QJb8Hs9hhnpQm5I47kYxQurSZN7wI4xdHPE8xSSPwIA,191
-digitalkin/logger.py,sha256=cFbIAZHOFx3nddOssRNYLXyqUPzR4CgDR_c-5wmB-og,1685
+digitalkin/__version__.py,sha256=ztRCETPoZd6W_J-mnJ5nS74c-ka0qrOuTY9L88iKUGc,191
+digitalkin/logger.py,sha256=I6ARTJ2oWJ97VqMT2oMb6JU2J2GKOZi9LZk7PUplh2E,2889
 digitalkin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalkin/grpc_servers/__init__.py,sha256=0cJBlwipSmFdXkyH3T0i6OJ1WpAtNsZgYX7JaSnkbtg,804
 digitalkin/grpc_servers/_base_server.py,sha256=NXnnZPjJqUDWoumhEbb7EOEWB7d8XYwpQs-l97NTe4k,18647
-digitalkin/grpc_servers/module_server.py,sha256=hOvoY2XFjxmgkbAsMex5a-m7OPyljnz0Gh9BJxtDtJo,10259
-digitalkin/grpc_servers/module_servicer.py,sha256=dnEozIDwkAoinh3lIbT3ZJ9YANlghC3iiQKNYFNHmTI,18805
+digitalkin/grpc_servers/module_server.py,sha256=81l1i32F7XGQDgBXjQ7Dpukh-KTpmHzM5PKka8LjviE,10386
+digitalkin/grpc_servers/module_servicer.py,sha256=hhUAH6K5OcvkQEbXQUeUTAHJxkus-KlVwJnG1bGHTo4,18963
 digitalkin/grpc_servers/registry_server.py,sha256=StY18DKYoPKQIU1SIzgito6D4_QA1aMVddZ8O2WGlHY,2223
 digitalkin/grpc_servers/registry_servicer.py,sha256=dqsKGHZ0LnaIvGt4ipaAuigd37sbJBndT4MAT029GsY,16471
 digitalkin/grpc_servers/utils/exceptions.py,sha256=SyOgvjggaUECYmSiqy8KJLHwHVt5IClSTxslHM-IZzI,931
 digitalkin/grpc_servers/utils/factory.py,sha256=jm6rFjiqmtSv7BIHNAOxsG9xXtSvWpx9TfzSQiX97MQ,5899
-digitalkin/grpc_servers/utils/grpc_client_wrapper.py,sha256=GXRqCTCufwWd8sVMoClnl-JpeBjgmdlSCD0a3YMU9D0,2594
-digitalkin/grpc_servers/utils/models.py,sha256=80F5oHiv8MOqMoDZJBXmJSRoVYJRyhaVcijQ2LinAig,8428
+digitalkin/grpc_servers/utils/grpc_client_wrapper.py,sha256=iPHwVAaGeuV0ZW7YhTc7E3SWPyWX244Cy0iFf2DSf_Q,2685
+digitalkin/grpc_servers/utils/models.py,sha256=hiwiGHy3sEBBFdOUBCoC1n_7GVeJhjRmi0sl4tCEJy0,8965
 digitalkin/grpc_servers/utils/types.py,sha256=rQ78s4nAet2jy-NIDj_PUWriT0kuGHr_w6ELjmjgBao,539
 digitalkin/models/__init__.py,sha256=hDHtUfswaNh8wo4NZaBItg9JqC0uNSRqXArNWSrGynY,163
 digitalkin/models/module/__init__.py,sha256=fgTVbsNmLZgM43Vy-Ea5-g0EG3pncmAmJl9nk-OQdzo,561
@@ -53,7 +53,7 @@ digitalkin/services/cost/grpc_cost.py,sha256=cGtb0atPXSEEOrNIWee-o3ScfNRSAFXJGDu
 digitalkin/services/filesystem/__init__.py,sha256=BhwMl_BUvM0d65fmglkp0SVwn3RfYiUOKJgIMnOCaGM,381
 digitalkin/services/filesystem/default_filesystem.py,sha256=qfC4jorfo86fBBnth-4ft13VuaGdvIHgWOVurCykXIk,15182
 digitalkin/services/filesystem/filesystem_strategy.py,sha256=zibVLvX_IBQ-kgh-KYzHdszDeiHFPEAZszu_k99x1GQ,9487
-digitalkin/services/filesystem/grpc_filesystem.py,sha256=0Wd4ZSEPznbATUABJwhn44wCWMX066Glm_FtLYSk16s,12819
+digitalkin/services/filesystem/grpc_filesystem.py,sha256=ilxTFjelmf8_bVSs3xLlsyWFHVlSJf27c4j8H7R1Rkw,12987
 digitalkin/services/identity/__init__.py,sha256=InkeyLgFYYwItx8mePA8HpfacOMWZwwuc0G4pWtKq9s,270
 digitalkin/services/identity/default_identity.py,sha256=Y2auZHrGSZTIN5D8HyjLvLcNbYFM1CNUE23x7p5VIGw,386
 digitalkin/services/identity/identity_strategy.py,sha256=skappBbds1_qa0Gr24FGrNX1N0_OYhYT1Lh7dUaAirE,429
@@ -76,14 +76,14 @@ digitalkin/utils/arg_parser.py,sha256=nvjI1pKDY1HfS0oGcMQPtdTQcggXLtpxXMbnMxNEKR
 digitalkin/utils/development_mode_action.py,sha256=TqRuAF_A7bDD4twRB4PnZcRoNeaiAnEdxM5kvy4aoaA,1511
 digitalkin/utils/llm_ready_schema.py,sha256=JjMug_lrQllqFoanaC091VgOqwAd-_YzcpqFlS7p778,2375
 digitalkin/utils/package_discover.py,sha256=3e9-6Vf3yAAv2VkHHVK4QVqHJBxQqg3d8uuDTsXph24,13471
-digitalkin-0.2.21.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.2.23.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
 modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modules/cpu_intensive_module.py,sha256=ejB9XPnFfA0uCuFUQbM3fy5UYfqqAlF36rv_P5Ri8ho,8363
 modules/minimal_llm_module.py,sha256=Ijld__ZnhzfLwpXD1XVkLZ7jyKZKyOFZczOpiPttJZc,11216
 modules/text_transform_module.py,sha256=bwPSnEUthZQyfLwcTLo52iAxItAoknkLh8Y3m5aywaY,7251
 services/filesystem_module.py,sha256=71Mcja8jCQqiqFHPdsIXplFIHTvgkxRhp0TRXuCfgkk,7430
 services/storage_module.py,sha256=ybTMqmvGaTrR8PqJ4FU0cwxaDjT36TskVrGoetTGmno,6955
-digitalkin-0.2.21.dist-info/METADATA,sha256=JdeHnI5TK-xDUJe-Im3Zd8ILrSAkjlkljBCBz-2_ilA,30579
-digitalkin-0.2.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-digitalkin-0.2.21.dist-info/top_level.txt,sha256=gcjqlyrZuLjIyxrOIavCQM_olpr6ND5kPKkZd2j0xGo,40
-digitalkin-0.2.21.dist-info/RECORD,,
+digitalkin-0.2.23.dist-info/METADATA,sha256=6xGU63KlOxOodbF57XVFJGRE-2ufQiQISkzXaeuW_bw,30579
+digitalkin-0.2.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+digitalkin-0.2.23.dist-info/top_level.txt,sha256=gcjqlyrZuLjIyxrOIavCQM_olpr6ND5kPKkZd2j0xGo,40
+digitalkin-0.2.23.dist-info/RECORD,,