Merge dev into main

Author: DinisCruz

README.md

@@ -1,6 +1,6 @@
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v3.47.0-blue)
+![Current Release](https://img.shields.io/badge/release-v3.47.2-blue)
 ![Python](https://img.shields.io/badge/python-3.8+-green)
 ![Type-Safe](https://img.shields.io/badge/Type--Safe-✓-brightgreen)
 ![Caching](https://img.shields.io/badge/Caching-Built--In-orange)

osbot_utils/type_safe/Type_Safe__Primitive.py

@@ -76,6 +76,10 @@ def __to_primitive__(self):                                     # Convert this T
             return self.__primitive_base__(self)
         return str(self)                                            # fallback
 
+    def json(self):
+        import json
+        return json.dumps(self.__to_primitive__())
+
     def obj(self):                                                                  # Get configuration as namespace object
         from osbot_utils.testing.__helpers import dict_to_obj
         return dict_to_obj(self.__cls_kwargs__())

osbot_utils/type_safe/primitives/domains/identifiers/Cache_Id.py

@@ -0,0 +1,9 @@
+from osbot_utils.type_safe.primitives.domains.identifiers.Random_Guid import Random_Guid
+
+
+class Cache_Id(Random_Guid):            # helper class so that we don't use Random_Guid to represent the cache_id class
+    def __new__(cls, value=None):
+        if value is None or value == '':
+            return str.__new__(cls, '')
+        else:
+            return super().__new__(cls, value)

osbot_utils/type_safe/primitives/domains/identifiers/Edge_Id.py

@@ -0,0 +1,9 @@
+from osbot_utils.type_safe.primitives.domains.identifiers.Obj_Id import Obj_Id
+
+
+class Edge_Id(Obj_Id):                         # helper class so that we don't use Obj_Id to represent the graph_id class
+    def __new__(cls, value=None):
+        if value is None or value == '':
+            return str.__new__(cls, '')
+        else:
+            return super().__new__(cls, value)

osbot_utils/type_safe/primitives/domains/identifiers/Graph_Id.py

@@ -0,0 +1,9 @@
+from osbot_utils.type_safe.primitives.domains.identifiers.Obj_Id import Obj_Id
+
+
+class Graph_Id(Obj_Id):                         # helper class so that we don't use Obj_Id to represent the graph_id class
+    def __new__(cls, value=None):
+        if value is None or value == '':
+            return str.__new__(cls, '')
+        else:
+            return super().__new__(cls, value)

osbot_utils/type_safe/primitives/domains/identifiers/Node_Id.py

@@ -0,0 +1,9 @@
+from osbot_utils.type_safe.primitives.domains.identifiers.Obj_Id import Obj_Id
+
+
+class Node_Id(Obj_Id):                         # helper class so that we don't use Obj_Id to represent the graph_id class
+    def __new__(cls, value=None):
+        if value is None or value == '':
+            return str.__new__(cls, '')
+        else:
+            return super().__new__(cls, value)

osbot_utils/type_safe/primitives/domains/identifiers/Obj_Id.py

@@ -1,29 +1,35 @@
+import re
 import random
 from osbot_utils.type_safe.Type_Safe__Primitive import Type_Safe__Primitive
 
-_hex_table = [f"{i:02x}" for i in range(256)]
+_regex_obj_id = re.compile(r'^[0-9a-f]{8}$')
 
-def is_obj_id(value: str):
+def is_obj_id(value):
     if isinstance(value, Obj_Id):
         return True
-    if isinstance(value, str):
-        if len(value) == 8:         # todo: add efficient check if we only have hex values
-            return True
+    if isinstance(value, str) and len(value) == 8:
+        return _regex_obj_id.match(value) is not None
     return False
 
 def new_obj_id():
-    return hex(random.getrandbits(32))[2:].zfill(8)  # slice off '0x' and pad
+    return hex(random.getrandbits(32))[2:].zfill(8)
 
-class Obj_Id(Type_Safe__Primitive,str):
-    def __new__(cls, value: str=None):
+class Obj_Id(Type_Safe__Primitive, str):
+    def __new__(cls, value: str = None):
         if value:
             if is_obj_id(value):
                 obj_id = value
             else:
-                raise ValueError(f'in Obj_Id: value provided was not a valid Obj_Id: {value}')
+                raise ValueError(f'in {cls.__name__}: value provided was not a valid {cls.__name__}: {value}')
         else:
             obj_id = new_obj_id()
-        return super().__new__(cls, obj_id)                                          # Return a new instance of Guid initialized with the string version of the UUID
+        return super().__new__(cls, obj_id)
 
     def __str__(self):
-        return self
+        return str.__str__(self)
+
+    def __add__(self, other):                                           # Concatenation returns plain str, not Obj_Id
+        return str.__str__(self) + other
+
+    def __radd__(self, other):                                          # Reverse concatenation returns plain str
+        return other + str.__str__(self)

osbot_utils/type_safe/primitives/domains/identifiers/Random_Guid.py

@@ -9,3 +9,14 @@ def __new__(cls, value=None):
         if is_guid(value):
             return str.__new__(cls, value)
         raise ValueError(f'in Random_Guid: value provided was not a Guid: {value}')
+
+
+    def __str__(self):
+        return str.__str__(self)
+
+    def __add__(self, other):                                           # Concatenation returns plain str, not Obj_Id
+        return str.__str__(self) + other
+
+    def __radd__(self, other):                                          # Reverse concatenation returns plain str
+        return other + str.__str__(self)
+

osbot_utils/version

@@ -1 +1 @@
-v3.47.0
+v3.47.2

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v3.47.0"
+version     = "v3.47.2"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <[email protected]>"]
 license     = "MIT"