zrb 1.0.0b3__tar.gz → 1.0.0b5__tar.gz

{zrb-1.0.0b3 → zrb-1.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0b3
+Version: 1.0.0b5
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -21,8 +21,8 @@ Requires-Dist: chromadb (>=0.5.20,<0.6.0) ; extra == "rag"
 Requires-Dist: fastapi[standard] (>=0.115.6,<0.116.0)
 Requires-Dist: isort (>=5.13.2,<5.14.0)
 Requires-Dist: libcst (>=1.5.0,<2.0.0)
-Requires-Dist: litellm (>=1.52.12,<2.0.0)
 Requires-Dist: pdfplumber (>=0.11.4,<0.12.0) ; extra == "rag"
+Requires-Dist: pydantic-ai (>=0.0.19,<0.0.20)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.3.0,<4.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)

{zrb-1.0.0b3 → zrb-1.0.0b5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.0.0b3"
+version = "1.0.0b5"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -44,13 +44,13 @@ black = "~24.10.0"
 isort = "~5.13.2"
 requests = "^2.32.3"
 libcst = "^1.5.0"
-litellm = "^1.52.12"
 chromadb = {version = "^0.5.20", optional = true}
 pdfplumber = {version = "^0.11.4", optional = true}
 beautifulsoup4 = "^4.12.3"
 fastapi = {extras = ["standard"], version = "^0.115.6"}
 python-jose = {extras = ["cryptography"], version = "^3.3.0"}
 ulid-py = "^1.1.0"
+pydantic-ai = "^0.0.19"
 
 [tool.poetry.extras]
 # poetry install -E rag

zrb-1.0.0b5/src/zrb/builtin/llm/llm_chat.py

@@ -0,0 +1,127 @@
+import json
+import os
+from typing import Any
+
+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.web import open_web_route, query_internet
+from zrb.config import (
+    LLM_ALLOW_ACCESS_INTERNET,
+    LLM_ALLOW_ACCESS_SHELL,
+    LLM_HISTORY_DIR,
+    LLM_MODEL,
+    LLM_SYSTEM_PROMPT,
+)
+from zrb.context.any_shared_context import AnySharedContext
+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.file import read_file, write_file
+from zrb.util.string.conversion import to_pascal_case
+
+
+class PreviousSessionInput(StrInput):
+
+    def to_html(self, ctx: AnySharedContext) -> str:
+        name = self.name
+        description = self.description
+        default = self.get_default_str(ctx)
+        script = read_file(
+            file_path=os.path.join(os.path.dirname(__file__), "previous-session.js"),
+            replace_map={
+                "CURRENT_INPUT_NAME": name,
+                "CurrentPascalInputName": to_pascal_case(name),
+            },
+        )
+        return "\n".join(
+            [
+                f'<input name="{name}" placeholder="{description}" value="{default}" />',
+                f"<script>{script}</script>",
+            ]
+        )
+
+
+def _read_chat_conversation(ctx: AnySharedContext) -> list[dict[str, Any]]:
+    if ctx.input.start_new:
+        return []
+    previous_session_name = ctx.input.previous_session
+    if previous_session_name == "" or previous_session_name is None:
+        last_session_file_path = os.path.join(LLM_HISTORY_DIR, "last-session")
+        if os.path.isfile(last_session_file_path):
+            previous_session_name = read_file(last_session_file_path).strip()
+    conversation_file_path = os.path.join(
+        LLM_HISTORY_DIR, f"{previous_session_name}.json"
+    )
+    if not os.path.isfile(conversation_file_path):
+        return []
+    return json.loads(read_file(conversation_file_path))
+
+
+def _write_chat_conversation(
+    ctx: AnySharedContext, conversations: list[dict[str, Any]]
+):
+    os.makedirs(LLM_HISTORY_DIR, exist_ok=True)
+    current_session_name = ctx.session.name
+    conversation_file_path = os.path.join(
+        LLM_HISTORY_DIR, f"{current_session_name}.json"
+    )
+    write_file(conversation_file_path, json.dumps(conversations, indent=2))
+    last_session_file_path = os.path.join(LLM_HISTORY_DIR, "last-session")
+    write_file(last_session_file_path, current_session_name)
+
+
+llm_chat: LLMTask = llm_group.add_task(
+    LLMTask(
+        name="llm-chat",
+        input=[
+            StrInput(
+                "model",
+                description="LLM Model",
+                prompt="LLM Model",
+                default_str=LLM_MODEL,
+                allow_positional_parsing=False,
+            ),
+            TextInput(
+                "system-prompt",
+                description="System prompt",
+                prompt="System prompt",
+                default_str=LLM_SYSTEM_PROMPT,
+                allow_positional_parsing=False,
+            ),
+            BoolInput(
+                "start-new",
+                description="Start new conversation (LLM will forget everything)",
+                prompt="Start new conversation (LLM will forget everything)",
+                default_str="false",
+                allow_positional_parsing=False,
+            ),
+            TextInput("message", description="User message", prompt="Your message"),
+            PreviousSessionInput(
+                "previous-session",
+                description="Previous conversation session",
+                prompt="Previous conversation session (can be empty)",
+                allow_positional_parsing=False,
+                allow_empty=True,
+            ),
+        ],
+        conversation_history_reader=_read_chat_conversation,
+        conversation_history_writer=_write_chat_conversation,
+        description="Chat with LLM",
+        model="{ctx.input.model}",
+        system_prompt="{ctx.input['system-prompt']}",
+        message="{ctx.input.message}",
+        retries=0,
+    ),
+    alias="chat",
+)
+
+if LLM_ALLOW_ACCESS_SHELL:
+    llm_chat.add_tool(run_shell_command)
+
+if LLM_ALLOW_ACCESS_INTERNET:
+    llm_chat.add_tool(open_web_route)
+    llm_chat.add_tool(query_internet)
+    llm_chat.add_tool(get_current_location)
+    llm_chat.add_tool(get_current_weather)

zrb-1.0.0b5/src/zrb/builtin/llm/previous-session.js

@@ -0,0 +1,21 @@
+async function updatePreviousSession(event) {
+    const currentInput = event.target;
+    if (currentInput.name === "CURRENT_INPUT_NAME") {
+        return
+    }
+    const previousSessionInput = submitTaskForm.querySelector('[name="CURRENT_INPUT_NAME"]');
+    if (previousSessionInput) {
+        const currentSessionName = cfg.SESSION_NAME
+        previousSessionInput.value = currentSessionName;
+    }
+}
+
+document.getElementById("submit-task-form").querySelectorAll("input[name], textarea[name]").forEach((element) => {
+    element.addEventListener("input", updatePreviousSession);
+    element.addEventListener("keyup", updatePreviousSession);
+});
+
+document.getElementById("submit-task-form").querySelectorAll("select[name]").forEach((element) => {
+    element.addEventListener("change", updatePreviousSession);
+});
+

zrb-1.0.0b5/src/zrb/builtin/llm/tool/api.py

@@ -0,0 +1,29 @@
+import json
+from typing import Annotated, Literal
+
+import requests
+
+
+def get_current_location() -> (
+    Annotated[str, "JSON string representing latitude and longitude"]
+):  # noqa
+    """Get the user's current location."""
+    return json.dumps(requests.get("http://ip-api.com/json?fields=lat,lon").json())
+
+
+def get_current_weather(
+    latitude: float,
+    longitude: float,
+    temperature_unit: Literal["celsius", "fahrenheit"],
+) -> str:
+    """Get the current weather in a given location."""
+    resp = requests.get(
+        "https://api.open-meteo.com/v1/forecast",
+        params={
+            "latitude": latitude,
+            "longitude": longitude,
+            "temperature_unit": temperature_unit,
+            "current_weather": True,
+        },
+    )
+    return json.dumps(resp.json())

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/builtin/todo.py

@@ -294,6 +294,7 @@ def _get_default_stop_work_time_str() -> str:
             description="Todo.txt content",
             prompt="Todo.txt content (will override existing)",
             default_str=lambda _: _get_todo_txt_content(),
+            allow_positional_parsing=False,
         ),
     ],
     description="📝 Edit todo",

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/config.py

