osbot-utils 1.13.0__tar.gz → 1.16.0__tar.gz

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/PKG-INFO

@@ -1,14 +1,18 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.13.0
+Version: 1.16.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
 Author: Dinis Cruz
 Author-email: dinis.cruz@owasp.org
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.7,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Project-URL: Repository, https://github.com/owasp-sbot/OSBot-Utils
@@ -18,7 +22,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.13.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.16.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.13.0 → osbot_utils-1.16.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-v1.13.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.16.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.13.0 → osbot_utils-1.16.0}/osbot_utils/base_classes/Kwargs_To_Self.py

@@ -3,10 +3,12 @@
 #       the data is available in IDE's code complete
 import functools
 import inspect
+import sys
 import types
+import typing
 from decimal import Decimal
-from enum                                       import Enum, EnumMeta, EnumType
-from typing                                     import get_origin, get_args
+from enum                                       import Enum, EnumMeta
+from typing                                     import List
 
 from osbot_utils.base_classes.Type_Safe__List   import Type_Safe__List
 from osbot_utils.utils.Dev                      import pprint
@@ -16,7 +18,30 @@ from osbot_utils.utils.Objects                  import default_value, value_type
     raise_exception_on_obj_type_annotation_mismatch, obj_is_attribute_annotation_of_type, enum_from_value, \
     obj_is_type_union_compatible, value_type_matches_obj_annotation_for_union_attr
 
-immutable_types = (bool, int, float, complex, str, tuple, frozenset, bytes, types.NoneType, EnumMeta)
+# Backport implementations of get_origin and get_args for Python 3.7
+if sys.version_info < (3, 8):
+    def get_origin(tp):
+        if isinstance(tp, typing._GenericAlias):
+            return tp.__origin__
+        elif tp is typing.Generic:
+            return typing.Generic
+        else:
+            return None
+
+    def get_args(tp):
+        if isinstance(tp, typing._GenericAlias):
+            return tp.__args__
+        else:
+            return ()
+else:
+    from typing import get_origin, get_args
+
+if sys.version_info >= (3, 10):
+    NoneType = types.NoneType
+else:
+    NoneType = type(None)
+
+immutable_types = (bool, int, float, complex, str, tuple, frozenset, bytes, NoneType, EnumMeta)
 
 
 #todo: see if we can also add type safety to method execution
@@ -115,25 +140,28 @@ class Kwargs_To_Self:               # todo: check if the description below is st
     def __exit__(self, exc_type, exc_val, exc_tb): pass
 
     def __setattr__(self, name, value):
-        # if self.__type_safety__:
+        if not hasattr(self, '__annotations__'):                    # can't do type safety checks if the class does not have annotations
+            return super().__setattr__(name, value)
+
+            # if self.__type_safety__:
         #     if self.__lock_attributes__:
             # todo: this can't work on all, current hypothesis is that this will work for the values that are explicitly set
             # if not hasattr(self, name):
             #     raise AttributeError(f"'[Object Locked] Current object is locked (with __lock_attributes__=True) which prevents new attributes allocations (i.e. setattr calls). In this case  {type(self).__name__}' object has no attribute '{name}'") from None
 
-            if value is not None:
-                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)
-                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
-                    raise Exception(f"Invalid type for attribute '{name}'. Expected '{self.__annotations__.get(name)}' but got '{type(value)}'")
-            else:
-                if hasattr(self, name) and self.__annotations__.get(name) :     # don't allow previously set variables to be set to None
-                    if getattr(self, name) is not None:                         # unless it is already set to None
-                        raise Exception(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)}'")
+        if value is not None:
+            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)
+            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
+                raise Exception(f"Invalid type for attribute '{name}'. Expected '{self.__annotations__.get(name)}' but got '{type(value)}'")
+        else:
+            if hasattr(self, name) and self.__annotations__.get(name) :     # don't allow previously set variables to be set to None
+                if getattr(self, name) is not None:                         # unless it is already set to None
+                    raise Exception(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)}'")
 
