osbot-utils 2.48.0__tar.gz → 2.50.0__tar.gz

{osbot_utils-2.48.0 → osbot_utils-2.50.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.48.0
+Version: 2.50.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.48.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.50.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.48.0 → osbot_utils-2.50.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.48.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.50.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.48.0 → osbot_utils-2.50.0}/osbot_utils/helpers/llms/builders/LLM_Request__Builder.py

@@ -43,6 +43,7 @@ class LLM_Request__Builder(Type_Safe):
     def set__model             (self, model   : Safe_Str__Text): self.llm_request_data.model    = model   ; return self
     def set__platform          (self, platform: Safe_Str__Text): self.llm_request_data.platform = platform; return self
     def set__provider          (self, provider: Safe_Str__Text): self.llm_request_data.provider = provider; return self
+    def set__model__gpt_4o     (self                          ): return self.set__model('gpt-4o'     )
     def set__model__gpt_4o_mini(self                          ): return self.set__model('gpt-4o-mini')
 
     @type_safe

{osbot_utils-2.48.0 → osbot_utils-2.50.0}/osbot_utils/helpers/llms/cache/Virtual_Storage__Local__Folder.py

@@ -3,11 +3,8 @@ from osbot_utils.decorators.methods.cache_on_self                   import cache
 from osbot_utils.helpers.safe_str.Safe_Str__File__Path              import Safe_Str__File__Path
 from osbot_utils.type_safe.Type_Safe                                import Type_Safe
 from osbot_utils.type_safe.decorators.type_safe                     import type_safe
-from osbot_utils.utils.Files                                        import current_temp_folder, path_combine_safe, folder_create, file_exists, folder_exists, file_delete, file_name_without_extension, parent_folder, create_folder, files_recursive
-from osbot_utils.utils.Json                                         import json_save_file, json_load_file, json_file_load
-
-FOLDER_NAME__CACHE_IN_TEMP_FOLDER = '_llm_requests_cache'
-FILE_NAME__CACHE_INDEX            = "cache_index.json"
+from osbot_utils.utils.Files                                        import current_temp_folder, path_combine_safe, folder_create, file_exists, folder_exists, file_delete, parent_folder, create_folder, files_recursive
+from osbot_utils.utils.Json                                         import json_save_file, json_load_file
 
 class Virtual_Storage__Local__Folder(Type_Safe):
 

{osbot_utils-2.48.0 → osbot_utils-2.50.0}/osbot_utils/helpers/llms/schemas/Schema__LLM_Request.py

@@ -3,5 +3,6 @@ from osbot_utils.type_safe.Type_Safe                             import Type_Saf
 
 
 class Schema__LLM_Request(Type_Safe):
-    #request_id   : Obj_Id                      # can't put this id here or we won't be able to cache this data
-    request_data : Schema__LLM_Request__Data
+    request_data : Schema__LLM_Request__Data
+
+    # request_id   : Obj_Id                      # can't put this id here or we won't be able to cache this data

{osbot_utils-2.48.0 → osbot_utils-2.50.0}/osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -50,8 +50,10 @@ class Type_Safe__Step__From_Json:
                     annotation        = type_safe_annotations.obj_attribute_annotation(_self, key)
                     annotation_origin = type_safe_cache.get_origin(annotation)
 
+                    if type(annotation) is type and issubclass(annotation, Type_Safe) and type(value) is dict:          # if the annotation is a Type_Safe class and the value is a dict
+                        value = annotation.from_json(value)                                                             # we can use the Type_Safe.from_json to create the deserialized value object
 
-                    if annotation == type:                                                  # Handle type objects
+                    elif annotation == type:                                                  # Handle type objects
                         value = self.deserialize_type__using_value(value)
                     elif annotation_origin == type:                                         # Handle type objects inside ForwardRef
                         value = self.deserialize_type__using_value(value)

osbot_utils-2.50.0/osbot_utils/version

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

{osbot_utils-2.48.0 → osbot_utils-2.50.0}/pyproject.toml

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

osbot_utils-2.48.0/osbot_utils/version

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