@@ -78,25 +78,23 @@ WEB_AUTH_REFRESH_TOKEN_EXPIRE_MINUTES = int(
 )
 LLM_MODEL = os.getenv("ZRB_LLM_MODEL", "ollama_chat/llama3.1")
 
-_DEFAULT_PROMPT = """
-You are a reliable assistant focused on providing accurate, helpful, and factual information.
-
-Key guidelines:
-1. Prioritize correctness and clarity.
-2. Avoid guessing—clearly state if more information is needed.
-3. Distinguish facts from opinions.
-4. Use phrases like "to the best of my knowledge" when appropriate.
-
-If unsure or lacking current data, inform the user and suggest verification.
-Accuracy always takes precedence over completeness.
-""".strip()
+_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"))
+)
 LLM_HISTORY_FILE = os.getenv(
-    "ZRB_LLM_HISTORY_FILE",
-    os.path.expanduser(os.path.join("~", ".zrb-llm-history.json")),
+    "ZRB_LLM_HISTORY_FILE", os.path.join(LLM_HISTORY_DIR, "history.json")
 )
 LLM_ALLOW_ACCESS_SHELL = to_boolean(os.getenv("ZRB_LLM_ACCESS_FILE", "1"))
-LLM_ALLOW_ACCESS_WEB = to_boolean(os.getenv("ZRB_LLM_ACCESS_WEB", "1"))
+LLM_ALLOW_ACCESS_INTERNET = to_boolean(os.getenv("ZRB_LLM_ACCESS_INTERNET", "1"))
 RAG_EMBEDDING_MODEL = os.getenv("ZRB_RAG_EMBEDDING_MODEL", "ollama/nomic-embed-text")
 RAG_CHUNK_SIZE = int(os.getenv("ZRB_RAG_CHUNK_SIZE", "1024"))
 RAG_OVERLAP = int(os.getenv("ZRB_RAG_OVERLAP", "128"))

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/any_input.py

