osbot-utils 2.39.0__tar.gz → 2.41.0__tar.gz

{osbot_utils-2.39.0 → osbot_utils-2.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.39.0
+Version: 2.41.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v2.39.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.41.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-2.39.0 → osbot_utils-2.41.0}/README.md

@@ -2,7 +2,7 @@
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v2.39.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.41.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-2.39.0 → osbot_utils-2.41.0}/osbot_utils/helpers/llms/cache/LLM_Request__Cache.py

@@ -48,15 +48,30 @@ class LLM_Request__Cache(Type_Safe):
 
         if request_hash in self.cache_index.cache_id__from__hash__request:                                                              # Check if we have an exact match
             cache_id    = self.cache_index.cache_id__from__hash__request[request_hash]
-            cache_entry = self.get_cache_entry(cache_id)
+            cache_entry = self.get__cache_entry__from__cache_id(cache_id)
             if cache_entry:
                 return cache_entry.llm_response
 
         return None
 
     @type_safe
-    def get_cache_entry(self, cache_id: Obj_Id) -> Optional[Schema__LLM_Response__Cache]:                               # Get cache entry by ID
-        return self.cache_entries.get(cache_id)
+    def get__cache_entry__from__cache_id(self, cache_id: Obj_Id) -> Optional[Schema__LLM_Response__Cache]:                               # Get cache entry by ID
+        if cache_id:
+            return self.cache_entries.get(cache_id)
+
+    @type_safe
+    def get__cache_entry__from__request(self, request: Schema__LLM_Request):
+        cache_id = self.get__cache_id__from__request(request)
+        return self.get__cache_entry__from__cache_id(cache_id)
+
+    @type_safe
+    def get__cache_id__from__request(self, request: Schema__LLM_Request):
+        request_hash = self.compute_request_hash(request)
+        return self.get__cache_id__from__request_hash(request_hash)
+
+    @type_safe
+    def get__cache_id__from__request_hash(self, request_hash: Safe_Str__Hash):
+        return self.cache_index.cache_id__from__hash__request.get(request_hash)
 
     def exists(self, request: Schema__LLM_Request) -> bool:                                                             # True if in cache
         request_hash = self.compute_request_hash(request)
@@ -78,7 +93,7 @@ class LLM_Request__Cache(Type_Safe):
         return self.save()
 
     def get_by_id(self, cache_id : Obj_Id)-> Optional[Schema__LLM_Response]:                                            # Cached response or None
-        cache_entry = self.get_cache_entry(cache_id)
+        cache_entry = self.get__cache_entry__from__cache_id(cache_id)
         if cache_entry:
             return cache_entry.llm_response
         return None

{osbot_utils-2.39.0 → osbot_utils-2.41.0}/osbot_utils/helpers/llms/cache/LLM_Request__Cache__File_System.py

@@ -43,7 +43,7 @@ class LLM_Request__Cache__File_System(LLM_Request__Cache):
             return cache_entry
         return None
 
-    def get_cache_entry(self, cache_id: Obj_Id) -> Optional[Schema__LLM_Response__Cache]:   # Get cache entry by ID (overridden)
+    def get__cache_entry__from__cache_id(self, cache_id: Obj_Id) -> Optional[Schema__LLM_Response__Cache]:   # Get cache entry by ID (overridden)
         if cache_id in self.cache_entries:                                                  # Check memory first
             return self.cache_entries[cache_id]
         return self.load_cache_entry(cache_id)                                              # Load from disk if not in memory
@@ -220,7 +220,7 @@ class LLM_Request__Cache__File_System(LLM_Request__Cache):
     #                 cache_id_str = os.path.splitext(os.path.basename(item_path))[0]
     #                 if is_obj_id(cache_id_str):
     #                     cache_id = Obj_Id(cache_id_str)
-    #                     cache_entry = self.get_cache_entry(cache_id)
+    #                     cache_entry = self.get_cache_entry__from__cache_id(cache_id)
     #                     if cache_entry:
     #                         results.append(cache_entry)
     #

osbot_utils-2.41.0/osbot_utils/version

@@ -0,0 +1 @@
+v2.41.0

{osbot_utils-2.39.0 → osbot_utils-2.41.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v2.39.0"
+version     = "v2.41.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-2.39.0/osbot_utils/version

@@ -1 +0,0 @@
-v2.39.0