digitalkin 0.2.25rc0__tar.gz → 0.2.26__tar.gz

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.2.25rc0
+Version: 0.2.26
 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.25rc0 → digitalkin-0.2.26}/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.25rc0"
+    version = "0.2.26"
 
     classifiers = [
         "Development Status :: 3 - Alpha",

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/__version__.py

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

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/grpc_servers/_base_server.py

@@ -299,7 +299,7 @@ class BaseServer(abc.ABC):
         self._add_reflection()
 
         # Start the server
-        logger.debug("Starting gRPC server on %s", self.config.address)
+        logger.debug("Starting gRPC server on %s", self.config.address, extra={"config": self.config})
         try:
             if self.config.mode == ServerMode.ASYNC:
                 # For async server, use the event loop

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/grpc_servers/module_server.py

@@ -133,7 +133,7 @@ class ModuleServer(BaseServer):
         """
         logger.debug(
             "Registering module with registry at %s",
-            self.server_config.registry_address,
+            self.server_config.registry_address, extra={"server_config": self.server_config}
         )
 
         # Create appropriate channel based on security mode
@@ -173,6 +173,7 @@ class ModuleServer(BaseServer):
                     "Request sent to registry for module: %s:%s",
                     self.module_class.metadata["name"],
                     self.module_class.metadata["module_id"],
+                    extra={"module_info": self.module_class.metadata}
                 )
                 response = stub.RegisterModule(request)
 

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/grpc_servers/module_servicer.py

@@ -76,9 +76,9 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
         self.job_manager = job_manager_class(module_class, self.args.services_mode)
 
         logger.debug(
-            "ModuleServicer initialized with job manager: %s | %s",
+            "ModuleServicer initialized with job manager: %s",
             self.args.job_manager_mode,
-            self.job_manager,
+            extra={"job_manager": self.job_manager},
         )
         self.setup = GrpcSetup() if self.args.services_mode == ServicesMode.REMOTE else DefaultSetup()
 
@@ -204,13 +204,14 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
         async with self.job_manager.generate_stream_consumer(job_id) as stream:  # type: ignore
             async for message in stream:
                 if message.get("error", None) is not None:
+                    logger.error("Error in output_data", extra={"message": message})
                     context.set_code(message["error"]["code"])
                     context.set_details(message["error"]["error_message"])
                     yield lifecycle_pb2.StartModuleResponse(success=False, job_id=job_id)
                     break
 
                 if message.get("exception", None) is not None:
-                    logger.error("Error in output_data")
+                    logger.error("Exception in output_data", extra={"message": message})
                     context.set_code(message["short_description"])
                     context.set_details(message["exception"])
                     yield lifecycle_pb2.StartModuleResponse(success=False, job_id=job_id)
@@ -248,7 +249,7 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
             context.set_details(message)
             return lifecycle_pb2.StopModuleResponse(success=False)
 
-        logger.debug("Job %s stopped successfully", request.job_id)
+        logger.debug("Job %s stopped successfully", request.job_id, extra={"job_id": request.job_id})
         return lifecycle_pb2.StopModuleResponse(success=True)
 
     async def GetModuleStatus(  # noqa: N802

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/grpc_servers/utils/grpc_client_wrapper.py

@@ -62,11 +62,11 @@ class GrpcClientWrapper:
         """
         try:
             # Call the register method
-            logger.debug("send request to %s", query_endpoint)
+            logger.debug("send request to %s", query_endpoint, extra={"request": request})
             response = getattr(self.stub, query_endpoint)(request)
-            logger.debug("receive response from request to registry: %s", response)
+            logger.debug("receive response from request to %s", query_endpoint, extra={"response": response})
         except grpc.RpcError as e:
-            logger.exception("RPC error during %s: %s", query_endpoint, e.details())
+            logger.exception("RPC error during %s", query_endpoint, extra={"error": e.details()})
             raise ServerError
         else:
             return response

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/logger.py

@@ -50,10 +50,16 @@ class ColorJSONFormatter(logging.Formatter):
             "level": record.levelname.lower(),
             "logger": record.name,
             "message": record.getMessage(),
+            "module": record.module,
             "location": f"{record.filename}:{record.lineno}",
             "function": record.funcName,
+            "pathname": record.pathname,
+            "process": record.process,
+            "processName": record.processName,
+            "relativeCreated": record.relativeCreated,
+            "thread": record.thread,
+            "threadName": record.threadName,
         }
-
         # Add exception info if present
         if record.exc_info:
             log_obj["exception"] = self.formatException(record.exc_info)
@@ -91,30 +97,69 @@ class ColorJSONFormatter(logging.Formatter):
         # Pretty print with color
         color = self.COLORS.get(record.levelno, self.grey)
         if self.is_production:
