zrb 1.4.1__tar.gz → 1.4.2__tar.gz

{zrb-1.4.1 → zrb-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.4.1
+Version: 1.4.2
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -44,7 +44,6 @@ Description-Content-Type: text/markdown
 
 Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you create custom automation workflows effortlessly. Whether you’re building CI/CD pipelines, code generators, or unique automation scripts, Zrb is designed to simplify and supercharge your workflow.
 
----
 
 ## 🚀 Why Zrb?
 
@@ -54,7 +53,6 @@ Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you cr
 - **Developer-Friendly:** Quick to install and get started, with clear documentation and examples.
 - **Web Interface:** Run Zrb as a server to make tasks accessible even to non-technical team members.
 
----
 
 ## 🔥 Key Features
 
@@ -64,11 +62,8 @@ Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you cr
 - **Flexible Input Handling:** Defaults, prompts, and command-line parameters to suit any workflow.
 - **Extensible & Open Source:** Contribute, customize, or extend Zrb to fit your unique needs.
 
----
 
-## 🛠️ Getting Started
-
-### Quick Installation
+# 🛠️ Installation
 
 Install Zrb via pip:
 
@@ -84,7 +79,7 @@ bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/mai
 
 ```
 
-### Your First Task
+# 🍲 Quick Start
 
 Create a file at `/home/<your-user-name>/zrb_init.py` with the following content:
 
@@ -183,7 +178,8 @@ Now, let's see how things work in detail. First, Zrb generates a `state diagram.
 
 - **Step by step guide:** [Getting started with Zrb](https://github.com/state-alchemists/zrb/blob/main/docs/recipes/getting-started/README.md).
 - **Full documentation:** [Zrb Documentation](https://github.com/state-alchemists/zrb/blob/main/docs/README.md)
-- **Video demo:** [![Video Title](https://img.youtube.com/vi/W7dgk96l__o/0.jpg)](https://www.youtube.com/watch?v=W7dgk96l__o)
+- **Video demo:**
+  [![Video Title](https://img.youtube.com/vi/W7dgk96l__o/0.jpg)](https://www.youtube.com/watch?v=W7dgk96l__o)
 
 
 # 🤝 Join the Community

{zrb-1.4.1 → zrb-1.4.2}/README.md

@@ -9,7 +9,6 @@
 
 Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you create custom automation workflows effortlessly. Whether you’re building CI/CD pipelines, code generators, or unique automation scripts, Zrb is designed to simplify and supercharge your workflow.
 
----
 
 ## 🚀 Why Zrb?
 
@@ -19,7 +18,6 @@ Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you cr
 - **Developer-Friendly:** Quick to install and get started, with clear documentation and examples.
 - **Web Interface:** Run Zrb as a server to make tasks accessible even to non-technical team members.
 
----
 
 ## 🔥 Key Features
 
@@ -29,11 +27,8 @@ Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you cr
 - **Flexible Input Handling:** Defaults, prompts, and command-line parameters to suit any workflow.
 - **Extensible & Open Source:** Contribute, customize, or extend Zrb to fit your unique needs.
 
----
 
-## 🛠️ Getting Started
-
-### Quick Installation
+# 🛠️ Installation
 
 Install Zrb via pip:
 
@@ -49,7 +44,7 @@ bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/mai
 
 ```
 
-### Your First Task
+# 🍲 Quick Start
 
 Create a file at `/home/<your-user-name>/zrb_init.py` with the following content:
 
@@ -148,7 +143,8 @@ Now, let's see how things work in detail. First, Zrb generates a `state diagram.
 
 - **Step by step guide:** [Getting started with Zrb](https://github.com/state-alchemists/zrb/blob/main/docs/recipes/getting-started/README.md).
 - **Full documentation:** [Zrb Documentation](https://github.com/state-alchemists/zrb/blob/main/docs/README.md)
-- **Video demo:** [![Video Title](https://img.youtube.com/vi/W7dgk96l__o/0.jpg)](https://www.youtube.com/watch?v=W7dgk96l__o)
+- **Video demo:**
+  [![Video Title](https://img.youtube.com/vi/W7dgk96l__o/0.jpg)](https://www.youtube.com/watch?v=W7dgk96l__o)
 
 
 # 🤝 Join the Community

{zrb-1.4.1 → zrb-1.4.2}/pyproject.toml

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

{zrb-1.4.1 → zrb-1.4.2}/src/zrb/builtin/llm/llm_chat.py

@@ -22,7 +22,6 @@ from zrb.config import (
     LLM_ALLOW_ACCESS_LOCAL_FILE,
     LLM_ALLOW_ACCESS_SHELL,
     LLM_HISTORY_DIR,
-    LLM_SYSTEM_PROMPT,
     SERP_API_KEY,
 )
 from zrb.context.any_shared_context import AnySharedContext
@@ -119,7 +118,7 @@ llm_chat: LLMTask = llm_group.add_task(
                 "system-prompt",
                 description="System prompt",
                 prompt="System prompt",
-                default=LLM_SYSTEM_PROMPT,
+                default="",
                 allow_positional_parsing=False,
                 always_prompt=False,
             ),
@@ -141,17 +140,19 @@ llm_chat: LLMTask = llm_group.add_task(
                 always_prompt=False,
             ),
         ],
-        model=lambda ctx: None if ctx.input.model == "" else ctx.input.model,
+        model=lambda ctx: None if ctx.input.model.strip() == "" else ctx.input.model,
         model_base_url=lambda ctx: (
-            None if ctx.input.base_url == "" else ctx.input.base_url
+            None if ctx.input.base_url.strip() == "" else ctx.input.base_url
         ),
         model_api_key=lambda ctx: (
-            None if ctx.input.api_key == "" else ctx.input.api_key
+            None if ctx.input.api_key.strip() == "" 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=lambda ctx: (
+            None if ctx.input.system_prompt.strip() == "" else ctx.input.system_prompt
+        ),
         message="{ctx.input.message}",
         retries=0,
     ),

{zrb-1.4.1 → zrb-1.4.2}/src/zrb/builtin/llm/tool/file.py

@@ -127,12 +127,12 @@ def _should_exclude(full_path: str, excluded_patterns: list[str]) -> bool:
 
 
 def read_text_file(file: str) -> str:
-    """Read a text file"""
+    """Read a text file and return a string containing the file content."""
     return read_file(os.path.abspath(file))
 
 
 def write_text_file(file: str, content: str):
-    """Write a text file"""
+    """Write content to a text file"""
     return write_file(os.path.abspath(file), content)
 
 

{zrb-1.4.1 → zrb-1.4.2}/src/zrb/config.py

@@ -76,15 +76,6 @@ WEB_AUTH_REFRESH_TOKEN_EXPIRE_MINUTES = int(
     os.getenv("ZRB_WEB_REFRESH_TOKEN_EXPIRE_MINUTES", "60")
 )
 
-_DEFAULT_PROMPT = (
-    "You are a helpful AI assistant capable of using various tools to answer user queries. When solving a problem:\n"
-    "1. Carefully analyze the user's request and identify what information is needed to provide a complete answer.\n"
-    "2. Determine which available tools can help you gather the necessary information.\n"
-    "3. Call tools strategically and in a logical sequence to collect required data.\n"
-    "4. If a tool provides incomplete information, intelligently decide which additional tool or approach to use.\n"
-    "5. Always aim to provide the most accurate and helpful response possible."
-)
-LLM_SYSTEM_PROMPT = os.getenv("ZRB_LLM_SYSTEM_PROMPT", _DEFAULT_PROMPT)
 LLM_HISTORY_DIR = os.getenv(
     "ZRB_LLM_HISTORY_DIR", os.path.expanduser(os.path.join("~", ".zrb-llm-history"))
 )

zrb-1.4.2/src/zrb/llm_config.py

@@ -0,0 +1,95 @@
+import os
+
+from pydantic_ai.models import Model
+from pydantic_ai.models.openai import OpenAIModel
+from pydantic_ai.providers.openai import OpenAIProvider
+
+DEFAULT_SYSTEM_PROMPT = """
+You have access to tools.
+Your goal to to answer user queries accurately.
+Follow these instructions precisely:
+1. ALWAYS use available tools to gather information BEFORE asking the user questions
+2. For tools that require arguments: provide arguments in valid JSON format
+3. For tools that require NO arguments: call with empty JSON object ({}) NOT empty string ('')
+4. NEVER pass arguments to tools that don't accept parameters
+5. NEVER ask users for information obtainable through tools
+6. Use tools in logical sequence until you have sufficient information
+7. If a tool call fails, check if you're passing arguments in the correct format
+8. Only after exhausting relevant tools should you request clarification
+""".strip()
+
+
+class LLMConfig:
+
+    def __init__(
+        self,
+        default_model_name: str | None = None,
+        default_base_url: str | None = None,
+        default_api_key: str | None = None,
+        default_system_prompt: str | None = None,
+    ):
+        self._model_name = (
+            default_model_name
+            if default_model_name is not None
+            else os.getenv("ZRB_LLM_MODEL", None)
+        )
+        self._model_base_url = (
+            default_base_url
+            if default_base_url is not None
+            else os.getenv("ZRB_LLM_BASE_URL", None)
+        )
+        self._model_api_key = (
+            default_api_key
+            if default_api_key is not None
+            else os.getenv("ZRB_LLM_API_KEY", None)
+        )
+        self._system_prompt = (
+            default_system_prompt
+            if default_system_prompt is not None
+            else os.getenv("ZRB_LLM_SYSTEM_PROMPT", 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._model_base_url is None and self._model_api_key is None:
+            return "openai"
+        return OpenAIProvider(
+            base_url=self._model_base_url, api_key=self._model_api_key
+        )
+
+    def get_default_system_prompt(self) -> str:
+        if self._system_prompt is not None:
+            return self._system_prompt
+        return DEFAULT_SYSTEM_PROMPT
+
+    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_system_prompt(self, system_prompt: str):
+        self._system_prompt = system_prompt
+
+    def set_default_model_name(self, model_name: str):
+        self._model_name = model_name
+
+    def set_default_model_api_key(self, model_api_key: str):
+        self._model_api_key = model_api_key
+
+    def set_default_model_base_url(self, model_base_url: str):
+        self._model_base_url = model_base_url
+
+    def set_default_model(self, model: Model | str | None):
+        self._default_model = model
+
+
+llm_config = LLMConfig()

{zrb-1.4.1 → zrb-1.4.2}/src/zrb/task/llm_task.py

@@ -18,7 +18,6 @@ from pydantic_ai.models import Model
 from pydantic_ai.settings import ModelSettings
 
 from zrb.attr.type import StrAttr, fstring
-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
@@ -58,7 +57,7 @@ class LLMTask(BaseTask):
             ModelSettings | Callable[[AnySharedContext], ModelSettings] | None
         ) = None,
         agent: Agent | Callable[[AnySharedContext], Agent] | None = None,
-        system_prompt: StrAttr | None = LLM_SYSTEM_PROMPT,
+        system_prompt: StrAttr | None = None,
         render_system_prompt: bool = True,
         message: StrAttr | None = None,
         tools: (
@@ -258,14 +257,14 @@ class LLMTask(BaseTask):
             return default_llm_config.get_default_model()
         if isinstance(model, str):
             llm_config = LLMConfig(
-                model_name=model,
-                base_url=get_attr(
+                default_model_name=model,
+                default_base_url=get_attr(
                     ctx,
                     self._get_model_base_url(ctx),
                     None,
                     auto_render=self._render_model_base_url,
                 ),
-                api_key=get_attr(
+                default_api_key=get_attr(
                     ctx,
                     self._get_model_api_key(ctx),
                     None,
@@ -292,12 +291,15 @@ class LLMTask(BaseTask):
         raise ValueError(f"Invalid model base URL: {api_key}")
 
     def _get_system_prompt(self, ctx: AnyContext) -> str:
-        return get_str_attr(
+        system_prompt = get_attr(
             ctx,
             self._system_prompt,
-            "You are a helpful assistant",
+            None,
             auto_render=self._render_system_prompt,
         )
+        if system_prompt is not None:
+            return system_prompt
+        return default_llm_config.get_default_system_prompt()
 
     def _get_message(self, ctx: AnyContext) -> str:
         return get_str_attr(ctx, self._message, "How are you?", auto_render=True)

zrb-1.4.1/src/zrb/llm_config.py

@@ -1,50 +0,0 @@
-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()