Merge branch 'main' into feature-Eliza-with-authentication

Author: mprynce

.github/workflows/linter.yaml

@@ -37,3 +37,9 @@ jobs:
           VALIDATE_YAML_PRETTIER: false
           VALIDATE_GIT_COMMITLINT: false
           VALIDATE_JSCPD: false
+          VALIDATE_JUPYTER_NBQA_BLACK: false
+          VALIDATE_JUPYTER_NBQA_ISORT: false
+          VALIDATE_JUPYTER_NBQA_FLAKE8: false
+          VALIDATE_JUPYTER_NBQA_MYPY: false
+          VALIDATE_JUPYTER_NBQA_PYLINT: false
+          VALIDATE_JUPYTER_NBQA_RUFF: false

.github/workflows/update_notebook_links.py

@@ -0,0 +1,119 @@
+"""Check links in notebooks for accuracy."""
+
+import os
+import sys
+import urllib.parse
+
+import nbformat
+
+
+LINK_PREFIXES = {
+    'colab_link': 'https://colab.research.google.com/github/a2aproject/a2a-samples/blob/main/',
+    'colab_enterprise_link': 'https://console.cloud.google.com/vertex-ai/colab/import/',
+    'github_link': 'https://github.com/a2aproject/a2a-samples/blob/main/',
+    'workbench_link': 'https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=',
+    'bigquery_studio_link': 'https://console.cloud.google.com/bigquery/import?url=',
+    'linkedin_link': 'https://www.linkedin.com/sharing/share-offsite/?url=',
+    'bluesky_link': 'https://bsky.app/intent/compose?text=',
+    'twitter_link': 'https://twitter.com/intent/tweet?url=',
+    'reddit_link': 'https://reddit.com/submit?url=',
+    'facebook_link': 'https://www.facebook.com/sharer/sharer.php?u=',
+}
+
+GITHUB_URL_PREFIX = LINK_PREFIXES['github_link']
+RAW_URL_PREFIX = (
+    'https://raw.githubusercontent.com/a2aproject/a2a-samples/main/'
+)
+
+
+def fix_markdown_links(
+    cell_source: str, relative_notebook_path: str
+) -> tuple[str, bool]:
+    """Fixes links in a markdown cell and returns the updated source."""
+    new_lines = []
+    changes_made = False
+
+    encoded_url = urllib.parse.quote(
+        f'{GITHUB_URL_PREFIX}{relative_notebook_path}'
+    )
+
+    for line in cell_source.splitlines():
+        for key, prefix in LINK_PREFIXES.items():
+            if prefix not in line or '**NOTE:**' in line:
+                continue
+
+            start_index = line.find(prefix) + len(prefix)
+            end_index = line.find('.ipynb', start_index) + len('.ipynb')
+            correct_link = ''
+
+            if key in {'colab_link', 'github_link'}:
+                correct_link = relative_notebook_path
+            elif key == 'colab_enterprise_link':
+                correct_link = urllib.parse.quote(
+                    f'{RAW_URL_PREFIX}{relative_notebook_path}',
+                    safe=':',
+                )
+            elif key == 'workbench_link':
+                correct_link = f'{RAW_URL_PREFIX}{relative_notebook_path}'
+            elif key == 'bigquery_studio_link':
+                correct_link = f'{GITHUB_URL_PREFIX}{relative_notebook_path}'
+            elif key in {
+                'linkedin_link',
+                'bluesky_link',
+                'twitter_link',
+                'reddit_link',
+                'facebook_link',
+            }:
+                correct_link = encoded_url
+
+            if correct_link.lower() not in line.lower():
+                print(f'Incorrect link in {relative_notebook_path}: {line}\n')
+                print(f'Should be: {correct_link}\n')
+                line = line.replace(line[start_index:end_index], correct_link)
+                changes_made = True
+
+        new_lines.append(line)
+
+    return '\n'.join(new_lines), changes_made
+
+
+def fix_links_in_notebook(notebook_path: str) -> int:
+    """Fixes specific types of links in a Jupyter notebook."""
+    with open(notebook_path, encoding='utf-8') as f:
+        notebook = nbformat.read(f, as_version=4)
+
+    relative_notebook_path = os.path.relpath(
+        notebook_path, start=os.getcwd()
+    ).lower()
+
+    for cell in notebook.cells:
+        if (
+            cell.cell_type == 'markdown'
+            and '<table' in cell.source
+            and 'colab' in cell.source
+        ):
+            updated_source, changes_made = fix_markdown_links(
+                cell.source, relative_notebook_path
+            )
+            if changes_made:
+                cell.source = updated_source
+                with open(notebook_path, 'w', encoding='utf-8') as f:
+                    nbformat.write(notebook, f)
+                return 1
+    return 0
+
+
+def process_directory(directory_path: str) -> None:
+    """Recursively processes all notebooks in a directory."""
+    for root, _, files in os.walk(directory_path):
+        for filename in files:
+            if filename.endswith('.ipynb'):
+                notebook_path = os.path.join(root, filename)
+                fix_links_in_notebook(notebook_path)
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        print('Usage: python update_notebook_links.py <directory_path>')
+        sys.exit(1)
+    process_directory(sys.argv[1])

.ruff.toml

