Merge pull request #3 from llm-agents-php/feature/error-handling

Handle LLM errors

composer.json

@@ -5,7 +5,7 @@
   "require": {
     "php": "^8.3",
     "openai-php/client": "^0.10.1",
-    "llm-agents/agents": "^1.0",
+    "llm-agents/agents": "^1.4",
     "guzzlehttp/guzzle": "^7.0"
   },
   "require-dev": {

src/Exception/LimitExceededException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Agents\OpenAI\Client\Exception;
+
+final class LimitExceededException extends OpenAiClientException
+{
+
+}

src/Exception/OpenAiClientException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Agents\OpenAI\Client\Exception;
+
+class OpenAiClientException extends \Exception
+{
+
+}

src/Exception/RateLimitException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Agents\OpenAI\Client\Exception;
+
+final class RateLimitException extends OpenAiClientException
+{
+
+}

src/Exception/TimeoutException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LLM\Agents\OpenAI\Client\Exception;
+
+final class TimeoutException extends OpenAiClientException
+{
+
+}

src/LLM.php

@@ -12,6 +12,9 @@
 use LLM\Agents\LLM\Prompt\PromptInterface;
 use LLM\Agents\LLM\Prompt\Tool;
 use LLM\Agents\LLM\Response\Response;
+use LLM\Agents\OpenAI\Client\Exception\LimitExceededException;
+use LLM\Agents\OpenAI\Client\Exception\RateLimitException;
+use LLM\Agents\OpenAI\Client\Exception\TimeoutException;
 use OpenAI\Contracts\ClientContract;
 
 final class LLM implements LLMInterface
@@ -77,7 +80,17 @@ public function generate(
             ->chat()
             ->createStreamed($request);
 
-        return $this->streamParser->parse($stream, $callback);
+        try {
+            return $this->streamParser->parse($stream, $callback);
+        } catch (LimitExceededException) {
+            throw new \LLM\Agents\LLM\Exception\LimitExceededException(
+                currentLimit: $request['max_tokens'],
+            );
+        } catch (RateLimitException) {
+            throw new \LLM\Agents\LLM\Exception\RateLimitException();
+        } catch (TimeoutException) {
+            throw new \LLM\Agents\LLM\Exception\TimeoutException();
+        }
     }
 
     protected function buildOptions(OptionsInterface $options): array

src/Parsers/ChatResponseParser.php

@@ -5,6 +5,9 @@
 namespace LLM\Agents\OpenAI\Client\Parsers;
 
 use LLM\Agents\OpenAI\Client\Event\MessageChunk;
+use LLM\Agents\OpenAI\Client\Exception\LimitExceededException;
+use LLM\Agents\OpenAI\Client\Exception\RateLimitException;
+use LLM\Agents\OpenAI\Client\Exception\TimeoutException;
 use LLM\Agents\OpenAI\Client\StreamChunkCallbackInterface;
 use LLM\Agents\LLM\Response\FinishReason;
 use LLM\Agents\LLM\Response\Response;
@@ -21,6 +24,11 @@ public function __construct(
         private ?EventDispatcherInterface $eventDispatcher = null,
     ) {}
 
+    /**
+     * @throws LimitExceededException
+     * @throws RateLimitException
+     * @throws TimeoutException
+     */
     public function parse(ResponseStreamContract $stream, ?StreamChunkCallbackInterface $callback = null): Response
     {
         $callback ??= static fn(?string $chunk, bool $stop, ?string $finishReason = null) => null;
@@ -112,6 +120,9 @@ public function parse(ResponseStreamContract $stream, ?StreamChunkCallbackInterf
                 tools: \array_values($toolCalls),
                 finishReason: $finishReason->value,
             ),
+            $finishReason === FinishReason::Length => throw new LimitExceededException(),
+            $finishReason === FinishReason::Timeout => throw new TimeoutException(),
+            $finishReason === FinishReason::Limit => throw new RateLimitException(),
         };
     }
 }

src/Parsers/ParserInterface.php

@@ -4,11 +4,19 @@
 
 namespace LLM\Agents\OpenAI\Client\Parsers;
 
+use LLM\Agents\OpenAI\Client\Exception\LimitExceededException;
+use LLM\Agents\OpenAI\Client\Exception\RateLimitException;
+use LLM\Agents\OpenAI\Client\Exception\TimeoutException;
 use LLM\Agents\OpenAI\Client\StreamChunkCallbackInterface;
 use LLM\Agents\LLM\Response\Response;
 use OpenAI\Contracts\ResponseStreamContract;
 
 interface ParserInterface
 {
+    /**
+     * @throws LimitExceededException
+     * @throws RateLimitException
+     * @throws TimeoutException
+     */
     public function parse(ResponseStreamContract $stream, ?StreamChunkCallbackInterface $callback = null): Response;
 }

src/StreamResponseParser.php

@@ -4,6 +4,9 @@
 
 namespace LLM\Agents\OpenAI\Client;
 
+use LLM\Agents\OpenAI\Client\Exception\LimitExceededException;
+use LLM\Agents\OpenAI\Client\Exception\RateLimitException;
+use LLM\Agents\OpenAI\Client\Exception\TimeoutException;
 use LLM\Agents\OpenAI\Client\Parsers\ParserInterface;
 use LLM\Agents\LLM\Exception\LLMException;
 use LLM\Agents\LLM\Response\Response;
@@ -19,6 +22,11 @@ public function registerParser(string $type, ParserInterface $parser): void
         $this->parsers[$type] = $parser;
     }
 
+    /**
+     * @throws LimitExceededException
+     * @throws RateLimitException
+     * @throws TimeoutException
+     */
     public function parse(StreamResponse $stream, ?StreamChunkCallbackInterface $callback = null): Response
     {
         $this->validateStreamResponse($stream);