-            super().__setattr__(name, value)
+        super().__setattr__(name, value)
 
     def __attr_names__(self):
         return list_set(self.__locals__())
@@ -156,30 +184,43 @@ class Kwargs_To_Self:               # todo: check if the description below is st
                     if (k in kwargs) is False:                                          # do not set the value is it has already been set
                         kwargs[k] = v
 
-            for var_name, var_type in base_cls.__annotations__.items():
-                if hasattr(base_cls, var_name) is False:                                # only add if it has not already been defined
-                    if var_name in kwargs:
-                        continue
-                    var_value = cls.__default__value__(var_type)
-                    kwargs[var_name] = var_value
-                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 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 Exception(exception_message)
-                        if var_type not in immutable_types and var_name.startswith('__') is False:              # if var_type is not one of the immutable_types or is an __ internal
-                            #todo: fix type safety bug that I believe is caused here
-                            if obj_is_type_union_compatible(var_type, immutable_types) is False:                # if var_type is not something like Optional[Union[int, str]]
-                                if type(var_type) not in immutable_types:
-                                    exception_message = f"variable '{var_name}' is defined as type '{var_type}' which is not supported by Kwargs_To_Self, with only the following immutable types being supported: '{immutable_types}'"
-                                    raise Exception(exception_message)
+            if hasattr(base_cls,'__annotations__'):  # can only do type safety checks if the class does not have annotations
+                for var_name, var_type in base_cls.__annotations__.items():
+                    if hasattr(base_cls, var_name) is False:                                # only add if it has not already been defined
+                        if var_name in kwargs:
+                            continue
+                        var_value = cls.__default__value__(var_type)
+                        kwargs[var_name] = var_value
+                    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 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 Exception(exception_message)
+                            if var_type not in immutable_types and var_name.startswith('__') is False:              # if var_type is not one of the immutable_types or is an __ internal
+                                #todo: fix type safety bug that I believe is caused here
+                                if obj_is_type_union_compatible(var_type, immutable_types) is False:                # if var_type is not something like Optional[Union[int, str]]
+                                    if type(var_type) not in immutable_types:
+                                        exception_message = f"variable '{var_name}' is defined as type '{var_type}' which is not supported by Kwargs_To_Self, with only the following immutable types being supported: '{immutable_types}'"
+                                        raise Exception(exception_message)
             if include_base_classes is False:
                 break
         return kwargs
 
     @classmethod
     def __default__value__(cls, var_type):
+        if var_type is typing.Set:                              # todo: refactor the dict, set and list logic, since they are 90% the same
+            return set()
+        if get_origin(var_type) is set:
+            return set()                                        # todo: add Type_Safe__Set
+
+        if var_type is typing.Dict:
+            return {}
+        if get_origin(var_type) is dict:
+            return {}                                           # todo: add Type_Safe__Dict
+
+        if var_type is typing.List:
+            return []  # handle case when List was used with no type information provided
         if get_origin(var_type) is list:                        # if we have list defined as list[type]
             item_type = get_args(var_type)[0]                   #    get the type that was defined
             return Type_Safe__List(expected_type=item_type)     #    and used it as expected_type in Type_Safe__List
@@ -198,9 +239,10 @@ class Kwargs_To_Self:               # todo: check if the description below is st
                     if not isinstance(v, classmethod):
                         kwargs[k] = v
             # add the vars defined with the annotations
-            for var_name, var_type in base_cls.__annotations__.items():
-                var_value        = getattr(self, var_name)
-                kwargs[var_name] = var_value
+            if hasattr(base_cls,'__annotations__'):  # can only do type safety checks if the class does not have annotations
+                for var_name, var_type in base_cls.__annotations__.items():
+                    var_value        = getattr(self, var_name)
+                    kwargs[var_name] = var_value
 
         return kwargs
 
@@ -230,7 +272,9 @@ class Kwargs_To_Self:               # todo: check if the description below is st
 
     @classmethod
     def __schema__(cls):
