Replace UUIDS with unique_names

examples_old/example4.py

@@ -9,7 +9,7 @@
 
 import numpy as np
 
-from easyscience import borg
+from easyscience import global_object
 from easyscience.Fitting import Fitter
 from easyscience.Objects.core import ComponentSerializer
 from easyscience.Objects.ObjectClasses import BaseObj
@@ -84,7 +84,7 @@ class InterfaceTemplate(ComponentSerializer, metaclass=ABCMeta):
     """
 
     _interfaces = []
-    _borg = borg
+    _global_object = global_object
 
     def __init_subclass__(cls, is_abstract: bool = False, **kwargs):
         """
@@ -171,7 +171,7 @@ def set_value(self, value_label: str, value: float):
         :return: None
         :rtype: noneType
         """
-        if self._borg.debug:
+        if self._global_object.debug:
             print(f"Interface1: Value of {value_label} set to {value}")
         setattr(self.calculator, value_label, value)
 
@@ -224,7 +224,7 @@ def set_value(self, value_label: str, value: float):
         :return: None
         :rtype: noneType
         """
-        if self._borg.debug:
+        if self._global_object.debug:
             print(f"Interface2: Value of {value_label} set to {value}")
         self._data = json.loads(self.calculator.export_data())
         if value_label in self._data.keys():

examples_old/example5_broken.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from easyscience import borg
+from easyscience import global_object
 from easyscience.Fitting import Fitter
 from easyscience.Objects.Base import BaseObj
 from easyscience.Objects.Base import Parameter
@@ -86,7 +86,7 @@ class InterfaceTemplate(ComponentSerializer, metaclass=ABCMeta):
     """
 
     _interfaces = []
-    _borg = borg
+    _global_object = global_object
 
     def __init_subclass__(cls, is_abstract: bool = False, **kwargs):
         """
@@ -173,7 +173,7 @@ def set_value(self, value_label: str, value: float):
         :return: None
         :rtype: noneType
         """
-        if self._borg.debug:
+        if self._global_object.debug:
             print(f"Interface1: Value of {value_label} set to {value}")
         setattr(self.calculator, value_label, value)
 
@@ -226,7 +226,7 @@ def set_value(self, value_label: str, value: float):
         :return: None
         :rtype: noneType
         """
-        if self._borg.debug:
+        if self._global_object.debug:
             print(f"Interface2: Value of {value_label} set to {value}")
         self._data = json.loads(self.calculator.export_data())
         if value_label in self._data.keys():
@@ -338,7 +338,7 @@ def __repr__(self):
         return f"Line: m={self.m}, c={self.c}"
 
 
-borg.debug = True
+global_object.debug = True
 
 interface = InterfaceFactory()
 line = Line(interface_factory=interface)

examples_old/example6_broken.py

@@ -8,10 +8,10 @@
 
 import numpy as np
 
-from easyscience import borg
-from easyscience.Fitting import Fitter
-from easyscience.Objects.Base import BaseObj
-from easyscience.Objects.Base import Parameter
+from easyscience import global_object
+from easyscience.fitting import Fitter
+from easyscience.Objects.ObjectClasses import BaseObj
+from easyscience.Objects.Variable import Parameter
 from easyscience.Objects.core import ComponentSerializer
 from easyscience.Objects.Inferface import InterfaceFactoryTemplate
 
@@ -92,7 +92,7 @@ class InterfaceTemplate(ComponentSerializer, metaclass=ABCMeta):
     """
 
     _interfaces = []
-    _borg = borg
+    _global_object = global_object
 
     def __init_subclass__(cls, is_abstract: bool = False, **kwargs):
         """
@@ -183,7 +183,7 @@ def set_value(self, value_label: str, value: float):
         :return: None
         :rtype: noneType
         """
-        if self._borg.debug:
+        if self._global_object.debug:
             print(f"Interface1: Value of {value_label} set to {value}")
         setattr(self.calculator, value_label, value)
 
@@ -264,7 +264,7 @@ def set_value(self, value_label: str, value: float):
         :return: None
         :rtype: noneType
         """
-        if self._borg.debug:
+        if self._global_object.debug:
             print(f"Interface2: Value of {value_label} set to {value}")
         self._data = json.loads(self.calculator.export_data())
         if value_label in self._data.keys():

src/easyscience/Objects/Groups.py

@@ -17,10 +17,9 @@
 from typing import Tuple
 from typing import Union
 
-from easyscience import borg
+from easyscience.global_object.undo_redo import NotarizedDict
 from easyscience.Objects.ObjectClasses import BasedBase
 from easyscience.Objects.ObjectClasses import Descriptor
-from easyscience.Utils.UndoRedo import NotarizedDict
 
 if TYPE_CHECKING:
     from easyscience.Utils.typing import B
