zrb 0.26.0__py3-none-any.whl → 0.27.1__py3-none-any.whl

zrb/__init__.py

@@ -10,7 +10,6 @@ from zrb.task.any_task_event_handler import (
     OnTriggered,
     OnWaiting,
 )
-from zrb.task.base_remote_cmd_task import BaseRemoteCmdTask, RemoteConfig
 from zrb.task.checker import Checker
 from zrb.task.cmd_task import CmdTask
 from zrb.task.decorator import python_task
@@ -69,8 +68,6 @@ assert CmdTask
 assert DockerComposeTask
 assert DockerComposeStartTask
 assert ServiceConfig
-assert BaseRemoteCmdTask
-assert RemoteConfig
 assert RemoteCmdTask
 assert RsyncTask
 assert Notifier

zrb/builtin/monorepo/_common.sh

@@ -0,0 +1,15 @@
+log_info() {
+    echo -e "🤖 \e[0;33m${1}\e[0;0m"
+}
+
+log_error() {
+    echo -e "\e[1;31m${1}\e[0;0m" >&2
+}
+
+log_conflict_error() {
+    log_error "Action blocked by unresolved conflicts."
+    log_error "You need to resolve the conflict(s) and commit the changes."
+    log_error "Unresolved conflict(s) detected:"
+    log_error "$1"
+}
+

zrb/builtin/monorepo/_config.py

@@ -2,8 +2,8 @@ import json
 import os
 from collections.abc import Mapping
 
-_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
-MONOREPO_CONFIG_FILE = os.path.join(_PROJECT_DIR, "monorepo.zrb.json")
+PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
+MONOREPO_CONFIG_FILE = os.path.join(PROJECT_DIR, "monorepo.zrb.json")
 MONOREPO_CONFIG: Mapping[str, Mapping[str, str]] = {}
 
 if os.path.isfile(MONOREPO_CONFIG_FILE):

zrb/builtin/monorepo/_helper.py

@@ -0,0 +1,140 @@
+import os
+
+from zrb.builtin.monorepo._config import PROJECT_DIR
+from zrb.task.cmd_task import CmdTask
+from zrb.task_env.env import Env
+from zrb.task_input.any_input import AnyInput
+from zrb.task_input.str_input import StrInput
+
+_CURRENT_DIR = os.path.dirname(__file__)
+
+
+def create_pull_monorepo_task(
+    task_name: str = "pull-monorepo",
+) -> CmdTask:
+    return CmdTask(
+        name=task_name,
+        envs=[
+            Env("TIME", os_name="", default="{{datetime.datetime.now()}}"),
+        ],
+        cmd_path=[
+            os.path.join(_CURRENT_DIR, "_common.sh"),
+            os.path.join(_CURRENT_DIR, "pull-monorepo.sh"),
+        ],
+        cwd=PROJECT_DIR,
+        should_show_cmd=False,
+        should_show_working_directory=False,
+        should_print_cmd_result=False,
+        retry=0,
+    )
+
+
+def create_push_monorepo_task(
+    task_name: str = "push-monorepo", default_commit_message: str = "Save changes"
+) -> CmdTask:
+    return CmdTask(
+        name=task_name,
+        inputs=[_create_commit_message_input(default_commit_message)],
+        envs=[
+            Env("MESSAGE", os_name="", default="{{input.message}}"),
+        ],
+        cmd_path=[
+            os.path.join(_CURRENT_DIR, "_common.sh"),
+            os.path.join(_CURRENT_DIR, "push-monorepo.sh"),
+        ],
+        cwd=PROJECT_DIR,
+        should_show_cmd=False,
+        should_show_working_directory=False,
+        should_print_cmd_result=False,
+        retry=0,
+    )
+
+
+def create_add_subrepo_task(
+    origin: str,
+    folder: str,
+    branch: str,
+    task_name: str = "add",
+) -> CmdTask:
+    return CmdTask(
+        name=task_name,
+        envs=[
+            Env("ORIGIN", os_name="", default=origin),
+            Env("FOLDER", os_name="", default=folder),
+            Env("BRANCH", os_name="", default=branch),
+            Env("TIME", os_name="", default="{{datetime.datetime.now()}}"),
+        ],
+        cmd_path=[
+            os.path.join(_CURRENT_DIR, "_common.sh"),
+            os.path.join(_CURRENT_DIR, "add-subrepo.sh"),
+        ],
+        cwd=PROJECT_DIR,
+        should_show_cmd=False,
+        should_show_working_directory=False,
+        should_print_cmd_result=False,
+        retry=0,
+    )
+
+
+def create_pull_subrepo_task(
+    origin: str,
+    folder: str,
+    branch: str,
+    task_name: str = "pull",
+) -> CmdTask:
+    return CmdTask(
+        name=task_name,
+        envs=[
+            Env("ORIGIN", os_name="", default=origin),
+            Env("FOLDER", os_name="", default=folder),
+            Env("BRANCH", os_name="", default=branch),
+            Env("TIME", os_name="", default="{{datetime.datetime.now()}}"),
+        ],
+        cmd_path=[
+            os.path.join(_CURRENT_DIR, "_common.sh"),
+            os.path.join(_CURRENT_DIR, "pull-subrepo.sh"),
+        ],
+        cwd=PROJECT_DIR,
+        should_show_cmd=False,
+        should_show_working_directory=False,
+        should_print_cmd_result=False,
+        retry=0,
+    )
+
+
+def create_push_subrepo_task(
+    origin: str,
+    folder: str,
+    branch: str,
+    task_name: str = "push",
+    default_commit_message: str = "Commit",
+) -> CmdTask:
+    return CmdTask(
+        name=task_name,
+        inputs=[_create_commit_message_input(default_commit_message)],
+        envs=[
+            Env("ORIGIN", os_name="", default=origin),
+            Env("FOLDER", os_name="", default=folder),
+            Env("BRANCH", os_name="", default=branch),
+            Env("TIME", os_name="", default="{{datetime.datetime.now()}}"),
+            Env("MESSAGE", os_name="", default="{{input.message}}"),
+        ],
+        cmd_path=[
+            os.path.join(_CURRENT_DIR, "_common.sh"),
+            os.path.join(_CURRENT_DIR, "push-subrepo.sh"),
+        ],
+        cwd=PROJECT_DIR,
+        should_show_cmd=False,
+        should_show_working_directory=False,
+        should_print_cmd_result=False,
+        retry=0,
+    )
+
+
+def _create_commit_message_input(default: str) -> AnyInput:
+    return StrInput(
+        name="message",
+        shortcut="m",
+        prompt="Commit Message",
+        default=default,
+    )

