zrb 0.24.1__py3-none-any.whl → 0.25.0__py3-none-any.whl

zrb/config/config.py

@@ -33,8 +33,18 @@ def _get_default_tmp_dir() -> str:
 TMP_DIR = os.getenv("ZRB_TMP_DIR", _get_default_tmp_dir())
 DEFAULT_SHELL = os.getenv("ZRB_SHELL", _get_current_shell())
 DEFAULT_EDITOR = os.getenv("ZRB_EDITOR", "nano")
-INIT_SCRIPT_STR = os.getenv("ZRB_INIT_SCRIPTS", "")
-INIT_SCRIPTS = INIT_SCRIPT_STR.split(":") if INIT_SCRIPT_STR != "" else []
+INIT_MODULES_STR = os.getenv("ZRB_INIT_MODULES", "")
+INIT_MODULES = (
+    [module.strip() for module in INIT_MODULES_STR.split(":") if module.strip() != ""]
+    if INIT_MODULES_STR != ""
+    else []
+)
+INIT_SCRIPTS_STR = os.getenv("ZRB_INIT_SCRIPTS", "")
+INIT_SCRIPTS = (
+    [script.strip() for script in INIT_SCRIPTS_STR.split(":") if script.strip() != ""]
+    if INIT_SCRIPTS_STR != ""
+    else []
+)
 LOGGING_LEVEL = untyped_to_logging_level(os.getenv("ZRB_LOGGING_LEVEL", "WARNING"))
 SHOULD_LOAD_BUILTIN = untyped_to_boolean(os.getenv("ZRB_SHOULD_LOAD_BUILTIN", "1"))
 ENV_PREFIX = os.getenv("ZRB_ENV", "")

zrb/helper/cli.py

@@ -4,9 +4,10 @@ from functools import lru_cache
 
 import click
 
-from zrb.config.config import INIT_SCRIPTS, SHOULD_LOAD_BUILTIN, VERSION
+from zrb.config.config import INIT_MODULES, INIT_SCRIPTS, SHOULD_LOAD_BUILTIN, VERSION
 from zrb.helper.accessories.color import colored
 from zrb.helper.loader.load_module import load_module
+from zrb.helper.loader.load_script import load_script
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
 from zrb.runner import runner
@@ -45,15 +46,28 @@ def create_cli() -> click.Group:
         from zrb import builtin
 
         assert builtin
+    # load from ZRB_INIT_MODULES
+    for init_module in INIT_MODULES:
+        try:
+            load_module(init_module)
+        except Exception:
+            logger.error(
+                colored(
+                    f"Failed to load module {init_module}",
+                    color="red",
+                    attrs=["bold"],
+                )
+            )
+            traceback.print_exc()
     # Load zrb_init.py
     project_dir = os.getenv("ZRB_PROJECT_DIR", os.getcwd())
     project_script = os.path.join(project_dir, "zrb_init.py")
-    load_module(script_path=project_script, sys_path_index=0)
+    load_script(script_path=project_script, sys_path_index=0)
     # load from ZRB_INIT_SCRIPTS environment
     for index, init_script in enumerate(INIT_SCRIPTS):
         logger.info(colored(f"Load module from {init_script}", attrs=["dark"]))
         try:
