zrb 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

zrb/__init__.py

@@ -33,6 +33,7 @@ from zrb.input.option_input import OptionInput
 from zrb.input.password_input import PasswordInput
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
+from zrb.llm_config import llm_config
 from zrb.runner.cli import cli
 from zrb.runner.web_config.config_factory import web_config
 from zrb.runner.web_schema.user import User
@@ -101,6 +102,7 @@ assert ContentTransformer
 assert Scaffolder
 assert Scheduler
 assert cli
+assert llm_config
 assert Xcom
 assert web_config
 assert User

zrb/builtin/llm/llm_chat.py

@@ -2,14 +2,12 @@ import json
 import os
 from typing import Any
 
-from pydantic_ai.models import Model
-
 from zrb.builtin.group import llm_group
 from zrb.builtin.llm.tool.api import get_current_location, get_current_weather
 from zrb.builtin.llm.tool.cli import run_shell_command
 from zrb.builtin.llm.tool.file import (
-    list_file,
-    read_source_code,
+    list_files,
+    read_all_files,
     read_text_file,
     write_text_file,
 )
@@ -24,18 +22,14 @@ from zrb.config import (
     LLM_ALLOW_ACCESS_LOCAL_FILE,
     LLM_ALLOW_ACCESS_SHELL,
     LLM_HISTORY_DIR,
-    LLM_MODEL,
     LLM_SYSTEM_PROMPT,
     SERP_API_KEY,
 )
-from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
-from zrb.input.any_input import AnyInput
 from zrb.input.bool_input import BoolInput
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
 from zrb.task.llm_task import LLMTask
-from zrb.util.attr import get_attr
 from zrb.util.file import read_file, write_file
 from zrb.util.string.conversion import to_pascal_case
 
