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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.37.0
+Version: 2.38.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.37.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.38.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.37.0 → osbot_utils-2.38.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.37.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.38.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.37.0 → osbot_utils-2.38.0}/osbot_utils/helpers/llms/actions/LLM_Request__Execute.py

@@ -10,7 +10,7 @@ class LLM_Request__Execute(Type_Safe):
     llm_cache      : LLM_Request__Cache
     llm_api        : API__LLM__Open_AI
     use_cache      : bool = True
-    request_builder: LLM_Request__Builder
+    request_builder: LLM_Request__Builder           # todo: fix the use of LLM_Request__Builder since it not good when we when overwrite it at self.request_builder.llm_request_data = llm_request.request_data
 
     @type_safe
     def execute(self, llm_request: Schema__LLM_Request) -> Schema__LLM_Response:

{osbot_utils-2.37.0 → osbot_utils-2.38.0}/osbot_utils/helpers/llms/builders/LLM_Request__Builder.py

@@ -1,10 +1,11 @@
 from typing                                                                 import Dict, Any, Type
 from osbot_utils.helpers.llms.actions.Type_Safe__Schema_For__LLMs           import Type_Safe__Schema_For__LLMs
+from osbot_utils.helpers.llms.schemas.Schema__LLM_Request                   import Schema__LLM_Request
 from osbot_utils.helpers.llms.schemas.Schema__LLM_Request__Data             import Schema__LLM_Request__Data
 from osbot_utils.helpers.llms.schemas.Schema__LLM_Request__Function_Call    import Schema__LLM_Request__Function_Call
 from osbot_utils.helpers.llms.schemas.Schema__LLM_Request__Message__Content import Schema__LLM_Request__Message__Content
 from osbot_utils.helpers.llms.schemas.Schema__LLM_Request__Message__Role    import Schema__LLM_Request__Message__Role
-from osbot_utils.helpers.safe_str.Safe_Str__Text import Safe_Str__Text
+from osbot_utils.helpers.safe_str.Safe_Str__Text                            import Safe_Str__Text
 from osbot_utils.type_safe.Type_Safe                                        import Type_Safe
 from osbot_utils.type_safe.decorators.type_safe                             import type_safe
 
@@ -25,6 +26,9 @@ class LLM_Request__Builder(Type_Safe):
     def add_message__system   (self, content : str = None): return self.add_message(role=Schema__LLM_Request__Message__Role.SYSTEM   , content=content)
     def add_message__user     (self, content : str = None): return self.add_message(role=Schema__LLM_Request__Message__Role.USER     , content=content)
 
+    def llm_request(self) -> Schema__LLM_Request:
+        return Schema__LLM_Request(request_data=self.llm_request_data)
+
     @type_safe
     def set__function_call(self, parameters    : Type[Type_Safe],
                                  function_name : str,

{osbot_utils-2.37.0 → osbot_utils-2.38.0}/osbot_utils/helpers/llms/builders/LLM_Request__Builder__Open_AI.py

@@ -10,7 +10,7 @@ class LLM_Request__Builder__Open_AI(LLM_Request__Builder):
                     "messages"       : [{"role"  : msg.role.value, "content": msg.content} for msg in self.llm_request_data.messages]}
         if self.llm_request_data.function_call:
             schema = self.schema_generator.export(self.llm_request_data.function_call.parameters)
-            schema["additionalProperties"] = False                                  # needs to be False when using structured outputs
+            self.add_additional_properties_to_schema(schema)
             payload["response_format"    ] =  { "type"       : "json_schema",
                                                 "json_schema": { "name"  : self.llm_request_data.function_call.function_name,
                                                                  "schema": schema                                      ,
@@ -22,6 +22,18 @@ class LLM_Request__Builder__Open_AI(LLM_Request__Builder):
 
         return payload
 
+    def add_additional_properties_to_schema(self, schema: dict) -> dict: # Recursively ensures every nested object in the schema has "additionalProperties": False.
+        if schema.get("type") == "object":
+            schema["additionalProperties"] = False
+            for prop_schema in schema.get("properties", {}).values():
+                self.add_additional_properties_to_schema(prop_schema)
+
+        elif schema.get("type") == "array":
+            items_schema = schema.get("items", {})
+            self.add_additional_properties_to_schema(items_schema)
+
+        return schema
+
     # @type_safe
     # def build_request_with_json_mode(self, request: Schema__LLM_Request
     #                                 ) -> Dict[str, Any]:

{osbot_utils-2.37.0 → osbot_utils-2.38.0}/osbot_utils/type_safe/shared/Type_Safe__Convert.py

@@ -1,5 +1,6 @@
-from osbot_utils.type_safe.shared.Type_Safe__Cache import type_safe_cache
-from osbot_utils.utils.Objects                     import base_classes_names
+from typing                                         import get_args
+from osbot_utils.type_safe.shared.Type_Safe__Cache  import type_safe_cache
+from osbot_utils.utils.Objects                      import base_classes_names
 
 
 class Type_Safe__Convert:
@@ -9,6 +10,10 @@ class Type_Safe__Convert:
                 obj_annotations  = target.__annotations__
                 if hasattr(obj_annotations,'get'):
                     attribute_annotation = obj_annotations.get(attr_name)
+                    args = get_args(attribute_annotation)
+                    if len(args) == 2 and args[1] is type(None):                            # todo: find a better way to do this, since this is handling an edge case when origin_attr_type is Optional (which is an shorthand for Union[X, None] )
+                        attribute_annotation = args[0]
+
                     if 'Type_Safe' in base_classes_names(attribute_annotation):
                         return attribute_annotation(**value)
         return value

osbot_utils-2.38.0/osbot_utils/version

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

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

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

osbot_utils-2.37.0/osbot_utils/version

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