zrb 0.0.85__py3-none-any.whl → 0.0.87__py3-none-any.whl

zrb/builtin/generator/simple_python_app/add.py

@@ -1,22 +1,30 @@
 from typing import Any
-from ..._group import project_add_group
-from ....task.task import Task
-from ....task.decorator import python_task
-from ....task.resource_maker import ResourceMaker
-from ....runner import runner
-from .._common.input import (
+from ..common.helper import (
+    validate_existing_project_dir, validate_inexisting_automation
+)
+from ..common.task_input import (
     project_dir_input, app_name_input, app_image_name_input, http_port_input,
     env_prefix_input
 )
-from .._common.helper import validate_project_dir, create_register_app_module
+from ..common.task_factory import create_register_module
 from ..project_task.task_factory import (
-    create_add_project_automation_task, create_register_app_task
+    create_ensure_project_tasks, create_add_build_images_upstream,
+    create_add_deploy_upstream, create_add_destroy_upstream,
+    create_add_push_images_upstream, create_add_remove_containers_upstream,
+    create_add_start_containers_upstream, create_add_start_upstream,
+    create_add_stop_containers_upstream
 )
-from ....helper import util
+from ...group import project_add_group
+from ....task.task import Task
+from ....task.decorator import python_task
+from ....task.resource_maker import ResourceMaker
+from ....runner import runner
+from ....helper.util import to_kebab_case
 
 import os
 
-current_dir = os.path.dirname(__file__)
+CURRENT_DIR = os.path.dirname(__file__)
+SNAKE_APP_NAME_TPL = '{{util.to_snake_case(input.app_name)}}'
 
 ###############################################################################
 # Task Definitions
@@ -29,18 +37,10 @@ current_dir = os.path.dirname(__file__)
 )
 async def validate(*args: Any, **kwargs: Any):
     project_dir = kwargs.get('project_dir')
-    validate_project_dir(project_dir)
+    validate_existing_project_dir(project_dir)
     app_name = kwargs.get('app_name')
-    automation_dir = os.path.join(
-        project_dir, '_automate', util.to_snake_case(app_name)
-    )
-    if os.path.exists(automation_dir):
-        raise Exception(
-            f'Automation directory already exists: {automation_dir}'
-        )
-    source_dir = os.path.join(
-        project_dir, 'src', f'{util.to_kebab_case(app_name)}'
-    )
+    validate_inexisting_automation(project_dir, app_name)
+    source_dir = os.path.join(project_dir, 'src', f'{to_kebab_case(app_name)}')
     if os.path.exists(source_dir):
         raise Exception(f'Source already exists: {source_dir}')
 
@@ -61,7 +61,7 @@ copy_resource = ResourceMaker(
         'ZRB_ENV_PREFIX': '{{util.coalesce(input.env_prefix, "MY").upper()}}',
         'zrb-app-image-name': '{{input.app_image_name}}'
     },
-    template_path=os.path.join(current_dir, 'template'),
+    template_path=os.path.join(CURRENT_DIR, 'template'),
     destination_path='{{ input.project_dir }}',
     excludes=[
         '*/deployment/venv',
@@ -69,96 +69,92 @@ copy_resource = ResourceMaker(
     ]
 )
 