@@ -75,17 +74,17 @@ def __init__(
         for key, item in kwargs.items():
             _kwargs[key] = item
         for arg in args:
-            kwargs[str(borg.map.convert_id_to_key(arg))] = arg
-            _kwargs[str(borg.map.convert_id_to_key(arg))] = arg
+            kwargs[arg.unique_name] = arg
+            _kwargs[arg.unique_name] = arg
 
         # Set kwargs, also useful for serialization
         self._kwargs = NotarizedDict(**_kwargs)
 
         for key in kwargs.keys():
             if key in self.__dict__.keys() or key in self.__slots__:
                 raise AttributeError(f'Given kwarg: `{key}`, is an internal attribute. Please rename.')
-            self._borg.map.add_edge(self, kwargs[key])
-            self._borg.map.reset_type(kwargs[key], 'created_internal')
+            self._global_object.map.add_edge(self, kwargs[key])
+            self._global_object.map.reset_type(kwargs[key], 'created_internal')
             if interface is not None:
                 kwargs[key].interface = interface
             # TODO wrap getter and setter in Logger
@@ -109,13 +108,13 @@ def insert(self, index: int, value: Union[V, B]) -> None:
             update_key = list(self._kwargs.keys())
             values = list(self._kwargs.values())
             # Update the internal dict
-            new_key = str(borg.map.convert_id_to_key(value))
+            new_key = value.unique_name
             update_key.insert(index, new_key)
             values.insert(index, value)
             self._kwargs.reorder(**{k: v for k, v in zip(update_key, values)})
             # ADD EDGE
-            self._borg.map.add_edge(self, value)
-            self._borg.map.reset_type(value, 'created_internal')
+            self._global_object.map.add_edge(self, value)
+            self._global_object.map.reset_type(value, 'created_internal')
             value.interface = self.interface
         else:
             raise AttributeError('Only EasyScience objects can be put into an EasyScience group')
@@ -174,11 +173,11 @@ def __setitem__(self, key: int, value: Union[B, V]) -> None:
             update_dict = {update_key[key]: value}
             self._kwargs.update(update_dict)
             # ADD EDGE
-            self._borg.map.add_edge(self, value)
-            self._borg.map.reset_type(value, 'created_internal')
+            self._global_object.map.add_edge(self, value)
+            self._global_object.map.reset_type(value, 'created_internal')
             value.interface = self.interface
             # REMOVE EDGE
-            self._borg.map.prune_vertex_from_edge(self, old_item)
+            self._global_object.map.prune_vertex_from_edge(self, old_item)
         else:
             raise NotImplementedError('At the moment only numerical values or EasyScience objects can be set.')
 
@@ -193,7 +192,7 @@ def __delitem__(self, key: int) -> None:
         """
         keys = list(self._kwargs.keys())
         item = self._kwargs[keys[key]]
-        self._borg.map.prune_vertex_from_edge(self, item)
+        self._global_object.map.prune_vertex_from_edge(self, item)
         del self._kwargs[keys[key]]
 
     def __len__(self) -> int:

src/easyscience/Objects/ObjectClasses.py

@@ -18,7 +18,7 @@
 from typing import TypeVar
 from typing import Union
 
-from easyscience import borg
+from easyscience import global_object
 from easyscience.Utils.classTools import addLoggedProp
 
 from .core import ComponentSerializer
@@ -34,16 +34,19 @@
 
 
 class BasedBase(ComponentSerializer):
-    __slots__ = ['_name', '_borg', 'user_data', '_kwargs']
+    __slots__ = ['_name', '_global_object', 'user_data', '_kwargs']
 
     _REDIRECT = {}
 
-    def __init__(self, name: str, interface: Optional[iF] = None):
-        self._borg = borg
-        self._borg.map.add_vertex(self, obj_type='created')
+    def __init__(self, name: str, interface: Optional[iF] = None, unique_name: Optional[str] = None):
+        self._global_object = global_object
+        if unique_name is None:
+            unique_name = self._unique_name_generator()
+        self._unique_name = unique_name
+        self._name = name
+        self._global_object.map.add_vertex(self, obj_type="created")
         self.interface = interface
         self.user_data: dict = {}
-        self._name: str = name
 
     @property
     def _arg_spec(self) -> Set[str]:
@@ -64,6 +67,21 @@ def __reduce__(self):
         cls = getattr(self, '__old_class__', self.__class__)
         return cls.from_dict, (state,)
 
+    @property
+    def unique_name(self) -> str:
+        """ Get the unique name of the object."""
+        return self._unique_name
+
+    @unique_name.setter
+    def unique_name(self, new_unique_name: str):
+        """ Set a new unique name for the object. The old name is still kept in the map. 
+
+        :param new_unique_name: New unique name for the object"""
+        if not isinstance(new_unique_name, str):
+            raise TypeError("Unique name has to be a string.")
+        self._unique_name = new_unique_name
+        self._global_object.map.add_vertex(self)
+
     @property
     def name(self) -> str:
         """
@@ -114,10 +132,12 @@ def generate_bindings(self):
         if self.interface is None:
             raise AttributeError('Interface error for generating bindings. `interface` has to be set.')
         interfaceable_children = [
-            key for key in self._borg.map.get_edges(self) if issubclass(type(self._borg.map.get_item_by_key(key)), BasedBase)
+            key
+            for key in self._global_object.map.get_edges(self)
+            if issubclass(type(self._global_object.map.get_item_by_key(key)), BasedBase)
         ]
         for child_key in interfaceable_children:
-            child = self._borg.map.get_item_by_key(child_key)
+            child = self._global_object.map.get_item_by_key(child_key)
             child.interface = self.interface
         self.interface.generate_bindings(self)
 
@@ -186,6 +206,14 @@ def get_fit_parameters(self) -> Union[List[Parameter], List[new_Parameter]]:
                     fit_list.append(item)
         return fit_list
 
+    def _unique_name_generator(self) -> str:
+        """
+        Generate a generic unique name for the object using the class name and a global iterator.
+        """
+        class_name = self.__class__.__name__
+        iterator_string = str(self._global_object.map._get_name_iterator(class_name))
+        return class_name + "_" + iterator_string
+
     def __dir__(self) -> Iterable[str]:
         """
         This creates auto-completion and helps out in iPython notebooks.
@@ -194,6 +222,7 @@ def __dir__(self) -> Iterable[str]:
         """
         new_class_objs = list(k for k in dir(self.__class__) if not k.startswith('_'))
         return sorted(new_class_objs)
+
 
 
 if TYPE_CHECKING:
@@ -213,6 +242,7 @@ class BaseObj(BasedBase):
     def __init__(
         self,
         name: str,
+        unique_name: Optional[str] = None,
         *args: Optional[BV],
         **kwargs: Optional[BV],
     ):
@@ -223,7 +253,7 @@ def __init__(
         :param args: Any arguments?
         :param kwargs: Fields which this class should contain
         """
-        super(BaseObj, self).__init__(name)
+        super(BaseObj, self).__init__(name=name, unique_name=unique_name)
         # If Parameter or Descriptor is given as arguments...
         for arg in args:
             if issubclass(type(arg), (BaseObj, Descriptor, DescriptorBase)):
@@ -233,12 +263,12 @@ def __init__(
         self._kwargs = kwargs
         for key in kwargs.keys():
             if key in known_keys:
-                raise AttributeError
+                raise AttributeError("Kwargs cannot overwrite class attributes in BaseObj.")
             if issubclass(type(kwargs[key]), (BasedBase, Descriptor, DescriptorBase)) or 'BaseCollection' in [
                 c.__name__ for c in type(kwargs[key]).__bases__
             ]:
-                self._borg.map.add_edge(self, kwargs[key])
-                self._borg.map.reset_type(kwargs[key], 'created_internal')
+                self._global_object.map.add_edge(self, kwargs[key])
+                self._global_object.map.reset_type(kwargs[key], 'created_internal')
             addLoggedProp(
                 self,
                 key,
@@ -271,8 +301,8 @@ def __init__(self, foo: Parameter, bar: Parameter):
         :return: None
         """
         self._kwargs[key] = component
-        self._borg.map.add_edge(self, component)
-        self._borg.map.reset_type(component, 'created_internal')
+        self._global_object.map.add_edge(self, component)
+        self._global_object.map.reset_type(component, 'created_internal')
         addLoggedProp(
             self,
             key,
@@ -298,13 +328,13 @@ def __setattr__(self, key: str, value: BV) -> None:
         ):
             if issubclass(type(getattr(self, key, None)), (BasedBase, Descriptor, DescriptorBase)):
                 old_obj = self.__getattribute__(key)
-                self._borg.map.prune_vertex_from_edge(self, old_obj)
+                self._global_object.map.prune_vertex_from_edge(self, old_obj)
             self._add_component(key, value)
         else:
             if hasattr(self, key) and issubclass(type(value), (BasedBase, Descriptor, DescriptorBase)):
                 old_obj = self.__getattribute__(key)
-                self._borg.map.prune_vertex_from_edge(self, old_obj)
-                self._borg.map.add_edge(self, value)
+                self._global_object.map.prune_vertex_from_edge(self, old_obj)
+                self._global_object.map.add_edge(self, value)
         super(BaseObj, self).__setattr__(key, value)
         # Update the interface bindings if something changed (BasedBase and Descriptor)
         if old_obj is not None: