osbot-utils 1.11.0__py3-none-any.whl → 1.15.0__py3-none-any.whl

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/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/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/graphs/mermaid/models/Mermaid__Diagram__Type.py

@@ -1,17 +1,16 @@
-from enum import auto, Enum
-
+from enum import 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()
+    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/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/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/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/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/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/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/helpers/sqlite/Sqlite__Cursor.py

@@ -84,4 +84,7 @@ class Sqlite__Cursor(Kwargs_To_Self):
         self.execute(sql_query)
         all_rows   = self.cursor().fetchall()
         all_values = [cell.get(cell_name) for cell in all_rows]
-        return all_values
+        return all_values
+
+    def vacuum(self):
+        return self.execute("VACUUM")

osbot_utils/helpers/sqlite/Sqlite__Database.py

@@ -130,8 +130,11 @@ class Sqlite__Database(Kwargs_To_Self):
             table_names.append('sqlite_master')
         return table_names
 
+    def purge_database(self):       # this fells like a better name than vacuum :)
+        return self.vacuum()
 
-
+    def vacuum(self):
+        return self.cursor().vacuum()
 
 
 

osbot_utils/helpers/sqlite/Sqlite__Table.py

@@ -130,6 +130,7 @@ class Sqlite__Table(Kwargs_To_Self):
         rows              = table_sqlite_master.cursor().execute__fetch_all(sql_query, params)
         return table_sqlite_master.list_of_field_name_from_rows(rows, field_name)
 
+
     def new_row_obj(self, row_data=None):
         if self.row_schema:
             new_obj = self.row_schema()
@@ -154,6 +155,7 @@ class Sqlite__Table(Kwargs_To_Self):
                         picked_row_data[field_name] = field_value
                 return picked_row_data
         return row_data
+
     def parse_row(self, row):
         if row and self.auto_pickle_blob:
             fields = self.fields__cached()
@@ -169,6 +171,14 @@ class Sqlite__Table(Kwargs_To_Self):
     def print(self, **kwargs):
         return Print_Table(**kwargs).print(self.rows())
 
+    def row(self, where, fields=None):
+        if fields is None:
+            return self.select_row_where(**where)
+
+        sql_query, params = self.sql_builder(limit=1).query_select_fields_with_conditions(fields, where)
+        row               = self.cursor().execute__fetch_one(sql_query, params)
+        return self.parse_row(row)
+
     def row_add(self, row_obj=None):
         invalid_reason = self.sql_builder().validate_row_obj(row_obj)
         if invalid_reason:

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/helpers/sqlite/domains/Sqlite__DB__Files.py

@@ -1,3 +1,4 @@
+from osbot_utils.decorators.lists.index_by import index_by
 from osbot_utils.decorators.methods.cache_on_self import cache_on_self
 from osbot_utils.helpers.sqlite.domains.Sqlite__DB__Local import Sqlite__DB__Local
 from osbot_utils.helpers.sqlite.tables.Sqlite__Table__Files import Sqlite__Table__Files
@@ -11,12 +12,33 @@ class Sqlite__DB__Files(Sqlite__DB__Local):
     def add_file(self, path, contents=None, metadata=None):
         return self.table_files().add_file(path, contents, metadata)
 
+    def clear_table(self):
+        self.table_files().clear()
+
+    def delete_file(self, path):
+        return self.table_files().delete_file(path)
+
+    def file(self, path, include_contents=False):
+        return self.table_files().file(path, include_contents=include_contents)
+
+    def file_exists(self, path):
+        return self.table_files().file_exists(path)
+
+    def file_names(self):
+        return self.table_files().select_field_values('path')
     @cache_on_self
     def table_files(self):
         return Sqlite__Table__Files(database=self).setup()
 
-    def files(self):
-        return self.table_files().files()
+    @index_by
+    def files(self,include_contents=False):
+        return self.table_files().files(include_contents=include_contents)
+
+    def files__with_content(self):
+        return self.files(include_contents=True)
+
+    def files__by_path(self):
+        return self.files(index_by='path')
 
     def setup(self):
         self.table_files()

osbot_utils/helpers/sqlite/domains/Sqlite__DB__Local.py

@@ -10,7 +10,8 @@ class Sqlite__DB__Local(Sqlite__Database):
     db_name: str
 
     def __init__(self, db_path=None, db_name=None):
-        self.db_name = db_name or random_text('db_local') + '.sqlite'
+        if hasattr(self, 'db_name') is False:
+            self.db_name = db_name or random_text('db_local') + '.sqlite'
         super().__init__(db_path=db_path or self.path_local_db())
 
     def path_db_folder(self):

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/helpers/sqlite/tables/Sqlite__Table__Files.py

@@ -1,6 +1,7 @@
 from osbot_utils.base_classes.Kwargs_To_Self import Kwargs_To_Self
 from osbot_utils.helpers.sqlite.Sqlite__Table import Sqlite__Table
-from osbot_utils.utils.Misc import timestamp_utc_now
+from osbot_utils.utils.Misc import timestamp_utc_now, bytes_sha256, str_sha256
+from osbot_utils.utils.Status import status_warning, status_ok
 
 SQLITE__TABLE_NAME__FILES = 'files'
 
@@ -21,10 +22,32 @@ class Sqlite__Table__Files(Sqlite__Table):
         super().__init__(**kwargs)
 
     def add_file(self, path, contents=None, metadata= None):
