zrb 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

zrb/builtin/generator/project/template/project.sh

@@ -4,20 +4,25 @@ PROJECT_DIR=$(pwd)
 echo "🤖 Set project directory to ${PROJECT_DIR}"
 
 
+_IS_EMPTY_VENV=0
 if [ -z "$PROJECT_USE_VENV" ] || [ "$PROJECT_USE_VENV" = 1 ]
 then
     if [ ! -d .venv ]
     then
         echo '🤖 Create virtual environment'
         python -m venv "${PROJECT_DIR}/.venv"
-        echo '🤖 Activate virtual environment'
-        source "${PROJECT_DIR}/.venv/bin/activate"
+        _IS_EMPTY_VENV=1
     fi
-
     echo '🤖 Activate virtual environment'
     source "${PROJECT_DIR}/.venv/bin/activate"
 fi
 
+install_requirements() {
+    echo '🤖 Install requirements'
+    pip install --upgrade pip
+    pip install -r "${PROJECT_DIR}/requirements.txt"
+}
+
 reload() {
 
     if [ ! -f "${PROJECT_DIR}/.env" ]
@@ -31,14 +36,18 @@ reload() {
 
     if [ -z "$PROJECT_AUTO_INSTALL_PIP" ] || [ "$PROJECT_AUTO_INSTALL_PIP" = 1 ]
     then
-        echo '🤖 Checking .venv and requirements.txt timestamp'
-        _VENV_TIMESTAMP=$(find .venv -type d -exec stat -c %Y {} \; | sort -n | tail -n 1)
-        _REQUIREMENTS_TIMESTAMP=$(stat -c %Y requirements.txt)
-        if [ "$_VENV_TIMESTAMP" -lt "$_REQUIREMENTS_TIMESTAMP" ] 
+        if [ "$_IS_EMPTY_VENV" = 1 ]
         then
-            echo '🤖 Install requirements'
-            pip install --upgrade pip
-            pip install -r "${PROJECT_DIR}/requirements.txt"
+            install_requirements
+            _IS_EMPTY_VENV=0
+        else
+            echo '🤖 Checking .venv and requirements.txt timestamp'
+            _VENV_TIMESTAMP=$(find .venv -type d -exec stat -c %Y {} \; | sort -n | tail -n 1)
+            _REQUIREMENTS_TIMESTAMP=$(stat -c %Y requirements.txt)
+            if [ "$_VENV_TIMESTAMP" -lt "$_REQUIREMENTS_TIMESTAMP" ] 
+            then
+                install_requirements
+            fi
         fi
     fi
 

zrb/builtin/generator/project_task/task_factory.py

@@ -1,54 +1,53 @@
-from zrb.helper.typing import Any, List, Optional
-from zrb.helper.typecheck import typechecked
-from zrb.builtin.generator.common.task_input import project_dir_input
+import os
+
 from zrb.builtin.generator.common.task_factory import create_add_upstream
-from zrb.task.decorator import python_task
-from zrb.task.any_task import AnyTask
-from zrb.task.task import Task
-from zrb.task_input.any_input import AnyInput
-from zrb.helper.codemod.add_import_module import add_import_module
+from zrb.builtin.generator.common.task_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
-import os
+from zrb.helper.typecheck import typechecked
+from zrb.helper.typing import Any, List, Optional
+from zrb.task.any_task import AnyTask
+from zrb.task.decorator import python_task
+from zrb.task.task import Task
+from zrb.task_input.any_input import AnyInput
 
 CURRENT_DIR = os.path.dirname(__file__)
 
 
 @typechecked
-def create_ensure_project_tasks(
-    upstreams: Optional[List[AnyTask]] = None
-) -> Task:
-    '''
+def create_ensure_project_tasks(upstreams: Optional[List[AnyTask]] = None) -> Task:
+    """
     Create a task to ensure there are project tasks under `_automate/_project`
-    '''
+    """
+
     @python_task(
-        name='ensure-project-tasks',
+        name="ensure-project-tasks",
         inputs=[project_dir_input],
-        upstreams=[] if upstreams is None else upstreams
+        upstreams=[] if upstreams is None else upstreams,
     )
     async def _task(*args: Any, **kwargs: Any):
-        task: Task = kwargs.get('_task')
-        project_dir = kwargs.get('project_dir', '.')
-        task.print_out('Create project tasks if not exist')
-        if os.path.exists(os.path.join(project_dir, '_automate', '_project')):
+        task: Task = kwargs.get("_task")
+        project_dir = kwargs.get("project_dir", ".")
+        task.print_out("Create project tasks if not exist")
+        if os.path.exists(os.path.join(project_dir, "_automate", "_project")):
             return
         await copy_tree(
-            src=os.path.join(CURRENT_DIR, 'template'),
+            src=os.path.join(CURRENT_DIR, "template"),
             dst=project_dir,
-            excludes=['*/__pycache__'],
+            excludes=["*/__pycache__"],
         )
-        project_task_module_path = '_automate._project'
-        zrb_init_path = os.path.join(project_dir, 'zrb_init.py')
+        project_task_module_path = "_automate._project"
+        zrb_init_path = os.path.join(project_dir, "zrb_init.py")
         code = await read_text_file_async(zrb_init_path)
-        import_alias = project_task_module_path.split('.')[-1]
+        import_alias = project_task_module_path.split(".")[-1]
         code = add_import_module(
-            code=code,
-            module_path=project_task_module_path,
-            alias=import_alias
+            code=code, module_path=project_task_module_path, alias=import_alias
         )
         code = add_assert_resource(code, import_alias)
         await write_text_file_async(zrb_init_path, code)
+
     return _task
 
 
@@ -57,15 +56,15 @@ def create_add_build_images_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('build_project_images.py'),
-        task_name='build-images',
+        task_file_name=_get_project_task_file("build_project_images.py"),
+        task_name="build-images",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -74,15 +73,15 @@ def create_add_deploy_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('deploy_project.py'),
-        task_name='deploy',
+        task_file_name=_get_project_task_file("deploy_project.py"),
+        task_name="deploy",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -91,15 +90,15 @@ def create_add_destroy_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('destroy_project.py'),
-        task_name='destroy',
+        task_file_name=_get_project_task_file("destroy_project.py"),
+        task_name="destroy",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -108,15 +107,15 @@ def create_add_push_images_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('push_project_images.py'),
-        task_name='push-images',
+        task_file_name=_get_project_task_file("push_project_images.py"),
+        task_name="push-images",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -125,15 +124,15 @@ def create_add_remove_containers_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('remove_project_containers.py'),
-        task_name='remove-containers',
+        task_file_name=_get_project_task_file("remove_project_containers.py"),
+        task_name="remove-containers",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -142,15 +141,15 @@ def create_add_start_containers_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('start_project_containers.py'),
-        task_name='start-containers',
+        task_file_name=_get_project_task_file("start_project_containers.py"),
+        task_name="start-containers",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -159,15 +158,15 @@ def create_add_start_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('start_project.py'),
-        task_name='start',
+        task_file_name=_get_project_task_file("start_project.py"),
+        task_name="start",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
@@ -176,18 +175,18 @@ def create_add_stop_containers_upstream(
     upstream_module: str,
     upstream_task_var: str,
     inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None
+    upstreams: Optional[List[AnyTask]] = None,
 ) -> Task:
     return create_add_upstream(
-        task_file_name=_get_project_task_file('stop_project_containers.py'),
-        task_name='stop-containers',
+        task_file_name=_get_project_task_file("stop_project_containers.py"),
+        task_name="stop-containers",
         upstream_module=upstream_module,
         upstream_task_var=upstream_task_var,
         inputs=inputs,
-        upstreams=upstreams
+        upstreams=upstreams,
     )
 
 
 @typechecked
 def _get_project_task_file(task_file_name: str) -> str:
-    return os.path.join('_automate', '_project', task_file_name)
+    return os.path.join("_automate", "_project", task_file_name)

zrb/builtin/generator/project_task/template/_automate/_project/__init__.py

@@ -1,10 +1,10 @@
 from .build_project_images import build_project_images
 from .deploy_project import deploy_project
+from .destroy_project import destroy_project
 from .push_project_images import push_project_images
 from .remove_project_containers import remove_project_containers
-from .destroy_project import destroy_project
-from .start_project_containers import start_project_containers
 from .start_project import start_project
+from .start_project_containers import start_project_containers
 from .stop_project_containers import stop_project_containers
 
 assert build_project_images

zrb/builtin/generator/project_task/template/_automate/_project/build_project_images.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 build_project_images = Task(
-    name='build-images',
+    name="build-images",
     group=project_group,
     upstreams=[],
-    description='Build project images',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Build project images",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(build_project_images)

zrb/builtin/generator/project_task/template/_automate/_project/deploy_project.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 deploy_project = Task(
-    name='deploy',
+    name="deploy",
     group=project_group,
     upstreams=[],
-    description='Deploy project',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Deploy project",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(deploy_project)

zrb/builtin/generator/project_task/template/_automate/_project/destroy_project.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 destroy_project = Task(
-    name='destroy',
+    name="destroy",
     group=project_group,
     upstreams=[],
-    description='Remove project deployment',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Remove project deployment",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(destroy_project)

zrb/builtin/generator/project_task/template/_automate/_project/push_project_images.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 push_project_images = Task(
-    name='push-images',
+    name="push-images",
     group=project_group,
     upstreams=[],
-    description='Build project images',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Build project images",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(push_project_images)

zrb/builtin/generator/project_task/template/_automate/_project/remove_project_containers.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 remove_project_containers = Task(
-    name='remove-containers',
+    name="remove-containers",
     group=project_group,
     upstreams=[],
-    description='Remove project containers',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Remove project containers",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(remove_project_containers)

zrb/builtin/generator/project_task/template/_automate/_project/start_project.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 start_project = Task(
-    name='start',
+    name="start",
     group=project_group,
     upstreams=[],
-    description='Start project',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Start project",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(start_project)

zrb/builtin/generator/project_task/template/_automate/_project/start_project_containers.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 start_project_containers = Task(
-    name='start-containers',
+    name="start-containers",
     group=project_group,
     upstreams=[],
-    description='Start as containers',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Start as containers",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(start_project_containers)

zrb/builtin/generator/project_task/template/_automate/_project/stop_project_containers.py

@@ -1,11 +1,11 @@
-from zrb.builtin.group import project_group
 from zrb import Task, runner
+from zrb.builtin.group import project_group
 
 stop_project_containers = Task(
-    name='stop-containers',
+    name="stop-containers",
     group=project_group,
     upstreams=[],
-    description='Stop project containers',
-    run=lambda *args, **kwargs: kwargs.get('_task').print_out('🆗')
+    description="Stop project containers",
+    run=lambda *args, **kwargs: kwargs.get("_task").print_out("🆗"),
 )
 runner.register(stop_project_containers)

zrb/builtin/generator/python_task/add.py

@@ -1,16 +1,17 @@
-from zrb.helper.typing import Any
-from zrb.builtin.generator.common.task_input import project_dir_input, task_name_input
+import os
+
 from zrb.builtin.generator.common.helper import (
-    validate_existing_project_dir, validate_inexisting_automation
+    validate_existing_project_dir,
+    validate_inexisting_automation,
 )
 from zrb.builtin.generator.common.task_factory import create_register_module
+from zrb.builtin.generator.common.task_input import project_dir_input, task_name_input
+from zrb.builtin.group import project_add_group
+from zrb.helper.typing import Any
+from zrb.runner import runner
 from zrb.task.decorator import python_task
-from zrb.task.task import Task
 from zrb.task.resource_maker import ResourceMaker
-from zrb.runner import runner
-from zrb.builtin.group import project_add_group
-
-import os
+from zrb.task.task import Task
 
 CURRENT_DIR = os.path.dirname(__file__)
 
@@ -19,50 +20,41 @@ CURRENT_DIR = os.path.dirname(__file__)
 ###############################################################################
 
 
-@python_task(
-    name='validate',
-    inputs=[
-        project_dir_input,
-        task_name_input
-    ]
-)
+@python_task(name="validate", inputs=[project_dir_input, task_name_input])
 async def validate(*args: Any, **kwargs: Any):
-    project_dir = kwargs.get('project_dir')
+    project_dir = kwargs.get("project_dir")
     validate_existing_project_dir(project_dir)
-    task_name = kwargs.get('task_name')
+    task_name = kwargs.get("task_name")
     validate_inexisting_automation(project_dir, task_name)
 
 
 copy_resource = ResourceMaker(
-    name='copy-resource',
-    inputs=[
-        project_dir_input,
-        task_name_input
-    ],
+    name="copy-resource",
+    inputs=[project_dir_input, task_name_input],
     upstreams=[validate],
     replacements={
-        'zrbTaskName': '{{input.task_name}}',
+        "zrbTaskName": "{{input.task_name}}",
     },
-    template_path=os.path.join(CURRENT_DIR, 'template'),
-    destination_path='{{ input.project_dir }}',
+    template_path=os.path.join(CURRENT_DIR, "template"),
+    destination_path="{{ input.project_dir }}",
     excludes=[
-        '*/__pycache__',
-    ]
+        "*/__pycache__",
+    ],
 )
 
 register_module = create_register_module(
-    module_path='_automate.{{util.to_snake_case(input.task_name)}}',
+    module_path="_automate.{{util.to_snake_case(input.task_name)}}",
     inputs=[task_name_input],
-    upstreams=[copy_resource]
+    upstreams=[copy_resource],
 )
 
 
 @python_task(
-    name='python-task',
+    name="python-task",
     group=project_add_group,
     upstreams=[register_module],
-    runner=runner
+    runner=runner,
 )
 async def add_python_task(*args: Any, **kwargs: Any):
-    task: Task = kwargs.get('_task')
-    task.print_out('Success')
+    task: Task = kwargs.get("_task")
+    task.print_out("Success")

zrb/builtin/generator/python_task/template/_automate/snake_zrb_task_name.py

@@ -1,4 +1,5 @@
 from typing import Any, Mapping
+
 from zrb import Task, python_task, runner
 from zrb.builtin.group import project_group
 
@@ -8,15 +9,15 @@ from zrb.builtin.group import project_group
 
 
 @python_task(
-    name='kebab-zrb-task-name',
-    description='human readable zrb task name',
+    name="kebab-zrb-task-name",
+    description="human readable zrb task name",
     group=project_group,
-    runner=runner
+    runner=runner,
 )
 async def snake_zrb_task_name(*args: Any, **kwargs: Any) -> Any:
-    task: Task = kwargs.get('_task')
+    task: Task = kwargs.get("_task")
     env_map: Mapping[str, str] = task.get_env_map()
     input_map: Mapping[str, str] = task.get_input_map()
-    task.print_out(f'Env map: {env_map}')
-    task.print_out(f'Input map: {input_map}')
-    return 'ok'
+    task.print_out(f"Env map: {env_map}")
+    task.print_out(f"Input map: {input_map}")
+    return "ok"