aixtools 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

aixtools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.3'
-__version_tuple__ = version_tuple = (0, 3, 3)
+__version__ = version = '0.3.5'
+__version_tuple__ = version_tuple = (0, 3, 5)
 
 __commit_id__ = commit_id = None

aixtools/a2a/app.py

@@ -6,6 +6,9 @@ import json
 from functools import partial
 from typing import assert_never
 
+from a2a.server.apps import A2AStarletteApplication
+from a2a.server.request_handlers import RequestHandler
+from a2a.types import AgentCard
 from fasta2a.applications import FastA2A
 from fasta2a.broker import InMemoryBroker
 from fasta2a.schema import Part, TaskSendParams
@@ -26,6 +29,8 @@ from starlette.exceptions import HTTPException
 from starlette.requests import Request
 from starlette.responses import RedirectResponse
 
+from aixtools.a2a.auth_middleware import AuthMiddleware
+from aixtools.auth.auth import AccessTokenAuthProvider
 from aixtools.context import session_id_var, user_id_var
 
 
@@ -124,3 +129,18 @@ def fix_a2a_docs_pages(app: Starlette) -> None:
 
     app.router.add_route("/.well-known/agent.json", redirect_to_sub_agent, methods=["GET"])
     app.router.add_route("/", redirect_to_sub_agent, methods=["POST"])
+
+
+def build_a2a_starlette_app(
+    public_agent_card: AgentCard, request_handler: RequestHandler, auth_provider: AccessTokenAuthProvider | None = None
+) -> Starlette:
+    """Builds a A2AStarletteApplication with the given auth provider."""
+    server = A2AStarletteApplication(
+        agent_card=public_agent_card,
+        http_handler=request_handler,
+    )
+
+    app = server.build()
+    if auth_provider:
+        app.add_middleware(AuthMiddleware, provider=auth_provider)
+    return app

aixtools/a2a/auth_middleware.py

@@ -0,0 +1,46 @@
+"Auth module managing user authentication for A2A server"
+
+from logging import getLogger
+
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.requests import Request
+
+from aixtools.auth.auth import AccessTokenAuthProvider, AuthTokenError
+from aixtools.utils import config
+
+logger = getLogger(__name__)
+
+
+class AuthMiddleware(BaseHTTPMiddleware):  # pylint: disable=too-few-public-methods
+    """
+    Middleware that enforces access token authentication for A2A route.
+    """
+
+    AGENT_CARD_PATH_SUFFIXES = [".well-known/agent.json", ".well-known/agent-card.json"]
+    APP_DEFAULT_SCOPE = config.APP_DEFAULT_SCOPE
+
+    def __init__(self, app, provider: AccessTokenAuthProvider):
+        super().__init__(app)
+        self.provider = provider
+
+    async def dispatch(self, request: Request, call_next):
+        """
+        Auth middleware function that checks whether the request has a valid access token.
+
+        :param request: The incoming http request
+        :param call_next: The next function in the chain
+        :raises HTTPException: If an access token isn't valid or missing
+        """
+
+        path = request.url.path
+
+        # allow agent cards to pass
+        if any(path.endswith(suffix) for suffix in self.AGENT_CARD_PATH_SUFFIXES):
+            return await call_next(request)
+
+        auth_header = request.headers.get("Authorization") or request.headers.get("authorization")
+        try:
+            await self.provider.verify_auth_header(auth_header)
+            return await call_next(request)
+        except AuthTokenError as e:
+            raise e.to_http_exception(self.APP_DEFAULT_SCOPE)

aixtools/auth/auth.py

@@ -120,6 +120,7 @@ class AccessTokenVerifier:
         except InvalidSignatureError as e:
             raise AuthTokenError(AuthTokenErrorCode.INVALID_SIGNATURE) from e
         except jwt.exceptions.PyJWTError as e:
+            logger.exception("Unable to check JWT token: %s", token)
             raise AuthTokenError(AuthTokenErrorCode.JWT_ERROR) from e
 
     def authorize_claims(self, claims: dict, expected_scope: str):
@@ -148,10 +149,11 @@ class AccessTokenVerifier:
             logger.info("Authorized JWT token, against %s", groups)
             return
 
-        logger.error("Could not find any group in JWT token, matching: %s", self.authorized_groups)
+        email = claims.get("email")
+        logger.warning("User %s group %s does not match configured groups %s", email, groups, self.authorized_groups)
         raise AuthTokenError(
             AuthTokenErrorCode.MISSING_GROUPS_ERROR,
-            f"Could not find any group in JWT token, matching: {self.authorized_groups}",
+            f"User {email} group {groups} does not match configured groups {self.authorized_groups}",
         )
 
 

aixtools/testing/aix_test_model.py

@@ -19,6 +19,20 @@ from ..utils.utils import async_iter
 FINAL_RESULT_TOOL_NAME = "final_result"
 
 
