osbot-utils 1.96.0__tar.gz → 2.2.0__tar.gz

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: osbot_utils
-Version: 1.96.0
+Version: 2.2.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v1.96.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.2.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.96.0 → osbot_utils-2.2.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.96.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.2.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.96.0 → osbot_utils-2.2.0}/osbot_utils/base_classes/Kwargs_To_Self.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 # todo: refactor all of Kwargs_To_Self to use Type_Safe
 Kwargs_To_Self = Type_Safe

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/context_managers/capture_duration.py

@@ -1,5 +1,5 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
-from osbot_utils.utils.Misc import timestamp_utc_now
+from osbot_utils.type_safe.Type_Safe import Type_Safe
+from osbot_utils.utils.Misc          import timestamp_utc_now
 
 
 class capture_duration(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/decorators/methods/type_safe.py

@@ -1,5 +1,5 @@
 import functools                                                                           # For wrapping functions
-from osbot_utils.helpers.Type_Safe_Method import Type_Safe_Method
+from osbot_utils.type_safe.Type_Safe_Method import Type_Safe_Method
 
 def type_safe(func):                                                                       # Main decorator function
     @functools.wraps(func)                                                                 # Preserve function metadata

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/CFormat.py

@@ -2,7 +2,7 @@
 #     - Have code complete on CPrint
 #     - not have the write the code for each of the methods
 #     - have a good and logical place to capture the ID of the color
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 
 class CFormat_Colors:

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/Hashicorp_Secrets.py

@@ -1,5 +1,5 @@
 from osbot_utils.utils.Env                  import get_env
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.utils.Lists                import list_index_by
 from osbot_utils.utils.Misc                 import list_set
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/Zip_Bytes.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.utils.Dev                  import pprint
 from osbot_utils.utils.Files                import files_list, file_create_from_bytes, temp_file, parent_folder, parent_folder_create
 from osbot_utils.utils.Misc                 import random_text

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/cache_requests/Cache__Requests__Actions.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe                             import Type_Safe
+from osbot_utils.type_safe.Type_Safe                             import Type_Safe
 from osbot_utils.helpers.cache_requests.Cache__Requests__Row        import Cache__Requests__Row
 from osbot_utils.helpers.cache_requests.Cache__Requests__Table      import Cache__Requests__Table
 from osbot_utils.utils.Json                                         import json_dumps

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/cache_requests/Cache__Requests__Config.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 
 class Cache__Requests__Config(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/cache_requests/Cache__Requests__Data.py

@@ -1,5 +1,5 @@
 import types
-from osbot_utils.base_classes.Type_Safe                                     import Type_Safe
+from osbot_utils.type_safe.Type_Safe                                     import Type_Safe
 from osbot_utils.helpers.cache_requests.Cache__Requests__Config             import Cache__Requests__Config
 from osbot_utils.helpers.cache_requests.Cache__Requests__Table              import Cache__Requests__Table
 from osbot_utils.utils.Json                                                 import json_dumps, json_loads

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/cache_requests/Cache__Requests__Invoke.py

@@ -1,7 +1,7 @@
 import threading
 import types
 
-from osbot_utils.base_classes.Type_Safe                                 import Type_Safe
+from osbot_utils.type_safe.Type_Safe                                 import Type_Safe
 from osbot_utils.helpers.cache_requests.Cache__Requests__Actions        import Cache__Requests__Actions
 from osbot_utils.helpers.cache_requests.Cache__Requests__Config         import Cache__Requests__Config
 from osbot_utils.helpers.cache_requests.Cache__Requests__Data           import Cache__Requests__Data

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/cache_requests/Cache__Requests__Row.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe                         import Type_Safe
+from osbot_utils.type_safe.Type_Safe                         import Type_Safe
 from osbot_utils.helpers.cache_requests.Cache__Requests__Config import Cache__Requests__Config
 from osbot_utils.helpers.cache_requests.Cache__Requests__Table  import Cache__Requests__Table
 from osbot_utils.utils.Json                                     import json_dumps

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/cache_requests/Cache__Requests__Table.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 
 class Cache__Requests__Table(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/Flow.py

@@ -3,7 +3,7 @@ import logging
 import typing
 
 from osbot_utils.helpers.Dependency_Manager             import Dependency_Manager
-from osbot_utils.base_classes.Type_Safe                 import Type_Safe
+from osbot_utils.type_safe.Type_Safe                 import Type_Safe
 from osbot_utils.helpers.CFormat                        import CFormat, f_dark_grey, f_magenta, f_bold
 from osbot_utils.helpers.flows.models.Flow_Run__Config  import Flow_Run__Config
 from osbot_utils.helpers.flows.Flow__Events             import flow_events

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/Flow__Events.py

@@ -1,6 +1,6 @@
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Data import Flow_Run__Event_Data
 from osbot_utils.utils.Str                                  import ansi_to_text
-from osbot_utils.base_classes.Type_Safe                     import Type_Safe
+from osbot_utils.type_safe.Type_Safe                     import Type_Safe
 from osbot_utils.helpers.flows.models.Flow_Run__Event       import Flow_Run__Event
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Type  import Flow_Run__Event_Type
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/Task.py

@@ -8,7 +8,7 @@ from osbot_utils.helpers.Dependency_Manager import Dependency_Manager
 from osbot_utils.helpers.flows.Flow__Events import flow_events
 from osbot_utils.testing.Stdout             import Stdout
 from osbot_utils.helpers.CFormat            import CFormat, f_dark_grey, f_red, f_blue, f_bold
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.helpers.flows.Flow         import Flow
 
 TASK__RANDOM_ID__PREFIX    = 'task_id__'

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/models/Flow_Run__Config.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 
 class Flow_Run__Config(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/models/Flow_Run__Event.py

@@ -1,6 +1,6 @@
 from osbot_utils.helpers.Random_Guid import Random_Guid
 
-from osbot_utils.base_classes.Type_Safe                     import Type_Safe
+from osbot_utils.type_safe.Type_Safe                     import Type_Safe
 from osbot_utils.helpers.Timestamp_Now                      import Timestamp_Now
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Data  import Flow_Run__Event_Data
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Type  import Flow_Run__Event_Type

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/models/Flow_Run__Event_Data.py

@@ -1,6 +1,6 @@
 import logging
 
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 
 class Flow_Run__Event_Data(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/flows/models/Flow_Run__Event_Type.py

@@ -1,6 +1,6 @@
 from enum import Enum
 
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 class Flow_Run__Event_Type(Enum):
     FLOW_MESSAGE: str = 'flow_message'

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/generators/Generator_Manager.py

@@ -3,7 +3,7 @@ from _thread                                                    import RLock
 from types                                                      import GeneratorType
 from typing                                                     import Dict                               # Typing imports for type hints
 from typing                                                     import Union
-from osbot_utils.base_classes.Type_Safe                         import Type_Safe                          # Type_Safe base class for type-safe attributes
+from osbot_utils.type_safe.Type_Safe                         import Type_Safe                          # Type_Safe base class for type-safe attributes
 from osbot_utils.helpers.Random_Guid                            import Random_Guid                        # Helper for generating unique IDs
 from osbot_utils.helpers.generators.Generator_Context_Manager   import Generator_Context_Manager
 from osbot_utils.helpers.generators.Model__Generator_State      import Model__Generator_State

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/generators/Model__Generator_Target.py

@@ -1,5 +1,5 @@
 from types                                                  import GeneratorType
-from osbot_utils.base_classes.Type_Safe                     import Type_Safe
+from osbot_utils.type_safe.Type_Safe                     import Type_Safe
 from osbot_utils.helpers.Random_Guid                        import Random_Guid
 from osbot_utils.helpers.generators.Model__Generator_State  import Model__Generator_State
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/pubsub/Event__Queue.py

@@ -1,7 +1,7 @@
 import time
 from queue                                                      import Queue, Empty
 from threading                                                  import Thread
-from osbot_utils.base_classes.Type_Safe                         import Type_Safe
+from osbot_utils.type_safe.Type_Safe                         import Type_Safe
 from osbot_utils.helpers.pubsub.schemas.Schema__Event           import Schema__Event
 from osbot_utils.helpers.pubsub.schemas.Schema__Event__Message  import Schema__Event__Message
 from osbot_utils.utils.Misc                                     import random_text, timestamp_utc_now, random_guid

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/sqlite/Sqlite__Database.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe             import Type_Safe
+from osbot_utils.type_safe.Type_Safe             import Type_Safe
 from osbot_utils.decorators.methods.cache_on_self   import cache_on_self
 from osbot_utils.utils.Files                        import current_temp_folder, path_combine, folder_create, file_exists, file_delete
 from osbot_utils.utils.Misc                         import  random_filename

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/sqlite/Sqlite__Table__Create.py

@@ -1,6 +1,5 @@
 import inspect
-from typing import List
-
+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
@@ -17,8 +16,8 @@ class Sqlite__Table__Create(Kwargs_To_Self):
         self.set_default_fields()
 
     def add_field(self, field_data: dict):
-        sqlite_field = Sqlite__Field.from_json(field_data)
-        if sqlite_field:
+        if field_data and isinstance(field_data, dict):
+            sqlite_field = Sqlite__Field.from_json(field_data)
             self.fields.append(sqlite_field)
             return True
         return False

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/sqlite/cache/Sqlite__Cache__Requests.py

@@ -1,5 +1,5 @@
 import types
-from osbot_utils.base_classes.Type_Safe                                     import Type_Safe
+from osbot_utils.type_safe.Type_Safe                                     import Type_Safe
 from osbot_utils.helpers.cache_requests.Cache__Requests__Actions            import Cache__Requests__Actions
 from osbot_utils.helpers.cache_requests.Cache__Requests__Config             import Cache__Requests__Config
 from osbot_utils.helpers.cache_requests.Cache__Requests__Data               import Cache__Requests__Data

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/sqlite/cache/Sqlite__Cache__Requests__Sqlite.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe                         import Type_Safe
+from osbot_utils.type_safe.Type_Safe                         import Type_Safe
 from osbot_utils.helpers.cache_requests.Cache__Requests__Config import Cache__Requests__Config
 from osbot_utils.helpers.sqlite.cache.Sqlite__DB__Requests      import Sqlite__DB__Requests
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/sqlite/sample_data/Sqlite__Sample_Data__Chinook.py

@@ -1,16 +1,10 @@
-from osbot_utils.base_classes.Kwargs_To_Self import Kwargs_To_Self
-from osbot_utils.decorators.methods.cache_on_self import cache_on_self
-from osbot_utils.helpers.sqlite.Sqlite__Database import Sqlite__Database
-from osbot_utils.helpers.sqlite.Sqlite__Table import Sqlite__Table
-from osbot_utils.helpers.sqlite.Sqlite__Table__Create import Sqlite__Table__Create
-from osbot_utils.helpers.sqlite.domains.Sqlite__DB__Json import Sqlite__DB__Json
-from osbot_utils.testing.Duration import duration, Duration
-from osbot_utils.utils.Dev import pprint
-from osbot_utils.utils.Files import current_temp_folder, path_combine, folder_create, file_exists, file_not_exists, \
-    file_contents
-from osbot_utils.utils.Http import GET, GET_to_file
-from osbot_utils.utils.Json import json_loads, json_from_file, json_dump, json_file_create, json_file_load
-from osbot_utils.utils.Objects import obj_info
+from osbot_utils.base_classes.Kwargs_To_Self                import Kwargs_To_Self
+from osbot_utils.decorators.methods.cache_on_self           import cache_on_self
+from osbot_utils.helpers.sqlite.Sqlite__Database            import Sqlite__Database
+from osbot_utils.helpers.sqlite.domains.Sqlite__DB__Json    import Sqlite__DB__Json
+from osbot_utils.utils.Files                                import current_temp_folder, path_combine, folder_create, file_not_exists
+from osbot_utils.utils.Http                                 import GET_to_file
+from osbot_utils.utils.Json                                 import  json_from_file, json_file_create, json_file_load
 
 URL__CHINOOK_JSON                = 'https://github.com/lerocha/chinook-database/releases/download/v1.4.5/ChinookData.json'
 FILE_NAME__CHINOOK_DATA_JSON     = 'ChinookData.json'

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/ssh/SSH.py

@@ -1,5 +1,5 @@
 from osbot_utils.base_classes.Kwargs_To_Self        import Kwargs_To_Self
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 from osbot_utils.decorators.methods.cache_on_self   import cache_on_self
 from osbot_utils.helpers.ssh.SCP                    import SCP
 from osbot_utils.helpers.ssh.SSH__Execute           import SSH__Execute

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/ssh/SSH__Execute.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 from osbot_utils.context_managers.capture_duration          import capture_duration
 from osbot_utils.decorators.lists.group_by                  import group_by
 from osbot_utils.decorators.lists.index_by                  import index_by

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/ssh/SSH__Python.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 from osbot_utils.helpers.ssh.SSH__Execute import SSH__Execute
 from osbot_utils.helpers.ssh.SSH__Linux import SSH__Linux
 from osbot_utils.utils.Dev import pprint

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/trace/Trace_Call__Config.py

@@ -1,5 +1,5 @@
 
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 from osbot_utils.utils.Dev              import pprint                   # todo: fix test requirement of mock to use this method
 
 

osbot_utils-2.2.0/osbot_utils/helpers/xml/Xml__Attribute.py

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

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/Xml__Element.py

@@ -1,5 +1,5 @@
 from typing                                 import Dict, List, Union
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.helpers.xml.Xml__Attribute import Xml__Attribute
 
 class XML__Element(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/Xml__File.py

@@ -1,5 +1,5 @@
 from typing                                 import Dict
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.helpers.xml.Xml__Element   import XML__Element
 
 class Xml__File(Type_Safe):

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/Xml__File__Load.py

@@ -1,7 +1,7 @@
 from io                                     import StringIO
 from typing                                 import List, Union, Dict
 from xml.etree.ElementTree                  import iterparse, Element, fromstring, ParseError
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.helpers.xml.Xml__Attribute import Xml__Attribute
 from osbot_utils.helpers.xml.Xml__Element   import XML__Element
 from osbot_utils.helpers.xml.Xml__File      import Xml__File

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/Xml__File__To_Dict.py

@@ -1,5 +1,5 @@
 from typing                                 import Dict, Any
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.helpers.xml.Xml__Element   import XML__Element
 from osbot_utils.helpers.xml.Xml__File      import Xml__File
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/Xml__File__To_Xml.py

@@ -1,7 +1,7 @@
 from typing                                 import Optional
 from xml.etree.ElementTree                  import Element, SubElement, tostring
 from xml.dom                                import minidom
-from osbot_utils.base_classes.Type_Safe     import Type_Safe
+from osbot_utils.type_safe.Type_Safe     import Type_Safe
 from osbot_utils.helpers.xml.Xml__Element   import XML__Element
 from osbot_utils.helpers.xml.Xml__File      import Xml__File
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/rss/RSS__Channel.py

@@ -1,5 +1,5 @@
 from typing                                     import Any, Dict, List
-from osbot_utils.base_classes.Type_Safe         import Type_Safe
+from osbot_utils.type_safe.Type_Safe            import Type_Safe
 from osbot_utils.helpers.xml.rss.RSS__Image     import RSS__Image
 from osbot_utils.helpers.xml.rss.RSS__Item      import RSS__Item
 

osbot_utils-2.2.0/osbot_utils/helpers/xml/rss/RSS__Enclosure.py

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

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/rss/RSS__Feed.py

@@ -1,5 +1,5 @@
 from typing                                     import Dict, Any
-from osbot_utils.base_classes.Type_Safe         import Type_Safe
+from osbot_utils.type_safe.Type_Safe         import Type_Safe
 from osbot_utils.helpers.xml.rss.RSS__Channel   import RSS__Channel
 
 DEFAULT__RSS_FEED__VERSION = "2.0"

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/rss/RSS__Image.py

@@ -1,4 +1,4 @@
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 
 class RSS__Image(Type_Safe):
     url    : str

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/helpers/xml/rss/RSS__Item.py

@@ -1,5 +1,5 @@
 from typing                                         import Dict, List, Any
-from osbot_utils.base_classes.Type_Safe             import Type_Safe
+from osbot_utils.type_safe.Type_Safe             import Type_Safe
 from osbot_utils.helpers.Guid                       import Guid
 from osbot_utils.helpers.xml.rss.RSS__Enclosure     import RSS__Enclosure
 

{osbot_utils-1.96.0 → osbot_utils-2.2.0}/osbot_utils/testing/Temp_Env_Vars.py

@@ -1,5 +1,5 @@
 import os
-from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.type_safe.Type_Safe import Type_Safe
 from osbot_utils.utils.Env              import del_env, set_env
 
 

{osbot_utils-1.96.0/osbot_utils/base_classes → osbot_utils-2.2.0/osbot_utils/type_safe}/Type_Safe.py

@@ -24,7 +24,7 @@ if sys.version_info < (3, 8):                                           # pragma
         else:
             return ()
 else:
-    from typing import get_origin, get_args, ForwardRef
+    from typing import get_origin, get_args, ForwardRef, Any
     from osbot_utils.helpers.python_compatibility.python_3_8 import Annotated
 
 if sys.version_info >= (3, 10):
@@ -84,11 +84,11 @@ class Type_Safe:
         raise AttributeError(f"'{type(self).__name__}' object has no attribute '{name}'")   # Raise error if attribute is not a valid getter/setter
 
     def __setattr__(self, name, value):
-        from osbot_utils.utils.Objects                          import convert_dict_to_value_from_obj_annotation
-        from osbot_utils.utils.Objects                          import convert_to_value_from_obj_annotation
-        from osbot_utils.utils.Objects                          import value_type_matches_obj_annotation_for_attr
-        from osbot_utils.utils.Objects                          import value_type_matches_obj_annotation_for_union_and_annotated
-        from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
+        from osbot_utils.utils.Objects                  import convert_dict_to_value_from_obj_annotation
+        from osbot_utils.utils.Objects                  import convert_to_value_from_obj_annotation
+        from osbot_utils.utils.Objects                  import value_type_matches_obj_annotation_for_attr
+        from osbot_utils.utils.Objects                  import value_type_matches_obj_annotation_for_union_and_annotated
+        from osbot_utils.type_safe.Type_Safe__Validator import Type_Safe__Validator
 
         annotations = all_annotations(self)
         if not annotations:                                             # can't do type safety checks if the class does not have annotations
@@ -117,12 +117,16 @@ class Type_Safe:
         # todo: refactor this to separate method
         if hasattr(annotations, 'get'):
             annotation = annotations.get(name)
-            if annotation and get_origin(annotation) is Annotated:
-                annotation_args = get_args(annotation)
-                target_type = annotation_args[0]
-                for attribute in annotation_args[1:]:
-                    if isinstance(attribute, Type_Safe__Validator):
-                        attribute.validate(value=value, field_name=name, target_type=target_type)
+            if annotation:
+                annotation_origin = get_origin(annotation)
+                if annotation_origin is Annotated:
+                    annotation_args = get_args(annotation)
+                    target_type = annotation_args[0]
+                    for attribute in annotation_args[1:]:
+                        if isinstance(attribute, Type_Safe__Validator):
+                            attribute.validate(value=value, field_name=name, target_type=target_type)
+                elif annotation_origin is dict:
+                    value = self.deserialize_dict__using_key_value_annotations(name, value)
 
         super().__setattr__(name, value)
 
@@ -184,8 +188,8 @@ class Type_Safe:
     @classmethod
     def __default__value__(cls, var_type):
         import typing
-        from osbot_utils.base_classes.Type_Safe__List import Type_Safe__List
-        from osbot_utils.base_classes.Type_Safe__Dict import Type_Safe__Dict
+        from osbot_utils.type_safe.Type_Safe__List import Type_Safe__List
+        from osbot_utils.type_safe.Type_Safe__Dict import Type_Safe__Dict
 
         if var_type is typing.Set:                              # todo: refactor the dict, set and list logic, since they are 90% the same
             return set()
@@ -324,7 +328,7 @@ class Type_Safe:
         return value
 
     def deserialize_dict__using_key_value_annotations(self, key, value):
-        from osbot_utils.base_classes.Type_Safe__Dict import Type_Safe__Dict
+        from osbot_utils.type_safe.Type_Safe__Dict import Type_Safe__Dict
 
         dict_annotations_tuple =  get_args(self.__annotations__[key])
         if not dict_annotations_tuple:                                      # happens when the value is a dict/Dict with no annotations
@@ -341,8 +345,12 @@ class Type_Safe:
             else:
                 new__dict_key = key_class(dict_key)
 
-            if issubclass(value_class, Type_Safe):
+            if type(dict_value) == value_class:                                        # if the value is already the target, then just use it
+                new__dict_value = dict_value
+            elif issubclass(value_class, Type_Safe):
                 new__dict_value = value_class().deserialize_from_dict(dict_value)
+            elif value_class is Any:
+                new__dict_value = dict_value
             else:
                 new__dict_value = value_class(dict_value)
             new_value[new__dict_key] = new__dict_value
@@ -353,7 +361,7 @@ class Type_Safe:
     def deserialize_from_dict(self, data, raise_on_not_found=False):
         from decimal                                    import Decimal
         from enum                                       import EnumMeta
-        from osbot_utils.base_classes.Type_Safe__List   import Type_Safe__List
+        from osbot_utils.type_safe.Type_Safe__List      import Type_Safe__List
         from osbot_utils.helpers.Random_Guid            import Random_Guid
         from osbot_utils.helpers.Random_Guid_Short      import Random_Guid_Short
         from osbot_utils.utils.Objects                  import obj_is_attribute_annotation_of_type
@@ -362,6 +370,9 @@ class Type_Safe:
         from osbot_utils.helpers.Safe_Id                import Safe_Id
         from osbot_utils.helpers.Timestamp_Now          import Timestamp_Now
 
+        if hasattr(data, 'items') is False:
+            raise ValueError(f"Expected a dictionary, but got '{type(data)}'")
+
         for key, value in data.items():
             if hasattr(self, key) and isinstance(getattr(self, key), Type_Safe):
                 getattr(self, key).deserialize_from_dict(value)                                             # if the attribute is a Type_Safe object, then also deserialize it
@@ -432,7 +443,7 @@ class Type_Safe:
             json_data = json_parse(json_data)
         if json_data:                                           # if there is no data or is {} then don't create an object (since this could be caused by bad data being provided)
             return cls().deserialize_from_dict(json_data,raise_on_not_found=raise_on_not_found)
-        return None
+        return cls()
 
 # todo: see if it is possible to add recursive protection to this logic
 def serialize_to_dict(obj):

{osbot_utils-1.96.0/osbot_utils/base_classes → osbot_utils-2.2.0/osbot_utils/type_safe}/Type_Safe__Base.py

@@ -85,6 +85,9 @@ class Type_Safe__Base:
                 actual_type_name = type_str(type(item))
                 raise TypeError(f"Expected '{expected_type_name}', but got '{actual_type_name}'")
 
+    def json(self):
+        raise NotImplemented
+
 # todo: see if we should/can move this to the Objects.py file
 def type_str(tp):
     origin = get_origin(tp)

osbot_utils-2.2.0/osbot_utils/type_safe/Type_Safe__Dict.py

@@ -0,0 +1,39 @@
+from osbot_utils.type_safe.Type_Safe__Base import type_str, Type_Safe__Base
+
+class Type_Safe__Dict(Type_Safe__Base, dict):
+    def __init__(self, expected_key_type, expected_value_type, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.expected_key_type   = expected_key_type
+        self.expected_value_type = expected_value_type
+
+        for k, v in self.items():                           # check type-safety of ctor arguments
+            self.is_instance_of_type(k, self.expected_key_type  )
+            self.is_instance_of_type(v, self.expected_value_type)
+
+    def __setitem__(self, key, value):                                  # Check type-safety before allowing assignment.
+        self.is_instance_of_type(key, self.expected_key_type)
+        self.is_instance_of_type(value, self.expected_value_type)
+        super().__setitem__(key, value)
+
+    def __repr__(self):
+        key_type_name   = type_str(self.expected_key_type)
+        value_type_name = type_str(self.expected_value_type)
+        return f"dict[{key_type_name}, {value_type_name}] with {len(self)} entries"
+
+    def json(self):                                                                         # Convert the dictionary to a JSON-serializable format.
+        from osbot_utils.type_safe.Type_Safe import Type_Safe                               # can only import this here to avoid circular imports
+
+        result = {}
+        for key, value in self.items():
+            if isinstance(value, Type_Safe):                                                # Handle Type_Safe objects in values
+                result[key] = value.json()
+            elif isinstance(value, (list, tuple)):                                          # Handle lists/tuples that might contain Type_Safe objects
+                result[key] = [item.json() if isinstance(item, Type_Safe) else item
+                               for item in value]
+            elif isinstance(value, dict):                                                   # Handle nested dictionaries that might contain Type_Safe objects
+                result[key] = {k: v.json() if isinstance(v, Type_Safe) else v
+                               for k, v in value.items()}
+            else:                                                                           # Regular values can be used as-is
+                result[key] = value
+        return result

osbot_utils-2.2.0/osbot_utils/type_safe/Type_Safe__List.py

@@ -0,0 +1,34 @@
+from osbot_utils.type_safe.Type_Safe__Base import Type_Safe__Base, type_str
+
+class Type_Safe__List(Type_Safe__Base, list):
+
+    def __init__(self, expected_type, *args):
+        super().__init__(*args)
+        self.expected_type = expected_type
+
+    def __repr__(self):
+        expected_type_name = type_str(self.expected_type)
+        return f"list[{expected_type_name}] with {len(self)} elements"
+
+    def append(self, item):
+        try:
+            self.is_instance_of_type(item, self.expected_type)
+        except TypeError as e:
+            raise TypeError(f"In Type_Safe__List: Invalid type for item: {e}")
+        super().append(item)
+
+
+    def json(self): # Convert the list to a JSON-serializable format.
+        from osbot_utils.type_safe.Type_Safe import Type_Safe                           # Import here to avoid circular imports
+
+        result = []
+        for item in self:
+            if isinstance(item, Type_Safe):
+                result.append(item.json())
+            elif isinstance(item, (list, tuple)):
+                result.append([x.json() if isinstance(x, Type_Safe) else x for x in item])
+            elif isinstance(item, dict):
+                result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
+            else:
+                result.append(item)
+        return result