-            load_module(script_path=init_script, sys_path_index=index + 1)
+            load_script(script_path=init_script, sys_path_index=index + 1)
         except Exception:
             logger.error(
                 colored(

zrb/helper/loader/load_module.py

@@ -1,8 +1,6 @@
-import importlib.util
-import os
-import re
-import sys
+import importlib
 from functools import lru_cache
+from typing import Any
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
@@ -10,48 +8,11 @@ from zrb.helper.typecheck import typechecked
 
 logger.debug(colored("Loading zrb.helper.loader.load_module", attrs=["dark"]))
 
-pattern = re.compile("[^a-zA-Z0-9]")
-
 
 @lru_cache
 @typechecked
-def load_module(script_path: str, sys_path_index: int = 0):
-    if not os.path.isfile(script_path):
-        return
-    script_dir_path = os.path.dirname(script_path)
-    _append_dir_to_sys_path(script_dir_path, sys_path_index)
-    _append_dir_to_python_path(script_dir_path)
-    _exec_script_as_module(script_path)
-
-
-def _exec_script_as_module(script_path: str):
-    module_name = pattern.sub("", script_path)
-    logger.info(colored(f"Get module spec: {script_path}", attrs=["dark"]))
-    spec = importlib.util.spec_from_file_location(module_name, script_path)
-    logger.info(colored(f"Create module: {script_path}", attrs=["dark"]))
-    module = importlib.util.module_from_spec(spec)
-    logger.info(colored(f"Exec module: {script_path}", attrs=["dark"]))
-    spec.loader.exec_module(module)
-    logger.info(colored(f"Module executed: {script_path}", attrs=["dark"]))
-
-
-def _append_dir_to_sys_path(dir_path: str, index: int):
-    if dir_path in sys.path:
-        return
-    sys.path.insert(index, dir_path)
-    logger.info(colored(f"Set sys.path to {sys.path}", attrs=["dark"]))
-
-
-def _append_dir_to_python_path(dir_path: str):
-    new_python_path = _get_new_python_path(dir_path)
-    logger.info(colored(f"Set PYTHONPATH to {new_python_path}", attrs=["dark"]))
-    os.environ["PYTHONPATH"] = new_python_path
-
-
-def _get_new_python_path(dir_path: str) -> str:
-    current_python_path = os.getenv("PYTHONPATH")
-    if current_python_path is None or current_python_path == "":
-        return dir_path
-    if dir_path in current_python_path.split(":"):
-        return current_python_path
-    return ":".join([current_python_path, dir_path])
+def load_module(module_name: str) -> Any:
+    logger.info(colored(f"Importing module: {module_name}", attrs=["dark"]))
+    module = importlib.import_module(module_name)
+    logger.info(colored(f"Module imported: {module_name}", attrs=["dark"]))
+    return module

zrb/helper/loader/load_script.py

@@ -0,0 +1,57 @@
+import importlib.util
+import os
+import re
+import sys
+from functools import lru_cache
+
+from zrb.helper.accessories.color import colored
+from zrb.helper.log import logger
+from zrb.helper.typecheck import typechecked
+
+logger.debug(colored("Loading zrb.helper.loader.load_script", attrs=["dark"]))
+
+pattern = re.compile("[^a-zA-Z0-9]")
+
+
+@lru_cache
+@typechecked
+def load_script(script_path: str, sys_path_index: int = 0):
+    if not os.path.isfile(script_path):
+        return
+    script_dir_path = os.path.dirname(script_path)
+    _append_dir_to_sys_path(script_dir_path, sys_path_index)
+    _append_dir_to_python_path(script_dir_path)
+    _exec_script_as_module(script_path)
+
+
+def _exec_script_as_module(script_path: str):
+    module_name = pattern.sub("", script_path)
+    logger.info(colored(f"Get module spec: {script_path}", attrs=["dark"]))
+    spec = importlib.util.spec_from_file_location(module_name, script_path)
+    logger.info(colored(f"Create module: {script_path}", attrs=["dark"]))
+    module = importlib.util.module_from_spec(spec)
+    logger.info(colored(f"Exec module: {script_path}", attrs=["dark"]))
+    spec.loader.exec_module(module)
+    logger.info(colored(f"Module executed: {script_path}", attrs=["dark"]))
+
+
+def _append_dir_to_sys_path(dir_path: str, index: int):
+    if dir_path in sys.path:
+        return
+    sys.path.insert(index, dir_path)
+    logger.info(colored(f"Set sys.path to {sys.path}", attrs=["dark"]))
+
+
+def _append_dir_to_python_path(dir_path: str):
+    new_python_path = _get_new_python_path(dir_path)
+    logger.info(colored(f"Set PYTHONPATH to {new_python_path}", attrs=["dark"]))
+    os.environ["PYTHONPATH"] = new_python_path
+
+
+def _get_new_python_path(dir_path: str) -> str:
+    current_python_path = os.getenv("PYTHONPATH")
+    if current_python_path is None or current_python_path == "":
+        return dir_path
+    if dir_path in current_python_path.split(":"):
+        return current_python_path
+    return ":".join([current_python_path, dir_path])

{zrb-0.24.1.dist-info → zrb-0.25.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.24.1
+Version: 0.25.0
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-0.24.1.dist-info → zrb-0.25.0.dist-info}/RECORD

@@ -1312,7 +1312,7 @@ zrb/builtin/update.py,sha256=89i_fPUlL27IXczLI7Lr7k4STMpnxyw2je8daCKUTQo,225
 zrb/builtin/version.py,sha256=i0pnnLQFLdTwcVqZs6xsGkbAY-IPbmelip7HuZVjgv0,384
 zrb/builtin/watch_changes.py,sha256=Vr__e_T31nnbefcPftvyn78dT3-UXqNRpH0KO-COeKQ,1220
 zrb/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/config/config.py,sha256=Zt8RPalNy1qH0bQ5WPazK2TQ2RYw08vegMFVVR4WVyM,1616
+zrb/config/config.py,sha256=k_3HaOljqKWr1TKZ0Ap7_E2BRqejkVNChMMA13PqEwM,1891
 zrb/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/accessories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/accessories/color.py,sha256=7bj2-K_sn1leXN_C9eeOWXZBfnsBAFOzfirSiM8vCMw,964
@@ -1321,7 +1321,7 @@ zrb/helper/accessories/name.py,sha256=e1uvU3MzuvDb5j6YIWBA048y4qeM-LfrxRKWlMehli
 zrb/helper/accessories/untyped_color.py,sha256=4wRbHSClbCzPRWtW-Cy2agOMozANVi7u4p8lMXMSuJg,194
 zrb/helper/advertisement.py,sha256=GOaCtWYL9Oj_tAg4jqsCuFsdinHaOSH_6d57y8BbsVU,912
 zrb/helper/callable.py,sha256=usatPKPkK_67G9dWreaGXskOaGHd_hE8MiTWAUhfojE,563
-zrb/helper/cli.py,sha256=cpxJV1H4hMilcme-1mYLs6WjZI63C_TwTm2sVHLJB_c,2177
+zrb/helper/cli.py,sha256=S1j8hfW_zEDeycPRbJd0E8xkOZkuEZ5PNz6JO6EC8UI,2637
 zrb/helper/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/codemod/add_argument_to_function.py,sha256=Xh5Tlb4iO3cv4dRR12ms9kf0j-atVSnCh88TuqCof8I,1435
 zrb/helper/codemod/add_argument_to_function_call.py,sha256=dFFqQ885gG_ZCBgax6sjkWx7s7cIk1amLhTC0Ge_zZo,1186
@@ -1346,7 +1346,8 @@ zrb/helper/file/text.py,sha256=7JqNbk8hC7Y4UopEmhiGYkxDAauepvI1tEkbfpzcI84,963
 zrb/helper/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/git/detect_changes.py,sha256=blRGkLarFh88X-G2XHP2h0bRzropT-Hqfqjbp2uRcx4,1311
 zrb/helper/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/helper/loader/load_module.py,sha256=qLYFTBKnrxlmgEA_-uepAM16LwpIx3XyfvXSIvJEoMc,1998
+zrb/helper/loader/load_module.py,sha256=OfF7rtiXjNqAjIycLveXcmrWz8bZ0R9uqKeae_xYc2c,570
+zrb/helper/loader/load_script.py,sha256=LvIRB4-f3ft-wEp1amhws-L-mCKDQ1rFUzrdc16AwGE,1998
 zrb/helper/log.py,sha256=zwUjYERey4f9VSkYca1TT1VjTzoCTsQNTFEbXrc-DS4,544
 zrb/helper/map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/map/conversion.py,sha256=GeD7w9nv0j8f6LIxaAwXhr_5G9woX6zhEBX_vRZyWjw,620
@@ -1424,8 +1425,8 @@ zrb/task_input/multiline_input.py,sha256=KNto5k5X1C6KE_A-vX0OjpQyjgCRJ6BR2PwHXNQ
 zrb/task_input/password_input.py,sha256=95NlJ9xIq7z_evpAyR2XsBpeuWpBXd2Ezn3P7oDOttk,4360
 zrb/task_input/str_input.py,sha256=0nje7vI9fs_xqQBbmKB8Yn7wevlWp9Qebv7f8-GmiXs,4350
 zrb/task_input/task_input.py,sha256=WTj_qIQyRs-04-VotjNTcVyIuf6b2afInVoCQHoRmr0,2327
-zrb-0.24.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.24.1.dist-info/METADATA,sha256=4WWsARDnV-fCcehzw8m0KGIQgAfvEpb_1llECktnoVc,17085
-zrb-0.24.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.24.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.24.1.dist-info/RECORD,,
+zrb-0.25.0.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.25.0.dist-info/METADATA,sha256=k6zqt8ZNoObLoO5RitMmfjDovV-v3AJIx5oyOn36tF4,17085
+zrb-0.25.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.25.0.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.25.0.dist-info/RECORD,,