+def _convert_to_parts(items: list[str | TextPart | ToolCallPart]) -> list[TextPart | ToolCallPart]:
+    """Convert a list of strings, TextParts, or ToolCallParts to a list of Parts."""
+    parts: list[TextPart | ToolCallPart] = []
+    for item in items:
+        match item:
+            case str():
+                parts.append(TextPart(item))
+            case TextPart() | ToolCallPart():
+                parts.append(item)
+            case _:
+                raise ValueError(f"Invalid item type in list: {type(item)}, item: {item}")
+    return parts
+
+
 def final_result_tool(result: BaseModel | dict) -> ToolCallPart:
     """Create a ToolCallPart for the final result."""
     if isinstance(result, BaseModel):
@@ -33,7 +47,11 @@ class AixTestModel(Model):
     Test model, returns a specified list of answers, including messages or tool calls
     This is used for testing the agent and model interaction with the rest of the system.
 
-    responses: Is a list of strings or ToolCallPart objects that the model will return in order.
+    responses: Is a list of response items that the model will return in order. Each item can be:
+        - str: A simple text response
+        - TextPart: A text part
+        - ToolCallPart: A tool call
+        - list[str | TextPart | ToolCallPart]: Multiple parts in a single response
 
     Note: The agent will continue to invoke 'request()' until it returns a txt (i.e. not a ToolCallPart).
 