-        if self.contains(path=path):                                     # don't allow multiple entries for the same file path (until we add versioning support)
-            return None
-        row_data = self.create_node_data(path, contents, metadata)
-        return self.add_row_and_commit(**row_data)
+        if self.contains(path=path):                                                    # don't allow multiple entries for the same file path (until we add versioning support)
+            return status_warning(f"File not added, since file with path '{path}' already exists in the database")
+        if metadata is None:
+            metadata = {}
+        metadata.update(self.create_contents_metadata(contents))
+        row_data    = self.create_node_data(path, contents, metadata)
+        new_row_obj = self.add_row_and_commit(**row_data)
+        return status_ok(message='file added', data= new_row_obj)
+
+    def create_contents_metadata(self, contents):
+        file_size       = len(contents)
+        file_is_binary = type(contents) is bytes
+        if file_is_binary:
+            file_hash  = bytes_sha256(contents)
+        else:
+            file_hash = str_sha256(str(contents))
+        return dict(file_contents=dict(hash      = file_hash      ,
+                                       is_binary = file_is_binary ,
+                                       size      = file_size      ))
+
+    def delete_file(self, path):
+        if self.not_contains(path=path):                                                    # don't allow multiple entries for the same file path (until we add versioning support)
+            return status_warning(f"File not deleted, since file with path '{path}' did not exist in the database")
+
+        self.rows_delete_where(path=path)
+        return status_ok(message='file deleted')
 
     def create_node_data(self, path, contents=None, metadata= None):
         node_data = {'path'    : path     ,
@@ -34,9 +57,27 @@ class Sqlite__Table__Files(Sqlite__Table):
             node_data['timestamp'] = timestamp_utc_now()
         return node_data
 
+    def field_names_without_content(self):                      # todo: refactor to get this directly from the schema
+        return ['id', 'path', 'metadata', 'timestamp']          #       and so that these values are not hard-coded here
+
+    def file(self, path, include_contents=True):
+        if include_contents:
+            fields = ['*']
+        else:
+            fields = self.field_names_without_content()
+        return self.row(where=dict(path=path), fields = fields)
+
+    def file_without_contents(self, path):
+        return self.file(path, include_contents=False)
+
+    def file_exists(self, path):
+        return self.contains(path=path)
 
-    def files(self):
-        return self.rows()
+    def files(self, include_contents=False):
+        if include_contents:
+            return self.rows()
+        fields_names = self.field_names_without_content()
+        return self.rows(fields_names)
 
     def setup(self):
         if self.exists() is False:

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/testing/Temp_File.py

@@ -1,11 +1,11 @@
-from osbot_utils.utils.Files import Files, file_delete, folder_delete_all, files_list, file_create, file_name, \
+from osbot_utils.utils.Files import Files, file_delete, folder_delete_all, files_list, file_create, \
     parent_folder, file_exists, file_contents
 from osbot_utils.utils.Misc import random_filename
 
 
 class Temp_File:
-    def __init__(self, contents='...', extension='tmp'):
-        self.tmp_file            = random_filename(extension)
+    def __init__(self, contents='...', extension='tmp',file_name=None, ):
+        self.tmp_file            = file_name or random_filename(extension)
         self.tmp_folder          = None
         self.file_path           = None
         self.original_contents   = contents
@@ -30,7 +30,7 @@ class Temp_File:
         return file_exists(self.file_path)
 
     def file_name(self):
-        return file_name(self.path())
+        return Files.file_name(self.path())
 
     def files_in_folder(self):
         return files_list(self.tmp_folder)

osbot_utils/utils/Env.py

@@ -0,0 +1,89 @@
+# 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)
+
+def env_vars_list():
+    return list_set(env_vars())
+
+def env_vars(reload_vars=False):
+    """
+    if reload_vars reload data from .env file
+    then return dictionary with current environment variables
+    """
+    if reload_vars:
+        load_dotenv()
+    vars = os.environ
+    data = {}
+    for key in vars:
+        data[key] = vars[key]
+    return data
+
+def env_load_from_file(path, override=False):
+    if os.path.exists(path):
+        with open(path) as f:
+            for line in f:
+                line = line.strip()
+                if not line or line.startswith('#'):                # Strip whitespace and ignore comments
+                    continue
+                key, value = line.split(sep='=', maxsplit=1)        # Split the line into key and value
+                value = strip_quotes(value.strip())                 # Handle case when the value is in quotes
+                if override or key.strip() not in os.environ:       # Set the environment variable
+                    os.environ[key.strip()] = value.strip()
+
+def env_unload_from_file(path):
+    if os.path.exists(path):
+        with open(path) as f:
+            for line in f:
+                line = line.strip()
+                if not line or line.startswith('#'):  # Strip whitespace and ignore comments
+                    continue
+                key, _ = line.split(sep='=', maxsplit=1)  # Split the line into key and value
+                key = key.strip()
+                if key in os.environ:  # Remove the environment variable if it exists
+                    del os.environ[key]
+
+def load_dotenv(dotenv_path=None, override=False):
+    if dotenv_path:                                                 # If a specific dotenv path is provided, load from it
+        env_load_from_file(dotenv_path, override)
+    else:
+        directories = all_parent_folders(include_path=True)         # Define the possible directories to search for the .env file (which is this and all parent folders)
+        for directory in directories:                               # Iterate through the directories and load the .env file if found
+            env_path = os.path.join(directory, '.env')              # Define the path to the .env file
+            if os.path.exists(env_path):                            # If we found one
+                env_load_from_file(env_path, override)              # Process it
+                break                                               # Stop after loading the first .env file                                                     # Stop after loading the first .env file
+
+
+def unload_dotenv(dotenv_path=None):
+    if dotenv_path:                                                 # If a specific dotenv path is provided, unload from it
+        env_unload_from_file(dotenv_path)
+    else:
+        directories = all_parent_folders(include_path=True)         # Define the possible directories to search for the .env file (which is this and all parent folders)
+        for directory in directories:                               # Iterate through the directories and unload the .env file if found
+            env_path = os.path.join(directory, '.env')              # Define the path to the .env file
+            if os.path.exists(env_path):                            # If we found one
+                env_unload_from_file(env_path)                      # Process it
+                break                                               # Stop after unloading the first .env file
+
+
+env_load = load_dotenv

osbot_utils/utils/Files.py

@@ -21,7 +21,7 @@ class Files:
     def copy(source:str, destination:str) -> str:
         if file_exists(source):                                     # make sure source file exists
             destination_parent_folder = parent_folder(destination)  # get target parent folder
-            folder_create(destination_parent_folder)                # ensure targer folder exists       # todo: check if this is still needed (we should be using a copy method that creates the required fodlers)
+            folder_create(destination_parent_folder)                # ensure target folder exists       # todo: check if this is still needed (we should be using a copy method that creates the required fodlers)
             return shutil.copy(source, destination)                 # copy file and returns file destination
 
     @staticmethod
@@ -308,7 +308,11 @@ class Files:
     @staticmethod
     def path_combine(path1, path2):
         if type(path1) in [str, Path] and type(path2) in [str, Path]:
-            return abspath(join(str(path1), str(path2)))
+            parent_path = str(path1)
+            sub_path    = str(path2)
+            if sub_path.startswith('/'):
+                sub_path = sub_path[1:]
+            return abspath(join(parent_path,sub_path))
 
     @staticmethod
     def parent_folder(path):
@@ -424,13 +428,53 @@ class Files:
             file.write(contents)
         return path
 
-# todo: refactor the methods above into static methods
+# todo: refactor the methods above into static methods (as bellow)
 
+def all_parent_folders(path=None, include_path=False):
+    if path is None:
+        path = os.getcwd()
+    parent_directories = []
 
+    # Optionally include the starting path
+    if include_path:
+        parent_directories.append(path)
+
+    while True:                                         # Split the path into parts
+        path, tail = os.path.split(path)
+        if tail:
+            parent_directories.append(path)
+        else:
+            if path and path not in parent_directories:  # to handle the root path case
+                parent_directories.append(path)
+            break
+
+    return parent_directories
+def file_move(source_file, target_file):
+    if file_exists(source_file):
+        file_copy(source_file, target_file)
+        if file_exists(target_file):
+            if file_delete(source_file):
+                return True
+    return False
+
+def folders_names_in_folder(target):
+    folders = folders_in_folder(target)
+    return folders_names(folders)
+
+def stream_to_bytes(stream):
+    return stream.read()
+
+def stream_to_file(stream, path=None):
+    if path is None:                        # if path is not defined
+        path = Files.temp_file()            # save it to a temp file
+    with open(path, 'wb') as file:          # Write the content to the file
+        file.write(stream.read())
+    return path
 
 # helper methods
 # todo: all all methods above (including the duplicated mappings at the top)
 
+bytes_to_file                  = Files.write_bytes
 create_folder                  = Files.folder_create
 create_folder_in_parent        = Files.folder_create_in_parent
 create_temp_file               = Files.write
@@ -465,6 +509,7 @@ file_open_gz                   = Files.open_gz
 file_open_bytes                = Files.open_bytes
 file_to_base64                 = Files.file_to_base64
 file_from_base64               = Files.file_from_base64
+file_from_bytes                = Files.write_bytes
 file_save                      = Files.save
 file_sha256                    = Files.contents_sha256
 file_size                      = Files.file_size

osbot_utils/utils/Int.py

@@ -1,4 +1,3 @@
-@staticmethod
 def int_is_even(number):
     return number % 2 == 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/utils/Objects.py

@@ -4,14 +4,33 @@ import io
 import json
 import os
 import pickle
+import sys
 import types
-from typing import get_origin, Union, get_args
-
-from dotenv import load_dotenv
+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
@@ -88,24 +107,6 @@ def enum_from_value(enum_type, value):
     except KeyError:
         raise ValueError(f"Value '{value}' is not a valid member of {enum_type.__name__}.")     # Handle the case where the value does not match any Enum member
 
-def env_value(var_name):
-    return env_vars().get(var_name, None)
-
-def env_vars_list():
-    return list_set(env_vars())
-
-def env_vars(reload_vars=False):
-    """
-    if reload_vars reload data from .env file
-    then return dictionary with current environment variables
-    """
-    if reload_vars:
-        load_dotenv()
-    vars = os.environ
-    data = {}
-    for key in vars:
-        data[key] = vars[key]
-    return data
 
 def get_field(target, field, default=None):
     if target is not None:

osbot_utils/utils/Str.py

@@ -3,13 +3,19 @@ from html import escape, unescape
 
 from osbot_utils.utils.Files import safe_file_name
 
+# todo: refactor this this class all str related methods (mainly from the Misc class)
 
-def html_escape(value):
+def html_escape(value: str):
     return escape(value)
 
-def html_unescape(value):
+def html_unescape(value: str):
     return unescape(value)
 
+def strip_quotes(value: str):                           # Remove surrounding quotes (single or double)
+    if (value.startswith("'") and value.endswith("'")) or (value.startswith('"') and value.endswith('"')):
+        return value[1:-1]
+    return value
+
 def str_dedent(value, strip=True):
     result = textwrap.dedent(value)
     if strip:

osbot_utils/utils/Zip.py

@@ -1,11 +1,41 @@
+import gzip
 import io
 import os
 import shutil
+import tarfile
 import zipfile
 from os.path import abspath
 
-from osbot_utils.utils.Files import temp_folder, folder_files, temp_file, is_file
+from osbot_utils.utils.Files import temp_folder, folder_files, temp_file, is_file, file_copy, file_move
+
+
+def gz_tar_bytes_file_list(gz_bytes):
+    gz_buffer_from_bytes = io.BytesIO(gz_bytes)
+    with gzip.GzipFile(fileobj=gz_buffer_from_bytes, mode='rb') as gz:
+        decompressed_data = gz.read()
+        tar_buffer_from_bytes = io.BytesIO(decompressed_data)                       # Assuming the decompressed data is a tag file, process it
+        with tarfile.open(fileobj=tar_buffer_from_bytes, mode='r:') as tar:
+            return sorted(tar.getnames())
+
+def gz_tar_bytes_get_file(gz_bytes, tar_file_path):
+    gz_buffer_from_bytes = io.BytesIO(gz_bytes)
+    with gzip.GzipFile(fileobj=gz_buffer_from_bytes, mode='rb') as gz:
+        decompressed_data = gz.read()
+        tar_buffer_from_bytes = io.BytesIO(decompressed_data)
+        with tarfile.open(fileobj=tar_buffer_from_bytes, mode='r:') as tar:
+            extracted_file = tar.extractfile(tar_file_path)
+            if extracted_file:
+                return extracted_file.read()
+            else:
+                raise FileNotFoundError(f"The file {tar_file_path} was not found in the tar archive.")
 
+def gz_zip_bytes_file_list(gz_bytes):
+    gz_buffer_from_bytes = io.BytesIO(gz_bytes)
+    with gzip.GzipFile(fileobj=gz_buffer_from_bytes, mode='rb') as gz:
+        decompressed_data = gz.read()
+        zip_buffer_from_bytes = io.BytesIO(decompressed_data)                   # Assuming the decompressed data is a zip file, process it
+        with zipfile.ZipFile(zip_buffer_from_bytes, 'r') as zf:
+            return sorted(zf.namelist())
 
 def unzip_file(zip_file, target_folder=None, format='zip'):
     target_folder = target_folder or temp_folder()
@@ -28,6 +58,14 @@ def zip_bytes_get_file(zip_bytes, zip_file_path):
     with zipfile.ZipFile(zip_buffer, 'r') as zf:
         return zf.read(zip_file_path)
 
+def zip_bytes_extract_to_folder(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
+        zf.extractall(target_folder)                            # Extract all files to the target folder
+    return target_folder                                        # Return the path of the target folder
+
+
 def zip_bytes_file_list(zip_bytes):
     zip_buffer_from_bytes = io.BytesIO(zip_bytes)
     with zipfile.ZipFile(zip_buffer_from_bytes, 'r') as zf:
@@ -61,6 +99,11 @@ def zip_files_to_bytes(target_files, root_folder=None):
 def zip_folder(root_dir, format='zip'):
     return shutil.make_archive(base_name=root_dir, format=format, root_dir=root_dir)
 
+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
     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

osbot_utils/utils/__init__.py

@@ -1,16 +0,0 @@
-"""
-In this class you will find the following helper classes:
-
-- Assert
-- Dev
-- Files
-- Http
-- Json
-- Lists
-- Misc
-- Png
-- Process
-- Temp_File
-- Unzip_File
-- Zip_Folder
-"""

osbot_utils/version

@@ -1 +1 @@
-v1.11.0
+v1.15.0

{osbot_utils-1.11.0.dist-info → osbot_utils-1.15.0.dist-info}/METADATA

@@ -1,17 +1,20 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.11.0
+Version: 1.15.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
-Requires-Dist: python-dotenv
 Project-URL: Repository, https://github.com/owasp-sbot/OSBot-Utils
 Description-Content-Type: text/markdown
 
@@ -19,14 +22,14 @@ 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.11.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.15.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 
 
 ## Install - Release 1.x
 
-**for main branch**: add to requirements.txt
+**for main branch**: just get it from pypi
 
 ```
 pip install osbot-utils

{osbot_utils-1.11.0.dist-info → osbot_utils-1.15.0.dist-info}/RECORD

@@ -1,7 +1,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=7L-DT7BPw_hCNnIypmoPw6PEwoLXkTycYNuOe1YMUBU,17741
+osbot_utils/base_classes/Kwargs_To_Self.py,sha256=mkfnvlKVpNW1fI8pIIkrpP9w7eA7J6giRSAyW4HXWFY,19864
 osbot_utils/base_classes/Type_Safe__List.py,sha256=-80C9OhsK6iDR2dAG8yNLAZV0qg5x3faqvSUigFCMJw,517
 osbot_utils/base_classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/context_managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,17 +33,17 @@ osbot_utils/fluent/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVG
 osbot_utils/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/graphs/mermaid/Mermaid.py,sha256=iUFZdLAMRC4DjvqdV5RTmoi1eb2SQlGRAa4dIn3URCo,3068
 osbot_utils/graphs/mermaid/Mermaid__Edge.py,sha256=jwHxHJEAA49aO28T8nnJFxOfpWAZZaWKNT_krG1fwkQ,1893
-osbot_utils/graphs/mermaid/Mermaid__Graph.py,sha256=VoplH93NuM3npYy1zQBBWsjFFdUeu3A7q2uU_DipFIs,2829
+osbot_utils/graphs/mermaid/Mermaid__Graph.py,sha256=FRw17efZrdcKyXDKsyb1C8nswIAmljiUAyiF0FHIL4M,2854
 osbot_utils/graphs/mermaid/Mermaid__Node.py,sha256=j_AVfR3hnKAJH2Z3d17djvU7MfQP8B70Lh7Jv6y0tTs,3322
-osbot_utils/graphs/mermaid/Mermaid__Renderer.py,sha256=b1UB2aMb-gZAiiF7FrgO0V-1OxGN5Sq3vVUpupDhWiA,2264
+osbot_utils/graphs/mermaid/Mermaid__Renderer.py,sha256=-5h_Xkaq3boKVWzPYPG_kUoe0SOlR0Tm4zVEXJ70wUk,2289
 osbot_utils/graphs/mermaid/configs/Mermaid__Edge__Config.py,sha256=PaypnkaDQQhNBIxZqnAB5bxuJAZWh3SQtmHUPfIcDCQ,212
 osbot_utils/graphs/mermaid/configs/Mermaid__Node__Config.py,sha256=KZWd_uiIm-QIz_wPSDfXfWAWU_A2yxzMeq-h5wldVjQ,465
 osbot_utils/graphs/mermaid/configs/Mermaid__Render__Config.py,sha256=JGQR6kdiTQh45zFZYvqdEDMghFIWLnVYMZsdukYtGyw,216
 osbot_utils/graphs/mermaid/examples/Mermaid_Examples__FlowChart.py,sha256=BFlQ1C-DkmVxSWJKUQC8lFVxu26znHvgaXy50QkYVZY,2220
 osbot_utils/graphs/mermaid/models/Mermaid__Diagram_Direction.py,sha256=m52zJ3bkHuF-Fq29CK3yAlX9RFi5_VQwqQGKaT1XRR4,141
-osbot_utils/graphs/mermaid/models/Mermaid__Diagram__Type.py,sha256=2oMKPZmOfXZ-ZlqR8dayI0f3O0L1XzEwgsqf2EMfV6s,624
+osbot_utils/graphs/mermaid/models/Mermaid__Diagram__Type.py,sha256=QWPjpZ8Y77K3l8v481TK_UzbkxmSkIHDfOxc-P405TM,799
 osbot_utils/graphs/mermaid/models/Mermaid__Node__Shape.py,sha256=_su5S8nYqg5qpXmWvKFZ05ZT5zLjTZP3sVIhc2hNpgg,1813
-osbot_utils/graphs/mgraph/MGraph.py,sha256=GP5Ml_3b0It3SEGodWXQHi4kFCpUhpqV8qgHN0-x6OE,2193
+osbot_utils/graphs/mgraph/MGraph.py,sha256=1Iu2CM9IHxoJxjmABsBqDvi8l09LINLDE9_b53Dz4kM,2218
 osbot_utils/graphs/mgraph/MGraph__Config.py,sha256=oFTj9eP92HolaOSyk-7tpsPVFZLMIcTH-O-mx93nTiA,204
 osbot_utils/graphs/mgraph/MGraph__Data.py,sha256=oLaKmxUOXoQbhdUxa_VW_QZA0tAETgRMzP3pvslppHw,5746
 osbot_utils/graphs/mgraph/MGraph__Edge.py,sha256=TnYUk6-YFpB3_6zY-CY6jJFVSLciGbCxE-fuABw9LX4,916
@@ -63,7 +63,7 @@ osbot_utils/helpers/SCP.py,sha256=fK1xu5mk_axsI7MU2-WIXEjdYetWkUBDb33p6oALgaI,26
 osbot_utils/helpers/SSH.py,sha256=ou0ZzDXDDVHrDOag-7sD4ZgN00VuO7QwCwinMdOq8lg,6151
 osbot_utils/helpers/Type_Registry.py,sha256=Ajk3SyMSKDi2g9SJYUtTgg7PZkAgydaHcpbGuEN3S94,311
 osbot_utils/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/ast/Ast.py,sha256=QbY7HSGzRx7FxHJoo5rDQwEWBRDt6Xsg9gwSeloeaas,1090
+osbot_utils/helpers/ast/Ast.py,sha256=lcPQOSxXI6zgmMnIVF9WM6ISqViWX-sq4d_UC0CDG8s,1155
 osbot_utils/helpers/ast/Ast_Base.py,sha256=5rHMupBlN_n6lOC31UnSW_lWqxqxaE31v0gn-t32OgQ,3708
 osbot_utils/helpers/ast/Ast_Data.py,sha256=EL-6lkNDMe_BKBwFP1sJW-Y8t6TXYYv0uGdlxix4Tyg,697
 osbot_utils/helpers/ast/Ast_Load.py,sha256=ZO2QjhQ13j1m4MwAVbbdAoQ4UoUfzuU6E_RobkhZVpI,2100
@@ -149,15 +149,15 @@ osbot_utils/helpers/html/Tag__Body.py,sha256=U3UNVs1mNBsJ_kG_-OtwYPi-YzFb4Y2w4vI
 osbot_utils/helpers/html/Tag__Div.py,sha256=so47ldnc8nDGZAlZWp2BtfDxdhwzmKjCW8ca2MUbPDE,109
 osbot_utils/helpers/html/Tag__H.py,sha256=Z6PD5Uf5wlXmY7-7Xi5bv3Z_EykqxH4wt1Y_U2Sg5HY,295
 osbot_utils/helpers/html/Tag__HR.py,sha256=Z9YkBbKxas1Q4Tuw_xdpn3FQmkwAPCippilqCgXFhxA,107
-osbot_utils/helpers/html/Tag__Head.py,sha256=TIw8Vw2LxJ8PC1HB1No7usNLNFfuhcx1aSwER5dLTvE,1102
+osbot_utils/helpers/html/Tag__Head.py,sha256=uMuxtfkLkxgTMFVUPIWxvu1VwMyGkE7AXylDZJJHElg,1127
 osbot_utils/helpers/html/Tag__Html.py,sha256=W_QFUF27vpR109g9rpca0zoQis1wkMjGuAty2mwyhH0,1131
 osbot_utils/helpers/html/Tag__Link.py,sha256=rQ-gZN8EkSv5x1S-smdjvFflwMQHACHQXiOdx0MFke8,437
 osbot_utils/helpers/html/Tag__Style.py,sha256=LPPlIN7GyMvfCUlbs2eXVMUr9jS0PX5M94A5Ig_jXIs,846
 osbot_utils/helpers/html/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/pubsub/Event__Queue.py,sha256=51QO-3bnyrzYa7cMOk5rZP1Pwk1Wne_HtqeQ0oFMHl0,3187
-osbot_utils/helpers/pubsub/PubSub__Client.py,sha256=xl_72L7Y7asCHgOaoV4jJBaQyRzCwKLuZlz_VBxvHKU,2292
-osbot_utils/helpers/pubsub/PubSub__Room.py,sha256=g--Up1d0LQx65umWlvEOJ57LqugTzO3C5V_VUALiY_Q,457
-osbot_utils/helpers/pubsub/PubSub__Server.py,sha256=h-xQmZnhJryyJtTG8JIUxZPuRMuQFBl2agVKorXHg4U,3519
+osbot_utils/helpers/pubsub/PubSub__Client.py,sha256=6K3l4H-Tc0DhktrxpYzLVur1uZ532pQsHWprLNRXFJE,2316
+osbot_utils/helpers/pubsub/PubSub__Room.py,sha256=3drJIAVSAzXB_0Q9dXxwhYWxNaEUaMiWiXLY9Mh02DM,481
+osbot_utils/helpers/pubsub/PubSub__Server.py,sha256=DjQ6PsNGmULdFodspdNktADcoIN3FbdvAitE52m89-w,3548
 osbot_utils/helpers/pubsub/PubSub__Sqlite.py,sha256=3u1Gbpq22JDgDEexdyMzGvkQAHe97l8_Kuhr_SHFAR8,868
 osbot_utils/helpers/pubsub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/pubsub/schemas/Schema__Event.py,sha256=si12mqRRROI3HYGvjQvzPZ_NGw3TpmVZxGhzuWq5cus,402
@@ -169,26 +169,26 @@ osbot_utils/helpers/pubsub/schemas/Schema__Event__Message.py,sha256=rt8W-DGitmR-
 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/sqlite/Capture_Sqlite_Error.py,sha256=GSuRYgs1yKQjxMszPoaI7fsfMfuUqhb64AaIysRE6Cs,1747
-osbot_utils/helpers/sqlite/Sqlite__Cursor.py,sha256=0O7xEVNP4rk9GFo95AlL8F--Q3qb5FG2pIWHm5FzqjU,3303
-osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=wovss-inRP2ioLSyEgnqtJJWmHIp6zGZNeiB9f5t2So,5261
+osbot_utils/helpers/sqlite/Sqlite__Cursor.py,sha256=k5G9Tkk3nx6nHoSanLmpuJG_TceAmN7uRBCt0bo6sIc,3364
+osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=XcyZ7sqXQeV0dAyERiE3kYFeMubfhKidLbrlrZXLzQI,5432
 osbot_utils/helpers/sqlite/Sqlite__Field.py,sha256=oBWglAOKN0EWVtaRwiQFxmR1FQ61lQ35yKkWXjSiihs,2911
 osbot_utils/helpers/sqlite/Sqlite__Globals.py,sha256=aP6uIy_y4xzl2soTUCFIJRjsb8JyfxfL6qIEZKIWy_4,230
-osbot_utils/helpers/sqlite/Sqlite__Table.py,sha256=LTRCn9X2ciF29HEM9aKMHcZ0ZO4xTP2de9L2PvcUCOA,14805
-osbot_utils/helpers/sqlite/Sqlite__Table__Create.py,sha256=3Z6erCsfuVWU9AjeaXsIZQbM-a0_dKrzEOksp1H3ZHo,3825
+osbot_utils/helpers/sqlite/Sqlite__Table.py,sha256=FsFSolFN2N5V8DfZPp4gZL9xmCXaOhmG38wQmgRrvp8,15145
+osbot_utils/helpers/sqlite/Sqlite__Table__Create.py,sha256=dkzv-H4WCu2yt9Hx7ANuK0dhzWcpbs-Sb4GNKhRTTEo,3850
 osbot_utils/helpers/sqlite/Temp_Sqlite__Database__Disk.py,sha256=-BhK0_3lSJPWDt-QS8IQDfrw2K_drjtn-yXyf9GbER4,520
 osbot_utils/helpers/sqlite/Temp_Sqlite__Table.py,sha256=Na2dOHlYSVUKK7STHwdzBYbQgvW2a6cEhUnlC0-T8wk,729
 osbot_utils/helpers/sqlite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/domains/Sqlite__Cache__Requests.py,sha256=w5HmzkXqikGggS93obZWsqPRp6d2g7Vs74U9WI_u6Vc,10362
 osbot_utils/helpers/sqlite/domains/Sqlite__Cache__Requests__Patch.py,sha256=XiqSPnMUP7VIUBy2QZc_ql-pfG2kueTWNsjqt9pdhoY,2322
-osbot_utils/helpers/sqlite/domains/Sqlite__DB__Files.py,sha256=ofk9e0iUXhoLE8MdYWzmjgcCRhlK_OgEyY2NtBu4iQU,768
+osbot_utils/helpers/sqlite/domains/Sqlite__DB__Files.py,sha256=tirQs4VjnjzGagaT17NigqprMuQiELHm5FwAE5PJT1U,1510
 osbot_utils/helpers/sqlite/domains/Sqlite__DB__Graph.py,sha256=aGykK4Qll5Rn0xJR4RvF5bN6llNEjx-Vst52XTVSNio,1751
 osbot_utils/helpers/sqlite/domains/Sqlite__DB__Json.py,sha256=ILx1wOsmwmvV2yb_fMzLzo18uGNub8cxhBrRfYxCCqA,3808
-osbot_utils/helpers/sqlite/domains/Sqlite__DB__Local.py,sha256=NV0NkwjWwhU7Dq-l_sL1RqsQVxjYtkZJPqH5G96TYFc,882
+osbot_utils/helpers/sqlite/domains/Sqlite__DB__Local.py,sha256=n5kGCVkVC16JBEBfwh8sXmCJMSAtrkAUtSgXggHXVkc,932
 osbot_utils/helpers/sqlite/domains/Sqlite__DB__Requests.py,sha256=8Txl9kX1kHMTEpL-bIjJbzcCfMFb4nHeLrhdIiBtgAc,1541
 osbot_utils/helpers/sqlite/domains/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/domains/schemas/Schema__Table__Requests.py,sha256=dewvm_GZhGT5gfX6pVK55wVF_7mtSik2IUHus6bNS6E,443
 osbot_utils/helpers/sqlite/domains/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/sqlite/models/Sqlite__Field__Type.py,sha256=jFdiwpOPe0Du4SXhDvklpm0iGj9Ieu4H2sVw7lRdbRM,1023
+osbot_utils/helpers/sqlite/models/Sqlite__Field__Type.py,sha256=4xsnRLrU13ZT1GisVQZYFn3m7sw6DbY6pg3cg3Ug2cI,1114
 osbot_utils/helpers/sqlite/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/sample_data/Sqlite__Sample_Data__Chinook.py,sha256=Y_2tZuW0il_iOktmztszg6T6HlOnFCY5xJR8xub77cQ,5415
 osbot_utils/helpers/sqlite/sample_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -197,7 +197,7 @@ osbot_utils/helpers/sqlite/sql_builder/SQL_Builder__Select.py,sha256=_5fszoWTknE
 osbot_utils/helpers/sqlite/sql_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/tables/Sqlite__Table__Config.py,sha256=M-h6fYQgmX7Yaq3cSmpePutajLVeVy_IDUrDk97EH6U,2061
 osbot_utils/helpers/sqlite/tables/Sqlite__Table__Edges.py,sha256=YwlWj9GYBDeotqDFdjMOb6MyuHhPZKasndAtuHiLrkQ,1635
-osbot_utils/helpers/sqlite/tables/Sqlite__Table__Files.py,sha256=vtu9g78bw36mfdgeGe2BoGIC-kNStFRcNOWOsjZz6kc,1510
+osbot_utils/helpers/sqlite/tables/Sqlite__Table__Files.py,sha256=ZlhTqroHd9T8vqNwYpRv5cYHw7Fi-F6fxANh_Fr0nt4,3613
 osbot_utils/helpers/sqlite/tables/Sqlite__Table__Nodes.py,sha256=GT8h3wD4hGvEtqQuBs0sBbcu2ydktRHTi95PEL2ffHQ,1721
 osbot_utils/helpers/sqlite/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/trace/Trace_Call.py,sha256=xTmR5U2u0vKnIgMSu-4NAibWKIV4-Eql3vACwOr1lkw,6329
@@ -219,10 +219,10 @@ osbot_utils/testing/Log_To_Queue.py,sha256=pZQ7I1ne-H365a4WLS60oAD-B16pxIZO4suvC
 osbot_utils/testing/Log_To_String.py,sha256=hkjWsJfV68uqgX9nvVqUN3mVPxZQDb-6UBwsSEbQnkA,1216
 osbot_utils/testing/Logging.py,sha256=aOCQGaoKTPAJt3MX2DJoSs-a7UK0KOLqnzn4GRkPFCY,3010
 osbot_utils/testing/Patch_Print.py,sha256=RfY4HGIM06dF6JTKibnN1Uco8YL05xPWe1jS4MUiWV0,1566
-osbot_utils/testing/Profiler.py,sha256=K2KjIQVmrKW1bp6vwm90PO2rzFbjWaAQ_m1kDcUXo4M,3255
+osbot_utils/testing/Profiler.py,sha256=4em6Lpp0ONRDoDDCZsc_CdAOi_QolKOp4eA7KHN96e4,3365
 osbot_utils/testing/Stderr.py,sha256=wi1gfjpsxnBK3aOl2jzCTWI-0En1HtPgEin97148_MQ,459
 osbot_utils/testing/Stdout.py,sha256=XQ9OlOW1aHXY1TiNu8O5b75RoDnoaX5RyMHml3OjlKw,459
-osbot_utils/testing/Temp_File.py,sha256=U7lP3ucqqKIADBF3M-4rPiYqT-i7loDn-cWNFsN5_ow,1410
+osbot_utils/testing/Temp_File.py,sha256=gL1BJ6aRNg2o4LeUJ4f3bxKc75iw1qp0WKP9T3rS_WU,1435
 osbot_utils/testing/Temp_Folder.py,sha256=wZQhCi5Cy0dQQAXuu3_jArDz5T94Q_JX68GENU6nTMo,4793
 osbot_utils/testing/Temp_Sys_Path.py,sha256=gOMD-7dQYQlejoDYUqsrmuZQ9DLC07ymPZB3zYuNmG4,256
 osbot_utils/testing/Temp_Web_Server.py,sha256=0A-gZsd0_3wRj2YuBEOWyV2rhT6dcS2BlArngPXGTtk,3186
@@ -235,26 +235,27 @@ osbot_utils/utils/Assert.py,sha256=u9XLgYn91QvNWZGyPi29SjPJSXRHlm9andIn3NJEVog,1
 osbot_utils/utils/Call_Stack.py,sha256=MAq_0vMxnbeLfCe9qQz7GwJYaOuXpt3qtQwN6wiXsU0,6595
 osbot_utils/utils/Csv.py,sha256=oHLVpjRJqrLMz9lubMCNEoThXWju5rNTprcwHc1zq2c,1012
 osbot_utils/utils/Dev.py,sha256=HibpQutYy_iG8gGV8g1GztxNN4l29E4Bi7UZaVL6-L8,1203
+osbot_utils/utils/Env.py,sha256=BF9whkLIIBEQpx5Ww0bhRau55UhwV3SJT_z9DUoT3UY,4060
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
-osbot_utils/utils/Files.py,sha256=zJ9-B99AkRKcZCd-xiAuqt9YSlNOHogQOciBmOMbwf4,17807
+osbot_utils/utils/Files.py,sha256=HRMdDq1ZctDfCkIfuZGgQ3fG6O03qJEFEIkb8HTYzfU,19407
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
 osbot_utils/utils/Http.py,sha256=Z8V149M2HDrKBoXkDD5EXgqTGx6vQoUqXugXK__wcuw,4572
-osbot_utils/utils/Int.py,sha256=oDWQmop18IFfYVa2drz4qA5LxlL8T5Isjjo3fFN_vBw,130
+osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
 osbot_utils/utils/Json.py,sha256=AfOXYBxAGzqwaNeHZ-aC-RpurNmHzPxGoym7MMY8UN4,6366
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
 osbot_utils/utils/Lists.py,sha256=CLEjgZwAixJAFlubWEKjnUUhUN85oqvR7UqExVW7rdY,5502
-osbot_utils/utils/Misc.py,sha256=R7BMg4XcQ_83PntNP4mNylkpLjoIwMnsswllaDJVbbY,16486
-osbot_utils/utils/Objects.py,sha256=6MBSqQH4XedEyWmHDnf2OizRx38NTsCHUoaWj16V9_Q,13817
+osbot_utils/utils/Misc.py,sha256=OFbDe5NrUNNo8bneRnIwlfWSo-gwaYMP5L1eBTDro2s,16716
+osbot_utils/utils/Objects.py,sha256=qI6EVvx7kzXQrVGzsDk8txJkIXjsy7m2EEPZnYGy5R0,13867
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=z_20FlFdaLoUgJ0cmqXnyA7icgFIpBz8Ej1_xVKWsWM,11245
 osbot_utils/utils/Status.py,sha256=Yq4s0TelXgn0i2QjCP9V8mP30GabXp_UL-jjM6Iwiw4,4305
-osbot_utils/utils/Str.py,sha256=nc7cVdQ3ugcgxqpHIjuuf6WRXCiBLy1oDPLnsk5lVAw,1398
+osbot_utils/utils/Str.py,sha256=gcStFbB57ol74ASIr00pWImpd6ObBr5BLpSB0VUKNTE,1749
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
-osbot_utils/utils/Zip.py,sha256=ogn_vkTD2rJ6Yq1MQ5_9UQnYIscby1bx25cMN4QsnX8,4503
-osbot_utils/utils/__init__.py,sha256=AtewTFWWgEjSqHBn8uP6H9ZgY0U3dMtS-1grgneSKdI,172
-osbot_utils/version,sha256=prx7MCno_OAZwhbe9147hDB8kAgdP_7KZU_T1QeHj_I,8
-osbot_utils-1.11.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.11.0.dist-info/METADATA,sha256=NnsjD88LY1EU8RNg3Og0kfSUzJL0e4QEX-ctzsRWxns,1097
-osbot_utils-1.11.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.11.0.dist-info/RECORD,,
+osbot_utils/utils/Zip.py,sha256=YFahdBguVK71mLdYy4m7mqVAQ5al-60QnTmYK-txCfY,6784
+osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/version,sha256=6N-ed9f4qxkyGvpgFOr2Jl7OZbURQ8I_IfaWgnkeIPw,8
+osbot_utils-1.15.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.15.0.dist-info/METADATA,sha256=HijF1q8V9YDln_BgjxtAW1Rfesu8LtmOibEaKFcx-UY,1266
+osbot_utils-1.15.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.15.0.dist-info/RECORD,,