zrb/builtin/monorepo/_task.py

@@ -1,27 +1,18 @@
-import os
-from datetime import datetime
-
 from zrb.builtin.monorepo._config import MONOREPO_CONFIG
 from zrb.builtin.monorepo._group import monorepo_group
+from zrb.builtin.monorepo._helper import (
+    create_add_subrepo_task,
+    create_pull_monorepo_task,
+    create_pull_subrepo_task,
+    create_push_monorepo_task,
+    create_push_subrepo_task,
+)
 from zrb.helper.util import to_kebab_case
 from zrb.runner import runner
-from zrb.task.cmd_task import CmdTask
+from zrb.task.flow_task import FlowTask
 from zrb.task_group.group import Group
-from zrb.task_input.str_input import StrInput
 
-_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
-
-_pull_monorepo = CmdTask(
-    name="pull-monorepo",
-    inputs=[StrInput(name="message")],
-    cwd=_PROJECT_DIR,
-    cmd=[
-        "git add . -A",
-        'git commit -m "{{input.message}}"',
-        'git pull origin "$(git branch --show-current)"',
-    ],
-    retry=0,
-)
+_pull_monorepo = create_pull_monorepo_task()
 
 PULL_SUBREPO_UPSTREAM = _pull_monorepo
 PUSH_SUBREPO_UPSTREAM = _pull_monorepo
@@ -30,70 +21,106 @@ for name, config in MONOREPO_CONFIG.items():
     group = Group(
         name=kebab_name, parent=monorepo_group, description=f"Subrepo {name} management"
     )
-    subrepo_origin = config.get("origin", "")
-    subrepo_folder = config.get("folder", "")
-    subrepo_branch = config.get("branch", "main")
+    origin = config.get("origin", "")
+    folder = config.get("folder", "")
+    branch = config.get("branch", "main")
 
-    # define pull subrepo
-    pull_subrepo = CmdTask(
+    pull_subrepo = FlowTask(
         name="pull",
         group=group,
-        inputs=[
-            StrInput(
-                name="message",
-                shortcut="m",
-                prompt="Commit Messsage",
-                default=lambda m: f"Pulling from subrepo at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
-            )
+        upstreams=[_pull_monorepo],
+        steps=[
+            create_add_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"add-{kebab_name}-subrepo",
+            ),
+            create_pull_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"pull-{kebab_name}-subrepo",
+            ),
         ],
-        cmd=[
-            f'if [ ! -d "{subrepo_folder}" ]',
-            "then",
-            "   echo Run subtree add",
-            f'  git subtree add --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
-            "fi",
-            "echo Run subtree pull",
-            "set -e",
-            f'git subtree pull --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+    )
+    runner.register(pull_subrepo)
+
+    linked_pull_subrepo = FlowTask(
+        name=f"pull-{kebab_name}",
+        upstreams=[PULL_SUBREPO_UPSTREAM],
+        steps=[
+            create_add_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"add-{kebab_name}-subrepo",
+            ),
+            create_pull_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"pull-{kebab_name}-subrepo",
+            ),
         ],
-        retry=0,
     )
