zrb 1.5.1__py3-none-any.whl → 1.5.2__py3-none-any.whl

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/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt

@@ -1,12 +1,12 @@
-fastapi[standard]~=0.115.6
-alembic~=1.14.0
-sqlmodel~=0.0.22
+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.5
+Jinja2~=3.1.6
 python-jose~=3.4.0
 passlib~=1.7.4
 
-pytest~=8.3.4
-pytest-asyncio~=0.24.0
-pytest-cov~=6.0.0
+pytest~=8.3.5
+pytest-asyncio~=0.26.0
+pytest-cov~=6.1.0

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

@@ -1,15 +1,16 @@
-import os
-
 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
 
 
-def test_homepage():
+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
-    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")
+    assert response.text == render_content(
+        "homepage.html",
+        page_name="gateway.home",
+        current_user=current_user,
+    ).body.decode("utf-8")

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.dist-info → zrb-1.5.2.dist-info}/METADATA

@@ -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.dist-info → zrb-1.5.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 zrb/__init__.py,sha256=1waPjZcA3IHUEvIuVQso0YfNfW9i7SCJgEfzhiNTaCk,3020
-zrb/__main__.py,sha256=MvAGzoM3ElJZOPMKNqaTdnrT9PXi9Saq8CPa11RiLQk,1748
+zrb/__main__.py,sha256=QJfEeJ-fsuxxb4md1BuAt7CX4jJmb8ttHf16bb2bf40,1768
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
 zrb/builtin/__init__.py,sha256=oXG4Zm_rIp3G81Y7hiSe38jeS2sGZAnADoP_yxxhYEc,1926
@@ -162,7 +162,7 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.yellow.min.css,sha256=mOkvNiE272UAgO8cVewJjU9BYidLxDZ97IcYodW--Ik,82218
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/pico-css/pico.zinc.min.css,sha256=s8SdVQv4fX3W0LbfKDgUDczWcCyUfRbZhpyYtLdASC0,82212
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/template/default.html,sha256=Lg4vONCLOx8PSORFitg8JZa-4dp-pyUvKSVzCJEFsB8,4048
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt,sha256=VqHI89r0E8sU5vp3h-AXrZy30vGWVP2E8MYsvVxQ_Wg,194
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt,sha256=jSLXX-ZOElSG69qjx5yVcpg6X_QJoisNDUYpCv2ldH8,195
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/schema/permission.py,sha256=q66LXdZ-QTb30F1VTXNLnjyYBlK_ThVLiHgavtJy4LY,1424
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/schema/role.py,sha256=7USbuhHhPc3xXkmwiqTVKsN8-eFWS8Q7emKxCGNGPw0,3244
@@ -175,7 +175,7 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/auth/permissio
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/auth/permission/test_update_permission.py,sha256=AHTUIX7cdR5tKkbxs6JVrp5uoeiwIvqaBrhLFGOYoFg,2498
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/auth/test_user_session.py,sha256=RITk3KohVSEzdvyoOefzrx2eabHEhAx3eS3opjZwU5k,7096
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_health_and_readiness.py,sha256=nqbRJtGQdaHsj3MqiFrUPpQteRBRPiyHp9dpdUZcMg0,823
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_homepage.py,sha256=fJGnHGXe893idQ94-0Yd50YfxQRQZq3bLTd2Rgq2d-A,498
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_homepage.py,sha256=NnhAjs8JParlmTKynRb-l65h8FvEG_Tap5m8kDYvxOM,618
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_not_found_error.py,sha256=SBqFRgGUldUtIz-uMf9a5DeWDPFeKbhvnvwiYr-jjns,502
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test.sh,sha256=QIwe6InrlEkmxdtj6NTO9JozeECYN0O4vx-x-qid6go,148
 zrb/builtin/project/add/fastapp/fastapp_util.py,sha256=LfKcb_daaAdhMz0BgbYd1yIvw7DQzruZ7bjB7gLGFdk,1533
@@ -300,7 +300,7 @@ zrb/task/base_task.py,sha256=SQRf37bylS586KwyW0eYDe9JZ5Hl18FP8kScHae6y3A,21251
 zrb/task/base_trigger.py,sha256=jC722rDvodaBLeNaFghkTyv1u0QXrK6BLZUUqcmBJ7Q,4581
 zrb/task/cmd_task.py,sha256=pUKRSR4DZKjbmluB6vi7cxqyhxOLfJ2czSpYeQbiDvo,10705
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
-zrb/task/llm_task.py,sha256=oPLruaSCqEF2fX5xtXfXflVYMknT2U5nBqC0CObT-ug,14282
+zrb/task/llm_task.py,sha256=di9lYvcwd3uCPe9KzbDsXNy2ZJT49DmIIuYUS_bd8DY,19942
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
 zrb/task/rsync_task.py,sha256=GSL9144bmp6F0EckT6m-2a1xG25AzrrWYzH4k3SVUKM,6370
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
@@ -341,7 +341,7 @@ zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=1nDdwPc22oFoK_1ZTXyf3638Bg6sqE2yp_U4_-frHoc,16015
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.5.1.dist-info/METADATA,sha256=wO-YpDHeIeoVT37roX4fGmsyN0XwRWSQOESYwpY9HTg,8515
-zrb-1.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.5.1.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.5.1.dist-info/RECORD,,
+zrb-1.5.2.dist-info/METADATA,sha256=sY3qVRuIZtiXKa-osPrsWzZ8Fa3rGHzz4NfBQFuuHP0,8470
+zrb-1.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.5.2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.5.2.dist-info/RECORD,,