Merge pull request #1865 from Avaiga/feature/#398-databricks-poc

Bug/Fix failing issue on enterprise due to import manager

taipy/core/_cli/_core_cli_factory.py

@@ -15,15 +15,15 @@ from typing import Type
 
 from taipy.common._cli._base_cli._abstract_cli import _AbstractCLI
 
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ._core_cli import _CoreCLI
 
 
 class _CoreCLIFactory:
     @staticmethod
     def _build_cli() -> Type[_AbstractCLI]:
-        if _using_enterprise():
-            module = import_module(_TAIPY_ENTERPRISE_CORE_MODULE + "._cli._core_cli")
+        if EnterpriseEditionUtils._using_enterprise():
+            module = import_module(EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + "._cli._core_cli")
             core_cli = attrgetter("_CoreCLI")(module)
         else:
             core_cli = _CoreCLI

taipy/core/_manager/_manager_factory.py

@@ -18,9 +18,6 @@ from ._manager import _Manager
 
 
 class _ManagerFactory:
-    _TAIPY_ENTERPRISE_MODULE = "taipy.enterprise"
-    _TAIPY_ENTERPRISE_CORE_MODULE = _TAIPY_ENTERPRISE_MODULE + ".core"
-
     @classmethod
     @abstractmethod
     def _build_manager(cls) -> Type[_Manager]:  # type: ignore

taipy/core/_orchestrator/_orchestrator_factory.py

@@ -13,7 +13,7 @@ from typing import Optional, Type
 
 from taipy.common.config import Config
 
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ..exceptions.exceptions import ModeNotAvailable, OrchestratorNotBuilt
 from ._abstract_orchestrator import _AbstractOrchestrator
@@ -22,8 +22,12 @@ from ._orchestrator import _Orchestrator
 
 
 class _OrchestratorFactory:
-    _TAIPY_ENTERPRISE_CORE_ORCHESTRATOR_MODULE = _TAIPY_ENTERPRISE_MODULE + ".core._orchestrator._orchestrator"
-    _TAIPY_ENTERPRISE_CORE_DISPATCHER_MODULE = _TAIPY_ENTERPRISE_MODULE + ".core._orchestrator._dispatcher"
+    _TAIPY_ENTERPRISE_CORE_ORCHESTRATOR_MODULE = (
+        EnterpriseEditionUtils._TAIPY_ENTERPRISE_MODULE + ".core._orchestrator._orchestrator"
+    )
+    _TAIPY_ENTERPRISE_CORE_DISPATCHER_MODULE = (
+        EnterpriseEditionUtils._TAIPY_ENTERPRISE_MODULE + ".core._orchestrator._dispatcher"
+    )
     __TAIPY_ENTERPRISE_BUILD_DISPATCHER_METHOD = "_build_dispatcher"
 
     _orchestrator: Optional[_AbstractOrchestrator] = None
@@ -33,7 +37,7 @@ class _OrchestratorFactory:
     def _build_orchestrator(cls) -> Type[_AbstractOrchestrator]:
         if cls._orchestrator:
             return cls._orchestrator  # type: ignore
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             cls._orchestrator = _load_fct(
                 cls._TAIPY_ENTERPRISE_CORE_ORCHESTRATOR_MODULE,
                 "Orchestrator",
@@ -50,7 +54,7 @@ class _OrchestratorFactory:
         if not cls._orchestrator:
             raise OrchestratorNotBuilt
 
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             cls.__build_enterprise_job_dispatcher(force_restart=force_restart)
         elif Config.job_config.is_standalone:
             cls.__build_standalone_job_dispatcher(force_restart=force_restart)
@@ -76,7 +80,7 @@ class _OrchestratorFactory:
             else:
                 return
 
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             cls._dispatcher = _load_fct(
                 cls._TAIPY_ENTERPRISE_CORE_DISPATCHER_MODULE, cls.__TAIPY_ENTERPRISE_BUILD_DISPATCHER_METHOD
             )(cls._orchestrator)
@@ -89,7 +93,7 @@ class _OrchestratorFactory:
         if isinstance(cls._dispatcher, _StandaloneJobDispatcher):
             cls._dispatcher.stop()
 
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             cls._dispatcher = _load_fct(
                 cls._TAIPY_ENTERPRISE_CORE_DISPATCHER_MODULE, cls.__TAIPY_ENTERPRISE_BUILD_DISPATCHER_METHOD
             )(cls._orchestrator)

taipy/core/_version/_cli/_version_cli_factory.py

@@ -15,15 +15,15 @@ from typing import Type
 
 from taipy.common._cli._base_cli._abstract_cli import _AbstractCLI
 
-from ...common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ...common._check_dependencies import EnterpriseEditionUtils
 from ._version_cli import _VersionCLI
 
 
 class _VersionCLIFactory:
     @staticmethod
     def _build_cli() -> Type[_AbstractCLI]:
-        if _using_enterprise():
-            module = import_module(_TAIPY_ENTERPRISE_CORE_MODULE + "._version._cli._version_cli")
+        if EnterpriseEditionUtils._using_enterprise():
+            module = import_module(EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + "._version._cli._version_cli")
             core_cli = attrgetter("_VersionCLI")(module)
         else:
             core_cli = _VersionCLI

taipy/core/_version/_version_manager_factory.py

@@ -14,7 +14,7 @@ from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
 from ..common import _utils
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ._version_fs_repository import _VersionFSRepository
 from ._version_manager import _VersionManager
 
@@ -25,12 +25,13 @@ class _VersionManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_VersionManager]:
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             version_manager = _utils._load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager", "_VersionManager"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager", "_VersionManager"
             )  # type: ignore
             build_repository = _utils._load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager_factory", "_VersionManagerFactory"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager_factory",
+                "_VersionManagerFactory",
             )._build_repository  # type: ignore
         else:
             version_manager = _VersionManager

taipy/core/common/_check_dependencies.py

@@ -10,9 +10,6 @@
 # specific language governing permissions and limitations under the License.
 from importlib import util
 
-_TAIPY_ENTERPRISE_MODULE = "taipy.enterprise"
-_TAIPY_ENTERPRISE_CORE_MODULE = _TAIPY_ENTERPRISE_MODULE + ".core"
-
 
 def _check_dependency_is_installed(module_name: str, package_name: str) -> None:
     """
@@ -34,5 +31,10 @@ def _check_dependency_is_installed(module_name: str, package_name: str) -> None:
         )
 
 
-def _using_enterprise() -> bool:
-    return util.find_spec(_TAIPY_ENTERPRISE_MODULE) is not None
+class EnterpriseEditionUtils:
+    _TAIPY_ENTERPRISE_MODULE = "taipy.enterprise"
+    _TAIPY_ENTERPRISE_CORE_MODULE = _TAIPY_ENTERPRISE_MODULE + ".core"
+
+    @classmethod
+    def _using_enterprise(cls) -> bool:
+        return util.find_spec(cls._TAIPY_ENTERPRISE_MODULE) is not None

taipy/core/cycle/_cycle_manager_factory.py

@@ -13,7 +13,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ..cycle._cycle_manager import _CycleManager
 from ._cycle_fs_repository import _CycleFSRepository
@@ -25,10 +25,13 @@ class _CycleManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_CycleManager]:
-        if _using_enterprise():
-            cycle_manager = _load_fct(cls._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager", "_CycleManager")  # type: ignore
+        if EnterpriseEditionUtils._using_enterprise():
+            cycle_manager = _load_fct(
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager", "_CycleManager"
+            )  # type: ignore
             build_repository = _load_fct(
-                cls._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager_factory", "_CycleManagerFactory"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager_factory",
+                "_CycleManagerFactory",
             )._build_repository  # type: ignore
         else:
             cycle_manager = _CycleManager

taipy/core/data/_data_manager_factory.py

@@ -12,7 +12,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ._data_fs_repository import _DataFSRepository
 from ._data_manager import _DataManager
@@ -24,10 +24,13 @@ class _DataManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_DataManager]:
-        if _using_enterprise():
-            data_manager = _load_fct(_TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager", "_DataManager")  # type: ignore
+        if EnterpriseEditionUtils._using_enterprise():
+            data_manager = _load_fct(
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager", "_DataManager"
+            )  # type: ignore
             build_repository = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager_factory", "_DataManagerFactory"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager_factory",
+                "_DataManagerFactory",
             )._build_repository  # type: ignore
         else:
             data_manager = _DataManager

taipy/core/job/_job_manager_factory.py

@@ -12,7 +12,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ._job_fs_repository import _JobFSRepository
 from ._job_manager import _JobManager
@@ -24,10 +24,12 @@ class _JobManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_JobManager]:
-        if _using_enterprise():
-            job_manager = _load_fct(_TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager", "_JobManager")  # type: ignore
+        if EnterpriseEditionUtils._using_enterprise():
+            job_manager = _load_fct(
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager", "_JobManager"
+            )  # type: ignore
             build_repository = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager_factory", "_JobManagerFactory"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager_factory", "_JobManagerFactory"
             )._build_repository  # type: ignore
         else:
             job_manager = _JobManager

taipy/core/scenario/_scenario_manager_factory.py

@@ -12,7 +12,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ._scenario_fs_repository import _ScenarioFSRepository
 from ._scenario_manager import _ScenarioManager
@@ -24,12 +24,13 @@ class _ScenarioManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_ScenarioManager]:
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             scenario_manager = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager", "_ScenarioManager"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager", "_ScenarioManager"
             )  # type: ignore
             build_repository = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager_factory", "_ScenarioManagerFactory"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager_factory",
+                "_ScenarioManagerFactory",
             )._build_repository  # type: ignore
         else:
             scenario_manager = _ScenarioManager

taipy/core/sequence/_sequence_manager_factory.py

@@ -12,7 +12,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ._sequence_manager import _SequenceManager
 
@@ -21,9 +21,9 @@ class _SequenceManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_SequenceManager]:  # type: ignore
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             sequence_manager = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".sequence._sequence_manager", "_SequenceManager"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".sequence._sequence_manager", "_SequenceManager"
             )  # type: ignore
         else:
             sequence_manager = _SequenceManager

taipy/core/submission/_submission_manager_factory.py

@@ -12,7 +12,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ._submission_fs_repository import _SubmissionFSRepository
 from ._submission_manager import _SubmissionManager
@@ -24,12 +24,13 @@ class _SubmissionManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_SubmissionManager]:
-        if _using_enterprise():
+        if EnterpriseEditionUtils._using_enterprise():
             submission_manager = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager", "_SubmissionManager"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager",
+                "_SubmissionManager",
             )  # type: ignore
             build_repository = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager_factory",
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager_factory",
                 "_SubmissionManagerFactory",
             )._build_repository  # type: ignore
         else:

taipy/core/task/_task_manager_factory.py

@@ -12,7 +12,7 @@ from functools import lru_cache
 from typing import Type
 
 from .._manager._manager_factory import _ManagerFactory
-from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise
+from ..common._check_dependencies import EnterpriseEditionUtils
 from ..common._utils import _load_fct
 from ._task_fs_repository import _TaskFSRepository
 from ._task_manager import _TaskManager
@@ -24,10 +24,13 @@ class _TaskManagerFactory(_ManagerFactory):
     @classmethod
     @lru_cache
     def _build_manager(cls) -> Type[_TaskManager]:
-        if _using_enterprise():
-            task_manager = _load_fct(_TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager", "_TaskManager")  # type: ignore
+        if EnterpriseEditionUtils._using_enterprise():
+            task_manager = _load_fct(
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager", "_TaskManager"
+            )  # type: ignore
             build_repository = _load_fct(
-                _TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager_factory", "_TaskManagerFactory"
+                EnterpriseEditionUtils._TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager_factory",
+                "_TaskManagerFactory",
             )._build_repository  # type: ignore
         else:
             task_manager = _TaskManager