@@ -69,11 +87,25 @@ class AixTestModel(Model):
                     ]
                 )
     ```
+
+    Example with multiple parts in a single response:
+    ```
+        model = AixTestModel(
+                    responses=[
+                        [
+                            "First, let me think about this...",
+                            ToolCallPart(tool_name='analyze', args={'data': 'xyz'}),
+                            TextPart("Analysis complete."),
+                        ],
+                        "Final answer after analysis.",
+                    ]
+                )
+    ```
     """
 
     def __init__(  # pylint: disable=super-init-not-called
         self,
-        responses: list[str | TextPart | ToolCallPart] | AsyncGeneratorType,
+        responses: list[str | TextPart | ToolCallPart | list[str | TextPart | ToolCallPart]] | AsyncGeneratorType,
         sleep_time: float | None = None,
     ):
         self.response_iter = responses(self) if callable(responses) else async_iter(responses)
@@ -141,15 +173,14 @@ class AixTestModel(Model):
         if callable(res):
             res = res(self, messages)
         match res:
-            case str():
-                return ModelResponse(parts=[TextPart(res)], model_name=self.model_name)
-            case ToolCallPart():
-                return ModelResponse(parts=[res], model_name=self.model_name)
-            case TextPart():
-                return ModelResponse(parts=[res], model_name=self.model_name)
             case Exception():
                 raise res
+            case list():
+                parts = _convert_to_parts(res)
+            case str() | TextPart() | ToolCallPart():
+                parts = _convert_to_parts([res])
             case _:
                 raise ValueError(f"Invalid response type: {type(res)}, response: {res}")
         if self.sleep_time:
             await asyncio.sleep(self.sleep_time)
+        return ModelResponse(parts=parts, model_name=self.model_name)

{aixtools-0.3.3.dist-info → aixtools-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aixtools
-Version: 0.3.3
+Version: 0.3.5
 Summary: Tools for AI exploration and debugging
 Requires-Python: >=3.11.2
 Description-Content-Type: text/markdown

{aixtools-0.3.3.dist-info → aixtools-0.3.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aixtools/__init__.py,sha256=9NGHm7LjsQmsvjTZvw6QFJexSvAU4bCoN_KBk9SCa00,260
-aixtools/_version.py,sha256=lemL_4Kl75FgrO6lVuFrrtw6-Dcf9wtXBalKkXuzkO4,704
+aixtools/_version.py,sha256=UAb2Toi6SAdScDfq1uKRRv5QpMUuRtJqqwNxTMGe5Q4,704
 aixtools/app.py,sha256=JzQ0nrv_bjDQokllIlGHOV0HEb-V8N6k_nGQH-TEsVU,5227
 aixtools/chainlit.md,sha256=yC37Ly57vjKyiIvK4oUvf4DYxZCwH7iocTlx7bLeGLU,761
 aixtools/context.py,sha256=I_MD40ZnvRm5WPKAKqBUAdXIf8YaurkYUUHSVVy-QvU,598
@@ -17,7 +17,8 @@ aixtools/.chainlit/translations/nl.json,sha256=R3e-WxkQXAiuQgnnXjFWhwzpn1EA9xJ8g
 aixtools/.chainlit/translations/ta.json,sha256=pxa2uLEEDjiGiT6MFcCJ_kNh5KoFViHFptcJjc79Llc,17224
 aixtools/.chainlit/translations/te.json,sha256=0qGj-ODEHVOcxfVVX5IszS1QBCKSXuU1okANP_EbvBQ,16885
 aixtools/.chainlit/translations/zh-CN.json,sha256=EWxhT2_6CW9z0F6SI2llr3RsaL2omH1QZWHVG2n5POA,8664
-aixtools/a2a/app.py,sha256=p18G7fAInl9dcNYq6RStBjv1C3aD6oilQq3WXtBuk30,5069
+aixtools/a2a/app.py,sha256=ugx9FR8QadpEIgy79V6vx1zoamm6ldds6PYKePPQ3sA,5809
+aixtools/a2a/auth_middleware.py,sha256=Q9JmM0JZyJinQBm_BbSizhKpUgIvyWXEegCUmm204AI,1635
 aixtools/a2a/utils.py,sha256=EHr3IyyBJn23ni-JcfAf6i3VpQmPs0g1TSnAZazvY_8,4039
 aixtools/a2a/google_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aixtools/a2a/google_sdk/remote_agent_connection.py,sha256=wJXIHD76yL3nlI4b9IA7FQlpKRxrFDsSh78TIm1Fy4E,3329
@@ -33,7 +34,7 @@ aixtools/agents/nodes_to_str.py,sha256=UkOu5Nry827J4H_ohQU3tPBfJxtr3p6FfCfWoUy5u
 aixtools/agents/print_nodes.py,sha256=wVTngNfqM0As845WTRz6G3Rei_Gr3HuBlvu-G_eXuig,1665
 aixtools/agents/prompt.py,sha256=oZl6_3SelyoSysLpF6AAmLHLHhwyPYCtX8hJ2pRUnhw,7396
 aixtools/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aixtools/auth/auth.py,sha256=rCvkcZCDNo-f3lsuMkLlcfpTO5GlRsHY9qhCnB7ayhU,8123
+aixtools/auth/auth.py,sha256=0GAelLK6MaLq-iHm4jE76UPvLplEfodlxb0VYRttLNk,8258
 aixtools/compliance/__init__.py,sha256=vnw0zEdySIJWvDAJ8DCRRaWmY_agEOz1qlpAdhmtiuo,191
 aixtools/compliance/private_data.py,sha256=OOM9mIp3_w0fNgj3VAEWBl7-jrPc19_Ls1pC5dfF5UY,5323
 aixtools/db/__init__.py,sha256=b8vRhme3egV-aUZbAntnOaDkSXB8UT0Xy5oqQhU_z0Q,399
@@ -77,7 +78,7 @@ aixtools/server/path.py,sha256=nI4yRQcE6gjKx5GG3PmHf7iT1FelT6Q8Xhw4ol9O1e0,5219
 aixtools/server/utils.py,sha256=jIRgFT_tdgwuyI8vjc9iQJyDvC0CAoi09Gc5of6I1dg,3554
 aixtools/testing/__init__.py,sha256=mlmaAR2gmS4SbsYNCxnIprmFpFp-syjgVUkpUszo3mE,166
 aixtools/testing/agent_mock.py,sha256=D4DrRGaeKuWEhq8hdB5s9PdfLAXHMKiC3JA7M8yN13o,4244
-aixtools/testing/aix_test_model.py,sha256=i0xBdmpKoEfJHle6JDmcoJLUENN8Eqt181_WZ7XtDdU,6240
+aixtools/testing/aix_test_model.py,sha256=ylmZ-fcG8Y_5lQHzI-B4oQg8Tp6r67EfTqSoy7kyQE4,7429
 aixtools/testing/mock_tool.py,sha256=4I0LxxSkLhGIKM2YxCP3cnYI8IYJjdKhfwGZ3dioXsM,2465
 aixtools/testing/model_patch_cache.py,sha256=238gKC_gSpR3BkeejhetObOkpOR1l2Iz3A6B_eUTRNc,10158
 aixtools/tools/doctor/__init__.py,sha256=FPwYzC1eJyw8IH0-BP0wgxSprLy6Y_4yXCek7496f2k,64
@@ -95,8 +96,8 @@ aixtools/utils/chainlit/cl_agent_show.py,sha256=vaRuowp4BRvhxEr5hw0zHEJ7iaSF_5bo
 aixtools/utils/chainlit/cl_utils.py,sha256=fxaxdkcZg6uHdM8uztxdPowg3a2f7VR7B26VPY4t-3c,5738
 aixtools/vault/__init__.py,sha256=fsr_NuX3GZ9WZ7dGfe0gp_5-z3URxAfwVRXw7Xyc0dU,141
 aixtools/vault/vault.py,sha256=9dZLWdZQk9qN_Q9Djkofw9LUKnJqnrX5H0fGusVLBhA,6037
-aixtools-0.3.3.dist-info/METADATA,sha256=7DYSkk-wIir2no9izjOLxApYnkpzxa99JZ_-kI7npuY,28014
-aixtools-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aixtools-0.3.3.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
-aixtools-0.3.3.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
-aixtools-0.3.3.dist-info/RECORD,,
+aixtools-0.3.5.dist-info/METADATA,sha256=k1_-0YKmcLSeY36KVz-rxDYY1fwiB2iS_ncE9j8UozI,28014
+aixtools-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aixtools-0.3.5.dist-info/entry_points.txt,sha256=q8412TG4T0S8K0SKeWp2vkVPIDYQs0jNoHqcQ7qxOiA,155
+aixtools-0.3.5.dist-info/top_level.txt,sha256=wBn-rw9bCtxrR4AYEYgjilNCUVmKY0LWby9Zan2PRJM,9
+aixtools-0.3.5.dist-info/RECORD,,