-        return cls.__annotations__
+        if hasattr(cls,'__annotations__'):  # can only do type safety checks if the class does not have annotations
+            return cls.__annotations__
+        return {}
 
     # global methods added to any class that base classes this
     # todo: see if there should be a prefix on these methods, to make it easier to spot them
@@ -256,8 +300,9 @@ class Kwargs_To_Self:               # todo: check if the description below is st
         """Update instance attributes with values from provided keyword arguments."""
         for key, value in kwargs.items():
             if value is not None:
-                if value_type_matches_obj_annotation_for_attr(self, key, value) is False:
-                    raise Exception(f"Invalid type for attribute '{key}'. Expected '{self.__annotations__.get(key)}' but got '{type(value)}'")
+                if hasattr(self,'__annotations__'):  # can only do type safety checks if the class does not have annotations
+                    if value_type_matches_obj_annotation_for_attr(self, key, value) is False:
+                        raise Exception(f"Invalid type for attribute '{key}'. Expected '{self.__annotations__.get(key)}' but got '{type(value)}'")
                 setattr(self, key, value)
         return self
 
@@ -267,12 +312,14 @@ class Kwargs_To_Self:               # todo: check if the description below is st
             if hasattr(self, key) and isinstance(getattr(self, key), Kwargs_To_Self):
                 getattr(self, key).deserialize_from_dict(value)                         # Recursive call for complex nested objects
             else:
-                if obj_is_attribute_annotation_of_type(self, key, EnumType):            # handle the case when the value is an Enum
-                    enum_type = getattr(self, '__annotations__').get(key)
-                    if type(value) is not enum_type:                                    # if the value is not already of the target type
-                        value = enum_from_value(enum_type, value)                       # try to resolve the value into the enum
+                if hasattr(self, '__annotations__'):  # can only do type safety checks if the class does not have annotations
+                    if obj_is_attribute_annotation_of_type(self, key, EnumMeta):            # Handle the case when the value is an Enum
+                        enum_type = getattr(self, '__annotations__').get(key)
+                        if type(value) is not enum_type:                                    # If the value is not already of the target type
+                            value = enum_from_value(enum_type, value)                       # Try to resolve the value into the enum
 
                 setattr(self, key, value)                                               # Direct assignment for primitive types and other structures
+
         return self
 
     def serialize_to_dict(self):                        # todo: see if we need this method or if the .json() is enough
@@ -295,7 +342,7 @@ def serialize_to_dict(obj):
         return obj
     elif isinstance(obj, Enum):
         return obj.name
-    elif isinstance(obj, list):
+    elif isinstance(obj, list) or isinstance(obj, List):
         return [serialize_to_dict(item) for item in obj]
     elif isinstance(obj, dict):
         return {key: serialize_to_dict(value) for key, value in obj.items()}

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/graphs/mermaid/Mermaid__Graph.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from osbot_utils.graphs.mgraph.MGraph__Edge import MGraph__Edge
 from osbot_utils.graphs.mgraph.MGraph__Node import MGraph__Node
 from osbot_utils.graphs.mermaid.Mermaid__Edge import Mermaid__Edge
@@ -6,9 +8,9 @@ from osbot_utils.graphs.mgraph.MGraph import MGraph
 
 
 class Mermaid__Graph(MGraph):
-    edges        : list[Mermaid__Edge]
-    mermaid_code : list
-    nodes        : list[Mermaid__Node]
+    edges        : List[Mermaid__Edge]
+    mermaid_code : List
+    nodes        : List[Mermaid__Node]
 
     # def __init__(self, mgraph=None):
     #     super().__init__()

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/graphs/mermaid/Mermaid__Renderer.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from osbot_utils.base_classes.Kwargs_To_Self                        import Kwargs_To_Self
 from osbot_utils.graphs.mermaid.configs.Mermaid__Render__Config import Mermaid__Render__Config
 from osbot_utils.graphs.mermaid.models.Mermaid__Diagram_Direction   import Diagram__Direction
