osbot-utils 1.89.0__py3-none-any.whl → 1.91.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -3,7 +3,7 @@
 
 import sys
 import types
-from osbot_utils.utils.Objects                  import default_value         # todo: remove test mocking requirement for this to be here (instead of on the respective method)
+from osbot_utils.utils.Objects                          import default_value         # todo: remove test mocking requirement for this to be here (instead of on the respective method)
 
 # Backport implementations of get_origin and get_args for Python 3.7
 if sys.version_info < (3, 8):                                           # pragma: no cover
@@ -24,6 +24,7 @@ if sys.version_info < (3, 8):                                           # pragma
             return ()
 else:
     from typing import get_origin, get_args, ForwardRef
+    from osbot_utils.helpers.python_compatibility.python_3_8 import Annotated
 
 if sys.version_info >= (3, 10):
     NoneType = types.NoneType
@@ -44,7 +45,6 @@ class Type_Safe:
 
         for (key, value) in self.__cls_kwargs__().items():                  # assign all default values to self
             if value is not None:                                           # when the value is explicitly set to None on the class static vars, we can't check for type safety
-
                 raise_exception_on_obj_type_annotation_mismatch(self, key, value)
             if hasattr(self, key):
                 existing_value = getattr(self, key)
@@ -65,10 +65,11 @@ class Type_Safe:
     def __exit__(self, exc_type, exc_val, exc_tb): pass
 
     def __setattr__(self, name, value):
-        from osbot_utils.utils.Objects import convert_dict_to_value_from_obj_annotation
-        from osbot_utils.utils.Objects import convert_to_value_from_obj_annotation
-        from osbot_utils.utils.Objects import value_type_matches_obj_annotation_for_attr
-        from osbot_utils.utils.Objects import value_type_matches_obj_annotation_for_union_attr
+        from osbot_utils.utils.Objects                          import convert_dict_to_value_from_obj_annotation
+        from osbot_utils.utils.Objects                          import convert_to_value_from_obj_annotation
+        from osbot_utils.utils.Objects                          import value_type_matches_obj_annotation_for_attr
+        from osbot_utils.utils.Objects                          import value_type_matches_obj_annotation_for_union_and_annotated
+        from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
 
         if not hasattr(self, '__annotations__'):                    # can't do type safety checks if the class does not have annotations
             return super().__setattr__(name, value)
@@ -79,7 +80,7 @@ class Type_Safe:
             if type(value) in [int, str]:                                                   # for now only a small number of str and int classes are supported (until we understand the full implications of this)
                 value = convert_to_value_from_obj_annotation (self, name, value)
             check_1 = value_type_matches_obj_annotation_for_attr      (self, name, value)
-            check_2 = value_type_matches_obj_annotation_for_union_attr(self, name, value)
+            check_2 = value_type_matches_obj_annotation_for_union_and_annotated(self, name, value)
             if (check_1 is False and check_2 is None  or
                 check_1 is None  and check_2 is False or
                 check_1 is False and check_2 is False   ):          # fix for type safety assigment on Union vars
@@ -89,6 +90,16 @@ class Type_Safe:
                 if getattr(self, name) is not None:                         # unless it is already set to None
                     raise ValueError(f"Can't set None, to a variable that is already set. Invalid type for attribute '{name}'. Expected '{self.__annotations__.get(name)}' but got '{type(value)}'")
 
+        # todo: refactor this to separate method
+        if hasattr(self.__annotations__, 'get'):
+            annotation = self.__annotations__.get(name)
+            if annotation and get_origin(annotation) is Annotated:
+                annotation_args = get_args(annotation)
+                target_type = annotation_args[0]
+                for attribute in annotation_args[1:]:
+                    if isinstance(attribute, Type_Safe__Validator):
+                        attribute.validate(value=value, field_name=name, target_type=target_type)
+
         super().__setattr__(name, value)
 
     def __attr_names__(self):
@@ -131,6 +142,8 @@ class Type_Safe:
                     else:
                         var_value = getattr(base_cls, var_name)
                         if var_value is not None:                                                                   # allow None assignments on ctor since that is a valid use case
+                            if get_origin(var_type) is Annotated:
+                                continue
                             if var_type and not isinstance(var_value, var_type):                                    # check type
                                 exception_message = f"variable '{var_name}' is defined as type '{var_type}' but has value '{var_value}' of type '{type(var_value)}'"
                                 raise ValueError(exception_message)

osbot_utils/graphs/mermaid/Mermaid.py

@@ -1,10 +1,10 @@
-from osbot_utils.graphs.mermaid.Mermaid__Renderer   import Mermaid__Renderer
-from osbot_utils.graphs.mermaid.Mermaid__Edge       import Mermaid__Edge
-from osbot_utils.graphs.mermaid.Mermaid__Graph      import Mermaid__Graph
-from osbot_utils.graphs.mermaid.models.Mermaid__Diagram_Direction import Diagram__Direction
-from osbot_utils.graphs.mermaid.models.Mermaid__Diagram__Type import Diagram__Type
-from osbot_utils.utils.Python_Logger            import Python_Logger
-from osbot_utils.base_classes.Kwargs_To_Self    import Kwargs_To_Self
+from osbot_utils.graphs.mermaid.Mermaid__Renderer                   import Mermaid__Renderer
+from osbot_utils.graphs.mermaid.Mermaid__Edge                       import Mermaid__Edge
+from osbot_utils.graphs.mermaid.Mermaid__Graph                      import Mermaid__Graph
+from osbot_utils.graphs.mermaid.models.Mermaid__Diagram_Direction   import Diagram__Direction
+from osbot_utils.graphs.mermaid.models.Mermaid__Diagram__Type       import Diagram__Type
+from osbot_utils.utils.Python_Logger                                import Python_Logger
+from osbot_utils.base_classes.Kwargs_To_Self                        import Kwargs_To_Self
 
 class Mermaid(Kwargs_To_Self):
     graph             : Mermaid__Graph

osbot_utils/helpers/Zip_Bytes.py

@@ -2,10 +2,10 @@ from osbot_utils.base_classes.Type_Safe     import Type_Safe
 from osbot_utils.utils.Dev                  import pprint
 from osbot_utils.utils.Files                import files_list, file_create_from_bytes, temp_file, parent_folder, parent_folder_create
 from osbot_utils.utils.Misc                 import random_text
-from osbot_utils.utils.Regex                import list__match_regex, list__match_regexes
+from osbot_utils.utils.Regex                import list__match_regexes
 from osbot_utils.utils.Zip                  import zip_bytes_empty, zip_bytes__files, zip_bytes__add_file, zip_bytes__add_files, \
     zip_bytes__replace_files, zip_bytes__replace_file, zip_bytes__file_list, zip_bytes__file, \
-    zip_bytes__add_file__from_disk, zip_bytes__add_files__from_disk, zip_files, zip_file__files, zip_bytes__remove_files
+    zip_bytes__add_file__from_disk, zip_bytes__add_files__from_disk, zip_file__files, zip_bytes__remove_files
 
 
 class Zip_Bytes(Type_Safe):

osbot_utils/helpers/python_compatibility/python_3_8.py

@@ -0,0 +1,8 @@
+import sys
+
+if sys.version_info < (3, 9):
+    class Annotated:
+        def __init__(self, *args) -> None:
+            pass
+else:
+    from typing import Annotated

osbot_utils/helpers/trace/Trace_Call__Handler.py

@@ -8,28 +8,28 @@ from osbot_utils.helpers.trace.Trace_Call__Stack_Node   import Trace_Call__Stack
 from osbot_utils.helpers.trace.Trace_Call__Stats        import Trace_Call__Stats
 
 DEFAULT_ROOT_NODE_NODE_TITLE = 'Trace Session'
-GLOBAL_FUNCTIONS_TO_IGNORE   = ['value_type_matches_obj_annotation_for_attr'       ,            # these are type safety functions which introduce quite a lot of noise in the traces (and unless one is debugging type safety, they will not be needed)
-                                'value_type_matches_obj_annotation_for_union_attr' ,            # todo: map out and document why exactly these methods are ignore (and what is the side effect)
-                                'are_types_compatible_for_assigment'               ,
-                                'obj_attribute_annotation'                         ,
-                                'get_origin'                                       ,
-                                'getmro'                                           ,
-                                'default_value'                                    ,
-                                'raise_exception_on_obj_type_annotation_mismatch'  ,
-                                '__cls_kwargs__'        ,
-                                '__default__value__'    ,
-                                '__setattr__'           ,
+GLOBAL_FUNCTIONS_TO_IGNORE   = ['value_type_matches_obj_annotation_for_attr'                ,            # these are type safety functions which introduce quite a lot of noise in the traces (and unless one is debugging type safety, they will not be needed)
+                                'value_type_matches_obj_annotation_for_union_and_annotated' ,            # todo: map out and document why exactly these methods are ignore (and what is the side effect)
+                                'are_types_compatible_for_assigment'                        ,
+                                'obj_attribute_annotation'                                  ,
+                                'get_origin'                                                ,
+                                'getmro'                                                    ,
+                                'default_value'                                             ,
+                                'raise_exception_on_obj_type_annotation_mismatch'           ,
+                                '__cls_kwargs__'                                            ,
+                                '__default__value__'                                        ,
+                                '__setattr__'                                               ,
                                 '<module>']
-GLOBAL_MODULES_TO_IGNORE     = ['osbot_utils.helpers.trace.Trace_Call'               ,            # todo: map out and document why exactly these modules are ignore (and what is the side effect)
-                                'osbot_utils.helpers.trace.Trace_Call__Config'       ,
-                                'osbot_utils.helpers.trace.Trace_Call__View_Model'   ,
-                                'osbot_utils.helpers.trace.Trace_Call__Print_Traces' ,
-                                'osbot_utils.helpers.trace.Trace_Call__Stack'        ,
-                                'osbot_utils.base_classes.Type_Safe'                 ,
-                                'osbot_utils.helpers.CPrint'                         ,            #       also see if this should be done here or at the print/view stage
-                                'osbot_utils.helpers.Print_Table'                    ,
-                                'osbot_utils.decorators.methods.cache_on_self'       ,
-                                'codecs'                                             ]
+GLOBAL_MODULES_TO_IGNORE     = ['osbot_utils.helpers.trace.Trace_Call'                      ,            # todo: map out and document why exactly these modules are ignore (and what is the side effect)
+                                'osbot_utils.helpers.trace.Trace_Call__Config'              ,
+                                'osbot_utils.helpers.trace.Trace_Call__View_Model'          ,
+                                'osbot_utils.helpers.trace.Trace_Call__Print_Traces'        ,
+                                'osbot_utils.helpers.trace.Trace_Call__Stack'               ,
+                                'osbot_utils.base_classes.Type_Safe'                        ,
+                                'osbot_utils.helpers.CPrint'                                ,            #       also see if this should be done here or at the print/view stage
+                                'osbot_utils.helpers.Print_Table'                           ,
+                                'osbot_utils.decorators.methods.cache_on_self'              ,
+                                'codecs'                                                    ]
 
 #GLOBAL_MODULES_TO_IGNORE = []
 #GLOBAL_FUNCTIONS_TO_IGNORE = []

osbot_utils/helpers/type_safe/Type_Safe__Validator.py

@@ -0,0 +1,14 @@
+from osbot_utils.helpers.python_compatibility.python_3_8 import Annotated
+from typing                                              import Any
+
+class Type_Safe__Validator:                                                                 # Base class for all Type_Safe validators.
+
+    def validate(self, value: Any, field_name: str, target_type: type) -> None:                                # Validate a value against this validator's rules.
+        if value and type(value) != target_type:
+            raise ValueError(f"{field_name} must be of type {target_type}, got {type(value)}")
+
+    def describe(self) -> str:                                                              # Return a human-readable description of this validator's rules.
+        pass
+
+
+Validate = Annotated

osbot_utils/helpers/type_safe/validators/Validator__Max.py

@@ -0,0 +1,28 @@
+from typing                                             import Any
+from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
+
+
+class Validator__Max(Type_Safe__Validator):                             #    Validates that a numeric value is at most the specified maximum."""
+    max_value: float
+
+    def __init__(self, max_value):
+        self.max_value = max_value
+
+    def validate(self, value: Any, field_name: str, target_type: type) -> None:
+        super().validate(value=value, field_name=field_name, target_type=target_type)
+        if value is None:
+            return
+        compare_value = value if isinstance(value, (int, float)) else len(value)
+        if compare_value > self.max_value:
+            if not isinstance(value, (int, float)):
+                msg = f"{field_name} must be at most {self.max_value}, got {compare_value}"
+            elif isinstance(value, (list, tuple)):
+                msg = f"{field_name} must be at most {self.max_value}, got length {compare_value}"
+            else:
+                msg = f"{field_name} must be at most {self.max_value}, got size {compare_value}"
+            raise ValueError(msg)
+
+    def describe(self) -> str:
+        return f"maximum value: {self.max_value}"
+
+Max = Validator__Max

osbot_utils/helpers/type_safe/validators/Validator__Min.py

@@ -0,0 +1,38 @@
+from typing                                             import Any
+from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
+
+class Validator__Min(Type_Safe__Validator):                     # Validates that a value is at least the specified minimum. Works with any type that supports the < operator (numbers, strings, lists, etc.)
+    min_value: Any
+
+    def __init__(self, min_value):
+        super().__init__()
+        self.min_value = min_value
+
+    def validate(self, value: Any, field_name: str, target_type: type) -> None:
+        super().validate(value=value, field_name=field_name, target_type=target_type)
+        if value is None:                                                               # can't compare if value has been set to None
+            return
+
+        try:
+            compare_value = value if isinstance(value, (int, float)) else len(value)
+
+            if compare_value < self.min_value:
+                if isinstance(value, (int, float)):
+                    msg = f"{field_name} must be at least {self.min_value}, got {compare_value}"
+                elif isinstance(value, str):
+                    msg = f"{field_name} must have length at least {self.min_value}, got length {compare_value}"
+                elif isinstance(value, (list, tuple)):
+                    msg = f"{field_name} must have length at least {self.min_value}, got length {compare_value}"
+                else:
+                    msg = f"{field_name} must have size at least {self.min_value}, got size {compare_value}"
+                raise ValueError(msg)
+        except TypeError:
+            raise ValueError(f"Cannot compare {field_name} of type {type(value)} with minimum value of type {type(self.min_value)}")
+
+    def describe(self) -> str:
+        if isinstance(self.min_value, (int, float)):
+            return f"minimum value: {self.min_value}"
+        else:
+            return f"minimum length: {len(self.min_value)}"
+
+Min = Validator__Min

osbot_utils/helpers/type_safe/validators/Validator__One_Of.py

@@ -0,0 +1,18 @@
+from typing                                             import Any
+from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
+
+
+class Validator__One_Of(Type_Safe__Validator):                  # Validates that a value is one of a set of allowed values."""
+    allowed: list
+
+    def __init__(self, allowed):
+        self.allowed = allowed
+
+    def validate(self, value: Any, field_name: str, target_type:type) -> None:
+        if value not in self.allowed:
+            raise ValueError(f"{field_name} must be one of {self.allowed}, got {value}")
+
+    def describe(self) -> str:
+        return f"must be one of: {self.allowed}"
+
+One_Of = Validator__One_Of

osbot_utils/helpers/type_safe/validators/Validator__Regex.py

@@ -0,0 +1,26 @@
+from typing                                             import Any
+from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
+
+class Validator__Regex(Type_Safe__Validator):            # Validates that a string matches the specified regex pattern.
+    pattern    : str
+    description: str
+
+    def __init__(self, pattern, description=None):
+        self.pattern     = pattern
+        self.description = description
+
+    def validate(self, value: Any, field_name: str, target_type:type) -> None:
+        import re
+        if value is None:
+            return
+        if not isinstance(value, str):
+            raise ValueError(f"{field_name} must be a string, got {type(value)}")
+        if not re.match(self.pattern, value):
+            raise ValueError(f"{field_name} must match pattern {self.pattern}")
+
+    def describe(self) -> str:
+        if self.description:
+            return self.description
+        return f"must match pattern: {self.pattern}"
+
+Regex = Validator__Regex

osbot_utils/helpers/xml/Xml__Attribute.py

@@ -0,0 +1,7 @@
+from osbot_utils.base_classes.Type_Safe import Type_Safe
+
+
+class Xml__Attribute(Type_Safe):
+    name     : str
+    value    : str
+    namespace: str

osbot_utils/helpers/xml/Xml__Element.py

@@ -0,0 +1,15 @@
+from typing                                 import Dict, List, Union
+from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.helpers.xml.Xml__Attribute import Xml__Attribute
+
+class XML__Element(Type_Safe):
+    tag             : str                                   # Element's local name
+    namespace       : str                                   # Element's namespace URI
+    namespace_prefix: str                                   # Element's namespace prefix
+    attributes      : Dict[str, Xml__Attribute]             # Element attributes
+    children        : List[Union[str, 'XML__Element']]      # Child elements/text
+
+    # def qualified_name(self) -> str:                        # Get fully qualified name with prefix
+    #     if self.namespace_prefix:
+    #         return f"{self.namespace_prefix}:{self.tag}"
+    #     return self.tag

osbot_utils/helpers/xml/Xml__File.py

@@ -0,0 +1,9 @@
+from typing                                 import Dict
+from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.helpers.xml.Xml__Element   import XML__Element
+
+class Xml__File(Type_Safe):
+    xml_data    : str                           # Raw XML content
+    root_element: XML__Element                  # Parsed root element
+    namespaces  : Dict[str, str]                # XML namespace mappings
+

osbot_utils/helpers/xml/Xml__File__Load.py

@@ -0,0 +1,88 @@
+from io                                     import StringIO
+from typing                                 import List, Union, Dict
+from xml.etree.ElementTree                  import iterparse, Element, fromstring, ParseError
+from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.helpers.xml.Xml__Attribute import Xml__Attribute
+from osbot_utils.helpers.xml.Xml__Element   import XML__Element
+from osbot_utils.helpers.xml.Xml__File      import Xml__File
+
+
+class Xml__File__Load(Type_Safe):
+
+    def load_from_string(self, xml_data: str) -> Xml__File:    # Create Xml__File from string
+        xml_file = Xml__File(xml_data=xml_data)
+        self.load_namespaces(xml_file)
+        self.parse_xml      (xml_file)
+        return xml_file
+
+    def load_namespaces(self, xml_file: Xml__File):           # Extract namespaces from XML
+        if not xml_file.xml_data:
+            raise ValueError("XML data cannot be empty")
+
+        for event, elem in iterparse(StringIO(xml_file.xml_data), events=("start-ns",)):
+            prefix, uri = elem
+            xml_file.namespaces[prefix] = uri
+
+    def parse_xml(self, xml_file: Xml__File):                 # Parse XML into type-safe structure
+        if not xml_file.xml_data:
+            raise ValueError("XML data cannot be empty")
+
+        try:
+            root       = fromstring(xml_file.xml_data)
+            namespaces = xml_file.namespaces
+            xml_file.root_element = self.convert_element(namespaces,root)
+        except ParseError as error:
+            raise ValueError(f"Invalid XML: {str(error)}")
+
+    def convert_element(self, namespaces: Dict[str,str], element: Element) -> XML__Element:
+        attributes = self.convert_attributes(element)
+        children: List[Union[str, XML__Element]] = []
+
+        tag             = element.tag
+        namespace        = ''
+        namespace_prefix = ''
+
+        if '}' in tag:
+            namespace, tag = tag.split('}', 1)          # Split namespace and tag
+            namespace = namespace[1:]                   # Remove the '{' prefix
+
+            for prefix, uri in namespaces.items(): # Find prefix for this namespace
+                if uri == namespace:
+                    namespace_prefix = prefix
+                    break
+
+        # Handle text content
+        if element.text and element.text.strip():
+            children.append(element.text.strip())
+
+        # Process child elements
+        for child in element:
+            child_element = self.convert_element(namespaces, child)
+            children.append(child_element)
+
+            if child.tail and child.tail.strip():
+                children.append(child.tail.strip())
+
+        return XML__Element(tag=tag,
+                          namespace=namespace,
+                          namespace_prefix=namespace_prefix,
+                          attributes=attributes,
+                          children=children)
+
+    def convert_attributes(self, element: Element) -> Dict[str, Xml__Attribute]:    # Convert element attributes
+        attributes = {}
+        for key, value in element.attrib.items():
+            if '}' in key:                                        # Handle namespaced attributes
+                namespace, name = key.split('}', 1)
+                namespace = namespace[1:]                         # Remove the '{' prefix
+            else:
+                namespace = ''
+                name = key
+
+            attribute = Xml__Attribute(
+                name=name,
+                value=value,
+                namespace=namespace
+            )
+            attributes[key] = attribute
+        return attributes

osbot_utils/helpers/xml/Xml__File__To_Dict.py

@@ -0,0 +1,41 @@
+from typing                                 import Dict, Any
+from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.helpers.xml.Xml__Element   import XML__Element
+from osbot_utils.helpers.xml.Xml__File      import Xml__File
+
+
+class Xml__File__To_Dict(Type_Safe):
+    def to_dict(self, xml_file: Xml__File) -> Dict[str, Any]:   # Convert Xml__File to dictionary
+        if not xml_file.root_element:
+            return {}
+        return self.element_to_dict(xml_file.root_element)
+
+    def element_to_dict(self, element: XML__Element) -> Dict[str, Any]:         # Convert XML__Element to dictionary
+        result = {}
+
+        for key, attr in element.attributes.items():                            # Convert attributes first
+            result[key] = attr.value
+
+
+        child_nodes: Dict[str, Any] = {}                                        # Process children and collect text content
+        text_content = []
+        for child in element.children:
+            if isinstance(child, str):
+                text_content.append(child)
+            else:
+                if child.tag in child_nodes:                     # Handle child elements
+                    if not isinstance(child_nodes[child.tag], list):
+                        child_nodes[child.tag] = [child_nodes[child.tag]]
+                    child_nodes[child.tag].append(self.element_to_dict(child))
+                else:
+                    child_nodes[child.tag] = self.element_to_dict(child)
+
+        if text_content:                                        # Handle text content
+            text_value = ' '.join(text_content)
+            if child_nodes or result:                           # If we have attributes or child nodes
+                result['#text'] = text_value                    # Add text as a special key
+            else:
+                return text_value                               # Return just the text if no attributes/children
+
+        result.update(child_nodes)                             # Merge child nodes into result
+        return result

osbot_utils/helpers/xml/Xml__File__To_Xml.py

@@ -0,0 +1,72 @@
+from typing                                 import Optional
+from xml.etree.ElementTree                  import Element, SubElement, tostring
+from xml.dom                                import minidom
+from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.helpers.xml.Xml__Element   import XML__Element
+from osbot_utils.helpers.xml.Xml__File      import Xml__File
+
+class Xml__File__To_Xml(Type_Safe):
+
+    def convert_to_xml(self, xml_file: Xml__File, pretty_print: bool = True) -> str:
+        if not xml_file.root_element:
+            raise ValueError("XML file must have a root element")
+
+        # Create XML element tree
+        root = self.create_element(xml_file.root_element, xml_file.namespaces)
+
+        # Add all namespace declarations to root element
+        for prefix, uri in xml_file.namespaces.items():
+            if prefix == '':
+                root.set('xmlns', uri)
+            else:
+                root.set(f'xmlns:{prefix}', uri)
+
+        # Convert to string
+        xml_string = tostring(root, encoding='unicode', method='xml')
+
+        # Pretty print if requested
+        if pretty_print:
+            return self.pretty_print(xml_string)
+        return xml_string
+
+    def create_element(self, xml_element: XML__Element, namespaces: Optional[dict] = None, parent: Optional[Element] = None) -> Element:
+        # Create tag with namespace if applicable
+        tag = xml_element.tag
+        if xml_element.namespace_prefix:
+            tag = f"{xml_element.namespace_prefix}:{tag}"
+        # Don't add namespace URI for default namespace - let it be inherited
+
+        # Create new element or sub-element
+        if parent is not None:
+            element = SubElement(parent, tag)
+        else:
+            element = Element(tag)
+
+        # Add attributes including namespace declarations
+        for attr_key, attr in xml_element.attributes.items():
+            if attr.namespace:
+                attr_name = f"{{{attr.namespace}}}{attr.name}"
+            else:
+                attr_name = attr.name
+            element.set(attr_name, attr.value)
+
+        # Process children
+        text_parts = []
+        for child in xml_element.children:
+            if isinstance(child, str):
+                text_parts.append(child)
+            elif isinstance(child, XML__Element):
+                self.create_element(child, namespaces, element)
+
+        # Set text content if any
+        if text_parts:
+            element.text = ''.join(text_parts)
+
+        return element
+
+    def pretty_print(self, xml_string: str) -> str:
+        """Format XML string with proper indentation."""
+        parsed = minidom.parseString(xml_string)
+        pretty_xml = parsed.toprettyxml(indent='  ').rstrip() + '\n'
+        # Remove empty lines (common issue with toprettyxml)
+        return '\n'.join(line for line in pretty_xml.split('\n') if line.strip())

osbot_utils/helpers/xml/rss/RSS__Channel.py

@@ -0,0 +1,17 @@
+from typing                                     import Any, Dict, List
+from osbot_utils.base_classes.Type_Safe         import Type_Safe
+from osbot_utils.helpers.xml.rss.RSS__Image     import RSS__Image
+from osbot_utils.helpers.xml.rss.RSS__Item      import RSS__Item
+
+
+class RSS__Channel(Type_Safe):
+    description     : str
+    extensions      : Dict[str, Any]
+    image           : RSS__Image         = None
+    items           : List[RSS__Item]
+    language        : str
+    last_build_date : str
+    link            : str
+    title           : str
+    update_frequency: str
+    update_period   : str

osbot_utils/helpers/xml/rss/RSS__Enclosure.py

@@ -0,0 +1,7 @@
+from osbot_utils.base_classes.Type_Safe import Type_Safe
+
+
+class RSS__Enclosure(Type_Safe):
+    url    : str
+    type   : str
+    length : int

osbot_utils/helpers/xml/rss/RSS__Feed.py

@@ -0,0 +1,11 @@
+from typing                                     import Dict, Any
+from osbot_utils.base_classes.Type_Safe         import Type_Safe
+from osbot_utils.helpers.xml.rss.RSS__Channel   import RSS__Channel
+
+DEFAULT__RSS_FEED__VERSION = "2.0"
+
+class RSS__Feed(Type_Safe):
+    version    : str           = DEFAULT__RSS_FEED__VERSION
+    channel    : RSS__Channel  = None
+    namespaces : Dict[str, str]
+    extensions : Dict[str, Any]

osbot_utils/helpers/xml/rss/RSS__Feed__Parser.py

@@ -0,0 +1,93 @@
+from typing                                     import Dict, Any
+from osbot_utils.helpers.Guid                   import Guid
+from osbot_utils.helpers.xml.rss.RSS__Channel   import RSS__Channel
+from osbot_utils.helpers.xml.rss.RSS__Feed      import RSS__Feed
+from osbot_utils.helpers.xml.rss.RSS__Image     import RSS__Image
+from osbot_utils.helpers.xml.rss.RSS__Item      import RSS__Item
+
+
+class RSS__Feed__Parser:
+
+    def from_dict(self, data: Dict[str, Any]) -> RSS__Feed: # Convert a dictionary (from XML) into an RSS__Feed object
+        if 'channel' not in data:
+            raise ValueError("Invalid RSS feed: no channel element found")
+
+        channel_data = data['channel']
+        rss_items    = []
+        items        = channel_data.get('item', [])                                 # get raw items data
+        if type(items) is not list:                                                 # handle case when only one item is present
+            items = [items]                                                         # by converting it to a list
+        for item_data in items:                                                     # Process items
+
+            title       = self.element_text(item_data.get('title'      ))
+            link        = self.element_text(item_data.get('link'       ))
+            description = self.element_text(item_data.get('description'))
+            guid        = self.extract_guid(item_data.get('guid'       ))
+            pubDate     = self.element_text(item_data.get('pubDate'    ))
+            creator     = self.element_text(item_data.get('creator'    ))
+            rss_item = RSS__Item(title       = title                    ,
+                                 link        = link                     ,
+                                 description = description              ,
+                                 guid        = guid                     ,
+                                 pubDate     = pubDate                  ,
+                                 creator     = creator                  ,
+                                 categories  = item_data.get('category'     , []),
+                                 content     = item_data.get('content'      , {}),
+                                 thumbnail   = item_data.get('thumbnail'    , {}))
+
+
+            known_fields = {'title', 'link', 'description', 'guid', 'pubDate',          # Move non-standard elements to extensions
+                          'creator', 'category', 'content', 'thumbnail'}
+            rss_item.extensions = {k: v for k, v in item_data.items()
+                                   if k not in known_fields}
+            rss_items.append(rss_item)
+
+        # Create channel
+        link = self.element_text(channel_data.get('link'))
+        channel = RSS__Channel( title            = channel_data.get('title'          , ''),
+                                link             = link                                   ,
+                                description      = channel_data.get('description'    , ''),
+                                language         = channel_data.get('language'       , ''),
+                                last_build_date  = channel_data.get('lastBuildDate'      ),
+                                items            = rss_items                              ,
+                                update_frequency = channel_data.get('updateFrequency', ''),
+                                update_period    = channel_data.get('updatePeriod'   , ''))
+
+
+        # Process channel image if present
+        if 'image' in channel_data:
+            img_data = channel_data['image']
+            channel.image = RSS__Image( url     = img_data.get('url'       , '' ),
+                                        title   = img_data.get('title'     , '' ),
+                                        link    = img_data.get('link'      , '' ),
+                                        width   = int(img_data.get('width' , 0 )),
+                                        height  = int(img_data.get('height', 0 )))
+
+        known_channel_fields = {'title', 'link', 'description', 'language',         # Move non-standard channel elements to extensions
+                               'lastBuildDate', 'image', 'item', 'updateFrequency', 'updatePeriod'}
+        channel.extensions = {k: v for k, v in channel_data.items()
+                            if k not in known_channel_fields}
+
+        rss_feed = RSS__Feed(channel = channel)
+        return rss_feed
+
+    def extract_guid(self, target):
+        return Guid(self.extract_text(target))
+
+    def element_text(self, target):
+        if isinstance(target, list):
+            for item in target:
+                value = self.extract_text(item)
+                if value:
+                    return value
+        value = self.extract_text(target)
+        return value or f'{target}'
+
+    def extract_text(self, target):
+        if not target:
+            return ''
+        if isinstance(target, str):
+            return target
+        if isinstance(target, dict):
+            return target.get('#text', '')
+        return ''

osbot_utils/helpers/xml/rss/RSS__Image.py

@@ -0,0 +1,8 @@
+from osbot_utils.base_classes.Type_Safe import Type_Safe
+
+class RSS__Image(Type_Safe):
+    url    : str
+    title  : str
+    link   : str
+    width  : int
+    height : int

osbot_utils/helpers/xml/rss/RSS__Item.py

@@ -0,0 +1,17 @@
+from typing                                         import Dict, List, Any
+from osbot_utils.base_classes.Type_Safe             import Type_Safe
+from osbot_utils.helpers.Guid                       import Guid
+from osbot_utils.helpers.xml.rss.RSS__Enclosure     import RSS__Enclosure
+
+class RSS__Item(Type_Safe):
+    title       : str
+    link        : str
+    description : str
+    guid        : Guid
+    pubDate     : str
+    creator     : str
+    categories  : List[str]
+    enclosure   : RSS__Enclosure = None
+    content     : Dict[str, Any]
+    thumbnail   : Dict[str, Any]
+    extensions  : Dict[str, Any]

osbot_utils/utils/Objects.py

@@ -23,7 +23,7 @@ if sys.version_info < (3, 8):
         else:
             return ()
 else:
-    from typing import get_origin, get_args
+    from typing import get_origin, get_args, List, Tuple, Dict
 
 
 def are_types_compatible_for_assigment(source_type, target_type):
@@ -343,11 +343,10 @@ def obj_values(target=None):
     return list(obj_dict(target).values())
 
 def raise_exception_on_obj_type_annotation_mismatch(target, attr_name, value):
-    # todo : check if this is is not causing the type safety issues
     if value_type_matches_obj_annotation_for_attr(target, attr_name, value) is False:               # handle case with normal types
-        if value_type_matches_obj_annotation_for_union_attr(target, attr_name, value) is True:      # handle union cases
+        if value_type_matches_obj_annotation_for_union_and_annotated(target, attr_name, value) is True:      # handle union cases
             return                                                                                  #     this is done like this because value_type_matches_obj_annotation_for_union_attr will return None when there is no Union objects
-        raise Exception(f"Invalid type for attribute '{attr_name}'. Expected '{target.__annotations__.get(attr_name)}' but got '{type(value)}'")
+        raise TypeError(f"Invalid type for attribute '{attr_name}'. Expected '{target.__annotations__.get(attr_name)}' but got '{type(value)}'")
 
 def obj_attribute_annotation(target, attr_name):
     if target is not None and attr_name is not None:
@@ -382,15 +381,52 @@ def obj_is_type_union_compatible(var_type, compatible_types):
         return True                                                         # If all args are compatible, return True
     return var_type in compatible_types or var_type is type(None)           # Check for direct compatibility or type(None) for non-Union types
 
-def value_type_matches_obj_annotation_for_union_attr(target, attr_name, value):
-    from typing import Union
+
+def value_type_matches_obj_annotation_for_union_and_annotated(target, attr_name, value):
+    from osbot_utils.helpers.python_compatibility.python_3_8 import Annotated
+    from typing                                              import Union, get_origin, get_args
+
     value_type           = type(value)
-    attribute_annotation = obj_attribute_annotation(target,attr_name)
+    attribute_annotation = obj_attribute_annotation(target, attr_name)
     origin               = get_origin(attribute_annotation)
-    if origin is Union:                                                     # For Union types, including Optionals
-        args = get_args(attribute_annotation)                               # Get the argument types
+
+    if origin is Union:                                                     # Handle Union types (including Optional)
+        args = get_args(attribute_annotation)
         return value_type in args
-    return None                                                             # if it is not an Union type just return None (to give an indication to the caller that the comparison was not made)
+
+    # todo: refactor the logic below to a separate method (and check for duplicate code with other get_origin usage)
+    if origin is Annotated:                                                # Handle Annotated types
+        args        = get_args(attribute_annotation)
+        base_type   = args[0]                                              # First argument is the base type
+        base_origin = get_origin(base_type)
+
+        if base_origin is None:                                            # Non-container types
+            return isinstance(value, base_type)
+
+        if base_origin in (list, List):                                    # Handle List types
+            if not isinstance(value, list):
+                return False
+            item_type = get_args(base_type)[0]
+            return all(isinstance(item, item_type) for item in value)
+
+        if base_origin in (tuple, Tuple):                                  # Handle Tuple types
+            if not isinstance(value, tuple):
+                return False
+            item_types = get_args(base_type)
+            return len(value) == len(item_types) and all(
+                isinstance(item, item_type)
+                for item, item_type in zip(value, item_types)
+            )
+
+        if base_origin in (dict, Dict):                                    # Handle Dict types
+            if not isinstance(value, dict):
+                return False
+            key_type, value_type = get_args(base_type)
+            return all(isinstance(k, key_type) and isinstance(v, value_type)
+                      for k, v in value.items())
+
+    # todo: add support for for other typing constructs
+    return None                                                             # if it is not a Union or Annotated types just return None (to give an indication to the caller that the comparison was not made)
 
 
 def pickle_save_to_bytes(target: object) -> bytes:

osbot_utils/utils/Regex.py

@@ -1,7 +1,7 @@
 import re
-
 from osbot_utils.utils.Status import status_error
 
+# todo: review if we can delete this file (since we now have an Regex class in the validators)
 
 def list__match_regex(target, pattern):
     return list__match_regexes(target, [pattern])

osbot_utils/version

@@ -1 +1 @@
-v1.89.0
+v1.91.0

{osbot_utils-1.89.0.dist-info → osbot_utils-1.91.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.89.0
+Version: 1.91.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -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-v1.89.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.91.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-1.89.0.dist-info → osbot_utils-1.91.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ osbot_utils/__init__.py,sha256=DdJDmQc9zbQUlPVyTJOww6Ixrn9n4bD3ami5ItQfzJI,16
 osbot_utils/base_classes/Cache_Pickle.py,sha256=kPCwrgUbf_dEdxUz7vW1GuvIPwlNXxuRhb-H3AbSpII,5884
 osbot_utils/base_classes/Kwargs_To_Disk.py,sha256=HHoy05NC_w35WcT-OnSKoSIV_cLqaU9rdjH0_KNTM0E,1096
 osbot_utils/base_classes/Kwargs_To_Self.py,sha256=weFNsBfBNV9W_qBkN-IdBD4yYcJV_zgTxBRO-ZlcPS4,141
-osbot_utils/base_classes/Type_Safe.py,sha256=oEwxNPa1pcq6ccJUyWPUuuMXK6CRzVIzwQNL2lcc6E4,24663
+osbot_utils/base_classes/Type_Safe.py,sha256=JT_lzMkdt7zmLFAPProbgk30J3iBjLgpavGOZ7XwvXY,25611
 osbot_utils/base_classes/Type_Safe__Base.py,sha256=CFPYe8_i5vvTLyc7s8CXbY4n_dY6sqVfBY8w9Vo77ZA,5468
 osbot_utils/base_classes/Type_Safe__Dict.py,sha256=sfZcukhXUd9TS0PQpAk-gGLfZUJSC6BtMh6jF4Fn8Jw,1107
 osbot_utils/base_classes/Type_Safe__List.py,sha256=pXDzJJttpEQQ9oTdsw7BykMB4VIX2rZzi1ZrnCzMZ8M,650
@@ -38,7 +38,7 @@ osbot_utils/fluent/Fluent_Dict.py,sha256=nZ2z91s39sU2a-TLYpBirRoWgDXHrs0tQ9Bi_Zd
 osbot_utils/fluent/Fluent_List.py,sha256=PfDDC9sm16CFnNQ8gkhCEsmKcZp8iyQ0YBpSHvYssG8,1089
 osbot_utils/fluent/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 osbot_utils/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/graphs/mermaid/Mermaid.py,sha256=iUFZdLAMRC4DjvqdV5RTmoi1eb2SQlGRAa4dIn3URCo,3068
+osbot_utils/graphs/mermaid/Mermaid.py,sha256=G7--iIKm2C1z-tEB1qLNopwoW3_w4oR7Oq7-yA460mM,3164
 osbot_utils/graphs/mermaid/Mermaid__Edge.py,sha256=jwHxHJEAA49aO28T8nnJFxOfpWAZZaWKNT_krG1fwkQ,1893
 osbot_utils/graphs/mermaid/Mermaid__Graph.py,sha256=FRw17efZrdcKyXDKsyb1C8nswIAmljiUAyiF0FHIL4M,2854
 osbot_utils/graphs/mermaid/Mermaid__Node.py,sha256=j_AVfR3hnKAJH2Z3d17djvU7MfQP8B70Lh7Jv6y0tTs,3322
@@ -77,8 +77,7 @@ osbot_utils/helpers/Str_ASCII.py,sha256=PRqyu449XnKrLn6b9Miii1Hv-GO5OAa1UhhgvlRc
 osbot_utils/helpers/Timestamp_Now.py,sha256=k3-SUGYx2jLTXvgZYeECqPRJhVxqWPmW7co1l6r12jk,438
 osbot_utils/helpers/Type_Registry.py,sha256=Ajk3SyMSKDi2g9SJYUtTgg7PZkAgydaHcpbGuEN3S94,311
 osbot_utils/helpers/Type_Safe_Method.py,sha256=8E88of__An9_ZhJKz6Kp22C1mb9WLED0jWNLOII3fJs,10489
-osbot_utils/helpers/Xml_To_Dict.py,sha256=EbuiLi1cElakYyueSKi6LKJXUDz4-oi4QTFI1WTu7Rs,2846
-osbot_utils/helpers/Zip_Bytes.py,sha256=KB5zWfCf6ET4alNfqNrSp5DxZ3Jp9oDHpc6tK2iO_qg,4320
+osbot_utils/helpers/Zip_Bytes.py,sha256=6i6uD1TIcMZZRM8BYMseSnihRxUI2vJiai3UnPHrGrY,4290
 osbot_utils/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/ast/Ast.py,sha256=lcPQOSxXI6zgmMnIVF9WM6ISqViWX-sq4d_UC0CDG8s,1155
 osbot_utils/helpers/ast/Ast_Base.py,sha256=5rHMupBlN_n6lOC31UnSW_lWqxqxaE31v0gn-t32OgQ,3708
@@ -211,6 +210,8 @@ osbot_utils/helpers/pubsub/schemas/Schema__Event__Leave_Room.py,sha256=cNugRz-k_
 osbot_utils/helpers/pubsub/schemas/Schema__Event__Message.py,sha256=rt8W-DGitmR-SvmunSG8kbTH_mubE2PKMh2cJ3eJOyo,244
 osbot_utils/helpers/pubsub/schemas/Schema__PubSub__Client.py,sha256=yOQSn4o1bIsEoyhnQJYen372so89Ben1wMWUO12G4h8,239
 osbot_utils/helpers/pubsub/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/python_compatibility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/python_compatibility/python_3_8.py,sha256=kh846vs3ir8xD0RSARJBOL0xufnt3L_Td3K45lDfqng,161
 osbot_utils/helpers/sqlite/Capture_Sqlite_Error.py,sha256=GSuRYgs1yKQjxMszPoaI7fsfMfuUqhb64AaIysRE6Cs,1747
 osbot_utils/helpers/sqlite/Sqlite__Cursor.py,sha256=k5G9Tkk3nx6nHoSanLmpuJG_TceAmN7uRBCt0bo6sIc,3364
 osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=YSuppFFiR-RcGiAXxhS-Oygw5PvdbV94wm4ybQ7cOF8,5616
@@ -261,7 +262,7 @@ osbot_utils/helpers/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 osbot_utils/helpers/trace/Trace_Call.py,sha256=O_y6cncgneYrj3ARDMz-o9Yi1LjsESibUqkGFAg0Jk0,8886
 osbot_utils/helpers/trace/Trace_Call__Config.py,sha256=UAjdsDEqsPBBsu-h4_QKYL4UMukJmQYBBWGYTmSKS40,3361
 osbot_utils/helpers/trace/Trace_Call__Graph.py,sha256=HCrXRKQI42DIQxxyFLcaosWiOcUyoITbeV17ICdXcXM,1156
-osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=hdgiawoC4K2DrMAHbz2706SfEcxPdX9kK0gjyWqjSzQ,12400
+osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=9EQyIiGB6r3UURyNgEXHPOCmZNOejM0UJNW9c_MjpNU,12650
 osbot_utils/helpers/trace/Trace_Call__Print_Lines.py,sha256=cy7zLv0_JNxdOIQPfZk6J9bv6AkIW6O643w0ykClXbw,4820
 osbot_utils/helpers/trace/Trace_Call__Print_Traces.py,sha256=2LGeWMGP1uhSojGMmJmL3bH2B5LFIlfYEqEPNqoyKJw,8628
 osbot_utils/helpers/trace/Trace_Call__Stack.py,sha256=pIvZ2yP4tymOQraUR2N5R-qlmg5QijyLxt85zmMajUs,7462
@@ -270,6 +271,26 @@ osbot_utils/helpers/trace/Trace_Call__Stats.py,sha256=gmiotIrOXe2ssxodzQQ56t8eGT
 osbot_utils/helpers/trace/Trace_Call__View_Model.py,sha256=a40nn6agCEMd2ecsJ93n8vXij0omh0D69QilqwmN_ao,4545
 osbot_utils/helpers/trace/Trace_Files.py,sha256=SNpAmuBlSUS9NyVocgZ5vevzqVaIqoh622yZge3a53A,978
 osbot_utils/helpers/trace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/type_safe/Type_Safe__Validator.py,sha256=cJIPSBarjV716SZUOLvz7Mthjk-aUYKUQtRDtKUBmN4,779
+osbot_utils/helpers/type_safe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/type_safe/validators/Validator__Max.py,sha256=UxrS-tDS5RqfV5aCSbgoGcKHC9VPGqeS_ACB1dqNpQw,1272
+osbot_utils/helpers/type_safe/validators/Validator__Min.py,sha256=krNnQjt8XCS5smESvGsFHw2dJWmS9VKn6WXcY1xatkY,1978
+osbot_utils/helpers/type_safe/validators/Validator__One_Of.py,sha256=AEknqmurAilHMOvbL6EBxAho2pz4llKPNeX0FHBPru8,678
+osbot_utils/helpers/type_safe/validators/Validator__Regex.py,sha256=k6mZSDM1lISwCK-Atnuw5TTe1qx6DIf-DbzT4hL1Pu8,1005
+osbot_utils/helpers/type_safe/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/xml/Xml__Attribute.py,sha256=r29x8ehRug27KuHQKQEGl6Thz_MNaNHy6X3cPRgH4ho,148
+osbot_utils/helpers/xml/Xml__Element.py,sha256=J0hMaJPIBNmZf4wo0xrtZBZd5vWie5FoX9XqtAXQToM,871
+osbot_utils/helpers/xml/Xml__File.py,sha256=c3axXx07rIoK5tGzpLwH-X1B7nusSe1-SZAxJNZJ0KI,420
+osbot_utils/helpers/xml/Xml__File__Load.py,sha256=iAH21HjrqFoZlU5-Kg2RE53RBdNs0mDaASETUTnbhRo,3625
+osbot_utils/helpers/xml/Xml__File__To_Dict.py,sha256=1KGswrpMpUPu4JDYUbkP8GTOQfHGcGONnDYsi-_aqv0,2061
+osbot_utils/helpers/xml/Xml__File__To_Xml.py,sha256=HvUbYOfLz6i160_to90dP3b1uy3Z85nnj7qaGN8LEBI,2884
+osbot_utils/helpers/xml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/xml/rss/RSS__Channel.py,sha256=HPLsGRNIaPh0_8GYE2a53bSV5Bb4E6j6tKGuy4bxg4Y,605
+osbot_utils/helpers/xml/rss/RSS__Enclosure.py,sha256=f75U7nXXJ7hLs2zPDui0WsFAmMJaeaverjlxD4M-Otg,142
+osbot_utils/helpers/xml/rss/RSS__Feed.py,sha256=lhFoeBMWdH1Dp8QnagCGj9bfZHKmB_HkE56hPVZNaM0,425
+osbot_utils/helpers/xml/rss/RSS__Feed__Parser.py,sha256=qG4FbUexMmU6_pTgcxDBmBeZvh9d1dmFZGzQOwVlggk,5088
+osbot_utils/helpers/xml/rss/RSS__Image.py,sha256=4uI0jd17pqb8FJ8HQcERXvn3WjGbiOVI8u1tv-IN59U,171
+osbot_utils/helpers/xml/rss/RSS__Item.py,sha256=y-QI2WBfd9FEsVWc_eNirvZUUslpb2z27hxcm-RVHJQ,611
 osbot_utils/testing/Catch.py,sha256=HdNoKnrPBjvVj87XYN-Wa1zpo5z3oByURT6TKbd5QpQ,2229
 osbot_utils/testing/Custom_Handler_For_Http_Tests.py,sha256=LKscFEcuwTQQ9xl4q71PR5FA8U-q8OtfTkCJoIgQIoQ,5358
 osbot_utils/testing/Duration.py,sha256=iBrczAuw6j3jXtG7ZPraT0PXbCILEcCplJbqei96deA,2217
@@ -306,11 +327,11 @@ osbot_utils/utils/Json.py,sha256=0DZGlCU7Nqte5n0r7ctPXFybqA5MRfSrTz5zuK_6UFk,709
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
 osbot_utils/utils/Lists.py,sha256=tPz5x5s3sRO97WZ_nsxREBPC5cwaHrhgaYBhsrffTT8,5599
 osbot_utils/utils/Misc.py,sha256=H_xexJgiTxB3jDeDiW8efGQbO0Zuy8MM0iQ7qXC92JI,17363
-osbot_utils/utils/Objects.py,sha256=qzdwfQZMyI-ySlOhuUM6z2M4cW9eZDXpUeTIzgYwlS4,19977
+osbot_utils/utils/Objects.py,sha256=FVX0CyVY2g1iXIL4UA1dFzgbsA-GYrJ_cYlxosGxTdo,21713
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=tx8N6wRKL3RDHboDRKZn8SirSJdSAE9cACyJkxrThZ8,12792
-osbot_utils/utils/Regex.py,sha256=0ubgp8HKsS3PNe2H6XlzMIcUuV7jhga3VkQVDNOJWuA,866
+osbot_utils/utils/Regex.py,sha256=MtHhk69ax7Nwu4CQZK7y4KXHZ6VREwEpIchuioB168c,960
 osbot_utils/utils/Status.py,sha256=Yq4s0TelXgn0i2QjCP9V8mP30GabXp_UL-jjM6Iwiw4,4305
 osbot_utils/utils/Str.py,sha256=Y05F46m6s3_H7KoPdeasc1LRaU7R4YifIbsHNQYDEeg,3275
 osbot_utils/utils/Threads.py,sha256=lnh4doZWYUIoWBZRU_780QPeAIKGDh7INuqmU8Fzmdc,3042
@@ -318,8 +339,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=ty30vvmdD1qw-8a6mVUfcEOT_nStazbsrdXwAHaom5k,8
-osbot_utils-1.89.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.89.0.dist-info/METADATA,sha256=fqPYnTXYJMDtR982ODsggiUxzZHnnLBFCaBpnOMtpKw,1317
-osbot_utils-1.89.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-1.89.0.dist-info/RECORD,,
+osbot_utils/version,sha256=mY1aZ-j7A_cOD1nfZEVe-d0NfwVf728QcJbLk0BIvkI,8
+osbot_utils-1.91.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.91.0.dist-info/METADATA,sha256=luU4ieNWlaNSKRUyf9jTUyGb2tKGwRPlZtgZ5cZCTPc,1317
+osbot_utils-1.91.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+osbot_utils-1.91.0.dist-info/RECORD,,

osbot_utils/helpers/Xml_To_Dict.py

@@ -1,87 +0,0 @@
-from typing                 import Dict, Any, Union
-from xml.etree.ElementTree  import Element
-
-from osbot_utils.base_classes.Type_Safe import Type_Safe
-
-class XML_Attribute(Type_Safe):
-    name     : str
-    value    : str
-    namespace: str
-
-class XML_Element(Type_Safe):
-    attributes: Dict[str, XML_Attribute]
-    children  : Dict[str, Union[str, 'XML_Element']]
-
-
-class Xml_To_Dict(Type_Safe):
-    xml_data    : str             = None       # Input XML string
-    root        : Element         = None       # Root ElementTree.Element
-    namespaces  : Dict[str, str]               # XML namespaces
-    xml_dict    : Dict[str, Any]               # Parsed XML as dictionary
-
-    def setup(self) :
-        from xml.etree.ElementTree import ParseError
-        try:
-            self.load_namespaces()
-            self.load_root()
-
-        except ParseError as e:
-            raise ValueError(f"Invalid XML: {str(e)}")
-        return self
-
-
-    def load_namespaces(self):
-        from xml.etree.ElementTree import iterparse
-        from io import StringIO
-
-        for event, elem in iterparse(StringIO(self.xml_data), events=("start-ns",)):
-            self.namespaces[elem[0]] = elem[1]
-
-    def load_root(self):
-        from xml.etree.ElementTree import fromstring
-
-        self.root = fromstring(self.xml_data)
-
-    def element_to_dict(self, element: Element) -> Union[Dict[str, Any], str]:
-        """Convert an ElementTree.Element to a dictionary"""
-        result: Dict[str, Any] = {}
-
-
-        if element.attrib:                                  # Handle attributes
-            result.update(element.attrib)
-
-        # Handle child elements
-        child_nodes: Dict[str, Any] = {}
-        for child in element:
-            tag = child.tag                                 # Remove namespace prefix if present
-            if '}' in tag:
-                tag = tag.split('}', 1)[1]
-
-            child_data = self.element_to_dict(child)
-
-            if tag in child_nodes:
-                if not isinstance(child_nodes[tag], list):
-                    child_nodes[tag] = [child_nodes[tag]]
-                child_nodes[tag].append(child_data)
-            else:
-                child_nodes[tag] = child_data
-
-        # Handle text content
-        text = element.text.strip() if element.text else ''
-        if text:
-            if child_nodes or result:
-                result['_text'] = text
-            else:
-                return text
-        elif not child_nodes and not result:                # Make sure we return text content even for empty nodes
-            return text
-
-        # Combine results
-        if child_nodes:
-            result.update(child_nodes)
-
-        return result
-
-    def parse(self) -> Dict[str, Any]:   # Convert parsed XML to dictionary
-        self.xml_dict = self.element_to_dict(self.root)
-        return self