zrb 1.5.1__tar.gz → 1.5.2__tar.gz

{zrb-1.5.1 → zrb-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.5.1
+Version: 1.5.2
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -16,19 +16,18 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
 Provides-Extra: playwright
 Provides-Extra: rag
-Requires-Dist: autopep8 (>=2.0.4,<3.0.0)
-Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0)
-Requires-Dist: black (>=24.10.0,<24.11.0)
-Requires-Dist: chromadb (>=0.5.20,<0.6.0) ; extra == "rag" or extra == "all"
-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: openai (>=1.10.0,<2.0.0) ; extra == "rag" or extra == "all"
-Requires-Dist: pdfplumber (>=0.11.4,<0.12.0) ; extra == "rag" or extra == "all"
-Requires-Dist: playwright (>=1.43.0,<2.0.0) ; extra == "playwright" or extra == "all"
-Requires-Dist: psutil (>=6.1.1,<7.0.0)
-Requires-Dist: pydantic-ai (>=0.0.42,<0.0.43)
-Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
+Requires-Dist: beautifulsoup4 (>=4.13.3,<5.0.0)
+Requires-Dist: black (>=25.1.0,<25.2.0)
+Requires-Dist: chromadb (>=0.6.3,<0.7.0) ; extra == "rag" or extra == "all"
+Requires-Dist: fastapi[standard] (>=0.115.12,<0.116.0)
+Requires-Dist: isort (>=6.0.1,<6.1.0)
+Requires-Dist: libcst (>=1.7.0,<2.0.0)
+Requires-Dist: openai (>=1.70.0,<2.0.0) ; extra == "rag" or extra == "all"
+Requires-Dist: pdfplumber (>=0.11.6,<0.12.0) ; extra == "rag" or extra == "all"
+Requires-Dist: playwright (>=1.51.0,<2.0.0) ; extra == "playwright" or extra == "all"
+Requires-Dist: psutil (>=7.0.0,<8.0.0)
+Requires-Dist: pydantic-ai (>=0.0.49,<0.0.50)
+Requires-Dist: python-dotenv (>=1.1.0,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.4.0,<4.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: ulid-py (>=1.1.0,<2.0.0)

{zrb-1.5.1 → zrb-1.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.5.1"
+version = "1.5.2"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -38,22 +38,21 @@ exclude = [
 
 [tool.poetry.dependencies]
 python = ">=3.10.0,<4.0.0"
-python-dotenv = "^1.0.1"
-autopep8 = "^2.0.4"
-black = "~24.10.0"
-isort = "~5.13.2"
+python-dotenv = "^1.1.0"
+black = "~25.1.0"
+isort = "~6.0.1"
 requests = "^2.32.3"
-libcst = "^1.5.0"
-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"}
+libcst = "^1.7.0"
+chromadb = {version = "^0.6.3", optional = true}
+pdfplumber = {version = "^0.11.6", optional = true}
+beautifulsoup4 = "^4.13.3"
+fastapi = {extras = ["standard"], version = "^0.115.12"}
 python-jose = {extras = ["cryptography"], version = "^3.4.0"}
 ulid-py = "^1.1.0"
-pydantic-ai = "^0.0.42"
-openai = {version = "^1.10.0", optional = true}
-playwright = {version = "^1.43.0", optional = true}
-psutil = "^6.1.1"
+pydantic-ai = "^0.0.49"
+openai = {version = "^1.70.0", optional = true}
+playwright = {version = "^1.51.0", optional = true}
+psutil = "^7.0.0"
 
 [tool.poetry.extras]
 # poetry install -E rag
@@ -62,12 +61,13 @@ playwright = ["playwright"]
 all = ["chromadb", "pdfplumber", "openai", "playwright"]
 
 [tool.poetry.group.dev.dependencies]
-alembic = "^1.14.0" # FastApp dependencies
-flake8 = "~7.1.1"
-pytest = "~8.3.3"
-pytest-cov = "~6.0.0"
-pytest-asyncio = "~0.24.0"
-sqlmodel = "^0.0.22" # FastApp dependencies
+alembic = "^1.15.2" # FastApp dependencies
+autopep8 = "^2.0.4"
+flake8 = "~7.2.0"
+pytest = "~8.3.5"
+pytest-cov = "~6.1.0"
+pytest-asyncio = "~0.26.0"
+sqlmodel = "^0.0.24" # FastApp dependencies
 tomlkit = "^0.13.2"
 
 [tool.pytest.ini_options]

{zrb-1.5.1 → zrb-1.5.2}/src/zrb/__main__.py

@@ -16,7 +16,7 @@ def serve_cli():
         zrb_init_path_list = _get_zrb_init_path_list()
         # load init scripts
         for init_script in INIT_SCRIPTS:
-            abs_init_script = os.path.abspath(init_script)
+            abs_init_script = os.path.abspath(os.path.expanduser(init_script))
             if abs_init_script not in zrb_init_path_list:
                 load_file(abs_init_script, -1)
         # load zrb init

zrb-1.5.2/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt

@@ -0,0 +1,12 @@
+fastapi[standard]~=0.115.12
+alembic~=1.15.2
+sqlmodel~=0.0.24
+ulid-py~=1.1.0
+passlib~=1.7.4
+Jinja2~=3.1.6
+python-jose~=3.4.0
+passlib~=1.7.4
+
+pytest~=8.3.5
+pytest-asyncio~=0.26.0
+pytest-cov~=6.1.0

zrb-1.5.2/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_homepage.py

@@ -0,0 +1,16 @@
+from fastapi.testclient import TestClient
+from my_app_name.main import app
+from my_app_name.module.auth.service.user.user_service_factory import user_service
+from my_app_name.module.gateway.util.view import render_content
+
+
+async def test_homepage():
+    current_user = await user_service.get_current_user(access_token=None)
+    client = TestClient(app, base_url="http://localhost")
+    response = client.get("/")
+    assert response.status_code == 200
+    assert response.text == render_content(
+        "homepage.html",
+        page_name="gateway.home",
+        current_user=current_user,
+    ).body.decode("utf-8")

{zrb-1.5.1 → zrb-1.5.2}/src/zrb/task/llm_task.py

@@ -1,3 +1,4 @@
+import copy
 import functools
 import inspect
 import json
@@ -6,6 +7,7 @@ import traceback
 from collections.abc import Callable
 from typing import Any
 
+from openai import APIError
 from pydantic_ai import Agent, Tool
 from pydantic_ai.messages import (
     FinalResultEvent,
@@ -139,16 +141,31 @@ class LLMTask(BaseTask):
         history = await self._read_conversation_history(ctx)
         user_prompt = self._get_message(ctx)
         agent = self._get_agent(ctx)
-        async with agent.iter(
-            user_prompt=user_prompt,
-            message_history=ModelMessagesTypeAdapter.validate_python(history),
-        ) as agent_run:
-            async for node in agent_run:
-                # Each node represents a step in the agent's execution
-                await self._print_node(ctx, agent_run, node)
-        new_history = json.loads(agent_run.result.all_messages_json())
-        await self._write_conversation_history(ctx, new_history)
-        return agent_run.result.data
+        try:
+            async with agent.iter(
+                user_prompt=user_prompt,
+                message_history=ModelMessagesTypeAdapter.validate_python(history),
+            ) as agent_run:
+                async for node in agent_run:
+                    # Each node represents a step in the agent's execution
+                    # Reference: https://ai.pydantic.dev/agents/#streaming
+                    try:
+                        await self._print_node(ctx, agent_run, node)
+                    except APIError as e:
+                        # Extract detailed error information from the response
+                        error_details = _extract_api_error_details(e)
+                        ctx.log_error(f"API Error: {error_details}")
+                        raise
+                    except Exception as e:
+                        ctx.log_error(f"Error processing node: {str(e)}")
+                        ctx.log_error(f"Error type: {type(e).__name__}")
+                        raise
+                new_history = json.loads(agent_run.result.all_messages_json())
+                await self._write_conversation_history(ctx, new_history)
+                return agent_run.result.data
+        except Exception as e:
+            ctx.log_error(f"Error in agent execution: {str(e)}")
+            raise
 
     async def _print_node(self, ctx: AnyContext, agent_run: Any, node: Any):
         if Agent.is_user_prompt_node(node):
@@ -204,9 +221,20 @@ class LLMTask(BaseTask):
             async with node.stream(agent_run.ctx) as handle_stream:
                 async for event in handle_stream:
                     if isinstance(event, FunctionToolCallEvent):
-                        # Fixing anthrophic claude when call function with empty parameter
-                        if event.part.args == "":
+                        # Handle empty arguments across different providers
+                        if event.part.args == "" or event.part.args is None:
+                            event.part.args = {}
+                        elif isinstance(
+                            event.part.args, str
+                        ) and event.part.args.strip() in ["null", "{}"]:
+                            # Some providers might send "null" or "{}" as a string
                             event.part.args = {}
+                        # Handle dummy property if present (from our schema sanitization)
+                        if (
+                            isinstance(event.part.args, dict)
+                            and "_dummy" in event.part.args
+                        ):
+                            del event.part.args["_dummy"]
                         ctx.print(
                             stylize_faint(
                                 f"[Tools] The LLM calls tool={event.part.tool_name!r} with args={event.part.args} (tool_call_id={event.part.tool_call_id!r})"  # noqa
@@ -330,13 +358,101 @@ class LLMTask(BaseTask):
 
 
 def _wrap_tool(func):
-    @functools.wraps(func)
-    async def wrapper(*args, **kwargs):
+    sig = inspect.signature(func)
+    if len(sig.parameters) == 0:
+
+        @functools.wraps(func)
+        async def wrapper(_dummy=None):
+            try:
+                return await run_async(func())
+            except Exception as e:
+                # Optionally, you can include more details from traceback if needed.
+                error_details = traceback.format_exc()
+                return f"Error: {e}\nDetails: {error_details}"
+
+        new_sig = inspect.Signature(
+            parameters=[
+                inspect.Parameter(
+                    "_dummy", inspect.Parameter.POSITIONAL_OR_KEYWORD, default=None
+                )
+            ]
+        )
+        # Override the wrapper's signature so introspection yields a non-empty schema.
+        wrapper.__signature__ = new_sig
+        return wrapper
+    else:
+
+        @functools.wraps(func)
+        async def wrapper(*args, **kwargs):
+            try:
+                return await run_async(func(*args, **kwargs))
+            except Exception as e:
+                # Optionally, you can include more details from traceback if needed.
+                error_details = traceback.format_exc()
+                return f"Error: {e}\nDetails: {error_details}"
+
+        return wrapper
+
+
+def _extract_api_error_details(error: APIError) -> str:
+    """Extract detailed error information from an APIError."""
+    details = f"{error.message}"
+    # Try to parse the error body as JSON
+    if error.body:
         try:
-            return await run_async(func(*args, **kwargs))
+            if isinstance(error.body, str):
+                body_json = json.loads(error.body)
+            elif isinstance(error.body, bytes):
+                body_json = json.loads(error.body.decode("utf-8"))
+            else:
+                body_json = error.body
+            # Extract error details from the JSON structure
+            if isinstance(body_json, dict):
+                if "error" in body_json:
+                    error_obj = body_json["error"]
+                    if isinstance(error_obj, dict):
+                        if "message" in error_obj:
+                            details += f"\nProvider message: {error_obj['message']}"
+                        if "code" in error_obj:
+                            details += f"\nError code: {error_obj['code']}"
+                        if "status" in error_obj:
+                            details += f"\nStatus: {error_obj['status']}"
+                # Check for metadata that might contain provider-specific information
+                if "metadata" in body_json and isinstance(body_json["metadata"], dict):
+                    metadata = body_json["metadata"]
+                    if "provider_name" in metadata:
+                        details += f"\nProvider: {metadata['provider_name']}"
+                    if "raw" in metadata:
+                        try:
+                            raw_json = json.loads(metadata["raw"])
+                            if "error" in raw_json and isinstance(
+                                raw_json["error"], dict
+                            ):
+                                raw_error = raw_json["error"]
+                                if "message" in raw_error:
+                                    details += (
+                                        f"\nRaw error message: {raw_error['message']}"
+                                    )
+                        except (KeyError, TypeError, ValueError):
+                            # If we can't parse the raw JSON, just include it as is
+                            details += f"\nRaw error data: {metadata['raw']}"
+        except json.JSONDecodeError:
+            # If we can't parse the JSON, include the raw body
+            details += f"\nRaw error body: {error.body}"
         except Exception as e:
-            # Optionally, you can include more details from traceback if needed.
-            error_details = traceback.format_exc()
-            return f"Error: {e}\nDetails: {error_details}"
-
-    return wrapper
+            # Catch any other exceptions during parsing
+            details += f"\nError parsing error body: {str(e)}"
+    # Include request information if available
+    if hasattr(error, "request") and error.request:
+        if hasattr(error.request, "method") and hasattr(error.request, "url"):
+            details += f"\nRequest: {error.request.method} {error.request.url}"
+        # Include a truncated version of the request content if available
+        if hasattr(error.request, "content") and error.request.content:
+            content = error.request.content
+            if isinstance(content, bytes):
+                try:
+                    content = content.decode("utf-8")
+                except UnicodeDecodeError:
+                    content = str(content)
+            details += f"\nRequest content: {content}"
+    return details

zrb-1.5.1/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt

@@ -1,12 +0,0 @@
-fastapi[standard]~=0.115.6
-alembic~=1.14.0
-sqlmodel~=0.0.22
-ulid-py~=1.1.0
-passlib~=1.7.4
-Jinja2~=3.1.5
-python-jose~=3.4.0
-passlib~=1.7.4
-
-pytest~=8.3.4
-pytest-asyncio~=0.24.0
-pytest-cov~=6.0.0

zrb-1.5.1/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_homepage.py

@@ -1,15 +0,0 @@
-import os
-
-from fastapi.testclient import TestClient
-from my_app_name.main import app
-from my_app_name.module.gateway.util.view import render_content
-
-
-def test_homepage():
-    client = TestClient(app, base_url="http://localhost")
-    response = client.get("/")
-    assert response.status_code == 200
-    view_path = os.path.join(
-        os.path.dirname(os.path.dirname(__file__)), "module", "gateway", "view"
-    )
-    assert response.text == render_content("homepage.html").body.decode("utf-8")