Merge pull request #247 from microsoft/james-dev-agentic-ai

fix prompt and bug and logistic a2a server

Author: james-tn

agentic_ai/agents/semantic_kernel/multi_agent/a2a/README.md

@@ -32,6 +32,7 @@ sequenceDiagram
     LogAgent-->>CSAgent: PickupScheduledConfirmation (confirmation details)  
     CSAgent->>Customer: Confirms pickup details, provides instructions      
 ```
+
 ## Running the A2A Demo End-to-End  
 
 The repo ships three Python modules:  

agentic_ai/agents/semantic_kernel/multi_agent/a2a/data/contoso.db

@@ -70,9 +70,10 @@ async def build_sk_logistics_agent() -> ChatCompletionAgent:
         "You are the Logistics AI agent responsible for arranging product-return "  
         "pick-ups."  
         "Supported request types:\n"  
-        "  • availability_request\n"  
-        "  • schedule_pickup\n"  
-        "  • cancel_request\n"  
+        "  • availability_request: requireing pickup address and preferred data range\n"  
+        "  • schedule_pickup: need order_id, address and timeslot\n"  
+        "  • cancel_request\n." \
+
     )  
 
     agent = ChatCompletionAgent(  
@@ -113,11 +114,11 @@ async def execute(      # type: ignore[override]
         try:  
             agent = await self._get_agent()  
             query = context.get_user_input()
+            print(f"Received query: {query}")
             task = context.current_task
             if not task:
                 task = new_task(context.message)
                 await event_queue.enqueue_event(task)
-            print("received contextid", task.contextId)
             #get thread from session store
             thread = AGENT_STATE_STORE.get(task.contextId, {})
             # Retrieve user's raw JSON payload (1st text part)  
@@ -128,6 +129,7 @@ async def execute(      # type: ignore[override]
             else:
                 response = await agent.get_response(messages=query)
             response_content = str(response.content) 
+            print(f"Response content: {response_content}")
             # Update the thread in the session store
             AGENT_STATE_STORE[task.contextId] = response.thread if response.thread else {}
 

agentic_ai/agents/semantic_kernel/multi_agent/a2a/logistic_a2a_server.py

@@ -10,6 +10,7 @@
 from dotenv import load_dotenv  
 from fastmcp import FastMCP  
 from pydantic import BaseModel, Field, field_validator  
+import logging
 
 # ──────────────────── FastMCP initialisation ────────────────────────  
 mcp = FastMCP(  
@@ -61,11 +62,8 @@ class PickupAvailabilityRequest(BaseModel):
     """  
 
     address: str = Field(..., description="Street address for the return pick-up")  
-    earliest_date: Optional[str] = Field(  
-        None, description="First acceptable date (YYYY-MM-DD, default: tomorrow)"  
-    )  
-    latest_date: Optional[str] = Field(  
-        None, description="Last acceptable date (YYYY-MM-DD, default: +7 days)"  
+    earliest_date: str = Field(  description="First acceptable date (YYYY-MM-DD)")  
+    latest_date: Optional[str] = Field( description="Last acceptable date (YYYY-MM-DD)"  
     )  
     count: Optional[int] = Field(  
         5, description="How many candidate slots to return (max 10)"  
@@ -138,6 +136,7 @@ def get_pickup_availability(
     requested interval we expose three windows – 09-12, 12-15, 15-18 –  
     until we have satisfied `count` slots.  
     """  
+    print(f"Received availability request: {params}")  # Debug output
     carriers = ["UPS", "FedEx", "DHL"]  # round-robin assignment  
 
     start = datetime.strptime(params.earliest_date, "%Y-%m-%d")  
@@ -161,7 +160,8 @@ def get_pickup_availability(
                         carrier=carriers[len(slots) % len(carriers)],  
                     )  
                 )  
-        day_cursor += timedelta(days=1)  
+        day_cursor += timedelta(days=1) 
+    logging.debug("Generated slots: %s", slots)  # Debug output 
 
     return PickupAvailabilityResponse(slots=slots)  
 
@@ -170,27 +170,31 @@ def schedule_pickup(
     request: PickupConfirmationRequest,  
 ) -> PickupScheduledConfirmation:  
     db = get_db()  
-    cur = db.execute(  
-        """  
-        INSERT INTO Pickups(order_id, slot_id, date, start_time, end_time,  
-                            carrier, address, status, created_at)  
-        VALUES (?,?,?,?,?,?,?,?,?)  
-        """,  
-        (  
-            request.order_id,  
-            request.slot.slot_id,  
-            request.slot.date,  
-            request.slot.start_time,  
-            request.slot.end_time,  
-            request.slot.carrier,  
-            request.address,  
-            "scheduled",  
-            datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),  
-        ),  
-    )  
-    pickup_id = cur.lastrowid  
-    db.commit()  
-    db.close()  
+    try:
+        cur = db.execute(  
+                """  
+                INSERT INTO Pickups(order_id, slot_id, date, start_time, end_time,  
+                                    carrier, address, status, created_at)  
+                VALUES (?,?,?,?,?,?,?,?,?)  
+                """,  
+                (  
+                    request.order_id,  
+                    request.slot.slot_id,  
+                    request.slot.date,  
+                    request.slot.start_time,  
+                    request.slot.end_time,  
+                    request.slot.carrier,  
+                    request.address,  
+                    "scheduled",  
+                    datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),  
+                ),  
+            )  
+        pickup_id = cur.lastrowid  
+        db.commit()  
+        db.close()  
+    except sqlite3.Error as e:
+        logging.error(f"Database error: {e}")  # Log database errors
+    
 
     return PickupScheduledConfirmation(  
         pickup_id=pickup_id,  

agentic_ai/agents/semantic_kernel/multi_agent/a2a/logistic_mcp.py

@@ -60,11 +60,15 @@ async def _ensure_client(self) -> None:
 
     # --------  the single exposed tool  -------------------------------  
     @kernel_function(  
-        name="logistics_chat",  
+        name="logistics_agent",  
         description=(  
-            "Talk to Contoso Logistics to set up a return pick-up. "  
-            "Just pass the user's message; the agent will respond with the next step."  
-        ),  
+        "Logistics AI agent responsible for arranging product-return "  
+        "pick-ups."  
+        "Supported request types:\n"  
+        "  • availability_request\n"  
+        "  • schedule_pickup\n"  
+        "  • cancel_request\n"       
+         ),  
     )  
     async def chat(self, message: str) -> str:  
         """  
@@ -105,7 +109,7 @@ def __init__(self, state_store, session_id) -> None:
 
         # URLs / env ---------------------------------------------------  
         self.logistics_a2a_url = os.getenv("LOGISTICS_A2A_URL", "http://localhost:9100")  
-        self.mcp_server_uri = os.getenv("LOGISTIC_MCP_SERVER_URI")  
+        self.mcp_server_uri = os.getenv("MCP_SERVER_URI")  
 
         # runtime members ---------------------------------------------  
         self._initialized = False  
@@ -142,11 +146,9 @@ async def _setup_agents(self) -> None:
         self.customer_service_agent = ChatCompletionAgent(  
             service=AzureChatCompletion(),  
             name="customer_service_agent",  
-            instructions=(  
-                "You are a helpful Contoso customer-service assistant.\n"  
-                "• Use Contoso MCP tools for order & billing.\n"  
-                "• For product returns, talk to the 'logistics_chat' tool "  
-                "to arrange pick-ups – you can speak naturally, no JSON needed."  
+            instructions=( "You are a helpful assistant. You can use multiple tools to find information and answer questions. "  
+            "When customer ask for a product return, first check if the product is eligible for return, that is if the order has been delivered and check with customer if the condition of the product is acceptable and the return is within 30 days of delivery. "  
+            "If the product is eligible for return, ask customer for their address, their prefered timeframe and forward all information to the logistic agent to schedule a pick-up. Ask logistic agent for 3 options within the next week. " 
             ),  
             plugins=[  
                 contoso_plugin,  
@@ -167,11 +169,13 @@ async def _setup_agents(self) -> None:
     # ----------------------------------------------------------------  
     async def chat_async(self, prompt: str) -> str:  
         await self._setup_agents()  
+        logging.info("prompt: %s", prompt)
 
         response = await self.customer_service_agent.get_response(  
             messages=prompt, thread=self._thread  
         )  
         response_content = str(response.content)  
+        logging.info("response: %s", response_content)
 
         # ---------- persist state ------------------------------------  
         self._thread = response.thread