@@ -19,6 +19,11 @@ class AnyInput(ABC):
     def prompt_message(self) -> str:
         pass
 
+    @property
+    @abstractmethod
+    def allow_positional_parsing(self) -> bool:
+        pass
+
     @abstractmethod
     def to_html(self, shared_ctx: AnySharedContext) -> str:
         pass

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/base_input.py

@@ -16,6 +16,7 @@ class BaseInput(AnyInput):
         default_str: StrAttr = "",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
     ):
         self._name = name
         self._description = description
@@ -23,6 +24,7 @@ class BaseInput(AnyInput):
         self._default_str = default_str
         self._auto_render = auto_render
         self._allow_empty = allow_empty
+        self._allow_positional_parsing = allow_positional_parsing
 
     def __repr__(self):
         return f"<{self.__class__.__name__} name={self._name}>"
@@ -39,6 +41,10 @@ class BaseInput(AnyInput):
     def prompt_message(self) -> str:
         return self._prompt if self._prompt is not None else self.name
 
+    @property
+    def allow_positional_parsing(self) -> bool:
+        return self._allow_positional_parsing
+
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/bool_input.py

@@ -13,6 +13,7 @@ class BoolInput(BaseInput):
         default_str: StrAttr = "False",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
     ):
         super().__init__(
             name=name,
@@ -21,6 +22,7 @@ class BoolInput(BaseInput):
             default_str=default_str,
             auto_render=auto_render,
             allow_empty=allow_empty,
+            allow_positional_parsing=allow_positional_parsing,
         )
 
     def to_html(self, ctx: AnySharedContext) -> str:

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/float_input.py

@@ -12,6 +12,7 @@ class FloatInput(BaseInput):
         default_str: StrAttr = "0.0",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
     ):
         super().__init__(
             name=name,
@@ -20,6 +21,7 @@ class FloatInput(BaseInput):
             default_str=default_str,
             auto_render=auto_render,
             allow_empty=allow_empty,
+            allow_positional_parsing=allow_positional_parsing,
         )
 
     def to_html(self, ctx: AnySharedContext) -> str:

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/int_input.py

@@ -12,6 +12,7 @@ class IntInput(BaseInput):
         default_str: StrAttr = "0",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
     ):
         super().__init__(
             name=name,
@@ -20,6 +21,7 @@ class IntInput(BaseInput):
             default_str=default_str,
             auto_render=auto_render,
             allow_empty=allow_empty,
+            allow_positional_parsing=allow_positional_parsing,
         )
 
     def to_html(self, ctx: AnySharedContext) -> str:

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/option_input.py

@@ -14,6 +14,7 @@ class OptionInput(BaseInput):
         default_str: StrAttr = "",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
     ):
         super().__init__(
             name=name,
@@ -22,6 +23,7 @@ class OptionInput(BaseInput):
             default_str=default_str,
             auto_render=auto_render,
             allow_empty=allow_empty,
+            allow_positional_parsing=allow_positional_parsing,
         )
         self._options = options
 

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/password_input.py

@@ -14,6 +14,7 @@ class PasswordInput(BaseInput):
         default_str: str | Callable[[AnySharedContext], str] = "",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
     ):
         super().__init__(
             name=name,
@@ -22,6 +23,7 @@ class PasswordInput(BaseInput):
             default_str=default_str,
             auto_render=auto_render,
             allow_empty=allow_empty,
+            allow_positional_parsing=allow_positional_parsing,
         )
         self._is_secret = True
 

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/input/text_input.py