-register_local_app_module = create_register_app_module(
-    module='local', upstreams=[copy_resource]
+register_local_module = create_register_module(
+    module_path=f'_automate.{SNAKE_APP_NAME_TPL}.local',
+    alias=f'{SNAKE_APP_NAME_TPL}_local',
+    inputs=[app_name_input],
+    upstreams=[copy_resource]
 )
 
-register_container_app_module = create_register_app_module(
-    module='container', upstreams=[register_local_app_module]
+register_container_module = create_register_module(
+    module_path=f'_automate.{SNAKE_APP_NAME_TPL}.container',
+    alias=f'{SNAKE_APP_NAME_TPL}_container',
+    inputs=[app_name_input],
+    upstreams=[register_local_module]
 )
 
-register_image_app_module = create_register_app_module(
-    module='image', upstreams=[register_container_app_module]
+register_image_module = create_register_module(
+    module_path=f'_automate.{SNAKE_APP_NAME_TPL}.image',
+    alias=f'{SNAKE_APP_NAME_TPL}_image',
+    inputs=[app_name_input],
+    upstreams=[register_container_module]
 )
 
-register_deployment_app_module = create_register_app_module(
-    module='deployment', upstreams=[register_image_app_module]
+register_deployment_module = create_register_module(
+    module_path=f'_automate.{SNAKE_APP_NAME_TPL}.deployment',
+    alias=f'{SNAKE_APP_NAME_TPL}_deployment',
+    inputs=[app_name_input],
+    upstreams=[register_image_module]
 )
 
-add_project_task = create_add_project_automation_task(
+ensure_project_tasks = create_ensure_project_tasks(
     upstreams=[copy_resource]
 )
 
-register_start = create_register_app_task(
-    task_name='register-start',
-    project_automation_file_name='start_project.py',
-    project_automation_task_name='start',
-    app_automation_file_name='local.py',
-    app_automation_task_var_name_tpl='start_{snake_app_name}',
-    upstreams=[add_project_task]
+add_start_upstream = create_add_start_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.local',
+    upstream_task_var=f'start_{SNAKE_APP_NAME_TPL}',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_start_container = create_register_app_task(
-    task_name='register-start-container',
-    project_automation_file_name='start_project_containers.py',
-    project_automation_task_name='start-containers',
-    app_automation_file_name='container.py',
-    app_automation_task_var_name_tpl='start_{snake_app_name}_container',
-    upstreams=[add_project_task]
+add_start_container_upstream = create_add_start_containers_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.container',
+    upstream_task_var=f'start_{SNAKE_APP_NAME_TPL}_container',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_stop_container = create_register_app_task(
-    task_name='register-stop-container',
-    project_automation_file_name='stop_project_containers.py',
-    project_automation_task_name='stop-containers',
-    app_automation_file_name='container.py',
-    app_automation_task_var_name_tpl='stop_{snake_app_name}_container',
-    upstreams=[add_project_task]
+add_stop_container_upstream = create_add_stop_containers_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.container',
+    upstream_task_var=f'stop_{SNAKE_APP_NAME_TPL}_container',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_remove_container = create_register_app_task(
-    task_name='register-remove-container',
-    project_automation_file_name='remove_project_containers.py',
-    project_automation_task_name='remove-containers',
-    app_automation_file_name='container.py',
-    app_automation_task_var_name_tpl='remove_{snake_app_name}_container',
-    upstreams=[add_project_task]
+add_remove_container_upstream = create_add_remove_containers_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.container',
+    upstream_task_var=f'remove_{SNAKE_APP_NAME_TPL}_container',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_push_image = create_register_app_task(
-    task_name='register-push-image',
-    project_automation_file_name='push_project_images.py',
-    project_automation_task_name='push-images',
-    app_automation_file_name='image.py',
-    app_automation_task_var_name_tpl='push_{snake_app_name}_image',
-    upstreams=[add_project_task]
+add_build_image_upstream = create_add_build_images_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.image',
+    upstream_task_var=f'build_{SNAKE_APP_NAME_TPL}_image',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_build_image = create_register_app_task(
-    task_name='register-build-image',
-    project_automation_file_name='build_project_images.py',
-    project_automation_task_name='build-images',
-    app_automation_file_name='image.py',
-    app_automation_task_var_name_tpl='build_{snake_app_name}_image',
-    upstreams=[add_project_task]
+add_push_image_upstream = create_add_push_images_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.image',
+    upstream_task_var=f'push_{SNAKE_APP_NAME_TPL}_image',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_deploy = create_register_app_task(
-    task_name='register-deploy',
-    project_automation_file_name='deploy_project.py',
-    project_automation_task_name='deploy',
-    app_automation_file_name='deployment.py',
-    app_automation_task_var_name_tpl='deploy_{snake_app_name}',
-    upstreams=[add_project_task]
+add_deploy_upstream = create_add_deploy_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.deployment',
+    upstream_task_var=f'deploy_{SNAKE_APP_NAME_TPL}',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
-register_destroy = create_register_app_task(
-    task_name='register-destroy',
-    project_automation_file_name='destroy_project.py',
-    project_automation_task_name='destroy',
-    app_automation_file_name='deployment.py',
-    app_automation_task_var_name_tpl='destroy_{snake_app_name}',
-    upstreams=[add_project_task]
+add_destroy_upstream = create_add_destroy_upstream(
+    upstream_module=f'_automate.{SNAKE_APP_NAME_TPL}.deployment',
+    upstream_task_var=f'destroy_{SNAKE_APP_NAME_TPL}',
+    upstreams=[ensure_project_tasks],
+    inputs=[app_name_input]
 )
 
 
@@ -166,18 +162,18 @@ register_destroy = create_register_app_task(
     name='simple-python-app',
     group=project_add_group,
     upstreams=[
-        register_local_app_module,
-        register_container_app_module,
-        register_image_app_module,
-        register_deployment_app_module,
-        register_start,
-        register_start_container,
-        register_stop_container,
-        register_remove_container,
-        register_build_image,
-        register_push_image,
-        register_deploy,
-        register_destroy
+        register_local_module,
+        register_container_module,
+        register_image_module,
+        register_deployment_module,
+        add_start_upstream,
+        add_start_container_upstream,
+        add_stop_container_upstream,
+        add_remove_container_upstream,
+        add_build_image_upstream,
+        add_push_image_upstream,
+        add_deploy_upstream,
+        add_destroy_upstream
     ],
     runner=runner
 )

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/app-activate-venv.sh

@@ -0,0 +1,7 @@
+if [ ! -d .venv ]
+then
+  echo "Init virtual environment"
+  python -m venv .venv
+fi
+echo "Activate virtual environment"
+source .venv/bin/activate

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/app-start.sh

@@ -0,0 +1,6 @@
+PYTHONUNBUFFERED=1
+echo "Install packages"
+pip install -r requirements.txt
+
+echo "Start app"
+uvicorn main:app --host {{env.get("APP_HOST", "0.0.0.0")}} --port {{env.get("APP_PORT", "8080")}}

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/pulumi-destroy.sh

@@ -1,2 +1 @@
-(pulumi stack select {{input.snake_zrb_app_name_pulumi_stack}} || pulumi stack init {{input.snake_zrb_app_name_pulumi_stack}})
 pulumi destroy --skip-preview

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/pulumi-init-stack.sh

@@ -0,0 +1 @@
+(pulumi stack select {{input.snake_zrb_app_name_pulumi_stack}} || pulumi stack init {{input.snake_zrb_app_name_pulumi_stack}})

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/pulumi-up.sh

@@ -1,2 +1 @@
-(pulumi stack select {{input.snake_zrb_app_name_pulumi_stack}} || pulumi stack init {{input.snake_zrb_app_name_pulumi_stack}})
 pulumi up --skip-preview

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/container.py

@@ -1,7 +1,7 @@
 from zrb import (
     DockerComposeTask, Env, EnvFile, HTTPChecker, ServiceConfig, runner
 )
-from zrb.builtin._group import project_group
+from zrb.builtin.group import project_group
 from ._common import (
     RESOURCE_DIR, APP_DIR, local_input, host_input, https_input
 )

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/deployment.py

@@ -1,5 +1,5 @@
 from zrb import CmdTask, Env, EnvFile, IntInput, StrInput, ChoiceInput, runner
-from zrb.builtin._group import project_group
+from zrb.builtin.group import project_group
 from .image import push_snake_zrb_app_name_image, image_input, image_env
 from ._common import (
     CURRENT_DIR, DEPLOYMENT_DIR, TEMPLATE_ENV_FILE_NAME
@@ -77,7 +77,10 @@ deploy_snake_zrb_app_name = CmdTask(
         image_env,
         deployment_replica_env,
     ],
-    cmd_path=os.path.join(CURRENT_DIR, 'cmd', 'pulumi-up.sh'),
+    cmd_path=[
+        os.path.join(CURRENT_DIR, 'cmd', 'pulumi-init-stack.sh'),
+        os.path.join(CURRENT_DIR, 'cmd', 'pulumi-up.sh'),
+    ]
 )
 runner.register(deploy_snake_zrb_app_name)
 
@@ -97,6 +100,9 @@ destroy_snake_zrb_app_name = CmdTask(
         image_env,
         deployment_replica_env,
     ],
-    cmd_path=os.path.join(CURRENT_DIR, 'cmd', 'pulumi-destroy.sh'),
+    cmd_path=[
+        os.path.join(CURRENT_DIR, 'cmd', 'pulumi-init-stack.sh'),
+        os.path.join(CURRENT_DIR, 'cmd', 'pulumi-destroy.sh'),
+    ]
 )
 runner.register(destroy_snake_zrb_app_name)

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/image.py

@@ -1,5 +1,5 @@
 from zrb import DockerComposeTask, Env, StrInput, runner
-from zrb.builtin._group import project_group
+from zrb.builtin.group import project_group
 from ._common import (
     RESOURCE_DIR, local_input
 )

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/local.py

@@ -1,5 +1,5 @@
 from zrb import CmdTask, Env, EnvFile, HTTPChecker, runner
-from zrb.builtin._group import project_group
+from zrb.builtin.group import project_group
 from ._common import (
     CURRENT_DIR, APP_DIR, TEMPLATE_ENV_FILE_NAME,
     local_input, host_input, https_input
@@ -36,7 +36,10 @@ start_snake_zrb_app_name = CmdTask(
             default='zrbAppHttpPort'
         )
     ],
-    cmd_path=os.path.join(CURRENT_DIR, 'cmd', 'start.sh'),
+    cmd_path=[
+        os.path.join(CURRENT_DIR, 'cmd', 'app-activate-venv.sh'),
+        os.path.join(CURRENT_DIR, 'cmd', 'app-start.sh'),
+    ],
     checkers=[
         HTTPChecker(
             name='check-kebab-zrb-app-name',

zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/deployment/requirements.txt

@@ -1,3 +1,3 @@
 pulumi>=3.0.0,<4.0.0
-pulumi-kubernetes>=3.0.0,<4.0.0
-python-dotenv==0.21.1
+pulumi-kubernetes>=3.0.0,<4.2.0
+python-dotenv==1.0.0

zrb/builtin/git.py

@@ -1,5 +1,5 @@
 from typing import Any
-from ._group import git_group
+from .group import git_group
 from ..task.decorator import python_task
 from ..task.task import Task
 from ..task_input.str_input import StrInput

zrb/builtin/{_group.py → group.py}

@@ -15,11 +15,8 @@ ubuntu_group = Group(
 ubuntu_install_group = Group(
     name='install', description='Install things on ubuntu', parent=ubuntu_group
 )
-principle_group = Group(
-    name='principle', description='Principle related commands'
-)
-principle_show_group = Group(
-    name='show', description='Showing principles', parent=principle_group
+explain_group = Group(
+    name='explain', description='Explain things'
 )
 base64_group = Group(
     name='base64', description='Base64 operations'

zrb/builtin/md5.py

@@ -1,5 +1,5 @@
 from typing import Any
-from ._group import md5_group
+from .group import md5_group
 from ..task.decorator import python_task
 from ..task_input.str_input import StrInput
 from ..runner import runner

zrb/builtin/project.py

@@ -1,5 +1,5 @@
 from typing import Any, Mapping
-from ._group import project_group
+from .group import project_group
 from ..task.decorator import python_task
 from ..task_input.bool_input import BoolInput
 from ..runner import runner

zrb/builtin/ubuntu.py

@@ -1,4 +1,4 @@
-from ._group import ubuntu_group, ubuntu_install_group
+from .group import ubuntu_group, ubuntu_install_group
 from ..task.cmd_task import CmdTask
 from ..runner import runner
 

zrb/config/config.py

@@ -1,18 +1,20 @@
 from ..helper.string.conversion import to_boolean, to_logging_level
+from typeguard import typechecked
 import os
-import pkg_resources
+import importlib.metadata as metadata
 
 
-def get_version():
+@typechecked
+def get_version() -> str:
     try:
-        dist = pkg_resources.get_distribution("zrb")
-        return dist.version
-    except pkg_resources.DistributionNotFound:
+        return metadata.version("zrb")
+    except metadata.PackageNotFoundError:
         import flit
         meta = flit.read_module_metadata("zrb")
-        return meta["module"]["version"]
+        return str(meta["module"]["version"])
 
 
+@typechecked
 def get_current_shell() -> str:
     current_shell = os.getenv('SHELL', '')
     if current_shell.endswith('zsh'):

zrb/helper/accessories/color.py

@@ -1,9 +1,11 @@
 from typing import Iterable, Optional
+from typeguard import typechecked
 from termcolor import colored as term_colored, COLORS
 import random
 
 
-def get_random_color():
+@typechecked
+def get_random_color() -> str:
     colors = [
         'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'light_green',
         'light_yellow', 'light_blue', 'light_magenta', 'light_cyan',
@@ -11,10 +13,12 @@ def get_random_color():
     return random.choice(colors)
 
 
+@typechecked
 def is_valid_color(color: str) -> bool:
     return color in COLORS
 
 
+@typechecked
 def colored(
     text: str,
     color: Optional[str] = None,

zrb/helper/accessories/icon.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import random
 
 
+@typechecked
 def get_random_icon() -> str:
     icons = [
         '🐶', '🐱', '🐭', '🐹', '🦊', '🐻', '🐨', '🐯', '🦁', '🐮', '🐷', '🍎', '🍐',

zrb/helper/accessories/name.py

@@ -1,7 +1,9 @@
+from typeguard import typechecked
 import random
 import string
 
 
+@typechecked
 def get_random_name(
     separator: str = '-',
     add_random_digit: bool = True,

zrb/helper/advertisement.py

@@ -18,6 +18,7 @@ class Advertisement():
         print(colored(self.content, attrs=['dark']), file=sys.stderr)
 
 
+@typechecked
 def get_advertisement(
     advertisements: Iterable[Advertisement]
 ) -> Optional[Advertisement]:

zrb/helper/cli.py

@@ -1,6 +1,7 @@
+from typeguard import typechecked
 from ..runner import runner
-from .loader.load_module import load_module
 from ..config.config import init_scripts, should_load_builtin
+from .loader.load_module import load_module
 from .log import logger
 from .accessories.color import colored
 
@@ -9,6 +10,7 @@ import os
 import sys
 
 
+@typechecked
 def create_cli() -> click.Group:
     cli = click.Group(name='zrb', help='Super framework for your super app.')
     # load from ZRB_INIT_SCRIPTS environment
@@ -31,6 +33,7 @@ def create_cli() -> click.Group:
     return cli
 
 
+@typechecked
 def _load_zrb_init(project_dir: str):
     project_script = os.path.join(project_dir, 'zrb_init.py')
     if not os.path.isfile(project_script):
@@ -43,6 +46,7 @@ def _load_zrb_init(project_dir: str):
     load_module(script_path=project_script)
 
 
+@typechecked
 def _get_new_python_path(project_dir: str) -> str:
     current_python_path = os.getenv('PYTHONPATH')
     if current_python_path is None or current_python_path == '':

zrb/helper/codemod/add_argument_to_function.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import libcst as cst
 
 
+@typechecked
 class AddArgumentTransformer(cst.CSTTransformer):
     def __init__(
         self, function_name: str, argument_name: str, argument_type: str
@@ -26,6 +28,7 @@ class AddArgumentTransformer(cst.CSTTransformer):
         return updated_node
 
 
+@typechecked
 def add_argument_to_function(
     code: str, function_name: str, argument_name: str, argument_type: str
 ) -> str:

zrb/helper/codemod/add_argument_to_function_call.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import libcst as cst
 
 
+@typechecked
 class AddArgumentTransformer(cst.CSTTransformer):
     def __init__(self, function_name: str, argument_name: str):
         self.function_name = function_name
@@ -21,6 +23,7 @@ class AddArgumentTransformer(cst.CSTTransformer):
         return updated_node
 
 
+@typechecked
 def add_argument_to_function_call(
     code: str, function_name: str, argument_name: str
 ) -> str:

zrb/helper/codemod/add_assert_resource.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import libcst as cst
 
 
+@typechecked
 def add_assert_resource(code: str, resource: str) -> str:
     """
     Adds an assertion statement to the end of a module that checks whether

zrb/helper/codemod/add_function_call.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import libcst as cst
 
 
+@typechecked
 def add_function_call(code: str, function_name: str, parameters: list) -> str:
     """
     Adds a function call statement to the end of a module with the specified

zrb/helper/codemod/add_import_module.py

@@ -1,7 +1,9 @@
+from typeguard import typechecked
 from typing import Optional, Union, Tuple
 import libcst as cst
 
 
+@typechecked
 def add_import_module(
     code: str,
     module_path: str,
@@ -87,6 +89,7 @@ def _get_new_import(
     )
 
 
+@typechecked
 def _split_module_path(module_path) -> Tuple[str, str]:
     prefix = ''
     suffix = ''

zrb/helper/codemod/add_key_value_to_dict.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import libcst as cst
 
 
+@typechecked
 class AddKeyValuePairTransformer(cst.CSTTransformer):
     def __init__(
         self, dict_name: str,

zrb/helper/codemod/add_property_to_class.py

@@ -1,7 +1,9 @@
+from typeguard import typechecked
 from typing import Optional
 import libcst as cst
 
 
+@typechecked
 class AddPropertyTransformer(cst.CSTTransformer):
     def __init__(
         self,
@@ -51,6 +53,7 @@ class AddPropertyTransformer(cst.CSTTransformer):
         return updated_node.with_changes(body=new_body)
 
 
+@typechecked
 def add_property_to_class(
     code: str,
     class_name: str,

zrb/helper/codemod/add_upstream_to_task.py

@@ -1,6 +1,8 @@
+from typeguard import typechecked
 import libcst as cst
 
 
+@typechecked
 class TaskTransformer(cst.CSTTransformer):
     def __init__(self, task_name: str, upstream_task_name: str):
         super().__init__()
@@ -74,6 +76,7 @@ class TaskTransformer(cst.CSTTransformer):
         )
 
 
+@typechecked
 def add_upstream_to_task(
     code: str, task_name: str, upstream_task_name: str
 ) -> str: