osbot-utils 2.68.0__tar.gz → 2.70.0__tar.gz

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/PKG-INFO

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

@@ -1,5 +1,6 @@
 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.Safe_Str__LLM__Model_Name             import Safe_Str__LLM__Model_Name
 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
@@ -40,14 +41,14 @@ class LLM_Request__Builder(Type_Safe):
         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      (self                          ): return self.set__model('gpt-4o'      )
-    def set__model__gpt_4o_mini (self                          ): return self.set__model('gpt-4o-mini' )
-    def set__model__gpt_4_1     (self                          ): return self.set__model('gpt-4.1'     )
-    def set__model__gpt_4_1_mini(self                          ): return self.set__model('gpt-4.1-mini')
-    def set__model__gpt_4_1_nano(self                          ): return self.set__model('gpt-4.1-nano')
+    def set__model              (self, model   : Safe_Str__LLM__Model_Name): 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' )
+    def set__model__gpt_4_1     (self                                     ): return self.set__model('gpt-4.1'     )
+    def set__model__gpt_4_1_mini(self                                     ): return self.set__model('gpt-4.1-mini')
+    def set__model__gpt_4_1_nano(self                                     ): return self.set__model('gpt-4.1-nano')
 
 
     @type_safe

osbot_utils-2.70.0/osbot_utils/helpers/llms/schemas/Safe_Str__LLM__Model_Name.py

@@ -0,0 +1,10 @@
+import re
+
+from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
+
+TYPE_SAFE_STR__LLM__MODEL_NAME__MAX_LENGTH = 256
+TYPE_SAFE_STR__LLM__MODEL_NAME__REGEX      =  r'[^a-zA-Z0-9/_\-.:]'
+
+class Safe_Str__LLM__Model_Name(Safe_Str):
+    regex      = re.compile(TYPE_SAFE_STR__LLM__MODEL_NAME__REGEX)
+    max_length = TYPE_SAFE_STR__LLM__MODEL_NAME__MAX_LENGTH

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/osbot_utils/helpers/llms/schemas/Schema__LLM_Request__Data.py

@@ -1,11 +1,12 @@
 from typing                                                                 import List, Optional
+from osbot_utils.helpers.llms.schemas.Safe_Str__LLM__Model_Name             import Safe_Str__LLM__Model_Name
 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         : Safe_Str__Text                                                  # LLM model identifier
+    model         : Safe_Str__LLM__Model_Name                                       # LLM model identifier
     platform      : Safe_Str__Text
     provider      : Safe_Str__Text
     messages      : List    [Schema__LLM_Request__Message__Content]                 # Message content entries

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/osbot_utils/helpers/safe_str/Safe_Str__File__Name.py

@@ -1,8 +1,10 @@
 import re
 from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
 
+TYPE_SAFE_STR__FILE__NAME__REGEX = re.compile(r'[^a-zA-Z0-9_\-. ]')
+
 class Safe_Str__File__Name(Safe_Str):
-    regex                      = re.compile(r'[^a-zA-Z0-9_\-. ]')
+    regex                      = TYPE_SAFE_STR__FILE__NAME__REGEX
     allow_empty                = False
     trim_whitespace            = True
     allow_all_replacement_char = False

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/osbot_utils/type_safe/Type_Safe__Primitive.py

@@ -29,6 +29,12 @@ class Type_Safe__Primitive:
             return super().__eq__(other)
         return False                                                            # Different types → not equal
 
+    def __enter__(self):                                                        # support context manager
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return
+
     def __ne__(self, other):
         return not self.__eq__(other)
 

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/osbot_utils/utils/Files.py

@@ -1,5 +1,8 @@
 import os
-from typing import Union
+from typing import Union, List
+
+from osbot_utils.helpers.safe_str.Safe_Str__File__Path import Safe_Str__File__Path
+
 
 class Files:
     @staticmethod
@@ -72,16 +75,25 @@ class Files:
         return glob.glob(path_pattern, recursive=recursive)
 
     @staticmethod
