digitalkin 0.2.5__py3-none-any.whl → 0.2.6__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.5"
+    __version__ = "0.2.6"

digitalkin/services/filesystem/grpc_filesystem.py

@@ -10,7 +10,7 @@ from digitalkin_proto.digitalkin.filesystem.v2.filesystem_pb2 import FileType as
 
 from digitalkin.grpc_servers.utils.exceptions import ServerError
 from digitalkin.grpc_servers.utils.grpc_client_wrapper import GrpcClientWrapper
-from digitalkin.grpc_servers.utils.models import ServerConfig
+from digitalkin.grpc_servers.utils.models import ClientConfig
 from digitalkin.services.filesystem.filesystem_strategy import (
     FilesystemData,
     FilesystemServiceError,
@@ -28,7 +28,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         self,
         mission_id: str,
         config: dict[str, str],
-        server_config: ServerConfig,
+        client_config: ClientConfig,
         **kwargs,  # noqa: ANN003, ARG002
     ) -> None:
         """Initialize the default filesystem strategy.
@@ -36,11 +36,11 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper):
         Args:
             mission_id: The ID of the mission this strategy is associated with
             config: A dictionary mapping names to Pydantic model classes
-            server_config: The server configuration object
+            client_config: The client configuration object
             kwargs: other optional arguments to pass to the parent class constructor
         """
         super().__init__(mission_id, config)
-        channel = self._init_channel(server_config)
+        channel = self._init_channel(client_config)
         self.stub = filesystem_service_pb2_grpc.FilesystemServiceStub(channel)
         logger.info("Channel client 'Filesystem' initialized succesfully")
 

digitalkin/services/storage/grpc_storage.py

@@ -8,8 +8,8 @@ from google.protobuf.struct_pb2 import Struct
 from pydantic import BaseModel
 
 from digitalkin.grpc_servers.utils.grpc_client_wrapper import GrpcClientWrapper
-from digitalkin.grpc_servers.utils.models import ServerConfig
-from digitalkin.services.storage.storage_strategy import StorageRecord, StorageServiceError, StorageStrategy
+from digitalkin.grpc_servers.utils.models import ClientConfig
+from digitalkin.services.storage.storage_strategy import DataType, StorageRecord, StorageServiceError, StorageStrategy
 
 logger = logging.getLogger(__name__)
 
@@ -21,13 +21,13 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
         self,
         mission_id: str,
         config: dict[str, type[BaseModel]],
-        server_config: ServerConfig,
+        client_config: ClientConfig,
         **kwargs,  # noqa: ANN003, ARG002
     ) -> None:
         """Initialize the storage."""
         super().__init__(mission_id=mission_id, config=config)
 
-        channel = self._init_channel(server_config)
+        channel = self._init_channel(client_config)
         self.stub = storage_service_pb2_grpc.StorageServiceStub(channel)
         logger.info("Channel client 'storage' initialized succesfully")
 
@@ -98,7 +98,7 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
 
             request = data_pb2.ModifyRecordRequest(data=data_struct, mission_id=self.mission_id, name=name)
             response: data_pb2.ModifyRecordResponse = self.exec_grpc_query("ModifyRecord", request)
-            return StorageRecord(**json_format.MessageToDict(response.stored_data))
+            return self._build_record_from_proto(response.stored_data, name)
         except Exception:
             msg = f"Error while modifing record {name}"
             logger.exception(msg)
@@ -121,3 +121,36 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             logger.exception(msg)
             return False
         return True
+
+    def _build_record_from_proto(self, stored_data: data_pb2.StorageRecord, default_name: str) -> StorageRecord:
+        """Helper to construire un StorageRecord complet à partir du message gRPC.
+
+        Args:
+            stored_data: Le message gRPC contenant les données stockées.
+            default_name: Le nom par défaut à utiliser si le nom n'est pas présent dans les données.
+
+        Returns:
+            StorageRecord: Un objet StorageRecord construit à partir des données stockées.
+        """
+        # Converti en dict, avec tous les champs même s'ils sont absents
+        raw = json_format.MessageToDict(
+            stored_data,
+            preserving_proto_field_name=True,
+            always_print_fields_with_no_presence=True,
+        )
+        # On récupère ou on complète les champs obligatoires
+        name = raw.get("name", default_name)
+        dtype = raw.get("data_type", DataType.OUTPUT.name)
+        payload = raw.get("data", {})
+
+        # Valide le modèle pydantic pour le champ `data`
+        validated = self._validate_data(name, payload)
+
+        return StorageRecord(
+            mission_id=self.mission_id,
+            name=name,
+            data_type=DataType[dtype],
+            data=validated,
+            creation_date=raw.get("creation_date"),
+            update_date=raw.get("update_date"),
+        )

{digitalkin-0.2.5.dist-info → digitalkin-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.2.5
+Version: 0.2.6
 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.5.dist-info → digitalkin-0.2.6.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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=rNDXhMY4crjuy0nWOXRh9ypmALKFI7DzYaHCTDZkRl8,190
+digitalkin/__version__.py,sha256=oM4jNCAYWlE0yUk_rpWiJCYE3Pyq4cZrXpraEmj9p-E,190
 digitalkin/logger.py,sha256=9cDgyJV2QXXT8F--xRODFlZyDgjuTTXNdpCU3GdqCsk,382
 digitalkin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalkin/grpc_servers/__init__.py,sha256=0cJBlwipSmFdXkyH3T0i6OJ1WpAtNsZgYX7JaSnkbtg,804
@@ -48,7 +48,7 @@ digitalkin/services/cost/grpc_cost.py,sha256=k0Df_41dwrowBjtz11eqYQyWCMIjY-wEPEy
 digitalkin/services/filesystem/__init__.py,sha256=BhwMl_BUvM0d65fmglkp0SVwn3RfYiUOKJgIMnOCaGM,381
 digitalkin/services/filesystem/default_filesystem.py,sha256=tTOsBt0MSjexKgWm657y8BLppMYJtmJIVdqzsSRRaYk,7264
 digitalkin/services/filesystem/filesystem_strategy.py,sha256=VH93jkijFtyVA6XaH_rsfdSyeEpkqea54NAvHFLJDjM,2216
-digitalkin/services/filesystem/grpc_filesystem.py,sha256=rtVfutPoggB1AG6vcxrSMnUOu20h9tlWFfwoY1PMliw,8180
+digitalkin/services/filesystem/grpc_filesystem.py,sha256=KifdA_1evYA19rib5ZR5WMIrm9_jzr3PF5Sq3s2uI3Q,8180
 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
@@ -63,16 +63,16 @@ digitalkin/services/snapshot/default_snapshot.py,sha256=Mb8QwWRsHh9I_tN0ln_ZiFa1
 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=bHNPm8nLvytKqKP2ntLkikvqH1qDKOwofrStVJH6PJg,7765
-digitalkin/services/storage/grpc_storage.py,sha256=BqWLK9w_03BEjlJCVbdrlbMvh2szGj7-YNXQtLCTiIg,4447
+digitalkin/services/storage/grpc_storage.py,sha256=eSadiI3JuveItx8LdiC3GbjbjnB8GmPqTVxw1uA1-9E,5809
 digitalkin/services/storage/storage_strategy.py,sha256=vGo4aYkEp_GZV11m7vd-xY_Z3gVa5K0gMTzbj2Au_3o,6600
 digitalkin/utils/__init__.py,sha256=sJnY-ZUgsjMfojAjONC1VN14mhgIDnzyOlGkw21rRnM,28
 digitalkin/utils/arg_parser.py,sha256=3YyI6oZhhrlTmPTrzlwpQzbCNWDFAT3pggcLxNtJoc0,4388
-digitalkin-0.2.5.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.2.6.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
 modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modules/minimal_llm_module.py,sha256=i9KTbv8w1ekzRYWDiRsxD6xLCoZ3uDjD_hWgfY2PRys,5637
+modules/minimal_llm_module.py,sha256=W-E3OrRbAsRJ6hvSeTU8pzmacdJC_PbcWfDapRv5A1A,5617
 modules/storage_module.py,sha256=bu52lW4RFcWB8VFDhrpBFfCaTSkVL6so3zrkfW4LO9E,6270
-modules/text_transform_module.py,sha256=fAC6r_Ujca1Tz1qdWL4hTPZFn3gFWIVNj5-rytQMObE,7191
-digitalkin-0.2.5.dist-info/METADATA,sha256=GLLOO0md8f6VLKykUxBJwZ2wTh3NEpBcKdi-V5wKvx8,29125
-digitalkin-0.2.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-digitalkin-0.2.5.dist-info/top_level.txt,sha256=5_5e35inSM5YfWNZE21p5wGBojiVtQQML_WzbEk4BRU,31
-digitalkin-0.2.5.dist-info/RECORD,,
+modules/text_transform_module.py,sha256=1KaA7abwxltKKtbmiW1rkkIK3BTYFPegUq54px0LOQs,7277
+digitalkin-0.2.6.dist-info/METADATA,sha256=MSrxM2ATU0easkm4lkbVJdPbUzoH0xDgbmQ622ACwfM,29125
+digitalkin-0.2.6.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+digitalkin-0.2.6.dist-info/top_level.txt,sha256=5_5e35inSM5YfWNZE21p5wGBojiVtQQML_WzbEk4BRU,31
+digitalkin-0.2.6.dist-info/RECORD,,

{digitalkin-0.2.5.dist-info → digitalkin-0.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

modules/minimal_llm_module.py

@@ -8,7 +8,7 @@ import grpc
 import openai
 from pydantic import BaseModel
 
-from digitalkin.grpc_servers.utils.models import SecurityMode, ServerConfig, ServerMode
+from digitalkin.grpc_servers.utils.models import SecurityMode, ClientConfig, ServerMode
 from digitalkin.modules._base_module import BaseModule
 from digitalkin.services.setup.setup_strategy import SetupData
 
@@ -45,12 +45,11 @@ class OpenAIToolSecret(BaseModel):
     """Secret model defining module configuration parameters."""
 
 
-server_config = ServerConfig(
+client_config = ClientConfig(
     host="[::]",
     port=50151,
     mode=ServerMode.ASYNC,
     security=SecurityMode.INSECURE,
-    max_workers=10,
     credentials=None,
 )
 
@@ -81,11 +80,11 @@ class OpenAIToolModule(BaseModule[OpenAIToolInput, OpenAIToolOutput, OpenAIToolS
     services_config_params = {
         "storage": {
             "config": {"setups": OpenAIToolSetup},
-            "server_config": server_config,
+            "client_config": client_config,
         },
         "filesystem": {
             "config": {},
-            "server_config": server_config,
+            "client_config": client_config,
         },
     }
 

modules/text_transform_module.py

@@ -6,7 +6,7 @@ from typing import Any, ClassVar
 
 from pydantic import BaseModel
 
-from digitalkin.grpc_servers.utils.models import SecurityMode, ServerConfig, ServerMode
+from digitalkin.grpc_servers.utils.models import SecurityMode, ClientConfig, ServerMode
 from digitalkin.modules._base_module import BaseModule
 from digitalkin.services.setup.setup_strategy import SetupData
 from digitalkin.services.storage.storage_strategy import DataType, StorageRecord
@@ -54,12 +54,11 @@ class TextTransformStorage(BaseModel):
     ended: bool = False
 
 
-server_config = ServerConfig(
+client_config = ClientConfig(
     host="[::]",
     port=50151,
     mode=ServerMode.ASYNC,
     security=SecurityMode.INSECURE,
-    max_workers=10,
     credentials=None,
 )
 
@@ -91,8 +90,12 @@ class TextTransformModule(BaseModule[TextTransformInput, TextTransformOutput, Te
     services_config_params = {
         "storage": {
             "config": {"monitor": TextTransformStorage, "setups": TextTransformStorage},
-            "server_config": server_config,
-        }
+            "client_config": client_config,
+        },
+        "filesystem": {
+            "config": {},
+            "client_config": client_config,
+        },
     }
 
     async def initialize(self, setup_data: SetupData) -> None: