zrb 1.9.2__tar.gz → 1.9.4__tar.gz

{zrb-1.9.2 → zrb-1.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.9.2
+Version: 1.9.4
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -92,6 +92,7 @@ This guide shows you how to define two simple tasks:
 - And another one to convert that script into a PNG image.
 
 > **Note:** This assume you have an `OPENAI_API_KEY` and a Mermaid CLI installed (i.e., `npm install -g @mermaid-js/mermaid-cli`)
+> If you want to use other LLM Provider (e.g., Deepseek, Ollama, etc.), you can refer to [Zrb LLM Integration guide](https://github.com/state-alchemists/zrb/blob/main/docs/installation-and-configuration/configuration/llm-integration.md)
 
 ## 1. Create Your Task Definition File
 

{zrb-1.9.2 → zrb-1.9.4}/README.md

@@ -51,6 +51,7 @@ This guide shows you how to define two simple tasks:
 - And another one to convert that script into a PNG image.
 
 > **Note:** This assume you have an `OPENAI_API_KEY` and a Mermaid CLI installed (i.e., `npm install -g @mermaid-js/mermaid-cli`)
+> If you want to use other LLM Provider (e.g., Deepseek, Ollama, etc.), you can refer to [Zrb LLM Integration guide](https://github.com/state-alchemists/zrb/blob/main/docs/installation-and-configuration/configuration/llm-integration.md)
 
 ## 1. Create Your Task Definition File
 

{zrb-1.9.2 → zrb-1.9.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.9.2"
+version = "1.9.4"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

zrb-1.9.4/src/zrb/__init__.py

@@ -0,0 +1,134 @@
+import importlib
+from typing import TYPE_CHECKING, Any
+
+_LAZY_LOAD = {
+    "AnyAttr": "zrb.attr.type",
+    "BoolAttr": "zrb.attr.type",
+    "FloatAttr": "zrb.attr.type",
+    "IntAttr": "zrb.attr.type",
+    "StrAttr": "zrb.attr.type",
+    "StrDictAttr": "zrb.attr.type",
+    "fstring": "zrb.attr.type",
+    "AnyCallback": "zrb.callback.any_callback",
+    "Callback": "zrb.callback.callback",
+    "CmdResult": "zrb.cmd.cmd_result",
+    "Cmd": "zrb.cmd.cmd_val",
+    "CmdPath": "zrb.cmd.cmd_val",
+    "CFG": "zrb.config",
+    "AnyContentTransformer": "zrb.content_transformer.any_content_transformer",
+    "ContentTransformer": "zrb.content_transformer.content_transformer",
+    "AnyContext": "zrb.context.any_context",
+    "AnySharedContext": "zrb.context.any_shared_context",
+    "Context": "zrb.context.context",
+    "SharedContext": "zrb.context.shared_context",
+    "AnyEnv": "zrb.env.any_env",
+    "Env": "zrb.env.env",
+    "EnvFile": "zrb.env.env_file",
+    "EnvMap": "zrb.env.env_map",
+    "AnyGroup": "zrb.group.any_group",
+    "Group": "zrb.group.group",
+    "AnyInput": "zrb.input.any_input",
+    "BaseInput": "zrb.input.base_input",
+    "BoolInput": "zrb.input.bool_input",
+    "FloatInput": "zrb.input.float_input",
+    "IntInput": "zrb.input.int_input",
+    "OptionInput": "zrb.input.option_input",
+    "PasswordInput": "zrb.input.password_input",
+    "StrInput": "zrb.input.str_input",
+    "TextInput": "zrb.input.text_input",
+    "llm_config": "zrb.llm_config",
+    "llm_rate_limitter": "zrb.llm_rate_limitter",
+    "cli": "zrb.runner.cli",
+    "web_auth_config": "zrb.runner.web_auth_config",
+    "User": "zrb.runner.web_schema.user",
+    "Session": "zrb.session.session",
+    "AnyTask": "zrb.task.any_task",
+    "BaseTask": "zrb.task.base_task",
+    "BaseTrigger": "zrb.task.base_trigger",
+    "CmdTask": "zrb.task.cmd_task",
+    "HttpCheck": "zrb.task.http_check",
+    "ConversationHistoryData": "zrb.task.llm.history",
+    "LLMTask": "zrb.task.llm_task",
+    "make_task": "zrb.task.make_task",
+    "RsyncTask": "zrb.task.rsync_task",
+    "Scaffolder": "zrb.task.scaffolder",
+    "Scheduler": "zrb.task.scheduler",
+    "Task": "zrb.task.task",
+    "TcpCheck": "zrb.task.tcp_check",
+    "load_file": "zrb.util.load",
+    "load_module": "zrb.util.load",
+    "Xcom": "zrb.xcom.xcom",
+}
+
+if TYPE_CHECKING:
+    from zrb.attr.type import (
+        AnyAttr,
+        BoolAttr,
+        FloatAttr,
+        IntAttr,
+        StrAttr,
+        StrDictAttr,
+        fstring,
+    )
+    from zrb.callback.any_callback import AnyCallback
+    from zrb.callback.callback import Callback
+    from zrb.cmd.cmd_result import CmdResult
+    from zrb.cmd.cmd_val import Cmd, CmdPath
+    from zrb.config import CFG
+    from zrb.content_transformer.any_content_transformer import AnyContentTransformer
+    from zrb.content_transformer.content_transformer import ContentTransformer
+    from zrb.context.any_context import AnyContext
+    from zrb.context.any_shared_context import AnySharedContext
+    from zrb.context.context import Context
+    from zrb.context.shared_context import SharedContext
+    from zrb.env.any_env import AnyEnv
+    from zrb.env.env import Env
+    from zrb.env.env_file import EnvFile
+    from zrb.env.env_map import EnvMap
+    from zrb.group.any_group import AnyGroup
+    from zrb.group.group import Group
+    from zrb.input.any_input import AnyInput
+    from zrb.input.base_input import BaseInput
+    from zrb.input.bool_input import BoolInput
+    from zrb.input.float_input import FloatInput
+    from zrb.input.int_input import IntInput
+    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.llm_rate_limitter import llm_rate_limitter
+    from zrb.runner.cli import cli
+    from zrb.runner.web_auth_config import web_auth_config
+    from zrb.runner.web_schema.user import User
+    from zrb.session.session import Session
+    from zrb.task.any_task import AnyTask
+    from zrb.task.base_task import BaseTask
+    from zrb.task.base_trigger import BaseTrigger
+    from zrb.task.cmd_task import CmdTask
+    from zrb.task.http_check import HttpCheck
+    from zrb.task.llm.history import ConversationHistoryData
+    from zrb.task.llm_task import LLMTask
+    from zrb.task.make_task import make_task
+    from zrb.task.rsync_task import RsyncTask
+    from zrb.task.scaffolder import Scaffolder
+    from zrb.task.scheduler import Scheduler
+    from zrb.task.task import Task
+    from zrb.task.tcp_check import TcpCheck
+    from zrb.util.load import load_file, load_module
+    from zrb.xcom.xcom import Xcom
+
+
+def __getattr__(name: str) -> Any:
+    if name in _LAZY_LOAD:
+        module = importlib.import_module(_LAZY_LOAD[name])
+        return getattr(module, name)
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+# Eager load CFG
+CFG = __getattr__("CFG")
+if CFG.LOAD_BUILTIN:
+    from zrb import builtin
+
+    assert builtin

{zrb-1.9.2 → zrb-1.9.4}/src/zrb/builtin/llm/tool/file.py

@@ -415,6 +415,7 @@ def apply_diff(
     replace_content: str,
 ) -> str:
     """Apply a precise search/replace to a file based on line numbers and content.
+    This tool enables you to update certain part of the file efficiently.
     Args:
         path (str): Path to modify. Pass exactly as provided, including '~'.
         start_line (int): The 1-based starting line number of the content to replace.

{zrb-1.9.2 → zrb-1.9.4}/src/zrb/config.py

@@ -167,11 +167,11 @@ class Config:
 
     @property
     def WEB_SUPER_ADMIN_USERNAME(self) -> str:
-        return os.getenv("ZRB_WEB_SUPERADMIN_USERNAME", "admin")
+        return os.getenv("ZRB_WEB_SUPER_ADMIN_USERNAME", "admin")
 
     @property
     def WEB_SUPER_ADMIN_PASSWORD(self) -> str:
-        return os.getenv("ZRB_WEB_SUPERADMIN_PASSWORD", "admin")
+        return os.getenv("ZRB_WEB_SUPER_ADMIN_PASSWORD", "admin")
 
     @property
     def WEB_ACCESS_TOKEN_COOKIE_NAME(self) -> str:

{zrb-1.9.2 → zrb-1.9.4}/src/zrb/llm_config.py

@@ -9,66 +9,91 @@ if TYPE_CHECKING:
 
 
 DEFAULT_PERSONA = (
-    "You are a helpful and precise expert assistant. Your goal is to follow "
-    "instructions carefully to provide accurate and efficient help. Get "
-    "straight to the point."
+    "You are a helpful and precise expert assistant. Your primary goal is to "
+    "assist the user by proactively using your available tools to find "
+    "information, execute tasks, and solve problems. Always be accurate, "
+    "efficient, and get straight to the point."
 ).strip()
 
 DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
     "This is an interactive session. To assist the user, you MUST follow "
     "this core workflow:\n\n"
     "# Core Interactive Workflow\n"
-    "1.  **Clarify:** If the user's request is ambiguous, ask clarifying "
-    "questions to ensure you fully understand their goal.\n"
-    "2.  **Plan:** For any non-trivial task, briefly outline your plan to the "
+    "1.  **Understand:** First, understand the user's request. If you "
+    "encounter any concept, term, or topic you are unfamiliar with, you MUST "
+    "use your tools to search for information before proceeding. Do not "
+    "apologize for not knowing something; find the answer.\n"
+    "2.  **Clarify:** If the user's request is ambiguous after your initial "
+    "research, ask clarifying questions to ensure you fully understand their "
+    "goal.\n"
+    "3.  **Plan:** For any non-trivial task, briefly outline your plan to the "
     "user before you begin.\n"
-    "3.  **Execute:** Carry out the plan, using your available tools as "
+    "4.  **Execute:** Carry out the plan, using your available tools as "
     "needed.\n"
-    "4.  **Confirm:** Before performing any significant or irreversible "
+    "5.  **Confirm:** Before performing any significant or irreversible "
     "action (e.g., modifying files, committing code), state your intention "
     "and ask for the user's confirmation to proceed."
 ).strip()
 
 DEFAULT_SYSTEM_PROMPT = (
     "To fulfill this one-shot request, follow this simple process:\n"
-    "1.  **Analyze:** Deconstruct the user's request.\n"
-    "2.  **Execute:** Fulfill the request directly and concisely, using tools "
-    "if necessary.\n"
-    "3.  **Answer:** Provide a clear and accurate answer."
+    "1.  **Analyze and Research:** Deconstruct the user's request. If you "
+    "encounter any concept, term, or topic you are unfamiliar with, you MUST "
+    "use your tools to search for information. Do not state you don't know "
+    "something without trying to find out first.\n"
+    "2.  **Execute:** Fulfill the request directly and concisely, using your "
+    "tools to perform actions and gather any final, necessary information.\n"
+    "3.  **Answer:** Provide a clear, accurate, and well-informed answer "
+    "based on your research and execution."
 ).strip()
 
 DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
-    "If the user's request falls into a specialized category below, follow "
-    "the associated protocol.\n\n"
+    "If the user's request falls into a specialized category below, you MUST "
+    "follow the associated protocol.\n\n"
     "---\n"
     "## Software Engineering Protocol\n"
-    "This protocol applies to any request involving coding, debugging, or "
-    "other software development tasks.\n\n"
-    "### 1. Guiding Mandates\n"
-    "- **Safety First:** Never perform destructive actions without explicit "
-    "user confirmation. Explain critical commands before executing them.\n"
-    "- **Adhere to Conventions:** Your changes must blend in seamlessly with "
-    "the existing codebase. Match the formatting, naming, and architectural "
-    "patterns. *Never assume* a project's conventions; use your tools to "
-    "discover them.\n"
+    "This protocol applies to any request involving coding, debugging, "
+    "performance analysis, or other software development tasks.\n\n"
+    "### 1. Core Mandates\n"
+    "- **Safety First:** Never perform destructive actions (e.g., `rm -rf`) "
+    "without explicit user confirmation. Explain all critical commands before "
+    "executing them.\n"
+    "- **Adhere to Conventions:** Your changes MUST blend in seamlessly. "
+    "Match existing formatting, naming, and architectural patterns. *Never "
+    "assume* conventions; use your tools to discover them by reading "
+    "configuration files (e.g., `.gitignore`, `.flake8`), analyzing "
+    "neighboring code, and observing test patterns.\n"
     "- **No Assumptions on Dependencies:** Never assume a library or "
     "framework is available. Verify its presence in `package.json`, "
-    "`requirements.txt`, or similar files first.\n\n"
-    "### 2. Core Workflow\n"
-    "1.  **Understand:** Use your tools to analyze the relevant files and "
-    "codebase. Announce what you are inspecting (e.g., 'Okay, I will read "
-    "`main.py` and `utils.py` to understand the context.').\n"
-    "2.  **Plan:** Announce your step-by-step plan (e.g., 'Here is my plan: "
-    "1. Add the function to `utils.py`. 2. Import and call it in `main.py`. "
-    "3. Run the tests.').\n"
-    "3.  **Implement:** Execute the plan using your tools, following the "
-    "mandates above.\n"
-    "4.  **Verify:** After making changes, run the relevant verification "
-    "commands (e.g., tests, linters). Announce the command you will run "
-    "(e.g., 'Now, I will run `npm test` to verify the changes.').\n"
-    "5.  **Conclude:** Report the results of the verification step. If "
-    "successful, ask for the next step (e.g., 'All tests passed. Should I "
-    "commit these changes?')."
+    "`requirements.txt`, `pyproject.toml`, or similar files first.\n\n"
+    "### 2. Diagnostic & Implementation Workflow\n"
+    "1.  **Understand & Investigate (Tool-First):**\n"
+    "    - **Initial Assessment:** Start by using tools to understand the "
+    "task and environment. Do not begin by simply reading files. Formulate "
+    "an investigation plan.\n"
+    "    - **Information Gathering:** Use available tools to find relevant "
+    "information (e.g., project structure, framework, etc.) to complete the task.\n"
+    "    - **For Performance/Bugs:** If the task is to fix a bug or analyze "
+    "performance, your first step is to try and reproduce it. Then, use "
+    "diagnostic tools. For performance, use a profiler (e.g., `cProfile`, etc.). "
+    "For bugs, run the tests and analyze logs.\n"
+    "2.  **Plan:**\n"
+    "    - Announce your step-by-step plan based on your investigation "
+    "(e.g., 'Here is my plan: 1. Add a profiling decorator to the slow "
+    "function. 2. Run the code to generate a profile. 3. Analyze the "
+    "results to identify the bottleneck.').\n"
+    "3.  **Implement:**\n"
+    "    - Execute the plan using your tools, strictly following the Core "
+    "Mandates.\n"
+    "4.  **Verify:**\n"
+    "    - After making changes, ALWAYS run the relevant verification "
+    "commands (e.g., tests, linters, build scripts). Announce the command "
+    "you will run (e.g., 'Now, I will run `pytest` to verify the "
+    "changes.').\n"
+    "5.  **Conclude:**\n"
+    "    - Report the results of the verification. If successful, the task "
+    "is complete. If it fails, return to step 1 to diagnose the new "
+    "problem."
 ).strip()
 
 DEFAULT_SUMMARIZATION_PROMPT = (
@@ -87,8 +112,10 @@ DEFAULT_SUMMARIZATION_PROMPT = (
     "`Previous Summary`.\n"
     "1.  Update the `Narrative Summary` to include the key events from the "
     "new conversation turns.\n"
-    "2.  Replace the `Recent History` with the last 4 turns of the *new* "
-    "conversation.\n\n"
+    "2.  Replace the `Recent History` with the most recent turns from the *new* "
+    "conversation. It is critical to include the user's very last message "
+    "and assistant's very last response, ensuring the end of the conversation is "
+    "not truncated.\n\n"
     "### 3. Output Specification\n"
     "Your entire output MUST be a single block of text containing the "
     "following two sections in this exact order:\n"

{zrb-1.9.2 → zrb-1.9.4}/src/zrb/task/llm/context_enrichment.py

@@ -75,7 +75,7 @@ async def enrich_context(
             return new_long_term_context
         else:
             ctx.log_warning("Context enrichment returned no data.")
-    except Exception as e:
+    except BaseException as e:
         ctx.log_warning(f"Error during context enrichment LLM call: {e}")
         traceback.print_exc()
 

{zrb-1.9.2 → zrb-1.9.4}/src/zrb/task/llm/history_summarization.py

@@ -122,7 +122,7 @@ async def summarize_history(
             return new_summary
         else:
             ctx.log_warning("History summarization failed or returned no data.")
-    except Exception as e:
+    except BaseException as e:
         ctx.log_warning(f"Error during history summarization: {e}")
         traceback.print_exc()
 

zrb-1.9.2/src/zrb/__init__.py

@@ -1,117 +0,0 @@
-from zrb.attr.type import (
-    AnyAttr,
-    BoolAttr,
-    FloatAttr,
-    IntAttr,
-    StrAttr,
-    StrDictAttr,
-    fstring,
-)
-from zrb.callback.any_callback import AnyCallback
-from zrb.callback.callback import Callback
-from zrb.cmd.cmd_result import CmdResult
-from zrb.cmd.cmd_val import Cmd, CmdPath
-from zrb.config import CFG
-from zrb.content_transformer.any_content_transformer import AnyContentTransformer
-from zrb.content_transformer.content_transformer import ContentTransformer
-from zrb.context.any_context import AnyContext
-from zrb.context.any_shared_context import AnySharedContext
-from zrb.context.context import Context
-from zrb.context.shared_context import SharedContext
-from zrb.env.any_env import AnyEnv
-from zrb.env.env import Env
-from zrb.env.env_file import EnvFile
-from zrb.env.env_map import EnvMap
-from zrb.group.any_group import AnyGroup
-from zrb.group.group import Group
-from zrb.input.any_input import AnyInput
-from zrb.input.base_input import BaseInput
-from zrb.input.bool_input import BoolInput
-from zrb.input.float_input import FloatInput
-from zrb.input.int_input import IntInput
-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.llm_rate_limitter import llm_rate_limitter
-from zrb.runner.cli import cli
-from zrb.runner.web_auth_config import web_auth_config
-from zrb.runner.web_schema.user import User
-from zrb.session.session import Session
-from zrb.task.any_task import AnyTask
-from zrb.task.base_task import BaseTask
-from zrb.task.base_trigger import BaseTrigger
-from zrb.task.cmd_task import CmdTask
-from zrb.task.http_check import HttpCheck
-from zrb.task.llm.history import ConversationHistoryData
-from zrb.task.llm_task import LLMTask
-from zrb.task.make_task import make_task
-from zrb.task.rsync_task import RsyncTask
-from zrb.task.scaffolder import Scaffolder
-from zrb.task.scheduler import Scheduler
-from zrb.task.task import Task
-from zrb.task.tcp_check import TcpCheck
-from zrb.util.load import load_file, load_module
-from zrb.xcom.xcom import Xcom
-
-assert load_file
-assert load_module
-assert fstring
-assert AnyAttr
-assert BoolAttr
-assert IntAttr
-assert FloatAttr
-assert StrAttr
-assert StrDictAttr
-assert AnyCallback
-assert Callback
-assert AnyEnv
-assert Env
-assert EnvFile
-assert EnvMap
-assert AnyInput
-assert BaseInput
-assert BoolInput
-assert Cmd
-assert CmdPath
-assert CmdResult
-assert CmdTask
-assert HttpCheck
-assert TcpCheck
-assert FloatInput
-assert IntInput
-assert OptionInput
-assert PasswordInput
-assert StrInput
-assert TextInput
-assert AnyGroup
-assert Group
-assert AnyTask
-assert BaseTask
-assert BaseTrigger
-assert RsyncTask
-assert Task
-assert LLMTask
-assert ConversationHistoryData
-assert Session
-assert AnyContext
-assert Context
-assert AnySharedContext
-assert SharedContext
-assert make_task
-assert AnyContentTransformer
-assert ContentTransformer
-assert Scaffolder
-assert Scheduler
-assert cli
-assert llm_config
-assert llm_rate_limitter
-assert Xcom
-assert web_auth_config
-assert User
-
-if CFG.LOAD_BUILTIN:
-    from zrb import builtin
-
-    assert builtin