osbot-utils 2.39.0__py3-none-any.whl → 2.40.0__py3-none-any.whl

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/helpers/llms/cache/LLM_Request__Cache__File_System.py

@@ -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/version

@@ -1 +1 @@
-v2.39.0
+v2.40.0

{osbot_utils-2.39.0.dist-info → osbot_utils-2.40.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.39.0
+Version: 2.40.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.40.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.dist-info → osbot_utils-2.40.0.dist-info}/RECORD

@@ -198,8 +198,8 @@ osbot_utils/helpers/llms/builders/LLM_Request__Builder__Open_AI.py,sha256=JwyPDe
 osbot_utils/helpers/llms/builders/LLM_Request__Factory.py,sha256=bpFXVTKpalBL7ZONjaHU5c0-2Rwzzd2vgdD1FpYxfGw,6291
 osbot_utils/helpers/llms/builders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/llms/cache/LLM_Cache__Path_Generator.py,sha256=7kDY-aaUWR4Da6lj5RPwjqTLUTGrOUYhbNfOPM30e40,4442
-osbot_utils/helpers/llms/cache/LLM_Request__Cache.py,sha256=LJM33aNi7teCUMNr6mpgl6MBfvOaa38H2KuJicBXMwg,6999
-osbot_utils/helpers/llms/cache/LLM_Request__Cache__File_System.py,sha256=eIWHqUuODyG3WYoB6SmAowb-yc4Zk28SH2GjyxGDOVg,15392
+osbot_utils/helpers/llms/cache/LLM_Request__Cache.py,sha256=xmHZ8hV1w6aUjPp8zmHIydjr84keUT--Ug_ABpNSVlE,7684
+osbot_utils/helpers/llms/cache/LLM_Request__Cache__File_System.py,sha256=4xYBhzydIoZI0g9CAswSGdFtwp6dcItm8_vnMfeSoTg,15408
 osbot_utils/helpers/llms/cache/LLM_Request__Cache__Storage.py,sha256=0ok7z2kGiK3edlgD0hwD5z2hYFZ91Viar1JgD7SNoxg,5434
 osbot_utils/helpers/llms/cache/Virtual_Storage__Local__Folder.py,sha256=xNM2xy0-2ROvhEFXa_jwqth7eApIcRTqcRUDxo0THXI,3214
 osbot_utils/helpers/llms/cache/Virtual_Storage__Sqlite.py,sha256=j8EWuKFVMtDBxrCEi8yNdpzwvTxO6Bri2Bi4-KwO-3s,4638
@@ -398,8 +398,8 @@ osbot_utils/utils/Toml.py,sha256=Rxl8gx7mni5CvBAK-Ai02EKw-GwtJdd3yeHT2kMloik,166
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=pR6sKliUY0KZXmqNzKY2frfW-YVQEVbLKiyqQX_lc-8,14052
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=qJGCI5s9nSw82EuuElCNdr2zaUbltf_E-fswKeYsGRI,8
-osbot_utils-2.39.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.39.0.dist-info/METADATA,sha256=qcgUeDsG2DpUyAbFtYabOjDWUL9lqlFQdgvBIzC4wbU,1329
-osbot_utils-2.39.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-osbot_utils-2.39.0.dist-info/RECORD,,
+osbot_utils/version,sha256=EA_osWNMH5Sn_inc9L5qYPjfsYR_EbU1rahws7uQB0o,8
+osbot_utils-2.40.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.40.0.dist-info/METADATA,sha256=YPJG2T0zO_VSq9HLF-n45Imxo2bf9vq2VxWN6QBc5ko,1329
+osbot_utils-2.40.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+osbot_utils-2.40.0.dist-info/RECORD,,