@@ -6,7 +8,7 @@ from osbot_utils.graphs.mermaid.models.Mermaid__Diagram__Type       import Diagr
 
 class Mermaid__Renderer(Kwargs_To_Self):
     config            : Mermaid__Render__Config
-    mermaid_code      : list
+    mermaid_code      : List
     diagram_direction : Diagram__Direction = Diagram__Direction.LR
     diagram_type      : Diagram__Type      = Diagram__Type.graph
 

osbot_utils-1.16.0/osbot_utils/graphs/mermaid/models/Mermaid__Diagram__Type.py

@@ -0,0 +1,16 @@
+from enum import Enum
+
+class Diagram__Type(Enum):
+    class_diagram                = "class_diagram"
+    entity_relationship_diagram  = "entity_relationship_diagram"
+    flowchart                    = "flowchart"
+    gantt                        = "gantt"
+    git_graph                    = "git_graph"
+    graph                        = "graph"
+    mermaid_map                  = "mermaid_map"
+    mindmap                      = "mindmap"
+    pie_chart                    = "pie_chart"
+    requirement_diagram          = "requirement_diagram"
+    sequence_diagram             = "sequenceDiagram"             # these are different from the others
+    state_diagram                = "stateDiagram-v2"             # these are different from the others
+    user_journey                 = "user_journey"

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/graphs/mgraph/MGraph.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from osbot_utils.utils.Misc import random_text, lower
 from osbot_utils.base_classes.Kwargs_To_Self   import Kwargs_To_Self
 from osbot_utils.graphs.mgraph.MGraph__Config  import MGraph__Config
@@ -8,9 +10,9 @@ from osbot_utils.graphs.mgraph.MGraph__Node    import MGraph__Node
 # todo add support for storing the data in sqlite so that we get the ability to search nodes and edges
 class MGraph(Kwargs_To_Self):
     config : MGraph__Config
-    edges  : list[MGraph__Edge]
+    edges  : List[MGraph__Edge]
     key    : str
-    nodes  : list[MGraph__Node]
+    nodes  : List[MGraph__Node]
 
 
     def __init__(self, **kwargs):

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/ast/Ast.py

@@ -11,9 +11,12 @@ class Ast:
         pass
 
     def source_code__from(self, target):
-        source_raw = inspect.getsource(target)
-        source     = str_dedent(source_raw)             # remove any training spaces or it won't compile
-        return source
+        try:
+            source_raw = inspect.getsource(target)
+            source     = str_dedent(source_raw)             # remove any training spaces or it won't compile
+            return source
+        except:
+            return None
 
     def ast_module__from(self, target):
         source_code = self.source_code__from(target)

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/html/Tag__Head.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from osbot_utils.helpers.html.Tag__Base import Tag__Base
 from osbot_utils.helpers.html.Tag__Link import Tag__Link
 from osbot_utils.helpers.html.Tag__Style import Tag__Style
@@ -6,8 +8,8 @@ from osbot_utils.utils.Dev import pprint
 
 class Tag__Head(Tag__Base):
     title    : str
-    links    : list[Tag__Link]
-    meta     : list[Tag__Base]
+    links    : List[Tag__Link]
+    meta     : List[Tag__Base]
     style    : Tag__Style
 
     def __init__(self, **kwargs):

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/pubsub/PubSub__Client.py

@@ -1,4 +1,5 @@
 from queue import Queue
+from typing import List
 
 from osbot_utils.base_classes.Kwargs_To_Self import Kwargs_To_Self
 from osbot_utils.helpers.pubsub.Event__Queue import Event__Queue
@@ -13,7 +14,7 @@ from osbot_utils.utils.Misc import random_guid
 class PubSub__Client(Kwargs_To_Self):
     event_queue       : Event__Queue
     client_id         : str
-    received_messages : list[str]           # todo: fix this to be Events/Messages received via event_queue
+    received_messages : List[str]           # todo: fix this to be Events/Messages received via event_queue
 
     def __init__(self, **kwargs):
         self.client_id = kwargs.get('client_id') or random_guid()

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/pubsub/PubSub__Room.py

