digitalkin 0.2.20__py3-none-any.whl → 0.2.22__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.20"
+    __version__ = "0.2.22"

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
@@ -157,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()))

digitalkin/services/filesystem/default_filesystem.py

@@ -84,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)
@@ -215,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:
@@ -226,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:

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: (
@@ -130,6 +133,7 @@ class FilesystemStrategy(BaseStrategy, ABC):
     def get_file(
         self,
         file_id: str,
+        context: Literal["mission", "setup"] = "mission",
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:
@@ -141,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.setup_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.setup_id,
+            context=file.context,
             name=file.name,
             file_type=filesystem_pb2.FileType.Name(file.file_type),
             content_type=file.content_type,
@@ -127,6 +110,23 @@ 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,
@@ -172,7 +172,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
                     metadata_struct.update(file.metadata)
                 upload_files.append(
                     filesystem_pb2.UploadFileData(
-                        context=self.setup_id,
+                        context=self.mission_id,
                         name=file.name,
                         file_type=self._file_type_to_enum(file.file_type),
                         content_type=file.content_type or "application/octet-stream",
@@ -191,6 +191,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
     def get_file(
         self,
         file_id: str,
+        context: Literal["mission", "setup"] = "mission",
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:
@@ -198,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:
@@ -206,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.setup_id,
+                context=context_id,
                 file_id=file_id,
                 include_content=include_content,
             )
@@ -256,7 +263,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         """
         with GrpcFilesystem._handle_grpc_errors("UpdateFile"):
             request = filesystem_pb2.UpdateFileRequest(
-                context=self.setup_id,
+                context=self.mission_id,
                 file_id=file_id,
                 content=content,
                 file_type=self._file_type_to_enum(file_type) if file_type else None,
@@ -290,7 +297,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         """
         with GrpcFilesystem._handle_grpc_errors("DeleteFiles"):
             request = filesystem_pb2.DeleteFilesRequest(
-                context=self.setup_id,
+                context=self.mission_id,
                 filters=self._filter_to_proto(filters),
                 permanent=permanent,
                 force=force,
@@ -320,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=self.setup_id,
+                context=context_id,
                 filters=self._filter_to_proto(filters),
                 include_content=include_content,
                 list_size=list_size,

{digitalkin-0.2.20.dist-info → digitalkin-0.2.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.2.20
+Version: 0.2.22
 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.20.dist-info → digitalkin-0.2.22.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=xyy1KDxstIdKxcpHjRqocBqBoSJHYg0P7CqiadzMtOo,191
+digitalkin/__version__.py,sha256=Fv41tGy4IXZqByuVB-6U6fI-NrUwsO6YXQ_VYoZtjmE,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=L7xzrFChGNUNdUGylmTz0Uy73gGWvjSp5nesI3Z-mC0,18547
+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
@@ -51,9 +51,9 @@ digitalkin/services/cost/cost_strategy.py,sha256=MpPX33P_S5b2by6F4zT-rcyeRuh2V4N
 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=3chjexNaAP8_t5RT6SvHjO1w5kKv5ZZp8kMocvFt-9U,15088
-digitalkin/services/filesystem/filesystem_strategy.py,sha256=k2hujknNnQwUktJKUuXU_COv-eGJuMJpe1gVkikWYVY,9223
-digitalkin/services/filesystem/grpc_filesystem.py,sha256=NB415FFWOSZDvzgFAhji7VVXG8zXCSspY3R0JZSUbWw,12550
+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=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.20.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.2.22.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.20.dist-info/METADATA,sha256=2sPBkq_RDcLjtEe_BGZHPYJSWsYRzYXwDrDLaEOd_-c,30579
-digitalkin-0.2.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-digitalkin-0.2.20.dist-info/top_level.txt,sha256=gcjqlyrZuLjIyxrOIavCQM_olpr6ND5kPKkZd2j0xGo,40
-digitalkin-0.2.20.dist-info/RECORD,,
+digitalkin-0.2.22.dist-info/METADATA,sha256=3GGfNJVjNOaH-Zw9q4bK0Db345xqTrDzzQvgfygihnU,30579
+digitalkin-0.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+digitalkin-0.2.22.dist-info/top_level.txt,sha256=gcjqlyrZuLjIyxrOIavCQM_olpr6ND5kPKkZd2j0xGo,40
+digitalkin-0.2.22.dist-info/RECORD,,