@@ -18,6 +18,7 @@ class TextInput(BaseInput):
         default_str: str | Callable[[AnySharedContext], str] = "",
         auto_render: bool = True,
         allow_empty: bool = False,
+        allow_positional_parsing: bool = True,
         editor: str = DEFAULT_EDITOR,
         extension: str = ".txt",
         comment_start: str | None = None,
@@ -30,6 +31,7 @@ class TextInput(BaseInput):
             default_str=default_str,
             auto_render=auto_render,
             allow_empty=allow_empty,
+            allow_positional_parsing=allow_positional_parsing,
         )
         self._editor = editor
         self._extension = extension

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/runner/common_util.py

@@ -15,7 +15,7 @@ def get_run_kwargs(
         if task_input.name in str_kwargs:
             # Update shared context for next input default value
             task_input.update_shared_context(shared_ctx, str_kwargs[task_input.name])
-        elif arg_index < len(args):
+        elif arg_index < len(args) and task_input.allow_positional_parsing:
             run_kwargs[task_input.name] = args[arg_index]
             # Update shared context for next input default value
             task_input.update_shared_context(shared_ctx, run_kwargs[task_input.name])

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/runner/web_route/node_page/task/view.html

@@ -63,7 +63,7 @@
             <article>
                 <form id="submit-task-form" onsubmit="submitNewSessionForm(event)">
                     {task_inputs}
-                    <button>🚀 Run</button>
+                    <button>🚀 Run New Session</button>
                 </form>
             </article>
             <article>

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/runner/web_route/static/resources/session/current-session.js

@@ -4,18 +4,22 @@ const CURRENT_SESSION = {
         const logTextarea = document.getElementById("log-textarea");
         const submitTaskForm = document.getElementById("submit-task-form");
         let isFinished = false;
+        let isInputUpdated = false;
         let errorCount = 0;
         while (!isFinished) {
             try {
                 const data = await this.getCurrentSession();
                 // update inputs
-                const dataInputs = data.input;
-                for (const inputName in dataInputs) {
-                    const inputValue = dataInputs[inputName];
-                    const input = submitTaskForm.querySelector(`[name="${inputName}"]`);
-                    if (input) {
-                        input.value = inputValue;
+                if (!isInputUpdated) {
+                    const dataInputs = data.input;
+                    for (const inputName in dataInputs) {
+                        const inputValue = dataInputs[inputName];
+                        const input = submitTaskForm.querySelector(`[name="${inputName}"]`);
+                        if (input) {
+                            input.value = inputValue;
+                        }
                     }
+                    isInputUpdated = true;
                 }
                 resultLineCount = data.final_result.split("\n").length;
                 resultTextarea.rows = resultLineCount <= 5 ? resultLineCount : 5;
@@ -51,7 +55,6 @@ const CURRENT_SESSION = {
                     "Content-Type": "application/json"
                 },
             });
-            console.log("RESPONSE", response);
             return await response.json();
         } catch (error) {
             console.error("Error:", error);

{zrb-1.0.0b3 → zrb-1.0.0b5}/src/zrb/runner/web_route/static/resources/session/event.js

@@ -20,9 +20,9 @@ window.addEventListener("load", async function () {
 
 
 const submitTaskForm = document.getElementById("submit-task-form");
-submitTaskForm.addEventListener("change", async function(event) {
+async function handleInputUpdate(event) {
     const currentInput = event.target;
-    const inputs = Array.from(submitTaskForm.querySelectorAll("input[name], textarea[name]"));
+    const inputs = Array.from(submitTaskForm.querySelectorAll("input[name], textarea[name], select[name]"));
     const inputMap = {};
     const fixedInputNames = [];
     for (const input of inputs) {
@@ -56,6 +56,10 @@ submitTaskForm.addEventListener("change", async function(event) {
                 if (input === currentInput) {
                     return;
                 }
+                if (value === "") {
+                    return;
+                }
+                console.log(input, data);
                 input.value = value;
             });
         } else {
@@ -64,6 +68,14 @@ submitTaskForm.addEventListener("change", async function(event) {
     } catch (error) {
         console.error("Error during fetch:", error);
     }
+}
+
+submitTaskForm.querySelectorAll("input[name], textarea[name]").forEach((element) => {
+    element.addEventListener("input", handleInputUpdate);
+    element.addEventListener("keyup", handleInputUpdate);
+});
+submitTaskForm.querySelectorAll("select[name]").forEach((element) => {
+    element.addEventListener("change", handleInputUpdate);
 });