Merge pull request #2137 from Avaiga/refactor/expand-Event-and-get_manager-method

Refactor - Expand Event and _get_manager() method

taipy/core/_entity/_entity.py

@@ -11,7 +11,7 @@
 
 from typing import List
 
-from .._entity._reload import _get_manager
+from .._entity._reload import _Reloader
 from ..notification import Notifier
 
 
@@ -33,8 +33,8 @@ class _Entity:
             for to_delete_key in self._properties._pending_deletions:
                 self._properties.data.pop(to_delete_key, None)
             self._properties.data.update(self._properties._pending_changes)
-        _get_manager(self._MANAGER_NAME)._set(self)
+        _Reloader._get_manager(self._MANAGER_NAME)._set(self)
 
         for event in self._in_context_attributes_changed_collector:
             Notifier.publish(event)
-        _get_manager(self._MANAGER_NAME)._set(self)
+        _Reloader._get_manager(self._MANAGER_NAME)._set(self)

taipy/core/_entity/_reload.py

@@ -10,8 +10,11 @@
 # specific language governing permissions and limitations under the License.
 
 import functools
+from typing import Dict, Type
 
 from .._manager._manager import _Manager
+from ..common._check_dependencies import EnterpriseEditionUtils
+from ..common._utils import _load_fct
 from ..notification import EventOperation, Notifier, _make_event
 
 
@@ -19,19 +22,21 @@ class _Reloader:
     """The _Reloader singleton class"""
 
     _instance = None
-
     _no_reload_context = False
 
+    _managers: Dict[str, Type[_Manager]] = {}
+
     def __new__(cls, *args, **kwargs):
         if not isinstance(cls._instance, cls):
             cls._instance = object.__new__(cls, *args, **kwargs)
+            cls._managers = cls._build_managers()
         return cls._instance
 
     def _reload(self, manager: str, obj):
         if self._no_reload_context:
             return obj
 
-        entity = _get_manager(manager)._get(obj, obj)
+        entity = self._get_manager(manager)._get(obj, obj)
         if obj._is_in_context and hasattr(entity, "_properties"):
             if obj._properties._pending_changes:
                 entity._properties._pending_changes = obj._properties._pending_changes
@@ -47,6 +52,40 @@ class _Reloader:
     def __exit__(self, exc_type, exc_value, exc_traceback):
         self._no_reload_context = False
 
+    @classmethod
+    @functools.lru_cache
+    def _build_managers(cls) -> Dict[str, Type[_Manager]]:
+        from ..cycle._cycle_manager_factory import _CycleManagerFactory
+        from ..data._data_manager_factory import _DataManagerFactory
+        from ..job._job_manager_factory import _JobManagerFactory
+        from ..scenario._scenario_manager_factory import _ScenarioManagerFactory
+        from ..sequence._sequence_manager_factory import _SequenceManagerFactory
+        from ..submission._submission_manager_factory import _SubmissionManagerFactory
+        from ..task._task_manager_factory import _TaskManagerFactory
+
+        managers: Dict[str, Type[_Manager]] = {
+            "scenario": _ScenarioManagerFactory._build_manager(),
+            "sequence": _SequenceManagerFactory._build_manager(),
+            "data": _DataManagerFactory._build_manager(),
+            "cycle": _CycleManagerFactory._build_manager(),
+            "job": _JobManagerFactory._build_manager(),
+            "task": _TaskManagerFactory._build_manager(),
+            "submission": _SubmissionManagerFactory._build_manager(),
+        }
+
+        if EnterpriseEditionUtils._using_enterprise():
+            _build_enterprise_managers = _load_fct(
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + "._entity.utils", "_build_enterprise_managers"
+            )
+            managers.update(_build_enterprise_managers())
+
+        return managers
+
+    @classmethod
+    @functools.lru_cache
+    def _get_manager(cls, manager: str) -> Type[_Manager]:
+        return cls._managers[manager]
+
 
 def _self_reload(manager: str):
     def __reload(fct):
@@ -65,7 +104,7 @@ def _self_setter(manager):
         @functools.wraps(fct)
         def _do_set_entity(self, *args, **kwargs):
             fct(self, *args, **kwargs)
