From 79ff677c4d83c9b612fbc6af517700bf6fe327d4 Mon Sep 17 00:00:00 2001 From: Toan Quach Date: Wed, 2 Oct 2024 14:45:56 +0700 Subject: [PATCH] fixed issue of import in enterprise --- taipy/core/_cli/_core_cli_factory.py | 6 +++--- taipy/core/_manager/_manager_factory.py | 3 --- taipy/core/_version/_cli/_version_cli_factory.py | 6 +++--- taipy/core/_version/_version_manager_factory.py | 9 +++++---- taipy/core/common/_check_dependencies.py | 12 +++++++----- taipy/core/cycle/_cycle_manager_factory.py | 11 +++++++---- taipy/core/data/_data_manager_factory.py | 10 ++++++---- taipy/core/job/_job_manager_factory.py | 10 ++++++---- taipy/core/scenario/_scenario_manager_factory.py | 9 +++++---- taipy/core/sequence/_sequence_manager_factory.py | 6 +++--- taipy/core/submission/_submission_manager_factory.py | 9 +++++---- taipy/core/task/_task_manager_factory.py | 10 ++++++---- 12 files changed, 56 insertions(+), 45 deletions(-) diff --git a/taipy/core/_cli/_core_cli_factory.py b/taipy/core/_cli/_core_cli_factory.py index 27929971b..910861259 100644 --- a/taipy/core/_cli/_core_cli_factory.py +++ b/taipy/core/_cli/_core_cli_factory.py @@ -15,15 +15,15 @@ from taipy._cli._base_cli._abstract_cli import _AbstractCLI -from ..common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise +from ..common._check_dependencies import EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): + module = import_module(EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + "._cli._core_cli") core_cli = attrgetter("_CoreCLI")(module) else: core_cli = _CoreCLI diff --git a/taipy/core/_manager/_manager_factory.py b/taipy/core/_manager/_manager_factory.py index faa9c9562..88f4e3ce1 100644 --- a/taipy/core/_manager/_manager_factory.py +++ b/taipy/core/_manager/_manager_factory.py @@ -18,9 +18,6 @@ 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 diff --git a/taipy/core/_version/_cli/_version_cli_factory.py b/taipy/core/_version/_cli/_version_cli_factory.py index 94d64f490..d8355b21c 100644 --- a/taipy/core/_version/_cli/_version_cli_factory.py +++ b/taipy/core/_version/_cli/_version_cli_factory.py @@ -15,15 +15,15 @@ from taipy._cli._base_cli._abstract_cli import _AbstractCLI -from ...common._check_dependencies import _TAIPY_ENTERPRISE_CORE_MODULE, _using_enterprise +from ...common._check_dependencies import EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): + module = import_module(EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + "._version._cli._version_cli") core_cli = attrgetter("_VersionCLI")(module) else: core_cli = _VersionCLI diff --git a/taipy/core/_version/_version_manager_factory.py b/taipy/core/_version/_version_manager_factory.py index cdf1cfe0d..f0ecf1307 100644 --- a/taipy/core/_version/_version_manager_factory.py +++ b/taipy/core/_version/_version_manager_factory.py @@ -14,7 +14,7 @@ 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 EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): version_manager = _utils._load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager", "_VersionManager" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager", "_VersionManager" ) # type: ignore build_repository = _utils._load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager_factory", "_VersionManagerFactory" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + "._version._version_manager_factory", + "_VersionManagerFactory", )._build_repository # type: ignore else: version_manager = _VersionManager diff --git a/taipy/core/common/_check_dependencies.py b/taipy/core/common/_check_dependencies.py index 3d1274948..73c3af27c 100644 --- a/taipy/core/common/_check_dependencies.py +++ b/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 EnterpriseChecker: + _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 diff --git a/taipy/core/cycle/_cycle_manager_factory.py b/taipy/core/cycle/_cycle_manager_factory.py index 9f5f29f5c..2319d0072 100644 --- a/taipy/core/cycle/_cycle_manager_factory.py +++ b/taipy/core/cycle/_cycle_manager_factory.py @@ -13,7 +13,7 @@ from typing import Type from .._manager._manager_factory import _ManagerFactory -from ..common._check_dependencies import _using_enterprise +from ..common._check_dependencies import EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): + cycle_manager = _load_fct( + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager", "_CycleManager" + ) # type: ignore build_repository = _load_fct( - cls._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager_factory", "_CycleManagerFactory" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".cycle._cycle_manager_factory", + "_CycleManagerFactory", )._build_repository # type: ignore else: cycle_manager = _CycleManager diff --git a/taipy/core/data/_data_manager_factory.py b/taipy/core/data/_data_manager_factory.py index 00036d07b..bd8f62341 100644 --- a/taipy/core/data/_data_manager_factory.py +++ b/taipy/core/data/_data_manager_factory.py @@ -12,7 +12,7 @@ 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 EnterpriseChecker from ..common._utils import _load_fct from ._data_fs_repository import _DataFSRepository from ._data_manager import _DataManager @@ -24,10 +24,12 @@ 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 EnterpriseChecker._using_enterprise(): + data_manager = _load_fct( + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager", "_DataManager" + ) # type: ignore build_repository = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager_factory", "_DataManagerFactory" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".data._data_manager_factory", "_DataManagerFactory" )._build_repository # type: ignore else: data_manager = _DataManager diff --git a/taipy/core/job/_job_manager_factory.py b/taipy/core/job/_job_manager_factory.py index 55f11f2a9..7fa12112b 100644 --- a/taipy/core/job/_job_manager_factory.py +++ b/taipy/core/job/_job_manager_factory.py @@ -12,7 +12,7 @@ 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 EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): + job_manager = _load_fct( + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager", "_JobManager" + ) # type: ignore build_repository = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager_factory", "_JobManagerFactory" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".job._job_manager_factory", "_JobManagerFactory" )._build_repository # type: ignore else: job_manager = _JobManager diff --git a/taipy/core/scenario/_scenario_manager_factory.py b/taipy/core/scenario/_scenario_manager_factory.py index 339749be9..ff49a4a58 100644 --- a/taipy/core/scenario/_scenario_manager_factory.py +++ b/taipy/core/scenario/_scenario_manager_factory.py @@ -12,7 +12,7 @@ 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 EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): scenario_manager = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager", "_ScenarioManager" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager", "_ScenarioManager" ) # type: ignore build_repository = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager_factory", "_ScenarioManagerFactory" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".scenario._scenario_manager_factory", + "_ScenarioManagerFactory", )._build_repository # type: ignore else: scenario_manager = _ScenarioManager diff --git a/taipy/core/sequence/_sequence_manager_factory.py b/taipy/core/sequence/_sequence_manager_factory.py index 879906a92..10d928f04 100644 --- a/taipy/core/sequence/_sequence_manager_factory.py +++ b/taipy/core/sequence/_sequence_manager_factory.py @@ -12,7 +12,7 @@ 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 EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): sequence_manager = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".sequence._sequence_manager", "_SequenceManager" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".sequence._sequence_manager", "_SequenceManager" ) # type: ignore else: sequence_manager = _SequenceManager diff --git a/taipy/core/submission/_submission_manager_factory.py b/taipy/core/submission/_submission_manager_factory.py index 360fd3897..b94ff9ada 100644 --- a/taipy/core/submission/_submission_manager_factory.py +++ b/taipy/core/submission/_submission_manager_factory.py @@ -12,7 +12,7 @@ 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 EnterpriseChecker 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 EnterpriseChecker._using_enterprise(): submission_manager = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager", "_SubmissionManager" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager", + "_SubmissionManager", ) # type: ignore build_repository = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager_factory", + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".submission._submission_manager_factory", "_SubmissionManagerFactory", )._build_repository # type: ignore else: diff --git a/taipy/core/task/_task_manager_factory.py b/taipy/core/task/_task_manager_factory.py index 9569c7be1..21edc4d94 100644 --- a/taipy/core/task/_task_manager_factory.py +++ b/taipy/core/task/_task_manager_factory.py @@ -12,7 +12,7 @@ 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 EnterpriseChecker from ..common._utils import _load_fct from ._task_fs_repository import _TaskFSRepository from ._task_manager import _TaskManager @@ -24,10 +24,12 @@ 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 EnterpriseChecker._using_enterprise(): + task_manager = _load_fct( + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager", "_TaskManager" + ) # type: ignore build_repository = _load_fct( - _TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager_factory", "_TaskManagerFactory" + EnterpriseChecker._TAIPY_ENTERPRISE_CORE_MODULE + ".task._task_manager_factory", "_TaskManagerFactory" )._build_repository # type: ignore else: task_manager = _TaskManager