-            json_str = json.dumps(log_obj, default=str, separators=(",", ":"))
-        else:
-            json_str = json.dumps(log_obj, indent=2, default=str)
-            json_str = json_str.replace("\\n", "\n")
+            log_obj["message"] = f"{color}{log_obj.get('message', '')}{self.reset}"
+            return json.dumps(log_obj, default=str, separators=(",", ":"))
+        json_str = json.dumps(log_obj, indent=2, default=str)
+        json_str = 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",
+def setup_logger(
+    name: str,
+    level: int = logging.INFO,
+    additional_loggers: dict[str, int] | None = None,
+    *,
+    is_production: bool | None = None,
+    configure_root: bool = True,
+) -> logging.Logger:
+    """Set up a logger with the ColorJSONFormatter.
+
+    Args:
+        name: Name of the logger to create
+        level: Logging level (default: logging.INFO)
+        is_production: Whether running in production. If None, checks RAILWAY_SERVICE_NAME env var
+        configure_root: Whether to configure root logger (default: True)
+        additional_loggers: Dict of additional logger names and their levels to configure
+
+    Returns:
+        logging.Logger: Configured logger instance
+    """
+    # Determine if we're in production
+    if is_production is None:
+        is_production = os.getenv("RAILWAY_SERVICE_NAME") is not None
+
+    # Configure root logger if requested
+    if configure_root:
+        logging.basicConfig(
+            level=logging.DEBUG,
+            stream=sys.stdout,
+            datefmt="%Y-%m-%d %H:%M:%S",
+        )
+
+    # Configure additional loggers
+    if additional_loggers:
+        for logger_name, logger_level in additional_loggers.items():
+            logging.getLogger(logger_name).setLevel(logger_level)
+
+    # Create and configure the main logger
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+    # Only add handler if not already configured
+    if not logger.handlers:
+        ch = logging.StreamHandler()
+        ch.setLevel(level)
+        ch.setFormatter(ColorJSONFormatter(is_production=is_production))
+        logger.addHandler(ch)
+        logger.propagate = False
+
+    return logger
+
+
+logger = setup_logger(
+    "digitalkin",
+    level=logging.INFO,
+    additional_loggers={
+        "grpc": logging.DEBUG,
+        "asyncio": logging.DEBUG,
+    },
 )
-
-logging.getLogger("grpc").setLevel(logging.DEBUG)
-logging.getLogger("asyncio").setLevel(logging.DEBUG)
-
-
-logger = logging.getLogger("digitalkin")
-is_production = os.getenv("RAILWAY_SERVICE_NAME") is not None
-
-if not logger.handlers:
-    ch = logging.StreamHandler()
-    ch.setLevel(logging.INFO)
-    ch.setFormatter(ColorJSONFormatter(is_production=is_production))
-
-    logger.addHandler(ch)
-    logger.propagate = False

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/models/module/module_types.py

@@ -24,7 +24,7 @@ class DataTrigger(BaseModel):
     """
 
     protocol: ClassVar[str]
-    created_at: str = datetime.now(tz=timezone.utc).isoformat()
+    created_at: str = Field(default_factory=lambda: datetime.now(timezone.utc).isoformat())
 
 
 DataTriggerT = TypeVar("DataTriggerT", bound=DataTrigger)

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin/modules/_base_module.py

@@ -381,15 +381,51 @@ class BaseModule(  # noqa: PLR0904
             asyncio.CancelledError: If the module is cancelled
         """
         try:
-            logger.info("Starting module %s", self.name)
+            logger.info(
+                "Starting module %s",
+                self.name,
+                extra={
+                    "mission_id": self.mission_id,
+                    "setup_id": self.setup_id,
+                    "setup_version_id": self.setup_version_id,
+                    "job_id": self.job_id,
+                },
+            )
             await self.run(input_data, setup_data, callback)
-            logger.info("Module %s finished", self.name)
+            logger.info(
+                "Module %s finished",
+                self.name,
+                extra={
+                    "mission_id": self.mission_id,
+                    "setup_id": self.setup_id,
+                    "setup_version_id": self.setup_version_id,
+                    "job_id": self.job_id,
+                },
+            )
         except asyncio.CancelledError:
             self._status = ModuleStatus.CANCELLED
-            logger.error(f"Module {self.name} cancelled")
+            logger.error(
+                "Module %s cancelled",
+                self.name,
+                extra={
+                    "mission_id": self.mission_id,
+                    "setup_id": self.setup_id,
+                    "setup_version_id": self.setup_version_id,
+                    "job_id": self.job_id,
+                },
+            )
         except Exception:
             self._status = ModuleStatus.FAILED
-            logger.exception("Error inside module %s", self.name)
+            logger.exception(
+                "Error inside module %s",
+                self.name,
+                extra={
+                    "mission_id": self.mission_id,
+                    "setup_id": self.setup_id,
+                    "setup_version_id": self.setup_version_id,
+                    "job_id": self.job_id,
+                },
+            )
         else:
             self._status = ModuleStatus.STOPPING
         finally:
@@ -464,7 +500,15 @@ class BaseModule(  # noqa: PLR0904
     ) -> None:
         """Start the module."""
         try:
-            logger.info("Run Config Setup lifecycle")
+            logger.info(
+                "Run Config Setup lifecycle",
+                extra={
+                    "mission_id": self.mission_id,
+                    "setup_id": self.setup_id,
+                    "setup_version_id": self.setup_version_id,
+                    "job_id": self.job_id,
+                },
+            )
             self._status = ModuleStatus.RUNNING
             content = await self.run_config_setup(config_setup_data)
 
@@ -474,4 +518,12 @@ class BaseModule(  # noqa: PLR0904
             self._status = ModuleStatus.STOPPING
         except Exception:
             self._status = ModuleStatus.FAILED
-            logger.exception("Error during module lifecyle")
+            logger.exception(
+                "Error during module lifecyle",
+                extra={
+                    "mission_id": self.mission_id,
+                    "setup_id": self.setup_id,
+                    "setup_version_id": self.setup_version_id,
+                    "job_id": self.job_id,
+                },
+            )

{digitalkin-0.2.25rc0 → digitalkin-0.2.26}/src/digitalkin.egg-info/PKG-INFO

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