兼容 Ollama 等更多第三方的类 OpenAI 接口

Author: Yurunsoft

README.md

@@ -93,6 +93,9 @@ imi-ai 是一个 ChatGPT 开源项目，支持聊天、问答、写代码、写
 * [x] [ChatGLM3](https://github.com/THUDM/ChatGLM3)
 * [x] [Google Gemini](https://aistudio.google.com/)
 * [x] [Qwen2](https://github.com/QwenLM/Qwen2) (Gitee AI Serverless API)
+* [x] [Ollama](https://ollama.com/)
+
+> 使用 Ollama 提供的类 OpenAI API，可以支持几乎所有开源模型私有化部署
 
 ### 其它
 

server/Module/Chat/Service/ChatService.php

@@ -197,24 +197,21 @@ public function chatStream(string $id, int $memberId, string $ip): \Iterator
             {
                 $role = $delta['role'];
             }
-            else
+            $yieldData = [];
+            if ($finishReason = ($data['finish_reason'] ?? null))
             {
-                $yieldData = [];
-                if ($finishReason = ($data['finish_reason'] ?? null))
-                {
-                    $yieldData['finishReason'] = $finishReason;
-                }
-                if (isset($delta['content']))
-                {
-                    $content .= $delta['content'];
-                    $yieldData['content'] = $delta['content'];
-                }
-                if (!$yieldData)
-                {
-                    continue;
-                }
-                yield $yieldData;
+                $yieldData['finishReason'] = $finishReason;
+            }
+            if (isset($delta['content']))
+            {
+                $content .= $delta['content'];
+                $yieldData['content'] = $delta['content'];
+            }
+            if (!$yieldData)
+            {
+                continue;
             }
+            yield $yieldData;
         }
         $endTime = time();
         $inputTokens += (\count($messages) * $modelConfig->additionalTokensPerMessage) + $modelConfig->additionalTokensAfterMessages;

server/Module/OpenAI/Client/OpenAI/Client.php

@@ -60,16 +60,9 @@ public function chat(array $params, ?int &$inputTokens = null, ?int &$outputToke
 
         try
         {
-            $contents = '';
             foreach ($this->client->chat()->createStreamed($params) as $response)
             {
                 $data = $response->toArray();
-                $content = $data['choices'][0]['delta']['content'] ?? null;
-                if (null !== $content && '' !== $content)
-                {
-                    $contents .= $content;
-                }
-                var_dump($data);
                 yield $data;
             }
             $inputTokens = $data['usage']['prompt_tokens'] ?? 0;