-    _pull_monorepo >> pull_subrepo
-    linked_pull_subrepo = pull_subrepo.copy()
-    PULL_SUBREPO_UPSTREAM >> linked_pull_subrepo
     PULL_SUBREPO_UPSTREAM = linked_pull_subrepo
-    runner.register(pull_subrepo)
 
-    # define push subrepo
-    push_subrepo = CmdTask(
+    push_subrepo = FlowTask(
         name="push",
         group=group,
-        inputs=[
-            StrInput(
-                name="message",
-                shortcut="m",
-                prompt="Commit Messsage",
-                default=lambda m: f"Pushing to subrepo at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
-            )
+        upstreams=[_pull_monorepo],
+        steps=[
+            create_add_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"add-{kebab_name}-subrepo",
+            ),
+            create_pull_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"pull-{kebab_name}-subrepo",
+            ),
+            create_push_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"push-{kebab_name}-subrepo",
+            ),
+            create_push_monorepo_task(task_name="push-monorepo"),
         ],
-        cmd=[
-            f'if [ ! -d "{subrepo_folder}" ]',
-            "then",
-            "   echo Run subtree add",
-            f'  git subtree add --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
-            "fi",
-            "echo Run subtree pull",
-            "set -e",
-            f'git subtree pull --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
-            "set +e",
-            "git add . -A",
-            'git commit -m "{{input.message}}"',
-            f'git subtree push --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+    )
+    runner.register(push_subrepo)
+
+    linked_push_subrepo = FlowTask(
+        name=f"push-{kebab_name}",
+        upstreams=[PUSH_SUBREPO_UPSTREAM],
+        steps=[
+            create_add_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"add-{kebab_name}-subrepo",
+            ),
+            create_pull_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"pull-{kebab_name}-subrepo",
+            ),
+            create_push_subrepo_task(
+                origin=origin,
+                folder=folder,
+                branch=branch,
+                task_name=f"push-{kebab_name}-subrepo",
+            ),
         ],
-        retry=0,
     )
-    _pull_monorepo >> push_subrepo
-    linked_push_subrepo = push_subrepo.copy()
-    PUSH_SUBREPO_UPSTREAM >> push_subrepo
     PUSH_SUBREPO_UPSTREAM = linked_push_subrepo
-    runner.register(push_subrepo)
+
+
+_push_monorepo = create_push_monorepo_task(task_name="push-monorepo")
+PUSH_SUBREPO_UPSTREAM >> _push_monorepo
+PUSH_SUBREPO_UPSTREAM = _push_monorepo

zrb/builtin/monorepo/add-subrepo.sh

@@ -0,0 +1,22 @@
+set -e
+
+if [ -d "${FOLDER}" ]
+then
+    exit 0
+fi
+
+CONFLICT="$(git diff --name-only --diff-filter=U)"
+if [ -n "${CONFLICT}" ]
+then
+    log_conflict_error "${CONFLICT}"
+    exit 1
+fi
+
+log_info "Adding subtree: ${FOLDER}"
+git subtree add --prefix "${FOLDER}" "${ORIGIN}" "${BRANCH}"
+git add . -A
+if [ -n "$(git status --porcelain)" ]
+then
+    log_info "Commit changes"
+    git commit -m "Adding subtree: ${FOLDER} at ${TIME}"
+fi

zrb/builtin/monorepo/add.py

@@ -1,7 +1,12 @@
 import json
+import os
 from collections.abc import Mapping
 
-from zrb.builtin.monorepo._config import MONOREPO_CONFIG, MONOREPO_CONFIG_FILE
+from zrb.builtin.monorepo._config import (
+    MONOREPO_CONFIG,
+    MONOREPO_CONFIG_FILE,
+    PROJECT_DIR,
+)
 from zrb.builtin.monorepo._group import monorepo_group
 from zrb.runner import runner
 from zrb.task.any_task import AnyTask
@@ -30,6 +35,9 @@ from zrb.task_input.str_input import StrInput
 def add_to_monorepo(*args, **kwargs):
     task: AnyTask = kwargs.get("_task")
     input_map: Mapping[str, str] = task.get_input_map()
