Merge pull request #52 from Contextable/general-cleanup

General cleanup

Author: contextablemark

typescript-sdk/integrations/adk-middleware/src/adk_middleware/adk_agent.py

@@ -11,9 +11,7 @@
 from ag_ui.core import (
     RunAgentInput, BaseEvent, EventType,
     RunStartedEvent, RunFinishedEvent, RunErrorEvent,
-    TextMessageStartEvent, TextMessageContentEvent, TextMessageEndEvent,
-    StateSnapshotEvent, StateDeltaEvent,
-    Context, ToolMessage, ToolCallEndEvent, SystemMessage,ToolCallResultEvent
+    ToolCallEndEvent, SystemMessage,ToolCallResultEvent
 )
 
 from google.adk import Runner
@@ -406,7 +404,7 @@ async def _handle_tool_result_submission(
         # Extract tool results that is send by the frontend 
         tool_results = await self._extract_tool_results(input)
 
-        # if the tool results are not send by the fronted then call the tool function
+        # if the tool results are not sent by the fronted then call the tool function
         if not tool_results:
             logger.error(f"Tool result submission without tool results for thread {thread_id}")
             yield RunErrorEvent(
@@ -476,7 +474,7 @@ async def _extract_tool_results(self, input: RunAgentInput) -> List[Dict]:
             tool_name = tool_call_map.get(most_recent_tool_message.tool_call_id, "unknown")
 
             # Debug: Log the extracted tool message
-            logger.info(f"Extracted most recent ToolMessage: role={most_recent_tool_message.role}, tool_call_id={most_recent_tool_message.tool_call_id}, content='{most_recent_tool_message.content}'")
+            logger.debug(f"Extracted most recent ToolMessage: role={most_recent_tool_message.role}, tool_call_id={most_recent_tool_message.tool_call_id}, content='{most_recent_tool_message.content}'")
 
             return [{
                 'tool_name': tool_name,
@@ -819,7 +817,7 @@ async def _run_adk_in_background(
                     content = tool_msg['message'].content
 
                     # Debug: Log the actual tool message content we received
-                    logger.info(f"Received tool result for call {tool_call_id}: content='{content}', type={type(content)}")
+                    logger.debug(f"Received tool result for call {tool_call_id}: content='{content}', type={type(content)}")
 
                     # Parse JSON content, handling empty or invalid JSON gracefully
                     try:

typescript-sdk/integrations/adk-middleware/src/adk_middleware/event_translator.py

@@ -11,11 +11,8 @@
     BaseEvent, EventType,
     TextMessageStartEvent, TextMessageContentEvent, TextMessageEndEvent,
     ToolCallStartEvent, ToolCallArgsEvent, ToolCallEndEvent,
-    ToolCallChunkEvent,ToolCallResultEvent,
-    StateSnapshotEvent, StateDeltaEvent,
-    MessagesSnapshotEvent,
-    CustomEvent,
-    Message, AssistantMessage, UserMessage, ToolMessage
+    ToolCallResultEvent, StateSnapshotEvent, StateDeltaEvent,
+    CustomEvent
 )
 import json
 from google.adk.events import Event as ADKEvent
@@ -71,7 +68,7 @@ async def translate(
             # Determine action based on ADK streaming pattern
             should_send_end = turn_complete and not is_partial
 
-            logger.info(f"📥 ADK Event: partial={is_partial}, turn_complete={turn_complete}, "
+            logger.debug(f"📥 ADK Event: partial={is_partial}, turn_complete={turn_complete}, "
                        f"is_final_response={is_final_response}, should_send_end={should_send_end}")
 
             # Skip user events (already in the conversation)
@@ -86,9 +83,6 @@ async def translate(
                 ):
                     yield event
 
-
-            
-
             # call _translate_function_calls function to yield Tool Events
             if hasattr(adk_event, 'get_function_calls'):               
                 function_calls = adk_event.get_function_calls()

typescript-sdk/integrations/adk-middleware/src/adk_middleware/utils/converters.py

@@ -74,7 +74,7 @@ def convert_ag_ui_messages_to_adk(messages: List[Message]) -> List[ADKEvent]:
                     role="function",
                     parts=[types.Part(
                         function_response=types.FunctionResponse(
-                            name=message.tool_call_id,  # This might need adjustment
+                            name=message.tool_call_id, 
                             response={"result": message.content} if isinstance(message.content, str) else message.content,
                             id=message.tool_call_id
                         )
@@ -115,7 +115,7 @@ def convert_adk_event_to_ag_ui_message(event: ADKEvent) -> Optional[Message]:
                     content="\n".join(text_parts)
                 )
 
-        elif event.author != "user":  # Assistant/model response
+        else:  # Assistant/model response
             # Extract text and tool calls
             text_parts = []
             tool_calls = []