-            entity_manager = _get_manager(manager)
+            entity_manager = _Reloader._get_manager(manager)
             value = args[0] if len(args) == 1 else args
             event = _make_event(
                 self,
@@ -84,24 +123,3 @@ def _self_setter(manager):
         return _do_set_entity
 
     return __set_entity
-
-
-@functools.lru_cache
-def _get_manager(manager: str) -> _Manager:
-    from ..cycle._cycle_manager_factory import _CycleManagerFactory
-    from ..data._data_manager_factory import _DataManagerFactory
-    from ..job._job_manager_factory import _JobManagerFactory
-    from ..scenario._scenario_manager_factory import _ScenarioManagerFactory
-    from ..sequence._sequence_manager_factory import _SequenceManagerFactory
-    from ..submission._submission_manager_factory import _SubmissionManagerFactory
-    from ..task._task_manager_factory import _TaskManagerFactory
-
-    return {
-        "scenario": _ScenarioManagerFactory._build_manager(),
-        "sequence": _SequenceManagerFactory._build_manager(),
-        "data": _DataManagerFactory._build_manager(),
-        "cycle": _CycleManagerFactory._build_manager(),
-        "job": _JobManagerFactory._build_manager(),
-        "task": _TaskManagerFactory._build_manager(),
-        "submission": _SubmissionManagerFactory._build_manager(),
-    }[manager]  # type: ignore

taipy/core/_manager/_manager_factory.py

@@ -20,7 +20,7 @@ from ._manager import _Manager
 class _ManagerFactory:
     @classmethod
     @abstractmethod
-    def _build_manager(cls) -> Type[_Manager]:  # type: ignore
+    def _build_manager(cls) -> Type[_Manager]:
         raise NotImplementedError
 
     @classmethod

taipy/core/data/_data_manager_factory.py

@@ -8,6 +8,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 # an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
+
 from functools import lru_cache
 from typing import Type
 
@@ -27,7 +28,7 @@ class _DataManagerFactory(_ManagerFactory):
         if EnterpriseEditionUtils._using_enterprise():
             data_manager = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager", "_DataManager"
-            )  # type: ignore
+            )
             build_repository = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager_factory",
                 "_DataManagerFactory",

taipy/core/job/_job_manager_factory.py

@@ -8,6 +8,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 # an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
+
 from functools import lru_cache
 from typing import Type
 
@@ -27,7 +28,7 @@ class _JobManagerFactory(_ManagerFactory):
         if EnterpriseEditionUtils._using_enterprise():
             job_manager = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager", "_JobManager"
-            )  # type: ignore
+            )
             build_repository = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager_factory", "_JobManagerFactory"
             )._build_repository  # type: ignore

taipy/core/notification/__init__.py

@@ -26,6 +26,6 @@ object) must be instantiated with an associated event queue.
 from ._registration import _Registration
 from ._topic import _Topic
 from .core_event_consumer import CoreEventConsumerBase
-from .event import _ENTITY_TO_EVENT_ENTITY_TYPE, Event, EventEntityType, EventOperation, _make_event
+from .event import Event, EventEntityType, EventOperation, _make_event
 from .notifier import Notifier, _publish_event
 from .registration_id import RegistrationId

taipy/core/notification/_topic.py

@@ -12,7 +12,7 @@
 from typing import Optional
 
 from ..exceptions.exceptions import InvalidEventOperation
-from .event import _UNSUBMITTABLE_ENTITY_TYPES, EventEntityType, EventOperation
+from .event import Event, EventEntityType, EventOperation
 
 
 class _Topic:
@@ -35,7 +35,7 @@ class _Topic:
         if (
             entity_type
             and operation
-            and entity_type in _UNSUBMITTABLE_ENTITY_TYPES
+            and entity_type in Event._UNSUBMITTABLE_ENTITY_TYPES
             and operation == EventOperation.SUBMISSION
         ):
             raise InvalidEventOperation

taipy/core/notification/event.py

@@ -62,23 +62,20 @@ class EventEntityType(_ReprEnum):
     JOB = 6
     SUBMISSION = 7
 