-    def files(path, pattern= '*', only_files=True):
+    def files(path, pattern= '*', only_files=True, include_path=True) -> List[Safe_Str__File__Path]:
+
         from pathlib import Path
 
-        result = []
+        result   = []
         for file in Path(path).rglob(pattern):
             if only_files and is_not_file(file):
                 continue
-            result.append(str(file))                                  # todo: see if there is a better way to do this conversion to string
+            file_path = file.as_posix()
+            if include_path is False:
+                file_path = str(file.relative_to(path))
+            result.append(Safe_Str__File__Path(file_path))
+
         return sorted(result)
 
+    @staticmethod
+    def files__virtual_paths(path, pattern='*', only_files=True):
+        return Files.files(path, pattern=pattern, only_files=only_files, include_path=False)
+
     @staticmethod
     def files_names(files : list, check_if_exists=True):
         result = []
@@ -628,6 +640,7 @@ filter_parent_folder           = Files.filter_parent_folder
 files_find                     = Files.find
 files_recursive                = Files.files_recursive
 files_list                     = Files.files
+files_list__virtual_paths      = Files.files__virtual_paths
 files_names                    = Files.files_names
 
 find_files                     = Files.files

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/osbot_utils/utils/Zip.py

@@ -79,6 +79,8 @@ def zip_bytes__add_files(zip_bytes, files_to_add):
                 file_contents = file_contents.encode('utf-8')
             elif not isinstance(file_contents, bytes):
                 continue
+            if file_path.startswith(('/', '\\')):                                       # Strip leading slash or backslash to make the path relative
+                file_path = file_path.lstrip('/\\')
             zf.writestr(file_path, file_contents)
 
     return zip_buffer.getvalue()
@@ -135,7 +137,7 @@ def zip_bytes__replace_files(zip_bytes, files_to_replace):
 def zip_bytes__unzip(zip_bytes, target_folder=None):
     target_folder = target_folder or temp_folder()              # Use the provided target folder or create a temporary one
     zip_buffer = io.BytesIO(zip_bytes)                          # Create a BytesIO buffer from the zip bytes
-    with zipfile.ZipFile(zip_buffer, 'r') as zf:          # Open the zip file from the buffer
+    with zipfile.ZipFile(zip_buffer, 'r') as zf:                # Open the zip file from the buffer
         zf.extractall(target_folder)                            # Extract all files to the target folder
     return target_folder                                        # Return the path of the target folder
 
@@ -200,16 +202,18 @@ def zip_folder_to_file (root_dir, target_file):
     zip_file = zip_folder(root_dir)
     return file_move(zip_file, target_file)
 
-def zip_folder_to_bytes(root_dir):      # todo add unit test
+def zip_folder_to_bytes(root_dir, files_to_ignore:list=None):      # todo add unit test
     zip_buffer = io.BytesIO()                                                   # Create a BytesIO buffer to hold the zipped file
     with zipfile.ZipFile(zip_buffer, 'w', zipfile.ZIP_DEFLATED) as zf:          # Create a ZipFile object with the buffer as the target
         for foldername, subfolders, filenames in os.walk(root_dir):             # Walk the root_dir and add all files and folders to the zip file
             for filename in filenames:
+                if files_to_ignore and filename in files_to_ignore:
+                    continue
                 absolute_path = os.path.join(foldername, filename)              # Create the complete filepath
                 arcname = os.path.relpath(absolute_path, root_dir)              # Define the arcname, which is the name inside the zip file
                 zf.write(absolute_path, arcname)                                # Add the file to the zip file
     zip_buffer.seek(0)                                                          # Reset buffer position
-    return zip_buffer
+    return zip_buffer.getvalue()
 
 def zip_files(base_folder, file_pattern="*.*", target_file=None):
     base_folder = abspath(base_folder)

osbot_utils-2.70.0/osbot_utils/version

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

{osbot_utils-2.68.0 → osbot_utils-2.70.0}/pyproject.toml

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

osbot_utils-2.68.0/osbot_utils/version

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