zrb 0.24.0__py3-none-any.whl → 0.25.1__py3-none-any.whl

zrb/builtin/project/add/fastapp/module/module.py

@@ -1,5 +1,6 @@
 import asyncio
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import validate_existing_project_dir
 from zrb.builtin.project._input import project_dir_input
@@ -18,7 +19,6 @@ from zrb.builtin.project.add.fastapp.module._helper import (
 from zrb.builtin.project.add.fastapp.module._input import module_name_input
 from zrb.helper import util
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.resource_maker import ResourceMaker

zrb/builtin/project/add/plugin/plugin.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -19,7 +20,6 @@ from zrb.builtin.project.add.plugin._input import (
 from zrb.builtin.project.add.project_task import add_project_tasks
 from zrb.config.config import VERSION
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.resource_maker import ResourceMaker

zrb/builtin/project/add/project_task/add.py

@@ -1,11 +1,11 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._input import project_dir_input
 from zrb.helper.codemod.add_assert_resource import add_assert_resource
 from zrb.helper.codemod.add_import_module import add_import_module
 from zrb.helper.file.copy_tree import copy_tree
 from zrb.helper.file.text import read_text_file_async, write_text_file_async
-from zrb.helper.typing import Any
 from zrb.task.decorator import python_task
 from zrb.task.task import Task
 

zrb/builtin/project/add/project_task/template/_automate/_project/build.py

@@ -1,7 +1,8 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.builtin import project_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 
 @python_task(

zrb/builtin/project/add/project_task/template/_automate/_project/container/remove.py

@@ -1,6 +1,7 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 from ._group import project_container_group
 

zrb/builtin/project/add/project_task/template/_automate/_project/container/start.py

@@ -1,6 +1,7 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 from ._group import project_container_group
 

zrb/builtin/project/add/project_task/template/_automate/_project/container/stop.py

@@ -1,6 +1,7 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 from ._group import project_container_group
 

zrb/builtin/project/add/project_task/template/_automate/_project/deploy.py

@@ -1,7 +1,8 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.builtin import project_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 
 @python_task(

zrb/builtin/project/add/project_task/template/_automate/_project/destroy.py

@@ -1,7 +1,8 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.builtin import project_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 
 @python_task(

zrb/builtin/project/add/project_task/template/_automate/_project/get_env.py

@@ -1,7 +1,8 @@
+from typing import Any
+
 from zrb import BoolInput, python_task, runner
 from zrb.builtin import project_group
 from zrb.helper.env_map.fetch import fetch_env_map_from_group
-from zrb.helper.typing import Any, Mapping
 
 
 @python_task(

zrb/builtin/project/add/project_task/template/_automate/_project/image/build.py

@@ -1,6 +1,7 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 from ._group import project_image_group
 

zrb/builtin/project/add/project_task/template/_automate/_project/image/push.py

@@ -1,6 +1,7 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 from ._group import project_image_group
 

zrb/builtin/project/add/project_task/template/_automate/_project/publish.py

@@ -1,7 +1,8 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.builtin import project_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 
 @python_task(

zrb/builtin/project/add/project_task/template/_automate/_project/start.py

@@ -1,7 +1,8 @@
+from typing import Any
+
 from zrb import Task, python_task, runner
 from zrb.builtin import project_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 
 @python_task(

zrb/builtin/project/add/task/cmd/add.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -8,7 +9,6 @@ from zrb.builtin.project._helper import (
 from zrb.builtin.project._input import project_dir_input
 from zrb.builtin.project.add.task._group import project_add_task_group
 from zrb.builtin.project.add.task._input import task_name_input
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.resource_maker import ResourceMaker

zrb/builtin/project/add/task/docker_compose/add.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -12,7 +13,6 @@ from zrb.builtin.project.add.task.docker_compose._input import (
     compose_command_input,
     http_port_input,
 )
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.resource_maker import ResourceMaker

zrb/builtin/project/add/task/docker_compose/template/src/kebab-zrb-task-name/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 x-logging: &default-logging
   options:
     max-size: "100m"

zrb/builtin/project/add/task/python/add.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -8,7 +9,6 @@ from zrb.builtin.project._helper import (
 from zrb.builtin.project._input import project_dir_input
 from zrb.builtin.project.add.task._group import project_add_task_group
 from zrb.builtin.project.add.task._input import task_name_input
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.resource_maker import ResourceMaker

zrb/builtin/project/add/task/python/template/_automate/snake_zrb_task_name.py

@@ -1,4 +1,4 @@
-from typing import Any, Mapping
+from typing import Any
 
 from zrb import Task, python_task, runner
 from zrb.builtin import project_group

zrb/builtin/project/create/_helper.py

@@ -1,6 +1,6 @@
 import os
+from collections.abc import Mapping
 
-from zrb.helper.typing import Mapping
 from zrb.task.resource_maker import ResourceMaker
 
 

zrb/builtin/project/create/create.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._group import project_group
 from zrb.builtin.project._input import project_dir_input
@@ -12,7 +13,6 @@ from zrb.builtin.project.create._input import (
 )
 from zrb.config.config import VERSION
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.cmd_task import CmdTask
 from zrb.task.decorator import python_task

zrb/builtin/say.py

@@ -1,8 +1,8 @@
 import datetime
 import random
+from typing import Any
 
 from zrb.helper.task import show_lines
-from zrb.helper.typing import Any, List
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task_input.int_input import IntInput
@@ -94,7 +94,7 @@ def say(*args: Any, **kwargs: Any):
     show_lines(kwargs["_task"], *lines)
 
 
-def _get_content(text: str, width: int) -> List[str]:
+def _get_content(text: str, width: int) -> list[str]:
     if text == "":
         now = datetime.datetime.now()
         today = "Today is " + now.strftime("%A, %B %d, %Y")
@@ -108,7 +108,7 @@ def _get_content(text: str, width: int) -> List[str]:
     return _split_text_by_width(text, width)
 
 
-def _split_text_by_width(text: str, width: int) -> List[str]:
+def _split_text_by_width(text: str, width: int) -> list[str]:
     original_lines = text.split("\n")
     new_lines = []
     for original_line in original_lines:

zrb/builtin/version.py

@@ -1,5 +1,6 @@
+from typing import Any
+
 from zrb.config.config import VERSION
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.task import Task

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/accessories/color.py

@@ -1,11 +1,12 @@
 import random
+from collections.abc import Iterable
+from typing import Optional
 
 from termcolor import COLORS
 
 from zrb.helper.accessories.untyped_color import untyped_colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Iterable, Optional
 
 logger.debug(untyped_colored("Loading zrb.helper.accessories.color", attrs=["dark"]))
 

zrb/helper/advertisement.py

@@ -2,11 +2,12 @@ import datetime
 import random
 import re
 import sys
+from collections.abc import Iterable
+from typing import Optional
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Iterable, Optional
 
 logger.debug(colored("Loading zrb.helper.advertisement", attrs=["dark"]))
 

zrb/helper/callable.py

@@ -1,6 +1,7 @@
 import asyncio
 import inspect
-from typing import Any, Callable, Coroutine
+from collections.abc import Callable
+from typing import Any
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger

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/codemod/add_import_module.py

@@ -1,9 +1,10 @@
+from typing import Optional, Union
+
 import libcst as cst
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Optional, Tuple, Union
 
 logger.debug(colored("Loading zrb.helper.codemod.add_import_module", attrs=["dark"]))
 
@@ -83,7 +84,7 @@ def _get_new_import(
 
 
 @typechecked
-def _split_module_path(module_path) -> Tuple[str, str]:
+def _split_module_path(module_path) -> tuple[str, str]:
     prefix = ""
     suffix = ""
     is_prefix = True

zrb/helper/codemod/add_property_to_class.py

@@ -1,9 +1,10 @@
+from typing import Optional
+
 import libcst as cst
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Optional
 
 logger.debug(
     colored("Loading zrb.helper.codemod.add_property_to_class", attrs=["dark"])

zrb/helper/default_env.py

@@ -1,10 +1,11 @@
 import os
+from collections.abc import Mapping
 from functools import lru_cache
+from typing import Optional
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Mapping, Optional
 
 logger.debug(colored("Loading zrb.helper.default_env", attrs=["dark"]))
 _PROJECT_DIR_MAP: Mapping[str, str] = {}

zrb/helper/docker_compose/fetch_external_env.py

@@ -1,7 +1,9 @@
+from collections.abc import Mapping
+from typing import Any
+
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Any, List, Mapping
 
 logger.debug(
     colored("Loading zrb.helper.docker_compose.fetch_external_env", attrs=["dark"])
@@ -19,7 +21,7 @@ def fetch_compose_file_env_map(data: Any) -> Mapping[str, str]:
         environments = data["services"][service]["environment"]
         if isinstance(environments, list):
             for environment in environments:
-                parts: List[str] = environment.split("=")
+                parts: list[str] = environment.split("=")
                 if len(parts) > 0:
                     env_str = str(parts[1])
                     env_dict = parse_compose_file_env_string(env_str)

zrb/helper/docker_compose/file.py

@@ -1,9 +1,11 @@
+from collections.abc import Mapping
+from typing import Any
+
 from ruamel.yaml import YAML, CommentedMap
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Any, Mapping
 
 logger.debug(colored("Loading zrb.helper.docker_compose.file", attrs=["dark"]))
 

zrb/helper/env_map/fetch.py

@@ -1,8 +1,9 @@
+from collections.abc import Mapping
+
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.string.jinja import is_probably_jinja
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import List, Mapping
 from zrb.task.any_task import AnyTask
 from zrb.task_env.env import Env
 from zrb.task_group.group import Group
@@ -39,7 +40,7 @@ def fetch_env_map_from_task(env_map: Mapping[str, str], task: AnyTask):
 
 @typechecked
 def _add_envs_to_env_map(
-    env_map: Mapping[str, str], envs: List[Env]
+    env_map: Mapping[str, str], envs: list[Env]
 ) -> Mapping[str, str]:
     for env in envs:
         if env.get_os_name() == "":

zrb/helper/file/copy_tree.py

@@ -1,13 +1,14 @@
 import fnmatch
 import os
 import shutil
+from collections.abc import Iterable, Mapping
+from typing import Optional
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.file.text import read_text_file_async, write_text_file_async
 from zrb.helper.log import logger
 from zrb.helper.string.parse_replacement import parse_replacement
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Iterable, Mapping, Optional
 
 logger.debug(colored("Loading zrb.helper.file.copy_tree", attrs=["dark"]))
 

zrb/helper/file/match.py

@@ -1,16 +1,16 @@
 import fnmatch
 import glob
+from collections.abc import Iterable
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Iterable, List
 
 logger.debug(colored("Loading zrb.helper.file.match", attrs=["dark"]))
 
 
 @typechecked
-def get_file_names(glob_path: str, glob_ignored_paths: Iterable[str]) -> List[str]:
+def get_file_names(glob_path: str, glob_ignored_paths: Iterable[str]) -> list[str]:
     matches = []
     for file in glob.glob(glob_path, recursive=True):
         should_ignore = any(

zrb/helper/git/detect_changes.py

@@ -1,9 +1,9 @@
 import subprocess
+from collections.abc import Mapping
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Mapping
 
 logger.debug(colored("Loading zrb.helper.git.detect_changes", attrs=["dark"]))
 

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])