smarta2a 0.4.21__py3-none-any.whl → 0.4.23__py3-none-any.whl

smarta2a/agent/a2a_human.py

@@ -37,7 +37,7 @@ class A2AHuman:
         
         @self.app.on_send_task(forward_to_webhook=True)
         async def on_send_task(request: SendTaskRequest, state: StateData):
-            return "I am human and take some time to respond, but I will definitely respond to your request"
+            return "I am human and will take some time to respond, please standby"
         
         @self.app.webhook()
         async def on_webhook(request: WebhookRequest, state: StateData):

smarta2a/server/server.py

@@ -108,7 +108,7 @@ class SmartA2A:
             # <-- Accept both SSE‐style responses:
             if isinstance(response, (EventSourceResponse, StreamingResponse)):
                 return response
-            print(response)
+            
             # <-- Everything else is a normal pydantic JSONRPCResponse
             return response.model_dump()
         

smarta2a/server/webhook_request_processor.py

@@ -1,15 +1,19 @@
 # Library imports
 from typing import Callable, Any, Optional
+import copy
+from uuid import uuid4
 
 # Local imports
 from smarta2a.server.state_manager import StateManager
-from smarta2a.utils.types import WebhookRequest, WebhookResponse, StateData, Message
+from smarta2a.utils.types import WebhookRequest, WebhookResponse, StateData, Message, TaskState
+from smarta2a.utils.task_builder import TaskBuilder
 from smarta2a.client.a2a_client import A2AClient
 
 class WebhookRequestProcessor:
     def __init__(self, webhook_fn: Callable[[WebhookRequest], Any], state_manager: Optional[StateManager] = None):
         self.webhook_fn = webhook_fn
         self.state_manager = state_manager
+        self.task_builder = TaskBuilder(default_status=TaskState.COMPLETED)
         self.a2a_aclient = A2AClient()
 
     async def process_request(self, request: WebhookRequest) -> WebhookResponse:
@@ -18,67 +22,111 @@ class WebhookRequestProcessor:
             return await self._webhook_handler(request, state_data)
         else:
             return await self._webhook_handler(request)
-
+    
 
     async def _webhook_handler(self, request: WebhookRequest, state_data: Optional[StateData] = None) -> WebhookResponse:
+        print("--- _webhook_handler ---")
+        print(request)
+        print("--- end of _webhook_handler ---")
+        print("--- state_data ---")
+        print(state_data)
+        print("--- end of state_data ---")
         try:
-            # --- Step 1: Process Incoming Task ---
-            if request.result:
-                incoming_task = request.result
-                
-                # Initialize state_data if missing
-                if not state_data:
-                    state_data = StateData(
-                        task_id=incoming_task.id,
-                        task=incoming_task.copy(update={"artifacts": incoming_task.artifacts}),
-                        context_history=[],
-                        push_notification_config=None
-                    )
+            # Extract parameters from request
+            task_id = request.id
+            task = request.result
 
-            # --- Step 2: Call Webhook Function ---
-            webhook_response = await self.webhook_fn(request, state_data) if state_data else await self.webhook_fn(request)
+            if state_data:
+                session_id = task.sessionId if task and task.sessionId else state_data.task.sessionId
+                task_history = task.history if task and task.history is not None else state_data.task.history.copy() if state_data.task.history else []
+                context_history = state_data.context_history.copy()
+                metadata = task.metadata if task and task.metadata is not None else state_data.task.metadata.copy() if state_data.task.metadata else {}
+                # Deep copy of push_notification_config
+                push_notification_config = copy.deepcopy(state_data.push_notification_config) if state_data.push_notification_config else None
+            else:
+                # No state_data so just assign based on task from the request
+                session_id = task.sessionId if task and task.sessionId else str(uuid4())
+                task_history = task.history if task and task.history else []
+                context_history = []
+                metadata = task.metadata if task and task.metadata else {}
+                push_notification_config = None
             
