fixup! fix: code review

Signed-off-by: Petr Bulánek <[email protected]>

Author: PetrBulanek

agents/form/src/form/agent.py

@@ -3,7 +3,7 @@
 
 import os
 from typing import Annotated
-
+from pydantic import BaseModel
 
 import a2a.server.agent_execution
 import a2a.server.apps
@@ -20,17 +20,20 @@
 from agentstack_sdk.server.context import RunContext
 
 import agentstack_sdk.a2a.extensions
-from agentstack_sdk.a2a.extensions.ui.form import (
+from agentstack_sdk.a2a.extensions.common.form import (
     DateField,
     TextField,
     FileField,
+    FileInfo,
     CheckboxField,
     MultiSelectField,
     OptionItem,
-    FormExtensionServer,
-    FormExtensionSpec,
     FormRender,
 )
+from agentstack_sdk.a2a.extensions.services.form import (
+    FormServiceExtensionServer,
+    FormServiceExtensionSpec,
+)
 
 agent_detail_extension_spec = agentstack_sdk.a2a.extensions.AgentDetailExtensionSpec(
     params=agentstack_sdk.a2a.extensions.AgentDetail(
@@ -65,18 +68,24 @@
 )
 
 form_render = FormRender(
-    id="adventure_form",
     title="Let’s go on an adventure",
     columns=2,
     fields=[location, date_from, date_to, notes, flexible, interests],
 )
-form_extension_spec = FormExtensionSpec(form_render)
+form_extension_spec = FormServiceExtensionSpec.demand(initial_form=form_render)
 
 server = Server()
 
+class FormData(BaseModel):
+    location: str | None
+    date_from: str | None
+    date_to: str | None
+    notes: list[FileInfo] | None
+    flexible: bool | None
+    interests: list[str] | None
 
 @server.agent(
-    name="Single-turn Form Agent",
+    name="Single-turn Form Agent 2",
     documentation_url=f"https://github.com/i-am-bee/agentstack/blob/{os.getenv('RELEASE_VERSION', 'main')}/agents/form",
     version="1.0.0",
     default_input_modes=["text", "text/plain"],
@@ -97,17 +106,17 @@
     ],
 )
 async def agent(
-    input: Message,
+    _message: Message,
     form: Annotated[
-        FormExtensionServer,
+        FormServiceExtensionServer,
         form_extension_spec,
     ],
 ):
     """Example demonstrating a single-turn agent using a form to collect user input."""
 
-    form_data = form.parse_form_response(message=input)
+    form_data = form.parse_initial_form(model=FormData)
 
-    yield f"Hello {form_data.values['location'].value}"
+    yield f"Hello {form_data.location}"
 
 
 def serve():

apps/agentstack-sdk-ts/src/client/a2a/extensions/common/form.ts

@@ -117,7 +117,7 @@ export const formRenderSchema = z.object({
   fields: z.array(fieldSchema).nonempty(),
 });
 
-export const responseSchema = z.object({
+export const formResponseSchema = z.object({
   values: z.record(
     z.string(),
     z.discriminatedUnion('type', [
@@ -141,4 +141,4 @@ export type MultiSelectField = z.infer<typeof multiSelectField>;
 export type CheckboxField = z.infer<typeof checkboxField>;
 
 export type FormField = z.infer<typeof fieldSchema>;
-export type FormResponseValue = z.infer<typeof responseSchema>['values'][string];
+export type FormResponseValue = z.infer<typeof formResponseSchema>['values'][string];

apps/agentstack-sdk-ts/src/client/a2a/extensions/handle-agent-card.ts

@@ -64,7 +64,7 @@ export const handleAgentCard = (agentCard: { capabilities: AgentCapabilities })
   const formDemands = formExtensionExtractor(extensions);
 
   const resolveMetadata = async (fulfillments: Fulfillments) => {
-    let fulfilledMetadata = {};
+    let fulfilledMetadata: Record<string, unknown> = {};
 
     fulfilledMetadata = platformApiExtension(fulfilledMetadata, fulfillments.getContextToken());
 

apps/agentstack-sdk-ts/src/client/a2a/extensions/handle-input-required.ts

@@ -6,8 +6,6 @@
 import type { FormResponseValue } from './common/form';
 import { requestFormExtension } from './ui/request-form';
 
-export type RunFormValues = Record<string, FormResponseValue>;
-
 export type InputRequiredResponses = Partial<{
   form: Record<string, FormResponseValue>;
 }>;

apps/agentstack-sdk-ts/src/client/a2a/extensions/services/form.ts

@@ -5,7 +5,7 @@
 
 import { z } from 'zod';
 
-import { formRenderSchema, responseSchema } from '../common/form';
+import { formRenderSchema, formResponseSchema } from '../common/form';
 import type { A2AServiceExtension } from '../types';
 
 const URI = 'https://a2a-extensions.agentstack.beeai.dev/services/form/v1';
@@ -20,11 +20,11 @@ const formDemandSchema = z.object({
 export type FormDemands = z.infer<typeof formDemandSchema>;
 
 const formFulfillmentSchema = z.object({
-  form_fulfillments: z.record(z.string(), responseSchema),
+  form_fulfillments: z.record(z.string(), formResponseSchema),
 });
 export type FormFulfillments = z.infer<typeof formFulfillmentSchema>;
 
-export const formExtension: A2AServiceExtension<typeof URI, z.infer<typeof formDemandSchema>, FormFulfillments> = {
+export const formExtension: A2AServiceExtension<typeof URI, FormDemands, FormFulfillments> = {
   getDemandsSchema: () => formDemandSchema,
   getFulfillmentSchema: () => formFulfillmentSchema,
   getUri: () => URI,

apps/agentstack-sdk-ts/src/index.ts

@@ -22,6 +22,7 @@ export * from './client/a2a/extensions/types';
 export * from './client/a2a/extensions/ui/agent-detail';
 export * from './client/a2a/extensions/ui/citation';
 export * from './client/a2a/extensions/ui/oauth';
+export * from './client/a2a/extensions/ui/request-form';
 export * from './client/a2a/extensions/ui/settings';
 export * from './client/a2a/extensions/ui/trajectory';
 export * from './client/a2a/extensions/utils';

apps/agentstack-ui/src/modules/runs/contexts/agent-run/AgentRunProvider.tsx

@@ -201,7 +201,7 @@ function AgentRunProvider({ agent, agentClient, children }: PropsWithChildren<Ag
           contextId,
           fulfillments,
           responses: {
-            form: message.form?.response ?? undefined,
+            form: message.form?.response,
           },
           taskId: fulfillmentsContext.taskId,
         });

docs/sdk/overview.mdx

@@ -53,27 +53,28 @@ When you await a form request, execution pauses the task, allowing the user to f
 
 ```python
 from typing import Annotated
-from agentstack_sdk.a2a.extensions.ui.form import (
-    FormExtensionServer,
-    FormExtensionSpec,
+from agentstack_sdk.a2a.extensions.common.form import (
     FormRender,
     TextField
 )
+from agentstack_sdk.a2a.extensions.ui.request_form import (
+    RequestFormExtensionServer,
+    RequestFormExtensionSpec,
+)
 
 @server.agent()
 async def form_agent(
     input: Message,
     context: RunContext,
-    form: Annotated[FormExtensionServer, FormExtensionSpec(params=None)]
+    request_form: Annotated[RequestFormExtensionServer, RequestFormExtensionSpec()]
 ):
     """Agent that pauses execution to request user input"""
     yield AgentMessage(text="I need some information from you.")
 
     # Execution pauses here - task enters input_required state
     # User fills out the form in the UI
-    form_data = await form.request_form(
+    form_data = await request_form.request_form(
         form=FormRender(
-            id="user_info",
             title="Please provide your details",
             fields=[
                 TextField(id="name", label="Your Name"),