remove duplicated codes

Author: Davide Antelmo

app/backend/app/agents/azure_chat/_chatkit_events_handler.py

@@ -130,7 +130,8 @@ async def handle_events(self, thread_id: str, events: AsyncIterable[WorkflowEven
                descriptive_title = f"Connected to {event.data.target} "
                handoff_result_task = CustomTask(title=descriptive_title, icon="check-circle-filled")
                taskResultUpdate =  TaskItem(thread_id=thread_id,id=f"tsk_{uuid.uuid4().hex[:8]}", task=handoff_result_task, created_at=datetime.now())
-               yield ThreadItemAddedEvent(item=taskResultUpdate) 
+               yield ThreadItemAddedEvent(item=taskResultUpdate)
+               continue
 
             if event.type == "output":
                 if isinstance(event.data, AgentResponseUpdate) \
@@ -152,6 +153,9 @@ async def handle_events(self, thread_id: str, events: AsyncIterable[WorkflowEven
                     #force this to be FunctionCallContent
                     function_call_content = event.data.contents[0] #type: ignore
 
+                    #skip any framework handoff_to_ function call
+                    if function_call_content.name and function_call_content.name.startswith("handoff_to_"):
+                        continue
 
                     if function_call_content.name:
                          call_id = function_call_content.call_id
@@ -166,9 +170,16 @@ async def handle_events(self, thread_id: str, events: AsyncIterable[WorkflowEven
                 and event.data.contents \
                 and isinstance(event.data.contents, list) \
                 and all(item.type == "function_result" for item in event.data.contents):
+
                     function_result_content = event.data.contents[0] #type: ignore
+                    
+                    #skip any framework handoff_to_ function call. check if result dict has the key "handoff_to"
+                    if function_result_content.result and isinstance(function_result_content.result, dict) and function_result_content.result.get("handoff_to"):
+                        continue
+
                     if function_result_content.call_id :
-                       tool_name = self.tool_name_id_map.get(function_result_content.call_id, function_result_content.call_id)     
+                       
+                       tool_name = self.tool_name_id_map.get(function_result_content.call_id, function_result_content.name)
                        descriptive_title = event_description_map[tool_name]["end"] if tool_name in event_description_map else tool_name
                        function_result_task = CustomTask(title=descriptive_title, icon="check-circle-filled")
                        taskResultUpdate =  TaskItem(thread_id=thread_id,id=function_result_content.call_id, task=function_result_task, created_at=datetime.now())
@@ -182,7 +193,7 @@ async def handle_events(self, thread_id: str, events: AsyncIterable[WorkflowEven
                     function_approval_content : Content = event.data.contents[0].function_call #type: ignore
                     tool_name =  function_approval_content.name 
                     parsed_args = function_approval_content.arguments
-                    function_approval_content.call_id 
+                    call_id = function_approval_content.call_id 
                    # approval_request_widget = build_approval_request(tool_name=tool_name, tool_args=parsed_args, call_id=function_approval_content.call_id, request_id=function_approval_content.id)
                    # Server Managed Widget Item
                     # widget_item = WidgetItem(
@@ -200,18 +211,19 @@ async def handle_events(self, thread_id: str, events: AsyncIterable[WorkflowEven
                         args={
                             "tool_name": tool_name,
                             "tool_args": parsed_args,
-                            "call_id": function_approval_content.call_id,
+                            "call_id": call_id,
                             "request_id": function_approval_content.id
                         }
                     )
                     #CustomThreadItemDoneEvent is a chatkit custom thread item type to support client widget. we disable pylance to avoid linting error
                     yield CustomThreadItemDoneEvent(type="thread.item.done", item=client_widget_item) #type: ignore
+                continue
 
 
-            else:
-                event_description = event_description_map.get(event.type, event.type)
-                progressUpdate = ProgressUpdateEvent(text=event_description, icon="atom")
-                yield progressUpdate
+            # Handle other event types as progress updates with event type as description
+            event_description = event_description_map.get(event.type, event.type)
+            progressUpdate = ProgressUpdateEvent(text=event_description, icon="atom")
+            yield progressUpdate
 
         # Finalize the message
         if self.message_started:

…ts/foundry_v2/_chatkit_events_handler.py …uters/chatkit/_chatkit_events_handler.pyapp/backend/app/agents/foundry_v2/_chatkit_events_handler.py renamed to app/backend/app/routers/chatkit/_chatkit_events_handler.py app/backend/app/agents/foundry_v2/_chatkit_events_handler.py renamed to app/backend/app/routers/chatkit/_chatkit_events_handler.py

@@ -6,6 +6,7 @@
 from chatkit.actions import Action
 from chatkit.server import ChatKitServer,agents_sdk_user_agent_override
 from chatkit.errors import CustomStreamError, StreamError, ErrorCode
+from app.routers.chatkit._chatkit_events_handler import ChatKitEventsHandler
 from agent_framework.observability import get_tracer
 from app.config.settings import settings
 
@@ -42,10 +43,8 @@
 
 if settings.AGENTS_TYPE == "azure_chat":
     from app.agents.azure_chat.handoff_orchestrator import HandoffOrchestrator
-    from app.agents.azure_chat._chatkit_events_handler import ChatKitEventsHandler
 elif settings.AGENTS_TYPE == "foundry_v2":
     from app.agents.foundry_v2.handoff_orchestrator import HandoffOrchestrator
-    from app.agents.foundry_v2._chatkit_events_handler import ChatKitEventsHandler
 else:
     raise ValueError(f"Unsupported AGENTS_TYPE: {settings.AGENTS_TYPE}")
 from app.common.chatkit.types import ClientWidgetItem, CustomThreadItemDoneEvent