mgraph-ai-service-cache-client 0.3.0__tar.gz → 0.18.0__tar.gz

{mgraph_ai_service_cache_client-0.3.0 → mgraph_ai_service_cache_client-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mgraph_ai_service_cache__client
-Version: 0.3.0
+Version: 0.18.0
 Summary: MGraph-AI__Service__Cache__Client
 Home-page: https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client
 License: Apache 2.0
@@ -10,14 +10,13 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: mgraph_ai_service_cache
 Requires-Dist: osbot-fast-api-serverless
 Project-URL: Repository, https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client
 Description-Content-Type: text/markdown
 
 # MGraph AI Service Cache Client
 
-[![Current Release](https://img.shields.io/badge/release-v0.3.0-blue)](https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client/releases)
+[![Current Release](https://img.shields.io/badge/release-v0.18.0-blue)](https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client/releases)
 [![Python](https://img.shields.io/badge/python-3.12-blue)](https://www.python.org/downloads/)
 [![FastAPI](https://img.shields.io/badge/FastAPI-0.116.1-009688)](https://fastapi.tiangolo.com/)
 [![AWS Lambda](https://img.shields.io/badge/AWS-Lambda-orange)](https://aws.amazon.com/lambda/)

{mgraph_ai_service_cache_client-0.3.0 → mgraph_ai_service_cache_client-0.18.0}/README.md

@@ -1,6 +1,6 @@
 # MGraph AI Service Cache Client
 
-[![Current Release](https://img.shields.io/badge/release-v0.3.0-blue)](https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client/releases)
+[![Current Release](https://img.shields.io/badge/release-v0.18.0-blue)](https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client/releases)
 [![Python](https://img.shields.io/badge/python-3.12-blue)](https://www.python.org/downloads/)
 [![FastAPI](https://img.shields.io/badge/FastAPI-0.116.1-009688)](https://fastapi.tiangolo.com/)
 [![AWS Lambda](https://img.shields.io/badge/AWS-Lambda-orange)](https://aws.amazon.com/lambda/)

mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client/Client__Cache__Service.py

@@ -0,0 +1,22 @@
+from fastapi                                                                                        import FastAPI
+from osbot_utils.decorators.methods.cache_on_self                                                   import cache_on_self
+from osbot_utils.type_safe.Type_Safe                                                                import Type_Safe
+from osbot_utils.type_safe.type_safe_core.decorators.type_safe                                      import type_safe
+from mgraph_ai_service_cache_client.client.client_contract.Cache__Service__Fast_API__Client         import Cache__Service__Fast_API__Client
+from mgraph_ai_service_cache_client.client.client_contract.Cache__Service__Fast_API__Client__Config import Cache__Service__Fast_API__Client__Config
+
+# todo: question: should this be called Client__Cache_Service (would make sense when we have multiple of these happening at the same time:
+#                                                              like Client__Http_Service, Client__LLMs_Service, Client__News_Service, etc..
+class Client__Cache__Service(Type_Safe):
+    config   : Cache__Service__Fast_API__Client__Config
+
+    @cache_on_self
+    def client(self):
+        return Cache__Service__Fast_API__Client(config=self.config)
+
+    @type_safe
+    def set__fast_api_app(self,
+                          app: FastAPI
+                    ) -> 'Client__Cache__Service':
+        self.config.fast_api_app = app
+        return self

mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client/client_contract/Cache__Service__Fast_API__Client.py

@@ -0,0 +1,96 @@
+from mgraph_ai_service_cache_client.client.requests.schemas.enums.Enum__Client__Mode            import Enum__Client__Mode
+from mgraph_ai_service_cache_client.schemas.consts.consts__Cache_Client                         import ENV_VAR__AUTH__TARGET_SERVER__CACHE_SERVICE__KEY_NAME, ENV_VAR__AUTH__TARGET_SERVER__CACHE_SERVICE__KEY_VALUE, ENV_VAR__URL__TARGET_SERVER__CACHE_SERVICE
+from osbot_utils.utils.Env                                                                      import get_env
+from mgraph_ai_service_cache_client.client.requests.Cache__Service__Fast_API__Client__Requests  import Cache__Service__Fast_API__Client__Requests
+from osbot_utils.type_safe.Type_Safe                                                            import Type_Safe
+from osbot_utils.decorators.methods.cache_on_self                                               import cache_on_self
+from .Cache__Service__Fast_API__Client__Config                                                  import Cache__Service__Fast_API__Client__Config
+from .namespaces.Service__Fast_API__Client__Namespace                                           import Service__Fast_API__Client__Namespaces
+from .store.Service__Fast_API__Client__File__Store                                              import Service__Fast_API__Client__File__Store
+from .retrieve.Service__Fast_API__Client__File__Retrieve                                        import Service__Fast_API__Client__File__Retrieve
+from .exists.Service__Fast_API__Client__File__Exists                                            import Service__Fast_API__Client__File__Exists
+from .delete.Service__Fast_API__Client__File__Delete                                            import Service__Fast_API__Client__File__Delete
+from .data_store.Service__Fast_API__Client__Data__Store                                         import Service__Fast_API__Client__Data__Store
+from .data.Service__Fast_API__Client__Data                                                      import Service__Fast_API__Client__Data
+from .update.Service__Fast_API__Client__File__Update                                            import Service__Fast_API__Client__File__Update
+from .zip.Service__Fast_API__Client__Zip                                                        import Service__Fast_API__Client__Zip
+from .namespace.Service__Fast_API__Client__Namespace                                            import Service__Fast_API__Client__Namespace
+from .admin_storage.Service__Fast_API__Client__Admin__Storage                                   import Service__Fast_API__Client__Admin__Storage
+from .server.Service__Fast_API__Client__Server                                                  import Service__Fast_API__Client__Server
+from .info.Service__Fast_API__Client__Info                                                      import Service__Fast_API__Client__Info
+
+class Cache__Service__Fast_API__Client(Type_Safe):
+    config   : Cache__Service__Fast_API__Client__Config
+
+    @cache_on_self
+    def requests(self) -> Cache__Service__Fast_API__Client__Requests:                            # Access the unified request handler
+        self.setup_config_from_env()
+        return Cache__Service__Fast_API__Client__Requests(config=self.config)
+
+    def setup_config_from_env(self):
+        key_name   = get_env(ENV_VAR__AUTH__TARGET_SERVER__CACHE_SERVICE__KEY_NAME  )
+        key_value  = get_env(ENV_VAR__AUTH__TARGET_SERVER__CACHE_SERVICE__KEY_VALUE )
+        target_url = get_env(ENV_VAR__URL__TARGET_SERVER__CACHE_SERVICE             )
+        if key_name and key_value and target_url:
+            with self.config as _:
+                _.api_key_header = key_name                                             # todo : see if we have a use case where we shouldn't be overwriting these self.config values
+                _.api_key        = key_value
+                _.base_url       = target_url
+                _.mode           = Enum__Client__Mode.REMOTE
+        return self
+
+    @cache_on_self
+    def store(self) -> Service__Fast_API__Client__File__Store:                               # Access store operations
+        return Service__Fast_API__Client__File__Store(_client=self)
+
+    @cache_on_self
+    def retrieve(self) -> Service__Fast_API__Client__File__Retrieve:                               # Access retrieve operations
+        return Service__Fast_API__Client__File__Retrieve(_client=self)
+
+    @cache_on_self
+    def exists(self) -> Service__Fast_API__Client__File__Exists:                               # Access exists operations
+        return Service__Fast_API__Client__File__Exists(_client=self)
+
+    @cache_on_self
+    def update(self) -> Service__Fast_API__Client__File__Update:                               # Access exists operations
+        return Service__Fast_API__Client__File__Update(_client=self)
+
+    @cache_on_self
+    def delete(self) -> Service__Fast_API__Client__File__Delete:                               # Access delete operations
+        return Service__Fast_API__Client__File__Delete(_client=self)
+
+    @cache_on_self
+    def data_store(self) -> Service__Fast_API__Client__Data__Store:                               # Access data_store operations
+        return Service__Fast_API__Client__Data__Store(_client=self)
+
+    @cache_on_self
+    def data(self) -> Service__Fast_API__Client__Data:                               # Access data operations
+        return Service__Fast_API__Client__Data(_client=self)
+
+    @cache_on_self
+    def zip(self) -> Service__Fast_API__Client__Zip:                               # Access zip operations
+        return Service__Fast_API__Client__Zip(_client=self)
+
+    @cache_on_self
+    def namespace(self) -> Service__Fast_API__Client__Namespace:                               # Access namespace operations
+        return Service__Fast_API__Client__Namespace(requests=self.requests())
+
+    @cache_on_self
+    def namespaces(self) -> Service__Fast_API__Client__Namespaces:                               # Access namespace operations
+        return Service__Fast_API__Client__Namespaces(_client=self)
+
+    @cache_on_self
+    def admin_storage(self) -> Service__Fast_API__Client__Admin__Storage:                               # Access admin_storage operations
+        return Service__Fast_API__Client__Admin__Storage(requests=self.requests())
+
+    @cache_on_self
+    def server(self) -> Service__Fast_API__Client__Server:                               # Access server operations
+        return Service__Fast_API__Client__Server(_client=self)
+
+    @cache_on_self
+    def info(self) -> Service__Fast_API__Client__Info:                               # Access info operations
+        return Service__Fast_API__Client__Info(_client=self)
+
+    # @cache_on_self
+    # def auth(self) -> Service__Fast_API__Client__Auth:                               # Access auth operations
+    #     return Service__Fast_API__Client__Auth(_client=self)

mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client/client_contract/Cache__Service__Fast_API__Client__Config.py

@@ -0,0 +1,23 @@
+from fastapi                                                                                import FastAPI
+from osbot_utils.type_safe.Type_Safe                                                        import Type_Safe
+from osbot_utils.type_safe.primitives.core.Safe_UInt                                        import Safe_UInt
+from osbot_utils.type_safe.primitives.domains.common.safe_str.Safe_Str__Version             import Safe_Str__Version
+from osbot_utils.type_safe.primitives.domains.http.safe_str.Safe_Str__Http__Header__Name    import Safe_Str__Http__Header__Name
+from osbot_utils.type_safe.primitives.domains.http.safe_str.Safe_Str__Http__Header__Value   import Safe_Str__Http__Header__Value
+from osbot_utils.type_safe.primitives.domains.web.safe_str.Safe_Str__Url                    import Safe_Str__Url
+from osbot_utils.type_safe.primitives.domains.identifiers.safe_str.Safe_Str__Id             import Safe_Str__Id
+from mgraph_ai_service_cache_client.client.requests.schemas.enums.Enum__Client__Mode        import Enum__Client__Mode
+from mgraph_ai_service_cache_client.utils.Version                                           import version__mgraph_ai_service_cache_client
+
+CACHE__SERVICE__NAME             = "Cache__Service__Fast_API"
+CACHE__SERVICE__REQUEST__TIMEOUT = 30
+
+class Cache__Service__Fast_API__Client__Config(Type_Safe):
+    base_url             : Safe_Str__Url                 = None
+    api_key              : Safe_Str__Http__Header__Value = None                                       # Optional API key
+    api_key_header       : Safe_Str__Http__Header__Name  = None                                       # Header name for API key
+    mode                 : Enum__Client__Mode            = Enum__Client__Mode.IN_MEMORY
+    fast_api_app         : FastAPI                       = None                                       # FastAPI app for in-memory
+    timeout              : Safe_UInt                     = CACHE__SERVICE__REQUEST__TIMEOUT           # Request timeout in seconds
+    service_name         : Safe_Str__Id                  = CACHE__SERVICE__NAME
+    service_version      : Safe_Str__Version             = version__mgraph_ai_service_cache_client

mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client/client_contract/admin_storage/Service__Fast_API__Client__Admin__Storage.py

@@ -0,0 +1,121 @@
+from typing                                                                                                   import Any, Dict, List
+from osbot_utils.type_safe.Type_Safe                                                                          import Type_Safe
+from mgraph_ai_service_cache_client.client.requests.Cache__Service__Fast_API__Client__Requests                import Cache__Service__Fast_API__Client__Requests
+from mgraph_ai_service_cache_client.schemas.routes.admin.Schema__Routes__Admin__Storage__Files_All__Response  import Schema__Routes__Admin__Storage__Files_All__Response
+
+
+class Service__Fast_API__Client__Admin__Storage(Type_Safe):
+    requests : Cache__Service__Fast_API__Client__Requests
+
+    def bucket_name(self) -> Dict:                              # Auto-generated from endpoint get__bucket_name
+                                                                                    # Build path
+        path = "/admin/storage/bucket-name"
+        body = None
+                                                                                    # Execute request
+        result = self.requests.execute(
+            method = "GET",
+            path   = path,
+            body   = body
+        )
+                                                                                    # Return response data
+        return result.json
+
+    def file__exists(self, path: Any) -> Dict:                              # Auto-generated from endpoint get__file__exists
+                                                                                    # Build path
+        path = f"/admin/storage/file/exists/{path}"                                 # FIXED was {path:path}
+        body = None
+                                                                                    # Execute request
+        result = self.requests.execute(
+            method = "GET",
+            path   = path,
+            body   = body
+        )
+                                                                                    # Return response data
+        return result.json if result.json else {}
+
+    def file__bytes(self, path: Any) -> bytes:                              # Auto-generated from endpoint get__file__bytes
+                                                                                    # Build path
+        path = f"/admin/storage/file/bytes/{path}"
+        body = None
+                                                                                    # Execute request
+        result = self.requests.execute( method = "GET",
+                                        path   = path,
+                                        body   = body)
+        return result.content                                                       # Return response data
+
+    def file__json(self, path: Any) -> Dict:                              # Auto-generated from endpoint get__file__json
+                                                                                    # Build path
+        path = f"/admin/storage/file/json/{path}"
+        body = None
+                                                                                    # Execute request
+        result = self.requests.execute( method = "GET",
+                                        path   = path ,
+                                        body   = body )
+                                                                                    # Return response data
+        return result.json if result.json else {}
+
+    def files__in__path(self,                                                # List files in path
+                        path            : str  = ''    ,
+                        return_full_path: bool = False ,
+                        recursive       : bool = False
+                    ) -> List[str]:
+
+
+        endpoint = f"/admin/storage/files/in/{path}"                                   # Build endpoint
+        params   = []
+
+        if return_full_path:
+            params.append(f"return_full_path={return_full_path}")
+        if recursive:
+            params.append(f"recursive={recursive}")
+
+        if params:
+            endpoint = f"{endpoint}?{'&'.join(params)}"
+
+        result = self.requests.execute(method = "GET",
+                                       path   = endpoint,
+                                       body   = None)
+        return result.json if result.json else []
+
+    def files__all__path(self, path: str) -> Schema__Routes__Admin__Storage__Files_All__Response:     # Auto-generated from endpoint get__files__all__path
+                                                                                    # Build path
+        path = f"/admin/storage/files/all/{path}"
+        body = None
+                                                                                    # Execute request
+        result = self.requests.execute(
+            method = "GET",
+            path   = path,
+            body   = body
+        )
+                                                                                    # Return response data
+        return Schema__Routes__Admin__Storage__Files_All__Response(**result.json)
+        #return result.json if result.json else result.text
+
+    def folders(self,                                                       # List folders in directory path
+                path            : str  = ''   ,                             # Directory path to list folders from
+                return_full_path: bool = False ,                            # If True, return full paths; if False, return relative names
+                recursive       : bool = False                              # If True, list all folders recursively; if False, list only direct children
+           ) -> List[str]:                                                  # List of folder paths (string)
+
+        endpoint = f"/admin/storage/folders/{path}"                         # Build endpoint with path
+        params   = []
+
+        if return_full_path:
+            params.append(f"return_full_path={return_full_path}")
+        if recursive:
+            params.append(f"recursive={recursive}")
+
+        if params:
+            endpoint = f"{endpoint}?{'&'.join(params)}"
+
+        result = self.requests.execute(method = "GET",
+                                        path   = endpoint,
+                                        body   = None)
+        return result.json if result.json else []
+
+    def file__delete(self, path: str) -> Dict[str, Any]:              # Delete a file at path
+        endpoint = f"/admin/storage/file/delete/{path}"                      # Build path
+        result = self.requests.execute(method = "DELETE",
+                                        path   = endpoint,
+                                        body   = None)
+        return result.json if result.json else {}                            # Return dict (empty if error)

{mgraph_ai_service_cache_client-0.3.0/mgraph_ai_service_cache_client → mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client}/client_contract/data/Service__Fast_API__Client__Data__Delete.py

@@ -12,7 +12,7 @@ class Service__Fast_API__Client__Data__Delete(Type_Safe):
 
     def delete__all__data__files(self, cache_id: str, namespace: str) -> Dict:                              # Auto-generated from endpoint delete__delete__all__data__files
                                                                                     # Build path
-        path = f"/{{namespace}}/cache/{{cache_id}}/data/delete/all"
+        path = f"/{namespace}/cache/{cache_id}/data/delete/all"
         body = None
                                                                                     # Execute request
         result = self.requests.execute(
@@ -25,7 +25,7 @@ class Service__Fast_API__Client__Data__Delete(Type_Safe):
 
     def delete__all__data__files__with__key(self, cache_id: str, namespace: str, data_key: str) -> Dict:                              # Auto-generated from endpoint delete__delete__all__data__files__with__key
                                                                                     # Build path
-        path = f"/{{namespace}}/cache/{{cache_id}}/data/delete/all/{data_key:path}"
+        path = f"/{namespace}/cache/{cache_id}/data/delete/all/{data_key}"
         body = None
                                                                                     # Execute request
         result = self.requests.execute(
@@ -38,7 +38,7 @@ class Service__Fast_API__Client__Data__Delete(Type_Safe):
 
     def delete__data__file__with__id(self, cache_id: str, namespace: str, data_type: Enum__Cache__Data_Type, data_file_id: str) -> Dict:                              # Auto-generated from endpoint delete__delete__data__file__with__id
                                                                                     # Build path
-        path = f"/{{namespace}}/cache/{{cache_id}}/data/delete/{{data_type}}/{{data_file_id}}"
+        path = f"/{namespace}/cache/{cache_id}/data/delete/{data_type}/{data_file_id}"
         body = None
                                                                                     # Execute request
         result = self.requests.execute(
@@ -51,7 +51,7 @@ class Service__Fast_API__Client__Data__Delete(Type_Safe):
 
     def delete__data__file__with__id_and_key(self, cache_id: str, namespace: str, data_type: Enum__Cache__Data_Type, data_key: str, data_file_id: str) -> Dict:                              # Auto-generated from endpoint delete__delete__data__file__with__id_and_key
                                                                                     # Build path
-        path = f"/{{namespace}}/cache/{{cache_id}}/data/delete/{{data_type}}/{data_key:path}/{{data_file_id}}"
+        path = f"/{namespace}/cache/{cache_id}/data/delete/{data_type}/{data_key}/{data_file_id}"
         body = None
                                                                                     # Execute request
         result = self.requests.execute(

{mgraph_ai_service_cache_client-0.3.0/mgraph_ai_service_cache_client → mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client}/client_contract/data/Service__Fast_API__Client__Data__Retrieve.py

@@ -1,5 +1,7 @@
-from typing                          import Any, Dict
-from osbot_utils.type_safe.Type_Safe import Type_Safe
+from typing                                                      import Any, Dict
+from osbot_utils.type_safe.Type_Safe                             import Type_Safe
+from osbot_utils.type_safe.type_safe_core.decorators.type_safe   import type_safe
+
 
 class Service__Fast_API__Client__Data__Retrieve(Type_Safe):
     _client: Any                                                                    # Reference to main client
@@ -34,7 +36,12 @@ class Service__Fast_API__Client__Data__Retrieve(Type_Safe):
                                                                                     # Return response data
         return result.json if result.json else result.text
 
-    def data__string__with__id(self, cache_id: str, namespace: str, data_file_id: str) -> Dict:                              # Auto-generated from endpoint get__data__string__with__id
+    @type_safe
+    def data__string__with__id(self,
+                               cache_id: str,
+                               namespace: str,
+                               data_file_id: str
+                          ) -> str:                              # Auto-generated from endpoint get__data__string__with__id
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/string/{data_file_id}"
         body = None
@@ -44,10 +51,15 @@ class Service__Fast_API__Client__Data__Retrieve(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        if result.status_code == 200:
+            return result.text
+        return None
 
-    def data__string__with__id_and_key(self, cache_id: str, namespace: str, data_key: str, data_file_id: str) -> Dict:                              # Auto-generated from endpoint get__data__string__with__id_and_key
+    def data__string__with__id_and_key(self,
+                                       cache_id: str,
+                                       namespace: str,
+                                       data_key: str,
+                                       data_file_id: str) -> Dict:                              # Auto-generated from endpoint get__data__string__with__id_and_key
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/string/{data_key}/{data_file_id}"
         body = None

{mgraph_ai_service_cache_client-0.3.0/mgraph_ai_service_cache_client → mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client}/client_contract/data_store/Service__Fast_API__Client__Data__Store.py

@@ -1,7 +1,8 @@
-from typing  import Any, Dict
-from osbot_utils.type_safe.Type_Safe import Type_Safe
-from osbot_utils.type_safe.primitives.domains.files.safe_str.Safe_Str__File__Path   import Safe_Str__File__Path
-from osbot_utils.type_safe.primitives.domains.identifiers.safe_str.Safe_Str__Id     import Safe_Str__Id
+from typing                                                                                 import Any, Dict
+from osbot_utils.type_safe.Type_Safe                                                        import Type_Safe
+from osbot_utils.type_safe.primitives.domains.files.safe_str.Safe_Str__File__Path           import Safe_Str__File__Path
+from osbot_utils.type_safe.primitives.domains.identifiers.safe_str.Safe_Str__Id             import Safe_Str__Id
+from mgraph_ai_service_cache_client.schemas.cache.data.Schema__Cache__Data__Store__Response import Schema__Cache__Data__Store__Response
 
 
 class Service__Fast_API__Client__Data__Store(Type_Safe):
@@ -11,7 +12,11 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
     def requests(self):                                                             # Access the unified request handler
         return self._client.requests()
 
-    def data__store_binary(self, cache_id: str, namespace: str, body:bytes) -> Dict:                              # Auto-generated from endpoint post__data__store_binary
+    def data__store_binary(self,
+                           cache_id : str,
+                           namespace: str,
+                           body     :bytes
+                      ) -> Schema__Cache__Data__Store__Response:                    # Auto-generated from endpoint post__data__store_binary
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/binary"
         #body = None
@@ -21,10 +26,15 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
+        return Schema__Cache__Data__Store__Response.from_json(result.json)          # Return response data
         return result.json if result.json else result.text
 
-    def data__store_binary__with__id(self, cache_id: str, namespace: str, data_file_id: str, body:bytes) -> Dict:                              # Auto-generated from endpoint post__data__store_binary__with__id
+    def data__store_binary__with__id(self,
+                                     cache_id    : str ,
+                                     namespace   : str ,
+                                     data_file_id: str ,
+                                     body        :bytes
+                                ) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_binary__with__id
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/binary/{data_file_id}"
         #body = None
@@ -34,10 +44,16 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)              # Return response data
+        #return result.json if result.json else result.text
 
-    def data__store_binary__with__id_and_key(self, cache_id: str, namespace: str, data_key: str, data_file_id: str, body:bytes) -> Dict:                              # Auto-generated from endpoint post__data__store_binary__with__id_and_key
+    def data__store_binary__with__id_and_key(self,
+                                             cache_id    : str ,
+                                             namespace   : str ,
+                                             data_key    : str ,
+                                             data_file_id: str ,
+                                             body        : bytes
+                                        ) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_binary__with__id_and_key
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/binary/{data_key}/{data_file_id}"
         #body = None
@@ -47,10 +63,14 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)         # Return response data
+        #return result.json if result.json else result.text
 
-    def data__store_json(self, cache_id: str, namespace: str, body:dict) -> Dict:                              # Auto-generated from endpoint post__data__store_json
+    def data__store_json(self,
+                         cache_id : str,
+                         namespace: str,
+                         body     :dict
+                    ) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_json
                                                                                     # Build path
         #path = f"/{{namespace}}/cache/{{cache_id}}/data/store/json"
         path = f"/{namespace}/cache/{cache_id}/data/store/json"
@@ -61,10 +81,14 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)              # Return response data
+        #return result.json if result.json else result.text
 
-    def data__store_json__with__id(self, cache_id: str, namespace: str, data_file_id: str, body:dict) -> Dict:                              # Auto-generated from endpoint post__data__store_json__with__id
+    def data__store_json__with__id(self,
+                                   cache_id: str,
+                                   namespace: str,
+                                   data_file_id: str,
+                                   body:dict) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_json__with__id
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/json/{data_file_id}"
         #body = None
@@ -74,13 +98,14 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)                # Return response data
+        #return result.json if result.json else result.text
 
     def data__store_json__with__id_and_key(self, cache_id: str,
                                            namespace: str, data_key: str,
                                            data_file_id: str,
-                                           body: dict) -> Dict:                              # Auto-generated from endpoint post__data__store_json__with__id_and_key
+                                           body: dict
+                                      ) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_json__with__id_and_key
                                                                                     # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/json/{data_key}/{data_file_id}"
         #body = None
@@ -90,14 +115,13 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)          # Return response data
+        #return result.json if result.json else result.text
 
-    #def data__store_string(self, cache_id: str, namespace: str) -> Dict:                             # todo: BUG same as the others
-    def data__store_string(self, cache_id: str, namespace: Safe_Str__Id, body:str) -> Dict:
+    def data__store_string(self, cache_id: str,
+                           namespace: Safe_Str__Id,
+                           body:str) -> Schema__Cache__Data__Store__Response:
                                                                                     # Build path
-        #path = f"/{{namespace}}/cache/{{cache_id}}/data/store/string"              # BUG
-        #body = None
         path = f"/{namespace}/cache/{cache_id}/data/store/string"
                                                                                     # Execute request
         result = self.requests.execute(
@@ -105,37 +129,32 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)
+        #return result.json if result.json else result.text
 
-    #def data__store_string__with__id(self, cache_id: str, namespace: str, data_file_id: str) -> Dict:                              # Auto-generated from endpoint post__data__store_string__with__id
     def data__store_string__with__id(self, cache_id     : str,
                                            namespace    : Safe_Str__Id,
                                            data_file_id : Safe_Str__Id,
                                            body         : str
-                                     ) -> Dict:                              # Auto-generated from endpoint post__data__store_string__with__id
+                                     ) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_string__with__id
 
-        #path = f"/{{namespace}}/cache/{{cache_id}}/data/store/string/{{data_file_id}}"      # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/string/{data_file_id}"      # Build path
-        #body = None
                                                                                     # Execute request
         result = self.requests.execute(
             method = "POST",
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
+        return Schema__Cache__Data__Store__Response.from_json(result.json)  # Return response data
         return result.json if result.json else result.text
 
-    #def data__store_string__with__id_and_key(self, cache_id: str, namespace: str, data_key: str, data_file_id: str) -> Dict:                              # Auto-generated from endpoint post__data__store_string__with__id_and_key
     def data__store_string__with__id_and_key(self, cache_id     : str                   ,
                                                    namespace    : Safe_Str__Id          ,
                                                    data_key     : Safe_Str__File__Path  ,
                                                    data_file_id : Safe_Str__Id          ,
                                                    body: str
-                                             ) -> Dict:                              # Auto-generated from endpoint post__data__store_string__with__id_and_key
+                                             ) -> Schema__Cache__Data__Store__Response:                              # Auto-generated from endpoint post__data__store_string__with__id_and_key
 
-        #path = f"/{{namespace}}/cache/{{cache_id}}/data/store/string/{data_key:path}/{{data_file_id}}"  # Build path
         path = f"/{namespace}/cache/{cache_id}/data/store/string/{data_key}/{data_file_id}"  # Build path
         #body = None
                                                                                     # Execute request
@@ -144,5 +163,5 @@ class Service__Fast_API__Client__Data__Store(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        return Schema__Cache__Data__Store__Response.from_json(result.json)                         # Return response data
+        #return result.json if result.json else result.text

{mgraph_ai_service_cache_client-0.3.0/mgraph_ai_service_cache_client → mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client}/client_contract/delete/Service__Fast_API__Client__File__Delete.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Dict
+from typing                          import Any, Dict
 from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 class Service__Fast_API__Client__File__Delete(Type_Safe):
@@ -8,9 +8,10 @@ class Service__Fast_API__Client__File__Delete(Type_Safe):
     def requests(self):                                                             # Access the unified request handler
         return self._client.requests()
 
+    # todo: this should a variation of the Schema__Cache__Delete__Success (which needed refactoring)
     def delete__cache_id(self, cache_id: str, namespace: str) -> Dict:                              # Auto-generated from endpoint delete__delete__cache_id
                                                                                     # Build path
-        path = f"/{{namespace}}/delete/{{cache_id}}"
+        path = f"/{namespace}/delete/{cache_id}"
         body = None
                                                                                     # Execute request
         result = self.requests.execute(
@@ -18,5 +19,6 @@ class Service__Fast_API__Client__File__Delete(Type_Safe):
             path   = path,
             body   = body
         )
-                                                                                    # Return response data
-        return result.json if result.json else result.text
+        if result.status_code == 200:                                                                                          # Return response data
+            return result.json
+        return None

{mgraph_ai_service_cache_client-0.3.0/mgraph_ai_service_cache_client → mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client}/client_contract/exists/Service__Fast_API__Client__File__Exists.py

@@ -10,7 +10,7 @@ class Service__Fast_API__Client__File__Exists(Type_Safe):
 
     def exists__hash__cache_hash(self, cache_hash: str, namespace: str) -> Dict:                              # Auto-generated from endpoint get__exists__hash__cache_hash
                                                                                     # Build path
-        path = f"/{{namespace}}/exists/hash/{{cache_hash}}"
+        path = f"/{namespace}/exists/hash/{cache_hash}"
         body = None
                                                                                     # Execute request
         result = self.requests.execute(

{mgraph_ai_service_cache_client-0.3.0/mgraph_ai_service_cache_client → mgraph_ai_service_cache_client-0.18.0/mgraph_ai_service_cache_client/client}/client_contract/info/Service__Fast_API__Client__Info.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Dict
+from typing                          import Any, Dict
 from osbot_utils.type_safe.Type_Safe import Type_Safe