zrb 1.8.11__py3-none-any.whl → 1.8.13__py3-none-any.whl

zrb/builtin/llm/chat_session.py

@@ -8,6 +8,7 @@ conversation flow via XCom.
 import asyncio
 
 from zrb.context.any_context import AnyContext
+from zrb.llm_config import llm_config
 from zrb.util.cli.style import stylize_bold_yellow, stylize_faint
 
 
@@ -113,11 +114,14 @@ def get_llm_ask_input_mapping(callback_ctx: AnyContext):
         A dictionary containing the input mapping for the LLM ask task.
     """
     data = callback_ctx.xcom.ask_trigger.pop()
+    system_prompt = callback_ctx.input.system_prompt
+    if system_prompt is None or system_prompt.strip() == "":
+        system_prompt = llm_config.default_interactive_system_prompt
     return {
         "model": callback_ctx.input.model,
         "base-url": callback_ctx.input.base_url,
         "api-key": callback_ctx.input.api_key,
-        "system-prompt": callback_ctx.input.system_prompt,
+        "system-prompt": system_prompt,
         "start-new": data.get("start_new"),
         "previous-session": data.get("previous_session_name"),
         "message": data.get("message"),

zrb/config.py

@@ -225,6 +225,10 @@ class Config:
     def LLM_SYSTEM_PROMPT(self) -> str | None:
         return os.getenv("ZRB_LLM_SYSTEM_PROMPT", None)
 
+    @property
+    def LLM_INTERACTIVE_SYSTEM_PROMPT(self) -> str | None:
+        return os.getenv("ZRB_LLM_INTERACTIVE_SYSTEM_PROMPT", None)
+
     @property
     def LLM_PERSONA(self) -> str | None:
         return os.getenv("ZRB_LLM_PERSONA", None)

zrb/llm_config.py

@@ -17,7 +17,7 @@ DEFAULT_PERSONA = (
     "straight to the point."
 ).strip()
 
-DEFAULT_SYSTEM_PROMPT = (
+DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
     "You have access to tools and two forms of memory:\n"
     "1.  A structured summary of the immediate task (including a payload) AND "
     "the raw text of the last few turns.\n"
@@ -50,6 +50,13 @@ DEFAULT_SYSTEM_PROMPT = (
     "guess."
 ).strip()
 
+DEFAULT_SYSTEM_PROMPT = (
+    "You are a helpful and precise expert assistant. Your goal is to "
+    "follow instructions carefully to provide an accurate and efficient answer. "
+    "Fulfill the user's request directly. Use your tools if necessary. "
+    "Get straight to the point."
+).strip()
+
 DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "## Technical Task Protocol\n"
     "When performing technical tasks, strictly follow this protocol.\n\n"
@@ -202,6 +209,7 @@ class LLMConfig:
         default_api_key: str | None = None,
         default_persona: str | None = None,
         default_system_prompt: str | None = None,
+        default_interactive_system_prompt: str | None = None,
         default_special_instruction_prompt: str | None = None,
         default_summarization_prompt: str | None = None,
         default_context_enrichment_prompt: str | None = None,
@@ -218,6 +226,7 @@ class LLMConfig:
         self._default_model_api_key = default_api_key
         self._default_persona = default_persona
         self._default_system_prompt = default_system_prompt
+        self._default_interactive_system_prompt = default_interactive_system_prompt
         self._default_special_instruction_prompt = default_special_instruction_prompt
         self._default_summarization_prompt = default_summarization_prompt
         self._default_context_enrichment_prompt = default_context_enrichment_prompt
@@ -282,6 +291,14 @@ class LLMConfig:
             return CFG.LLM_SYSTEM_PROMPT
         return DEFAULT_SYSTEM_PROMPT
 
+    @property
+    def default_interactive_system_prompt(self) -> str:
+        if self._default_interactive_system_prompt is not None:
+            return self._default_interactive_system_prompt
+        if CFG.LLM_INTERACTIVE_SYSTEM_PROMPT is not None:
+            return CFG.LLM_INTERACTIVE_SYSTEM_PROMPT
+        return DEFAULT_INTERACTIVE_SYSTEM_PROMPT
+
     @property
     def default_persona(self) -> str:
         if self._default_persona is not None:
@@ -358,6 +375,9 @@ class LLMConfig:
     def set_default_system_prompt(self, system_prompt: str):
         self._default_system_prompt = system_prompt
 
+    def set_default_interactive_system_prompt(self, interactive_system_prompt: str):
+        self._default_interactive_system_prompt = interactive_system_prompt
+
     def set_default_special_instruction_prompt(self, special_instruction_prompt: str):
         self._default_special_instruction_prompt = special_instruction_prompt
 

zrb/runner/web_app.py

@@ -39,7 +39,7 @@ def create_web_app(
     async def lifespan(app: FastAPI):
         capitalized_group_name = CFG.ROOT_GROUP_NAME.capitalize()
         for line in CFG.BANNER.split("\n") + [
-            f"{capitalized_group_name} Server running on http://localhost:{web_auth_config.port}"
+            f"{capitalized_group_name} Server running on http://localhost:{CFG.WEB_HTTP_PORT}"
         ]:
             print(line, file=sys.stderr)
         yield

zrb/runner/web_auth_config.py

@@ -8,7 +8,6 @@ from zrb.task.any_task import AnyTask
 class WebAuthConfig:
     def __init__(
         self,
-        port: int | None = None,
         secret_key: str | None = None,
         access_token_expire_minutes: int | None = None,
         refresh_token_expire_minutes: int | None = None,
@@ -21,7 +20,6 @@ class WebAuthConfig:
         guest_accessible_tasks: list[AnyTask | str] = [],
         find_user_by_username: Callable[[str], User | None] | None = None,
     ):
-        self._port = port
         self._secret_key = secret_key
         self._access_token_expire_minutes = access_token_expire_minutes
         self._refresh_token_expire_minutes = refresh_token_expire_minutes
@@ -35,12 +33,6 @@ class WebAuthConfig:
         self._guest_accessible_tasks = guest_accessible_tasks
         self._find_user_by_username = find_user_by_username
 
-    @property
-    def port(self) -> int:
-        if self._port is not None:
-            return self._port
-        return CFG.WEB_HTTP_PORT
-
     @property
     def secret_key(self) -> str:
         if self._secret_key is not None:
@@ -129,9 +121,6 @@ class WebAuthConfig:
             return [self.default_user]
         return self._user_list + [self.super_admin, self.default_user]
 
-    def set_port(self, port: int):
-        self._port = port
-
     def set_secret_key(self, secret_key: str):
         self._secret_key = secret_key
 

{zrb-1.8.11.dist-info → zrb-1.8.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.8.11
+Version: 1.8.13
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -43,20 +43,16 @@ Description-Content-Type: text/markdown
 
 # 🤖 Zrb: Your Automation Powerhouse
 
-
-**Unlock the full potential of automation in your projects!**
-
-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.
-
+Zrb simplifies the creation and execution of automation tasks. It allows you to define tasks using Python classes or functions, organize them into groups, and run them via a command-line interface or a web UI. Zrb handles task dependencies, inputs, environment variables, and inter-task communication, allowing you to focus on the logic of your automation.
 
 ## 🚀 Why Zrb?
 
-- **Easy Automation with Python:** Write your tasks in Python and let Zrb handle the rest.
-- **Seamless Integration:** Utilize built-in support for LLM tasks, command execution, and more.
-- **Custom Workflows:** Chain tasks, set dependencies, and build robust automation pipelines.
-- **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.
-
+Zrb stands out by offering:
+* **Python-Native Automation:** Write tasks in a familiar and powerful language.
+* **LLM Integration:** Easily incorporate AI capabilities into your workflows.
+* **Structured Workflows:** Define dependencies and organize tasks logically.
+* **Flexible Execution:** Run tasks from the CLI or a web browser.
+* **Extensibility:** Customize and build upon the Zrb framework.
 
 ## 🔥 Key Features
 
@@ -64,33 +60,44 @@ Zrb streamlines repetitive tasks, integrates with powerful LLMs, and lets you cr
 - **Task Chaining:** Easily define dependencies between tasks to create complex workflows.
 - **CLI & Server Mode:** Run tasks directly from the command line or through a user-friendly web UI.
 - **Flexible Input Handling:** Defaults, prompts, and command-line parameters to suit any workflow.
+* **Environment Variables:** Manage configuration using environment variables, loaded from the system, `.env` files, or task definitions.
+* **Cross-Communication (XCom):** Safely exchange small amounts of data between tasks.
 - **Extensible & Open Source:** Contribute, customize, or extend Zrb to fit your unique needs.
 
 
 # 🛠️ Installation
 
-Install Zrb via pip:
+The easiest way to install Zrb is using pip:
 
 ```bash
 pip install zrb
 # pip install --pre zrb
 ```
 
-Or run our installation script to set up Zrb along with all prerequisites:
+Alternatively, you can use Zrb installation script which handles prerequisites:
 
 ```bash
 bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
 ```
 
-You can also [run Zrb as container](https://github.com/state-alchemists/zrb?tab=readme-ov-file#-run-zrb-as-a-container)
+For more installation option like running Zrb on your **Android Device 📱** or **as a Container 🐋**, you can check the [installation and configuration guide](https://github.com/state-alchemists/zrb/blob/main/docs/installation-and-configuration/README.md).
 
 # 🍲 Quick Start: Build Your First Automation Workflow
 
-Zrb empowers you to create custom automation tasks using Python. This guide shows you how to define two simple tasks: one to generate a Mermaid script from your source code and another to convert that script into a PNG image.
+This guide shows you how to define two simple tasks:
+
+- One to generate a Mermaid Diagram Script from your source code.
+- 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`)
 
 ## 1. Create Your Task Definition File
 
-Place a file named `zrb_init.py` in a directory that's accessible from your projects. Zrb will automatically search for this file by starting in your current directory and then moving upward (i.e., checking parent directories) until it finds one. This means if you place your `zrb_init.py` in your home directory (e.g., `/home/<your-user-name>/zrb_init.py`), the tasks defined there will be available for any project.
+Place a file named `zrb_init.py` in a directory that's accessible from your projects.
+
+Zrb will automatically search for this file by starting in your current directory and then moving upward (i.e., checking parent directories) until it finds one.
+
+This means if you place your `zrb_init.py` in your home directory (e.g., `/home/<your-user-name>/zrb_init.py`), the tasks defined there will be available for any project inside your home directory.
 
 Add the following content to your zrb_init.py:
 
@@ -145,11 +152,11 @@ make_mermaid_script >> make_mermaid_image
 
 - **Task 1 – make-script**:
 
-    Uses an LLM to read all files in your current directory and generate a Mermaid script (e.g., `state diagram.mmd`).
+    Uses an LLM to read all files in your current directory and generate a [Mermaid Diagram Script](https://mermaid.js.org/) (e.g., `state diagram.mmd`).
 
 - **Task 2 – make-image**:
 
-    Executes a command that converts the Mermaid script into a PNG image (e.g., `state diagram.png`). This task will run only after the script has been generated.
+    Executes a command that converts the Mermaid Diagram Script into a PNG image (e.g., `state diagram.png`). This task will run only after the script has been generated.
 
 
 ## 2. Run Your Tasks
@@ -177,14 +184,16 @@ After setting up your tasks, you can execute them from any project. For example:
 
     Zrb will prompt:
 
-    ```bash
+    ```
     dir [./]:
     diagram [state diagram]:
     ```
 
     Press **Enter** to use the default value
 
-![State Diagram](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/state-diagram.png)
+- And you have your State Diagram ready :)
+
+    ![State Diagram](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/state-diagram.png)
 
 
 ## 3. Try Out the Web UI
@@ -199,41 +208,10 @@ Then open your browser and visit `http://localhost:21213`
 
 ![Zrb Web UI](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/zrb-web-ui.png)
 
-
-# 🐋 Run Zrb as a Container
-
-Zrb can be run in a containerized environment, offering two distinct versions to suit different needs:
-
-- **Standard Version**: Ideal for general use cases where Docker CLI access is not required.
-- **Dind (Docker in Docker) Version**: Includes built-in Docker commands, perfect for scenarios where you need to access the host's Docker CLI.
-
-### Standard Version
-
-The standard version of the Zrb container is suitable for most automation tasks. To run this version, execute the following command:
-
-```bash
-# Replace <host-path> and <container-path> with your desired paths
-docker run -v ${HOME}:/zrb-home -it --rm stalchmst/zrb:1.8.1 zrb
-```
-
-### Dind Version
-
-The Dind version is tailored for advanced use cases where Docker commands need to be executed within the container. This version allows the container to interact with the host's Docker daemon. To run the Dind version, use the command below:
-
-```bash
-# Replace <host-path> and <container-path> with your desired paths
-docker run \
-    -v ${HOME}:/zrb-home \
-    -v /var/run/docker.sock:/var/run/docker.sock \
-    -it --rm stalchmst/zrb:1.8.1-dind docker ps
-```
-
-> **Note:** The Dind (Docker in Docker) version of the container is larger in size compared to the standard version due to the inclusion of Docker CLI tools. Consider this when choosing the appropriate version for your needs.
-
 # 🎥 Demo & Documentation
 
-- **Full documentation:** [Zrb Documentation](https://github.com/state-alchemists/zrb/blob/main/docs/README.md)
-- **Video demo:**
+- **Go Further By Visiting Our 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)
 

{zrb-1.8.11.dist-info → zrb-1.8.13.dist-info}/RECORD

@@ -9,7 +9,7 @@ zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,35
 zrb/builtin/group.py,sha256=t008xLM4_fgbjfZrPoi_fQAnSHIo6MOiQSCHBO4GDYU,2379
 zrb/builtin/http.py,sha256=sLqEczuSxGYXWzyJR6frGOHkPTviu4BeyroUr3-ZuAI,4322
 zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
-zrb/builtin/llm/chat_session.py,sha256=ot2ss6yA4qIINg0nl3KJYnLag8H0eB9ggAgRGEUkZdE,6639
+zrb/builtin/llm/chat_session.py,sha256=Nfn_HXAKjKeIKWQt4nfS9k0VWmrg0JhexlJKVw58WLQ,6841
 zrb/builtin/llm/history.py,sha256=cnkOyO43uiMQ9cEvmqk-pPoCk1zCAH_fwAqSgBtsjzY,3079
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
 zrb/builtin/llm/llm_ask.py,sha256=QUV29gOAFKiMfJlAKbY9YfGPoxYv-4RPv6p7cWogK4U,4438
@@ -217,7 +217,7 @@ zrb/callback/callback.py,sha256=PFhCqzfxdk6IAthmXcZ13DokT62xtBzJr_ciLw6I8Zg,4030
 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=qFtVVme30fMyi5x_mgvvULczNbORqK8ZEN8agXokXO4,10222
+zrb/config.py,sha256=L4nrdO8uK1MNOJiTgywkjlYn5kX1dOsq48b5mPZ2004,10364
 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
@@ -246,13 +246,13 @@ 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=6T3MngWdUs0u0ZVs5Dl11w5KS7nN1RkgrIR_zKumzPM,3695
-zrb/llm_config.py,sha256=pXWHp-7WcAF3s5Gec8IBqoC_l3aRvU3aGt2Yr96SxGo,16607
+zrb/llm_config.py,sha256=PaOsd9i5rwq_Ry68T6tpgQ2sWdjq-SeCuw7XMaHxw7Q,17577
 zrb/llm_rate_limitter.py,sha256=uM9zmSgV10fQq1dlaDGLDrv72uLj6ldBxMoGjO2Az14,4429
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=AbLTNqFy5FuyGQOWOjHZGaBC8e2yuE_Dx1sBdnisR18,6984
 zrb/runner/common_util.py,sha256=JDMcwvQ8cxnv9kQrAoKVLA40Q1omfv-u5_d5MvvwHeE,1373
-zrb/runner/web_app.py,sha256=pydxJakSMsopvWWzkWLtMz7NyRORiS1KHKuG0jIF6N0,2792
-zrb/runner/web_auth_config.py,sha256=LwEDcfH0W57Z8SQIl8i-JpVibofB72gmzjPFiwUznQs,6361
+zrb/runner/web_app.py,sha256=L61fwHBKbG1BuoC8JASCUwoPYjBt2h90HtPQBpZALLs,2789
+zrb/runner/web_auth_config.py,sha256=g9C5ZFrYKlhJ4MqsA1uKsd9s3kN5sJiAN9QmGkRwBfc,6100
 zrb/runner/web_route/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/web_route/docs_route.py,sha256=Ftv4BbxnF_GZs2cJwen4hV7Z_UKQassFugB_bePdrPw,543
 zrb/runner/web_route/error_page/serve_default_404.py,sha256=srQSyOHoTZLScSvSUQnzUAVFOFSO_NQ2XEQZSvPd05c,1072
@@ -390,7 +390,7 @@ zrb/util/string/name.py,sha256=SXEfxJ1-tDOzHqmSV8kvepRVyMqs2XdV_vyoh_9XUu0,1584
 zrb/util/todo.py,sha256=VGISej2KQZERpornK-8X7bysp4JydMrMUTnG8B0-liI,20708
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.8.11.dist-info/METADATA,sha256=BxzTycMW2mrqcOCsi4k9Z_672xnzwp4IkYPpGrKrkn8,10108
-zrb-1.8.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.8.11.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.8.11.dist-info/RECORD,,
+zrb-1.8.13.dist-info/METADATA,sha256=oqzBj3hnl1XlXUSSib6obfP_75DGHvZnJCIjZIx7tJ4,9274
+zrb-1.8.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.8.13.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.8.13.dist-info/RECORD,,