digitalkin 0.2.21__tar.gz → 0.2.23__tar.gz

{digitalkin-0.2.21 → digitalkin-0.2.23}/PKG-INFO

@@ -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 → digitalkin-0.2.23}/pyproject.toml

@@ -12,7 +12,7 @@
 
     keywords = [ "digitalkin", "kin", "agent", "gprc", "sdk" ]
     # Version of the package automatically updated by bump2version (that is why it is separated)
-    version = "0.2.21"
+    version = "0.2.23"
 
     classifiers = [
         "Development Status :: 3 - Alpha",
@@ -115,8 +115,6 @@
         "tool_module.py",
         "trigger_module.py",
         "generate_certificates.py",
-        # "test_*.py",
-        # "tests/*",
         "examples/*",
     ]
     preview = true

{digitalkin-0.2.21 → digitalkin-0.2.23}/src/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-0.2.21 → digitalkin-0.2.23}/src/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-0.2.21 → digitalkin-0.2.23}/src/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-0.2.21 → digitalkin-0.2.23}/src/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-0.2.21 → digitalkin-0.2.23}/src/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-0.2.23/src/digitalkin/logger.py

@@ -0,0 +1,108 @@
+"""This module sets up a logger."""
+
+import json
+import logging
+import os
+import sys
+from datetime import datetime, timezone
+from typing import Any, ClassVar
+
+
+class ColorJSONFormatter(logging.Formatter):
+    """Color JSON formatter for development (pretty-printed with colors)."""
+
+    grey = "\x1b[38;20m"
+    green = "\x1b[32;20m"
+    blue = "\x1b[34;20m"
+    yellow = "\x1b[33;20m"
+    red = "\x1b[31;20m"
+    bold_red = "\x1b[31;1m"
+    reset = "\x1b[0m"
+
+    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:
+        """Format the log record as colored JSON for development.
+
+        Args:
+            record: The log record to format.
+
+        Returns:
+            str: The colored JSON formatted log 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(
+    level=logging.DEBUG,
+    stream=sys.stdout,
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+
+logging.getLogger("grpc").setLevel(logging.DEBUG)
+logging.getLogger("asyncio").setLevel(logging.DEBUG)
+
+
+logger = logging.getLogger("digitalkin")
+
+if not logger.handlers:
+    ch = logging.StreamHandler()
+    ch.setLevel(logging.INFO)
+    ch.setFormatter(ColorJSONFormatter())
+
+    logger.addHandler(ch)
+    logger.propagate = False

{digitalkin-0.2.21 → digitalkin-0.2.23}/src/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 → digitalkin-0.2.23}/src/digitalkin.egg-info/PKG-INFO

@@ -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/src/digitalkin/logger.py

@@ -1,61 +0,0 @@
-"""This module sets up a logger."""
-
-import logging
-import sys
-from typing import ClassVar
-
-
-class ColorFormatter(logging.Formatter):
-    """Color formatter for logging."""
-
-    grey = "\x1b[38;20m"
-    green = "\x1b[32;20m"
-    blue = "\x1b[34;20m"
-    yellow = "\x1b[33;20m"
-    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
-    }
-
-    def format(self, record: logging.LogRecord) -> str:  # type: ignore
-        """Format the log record.
-
-        Args:
-            record: The log record to format.
-
-        Returns:
-            str: The formatted log record.
-        """
-        log_fmt = self.FORMATS.get(record.levelno)
-        formatter = logging.Formatter(log_fmt)
-        return formatter.format(record)
-
-
-logging.basicConfig(
-    level=logging.DEBUG,
-    stream=sys.stdout,
-    datefmt="%Y-%m-%d %H:%M:%S",
-)
-
-logging.getLogger("grpc").setLevel(logging.DEBUG)
-logging.getLogger("asyncio").setLevel(logging.DEBUG)
-
-
-logger = logging.getLogger("digitalkin")
-
-if not logger.handlers:
-    ch = logging.StreamHandler()
-    ch.setLevel(logging.INFO)
-
-    ch.setFormatter(ColorFormatter())
-
-    logger.addHandler(ch)
-    logger.propagate = False