osbot-utils 2.35.0__py3-none-any.whl → 2.37.0__py3-none-any.whl

osbot_utils/helpers/llms/builders/LLM_Request__Builder.py

@@ -4,6 +4,7 @@ from osbot_utils.helpers.llms.schemas.Schema__LLM_Request__Data             impo
 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.type_safe.Type_Safe                                        import Type_Safe
 from osbot_utils.type_safe.decorators.type_safe                             import type_safe
 
@@ -25,16 +26,20 @@ class LLM_Request__Builder(Type_Safe):
     def add_message__user     (self, content : str = None): return self.add_message(role=Schema__LLM_Request__Message__Role.USER     , content=content)
 
     @type_safe
-    def set_function_call(self, parameters    : Type[Type_Safe],
-                                   function_name : str,
-                                   description   : str   = ''
-                           ) -> Schema__LLM_Request__Function_Call:
+    def set__function_call(self, parameters    : Type[Type_Safe],
+                                 function_name : str,
+                                 description   : str   = ''
+                            ) -> Schema__LLM_Request__Function_Call:
         function_call = Schema__LLM_Request__Function_Call(parameters   = parameters,
                                                           function_name = function_name,
                                                           description   = description)
         self.llm_request_data.function_call = function_call
         return self
 
+    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_mini(self                          ): return self.set__model('gpt-4o-mini')
 
     @type_safe
     def build_request_payload(self) -> Dict[str, Any]:

osbot_utils/helpers/llms/builders/LLM_Request__Factory.py

@@ -40,9 +40,9 @@ class LLM_Request__Factory(Type_Safe):                              # Factory cl
                                          ) -> Schema__LLM_Request__Data:                       # Create a request that uses function calling with the specified schema.
 
         with self.request_builder as _:
-            _.set_function_call(parameters    = parameters   ,   # Create the function call
-                                function_name = function_name,
-                                description   = function_desc)
+            _.set__function_call(parameters    = parameters,  # Create the function call
+                                 function_name = function_name,
+                                 description   = function_desc)
 
             _.add_message__system(content=system_prompt)
             _.add_message__user  (content=user_message )

osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Data.py

@@ -1,12 +1,13 @@
 from typing                                                                 import List, Optional
 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.safe_str.Safe_Str__Text                            import Safe_Str__Text
 from osbot_utils.type_safe.Type_Safe                                        import Type_Safe
 
 class Schema__LLM_Request__Data(Type_Safe):                                         # Schema for LLM API request data
-    model         : str                                                             # LLM model identifier
-    platform      : str
-    provider      : str
+    model         : Safe_Str__Text                                                  # LLM model identifier
+    platform      : Safe_Str__Text
+    provider      : Safe_Str__Text
     messages      : List    [Schema__LLM_Request__Message__Content]                 # Message content entries
     function_call : Optional[Schema__LLM_Request__Function_Call  ] = None           # Details of function call
     temperature   : Optional[float                               ] = None           # Model temperature (0-1)

osbot_utils/type_safe/shared/Type_Safe__Convert.py

@@ -15,15 +15,6 @@ class Type_Safe__Convert:
 
     def convert_to_value_from_obj_annotation(self, target, attr_name, value):                             # todo: see the side effects of doing this for all ints and floats
 
-        from osbot_utils.helpers.Guid           import Guid
-        from osbot_utils.helpers.Timestamp_Now  import Timestamp_Now
-        from osbot_utils.helpers.Random_Guid    import Random_Guid
-        from osbot_utils.helpers.Safe_Id        import Safe_Id
-        from osbot_utils.helpers.Str_ASCII      import Str_ASCII
-        from osbot_utils.helpers.Obj_Id         import Obj_Id
-
-        TYPE_SAFE__CONVERT_VALUE__SUPPORTED_TYPES = [Guid, Random_Guid, Safe_Id, Str_ASCII, Timestamp_Now, Obj_Id]
-
         if target is not None and attr_name is not None:
             if hasattr(target, '__annotations__'):
                 obj_annotations  = target.__annotations__
@@ -33,7 +24,7 @@ class Type_Safe__Convert:
                         origin = type_safe_cache.get_origin(attribute_annotation)                               # Add handling for Type[T] annotations
                         if origin is type and isinstance(value, str):
                             return self.get_class_from_class_name(value)
-                        if attribute_annotation in TYPE_SAFE__CONVERT_VALUE__SUPPORTED_TYPES:          # for now hard-coding this to just these types until we understand the side effects
+                        if isinstance(attribute_annotation, type) and issubclass(attribute_annotation, (str, int)):
                             return attribute_annotation(value)
         return value
 

osbot_utils/type_safe/shared/Type_Safe__Shared__Variables.py

@@ -1,9 +1,4 @@
 import types
 from enum import EnumMeta
 
-from osbot_utils.helpers.Safe_Id           import Safe_Id
-from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
-
-IMMUTABLE_TYPES = (bool, int, float, complex, str, bytes, types.NoneType, EnumMeta, type,
-                   #Safe_Id, Safe_Str             # ok to add since these classes use str as a base class # todo: see if we still need these
-                   )
+IMMUTABLE_TYPES = (bool, int, float, complex, str, bytes, types.NoneType, EnumMeta, type)

osbot_utils/type_safe/shared/Type_Safe__Validation.py

@@ -4,13 +4,11 @@ import types
 import typing
 from enum                                                           import EnumMeta
 from typing                                                         import Any, Annotated, Optional, get_args, get_origin, ForwardRef, Type, Dict, _GenericAlias
-from osbot_utils.helpers.safe_str.Safe_Str                          import Safe_Str
 from osbot_utils.type_safe.shared.Type_Safe__Annotations            import type_safe_annotations
 from osbot_utils.type_safe.shared.Type_Safe__Cache                  import type_safe_cache
 from osbot_utils.type_safe.shared.Type_Safe__Shared__Variables      import IMMUTABLE_TYPES
 from osbot_utils.type_safe.shared.Type_Safe__Raise_Exception        import type_safe_raise_exception
 
-
 class Type_Safe__Validation:
 
     def are_types_compatible_for_assigment(self, source_type, target_type):

osbot_utils/type_safe/steps/Type_Safe__Step__Init.py

@@ -31,6 +31,8 @@ class Type_Safe__Step__Init:
         annotation = type_safe_annotations.obj_attribute_annotation(__self, key)
         if annotation:
             if isinstance(annotation, EnumMeta) and type(value) is str:
+                if value not in annotation.__members__:
+                    raise ValueError(f"Invalid value '{value}' for enum {annotation.__name__}")
                 value = annotation[value]
             else:
 

osbot_utils/version

@@ -1 +1 @@
-v2.35.0
+v2.37.0

{osbot_utils-2.35.0.dist-info → osbot_utils-2.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.35.0
+Version: 2.37.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.35.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.37.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.35.0.dist-info → osbot_utils-2.37.0.dist-info}/RECORD

@@ -193,9 +193,9 @@ osbot_utils/helpers/llms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 osbot_utils/helpers/llms/actions/LLM_Request__Execute.py,sha256=JljneiEJ1ETlCBaH4cmd-bwIlIq_kFi2n2TD1bVGugU,1821
 osbot_utils/helpers/llms/actions/Type_Safe__Schema_For__LLMs.py,sha256=em9RoSZqSSo6BQBZvEKH8Qv8f8f8oubNpy0LIDsak-E,12024
 osbot_utils/helpers/llms/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/llms/builders/LLM_Request__Builder.py,sha256=FrrDTqivHXMaDifi8xDRvAbUju6a8CHnd1VleoQhp2Q,2601
+osbot_utils/helpers/llms/builders/LLM_Request__Builder.py,sha256=tfld-1hcjIH2e2qapXGAu2gq9E0k2NswPn5LRKzWfVA,3133
 osbot_utils/helpers/llms/builders/LLM_Request__Builder__Open_AI.py,sha256=7CUnNyGqyiD0-jX0pESQJichjx_0ttMmhO7OmqZWHl4,2918
-osbot_utils/helpers/llms/builders/LLM_Request__Factory.py,sha256=M-c_odsTjTfWo45LzL8Zkr9gd0LLl2brcwMKoeZNOnc,6292
+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=8Ayz26bteYhc4GNLpItNYlTwF4_yKvhFridDVA61fPo,6783
@@ -209,7 +209,7 @@ osbot_utils/helpers/llms/platforms/open_ai/API__LLM__Open_AI.py,sha256=Yyy2ZnIS6
 osbot_utils/helpers/llms/platforms/open_ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/llms/schemas/Schema__LLM_Cache__Index.py,sha256=12dUUSFhWRZvqEkNivqajqMPApPWhfSI7jWnHyBuxNw,717
 osbot_utils/helpers/llms/schemas/Schema__LLM_Request.py,sha256=7IXCf9AflRlUeFjDSqRR9CiBWlaAa1FgMzrS292e9Po,376
-osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Data.py,sha256=1D9zoDHbICpaxpAq4VTlYOF0-4Jys8Ohi5CrxTlEXQI,1260
+osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Data.py,sha256=EpII6ZMkWACkoHYn-TNowppbIskyoaCovefPA5Q5qtA,1380
 osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Function_Call.py,sha256=VJgWi4aK-DJmuJvfY2qZUZuLkrLlmu5lgyzxZrrp3hM,440
 osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Message__Content.py,sha256=nl-16yz4G_72ViACKE9CvGStrKxw2Gm_JcaU8wVcJXI,521
 osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Message__Role.py,sha256=T99w0cRrDPXQqPT-Nw7_14tMr4vKpUlhw74UJZL6w6w,168
@@ -351,19 +351,19 @@ osbot_utils/type_safe/methods/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 osbot_utils/type_safe/methods/type_safe_property.py,sha256=DcJkOIs6swJtkglsZVKLyFSczCGSJISOVwAmvjCOQvo,1425
 osbot_utils/type_safe/shared/Type_Safe__Annotations.py,sha256=nmVqCbhk4kUYrw_mdYqugxQlv4gM3NUUH89FYTHUg-c,1133
 osbot_utils/type_safe/shared/Type_Safe__Cache.py,sha256=G03pmpds9sTwU5z5pNLssD_GTvVSIR11nGYbkV5KaiY,7913
-osbot_utils/type_safe/shared/Type_Safe__Convert.py,sha256=mS92_sKjKM_aNSB3ERMEgv-3DtkLVAS8AZF067G-JWM,2995
+osbot_utils/type_safe/shared/Type_Safe__Convert.py,sha256=zvaorttNKZsFUgJE9R0_x34sbY6CGppP45z2KGaVcVg,2421
 osbot_utils/type_safe/shared/Type_Safe__Json_Compressor.py,sha256=TDbot_NNzCPXBQv0l5mksWueJNfxlVFDBGxIH8Jf_XY,5426
 osbot_utils/type_safe/shared/Type_Safe__Json_Compressor__Type_Registry.py,sha256=wYOCg7F1nTrRn8HlnZvrs_8A8WL4gxRYRLnXZpGIiuk,1119
 osbot_utils/type_safe/shared/Type_Safe__Not_Cached.py,sha256=25FAl6SOLxdStco_rm9tgOYLfuKyBWheGdl7vVa56UU,800
 osbot_utils/type_safe/shared/Type_Safe__Raise_Exception.py,sha256=pbru8k8CTQMNUfmFBndiJhg2KkqEYzFvJAPcNZHeHfQ,829
-osbot_utils/type_safe/shared/Type_Safe__Shared__Variables.py,sha256=TgF2MK__81YZaY19YWF4q1rE65BqU3HNmmN139OVcK0,409
-osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=s6yRSWY6zYKEQBwlDEGFwFRO9v8T7UOaz5fsz6ih0cw,19342
+osbot_utils/type_safe/shared/Type_Safe__Shared__Variables.py,sha256=SuZGl9LryQX6IpOE0I_lbzClT-h17UNylC__-M8ltTY,129
+osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=CHnrdPtVbuF9OlnFv3sfG-xwsmX5hDedXiLoI6fiiVM,19257
 osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/steps/Type_Safe__Step__Class_Kwargs.py,sha256=snoyJKvZ1crgF2fp0zexwNPnV_E63RfyRIsMAZdrKNY,6995
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Kwargs.py,sha256=tzKXDUc0HVP5QvCWsmcPuuZodNvQZ9FeMDNI2x00Ngw,1943
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Value.py,sha256=b5vsgM8eg9yq2KM0wRMntVHma6OhN_HnU76LxhEIpoA,4483
 osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=y6iet08nQboMPZ1ymrPA61oaSVE3YB1EvPn8a8PiqOE,14133
-osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=Ds_u5BzLYDGLsoQkPXVTac8HkUF96p2x_HDpVmWlvho,4321
+osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=dQRwFxEMdmoW2ogmYZ6ZxLOvt1XnALx41LPpIB6yp3s,4473
 osbot_utils/type_safe/steps/Type_Safe__Step__Set_Attr.py,sha256=VuKHH9QEYlbAL9R4zwQ5dwexx2sFY6wMx52QmF7eqcg,5219
 osbot_utils/type_safe/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/validators/Type_Safe__Validator.py,sha256=cJIPSBarjV716SZUOLvz7Mthjk-aUYKUQtRDtKUBmN4,779
@@ -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=eP_sVuSlH7b9KQmXQnUcU4y9U9Ka6cF20Dtqvf3X-xA,8
-osbot_utils-2.35.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.35.0.dist-info/METADATA,sha256=ry_EjbTe4KMUskGynioO4m4VBX1aD7gNbwe_Z_cTcEs,1329
-osbot_utils-2.35.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-osbot_utils-2.35.0.dist-info/RECORD,,
+osbot_utils/version,sha256=-HYKMJJj0R7l-Xfl9YKo2VaYfZDmtHwPvDLtL8vC6pw,8
+osbot_utils-2.37.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.37.0.dist-info/METADATA,sha256=wGNRK7yAwPpR8l9L2u5kjrFc33T2tq_g4BtuF_n8UMg,1329
+osbot_utils-2.37.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+osbot_utils-2.37.0.dist-info/RECORD,,