osbot-utils 2.38.0__tar.gz → 2.40.0__tar.gz

{osbot_utils-2.38.0 → osbot_utils-2.40.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.38.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.38.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.38.0 → osbot_utils-2.40.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.38.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.38.0 → osbot_utils-2.40.0}/osbot_utils/helpers/llms/actions/LLM_Request__Execute.py

@@ -26,6 +26,6 @@ class LLM_Request__Execute(Type_Safe):
         llm_response                          = Schema__LLM_Response(response_data=response_data)   # Create response object
 
         if self.use_cache:                                                                          # Cache the response if enabled
-            self.llm_cache.add(llm_request, llm_response)
+            self.llm_cache.add(request=llm_request, response=llm_response, payload=llm_payload)
 
         return llm_response

{osbot_utils-2.38.0 → osbot_utils-2.40.0}/osbot_utils/helpers/llms/cache/LLM_Request__Cache.py

@@ -25,14 +25,16 @@ class LLM_Request__Cache(Type_Safe):
         return Safe_Str__Hash(hash_value)
 
     @type_safe
-    def add(self, request     : Schema__LLM_Request ,                                       # Request to cache
-                  response    : Schema__LLM_Response                                        # Response to store
+    def add(self, request  : Schema__LLM_Request ,                                          # Request to cache
+                  response : Schema__LLM_Response,                                          # Response to store
+                  payload  : dict                                                           # Payload to store
              ) -> Obj_Id:                                                                   # returns cache_id
 
         hash_request          = self.compute_request_hash (request)                         # calculate request hash
         cache_entry           = Schema__LLM_Response__Cache(cache_id                = Obj_Id()             ,              # Create a cache entry
                                                             llm_request             = request              ,
                                                             llm_response            = response             ,
+                                                            llm_payload             = payload          ,
                                                             hash__request           = hash_request         )
         cache_id             = cache_entry.cache_id
 
@@ -46,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)
@@ -76,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.38.0 → osbot_utils-2.40.0}/osbot_utils/helpers/llms/cache/LLM_Request__Cache__File_System.py

@@ -169,12 +169,13 @@ class LLM_Request__Cache__File_System(LLM_Request__Cache):
         return path
 
     @type_safe
-    def add(self, request  : Schema__LLM_Request,
+    def add(self, request  : Schema__LLM_Request ,
                   response : Schema__LLM_Response,
+                  payload  : dict                ,
                   now      : datetime = None
              ) -> Obj_Id:                                                                           # Save an LLM request/response pair using temporal organization.
 
-        cache_id        = super().add(request, response)                                            # First use standard add() to handle in-memory caching
+        cache_id        = super().add(request=request, response=response, payload=payload)                                            # First use standard add() to handle in-memory caching
         cache_entry     = self.cache_entries[cache_id]                                              # get the cache entry (which will exist since it was added on super().add(request, response)  )
         request_domains = self.extract_domains_from_request(request)                                # Extract domains and areas for organization
         domains         = self.shared_domains + request_domains
@@ -219,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.38.0 → osbot_utils-2.40.0}/osbot_utils/helpers/llms/schemas/Schema__LLM_Response__Cache.py

@@ -10,4 +10,5 @@ class Schema__LLM_Response__Cache(Type_Safe):
     hash__request          : Safe_Str__Hash       = None
     llm_response           : Schema__LLM_Response = None
     llm_request            : Schema__LLM_Request  = None
+    llm_payload            : dict
     timestamp              : Timestamp_Now

osbot_utils-2.40.0/osbot_utils/version

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

{osbot_utils-2.38.0 → osbot_utils-2.40.0}/pyproject.toml

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

osbot_utils-2.38.0/osbot_utils/version

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