+    abs_folder = os.path.join(PROJECT_DIR, input_map.get("folder", ""))
+    if os.path.isdir(abs_folder):
+        raise ValueError(f"Directory exists: {abs_folder}")
     config = dict(MONOREPO_CONFIG)
     config[input_map.get("alias", "")] = {
         "folder": input_map.get("folder", ""),

zrb/builtin/monorepo/pull-monorepo.sh

@@ -0,0 +1,18 @@
+set -e
+
+CONFLICT="$(git diff --name-only --diff-filter=U)"
+if [ -n "${CONFLICT}" ]
+then
+    log_conflict_error "${CONFLICT}"
+    exit 1
+fi
+
+git add . -A
+if [ -n "$(git status --porcelain)" ]
+then
+    log_info "Commit changes"
+    git commit -m "Before pulling from monorepo at ${TIME}"
+fi
+
+log_info "Pulling from main repository"
+git pull origin "$(git branch --show-current)"

zrb/builtin/monorepo/pull-subrepo.sh

@@ -0,0 +1,18 @@
+set -e
+
+CONFLICT="$(git diff --name-only --diff-filter=U)"
+if [ -n "${CONFLICT}" ]
+then
+    log_conflict_error "${CONFLICT}"
+    exit 1
+fi
+
+log_info "Pulling from subtree"
+git subtree pull --prefix "${FOLDER}" "${ORIGIN}" "${BRANCH}"
+
+CONFLICT="$(git diff --name-only --diff-filter=U)"
+if [ -n "${CONFLICT}" ]
+then
+    log_conflict_error "${CONFLICT}"
+    exit 1
+fi

zrb/builtin/monorepo/pull.py

@@ -15,9 +15,10 @@ pull_from_monorepo = Task(
             name="message",
             shortcut="m",
             prompt="Commit Messsage",
-            default=lambda m: f"Pulling from subrepos at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+            default=lambda m: f"Synchronize subrepos at {datetime.now()}",
         )
     ],
+    retry=0,
 )
 PULL_SUBREPO_UPSTREAM >> pull_from_monorepo
 runner.register(pull_from_monorepo)

zrb/builtin/monorepo/push-monorepo.sh

@@ -0,0 +1,18 @@
+set -e
+
+CONFLICT="$(git diff --name-only --diff-filter=U)"
+if [ -n "${CONFLICT}" ]
+then
+    log_conflict_error "${CONFLICT}"
+    exit 1
+fi
+
+git add . -A
+if [ -n "$(git status --porcelain)" ]
+then
+    log_info "Commit changes"
+    git commit -m "${MESSAGE}"
+fi
+
+log_info "Pushing to main repository"
+git push origin "$(git branch --show-current)"

zrb/builtin/monorepo/push-subrepo.sh

@@ -0,0 +1,18 @@
+set -e
+
+CONFLICT="$(git diff --name-only --diff-filter=U)"
+if [ -n "${CONFLICT}" ]
+then
+    log_conflict_error "${CONFLICT}"
+    exit 1
+fi
+
+git add . -A
+if [ -n "$(git status --porcelain)" ]
+then
+    log_info "Commit changes"
+    git commit -m "${MESSAGE}"
+fi
+
+log_info "Pushing to subtree"
+git subtree push --prefix "${FOLDER}" "${ORIGIN}" "${BRANCH}"

zrb/builtin/monorepo/push.py

@@ -3,21 +3,9 @@ from datetime import datetime
 from zrb.builtin.monorepo._group import monorepo_group
 from zrb.builtin.monorepo._task import PUSH_SUBREPO_UPSTREAM
 from zrb.runner import runner
-from zrb.task.cmd_task import CmdTask
 from zrb.task.task import Task
 from zrb.task_input.str_input import StrInput
 
-_push_monorepo = CmdTask(
-    name="push-monorepo",
-    inputs=[StrInput(name="message")],
-    cmd=[
-        "git add . -A",
-        'git commit -m "{{input.message}}"',
-        'git push origin "$(git branch --show-current)"',
-    ],
-    retry=0,
-)
-
 push_to_monorepo = Task(
     name="push",
     group=monorepo_group,
@@ -27,9 +15,10 @@ push_to_monorepo = Task(
             name="message",
             shortcut="m",
             prompt="Commit Messsage",
-            default=lambda m: f"Pushing to subrepos at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+            default=lambda m: f"Synchronize subrepos at {datetime.now()}",
         )
     ],
+    retry=0,
 )