@@ -25,10 +25,12 @@ ignore = [
     "TD003",  # Ignore Missing issue link in TODOs (often not required/available)
     "T201",   # Ignore print presence
     "RUF012", # Ignore Mutable class attributes should be annotated with `typing.ClassVar`
+    "UP007",  # Do not upgrade `Optional[T]` to `T | None` (PEP 604 syntax)
     "E501",   # Ignore line length (handled by Ruff's dynamic line length)
     "ANN002",
     "ANN003",
     "ANN401",
+    "E402",
 ]
 
 select = [

demo/ui/components/agent_list.py

@@ -26,8 +26,10 @@ def agents_list(
         df_data['Organization'].append(
             agent_info.provider.organization if agent_info.provider else ''
         )
-        df_data['Input Modes'].append(', '.join(agent_info.defaultInputModes))
-        df_data['Output Modes'].append(', '.join(agent_info.defaultOutputModes))
+        df_data['Input Modes'].append(', '.join(agent_info.default_input_modes))
+        df_data['Output Modes'].append(
+            ', '.join(agent_info.default_output_modes)
+        )
         df_data['Streaming'].append(agent_info.capabilities.streaming)
     df = pd.DataFrame(
         pd.DataFrame(df_data),

demo/ui/components/conversation.py

@@ -42,8 +42,8 @@ async def send_message(message: str, message_id: str = ''):
     if not c:
         print('Conversation id ', state.conversation_id, ' not found')
     request = Message(
-        messageId=message_id,
-        contextId=state.conversation_id,
+        message_id=message_id,
+        context_id=state.conversation_id,
         role=Role.user,
         parts=[Part(root=TextPart(text=message))],
     )

demo/ui/components/form_render.py

@@ -314,9 +314,9 @@ async def cancel_form(e: me.ClickEvent):
     app_state.background_tasks[message_id] = ''
     app_state.completed_forms[form_message_id] = None
     request = Message(
-        messageId=message_id,
-        taskId=task_id,
-        contextId=app_state.current_conversation_id,
+        message_id=message_id,
+        task_id=task_id,
+        context_id=app_state.current_conversation_id,
         role=Role.user,
         parts=[Part(root=TextPart(text='rejected form entry'))],
     )
@@ -332,9 +332,9 @@ async def send_response(
     form = FormState(**json.loads(state.forms[id]))
     print('Sending form response', form)
     request = Message(
-        messageId=message_id,
-        taskId=task_id,
-        contextId=app_state.current_conversation_id,
+        message_id=message_id,
+        task_id=task_id,
+        context_id=app_state.current_conversation_id,
         role=Role.user,
         parts=[Part(root=DataPart(data=form.data))],
     )

demo/ui/pages/agent_list.py

@@ -12,8 +12,8 @@
 from utils.agent_card import get_agent_card
 
 
-def agent_list_page(app_state: AppState):
-    """Agents List Page"""
+def agent_list_page(app_state: AppState) -> None:
+    """Agents List Page."""
     state = me.state(AgentState)
     with page_scaffold():  # pylint: disable=not-context-manager
         with page_frame():
@@ -65,41 +65,41 @@ def agent_list_page(app_state: AppState):
                     me.button('Cancel', on_click=cancel_agent_dialog)
 
 
-def set_agent_address(e: me.InputBlurEvent):
+def set_agent_address(e: me.InputBlurEvent) -> None:
     state = me.state(AgentState)
     state.agent_address = e.value
 
 
-def load_agent_info(e: me.ClickEvent):
+async def load_agent_info(e: me.ClickEvent) -> None:
     state = me.state(AgentState)
     try:
         state.error = None
-        agent_card_response = get_agent_card(state.agent_address)
+        agent_card_response = await get_agent_card(state.agent_address)
         state.agent_name = agent_card_response.name
         state.agent_description = agent_card_response.description
         state.agent_framework_type = (
             agent_card_response.provider.organization
             if agent_card_response.provider
             else ''
         )
-        state.input_modes = agent_card_response.defaultInputModes
-        state.output_modes = agent_card_response.defaultOutputModes
+        state.input_modes = agent_card_response.default_input_modes
+        state.output_modes = agent_card_response.default_output_modes
         state.stream_supported = agent_card_response.capabilities.streaming
         state.push_notifications_supported = (
-            agent_card_response.capabilities.pushNotifications
+            agent_card_response.capabilities.push_notifications
         )
     except Exception as e:
         print(e)
         state.agent_name = None
         state.error = f'Cannot connect to agent as {state.agent_address}'
 
 
-def cancel_agent_dialog(e: me.ClickEvent):
+def cancel_agent_dialog(e: me.ClickEvent) -> None:
     state = me.state(AgentState)
     state.agent_dialog_open = False
 
 
-async def save_agent(e: me.ClickEvent):
+async def save_agent(e: me.ClickEvent) -> None:
     state = me.state(AgentState)
     await AddRemoteAgent(state.agent_address)
     state.agent_address = ''

demo/ui/pyproject.toml

@@ -8,19 +8,23 @@ dependencies = [
     "asyncio>=3.4.3",
     "httpx>=0.28.1",
     "httpx-sse>=0.4.0",
-    "pydantic>=2.10.6",
+    "pydantic>=2.11.0",
     "fastapi>=0.115.0",
     "uvicorn>=0.34.0",
     "mesop>=1.0.0",
-    "a2a-sdk>=0.2.16",
+    "a2a-sdk>=0.3.0",
     "pandas>=2.2.0",
     "google-genai>=1.9.0",
     "google-adk[a2a]>=1.7.0",
+    "litellm",
 ]
 
 [tool.hatch.build.targets.wheel]
 packages = ["a2a_ui"]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.uv.sources]
 a2a_ui = { workspace = true }