Merge remote-tracking branch 'origin/main'

Author: devhaozi

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `chatgpt-php` will be documented in this file.
 
+## 2.0.0 - 2023-03-31
+
+1. Update stream mode return.
+
 ## 1.8.0 - 2023-03-26
 
 Update V1 API and change error thrown.

src/V1.php

@@ -201,7 +201,7 @@ public function ask(
         // 流模式下，返回一个生成器
         if ($stream) {
             $answer = $response->getBody();
-            while (!$answer->eof()) {
+            while (! $answer->eof()) {
                 $raw = Psr7\Utils::readLine($answer);
                 $line = self::formatStreamMessage($raw);
                 if (self::checkFields($line)) {
@@ -232,7 +232,7 @@ public function ask(
 
                 $line = $this->formatStreamMessage($line);
 
-                if (!$this->checkFields($line)) {
+                if (! $this->checkFields($line)) {
                     if (isset($line["detail"]) && $line["detail"] === "Too many requests in 1 hour. Try again later.") {
                         throw new Exception("Rate limit exceeded");
                     }
@@ -311,7 +311,7 @@ public function getConversations(int $offset = 0, int $limit = 20, $account = 0)
             throw new Exception('Response is not json');
         }
 
-        if (!isset($data['items'])) {
+        if (! isset($data['items'])) {
             throw new Exception('Field missing');
         }
 

src/V2.php

@@ -117,7 +117,7 @@ public function ask(string $prompt, string $user = null, bool $stream = false)
         // 流模式下，返回一个生成器
         if ($stream) {
             $answer = $response->getBody();
-            while (!$answer->eof()) {
+            while (! $answer->eof()) {
                 $raw = Psr7\Utils::readLine($answer);
                 $line = self::formatStreamMessage($raw);
                 if (self::checkStreamFields($line)) {
@@ -139,7 +139,7 @@ public function ask(string $prompt, string $user = null, bool $stream = false)
                 throw new Exception('Response is not json');
             }
 
-            if (!$this->checkFields($data)) {
+            if (! $this->checkFields($data)) {
                 throw new Exception('Field missing');
             }