myagent-ai 1.9.1 → 1.9.2

package/core/llm.py

@@ -649,28 +649,36 @@ class LLMClient:
             logger.error(f"流式 LLM 调用失败: {e}")
 
     async def _stream_openai(self, kwargs: dict) -> AsyncGenerator[str, None]:
-        """OpenAI / 兼容接口 (含 Zhipu) 流式调用"""
-        loop = asyncio.get_running_loop()
-
-        def _create_stream():
-            return self._client.chat.completions.create(**kwargs)
-
-        stream = await loop.run_in_executor(None, _create_stream)
+        """OpenAI / 兼容接口 (含 Zhipu) 流式调用
 
-        # 使用迭代器在 executor 中逐步获取
-        def _next_chunk(it):
-            try:
-                return next(it)
-            except StopIteration:
-                return None
+        支持两种客户端:
+        - AsyncOpenAI: 使用 async for 直接异步迭代
+        - 同步 OpenAI: 在 executor 中同步迭代
+        """
+        # 判断客户端类型，选择合适的流式迭代方式
+        is_async = hasattr(self._client, '__aenter__')
+
+        if is_async:
+            # AsyncOpenAI: 直接异步迭代
+            stream = await self._client.chat.completions.create(**kwargs)
+            async for chunk in stream:
+                if chunk.choices and chunk.choices[0].delta.content:
+                    yield chunk.choices[0].delta.content
+        else:
+            # 同步 OpenAI: 在 executor 中迭代
+            loop = asyncio.get_running_loop()
 
-        iterator = iter(stream)
-        while True:
-            chunk = await loop.run_in_executor(None, _next_chunk, iterator)
-            if chunk is None:
-                break
-            if chunk.choices and chunk.choices[0].delta.content:
-                yield chunk.choices[0].delta.content
+            def _create_and_iterate():
+                stream = self._client.chat.completions.create(**kwargs)
+                results = []
+                for chunk in stream:
+                    if chunk.choices and chunk.choices[0].delta.content:
+                        results.append(chunk.choices[0].delta.content)
+                return results
+
+            chunks = await loop.run_in_executor(None, _create_and_iterate)
+            for content in chunks:
+                yield content
 
     async def _stream_anthropic(
         self, messages: List[Message], kwargs: dict

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {