Fixed async generators 3.12, 311 and 3.10

Author: Maximilian-Winter

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ToolAgents"
-version = "0.2.6"
+version = "0.2.7"
 description = "ToolAgents is a lightweight and flexible framework for creating function-calling agents with various language models and APIs."
 
 readme = "ReadMe.md"

src/ToolAgents/agents/base_llm_agent.py

@@ -244,7 +244,7 @@ async def get_streaming_response(
             tool_registry: ToolRegistry = None,
             settings: Optional[Any] = None,
             reset_last_messages_buffer: bool = True,
-    ) -> AsyncGenerator[ChatResponseChunk]:
+    ) -> AsyncGenerator[ChatResponseChunk, None]:
         """
         Gets a streaming response from the chat API, handling any tool calls.
 

src/ToolAgents/agents/chat_tool_agent.py

@@ -282,7 +282,7 @@ async def stream_step(
             tool_registry: ToolRegistry = None,
             settings: Optional[Any] = None,
             reset_last_messages_buffer: bool = True,
-    ) -> AsyncGenerator[StreamingChatMessage]:
+    ) -> AsyncGenerator[StreamingChatMessage, None]:
         """
         Performs a single streaming step of interaction with the chat API,
         yielding chunks and whether they contain tool calls.
@@ -353,7 +353,7 @@ async def get_streaming_response(
             tool_registry: ToolRegistry = None,
             settings: Optional[Any] = None,
             reset_last_messages_buffer: bool = True,
-    ) -> AsyncGenerator[ChatResponseChunk]:
+    ) -> AsyncGenerator[ChatResponseChunk, None]:
         """
         Gets a streaming response from the chat API, handling any tool calls.
 

src/ToolAgents/provider/chat_api_provider/anthropic.py

@@ -76,7 +76,7 @@ async def get_response(self, messages: List[ChatMessage], settings: ProviderSett
 
     async def get_streaming_response(self, messages: List[ChatMessage], settings: ProviderSettings=None,
                                tools: Optional[List[FunctionTool]] = None) -> AsyncGenerator[
-        StreamingChatMessage]:
+        StreamingChatMessage, None]:
         request_kwargs = self._prepare_request(messages, settings, tools)
         request_kwargs["stream"] = True
         response = self.client.messages.create(**request_kwargs)

src/ToolAgents/provider/chat_api_provider/groq.py

@@ -76,7 +76,7 @@ async def get_response(self, messages: List[ChatMessage], settings=None,
 
     async def get_streaming_response(self, messages: List[ChatMessage], settings=None,
                                tools: Optional[List[FunctionTool]] = None) -> AsyncGenerator[
-        StreamingChatMessage]:
+        StreamingChatMessage, None]:
         request_kwargs = self._prepare_request(messages, settings, tools)
 
         request_kwargs["stream"] = True

src/ToolAgents/provider/chat_api_provider/mistral.py

@@ -71,7 +71,7 @@ async def get_response(self, messages: List[ChatMessage], settings: ProviderSett
 
     async def get_streaming_response(self, messages: List[ChatMessage], settings: ProviderSettings = None,
                                tools: Optional[List[FunctionTool]] = None) -> AsyncGenerator[
-        StreamingChatMessage]:
+        StreamingChatMessage, None]:
         request_kwargs = self._prepare_request(messages, settings, tools)
 
         stream = self.client.chat.stream_async(**request_kwargs)

src/ToolAgents/provider/chat_api_provider/open_ai.py

@@ -83,7 +83,7 @@ async def get_response(self, messages: List[ChatMessage], settings=None,
 
     async def get_streaming_response(self, messages: List[ChatMessage], settings=None,
                                tools: Optional[List[FunctionTool]] = None) -> AsyncGenerator[
-        StreamingChatMessage]:
+        StreamingChatMessage, None]:
         request_kwargs = self._prepare_request(messages, settings, tools)
 
         request_kwargs["stream"] = True

src/ToolAgents/provider/llm_provider.py

@@ -249,7 +249,7 @@ async def get_response(self, messages: List[ChatMessage], settings: ProviderSett
     @abc.abstractmethod
     async def get_streaming_response(self, messages: List[ChatMessage], settings: ProviderSettings=None,
                                tools: Optional[List[FunctionTool]] = None) -> AsyncGenerator[
-        StreamingChatMessage]:
+        StreamingChatMessage, None]:
         pass
 
     @abc.abstractmethod

src/ToolAgents/provider/message_converter/anthropic_message_converter.py

@@ -183,7 +183,7 @@ def yield_from_provider(self, stream_generator: Any) -> Generator[StreamingChatM
                                                                          created_at=datetime.datetime.now(),
                                                                          updated_at=datetime.datetime.now()))
 
-    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage]:
+    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage, None]:
         current_tool_call = None
         content = None
         has_tool_call = False

src/ToolAgents/provider/message_converter/groq_message_converter.py

@@ -206,7 +206,7 @@ def yield_from_provider(self, stream_generator: Any) -> Generator[StreamingChatM
                     finished_chat_message=finished_message
                 )
 
-    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage]:
+    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage, None]:
         current_content = ""
         current_tool_calls = []
         alt_index = 0

src/ToolAgents/provider/message_converter/message_converter.py

@@ -42,5 +42,5 @@ def yield_from_provider(self, stream_generator: Any) -> Generator[StreamingChatM
         pass
 
     @abstractmethod
-    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage]:
+    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage, None]:
         pass

src/ToolAgents/provider/message_converter/mistral_message_converter.py

@@ -187,7 +187,7 @@ def yield_from_provider(self, stream_generator: Any) -> Generator[StreamingChatM
                     finished=True,
                     finished_chat_message=finished_message
                 )
-    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage]:
+    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage, None]:
         current_content = ""
         current_tool_calls = []
         alt_index = 0

src/ToolAgents/provider/message_converter/open_ai_message_converter.py

@@ -201,7 +201,7 @@ def yield_from_provider(self, stream_generator: Any) -> Generator[StreamingChatM
                     finished=True,
                     finished_chat_message=finished_message
                 )
-    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage]:
+    async def async_yield_from_provider(self, stream_generator: Any) -> AsyncGenerator[StreamingChatMessage, None]:
         current_content = ""
         current_tool_calls = []
         alt_index = 0