-
-_NO_ATTRIBUTE_NAME_OPERATIONS = {EventOperation.CREATION, EventOperation.DELETION, EventOperation.SUBMISSION}
-_UNSUBMITTABLE_ENTITY_TYPES = (
-    EventEntityType.CYCLE,
-    EventEntityType.DATA_NODE,
-    EventEntityType.JOB,
-    EventEntityType.SUBMISSION,
-)
-_ENTITY_TO_EVENT_ENTITY_TYPE = {
-    "scenario": EventEntityType.SCENARIO,
-    "sequence": EventEntityType.SEQUENCE,
-    "task": EventEntityType.TASK,
-    "data": EventEntityType.DATA_NODE,
-    "job": EventEntityType.JOB,
-    "cycle": EventEntityType.CYCLE,
-    "submission": EventEntityType.SUBMISSION,
-}
+    @classmethod
+    def add_member(cls, name, value):
+        # Check if the member already exists to prevent duplication
+        if name in cls._member_map_:
+            return
+
+        # Create a new enum member
+        new_member = object.__new__(cls)
+        new_member._name_ = name
+        new_member._value_ = value
+        # Update the class dictionary and member maps
+        setattr(cls, name, new_member)
+        cls._member_map_[name] = new_member
+        cls._value2member_map_[value] = new_member
 
 
 @dataclass(frozen=True)
@@ -88,6 +85,23 @@ class Event:
     An event holds the necessary attributes to identify the change.
     """
 
+    _NO_ATTRIBUTE_NAME_OPERATIONS = {EventOperation.CREATION, EventOperation.DELETION, EventOperation.SUBMISSION}
+    _UNSUBMITTABLE_ENTITY_TYPES = {
+        EventEntityType.CYCLE,
+        EventEntityType.DATA_NODE,
+        EventEntityType.JOB,
+        EventEntityType.SUBMISSION,
+    }
+    _ENTITY_TO_EVENT_ENTITY_TYPE = {
+        "scenario": EventEntityType.SCENARIO,
+        "sequence": EventEntityType.SEQUENCE,
+        "task": EventEntityType.TASK,
+        "data": EventEntityType.DATA_NODE,
+        "job": EventEntityType.JOB,
+        "cycle": EventEntityType.CYCLE,
+        "submission": EventEntityType.SUBMISSION,
+    }
+
     entity_type: EventEntityType
     """Type of the entity that was changed (`DataNode^`, `Scenario^`, `Cycle^`, etc. )."""
     operation: EventOperation
@@ -112,11 +126,11 @@ class Event:
         super().__setattr__("creation_date", datetime.now())
 
         # Check operation:
-        if self.entity_type in _UNSUBMITTABLE_ENTITY_TYPES and self.operation == EventOperation.SUBMISSION:
+        if self.entity_type in self._UNSUBMITTABLE_ENTITY_TYPES and self.operation == EventOperation.SUBMISSION:
             raise InvalidEventOperation
 
         # Check attribute name:
-        if self.operation in _NO_ATTRIBUTE_NAME_OPERATIONS and self.attribute_name is not None:
+        if self.operation in self._NO_ATTRIBUTE_NAME_OPERATIONS and self.attribute_name is not None:
             raise InvalidEventAttributeName
 
 

taipy/core/scenario/_scenario_manager_factory.py

@@ -8,6 +8,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 # an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
+
 from functools import lru_cache
 from typing import Type
 
@@ -27,7 +28,7 @@ class _ScenarioManagerFactory(_ManagerFactory):
         if EnterpriseEditionUtils._using_enterprise():
             scenario_manager = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager", "_ScenarioManager"
-            )  # type: ignore
+            )
             build_repository = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager_factory",
                 "_ScenarioManagerFactory",

taipy/core/sequence/_sequence_manager_factory.py

@@ -8,6 +8,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 # an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
+
 from functools import lru_cache
 from typing import Type
 
@@ -20,11 +21,11 @@ from ._sequence_manager import _SequenceManager
 class _SequenceManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
-    def _build_manager(cls) -> Type[_SequenceManager]:  # type: ignore
+    def _build_manager(cls) -> Type[_SequenceManager]:
         if EnterpriseEditionUtils._using_enterprise():
             sequence_manager = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".sequence._sequence_manager", "_SequenceManager"
-            )  # type: ignore
+            )
         else:
             sequence_manager = _SequenceManager
         return sequence_manager  # type: ignore

taipy/core/submission/_submission_manager_factory.py

@@ -8,6 +8,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 # an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
+
 from functools import lru_cache
 from typing import Type
 
@@ -28,7 +29,7 @@ class _SubmissionManagerFactory(_ManagerFactory):
             submission_manager = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager",
                 "_SubmissionManager",
-            )  # type: ignore
+            )
             build_repository = _load_fct(
                 EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager_factory",
                 "_SubmissionManagerFactory",