@@ -1,3 +1,5 @@
+from typing import Set
+
 from osbot_utils.base_classes.Kwargs_To_Self import Kwargs_To_Self
 from osbot_utils.helpers.pubsub.Event__Queue import Event__Queue
 from osbot_utils.helpers.pubsub.PubSub__Client import PubSub__Client
@@ -6,7 +8,7 @@ from osbot_utils.helpers.pubsub.PubSub__Client import PubSub__Client
 class PubSub__Room(Kwargs_To_Self):
     event_queue: Event__Queue
     room_name  : str
-    clients    : set[PubSub__Client]
+    clients    : Set[PubSub__Client]
 
     def send_to_clients__message(self, message):
         for client in self.clients:

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/pubsub/PubSub__Server.py

@@ -1,6 +1,7 @@
 import queue
 from threading import Thread
 from queue import Queue
+from typing import Set, Dict
 
 from osbot_utils.helpers.pubsub.Event__Queue                        import Event__Queue
 from osbot_utils.helpers.pubsub.PubSub__Client                      import PubSub__Client
@@ -17,9 +18,9 @@ from osbot_utils.utils.Dev                                          import pprin
 
 class PubSub__Server(Event__Queue):
     #pubsub_db: PubSub__Sqlite
-    clients          : dict
-    clients_connected: set[PubSub__Client]
-    rooms            : dict[str, PubSub__Room]
+    clients          : Dict
+    clients_connected: Set[PubSub__Client]
+    rooms            : Dict[str, PubSub__Room]
     logging          : Logging
 
     def __init__ (self):

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/sqlite/Sqlite__Table__Create.py

@@ -1,4 +1,6 @@
 import inspect
+from typing import List
+
 from osbot_utils.base_classes.Kwargs_To_Self                import Kwargs_To_Self
 from osbot_utils.decorators.lists.filter_list               import filter_list
 from osbot_utils.helpers.sqlite.Sqlite__Field               import Sqlite__Field
@@ -6,7 +8,7 @@ from osbot_utils.helpers.sqlite.Sqlite__Table               import Sqlite__Table
 from osbot_utils.helpers.sqlite.models.Sqlite__Field__Type  import Sqlite__Field__Type
 
 class Sqlite__Table__Create(Kwargs_To_Self):
-    fields  : list[Sqlite__Field]
+    fields  : List[Sqlite__Field]
     table   : Sqlite__Table
 
     def __init__(self, table_name):
@@ -21,7 +23,7 @@ class Sqlite__Table__Create(Kwargs_To_Self):
             return True
         return False
 
-    def add_fields(self, fields_data:list[dict]):
+    def add_fields(self, fields_data:List[dict]):
         results = []
         if fields_data:
             for field_data in fields_data:

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/helpers/sqlite/models/Sqlite__Field__Type.py

@@ -1,9 +1,14 @@
+import sys
+import types
 from decimal import Decimal
 from enum import Enum, auto
-from types import NoneType
-
 from osbot_utils.decorators.methods.cache import cache
 
+if sys.version_info >= (3, 10):
+    NoneType = types.NoneType
+else:
+    NoneType = type(None)
+
 
 class Sqlite__Field__Type(Enum):
     BOOLEAN = bool

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/testing/Profiler.py

@@ -26,8 +26,8 @@ class Profiler:
                 item[arg_name] = self.add_values(option, value)
             else:
                 if profile_options.get(arg_name):
-                    if arg_name == 'f_locals':
-                        item[arg_name] = value.copy()           # create a copy of the var
+                    if arg_name == 'f_locals' and sys.version_info < (3, 13):    # todo: figure out why in 3.13 the value.copy doesn't work
+                        item[arg_name] = value.copy()                            # create a copy of the var
                     else:
                         item[arg_name] = value
         return item

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/utils/Env.py

