zrb 0.6.2__py3-none-any.whl → 0.7.0__py3-none-any.whl

zrb/builtin/generator/common/task_input.py

@@ -22,6 +22,27 @@ project_name_input = StrInput(
     default="",
 )
 
+project_author_name_input = StrInput(
+    name="project-author-name",
+    prompt="Project author name",
+    description="Project author name",
+    default=SYSTEM_USER,
+)
+
+project_author_email_input = StrInput(
+    name="project-author-email",
+    prompt="Project author email",
+    description="Project author email",
+    default=f"{SYSTEM_USER}@gmail.com",
+)
+
+project_description_input = StrInput(
+    name="project-description",
+    description="Project description",
+    prompt="Project description",
+    default="Just another Zrb project",
+)
+
 app_name_input = StrInput(
     name="app-name",
     shortcut="a",
@@ -30,6 +51,27 @@ app_name_input = StrInput(
     default="app",
 )
 
+app_author_name_input = StrInput(
+    name="app-author-name",
+    prompt="App author name",
+    description="App author name",
+    default=SYSTEM_USER,
+)
+
+app_author_email_input = StrInput(
+    name="app-author-email",
+    prompt="App author email",
+    description="App author email",
+    default=f"{SYSTEM_USER}@gmail.com",
+)
+
+app_description_input = StrInput(
+    name="app-description",
+    description="App description",
+    prompt="App description",
+    default="Just another app",
+)
+
 app_image_default_namespace = os.getenv(
     "PROJECT_IMAGE_DEFAULT_NAMESPACE", "docker.io/" + SYSTEM_USER
 )
@@ -124,25 +166,46 @@ package_description_input = StrInput(
     name="package-description",
     description="Package description",
     prompt="Package description",
-    default="My super package",
+    default="Just another package",
 )
 
 package_homepage_input = StrInput(
     name="package-homepage",
     description="Package homepage",
     prompt="Package homepage",
-    default="https://github.com/"
-    + SYSTEM_USER
-    + "/{{util.to_kebab_case(input.package_name)}}",  # noqa
-)
-
-package_bug_tracker_input = StrInput(
-    name="package-bug-tracker",
-    description="Package bug tracker",
-    prompt="Package bug tracker",
-    default="https://github.com/"
-    + SYSTEM_USER
-    + "/{{util.to_kebab_case(input.package_name)}}/issues",  # noqa
+    default="".join(
+        [
+            "https://github.com/",
+            SYSTEM_USER,
+            "/{{util.to_kebab_case(input.package_name)}}",
+        ]
+    ),
+)
+
+package_repository_input = StrInput(
+    name="package-repository",
+    description="Package repository",
+    prompt="Package homepage",
+    default="".join(
+        [
+            "https://github.com/",
+            SYSTEM_USER,
+            "/{{util.to_kebab_case(input.package_name)}}",
+        ]
+    ),
+)
+
+package_documentation_input = StrInput(
+    name="package-documentation",
+    description="Package documentation",
+    prompt="Package homepage",
+    default="".join(
+        [
+            "https://github.com/",
+            SYSTEM_USER,
+            "/{{util.to_kebab_case(input.package_name)}}",
+        ]
+    ),
 )
 
 package_author_name_input = StrInput(

zrb/builtin/generator/docker_compose_task/template/src/kebab-zrb-task-name/image/Dockerfile

@@ -2,6 +2,8 @@ FROM python:3.10-slim
 ENV APP_MESSAGE "Hello, world!"
 ENV APP_PORT 8080
 WORKDIR /home
+COPY ./pyproject.toml ./pyproject.toml
+RUN pip install "poetry==1.7.1"
+RUN poetry install --only main --no-root
 COPY . .
-RUN pip install -r requirements.txt
-CMD uvicorn main:app --host "0.0.0.0" --port "$APP_PORT"
+CMD poetry run uvicorn main:app --host "0.0.0.0" --port "$APP_PORT"

zrb/builtin/generator/docker_compose_task/template/src/kebab-zrb-task-name/image/pyproject.toml

@@ -0,0 +1,25 @@
+[tool.poetry]
+name = "kebab-zrb-task-name"
+version = "0.0.1"
+description = "A docker compose task"
+authors = ["zrb"]
+packages = [
+  {include = "kebab-zrb-task-name", from = "../.."},
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+uvicorn = "==0.20.0"
+
+[tool.poetry.dev-dependencies]
+flake8 = "~6.0.0"
+black = "~23.12.1"
+isort = "~5.13.2"
+pytest = "~7.4.0"
+pytest-cov = "~4.1.0"
+pytest-asyncio = "~0.21.0"
+flameprof = "~0.4"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

zrb/builtin/generator/fastapp/add.py

@@ -6,6 +6,9 @@ from zrb.builtin.generator.common.helper import (
 )
 from zrb.builtin.generator.common.task_factory import create_register_module
 from zrb.builtin.generator.common.task_input import (
+    app_author_email_input,
+    app_author_name_input,
+    app_description_input,
     app_image_name_input,
     app_name_input,
     env_prefix_input,
@@ -58,6 +61,9 @@ copy_resource = ResourceMaker(
     inputs=[
         project_dir_input,
         app_name_input,
+        app_description_input,
+        app_author_name_input,
+        app_author_email_input,
         app_image_name_input,
         http_port_input,
         env_prefix_input,
@@ -65,6 +71,9 @@ copy_resource = ResourceMaker(
     upstreams=[validate],
     replacements={
         "zrbAppName": "{{input.app_name}}",
+        "zrbAppDescription": "{{input.app_description}}",
+        "zrbAppAuthorName": "{{input.app_author_name}}",
+        "zrbAppAuthorEmail": "{{input.app_author_email}}",
         "zrbAppHttpPort": '{{util.coalesce(input.http_port, "3001")}}',
         "ZRB_ENV_PREFIX": '{{util.coalesce(input.env_prefix, "MY").upper()}}',
         "zrb-app-image-name": "{{input.app_image_name}}",

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

@@ -2,6 +2,11 @@ if [ ! -d .venv ]
 then
   echo "Init virtual environment"
   python -m venv .venv
+  source .venv/bin/activate
+  echo "Upgrade Pip"
+  pip install -U pip
+  echo "Install Poetry"
+  pip install "poetry==1.7.1"
 fi
 echo "Activate virtual environment"
 source .venv/bin/activate

zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/cmd/app-prepare-backend.sh

@@ -1,2 +1,2 @@
 echo "Install packages"
-pip install -r requirements.txt
+poetry install --no-root

zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/cmd/app-prepare-load-test.sh

@@ -1,3 +1,2 @@
 echo "Install packages"
-pip install -r requirements.txt
-
+poetry install --no-root

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/loadtest/pyproject.toml

@@ -0,0 +1,21 @@
+[tool.poetry]
+name = "kebab-zrb-app-name-loadtest"
+version = "0.0.1"
+description = "Load test for zrbPackageName"
+authors = ["zrbAppAuthorName <zrbAppAuthorEmail>"]
+packages = [
+  {include = "kebab-zrb-app-name-loadtest", from = "../.."},
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+locust = "==2.16.1"
+
+[tool.poetry.dev-dependencies]
+flake8 = "~6.0.0"
+black = "~23.12.1"
+isort = "~5.13.2"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/Dockerfile

@@ -9,9 +9,11 @@ FROM python:3.10-slim
 ENV APP_HOST 0.0.0.0
 ENV APP_PORT 8080
 WORKDIR /home
-COPY requirements.txt .
 RUN apt update && apt install curl psmisc -y
-RUN pip install -r requirements.txt
+RUN pip install -U pip
+RUN pip install "poetry==1.7.1"
+COPY ./pyproject.toml ./pyproject.toml
+RUN poetry install --only main --no-root
 COPY . .
 COPY --from=frontend-builder /frontend/build /home/frontend/build
 CMD ./start.sh

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/pyproject.toml

@@ -0,0 +1,44 @@
+[tool.poetry]
+name = "kebab-zrb-app-name"
+version = "0.0.1"
+description = "zrbAppDescription"
+authors = ["zrbAppAuthorName <zrbAppAuthorEmail>"]
+packages = [
+  {include = "kebab-zrb-app-name", from = "../.."},
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+SQLAlchemy= "==2.0.25"
+aiormq= "==6.8.0"
+aiokafka= "==0.10.0"
+alembic= "==1.13.1"
+bcrypt= "==4.1.2"
+fastapi= "==0.109.0"
+jsons= "==1.6.3"
+pydantic= "==2.5.3"
+psycopg2-binary= "==2.9.9"
+python-jose= "==3.3.0"
+uvicorn= "==0.27.0"
+watchfiles= "==0.21.0"
+python-multipart= "==0.0.6"
+python-ulid= "==2.2.0"
+opentelemetry-distro= "==0.40b0"
+opentelemetry-exporter-otlp= "==1.19.0"
+opentelemetry-instrumentation-fastapi= "==0.40b0"
+
+
+[tool.poetry.dev-dependencies]
+flake8 = "~6.0.0"
+black = "~23.12.1"
+isort = "~5.13.2"
+pytest = "~7.4.0"
+pytest-cov = "~4.1.0"
+pytest-asyncio = "~0.21.0"
+httpx = "~0.24.1"
+asgi-lifespan = "~2.1.0"
+flameprof = "~0.4"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/start.sh

@@ -44,7 +44,7 @@ then
     echo "Start uvicorn with instrumentation, service name: ${APP_NAME}"
     OTEL_RESOURCE_ATTRIBUTES="service.name=${APP_NAME}" \
         OTEL_EXPORTER_OTLP_ENDPOINT="$APP_OTEL_EXPORTER_OTLP_ENDPOINT" \
-        opentelemetry-instrument uvicorn main:app --host "$APP_HOST" --port "$APP_PORT"
+        poetry run opentelemetry-instrument uvicorn main:app --host "$APP_HOST" --port "$APP_PORT"
 else
     # reload should only performed if otel is disabled
     _RELOAD=""
@@ -54,5 +54,5 @@ else
     fi
     # Run uvicorn
     echo "Start uvicorn"
-    uvicorn main:app --host "$APP_HOST" --port "$APP_PORT" $_RELOAD
+    poetry run uvicorn main:app --host "$APP_HOST" --port "$APP_PORT" $_RELOAD
 fi

zrb/builtin/generator/pip_package/add.py

@@ -8,10 +8,11 @@ from zrb.builtin.generator.common.task_factory import create_register_module
 from zrb.builtin.generator.common.task_input import (
     package_author_email_input,
     package_author_name_input,
-    package_bug_tracker_input,
     package_description_input,
+    package_documentation_input,
     package_homepage_input,
     package_name_input,
+    package_repository_input,
     project_dir_input,
 )
 from zrb.builtin.group import project_add_group
@@ -44,7 +45,8 @@ copy_resource = ResourceMaker(
         package_name_input,
         package_description_input,
         package_homepage_input,
-        package_bug_tracker_input,
+        package_repository_input,
+        package_documentation_input,
         package_author_name_input,
         package_author_email_input,
     ],
@@ -53,7 +55,8 @@ copy_resource = ResourceMaker(
         "zrbPackageName": "{{input.package_name}}",
         "zrbPackageDescription": "{{input.package_description}}",
         "zrbPackageHomepage": "{{input.package_homepage}}",
-        "zrbPackageBugTracker": "{{input.package_bug_tracker}}",
+        "zrbPackageRepository": "{{input.package_repository}}",
+        "zrbPackageDocumentation": "{{input.package_documentation}}",
         "zrbPackageAuthorName": "{{input.package_author_name}}",
         "zrbPackageAuthorEmail": "{{input.package_author_email}}",
     },
@@ -81,7 +84,8 @@ register_module = create_register_module(
         package_name_input,
         package_description_input,
         package_homepage_input,
-        package_bug_tracker_input,
+        package_repository_input,
+        package_documentation_input,
         package_author_name_input,
         package_author_email_input,
     ],

zrb/builtin/generator/pip_package/template/_automate/snake_zrb_package_name/cmd/activate-venv.sh

@@ -2,6 +2,11 @@ if [ ! -d .venv ]
 then
   echo "Init virtual environment"
   python -m venv .venv
+  source .venv/bin/activate
+  echo "Upgrade Pip"
+  pip install -U pip
+  echo "Install Poetry"
+  pip install "poetry==1.7.1"
 fi
 echo "Activate virtual environment"
 source .venv/bin/activate

zrb/builtin/generator/pip_package/template/_automate/snake_zrb_package_name/cmd/build.sh

@@ -5,4 +5,4 @@ echo "Remove dist"
 rm -Rf dist
 
 echo "Build"
-flit build
+poetry build

zrb/builtin/generator/pip_package/template/_automate/snake_zrb_package_name/cmd/install-symlink.sh

@@ -1,2 +1,2 @@
 echo "Install symlink"
-flit install --symlink
+poetry install

zrb/builtin/generator/pip_package/template/_automate/snake_zrb_package_name/cmd/prepare-venv.sh

@@ -1,3 +1,2 @@
 echo "Install packages"
-pip install -r requirements.txt
-
+poetry install

zrb/builtin/generator/pip_package/template/_automate/snake_zrb_package_name/cmd/publish.sh

@@ -1,2 +1,2 @@
 echo "Publish"
-flit publish --repository {{input.snake_zrb_package_name_repo}}
+poetry publish --repository {{input.snake_zrb_package_name_repo}}

zrb/builtin/generator/pip_package/template/src/kebab-zrb-package-name/pyproject.toml

@@ -1,36 +1,31 @@
-[build-system]
-requires = ["flit_core>=3.4"]
-build-backend = "flit_core.buildapi"
-
-[project]
+[tool.poetry]
 name = "kebab-zrb-package-name"
 version = "0.0.1"
-authors = [
-  { name="zrbPackageAuthorName", email="zrbPackageAuthorEmail" },
-]
 description = "zrbPackageDescription"
+authors = ["zrbPackageAuthorName <zrbPackageAuthorEmail>"]
+license = "AGPL-3.0-or-later"
 readme = "README.md"
-requires-python = ">=3.8"
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
-  "Operating System :: OS Independent",
-]
-dependencies = []
- 
+homepage = "zrbPackageHomepage"
+repository = "zrbPackageRepository"
+documentation = "zrbPackageDocumentation"
+keywords = []
 
-[project.optional-dependencies]
-dev = []
-test = []
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+zrb = ">=zrbVersion"
 
-[project.urls]
-"Homepage" = "zrbPackageHomepage"
-"Bug Tracker" = "zrbPackageBugTracker"
+[tool.poetry.dev-dependencies]
+flake8 = "~6.0.0"
+black = "~23.12.1"
+isort = "~5.13.2"
+pytest = "~7.4.0"
+pytest-cov = "~4.1.0"
+pytest-asyncio = "~0.21.0"
+flameprof = "~0.4"
 
-[project.scripts]
+[tool.poetry.scripts]
 kebab-zrb-package-name = "snake_zrb_package_name.__main__:hello"
 
-[tool.pytest.ini_options]
-pythonpath = [
-  "src"
-]
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

zrb/builtin/generator/plugin/create.py

@@ -3,9 +3,10 @@ import os
 from zrb.builtin.generator.common.task_input import (
     package_author_email_input,
     package_author_name_input,
-    package_bug_tracker_input,
     package_description_input,
+    package_documentation_input,
     package_homepage_input,
+    package_repository_input,
     project_dir_input,
 )
 from zrb.builtin.group import plugin_group
@@ -37,7 +38,8 @@ copy_resource = ResourceMaker(
         plugin_package_name_input,
         package_description_input,
         package_homepage_input,
-        package_bug_tracker_input,
+        package_repository_input,
+        package_documentation_input,
         package_author_name_input,
         package_author_email_input,
     ],
@@ -45,7 +47,8 @@ copy_resource = ResourceMaker(
         "zrbPackageName": "{{input.package_name}}",
         "zrbPackageDescription": "{{input.package_description}}",
         "zrbPackageHomepage": "{{input.package_homepage}}",
-        "zrbPackageBugTracker": "{{input.package_bug_tracker}}",
+        "zrbPackageRepository": "{{input.package_repository}}",
+        "zrbPackageDocumentation": "{{input.package_documentation}}",
         "zrbPackageAuthorName": "{{input.package_author_name}}",
         "zrbPackageAuthorEmail": "{{input.package_author_email}}",
         "zrbVersion": version,

zrb/builtin/generator/plugin/template/_cmd/activate-venv.sh

@@ -2,7 +2,11 @@ if [ ! -d .venv ]
 then
   echo "Init virtual environment"
   python -m venv .venv
+  source .venv/bin/activate
+  echo "Upgrade Pip"
+  pip install -U pip
+  echo "Install Poetry"
+  pip install "poetry==1.7.1"
 fi
 echo "Activate virtual environment"
-source .venv/bin/activate
-
+source .venv/bin/activate

zrb/builtin/generator/plugin/template/_cmd/build.sh

@@ -5,4 +5,4 @@ echo "Remove dist"
 rm -Rf dist
 
 echo "Build"
-flit build
+poetry build

zrb/builtin/generator/plugin/template/_cmd/install-symlink.sh

@@ -1,2 +1,2 @@
 echo "Install symlink"
-flit install --symlink
+poetry install

zrb/builtin/generator/plugin/template/_cmd/prepare-venv.sh

@@ -1,3 +1,2 @@
 echo "Install packages"
-pip install -r requirements.txt
-
+poetry install

zrb/builtin/generator/plugin/template/_cmd/publish.sh

@@ -1,2 +1,2 @@
 echo "Publish"
-flit publish --repository {{input.plugin_repo}}
+poetry publish --repository {{input.plugin_repo}}

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

@@ -1,40 +1,43 @@
 #!/bin/bash
 
-PROJECT_DIR=$(pwd)
-echo "🤖 Set project directory to ${PROJECT_DIR}"
+log_progress() {
+    echo -e "🤖 \e[0;33m${1}\e[0;0m"
+}
+
 
+init() {
+    export PROJECT_DIR=$(pwd)
+    log_progress "Setting project directory to ${PROJECT_DIR}"
 
-if [ -z "$PROJECT_USE_VENV" ] || [ "$PROJECT_USE_VENV" = 1 ]
-then
-    if [ ! -d .venv ]
+    _IS_EMPTY_VENV=0
+    if [ ! -d "${PROJECT_DIR}/.venv" ]
     then
-        echo '🤖 Create virtual environment'
+        log_progress 'Creating virtual environment'
         python -m venv "${PROJECT_DIR}/.venv"
-        echo '🤖 Activate virtual environment'
         source "${PROJECT_DIR}/.venv/bin/activate"
+        pip install --upgrade pip
+        pip install "poetry==1.7.1"
+        _IS_EMPTY_VENV=1
     fi
 
-    echo '🤖 Activate virtual environment'
+    log_progress 'Activating virtual environment'
     source "${PROJECT_DIR}/.venv/bin/activate"
-fi
+}
+
 
 reload() {
 
     if [ ! -f "${PROJECT_DIR}/.env" ]
     then
-        echo '🤖 Create project configuration (.env)'
+        log_progress 'Creating project configuration (.env)'
         cp "${PROJECT_DIR}/template.env" "${PROJECT_DIR}/.env"
     fi
 
-    echo '🤖 Load project configuration (.env)'
+    log_progress 'Loading project configuration (.env)'
     source "${PROJECT_DIR}/.env"
 
-    if [ -z "$PROJECT_AUTO_INSTALL_PIP" ] || [ "$PROJECT_AUTO_INSTALL_PIP" = 1 ]
-    then
-        echo '🤖 Install requirements'
-        pip install --upgrade pip
-        pip install -r "${PROJECT_DIR}/requirements.txt"
-    fi
+    log_progress 'Install'
+    poetry install
 
     _CURRENT_SHELL=$(ps -p $$ | awk 'NR==2 {print $4}')
     case "$_CURRENT_SHELL" in
@@ -47,12 +50,13 @@ reload() {
     esac
     if [ "$_CURRENT_SHELL" = "zsh" ] || [ "$_CURRENT_SHELL" = "bash" ]
     then
-        echo "🤖 Set up shell completion for $_CURRENT_SHELL"
+        log_progress "Setting up shell completion for $_CURRENT_SHELL"
         eval "$(_ZRB_COMPLETE=${_CURRENT_SHELL}_source zrb)"
     else
-        echo "🤖 Cannot set up shell completion for $_CURRENT_SHELL"
+        log_progress "Cannot set up shell completion for $_CURRENT_SHELL"
     fi
 }
 
+init
 reload
-echo '🤖 Happy Coding :)'
+log_progress 'Happy Coding :)'

zrb/builtin/generator/plugin/template/pyproject.toml

@@ -1,38 +1,31 @@
-[build-system]
-requires = ["flit_core>=3.4"]
-build-backend = "flit_core.buildapi"
-
-[project]
+[tool.poetry]
 name = "kebab-zrb-package-name"
 version = "0.0.1"
-authors = [
-  { name="zrbPackageAuthorName", email="zrbPackageAuthorEmail" },
-]
 description = "zrbPackageDescription"
+authors = ["zrbPackageAuthorName <zrbPackageAuthorEmail>"]
+license = "AGPL-3.0-or-later"
 readme = "README.md"
-requires-python = ">=3.8"
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
-  "Operating System :: OS Independent",
-]
-dependencies = [
-  "zrb>=zrbVersion"
-]
- 
+homepage = "zrbPackageHomepage"
+repository = "zrbPackageRepository"
+documentation = "zrbPackageDocumentation"
+keywords = []
 
-[project.optional-dependencies]
-dev = []
-test = []
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+zrb = ">=zrbVersion"
 
-[project.urls]
-"Homepage" = "zrbPackageHomepage"
-"Bug Tracker" = "zrbPackageBugTracker"
+[tool.poetry.dev-dependencies]
+flake8 = "~6.0.0"
+black = "~23.12.1"
+isort = "~5.13.2"
+pytest = "~7.4.0"
+pytest-cov = "~4.1.0"
+pytest-asyncio = "~0.21.0"
+flameprof = "~0.4"
 
-[project.scripts]
+[tool.poetry.scripts]
 kebab-zrb-package-name = "snake_zrb_package_name.__main__:main"
 
-[tool.pytest.ini_options]
-pythonpath = [
-  "src"
-]
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

zrb/builtin/generator/plugin/template/src/snake_zrb_package_name/__main__.py

@@ -1,3 +1,8 @@
 from .task.example_task import ExampleTask
 
 assert ExampleTask
+
+
+def main():
+    fn = ExampleTask.to_function()
+    fn()