fix: Final address of all remaining review comments by swapnil@, 1/ changed agent_id --> client_id everywhere, and 2/ changed final uri: https://github.com/a2aproject/a2a-samples/tree/main/samples/python/extensions/secure-passport

Author: gulliantonio

extensions/secure-passport/v1/samples/python/README.md

@@ -9,7 +9,7 @@ The core of this extension is the **`CallerContext`** data model, which is attac
 ### Extension URI
 
 The unique identifier for this extension is:
-`https://a2aprotocol.ai/ext/secure-passport/v1`
+`https://github.com/a2aproject/a2a-samples/tree/main/samples/python/extensions/secure-passport`
 
 ---
 
@@ -29,22 +29,22 @@ from secure_passport_ext import (
     get_secure_passport
 )
 
-def demonstrate_use_case(title: str, agent_id: str, state: dict, signature: str | None = None, session_id: str | None = None):
+def demonstrate_use_case(title: str, client_id: str, state: dict, signature: str | None = None, session_id: str | None = None):
     print(f"\n--- Demonstrating: {title} ---")
 
     passport = CallerContext(
-        agent_id=agent_id,
+        client_id=client_id,
         session_id=session_id,
         signature=signature,
         state=state
     )
 
-    message = MockA2AMessage()
+    message = A2AMessage()
     add_secure_passport(message, passport)
     retrieved = get_secure_passport(message)
 
     if retrieved:
-        print(f"  Source: {retrieved.agent_id}")
+        print(f"  Source: {retrieved.client_id}")
         print(f"  Verified: {retrieved.is_verified}")
         print(f"  Context: {retrieved.state}")
     else:
@@ -54,7 +54,7 @@ def demonstrate_use_case(title: str, agent_id: str, state: dict, signature: str
 
 demonstrate_use_case(
     title="1. Currency Conversion (GBP)",
-    agent_id="a2a://travel-orchestrator.com",
+    client_id="a2a://travel-orchestrator.com",
     state={"user_preferred_currency": "GBP", "user_id": "U001"},
     signature="sig-currency-1"
 )
@@ -63,7 +63,7 @@ demonstrate_use_case(
 
 demonstrate_use_case(
     title="2. Personalized Travel (Platinum Tier)",
-    agent_id="a2a://travel-portal.com",
+    client_id="a2a://travel-portal.com",
     session_id="travel-session-999",
     state={
         "destination": "Bali, Indonesia",
@@ -76,7 +76,7 @@ demonstrate_use_case(
 
 demonstrate_use_case(
     title="3. Retail Assistance (Unverified)",
-    agent_id="a2a://ecommerce-front.com",
+    client_id="a2a://ecommerce-front.com",
     state={"product_sku": "Nikon-Z-50mm-f1.8", "user_intent": "seeking_reviews"},
     signature=None
 )
@@ -85,7 +85,7 @@ demonstrate_use_case(
 
 demonstrate_use_case(
     title="4. Secured DB Access (Finance)",
-    agent_id="a2a://marketing-agent.com",
+    client_id="a2a://marketing-agent.com",
     state={
         "query_type": "quarterly_revenue",
         "access_scope": ["read:finance_db", "user:Gulli"]

extensions/secure-passport/v1/samples/python/run.py

@@ -30,7 +30,7 @@ def mock_agent_core_handler(message: A2AMessage, passport: CallerContext | None)
         print("  [Agent Core] Executing task with no external context.")
 
 
-def create_and_run_passport_test(agent_id: str, session_id: str | None, state: dict, signature: str | None, use_case_title: str):
+def create_and_run_passport_test(client_id: str, session_id: str | None, state: dict, signature: str | None, use_case_title: str):
     """
     Demonstrates a full communication cycle using the conceptual middleware.
     """
@@ -39,14 +39,14 @@ def create_and_run_passport_test(agent_id: str, session_id: str | None, state: d
 
     # 1. Orchestrator (Client) creates the Passport
     client_passport = CallerContext(
-        agent_id=agent_id,
+        client_id=client_id,
         session_id=session_id,
         signature=signature,
         state=state
     )
 
     # Mock A2A Message Container
-    client_message = A2AMessage() # CORRECTED: Instantiating A2AMessage
+    client_message = A2AMessage() 
 
     # --- CLIENT-SIDE PIPELINE ---
     print("  [PIPELINE] Client Side: Middleware -> Transport")
@@ -74,7 +74,7 @@ def run_all_samples():
 
     # --- Use Case 1: Efficient Currency Conversion (High Trust Example) ---
     create_and_run_passport_test(
-        agent_id="a2a://travel-orchestrator.com",
+        client_id="a2a://travel-orchestrator.com",
         session_id=None,
         state={"user_preferred_currency": "GBP", "loyalty_tier": "Silver"},
         signature="sig-currency-1",
@@ -83,7 +83,7 @@ def run_all_samples():
 
     # --- Use Case 2: Personalized Travel Booking (High Context Example) ---
     create_and_run_passport_test(
-        agent_id="a2a://travel-portal.com",
+        client_id="a2a://travel-portal.com",
         session_id="travel-booking-session-999",
         state={
             "destination": "Bali, Indonesia",
@@ -95,7 +95,7 @@ def run_all_samples():
 
     # --- Use Case 3: Proactive Retail Assistance (Unsigned/Low Trust Example) ---
     create_and_run_passport_test(
-        agent_id="a2a://ecommerce-front.com",
+        client_id="a2a://ecommerce-front.com",
         session_id="cart-session-404",
         state={
             "product_sku": "Nikon-Z-50mm-f1.8",
@@ -107,7 +107,7 @@ def run_all_samples():
 
     # --- Use Case 4: Marketing Agent seek insights (Secured Scope Example) ---
     create_and_run_passport_test(
-        agent_id="a2a://marketing-agent.com",
+        client_id="a2a://marketing-agent.com",
         session_id=None,
         state={
             "query_type": "quarterly_revenue",

extensions/secure-passport/v1/samples/python/src/secure_passport_ext/__init__.py

@@ -1,34 +1,23 @@
 from typing import Optional, Dict, Any, List, Callable
 from pydantic import BaseModel, Field, ValidationError, ConfigDict
 from copy import deepcopy
-import logging
 
-# --- Import official A2A types ---
-# Assuming the official A2A message type is available here:
-try:
-    from a2a.types import A2AMessage
-except ImportError:
-    # Fallback/Placeholder if official package is not fully installed locally
-    class A2AMessage(BaseModel):
-        metadata: Dict[str, Any] = Field(default_factory=dict)
-        
 # --- Extension Definition ---
 
-SECURE_PASSPORT_URI = "https://a2a-protocol.org/ext/secure-passport/v1"
+SECURE_PASSPORT_URI = "https://github.com/a2aproject/a2a-samples/tree/main/samples/python/extensions/secure-passport"
 
 class CallerContext(BaseModel):
     """
     The Secure Passport payload containing contextual state shared by the calling agent.
     """
-    # PEP 8 Compliant (snake_case) with JSON mapping (camelCase alias)
-    agent_id: str = Field(..., alias='agentId', description="The verifiable unique identifier of the calling agent.")
+    # *** CORE CHANGE: agent_id renamed to client_id ***
+    client_id: str = Field(..., alias='clientId', description="The verifiable unique identifier of the calling client.")
     signature: Optional[str] = Field(None, alias='signature', description="A cryptographic signature of the 'state' payload.")
     session_id: Optional[str] = Field(None, alias='sessionId', description="A session or conversation identifier for continuity.")
     state: Dict[str, Any] = Field(..., description="A free-form JSON object containing the contextual data.")
 
     # Use ConfigDict for Pydantic V2 compatibility and configuration
     model_config = ConfigDict(
-        # Allows instantiation using either the JSON alias or the Python field name
         populate_by_name=True, 
         extra='forbid'
     )
@@ -41,11 +30,18 @@ def is_verified(self) -> bool:
         return self.signature is not None
 
 # --- Helper Functions (Core Protocol Interaction) ---
+
+class BaseA2AMessage(BaseModel):
+    metadata: Dict[str, Any] = Field(default_factory=dict)
+
+try:
+    from a2a.types import A2AMessage
+except ImportError:
+    A2AMessage = BaseA2AMessage 
 
 def add_secure_passport(message: A2AMessage, context: CallerContext) -> None:
     """Adds the Secure Passport (CallerContext) to the message's metadata."""
 
-    # by_alias=True ensures the output JSON uses the correct camelCase names
     message.metadata[SECURE_PASSPORT_URI] = context.model_dump(by_alias=True, exclude_none=True)
 
 def get_secure_passport(message: A2AMessage) -> Optional[CallerContext]:
@@ -55,10 +51,9 @@ def get_secure_passport(message: A2AMessage) -> Optional[CallerContext]:
         return None
 
     try:
-        # validate uses aliases implicitly for input conversion
         return CallerContext.model_validate(deepcopy(passport_data))
     except ValidationError as e:
-        # logging is already used here
+        import logging
         logging.warning(f"ERROR: Received malformed Secure Passport data. Ignoring payload: {e}")
         return None
 
@@ -81,36 +76,33 @@ def get_agent_card_declaration(supported_state_keys: Optional[List[str]] = None)
             "uri": SECURE_PASSPORT_URI,
             "params": {}
         }
-        
         if supported_state_keys:
             declaration["params"]["supportedStateKeys"] = supported_state_keys
-            
+        
         return declaration
 
     @staticmethod
     def client_middleware(next_handler: Callable[[A2AMessage], Any], message: A2AMessage, context: CallerContext):
         """
         [Conceptual Middleware Layer: Client/Calling Agent]
-        
-        Type Hint: next_handler takes one A2AMessage and returns Any.
         """
-        logging.info(f"[Middleware: Client] Attaching Secure Passport for {context.agent_id}")
+        # ACCESS UPDATED: Use context.client_id
+        print(f"[Middleware: Client] Attaching Secure Passport for {context.client_id}")
         add_secure_passport(message, context)
-        return next_handler(message) # Passes the augmented message to the transport layer
+        return next_handler(message) 
 
     @staticmethod
     def server_middleware(next_handler: Callable[[A2AMessage, Optional[CallerContext]], Any], message: A2AMessage):
         """
         [Conceptual Middleware Layer: Server/Receiving Agent]
-        
-        Type Hint: next_handler takes A2AMessage and Optional[CallerContext] and returns Any.
         """
         passport = get_secure_passport(message)
 
         if passport:
-            logging.info(f"[Middleware: Server] Extracted Secure Passport. Verified: {passport.is_verified}")
+            print(f"[Middleware: Server] Extracted Secure Passport. Verified: {passport.is_verified}")
         else:
-            logging.debug("[Middleware: Server] No Secure Passport found or validation failed.")
+            print("[Middleware: Server] No Secure Passport found or validation failed.")
 
-        # next_handler is the agent's core task logic. We pass the message and the extracted passport.
         return next_handler(message, passport)
+
+

extensions/secure-passport/v1/samples/python/tests/test_secure_passport.py

@@ -15,10 +15,10 @@
 def valid_passport_data():
     """
     Returns a dictionary for creating a valid CallerContext. 
-    Uses snake_case keys to align with the CallerContext model attributes.
+    Keys are snake_case to align with the final CallerContext model attributes.
     """
     return {
-        "agent_id": "a2a://orchestrator.com",
+        "client_id": "a2a://orchestrator.com", # CORRECTED: Changed agent_id to client_id
         "session_id": "session-123",
         "state": {"currency": "USD", "tier": "silver"},
         "signature": "mock-signature-xyz"
@@ -37,7 +37,7 @@ def test_add_and_get_passport_success(valid_passport_data):
     retrieved = get_secure_passport(message)
 
     assert retrieved is not None
-    assert retrieved.agent_id == "a2a://orchestrator.com"
+    assert retrieved.client_id == "a2a://orchestrator.com" # CORRECTED: Access via client_id
     assert retrieved.state == {"currency": "USD", "tier": "silver"}
 
 def test_get_passport_when_missing():
@@ -47,9 +47,9 @@ def test_get_passport_when_missing():
     assert retrieved is None
 
 def test_passport_validation_failure_missing_required_field(valid_passport_data):
-    """Tests validation fails when a required field (agent_id) is missing."""
+    """Tests validation fails when a required field (client_id) is missing."""
     invalid_data = valid_passport_data.copy()
-    del invalid_data['agent_id']
+    del invalid_data['client_id'] # CORRECTED: Deleting client_id key
 
     message = A2AMessage() 
     message.metadata[SECURE_PASSPORT_URI] = invalid_data
@@ -107,7 +107,7 @@ def test_use_case_1_currency_conversion():
     }
 
     passport = CallerContext(
-        agent_id="a2a://travel-orchestrator.com",
+        client_id="a2a://travel-orchestrator.com", # CORRECTED: Using client_id keyword
         state=state_data,
         signature="sig-currency-1"
     )
@@ -128,8 +128,8 @@ def test_use_case_2_personalized_travel_booking():
     }
 
     passport = CallerContext(
-        agent_id="a2a://travel-portal.com",
-        session_id="travel-booking-session-999",
+        client_id="a2a://travel-portal.com", # CORRECTED: Using client_id keyword
+        session_id="travel-booking-session-999", 
         state=state_data,
         signature="sig-travel-2"
     )
@@ -151,7 +151,7 @@ def test_use_case_3_proactive_retail_assistance():
     }
 
     passport = CallerContext(
-        agent_id="a2a://ecommerce-front.com",
+        client_id="a2a://ecommerce-front.com", # CORRECTED: Using client_id keyword
         state=state_data,
     )
 
@@ -172,7 +172,7 @@ def test_use_case_4_secured_db_insights():
     }
 
     passport = CallerContext(
-        agent_id="a2a://marketing-agent.com",
+        client_id="a2a://marketing-agent.com", # CORRECTED: Using client_id keyword
         state=state_data,
         signature="sig-finance-4" 
     )