@@ -1,10 +1,23 @@
 # In Misc.py
 import os
+from sys import platform
 
+from osbot_utils.utils.Dev import pprint
 from osbot_utils.utils.Files import all_parent_folders
 from osbot_utils.utils.Misc import list_set
 from osbot_utils.utils.Str import strip_quotes
 
+def env__home_root():
+    return os.getenv('HOME') == '/root'
+
+def env__terminal_xterm():
+    return os.getenv('TERM') == 'xterm'
+
+def env__not_terminal_xterm():
+    return not env__terminal_xterm()
+
+def platform_darwin():
+    return platform == 'darwin'
 
 def env_value(var_name):
     return env_vars().get(var_name, None)

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/utils/Int.py

@@ -1,4 +1,3 @@
-@staticmethod
 def int_is_even(number):
     return number % 2 == 0
 

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/utils/Misc.py

@@ -10,12 +10,19 @@ import textwrap
 import re
 import uuid
 import warnings
-from datetime import datetime, timedelta, UTC
+from datetime import datetime, timedelta
 from secrets    import token_bytes
 from time import sleep
 from typing import Iterable
 from urllib.parse import  quote_plus, unquote_plus
 
+
+if sys.version_info >= (3, 11):
+    from datetime import UTC
+else:
+    from datetime import timezone                       # For versions before 3.11, we need to use a different method or library to handle UTC
+    UTC = timezone.utc
+
 def ansi_text_visible_length(text):
     ansi_escape = re.compile(r'\x1b\[[0-9;]*m')         # This regex matches the escape sequences used for text formatting
     visible_text = ansi_escape.sub('', text)       # Remove the escape sequences

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/osbot_utils/utils/Objects.py

@@ -4,12 +4,33 @@ import io
 import json
 import os
 import pickle
+import sys
 import types
-from typing import get_origin, Union, get_args
+import typing
+from typing import Union
 
 from osbot_utils.utils.Misc import list_set
 from osbot_utils.utils.Str  import str_unicode_escape, str_max_width
 
+# Backport implementations of get_origin and get_args for Python 3.7
+if sys.version_info < (3, 8):
+    def get_origin(tp):
+        if isinstance(tp, typing._GenericAlias):
+            return tp.__origin__
+        elif tp is typing.Generic:
+            return typing.Generic
+        else:
+            return None
+
+    def get_args(tp):
+        if isinstance(tp, typing._GenericAlias):
+            return tp.__args__
+        else:
+            return ()
+else:
+    from typing import get_origin, get_args
+
+
 def are_types_compatible_for_assigment(source_type, target_type):
     if source_type is target_type:
         return True

osbot_utils-1.16.0/osbot_utils/version

@@ -0,0 +1 @@
+v1.16.0

{osbot_utils-1.13.0 → osbot_utils-1.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v1.13.0"
+version     = "v1.16.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"
@@ -9,7 +9,7 @@ homepage    = "https://github.com/owasp-sbot/OSBot-Utils"
 repository  = "https://github.com/owasp-sbot/OSBot-Utils"
 
 [tool.poetry.dependencies]
-python          = "^3.11"
+python          = "^3.7"
 
 
 [build-system]

osbot_utils-1.13.0/osbot_utils/graphs/mermaid/models/Mermaid__Diagram__Type.py

@@ -1,17 +0,0 @@
-from enum import auto, Enum
-
-
-class Diagram__Type(Enum):
-    class_diagram                = auto()
-    entity_relationship_diagram  = auto()
-    flowchart                    = auto()
-    gantt                        = auto()
-    git_graph                    = auto()
-    graph                        = auto()
-    mermaid_map                  = auto()
-    mindmap                      = auto()
-    pie_chart                    = auto()
-    requirement_diagram          = auto()
-    sequence_diagram             = "sequenceDiagram"
-    state_diagram                = 'stateDiagram-v2'
-    user_journey                 = auto()

osbot_utils-1.13.0/osbot_utils/version

@@ -1 +0,0 @@
-v1.13.0