-            # --- Step 3: Process Webhook Response ---
-            if webhook_response.result:
-                updated_task = webhook_response.result
-                existing_task = state_data.task
-                
-                # Overwrite artifacts from response
-                existing_task.artifacts = updated_task.artifacts.copy() if updated_task.artifacts else []
-                
-                # Merge metadata
-                existing_task.metadata = {**(existing_task.metadata or {}), **(updated_task.metadata or {})}
-                
-                # Build messages from updated artifacts
-                updated_parts = [part for artifact in updated_task.artifacts for part in artifact.parts] if updated_task.artifacts else []
-                updated_messages = [Message(role="agent", parts=updated_parts, metadata=updated_task.metadata)]
-                
-                # Update context history again
-                if self.state_manager:
-                    history_strategy = self.state_manager.get_history_strategy()
-                    state_data.context_history = history_strategy.update_history(
-                        existing_history=state_data.context_history,
-                        new_messages=updated_messages
-                    )
-                    await self.state_manager.update_state(state_data)
-
-            # --- Step 4: Push Notification ---
-            push_url = state_data.push_notification_config.url if state_data and state_data.push_notification_config else None
+            # Call webhook handler
+            if state_data:
+                # Call webhook_fn with state_data
+                raw_result = await self.webhook_fn(request, state_data)
+            else:
+                # Call webhook_fn with request
+                raw_result = await self.webhook_fn(request)
+            
+            # Handle direct WebhookResponse returns
+            if isinstance(raw_result, WebhookResponse):
+                return raw_result
+            
+            # Process webhook_response in a way that is similar to handle_send_task
+            # Build task with updated history
+            updated_task = self.task_builder.build(
+                content=raw_result,
+                task_id=task_id,
+                session_id=session_id,
+                metadata=metadata,
+                history=task_history
+            )
+            
+            # Process messages through strategy (similar to handle_send_task)
+            messages = []
+            if updated_task.artifacts:
+                agent_parts = [p for a in updated_task.artifacts for p in a.parts]
+                agent_message = Message(
+                    role="agent",
+                    parts=agent_parts,
+                    metadata=updated_task.metadata
+                )
+                messages.append(agent_message)
+            
+            # Update Task history with a simple append
+            task_history.extend(messages)
             
-            if push_url:
+            if state_data:
+                # Update context history with a strategy
+                history_strategy = self.state_manager.get_history_strategy()
+                context_history = history_strategy.update_history(
+                    existing_history=context_history,
+                    new_messages=messages
+                )
+            
+            # Update task with final state
+            updated_task.history = task_history
+            
+            # State store update (if enabled)
+            if state_data:
+                await self.state_manager.update_state(
+                    state_data=StateData(
+                        task_id=task_id,
+                        task=updated_task,
+                        context_history=context_history,
+                        push_notification_config=push_notification_config,
+                    )
+                )
+            print("--- push_notification_config ---")
+            print(push_notification_config)
+            print("--- end of push_notification_config ---")
+            # If push_notification_config is set send the task to the push notification url
+            if push_notification_config:
                 try:
-                    self.a2a_aclient.send_to_webhook(webhook_url=push_url, id=state_data.task_id, task=state_data.task)
+                    await self.a2a_aclient.send_to_webhook(webhook_url=push_notification_config.url,id=task_id,task=updated_task.model_dump())
                 except Exception as e:
-                    return WebhookResponse(
-                        id=request.id,
-                        error=f"Push notification failed: {str(e)}"
-                    )
-
-            # --- Step 5: Return Final Response ---
+                    pass
+            
+            # Return the updated task
             return WebhookResponse(
                 id=request.id,
-                result=state_data.task if state_data else None
+                result=updated_task
             )
-        
+            
         except Exception as e:
-            return WebhookResponse(id=request.id, error=f"Internal error: {str(e)}")
+            # Handle exceptions
+            return WebhookResponse(
+                id=request.id,
+                error=str(e)
+            )

{smarta2a-0.4.21.dist-info → smarta2a-0.4.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smarta2a
-Version: 0.4.21
+Version: 0.4.23
 Summary: a Python framework that helps you build servers and AI agents that communicate using the A2A protocol
 Project-URL: Homepage, https://github.com/siddharthsma/smarta2a
 Project-URL: Bug Tracker, https://github.com/siddharthsma/smarta2a/issues

{smarta2a-0.4.21.dist-info → smarta2a-0.4.23.dist-info}/RECORD

@@ -1,6 +1,6 @@
 smarta2a/__init__.py,sha256=T_EECYqWrxshix0FbgUv22zlKRX22HFU-HKXcYTOb3w,175
 smarta2a/agent/a2a_agent.py,sha256=EurcxpV14e3OPWCMutYL0EXMHb5ZKQqAHEGZZF6pNgg,1892
-smarta2a/agent/a2a_human.py,sha256=yAW9naxyqStQhWwDamXRZIlw-mT_7RW2wcHyhy3rR6Y,1671
+smarta2a/agent/a2a_human.py,sha256=Bz4M9rhEwQEtIdDnV7VTL2n14nTT2wACyPBhDMph4FQ,1645
 smarta2a/agent/a2a_mcp_server.py,sha256=X_mxkgYgCA_dSNtCvs0rSlOoWYc-8d3Qyxv0e-a7NKY,1015
 smarta2a/archive/smart_mcp_client.py,sha256=0s2OWFKWSv-_UF7rb9fOrsh1OIYsYOsGukkXXp_E1cU,4158
 smarta2a/archive/subscription_service.py,sha256=vftmZD94HbdjPFa_1UBvsBm-WkW-s3ZCVq60fF7OCgA,4109
@@ -23,9 +23,9 @@ smarta2a/server/json_rpc_request_processor.py,sha256=qRB3sfj_n9ImkIOCdaUKMsDmKcO
 smarta2a/server/nats_client.py,sha256=K97e8awvAxsqgs3BxsTZU_mB3JPPZ0yjLX1LnZZjfXE,1450
 smarta2a/server/request_handler.py,sha256=tUAoxkrJtOnLPJxdUDMThGPFAxYnNFFofS3QD80g_8M,26184
 smarta2a/server/send_task_handler.py,sha256=fiBeCCHCu9c2H4EJOUc0t3EZgpHVFJy4B_6qZOC140s,6336
-smarta2a/server/server.py,sha256=E58tvOjAvHf_gYjST76sPEC5piaNyrHePa9k-fSadZA,6797
+smarta2a/server/server.py,sha256=L0vh1i-s8bAQKarTPkqzZRdZuqFUjoqeGOCfo8wUvgU,6782
 smarta2a/server/state_manager.py,sha256=jFxf9cDxLqjIo87tv_Ynh2dH1vCTFLrVSLPuVg6YWnA,8063
-smarta2a/server/webhook_request_processor.py,sha256=PErCC5HbeYsZ7JDf7Cbx_eIf1ZtLGiGe1LsmAD6Oxj0,3985
+smarta2a/server/webhook_request_processor.py,sha256=aoRUsTxvwX9JZcDjO51y-h9hX9YGsMGFNdTf_Zyr_GA,5876
 smarta2a/state_stores/__init__.py,sha256=vafxAqpwvag_cYFH2XKGk3DPmJIWJr4Ioey30yLFkVQ,220
 smarta2a/state_stores/base_state_store.py,sha256=_3LInM-qepKwwdypJTDNs9-DozBNrKVycwPwUm7bYdU,512
 smarta2a/state_stores/inmemory_state_store.py,sha256=nEBBUiiqhEluP2MYJjFUImcjIwLJEvL8BWwMbLCb8Fw,1268
@@ -36,7 +36,7 @@ smarta2a/utils/task_builder.py,sha256=wqSyfVHNTaXuGESu09dhlaDi7D007gcN3-8tH-nPQ4
 smarta2a/utils/task_request_builder.py,sha256=6cOGOqj2Rg43xWM03GRJQzlIZHBptsMCJRp7oD-TDAQ,3362
 smarta2a/utils/tools_manager.py,sha256=oR5cbwzPZ36hQAsWAgb-c6wFv5BthmCPraD7DSv-Bv8,4332
 smarta2a/utils/types.py,sha256=kzA6Vv5xXfu1sJuxhEXrglI9e9S6eZVIljMnsrQVyN0,13650
-smarta2a-0.4.21.dist-info/METADATA,sha256=q9zzIWTWwn2rIWg2tKHAzmb3CAq204N_XaFQ-NaYBN0,13051
-smarta2a-0.4.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-smarta2a-0.4.21.dist-info/licenses/LICENSE,sha256=lDbqrxVnzDMY5KJ8JS1WhvkWE8TJaw-O-CHDy-ecsJA,2095
-smarta2a-0.4.21.dist-info/RECORD,,
+smarta2a-0.4.23.dist-info/METADATA,sha256=bxlqSN9pysNL_bx1CsYjBLknPHRkKLyL2-Gg8BFl5w8,13051
+smarta2a-0.4.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+smarta2a-0.4.23.dist-info/licenses/LICENSE,sha256=lDbqrxVnzDMY5KJ8JS1WhvkWE8TJaw-O-CHDy-ecsJA,2095
+smarta2a-0.4.23.dist-info/RECORD,,