-PUSH_SUBREPO_UPSTREAM >> _push_monorepo >> push_to_monorepo
+PUSH_SUBREPO_UPSTREAM >> push_to_monorepo
 runner.register(push_to_monorepo)

zrb/helper/asyncio_task.py

@@ -16,8 +16,11 @@ async def stop_asyncio():
 
 
 def stop_asyncio_sync():
-    loop = asyncio.get_event_loop()
-    if loop.is_running():
-        loop.create_task(stop_asyncio())
-    else:
-        loop.run_until_complete(stop_asyncio())
+    try:
+        loop = asyncio.get_event_loop()
+        if loop.is_running():
+            loop.create_task(stop_asyncio())
+        else:
+            loop.run_until_complete(stop_asyncio())
+    except Exception:
+        pass

zrb/helper/cli.py

@@ -58,7 +58,6 @@ def create_cli() -> click.Group:
                     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")

zrb/task/base_task/base_task.py

@@ -288,7 +288,7 @@ class BaseTask(FinishTracker, AttemptTracker, Renderer, BaseTaskModel, AnyTask):
             self._print_result(result)
             return result
         except RuntimeError as e:
-            if "event loop is closed" not in str(e).lower():
+            if raise_error and ("event loop is closed" not in str(e).lower()):
                 raise e
         except Exception as e:
             self.log_error(f"{e}")

zrb/task/docker_compose_task.py

@@ -33,32 +33,33 @@ from zrb.task_input.any_input import AnyInput
 
 logger.debug(colored("Loading zrb.task.docker_compose_task", attrs=["dark"]))
 
+TDockerComposeTask = TypeVar("TDockerComposeTask", bound="DockerComposeTask")
 
-def _get_ensure_zrb_network_task(backend: str):
-    CURRENT_DIR = os.path.dirname(__file__)
-    SHELL_SCRIPT_DIR = os.path.join(CURRENT_DIR, "..", "shell-scripts")
-    ensure_container_backend = CmdTask(
-        name="ensure-compose-backend",
-        cmd_path=[
-            os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
-            os.path.join(SHELL_SCRIPT_DIR, f"ensure-{backend}-is-installed.sh"),
-        ],
-        preexec_fn=None,
-        should_print_cmd_result=False,
-    )
-    return CmdTask(
-        name="ensure-zrb-network",
-        cmd=[
-            f"{backend} network inspect zrb >/dev/null 2>&1 || \\",
-            f"{backend} network create -d bridge zrb",
-        ],
-        upstreams=[ensure_container_backend],
-        should_print_cmd_result=False,
-    )
-
+CURRENT_DIR = os.path.dirname(__file__)
+SHELL_SCRIPT_DIR = os.path.join(CURRENT_DIR, "..", "shell-scripts")
 
-TDockerComposeTask = TypeVar("TDockerComposeTask", bound="DockerComposeTask")
-ensure_zrb_network_task = _get_ensure_zrb_network_task(CONTAINER_BACKEND)
+ensure_container_backend = CmdTask(
+    name="ensure-compose-backend",
+    cmd_path=[
+        os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+        os.path.join(SHELL_SCRIPT_DIR, f"ensure-{CONTAINER_BACKEND}-is-installed.sh"),
+    ],
+    preexec_fn=None,
+    should_print_cmd_result=False,
+    should_show_cmd=False,
+    should_show_working_directory=False,
+)
+ensure_zrb_network_task = CmdTask(
+    name="ensure-zrb-network",
+    cmd=[
+        f"{CONTAINER_BACKEND} network inspect zrb >/dev/null 2>&1 || \\",
+        f"{CONTAINER_BACKEND} network create -d bridge zrb",
+    ],
+    upstreams=[ensure_container_backend],
+    should_print_cmd_result=False,
+    should_show_cmd=False,
+    should_show_working_directory=False,
+)
 
 
 @typechecked
@@ -120,14 +121,13 @@ class DockerComposeTask(CmdTask):
         should_show_cmd: bool = True,
         should_show_working_directory: bool = True,
     ):
-        combined_env_files = list(env_files)
         CmdTask.__init__(
             self,
             name=name,
             group=group,
             inputs=inputs,
             envs=envs,
-            env_files=combined_env_files,
+            env_files=env_files,
             icon=icon,
             color=color,
             description=description,

zrb/task/flow_task.py

@@ -85,7 +85,6 @@ class FlowTask(BaseTask):
             retry_interval=retry_interval,
             should_execute=should_execute,
             return_upstream_result=return_upstream_result,
-            run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
         )
 
     def copy(self) -> TFlowTask: