mgraph-ai-service-cache-client 0.2.0__tar.gz → 0.4.0__tar.gz

{mgraph_ai_service_cache_client-0.2.0 → mgraph_ai_service_cache_client-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mgraph_ai_service_cache__client
-Version: 0.2.0
+Version: 0.4.0
 Summary: MGraph-AI__Service__Cache__Client
 Home-page: https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client
 License: Apache 2.0
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 
 # MGraph AI Service Cache Client
 
-[![Current Release](https://img.shields.io/badge/release-v0.2.0-blue)](https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client/releases)
+[![Current Release](https://img.shields.io/badge/release-v0.4.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.2.0 → mgraph_ai_service_cache_client-0.4.0}/README.md

@@ -1,6 +1,6 @@
 # MGraph AI Service Cache Client
 
-[![Current Release](https://img.shields.io/badge/release-v0.2.0-blue)](https://github.com/the-cyber-boardroom/MGraph-AI__Service__Cache__Client/releases)
+[![Current Release](https://img.shields.io/badge/release-v0.4.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.2.0 → mgraph_ai_service_cache_client-0.4.0}/mgraph_ai_service_cache_client/client_contract/store/Service__Fast_API__Client__File__Store.py

@@ -31,16 +31,19 @@ class Service__Fast_API__Client__File__Store(Type_Safe):
                                                                                     # Return response data
         return result.json if result.json else result.text
 
-    def store__string__cache_key(self, namespace: str, strategy: Enum__Cache__Store__Strategy, cache_key: str, file_id: Optional[str] = None) -> Dict:                              # Auto-generated from endpoint post__store__string__cache_key
+    def store__string__cache_key(self, namespace: str                           ,
+                                       strategy : Enum__Cache__Store__Strategy  ,
+                                       cache_key: str                           ,
+                                       body     : str                           ,
+                                       file_id  : str   = ''
+                                  ) -> Dict:                              # Auto-generated from endpoint post__store__string__cache_key
                                                                                     # Build path
-        path = f"/{{namespace}}/{{strategy}}/store/string/{cache_key:path}"
-        body = None
+        path = f"/{namespace}/{strategy}/store/string/{cache_key}?file_id={file_id}"
+        #body = None
                                                                                     # Execute request
-        result = self.requests.execute(
-            method = "POST",
-            path   = path,
-            body   = body
-        )
+        result = self.requests.execute(method = "POST",
+                                       path   = path  ,
+                                       body   = body  )
                                                                                     # Return response data
         return result.json if result.json else result.text
 
@@ -61,16 +64,18 @@ class Service__Fast_API__Client__File__Store(Type_Safe):
                                                                                     # Return response data
         return result.json if result.json else result.text
 
-    def store__json__cache_key(self, namespace: str, strategy: Enum__Cache__Store__Strategy, cache_key: str, file_id: Optional[str] = None) -> Dict:                              # Auto-generated from endpoint post__store__json__cache_key
+    def store__json__cache_key(self, namespace: str,
+                                     strategy : Enum__Cache__Store__Strategy,
+                                     cache_key: str,
+                                     body     : dict ,
+                                     file_id  : str  = '') -> Dict:                              # Auto-generated from endpoint post__store__json__cache_key
                                                                                     # Build path
-        path = f"/{{namespace}}/{{strategy}}/store/json/{cache_key:path}"
-        body = None
+        path = f"/{namespace}/{strategy}/store/json/{cache_key}?file_id={file_id}"
+        #body = None
                                                                                     # Execute request
-        result = self.requests.execute(
-            method = "POST",
-            path   = path,
-            body   = body
-        )
+        result = self.requests.execute(method = "POST",
+                                      path   = path,
+                                      body   = body)
                                                                                     # Return response data
         return result.json if result.json else result.text
 
@@ -90,10 +95,14 @@ class Service__Fast_API__Client__File__Store(Type_Safe):
                                                                                     # Return response data
         return result.json if result.json else result.text
 
-    def store__binary__cache_key(self, namespace: str, strategy: Enum__Cache__Store__Strategy, cache_key: str, file_id: Optional[str] = None) -> Dict:                              # Auto-generated from endpoint post__store__binary__cache_key
+    def store__binary__cache_key(self, namespace: str,
+                                       strategy: Enum__Cache__Store__Strategy,
+                                       cache_key: str,
+                                       body = bytes ,
+                                       file_id: str = '') -> Dict:                              # Auto-generated from endpoint post__store__binary__cache_key
                                                                                     # Build path
-        path = f"/{{namespace}}/{{strategy}}/store/binary/{cache_key:path}"
-        body = None
+        path = f"/{namespace}/{strategy}/store/binary/{cache_key}?file_id={file_id}"
+        #body = None
                                                                                     # Execute request
         result = self.requests.execute(
             method = "POST",

mgraph_ai_service_cache_client-0.4.0/mgraph_ai_service_cache_client/schemas/cache/safe_str/Safe_Str__Json__Field_Path.py

@@ -0,0 +1,25 @@
+import re
+from osbot_utils.type_safe.primitives.core.Safe_Str import Safe_Str
+
+TYPE_SAFE_STR__FIELD_PATH__REGEX      = re.compile(r'[^a-zA-Z0-9_\-.]')  # Allow dots for nesting
+TYPE_SAFE_STR__FIELD_PATH__MAX_LENGTH = 256                              # Longer to support deep nesting
+
+class Safe_Str__Json__Field_Path(Safe_Str):
+    regex           = TYPE_SAFE_STR__FIELD_PATH__REGEX
+    max_length      = TYPE_SAFE_STR__FIELD_PATH__MAX_LENGTH
+    trim_whitespace = True
+
+    def __new__(cls, value: str = None):
+        if value:
+            if '..' in value:                                                                       # Don't allow consecutive dots
+                raise ValueError(f"Field path cannot contain consecutive dots: '{value}'")
+
+            if value.startswith('.') or value.endswith('.'):                                        # Don't allow leading/trailing dots
+                raise ValueError(f"Field path cannot start or end with a dot: '{value}'")
+
+            segments = value.split('.')                                                             # Each segment should be non-empty after splitting
+            for segment in segments:
+                if not segment:
+                    raise ValueError(f"Field path has empty segment: '{value}'")
+
+        return Safe_Str.__new__(cls, value)

{mgraph_ai_service_cache_client-0.2.0 → mgraph_ai_service_cache_client-0.4.0}/mgraph_ai_service_cache_client/schemas/cache/store/Schema__Cache__Store__Metadata.py

@@ -4,8 +4,9 @@ from osbot_utils.type_safe.primitives.domains.identifiers.Random_Guid
 from osbot_utils.type_safe.primitives.domains.identifiers.safe_str.Safe_Str__Id          import Safe_Str__Id
 from osbot_utils.type_safe.primitives.domains.identifiers.safe_int.Timestamp_Now         import Timestamp_Now
 from osbot_utils.type_safe.primitives.domains.cryptography.safe_str.Safe_Str__Cache_Hash import Safe_Str__Cache_Hash
-from mgraph_ai_service_cache_client.schemas.cache.enums.Enum__Cache__File_Type                  import Enum__Cache__File_Type
-from mgraph_ai_service_cache_client.schemas.cache.enums.Enum__Cache__Store__Strategy            import Enum__Cache__Store__Strategy
+from mgraph_ai_service_cache_client.schemas.cache.enums.Enum__Cache__File_Type           import Enum__Cache__File_Type
+from mgraph_ai_service_cache_client.schemas.cache.enums.Enum__Cache__Store__Strategy     import Enum__Cache__Store__Strategy
+from mgraph_ai_service_cache_client.schemas.cache.safe_str.Safe_Str__Json__Field_Path    import Safe_Str__Json__Field_Path
 
 
 class Schema__Cache__Store__Metadata(Type_Safe):                                             # Metadata for stored cache entries
@@ -14,7 +15,9 @@ class Schema__Cache__Store__Metadata(Type_Safe):
     cache_id         : Random_Guid                      = None                               # Cache entry ID
     content_encoding : Safe_Str__Id                     = None                               # Optional encoding
     file_id          : Safe_Str__Id                     = None                               # File ID used for storage
+    file_type        : Enum__Cache__File_Type           = None                               # Type: 'json' or 'binary'
+    json_field_path  : Safe_Str__Json__Field_Path       = None                               # Field Path used to calculate the hash of a Json object
+    namespace        : Safe_Str__Id                     = None                               # Namespace
     stored_at        : Timestamp_Now                    = None                               # When stored
     strategy         : Enum__Cache__Store__Strategy     = None                               # Storage strategy used
-    namespace        : Safe_Str__Id                     = None                               # Namespace
-    file_type        : Enum__Cache__File_Type           = None                               # Type: 'json' or 'binary'
+

{mgraph_ai_service_cache_client-0.2.0 → mgraph_ai_service_cache_client-0.4.0}/mgraph_ai_service_cache_client/schemas/cache/store/Schema__Store__Context.py

@@ -1,23 +1,25 @@
-from typing import Union, Dict, List
+from typing                                                                                 import Union, Dict
 from osbot_utils.type_safe.Type_Safe                                                        import Type_Safe
 from osbot_utils.type_safe.primitives.domains.cryptography.safe_str.Safe_Str__Cache_Hash    import Safe_Str__Cache_Hash
 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.Random_Guid                       import Random_Guid
 from osbot_utils.type_safe.primitives.domains.identifiers.safe_int.Timestamp_Now            import Timestamp_Now
 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.enums.Enum__Cache__Store__Strategy               import Enum__Cache__Store__Strategy
-from mgraph_ai_service_cache_client.schemas.cache.file.Schema__Cache__File__Paths                  import Schema__Cache__File__Paths
-from mgraph_ai_service_cache_client.schemas.cache.store.Schema__Cache__Store__Metadata             import Schema__Cache__Store__Metadata
-from mgraph_ai_service_cache_client.schemas.cache.store.Schema__Cache__Store__Paths                import Schema__Cache__Store__Paths
+from mgraph_ai_service_cache_client.schemas.cache.enums.Enum__Cache__Store__Strategy        import Enum__Cache__Store__Strategy
+from mgraph_ai_service_cache_client.schemas.cache.file.Schema__Cache__File__Paths           import Schema__Cache__File__Paths
+from mgraph_ai_service_cache_client.schemas.cache.safe_str.Safe_Str__Json__Field_Path       import Safe_Str__Json__Field_Path
+from mgraph_ai_service_cache_client.schemas.cache.store.Schema__Cache__Store__Metadata      import Schema__Cache__Store__Metadata
+from mgraph_ai_service_cache_client.schemas.cache.store.Schema__Cache__Store__Paths         import Schema__Cache__Store__Paths
 from mgraph_ai_service_cache.service.cache.Cache__Handler                                   import Cache__Handler
 
 
-class Schema__Store__Context(Type_Safe):                                                     # Context object to pass data between store operations
+class Schema__Store__Context(Type_Safe):                                                      # Context object to pass data between store operations
     storage_data      : Union[str, Dict, bytes]                                               # Data to be stored (string, dict, or bytes)
     cache_hash        : Safe_Str__Cache_Hash         = None                                   # Hash of the data or cache key
     cache_id          : Random_Guid                  = None                                   # Unique ID for this cache entry
     cache_key         : Safe_Str__File__Path         = None                                   # Optional semantic cache key
     file_id           : Safe_Str__Id                 = None                                   # Optional file ID (defaults to cache_id)
+    json_field_path   : Safe_Str__Json__Field_Path   = None                                   # Field Path used to calculate the hash of a Json object
     namespace         : Safe_Str__Id                 = None                                   # Namespace for isolation
     strategy          : Enum__Cache__Store__Strategy = None                                   # Storage strategy to use
     content_encoding  : Safe_Str__Id                 = None                                   # Optional encoding (e.g., 'gzip')

mgraph_ai_service_cache_client-0.4.0/mgraph_ai_service_cache_client/version

@@ -0,0 +1 @@
+v0.4.0

{mgraph_ai_service_cache_client-0.2.0 → mgraph_ai_service_cache_client-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "mgraph_ai_service_cache__client"
-version     = "v0.2.0"
+version     = "v0.4.0"
 description = "MGraph-AI__Service__Cache__Client"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "Apache 2.0"

mgraph_ai_service_cache_client-0.2.0/mgraph_ai_service_cache_client/version

@@ -1 +0,0 @@
-v0.2.0