digitalkin 0.2.19__py3-none-any.whl → 0.2.21__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.19"
+    __version__ = "0.2.21"

digitalkin/grpc_servers/module_servicer.py

@@ -100,6 +100,9 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
             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
+        )
         # Process the module input
         # TODO: Secret should be used here as well
         setup_version = request.setup_version
@@ -121,6 +124,7 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
         job_id = await self.job_manager.create_config_setup_instance_job(
             config_setup_data,
             request.mission_id,
+            setup_version.setup_id,
             setup_version.id,
         )
 
@@ -156,6 +160,7 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
             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)
         # Process the module input
         # TODO: Check failure of input data format
         input_data = self.module_class.create_input_model(dict(request.input.items()))
@@ -177,6 +182,7 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
             input_data,
             setup_data,
             mission_id=request.mission_id,
+            setup_id=setup_data_class.current_setup_version.setup_id,
             setup_version_id=setup_data_class.current_setup_version.id,
         )
 

digitalkin/modules/_base_module.py

@@ -54,7 +54,6 @@ class BaseModule(  # noqa: PLR0904
     description: str
 
     setup_format: type[SetupModelT]
-
     input_format: type[InputModelT]
     output_format: type[OutputModelT]
     secret_format: type[SecretModelT]
@@ -77,21 +76,38 @@ class BaseModule(  # noqa: PLR0904
     snapshot: SnapshotStrategy
     storage: StorageStrategy
 
+    # runtime params
+    job_id: str
+    mission_id: str
+    setup_id: str
+    setup_version_id: str
+    _status: ModuleStatus
+    _task: asyncio.Task | None
+
     def _init_strategies(self) -> None:
         """Initialize the services configuration."""
         for service_name in self.services_config.valid_strategy_names():
-            service = self.services_config.init_strategy(service_name, self.mission_id, self.setup_version_id)
+            service = self.services_config.init_strategy(
+                service_name,
+                self.mission_id,
+                self.setup_id,
+                self.setup_version_id,
+            )
             setattr(self, service_name, service)
 
     def __init__(
         self,
         job_id: str,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> None:
         """Initialize the module."""
         self.job_id: str = job_id
         self.mission_id: str = mission_id
+        # Setup reference needed for the overall Kin scope as the filesystem context
+        self.setup_id: str = setup_id
+        # SetupVersion reference needed for the precise Kin scope as the cost
         self.setup_version_id: str = setup_version_id
         self._status = ModuleStatus.CREATED
         self._task: asyncio.Task | None = None

digitalkin/modules/job_manager/base_job_manager.py

@@ -87,6 +87,7 @@ class BaseJobManager(abc.ABC, Generic[InputModelT, SetupModelT]):
         input_data: InputModelT,
         setup_data: SetupModelT,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> str:
         """Create and start a new job for the module's instance.
@@ -95,7 +96,8 @@ class BaseJobManager(abc.ABC, Generic[InputModelT, SetupModelT]):
             input_data: The input data required to start the job.
             setup_data: The setup configuration for the module.
             mission_id: The mission ID associated with the job.
-            setup_version_id: The setup ID associated with the module.
+            setup_id: The setup ID.
+            setup_version_id: The setup version ID associated with the module.
 
         Returns:
             str: The unique identifier (job ID) of the created job.
@@ -121,6 +123,7 @@ class BaseJobManager(abc.ABC, Generic[InputModelT, SetupModelT]):
         self,
         config_setup_data: SetupModelT,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> str:
         """Create and start a new module job.
@@ -131,7 +134,8 @@ class BaseJobManager(abc.ABC, Generic[InputModelT, SetupModelT]):
         Args:
             config_setup_data: The input data required to start the job.
             mission_id: The mission ID associated with the job.
-            setup_version_id: The setup ID.
+            setup_id: The setup ID.
+            setup_version_id: The setup version ID.
 
         Returns:
             str: The unique identifier (job ID) of the created job.

digitalkin/modules/job_manager/single_job_manager.py

@@ -71,6 +71,7 @@ class SingleJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
         self,
         config_setup_data: SetupModelT,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> str:
         """Create and start a new module setup configuration job.
@@ -82,6 +83,7 @@ class SingleJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
             config_setup_data: The input data required to start the job.
             setup_data: The setup configuration for the module.
             mission_id: The mission ID associated with the job.
+            setup_id: The setup ID associated with the module.
             setup_version_id: The setup ID.
 
         Returns:
@@ -92,7 +94,7 @@ class SingleJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
         """
         job_id = str(uuid.uuid4())
         # TODO: Ensure the job_id is unique.
-        module = self.module_class(job_id, mission_id=mission_id, setup_version_id=setup_version_id)
+        module = self.module_class(job_id, mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id)
         self.modules[job_id] = module
         self.queues[job_id] = asyncio.Queue()
 
@@ -176,6 +178,7 @@ class SingleJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
         input_data: InputModelT,
         setup_data: SetupModelT,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> str:
         """Create and start a new module job.
@@ -187,7 +190,8 @@ class SingleJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
             input_data: The input data required to start the job.
             setup_data: The setup configuration for the module.
             mission_id: The mission ID associated with the job.
-            setup_version_id: The setup ID associated with the module.
+            setup_id: The setup ID associated with the module.
+            setup_version_id: The setup Version ID associated with the module.
 
         Returns:
             str: The unique identifier (job ID) of the created job.
@@ -197,7 +201,12 @@ class SingleJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
         """
         job_id = str(uuid.uuid4())
         # TODO: Ensure the job_id is unique.
-        module = self.module_class(job_id, mission_id=mission_id, setup_version_id=setup_version_id)
+        module = self.module_class(
+            job_id,
+            mission_id=mission_id,
+            setup_id=setup_id,
+            setup_version_id=setup_version_id,
+        )
         self.modules[job_id] = module
         self.queues[job_id] = asyncio.Queue()
         callback = await self.job_specific_callback(self.add_to_queue, job_id)

digitalkin/modules/job_manager/taskiq_broker.py

@@ -132,6 +132,7 @@ async def send_message_to_stream(job_id: str, output_data: OutputModelT) -> None
 @TASKIQ_BROKER.task
 async def run_start_module(
     mission_id: str,
+    setup_id: str,
     setup_version_id: str,
     module_class: type[BaseModule],
     services_mode: ServicesMode,
@@ -143,6 +144,7 @@ async def run_start_module(
 
     Args:
         mission_id: str,
+        setup_id: The setup ID associated with the module.
         setup_version_id: The setup ID associated with the module.
         module_class: type[BaseModule],
         services_mode: ServicesMode,
@@ -161,7 +163,7 @@ async def run_start_module(
 
     job_id = context.message.task_id
     callback = await BaseJobManager.job_specific_callback(send_message_to_stream, job_id)
-    module = module_class(job_id, mission_id=mission_id, setup_version_id=setup_version_id)
+    module = module_class(job_id, mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id)
 
     await module.start(
         input_data,
@@ -176,6 +178,7 @@ async def run_start_module(
 @TASKIQ_BROKER.task
 async def run_config_module(
     mission_id: str,
+    setup_id: str,
     setup_version_id: str,
     module_class: type[BaseModule],
     services_mode: ServicesMode,
@@ -186,6 +189,7 @@ async def run_config_module(
 
     Args:
         mission_id: str,
+        setup_id: The setup ID associated with the module.
         setup_version_id: The setup ID associated with the module.
         module_class: type[BaseModule],
         services_mode: ServicesMode,
@@ -204,7 +208,7 @@ async def run_config_module(
 
     job_id = context.message.task_id
     callback = await BaseJobManager.job_specific_callback(send_message_to_stream, job_id)
-    module = module_class(job_id, mission_id=mission_id, setup_version_id=setup_version_id)
+    module = module_class(job_id, mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id)
 
     await module.start_config_setup(
         module_class.create_config_setup_model(config_setup_data),

digitalkin/modules/job_manager/taskiq_job_manager.py

@@ -136,6 +136,7 @@ class TaskiqJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
         self,
         config_setup_data: SetupModelT,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> str:
         """Create and start a new module setup configuration job.
@@ -147,6 +148,7 @@ class TaskiqJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
             config_setup_data: The input data required to start the job.
             setup_data: The setup configuration for the module.
             mission_id: The mission ID associated with the job.
+            setup_id: The setup ID associated with the module.
             setup_version_id: The setup ID.
 
         Returns:
@@ -168,6 +170,7 @@ class TaskiqJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
 
         running_task: AsyncTaskiqTask[Any] = await task.kiq(
             mission_id,
+            setup_id,
             setup_version_id,
             self.module_class,
             self.services_mode,
@@ -221,6 +224,7 @@ class TaskiqJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
         input_data: InputModelT,
         setup_data: SetupModelT,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
     ) -> str:
         """Launches the module_task in Taskiq, returns the Taskiq task id as job_id.
@@ -229,6 +233,7 @@ class TaskiqJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
             input_data: Input data for the module
             setup_data: Setup data for the module
             mission_id: Mission ID for the module
+            setup_id: The setup ID associated with the module.
             setup_version_id: The setup ID associated with the module.
 
         Returns:
@@ -245,6 +250,7 @@ class TaskiqJobManager(BaseJobManager, Generic[InputModelT, SetupModelT]):
 
         running_task: AsyncTaskiqTask[Any] = await task.kiq(
             mission_id,
+            setup_id,
             setup_version_id,
             self.module_class,
             self.services_mode,

digitalkin/services/base_strategy.py

@@ -9,12 +9,14 @@ class BaseStrategy(ABC):
     This class defines the interface for all strategies.
     """
 
-    def __init__(self, mission_id: str, setup_version_id: str) -> None:
+    def __init__(self, mission_id: str, setup_id: str, setup_version_id: str) -> None:
         """Initialize the strategy.
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup this strategy is associated with
             setup_version_id: The ID of the setup version this strategy is associated with
         """
         self.mission_id: str = mission_id
+        self.setup_id: str = setup_id
         self.setup_version_id: str = setup_version_id

digitalkin/services/cost/cost_strategy.py

@@ -57,15 +57,22 @@ class CostServiceError(Exception):
 class CostStrategy(BaseStrategy, ABC):
     """Abstract base class for cost strategies."""
 
-    def __init__(self, mission_id: str, setup_version_id: str, config: dict[str, CostConfig]) -> None:
+    def __init__(
+        self,
+        mission_id: str,
+        setup_id: str,
+        setup_version_id: str,
+        config: dict[str, CostConfig],
+    ) -> None:
         """Initialize the strategy.
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup
             setup_version_id: The ID of the setup version this strategy is associated with
             config: Configuration dictionary for the strategy
         """
-        super().__init__(mission_id, setup_version_id)
+        super().__init__(mission_id, setup_id, setup_version_id)
         self.config = config
 
     @abstractmethod

digitalkin/services/cost/default_cost.py

@@ -15,15 +15,16 @@ from digitalkin.services.cost.cost_strategy import (
 class DefaultCost(CostStrategy):
     """Default cost strategy."""
 
-    def __init__(self, mission_id: str, setup_version_id: str, config: dict[str, CostConfig]) -> None:
+    def __init__(self, mission_id: str, setup_id: str, setup_version_id: str, config: dict[str, CostConfig]) -> None:
         """Initialize the strategy.
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup
             setup_version_id: The ID of the setup version this strategy is associated with
             config: The configuration dictionary for the cost
         """
-        super().__init__(mission_id=mission_id, setup_version_id=setup_version_id, config=config)
+        super().__init__(mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id, config=config)
         self.db: dict[str, list[CostData]] = {}
 
     def add(

digitalkin/services/cost/grpc_cost.py

@@ -57,12 +57,13 @@ class GrpcCost(CostStrategy, GrpcClientWrapper):
     def __init__(
         self,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
         config: dict[str, CostConfig],
         client_config: ClientConfig,
     ) -> None:
         """Initialize the cost."""
-        super().__init__(mission_id=mission_id, setup_version_id=setup_version_id, config=config)
+        super().__init__(mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id, config=config)
         channel = self._init_channel(client_config)
         self.stub = cost_service_pb2_grpc.CostServiceStub(channel)
         logger.debug("Channel client 'Cost' initialized succesfully")

digitalkin/services/filesystem/default_filesystem.py

@@ -25,14 +25,15 @@ class DefaultFilesystem(FilesystemStrategy):
     Files are stored in a temporary directory with proper metadata tracking.
     """
 
-    def __init__(self, mission_id: str, setup_version_id: str) -> None:
+    def __init__(self, mission_id: str, setup_id: str, setup_version_id: str) -> None:
         """Initialize the default filesystem strategy.
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup
             setup_version_id: The ID of the setup version this strategy is associated with
         """
-        super().__init__(mission_id, setup_version_id)
+        super().__init__(mission_id, setup_id, setup_version_id)
         self.temp_root: str = tempfile.mkdtemp()
         os.makedirs(self.temp_root, exist_ok=True)
         self.db: dict[str, FilesystemRecord] = {}
@@ -83,7 +84,6 @@ class DefaultFilesystem(FilesystemStrategy):
             if (not filters.names or f.name in filters.names)
             and (not filters.file_ids or f.id in filters.file_ids)
             and (not filters.file_types or f.file_type in filters.file_types)
-            and f.context == self.mission_id
             and (not filters.status or f.status == filters.status)
             and (not filters.content_type_prefix or f.content_type.startswith(filters.content_type_prefix))
             and (not filters.min_size_bytes or f.size_bytes >= filters.min_size_bytes)
@@ -118,7 +118,7 @@ class DefaultFilesystem(FilesystemStrategy):
         for file in files:
             try:
                 # Check if file with same name exists in the context
-                context_dir = self._get_context_temp_dir(self.mission_id)
+                context_dir = self._get_context_temp_dir(self.setup_id)
                 file_path = os.path.join(context_dir, file.name)
                 if os.path.exists(file_path) and not file.replace_if_exists:
                     msg = f"File with name {file.name} already exists."
@@ -129,7 +129,7 @@ class DefaultFilesystem(FilesystemStrategy):
                 storage_uri = str(Path(file_path).resolve())
                 file_data = FilesystemRecord(
                     id=str(uuid.uuid4()),
-                    context=self.mission_id,
+                    context=self.setup_id,
                     name=file.name,
                     file_type=file.file_type,
                     content_type=file.content_type or "application/octet-stream",
@@ -138,14 +138,13 @@ class DefaultFilesystem(FilesystemStrategy):
                     metadata=file.metadata,
                     storage_uri=storage_uri,
                     file_url=storage_uri,
-                    status=file.status if hasattr(file, "status") and file.status else "ACTIVE",
+                    status="ACTIVE",
                 )
 
                 self.db[file_data.id] = file_data
                 uploaded_files.append(file_data)
                 total_uploaded += 1
                 logger.debug("Uploaded file %s", file_data)
-
             except Exception as e:  # noqa: PERF203
                 logger.exception("Error uploading file %s: %s", file.name, e)
                 total_failed += 1
@@ -199,6 +198,8 @@ class DefaultFilesystem(FilesystemStrategy):
             end_idx = start_idx + list_size
             paginated_files = filtered_files[start_idx:end_idx]
 
+            logger.critical(f"{filters=} | {paginated_files=}")
+
             if include_content:
                 for file in paginated_files:
                     file.content = Path(file.storage_uri).read_bytes()
@@ -213,6 +214,7 @@ class DefaultFilesystem(FilesystemStrategy):
     def get_file(
         self,
         file_id: str,
+        context: Literal["mission", "setup"] = "mission",  # noqa: ARG002
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:
@@ -224,6 +226,7 @@ class DefaultFilesystem(FilesystemStrategy):
 
         Args:
             file_id: The ID of the file to be retrieved
+            context: The context of the files (mission or setup)
             include_content: Whether to include file content in response
 
         Returns:
@@ -306,7 +309,7 @@ class DefaultFilesystem(FilesystemStrategy):
             raise FilesystemServiceError(msg)
 
         try:
-            context_dir = self._get_context_temp_dir(self.mission_id)
+            context_dir = self._get_context_temp_dir(self.setup_id)
             file_path = os.path.join(context_dir, file_id)
             existing_file = self.db[file_id]
 

digitalkin/services/filesystem/filesystem_strategy.py

@@ -33,6 +33,9 @@ class FilesystemRecord(BaseModel):
 class FileFilter(BaseModel):
     """Filter criteria for querying files."""
 
+    context: Literal["mission", "setup"] = Field(
+        default="mission", description="The context of the files (mission or setup)"
+    )
     names: list[str] | None = Field(default=None, description="Filter by file names (exact matches)")
     file_ids: list[str] | None = Field(default=None, description="Filter by file IDs")
     file_types: (
@@ -90,15 +93,22 @@ class FilesystemStrategy(BaseStrategy, ABC):
     filtering, and pagination.
     """
 
-    def __init__(self, mission_id: str, setup_version_id: str, config: dict[str, Any] | None = None) -> None:
+    def __init__(
+        self,
+        mission_id: str,
+        setup_id: str,
+        setup_version_id: str,
+        config: dict[str, Any] | None = None,
+    ) -> None:
         """Initialize the strategy.
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup
             setup_version_id: The ID of the setup version this strategy is associated with
             config: Configuration for the filesystem strategy
         """
-        super().__init__(mission_id, setup_version_id)
+        super().__init__(mission_id, setup_id, setup_version_id)
         self.config = config
 
     @abstractmethod
@@ -123,9 +133,10 @@ class FilesystemStrategy(BaseStrategy, ABC):
     def get_file(
         self,
         file_id: str,
+        context: Literal["mission", "setup"] = "mission",
         *,
         include_content: bool = False,
-    ) -> tuple[FilesystemRecord, bytes | None]:
+    ) -> FilesystemRecord:
         """Get a specific file by ID or name.
 
         This method fetches detailed information about a single file,
@@ -134,6 +145,7 @@ class FilesystemStrategy(BaseStrategy, ABC):
 
         Args:
             file_id: The ID of the file to be retrieved
+            context: The context of the files (mission or setup)
             include_content: Whether to include file content in response
 
         Returns:

digitalkin/services/filesystem/grpc_filesystem.py

@@ -85,25 +85,8 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         except AttributeError:
             return filesystem_pb2.FileStatus.FILE_STATUS_UNSPECIFIED
 
-    def _filter_to_proto(self, filters: FileFilter) -> filesystem_pb2.FileFilter:
-        """Convert a FileFilter to a FileFilter proto message.
-
-        Args:
-            filters: The FileFilter to convert
-
-        Returns:
-            filesystem_pb2.FileFilter: The converted FileFilter proto message
-        """
-        return filesystem_pb2.FileFilter(
-            context=self.mission_id,
-            **filters.model_dump(exclude={"file_types", "status"}),
-            file_types=[self._file_type_to_enum(file_type) for file_type in filters.file_types]
-            if filters.file_types
-            else None,
-            status=self._file_status_to_enum(filters.status) if filters.status else None,
-        )
-
-    def _file_proto_to_data(self, file: filesystem_pb2.File) -> FilesystemRecord:
+    @staticmethod
+    def _file_proto_to_data(file: filesystem_pb2.File) -> FilesystemRecord:
         """Convert a File proto message to FilesystemRecord.
 
         Args:
@@ -114,7 +97,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         """
         return FilesystemRecord(
             id=file.file_id,
-            context=self.mission_id,
+            context=file.context,
             name=file.name,
             file_type=filesystem_pb2.FileType.Name(file.file_type),
             content_type=file.content_type,
@@ -127,9 +110,27 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
             content=file.content,
         )
 
+    def _filter_to_proto(self, filters: FileFilter) -> filesystem_pb2.FileFilter:
+        """Convert a FileFilter to a FileFilter proto message.
+
+        Args:
+            filters: The FileFilter to convert
+
+        Returns:
+            filesystem_pb2.FileFilter: The converted FileFilter proto message
+        """
+        return filesystem_pb2.FileFilter(
+            **filters.model_dump(exclude={"file_types", "status"}),
+            file_types=[self._file_type_to_enum(file_type) for file_type in filters.file_types]
+            if filters.file_types
+            else None,
+            status=self._file_status_to_enum(filters.status) if filters.status else None,
+        )
+
     def __init__(
         self,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
         client_config: ClientConfig,
         config: dict[str, Any] | None = None,
@@ -138,11 +139,12 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup
             setup_version_id: The ID of the setup version this strategy is associated with
             client_config: Configuration for the gRPC client connection
             config: Configuration for the filesystem strategy
         """
-        super().__init__(mission_id, setup_version_id, config)
+        super().__init__(mission_id, setup_id, setup_version_id, config)
         self.service_name = "FilesystemService"
         channel = self._init_channel(client_config)
         self.stub = filesystem_service_pb2_grpc.FilesystemServiceStub(channel)
@@ -189,6 +191,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
     def get_file(
         self,
         file_id: str,
+        context: Literal["mission", "setup"] = "mission",
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:
@@ -196,6 +199,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
 
         Args:
             file_id: The ID of the file to be retrieved
+            context: The context of the files (mission or setup)
             include_content: Whether to include file content in response
 
         Returns:
@@ -204,9 +208,14 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         Raises:
             FilesystemServiceError: If there is an error retrieving the file
         """
+        match context:
+            case "setup":
+                context_id = self.setup_id
+            case "mission":
+                context_id = self.mission_id
         with GrpcFilesystem._handle_grpc_errors("GetFile"):
             request = filesystem_pb2.GetFileRequest(
-                context=self.mission_id,
+                context=context_id,
                 file_id=file_id,
                 include_content=include_content,
             )
@@ -320,7 +329,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         """
         with GrpcFilesystem._handle_grpc_errors("GetFiles"):
             request = filesystem_pb2.GetFilesRequest(
-                context=self.mission_id,
+                context=filters.context,
                 filters=self._filter_to_proto(filters),
                 include_content=include_content,
                 list_size=list_size,

digitalkin/services/services_config.py

@@ -111,12 +111,13 @@ class ServicesConfig(BaseModel):
         """
         return getattr(self, f"_config_{name}", {})
 
-    def init_strategy(self, name: str, mission_id: str, setup_version_id: str) -> ServicesStrategy:
+    def init_strategy(self, name: str, mission_id: str, setup_id: str, setup_version_id: str) -> ServicesStrategy:
         """Initialize a specific strategy.
 
         Args:
             name: The name of the strategy to initialize
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The setup ID for the strategy
             setup_version_id: The setup version ID for the strategy
 
         Returns:
@@ -131,7 +132,7 @@ class ServicesConfig(BaseModel):
             raise ValueError(msg)
 
         # Instantiate the strategy with the mission ID, setup version ID, and configuration
-        return strategy_type(mission_id, setup_version_id, **self.get_strategy_config(name) or {})
+        return strategy_type(mission_id, setup_id, setup_version_id, **self.get_strategy_config(name) or {})
 
     @property
     def storage(self) -> type[StorageStrategy]:

digitalkin/services/storage/default_storage.py

@@ -215,13 +215,14 @@ class DefaultStorage(StorageStrategy):
     def __init__(
         self,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
         config: dict[str, type[BaseModel]],
         storage_file_path: str = "local_storage",
         **kwargs,  # noqa: ANN003, ARG002
     ) -> None:
         """Initialize the storage."""
-        super().__init__(mission_id=mission_id, setup_version_id=setup_version_id, config=config)
+        super().__init__(mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id, config=config)
         self.storage_file_path = f"{self.mission_id}_{storage_file_path}.json"
         self.storage_file = Path(self.storage_file_path)
         self.storage = self._load_from_file()

digitalkin/services/storage/grpc_storage.py

@@ -200,13 +200,14 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
     def __init__(
         self,
         mission_id: str,
+        setup_id: str,
         setup_version_id: str,
         config: dict[str, type[BaseModel]],
         client_config: ClientConfig,
         **kwargs,  # noqa: ANN003, ARG002
     ) -> None:
         """Initialize the storage."""
-        super().__init__(mission_id=mission_id, setup_version_id=setup_version_id, config=config)
+        super().__init__(mission_id=mission_id, setup_id=setup_id, setup_version_id=setup_version_id, config=config)
 
         channel = self._init_channel(client_config)
         self.stub = storage_service_pb2_grpc.StorageServiceStub(channel)

digitalkin/services/storage/storage_strategy.py

@@ -163,15 +163,22 @@ class StorageStrategy(BaseStrategy, ABC):
             True if the deletion was successful, False otherwise
         """
 
-    def __init__(self, mission_id: str, setup_version_id: str, config: dict[str, type[BaseModel]]) -> None:
+    def __init__(
+        self,
+        mission_id: str,
+        setup_id: str,
+        setup_version_id: str,
+        config: dict[str, type[BaseModel]],
+    ) -> None:
         """Initialize the storage strategy.
 
         Args:
             mission_id: The ID of the mission this strategy is associated with
+            setup_id: The ID of the setup
             setup_version_id: The ID of the setup version
             config: A dictionary mapping names to Pydantic model classes
         """
-        super().__init__(mission_id, setup_version_id)
+        super().__init__(mission_id, setup_id, setup_version_id)
         # Schema configuration mapping keys to model classes
         self.config: dict[str, type[BaseModel]] = config
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.2.19
+Version: 0.2.21
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International
@@ -462,9 +462,9 @@ Requires-Dist: typos>=1.34.0; extra == "dev"
 Requires-Dist: ruff>=0.12.5; extra == "dev"
 Requires-Dist: mypy>=1.17.0; extra == "dev"
 Requires-Dist: pyright>=1.1.403; extra == "dev"
-Requires-Dist: pre-commit>=4.2.0; extra == "dev"
+Requires-Dist: pre-commit>=4.3.0; extra == "dev"
 Requires-Dist: bump2version>=1.0.1; extra == "dev"
-Requires-Dist: build>=1.2.2; extra == "dev"
+Requires-Dist: build>=1.3.0; extra == "dev"
 Requires-Dist: twine>=6.1.0; extra == "dev"
 Requires-Dist: cryptography>=45.0.5; extra == "dev"
 Provides-Extra: examples

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

@@ -7,13 +7,13 @@ 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=LHM4OqKaSNrr7rgQKMrzY_uftKOe1OypsBhuoDm0K6Q,191
+digitalkin/__version__.py,sha256=QJb8Hs9hhnpQm5I47kYxQurSZN7wI4xdHPE8xSSPwIA,191
 digitalkin/logger.py,sha256=cFbIAZHOFx3nddOssRNYLXyqUPzR4CgDR_c-5wmB-og,1685
 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=FSPcGHoEH_hfuGNDpNNN-bifSsxRnY-vOUBRZlE8hb4,18441
+digitalkin/grpc_servers/module_servicer.py,sha256=dnEozIDwkAoinh3lIbT3ZJ9YANlghC3iiQKNYFNHmTI,18805
 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
@@ -30,30 +30,30 @@ digitalkin/models/services/__init__.py,sha256=HsW7MUGFPvH7Ri28WN4BHHBfEQk5dzU_9F
 digitalkin/models/services/cost.py,sha256=QTEuFD6xz62nob0z4ksE-INJWcZ-iFiuNW5mvXhpFes,1599
 digitalkin/models/services/storage.py,sha256=cYTVIriGKiprF9OerhSxmc_jM6fUTVwmeon1yQCinkE,143
 digitalkin/modules/__init__.py,sha256=VwVbKok81NGyPIBZgEj_SR-59G8tTlSb4eBJI9W6Vx4,281
-digitalkin/modules/_base_module.py,sha256=JxiInXqnSltdiUjZMkRejURCBJ5MCBXz6SCsYKx-c0Q,16889
+digitalkin/modules/_base_module.py,sha256=uZ19kOgF-z5iEXjtfp0mBlex5XnifvuxFc7_Gj810qE,17365
 digitalkin/modules/archetype_module.py,sha256=lOe3yYufwfylZR_VGy1w-zqdqVaMI_JANfKkbH9eODE,471
 digitalkin/modules/tool_module.py,sha256=h9oo2vrFJdiBLW2qL_m79a9hEzfXV0L6bZd4KD5OSQs,422
 digitalkin/modules/trigger_handler.py,sha256=TpxFc_xkYia9B9rAvHkj02e818W08JOfIqssQqbsCpM,1785
-digitalkin/modules/job_manager/base_job_manager.py,sha256=3t2OPqlsFGKsKAEUsPS0hPin1uZGmeSUhK8prWwaoKI,5987
+digitalkin/modules/job_manager/base_job_manager.py,sha256=4qrCw68ZAleZp8vnpd1qYH320aQO0ApH2cZrKM87Grk,6121
 digitalkin/modules/job_manager/job_manager_models.py,sha256=onHy-DfInLZQveniMIWIKwTKSQjojz500JvHB54x93c,1129
-digitalkin/modules/job_manager/single_job_manager.py,sha256=Yx8uk97GPauZWnMOPtu3HAQ110-tsfOsMiTPosJ2AV8,10287
-digitalkin/modules/job_manager/taskiq_broker.py,sha256=rj7jXp-5K9345HY-ECueu5BPBFRP9Os_BiM-EgVjK_c,7304
-digitalkin/modules/job_manager/taskiq_job_manager.py,sha256=9rQBqmidamkblvZLzDdz8C1TVVIxQ-vZfxZXUR-NRw8,10038
+digitalkin/modules/job_manager/single_job_manager.py,sha256=nMC1BX6G62Ehmam7aVSAlKW9ShJDB1ntuMq7KbD_sSI,10564
+digitalkin/modules/job_manager/taskiq_broker.py,sha256=4q3U03SNlb1ypup0VOa73KHLKJ9peuZUPCR5eFLMNAk,7498
+digitalkin/modules/job_manager/taskiq_job_manager.py,sha256=JxvNS95J_kEuRP08PvC3pQIO3DL8V1GRv7u6WUG59xg,10254
 digitalkin/services/__init__.py,sha256=LqGk_5DJy8Bzz62ajIq9jCeYNKQUIgtSCpafZk15FLc,910
-digitalkin/services/base_strategy.py,sha256=QAQnJw1BbqcYMSzwlFyhHP5juBH2WKrZzWxqDr_sDHI,638
-digitalkin/services/services_config.py,sha256=4hc7-rHgSigoS3SuV0V9FReD2Dz7XoMXcD6iMBP2KKM,7391
+digitalkin/services/base_strategy.py,sha256=yA9KUJGRKuuaxA6l3GcMv8zKfWoIsW03UxJT80Yea2I,766
+digitalkin/services/services_config.py,sha256=JnyzZcG7OYBelwgn-wdVgY2n3yFTEkwLPHRZB8Tjw10,7468
 digitalkin/services/services_models.py,sha256=5zXkWcfKnXGwQi9sN4OAL3XrgqOcmsTl8ai5Mi4RPsw,1668
 digitalkin/services/agent/__init__.py,sha256=vJc8JN0pdtA8ecypLBeHrwAUIW6H2C8NyW-dk24rTpk,244
 digitalkin/services/agent/agent_strategy.py,sha256=42Q9RciHX6tg3CgDQkbrlIx4h_TX0WIuSpLmCjitVmA,492
 digitalkin/services/agent/default_agent.py,sha256=4N_E_eQxJGOx1KVUUg5jNOje-3ncMxF3ePB-uDuGrJc,345
 digitalkin/services/cost/__init__.py,sha256=Wi9ZB4LSXFsUYgkX-V1UJQkVXYDNDpp8q2dXccR2uRM,303
-digitalkin/services/cost/cost_strategy.py,sha256=VhHeqi9WnE1yoDBBVp5qmqwIt5tTZHU6_Z_jld8CVeE,2535
-digitalkin/services/cost/default_cost.py,sha256=mEd0VL_tMcGU41q0f9MFeBYeKZBenv0mIHuwgXlQ7uQ,3869
-digitalkin/services/cost/grpc_cost.py,sha256=p_5mG72N7e4bxwBOD9DNokvLtinBILiqCfllmkqpmhw,6253
+digitalkin/services/cost/cost_strategy.py,sha256=MpPX33P_S5b2by6F4zT-rcyeRuh2V4NYPZe05VpDOGQ,2649
+digitalkin/services/cost/default_cost.py,sha256=XE7kNFde8NmbulU9m1lc3mi-vHFkbaJf0XHUc0D4UHE,3945
+digitalkin/services/cost/grpc_cost.py,sha256=cGtb0atPXSEEOrNIWee-o3ScfNRSAFXJGDu0vcWT6zg,6295
 digitalkin/services/filesystem/__init__.py,sha256=BhwMl_BUvM0d65fmglkp0SVwn3RfYiUOKJgIMnOCaGM,381
-digitalkin/services/filesystem/default_filesystem.py,sha256=pQI7Sc9WNJrxxwd21iIviWcrKKuxuj3BdoAT-rghYGk,15023
-digitalkin/services/filesystem/filesystem_strategy.py,sha256=MlSgEDjjCy1GjtpdO_rKiF2NtfP4DpSU_VF2UtwQ7Ug,9130
-digitalkin/services/filesystem/grpc_filesystem.py,sha256=W-TYe76Zbf2KS0Z4NMVUjRdP6m2IzU7-VXiBdecOjpk,12489
+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/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
@@ -68,22 +68,22 @@ digitalkin/services/snapshot/__init__.py,sha256=Uzlnzo0CYlSpVsdiI37hW7xQk8hu3YA1
 digitalkin/services/snapshot/default_snapshot.py,sha256=Mb8QwWRsHh9I_tN0ln_ZiFa1QCZxOVWmuVLemQOTWpc,1058
 digitalkin/services/snapshot/snapshot_strategy.py,sha256=B1TU3V_k9A-OdqBkdyc41-ihnrW5Btcwd1KyQdHT46A,898
 digitalkin/services/storage/__init__.py,sha256=T-ocYLLphudkQgzvG47jBOm5GQsRFRIGA88y7Ur4akg,341
-digitalkin/services/storage/default_storage.py,sha256=m53sLOx0JVbua4weD_4GQBKK3c0UDf9HC5BnvSJAkvg,7933
-digitalkin/services/storage/grpc_storage.py,sha256=TWllxZGYse6f6AZp3YmYbskojOFTO1VkGSVde1zdQ6Q,7164
-digitalkin/services/storage/storage_strategy.py,sha256=vZWPk49AyJs7RwhSfUwDiTG1A7C4Ccd8y-VVPslyf0w,8734
+digitalkin/services/storage/default_storage.py,sha256=D8e-UYUkb2GvDEHMWcN3EkcIKXWA8DrsaQsXVjoXAYQ,7975
+digitalkin/services/storage/grpc_storage.py,sha256=3ZHGq3wnbF8dZjJcYN1EGTEUXA4rur0XEGtTBwAcGB4,7206
+digitalkin/services/storage/storage_strategy.py,sha256=sERF5tIJnzpb1iNqTXic9xRkGaXMifo6kb709ubB-Yo,8848
 digitalkin/utils/__init__.py,sha256=sJnY-ZUgsjMfojAjONC1VN14mhgIDnzyOlGkw21rRnM,28
 digitalkin/utils/arg_parser.py,sha256=nvjI1pKDY1HfS0oGcMQPtdTQcggXLtpxXMbnMxNEKRU,3109
 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.19.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.2.21.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.19.dist-info/METADATA,sha256=9gzMCkxF-zbZRMDfEzcTTrD6kde7pgMdyM-ckPv_wR0,30579
-digitalkin-0.2.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-digitalkin-0.2.19.dist-info/top_level.txt,sha256=gcjqlyrZuLjIyxrOIavCQM_olpr6ND5kPKkZd2j0xGo,40
-digitalkin-0.2.19.dist-info/RECORD,,
+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,,