@@ -90,46 +84,37 @@ def _write_chat_conversation(
     write_file(last_session_file_path, current_session_name)
 
 
-class _LLMChat(LLMTask):
-
-    _default_model: Model | str | None = None
-
-    def set_default_model(self, model: Model | str):
-        self._default_model = model
-
-    @property
-    def inputs(self) -> list[AnyInput]:
-        task_inputs = super().inputs
-        model_input_default = LLM_MODEL if self._default_model is None else "default"
-        return [
+llm_chat: LLMTask = llm_group.add_task(
+    LLMTask(
+        name="llm-chat",
+        input=[
             StrInput(
                 "model",
                 description="LLM Model",
                 prompt="LLM Model",
-                default=model_input_default,
+                default="",
                 allow_positional_parsing=False,
                 always_prompt=False,
+                allow_empty=True,
+            ),
+            StrInput(
+                "base-url",
+                description="LLM API Base URL",
+                prompt="LLM API Base URL",
+                default="",
+                allow_positional_parsing=False,
+                always_prompt=False,
+                allow_empty=True,
+            ),
+            StrInput(
+                "api-key",
+                description="LLM API Key",
+                prompt="LLM API Key",
+                default="",
+                allow_positional_parsing=False,
+                always_prompt=False,
+                allow_empty=True,
             ),
-            *task_inputs,
-        ]
-
-    def _get_model(self, ctx: AnyContext) -> str | Model | None:
-        if ctx.input.model == "default":
-            if self._default_model is not None:
-                return self._default_model
-            return super()._get_model(ctx)
-        model = get_attr(
-            ctx, ctx.input.model, "ollama_chat/llama3.1", auto_render=self._render_model
-        )
-        if isinstance(model, (Model, str)) or model is None:
-            return model
-        raise ValueError("Invalid model")
-
-
-llm_chat: LLMTask = llm_group.add_task(
-    _LLMChat(
-        name="llm-chat",
-        input=[
             TextInput(
                 "system-prompt",
                 description="System prompt",
@@ -156,10 +141,17 @@ llm_chat: LLMTask = llm_group.add_task(
                 always_prompt=False,
             ),
         ],
+        model=lambda ctx: None if ctx.input.model == "" else ctx.input.model,
+        model_base_url=lambda ctx: (
+            None if ctx.input.base_url == "" else ctx.input.base_url
+        ),
+        model_api_key=lambda ctx: (
+            None if ctx.input.api_key == "" else ctx.input.api_key
+        ),
         conversation_history_reader=_read_chat_conversation,
         conversation_history_writer=_write_chat_conversation,
         description="Chat with LLM",
-        system_prompt="{ctx.input['system-prompt']}",
+        system_prompt="{ctx.input.system_prompt}",
         message="{ctx.input.message}",
         retries=0,
     ),
@@ -168,8 +160,8 @@ llm_chat: LLMTask = llm_group.add_task(
 
 
 if LLM_ALLOW_ACCESS_LOCAL_FILE:
-    llm_chat.add_tool(read_source_code)
-    llm_chat.add_tool(list_file)
+    llm_chat.add_tool(read_all_files)
+    llm_chat.add_tool(list_files)
     llm_chat.add_tool(read_text_file)
     llm_chat.add_tool(write_text_file)
 

zrb/builtin/llm/tool/file.py

@@ -1,19 +1,44 @@
+import fnmatch
 import os
 
 from zrb.util.file import read_file, write_file
 
 
-def list_file(
+def list_files(
     directory: str = ".",
-    extensions: list[str] = [".py", ".go", ".js", ".ts", ".java", ".c", ".cpp"],
+    included_patterns: list[str] = [
+        "*.py",
+        "*.go",
+        "*.js",
+        "*.ts",
+        "*.java",
+        "*.c",
+        "*.cpp",
+    ],
+    excluded_patterns: list[str] = [
+        "venv",
+        ".venv",
+        "node_modules",
+        ".git",
+        "__pycache__",
+    ],
 ) -> list[str]:
-    """List all files in a directory"""
+    """List all files in a directory that match any of the included glob patterns
+    and do not reside in any directory matching an excluded pattern.
+    Patterns are evaluated using glob-style matching.
+    """
     all_files: list[str] = []
-    for root, _, files in os.walk(directory):
+    for root, dirs, files in os.walk(directory):
         for filename in files:
-            for extension in extensions:
-                if filename.lower().endswith(extension):
-                    all_files.append(os.path.join(root, filename))
+            if any(fnmatch.fnmatch(filename, pat) for pat in included_patterns):
+                full_path = os.path.join(root, filename)
+                # Check each component of the full path for excluded patterns.
+                if any(
+                    any(fnmatch.fnmatch(part, pat) for pat in excluded_patterns)
+                    for part in os.path.normpath(full_path).split(os.sep)
+                ):
+                    continue
+                all_files.append(full_path)
     return all_files
 
 
@@ -27,12 +52,24 @@ def write_text_file(file: str, content: str):
     return write_file(os.path.abspath(file), content)
 
 
-def read_source_code(
+def read_all_files(
     directory: str = ".",
-    extensions: list[str] = [".py", ".go", ".js", ".ts", ".java", ".c", ".cpp"],
+    included_patterns: list[str] = [
+        "*.py",
+        "*.go",
+        "*.js",
+        "*.ts",
+        "*.java",
+        "*.c",
+        "*.cpp",
+    ],
+    excluded_patterns: list[str] = [],
 ) -> list[str]:
-    """Read source code in a directory"""
-    files = list_file(directory, extensions)
+    """Read all files in a directory that match any of the included glob patterns
+    and do not match any of the excluded glob patterns.
+    Patterns are evaluated using glob-style matching.
+    """
+    files = list_files(directory, included_patterns, excluded_patterns)
     for index, file in enumerate(files):
         content = read_text_file(file)
         files[index] = f"# {file}\n```\n{content}\n```"

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py

@@ -8,7 +8,7 @@ from my_app_name._zrb.column.add_column_util import (
     update_my_app_name_test_update,
     update_my_app_name_ui,
 )
-from my_app_name._zrb.config import APP_DIR
+from my_app_name._zrb.config import ACTIVATE_VENV_SCRIPT, APP_DIR
 from my_app_name._zrb.format_task import format_my_app_name_code
 from my_app_name._zrb.group import app_create_group
 from my_app_name._zrb.input import (
@@ -17,9 +17,16 @@ from my_app_name._zrb.input import (
     new_column_input,
     new_column_type_input,
 )
-from my_app_name._zrb.util import get_existing_module_names, get_existing_schema_names
+from my_app_name._zrb.util import (
+    cd_module_script,
+    get_existing_module_names,
+    get_existing_schema_names,
+    set_create_migration_db_url_env,
+    set_env,
+)
+from my_app_name._zrb.venv_task import prepare_venv
 
-from zrb import AnyContext, Task, make_task
+from zrb import AnyContext, Cmd, CmdTask, EnvFile, Task, make_task
 
 
 @make_task(
@@ -118,6 +125,34 @@ update_my_app_name_test_delete_task = Task(
 )
 
 
+create_my_app_name_entity_migration = CmdTask(
+    name="create-my-app-name-entity-migration",
+    input=[
+        existing_module_input,
+        existing_entity_input,
+        new_column_input,
+    ],
+    env=EnvFile(path=os.path.join(APP_DIR, "template.env")),
+    cwd=APP_DIR,
+    cmd=[
+        ACTIVATE_VENV_SCRIPT,
+        Cmd(lambda ctx: set_create_migration_db_url_env(ctx.input.module)),
+        Cmd(lambda ctx: set_env("MY_APP_NAME_MODULES", ctx.input.module)),
+        Cmd(lambda ctx: cd_module_script(ctx.input.module)),
+        "alembic upgrade head",
+        Cmd(
+            'alembic revision --autogenerate -m "create_{to_snake_case(ctx.input.entity)}_{to_snake_case(ctx.input.column)}_column"',  # noqa
+        ),
+    ],
+    render_cmd=False,
+    retries=0,
+    upstream=[
+        prepare_venv,
+        update_my_app_name_schema_task,
+    ],
+)
+
+
 add_my_app_name_column = app_create_group.add_task(
     Task(
         name="add-my-app-name-column",
@@ -129,6 +164,7 @@ add_my_app_name_column = app_create_group.add_task(
             update_my_app_name_test_read_task,
             update_my_app_name_test_update_task,
             update_my_app_name_test_delete_task,
+            create_my_app_name_entity_migration,
         ],
         successor=format_my_app_name_code,
         retries=0,

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>My Entity</h1>
 
@@ -311,13 +311,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/my-entities", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
       class="container"
-      data-page-size='{{ page_size | tojson }}'
-      data-page='{{ page | tojson }}'
-      data-sort='{{ sort | tojson }}'
-      data-filter='{{ filter | tojson }}'
-      data-allow-create='{{ allow_create | tojson }}'
-      data-allow-update='{{ allow_update | tojson }}'
-      data-allow-delete='{{ allow_delete | tojson }}'>
+      data-page-size='{{ page_size | tojson | safe }}'
+      data-page='{{ page | tojson | safe }}'
+      data-sort='{{ sort | tojson | safe }}'
+      data-filter='{{ filter | tojson | safe }}'
+      data-allow-create='{{ allow_create | tojson | safe }}'
+      data-allow-update='{{ allow_update | tojson | safe }}'
+      data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>Permission</h1>
 
@@ -326,13 +326,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/permissions", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>Role</h1>
 
@@ -251,7 +251,7 @@
             try {
                 const createForm = document.getElementById("crud-create-form");
                 const formData = UTIL.getFormData(createForm);
-                formData.permission_names = JSON.parse(formData.permission_names);
+                formData.permission_names = UTIL.tryParseJSON(formData.permission_names);
                 await UTIL.fetchAPI(this.apiUrl, { method: "POST", body: JSON.stringify(formData) });
                 await this.fetchRows();
                 this.hideCreateForm();
@@ -283,7 +283,7 @@
             try {
                 const updateForm = document.getElementById("crud-update-form");
                 const formData = UTIL.getFormData(updateForm);
-                formData.permission_names = JSON.parse(formData.permission_names);
+                formData.permission_names = UTIL.tryParseJSON(formData.permission_names);
                 await UTIL.fetchAPI(`${this.apiUrl}/${this.state.updatedRowId}`, {
                     method: "PUT",
                     body: JSON.stringify(formData)
@@ -348,13 +348,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/roles", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/user.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>User</h1>
 
@@ -263,7 +263,7 @@
             try {
                 const createForm = document.getElementById("crud-create-form");
                 const formData = UTIL.getFormData(createForm);
-                formData.role_names = JSON.parse(formData.role_names);
+                formData.role_names = UTIL.tryParseJSON(formData.role_names);
                 await UTIL.fetchAPI(this.apiUrl, { method: "POST", body: JSON.stringify(formData) });
                 await this.fetchRows();
                 this.hideCreateForm();
@@ -298,7 +298,7 @@
                 if (!formData.password) {
                     delete formData.password;
                 }
-                formData.role_names = JSON.parse(formData.role_names);
+                formData.role_names = UTIL.tryParseJSON(formData.role_names);
                 await UTIL.fetchAPI(`${this.apiUrl}/${this.state.updatedRowId}`, {
                     method: "PUT",
                     body: JSON.stringify(formData)
@@ -363,13 +363,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/users", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/common/util.js

@@ -212,4 +212,12 @@ const UTIL = {
         return data;
     },
 
+    tryParseJSON(value) {
+        try {
+            return JSON.parse(value);
+        } catch {
+            return value;
+        }
+    },
+
 };

zrb/config.py

@@ -75,7 +75,6 @@ WEB_AUTH_ACCESS_TOKEN_EXPIRE_MINUTES = int(
 WEB_AUTH_REFRESH_TOKEN_EXPIRE_MINUTES = int(
     os.getenv("ZRB_WEB_REFRESH_TOKEN_EXPIRE_MINUTES", "60")
 )
-LLM_MODEL = os.getenv("ZRB_LLM_MODEL", "ollama_chat/llama3.1")
 
 _DEFAULT_PROMPT = (
     "You are a helpful AI assistant capable of using various tools to answer user queries. When solving a problem:\n"

zrb/llm_config.py

@@ -0,0 +1,50 @@
+import os
+
+from pydantic_ai.models import Model
+from pydantic_ai.models.openai import OpenAIModel
+from pydantic_ai.providers.openai import OpenAIProvider
+
+
+class LLMConfig:
+
+    def __init__(
+        self,
+        model_name: str | None = None,
+        base_url: str | None = None,
+        api_key: str | None = None,
+    ):
+        self._model_name = (
+            model_name if model_name is not None else os.getenv("ZRB_LLM_MODEL", None)
+        )
+        self._base_url = (
+            base_url if base_url is not None else os.getenv("ZRB_LLM_BASE_URL", None)
+        )
+        self._api_key = (
+            api_key if api_key is not None else os.getenv("ZRB_LLM_API_KEY", None)
+        )
+        self._default_model = None
+
+    def _get_model_name(self) -> str | None:
+        return self._model_name if self._model_name is not None else None
+
+    def _get_model_provider(self) -> OpenAIProvider:
+        if self._base_url is None and self._api_key is None:
+            return "openai"
+        return OpenAIProvider(base_url=self._base_url, api_key=self._api_key)
+
+    def get_default_model(self) -> Model | str | None:
+        if self._default_model is not None:
+            return self._default_model
+        model_name = self._get_model_name()
+        if model_name is None:
+            return None
+        return OpenAIModel(
+            model_name=model_name,
+            provider=self._get_model_provider(),
+        )
+
+    def set_default_model(self, model: Model | str | None):
+        self._default_model = model
+
+
+llm_config = LLMConfig()

zrb/task/llm_task.py

@@ -18,11 +18,13 @@ from pydantic_ai.models import Model
 from pydantic_ai.settings import ModelSettings
 
 from zrb.attr.type import StrAttr, fstring
-from zrb.config import LLM_MODEL, LLM_SYSTEM_PROMPT
+from zrb.config import LLM_SYSTEM_PROMPT
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.env.any_env import AnyEnv
 from zrb.input.any_input import AnyInput
+from zrb.llm_config import LLMConfig
+from zrb.llm_config import llm_config as default_llm_config
 from zrb.task.any_task import AnyTask
 from zrb.task.base_task import BaseTask
 from zrb.util.attr import get_attr, get_str_attr
@@ -46,11 +48,15 @@ class LLMTask(BaseTask):
         env: list[AnyEnv | None] | AnyEnv | None = None,
         model: (
             Callable[[AnySharedContext], Model | str | fstring] | Model | None
-        ) = LLM_MODEL,
+        ) = None,
+        render_model: bool = True,
+        model_base_url: StrAttr = None,
+        render_model_base_url: bool = True,
+        model_api_key: StrAttr = None,
+        render_model_api_key: bool = True,
         model_settings: (
             ModelSettings | Callable[[AnySharedContext], ModelSettings] | None
         ) = None,
-        render_model: bool = True,
         agent: Agent | Callable[[AnySharedContext], Agent] | None = None,
         system_prompt: StrAttr | None = LLM_SYSTEM_PROMPT,
         render_system_prompt: bool = True,
@@ -105,9 +111,13 @@ class LLMTask(BaseTask):
             successor=successor,
         )
         self._model = model
+        self._render_model = render_model
+        self._model_base_url = model_base_url
+        self._render_model_base_url = render_model_base_url
+        self._model_api_key = model_api_key
+        self._render_model_api_key = render_model_api_key
         self._model_settings = model_settings
         self._agent = agent
-        self._render_model = render_model
         self._system_prompt = system_prompt
         self._render_system_prompt = render_system_prompt
         self._message = message
@@ -120,9 +130,6 @@ class LLMTask(BaseTask):
         self._render_history_file = render_history_file
         self._max_call_iteration = max_call_iteration
 
-    def set_model(self, model: Model | str):
-        self._model = model
-
     def add_tool(self, tool: ToolOrCallable):
         self._additional_tools.append(tool)
 
@@ -242,15 +249,47 @@ class LLMTask(BaseTask):
             system_prompt=self._get_system_prompt(ctx),
             tools=tools,
             model_settings=self._get_model_settings(ctx),
+            retries=3,
         )
 
     def _get_model(self, ctx: AnyContext) -> str | Model | None:
-        model = get_attr(
-            ctx, self._model, "ollama_chat/llama3.1", auto_render=self._render_model
+        model = get_attr(ctx, self._model, None, auto_render=self._render_model)
+        if model is None:
+            return default_llm_config.get_default_model()
+        if isinstance(model, str):
+            llm_config = LLMConfig(
+                model_name=model,
+                base_url=get_attr(
+                    ctx,
+                    self._get_model_base_url(ctx),
+                    None,
+                    auto_render=self._render_model_base_url,
+                ),
+                api_key=get_attr(
+                    ctx,
+                    self._get_model_api_key(ctx),
+                    None,
+                    auto_render=self._render_model_api_key,
+                ),
+            )
+            return llm_config.get_default_model()
+        raise ValueError(f"Invalid model: {model}")
+
+    def _get_model_base_url(self, ctx: AnyContext) -> str | None:
+        base_url = get_attr(
+            ctx, self._model_base_url, None, auto_render=self._render_model_base_url
+        )
+        if isinstance(base_url, str) or base_url is None:
+            return base_url
+        raise ValueError(f"Invalid model base URL: {base_url}")
+
+    def _get_model_api_key(self, ctx: AnyContext) -> str | None:
+        api_key = get_attr(
+            ctx, self._model_api_key, None, auto_render=self._render_model_api_key
         )
-        if isinstance(model, (Model, str)) or model is None:
-            return model
-        raise ValueError("Invalid model")
+        if isinstance(api_key, str) or api_key is None:
+            return api_key
+        raise ValueError(f"Invalid model base URL: {api_key}")
 
     def _get_system_prompt(self, ctx: AnyContext) -> str:
         return get_str_attr(

{zrb-1.3.0.dist-info → zrb-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.3.0
+Version: 1.4.0
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -24,7 +24,7 @@ Requires-Dist: isort (>=5.13.2,<5.14.0)
 Requires-Dist: libcst (>=1.5.0,<2.0.0)
 Requires-Dist: pdfplumber (>=0.11.4,<0.12.0) ; extra == "rag"
 Requires-Dist: psutil (>=6.1.1,<7.0.0)
-Requires-Dist: pydantic-ai (>=0.0.31,<0.0.32)
+Requires-Dist: pydantic-ai (>=0.0.42,<0.0.43)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.4.0,<4.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
@@ -44,47 +44,49 @@ Zrb allows you to write your automation tasks in Python. For example, you can de
 
 ```python
 import os
-from zrb import cli, LLMTask, CmdTask, StrInput
-from zrb.builtin.llm.tool.file import read_source_code, write_text_file
+from zrb import cli, llm_config, LLMTask, CmdTask, StrInput, Group
+from zrb.builtin.llm.tool.file import read_all_files, write_text_file
 from pydantic_ai.models.openai import OpenAIModel
-
+from pydantic_ai.providers.openai import OpenAIProvider
 
 CURRENT_DIR = os.getcwd()
-OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
-OPENROUTER_API_KEY = os.getenv("OPENROUTER_API_KEY", "")
-OPENROUTER_MODEL_NAME = os.getenv(
-    "AGENT_MODEL_NAME", "anthropic/claude-3.7-sonnet"
+
+# Setup default LLM Config
+llm_config.set_default_model(
+    OpenAIModel(
+        model_name="gpt-4o",
+        provider=OpenAIProvider(
+            base_url="https://openrouter.ai/api/v1",
+            api_key=os.getenv("OPENROUTER_API_KEY", "")
+        )
+    )
 )
 
+# Make UML group
+uml_group = cli.add_group(Group(name="uml", description="UML related tasks"))
 
-# Defining a LLM Task to create a Plantuml script based on source code in current directory.
-# User can choose the diagram type. By default it is "state diagram"
-make_uml = cli.add_task(
+# Generate UML script
+make_uml_script = uml_group.add_task(
     LLMTask(
-        name="make-uml",
+        name="make-script",
         description="Creating plantuml diagram based on source code in current directory",
         input=StrInput(name="diagram", default="state diagram"),
-        model=OpenAIModel(
-            OPENROUTER_MODEL_NAME,
-            base_url=OPENROUTER_BASE_URL,
-            api_key=OPENROUTER_API_KEY,
-        ),
         message=(
             f"Read source code in {CURRENT_DIR}, "
             "make a {ctx.input.diagram} in plantuml format. "
             f"Write the script into {CURRENT_DIR}/{{ctx.input.diagram}}.uml"
         ),
         tools=[
-            read_source_code,
+            read_all_files,
             write_text_file,
         ],
     )
 )
 
 # Defining a Cmd Task to transform Plantuml script into a png image.
-make_png = cli.add_task(
+make_uml_image = uml_group.add_task(
     CmdTask(
-        name="make-png",
+        name="make-image",
         description="Creating png based on source code in current directory",
         input=StrInput(name="diagram", default="state diagram"),
         cmd="plantuml -tpng '{ctx.input.diagram}.uml'",
@@ -93,19 +95,19 @@ make_png = cli.add_task(
 )
 
 # Making sure that make_png has make_uml as its dependency.
-make_uml >> make_png
+make_uml_script >> make_uml_image
 ```
 
 Once defined, your automation tasks are immediately accessible from the CLI. You can then invoke the tasks by invoking.
 
 ```bash
-zrb make-png --diagram "state diagram"
+zrb uml make-image --diagram "state diagram"
 ```
 
 Or you can invoke the tasks without parameter.
 
 ```bash
-zrb make-png
+zrb uml make-image
 ```
 
 At this point, Zrb will politely ask you to provide the diagram type.

{zrb-1.3.0.dist-info → zrb-1.4.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zrb/__init__.py,sha256=JYLyBeSv-FP2iVKgsXJH8Ae-Cmjp5nmmIiwqayhCOEE,2964
+zrb/__init__.py,sha256=1waPjZcA3IHUEvIuVQso0YfNfW9i7SCJgEfzhiNTaCk,3020
 zrb/__main__.py,sha256=QcMnHfAFbDUFw9p9tgfFS4U0Ra9nE-TLU5YoMBiAriE,808
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
@@ -7,11 +7,11 @@ zrb/builtin/base64.py,sha256=1YnSwASp7OEAvQcsnHZGpJEvYoI1Z2zTIJ1bCDHfcPQ,921
 zrb/builtin/git.py,sha256=8_qVE_2lVQEVXQ9vhiw8Tn4Prj1VZB78ZjEJJS5Ab3M,5461
 zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,3505
 zrb/builtin/group.py,sha256=-phJfVpTX3_gUwS1u8-RbZUHe-X41kxDBSmrVh4rq8E,1682
-zrb/builtin/llm/llm_chat.py,sha256=yiL16XRy4oh5jKMzH0W7RBxfEwGKflvvrsYKleJFKWc,6221
+zrb/builtin/llm/llm_chat.py,sha256=QCfxocM7UQPtpIWLMzr9wKbl9DCPcDZszAnPxszaww0,6071
 zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
 zrb/builtin/llm/tool/api.py,sha256=bXFE7jihdhUscxJH8lu5imwlYH735AalbCyUTl28BaQ,826
 zrb/builtin/llm/tool/cli.py,sha256=to_IjkfrMGs6eLfG0cpVN9oyADWYsJQCtyluUhUdBww,253
-zrb/builtin/llm/tool/file.py,sha256=ibvh0zrsnponwyZvw6bWMUbpwSv5S5WUWCDfQ6BjVwk,1160
+zrb/builtin/llm/tool/file.py,sha256=CVmAwzHrO6gk6OcnHedKiZDQhmi-0f6Tx0vJWQe1KOQ,2191
 zrb/builtin/llm/tool/rag.py,sha256=vEIThEy0JGwXEiNRLOEJAHAE0l1Qie2qvU3ryioeYMk,6066
 zrb/builtin/llm/tool/web.py,sha256=SDnCtYHZ0Q4DtLbIhc11a0UyyKbTTeW60UfeIKzK35k,3204
 zrb/builtin/md5.py,sha256=0pNlrfZA0wlZlHvFHLgyqN0JZJWGKQIF5oXxO44_OJk,949
@@ -23,12 +23,12 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.flake8,sha256=fgvH
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.gitignore,sha256=D-ISOzaKlN_VzeZP5f8aznDSJX4p8PCtaK2JWM5yY1c,61
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/README.md,sha256=MAo7ZFbg7LLiAfQbXcippMgjJ2-VXMKtiTDEZ3I4AAg,221
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py,sha256=j24bFnqMCZrYx67HMtOAJMBb2P1-ymvo8_oFjP0uTxg,3726
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py,sha256=PxKS3azBnKMTZdStz1OTEr-7sCK_WMeCLiDd1gDoGHA,4819
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_util.py,sha256=GycuEtcvO02OwqULfP-qRxnAnJDDhWx_hdRSmbfx5bo,10952
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/config.py,sha256=uviB4q2iZjoU9_fA1O4VrjpuVAqx2gj5hjospJ0Xzeg,885
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_task.py,sha256=W0ziCIhSwUbu8vBABEcTvLrTAegJmRbqui6TzG1xqlo,11183
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_util.py,sha256=M7FSCdq-dzXqa22kFO6HwMIJ2XlHMSys-I0-K1_90xE,16683
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html,sha256=AFriF9Vz5889nfIIZbqaNXREMiShPcEiHBvO3aWs-ao,13240
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html,sha256=hcF-HZ_7vDyod-Rn_7ODqCjsNOwHvH1ICZC0AMzis5s,13338
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/my_entity_service.py,sha256=PgwTsHMHRiFS7JQeAe6wWmIHk6s-OfIybx_mJfuT_G4,3918
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/my_entity_service_factory.py,sha256=lnhhpc_AflWnCQbLkYORrshiqIA5wy4SdxDuUxmn7Ts,372
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/repository/my_entity_db_repository.py,sha256=GrMxMb98-XD7Rue1v14jBu6HRb8Gy5DywBSKnMhN0iY,770
@@ -125,14 +125,14 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/sche
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/subroute/auth.py,sha256=KXwia0eexjoxa7OK_VT7NuUL6snxxtOpMIgSjRRbBD0,17678
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/util/auth.py,sha256=zThjspTe-pu0r73vXwNb9Se4vCbX2HquTZKg2h9AMY0,2643
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/util/view.py,sha256=7C0KlvpUwlQ27p_zyFFxVZZNaQnZ9k2i3yit1cNZHoo,3192
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html,sha256=l2j1GCDIrSTUn1PY8cLf3sLJdVe8D1gjGUShUG20zUA,13782
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html,sha256=uVL7ZmbsIuya_RbZLL2qSfc7jJM_FPn2Mg8gten_ZUc,14980
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/user.html,sha256=CDeYHfcbThjraIzNIaOnnd7Wpk1Y5vz9eTLJCKiiyyk,15502
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html,sha256=o0TtDcZ_pDcHFSX3kEU9nninbNQAUbN_O4VqXZ8875s,13880
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html,sha256=NYS1SIC8hNJyKt1SW3AzIqibr8igAg51-T4XuDkSaRo,15092
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/user.html,sha256=s6ziDxsoavMIp4IB2bSWFViQZw62SyC4jRsx5uvUy6I,15614
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/error.html,sha256=FISZNhjhfIuoBWI0GR-c5XQxLniy0euWOjKgbtnVlt8,239
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/homepage.html,sha256=Q8jEwRraYJmn0rJIT1Ct4Dz2NB4S-NWJ1ZrU46oZkkw,126
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/login.html,sha256=OanTVSQG5T03AX4eformFN69qeSMh5jiWERNth1EAMw,2301
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/logout.html,sha256=HQnUPE_I9l-aF8LqpKuHCp6zsjYplTfbLfKbxn4hdXo,1571
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/common/util.js,sha256=-O3c441oaxIu9-6i2Foe6PSvdC5ycK_I3gKmTP4fNq8,8407
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/common/util.js,sha256=4wEtVKhNTrKsRGXEQvMkC5gd_GDS_ZuGGAmhJl8AHzQ,8547
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/crud/style.css,sha256=UzmYDiz4dlxKPPKXwTjybK1nrwkk-3DmFEmlpWnnqfo,206
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/crud/util.js,sha256=7TQftOjZGmx6POLCHzmh08m4q-sc01BRtmcZCQQ5JU8,4376
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/default/pico-style.css,sha256=7VEhpZWXz8pcKtTULorjQlWX1fMs7Bcbn1QBDJiJZfY,233
@@ -208,7 +208,7 @@ zrb/callback/callback.py,sha256=hKefB_Jd1XGjPSLQdMKDsGLHPzEGO2dqrIArLl_EmD0,848
 zrb/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/cmd/cmd_result.py,sha256=L8bQJzWCpcYexIxHBNsXj2pT3BtLmWex0iJSMkvimOA,597
 zrb/cmd/cmd_val.py,sha256=7Doowyg6BK3ISSGBLt-PmlhzaEkBjWWm51cED6fAUOQ,1014
-zrb/config.py,sha256=MfHwcQ4OhCmCw6jXpFI8483Ase6YrqNGBvqYzwnwopw,4753
+zrb/config.py,sha256=X0mlhmpUrYp_l4qI3CnsqOAfvxfLkteCOV9ABGF--Qc,4690
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/content_transformer/any_content_transformer.py,sha256=v8ZUbcix1GGeDQwB6OKX_1TjpY__ksxWVeqibwa_iZA,850
 zrb/content_transformer/content_transformer.py,sha256=STl77wW-I69QaGzCXjvkppngYFLufow8ybPLSyAvlHs,2404
@@ -237,6 +237,7 @@ zrb/input/option_input.py,sha256=TQB82ko5odgzkULEizBZi0e9TIHEbIgvdP0AR3RhA74,213
 zrb/input/password_input.py,sha256=szBojWxSP9QJecgsgA87OIYwQrY2AQ3USIKdDZY6snU,1465
 zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
 zrb/input/text_input.py,sha256=shvVbc2U8Is36h23M5lcW8IEwKc9FR-4uEPZZroj3rU,3377
+zrb/llm_config.py,sha256=SXSkDpmXxGLJaoUrT09oNdOGwHXc82TwIGssVeo6S7U,1553
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=HtfJQecFg2keIMK-7bVATBlTeZC_RvT8DsbUC58TMKU,6736
 zrb/runner/common_util.py,sha256=0zhZn1Jdmr194_nsL5_L-Kn9-_NDpMTI2z6_LXUQJ-U,1369
@@ -299,7 +300,7 @@ zrb/task/base_task.py,sha256=SQRf37bylS586KwyW0eYDe9JZ5Hl18FP8kScHae6y3A,21251
 zrb/task/base_trigger.py,sha256=jC722rDvodaBLeNaFghkTyv1u0QXrK6BLZUUqcmBJ7Q,4581
 zrb/task/cmd_task.py,sha256=pUKRSR4DZKjbmluB6vi7cxqyhxOLfJ2czSpYeQbiDvo,10705
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
-zrb/task/llm_task.py,sha256=B4qhza-4fk7odI7-rv2rLYvBLt1dmZMNgKu8OK7rajM,11849
+zrb/task/llm_task.py,sha256=Gf_Y8e3-U46wjnH5K36I1XJnFwwU-eTQlG5JL87UobM,13495
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
 zrb/task/rsync_task.py,sha256=GSL9144bmp6F0EckT6m-2a1xG25AzrrWYzH4k3SVUKM,6370
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
@@ -340,7 +341,7 @@ zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=1nDdwPc22oFoK_1ZTXyf3638Bg6sqE2yp_U4_-frHoc,16015
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.3.0.dist-info/METADATA,sha256=3wbbvRet-OzX0DonamEcOLlFxXCVclJufAhAhH28m7U,6303
-zrb-1.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.3.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.3.0.dist-info/RECORD,,
+zrb-1.4.0.dist-info/METADATA,sha256=9IBDp38-en6FVpqq2RUd4qMo7c138HImysJXzd6-kwg,6291
+zrb-1.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.4.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.4.0.dist-info/RECORD,,