Cleanup events

cognesy · Oct 9, 2024 · 4e80b35 · 4e80b35
1 parent 146708b
commit 4e80b35
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 174 deletions.
diff --git a/src/Events/Inference/StreamDataParsed.php b/src/Events/Inference/StreamDataParsed.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Cognesy\Instructor\Events\Inference;
+
+use Cognesy\Instructor\Events\Event;
+
+class StreamDataParsed extends Event
+{
+    public function __construct(
+        public string $content,
+    ) {
+        parent::__construct();
+    }
+
+    public function __toString(): string {
+        return $this->content;
+    }
+}
diff --git a/src/Events/Inference/StreamDataReceived.php b/src/Events/Inference/StreamDataReceived.php
@@ -7,13 +7,12 @@
 class StreamDataReceived extends Event
 {
     public function __construct(
-        public string $raw,
-        public string $parsed,
+        public string $content,
     ) {
         parent::__construct();
     }
 
     public function __toString(): string {
-        return $this->raw;
+        return $this->content;
     }
 }
diff --git a/src/Events/LLMClient/LLMRequestErrorRaised.php b/src/Events/LLMClient/LLMRequestErrorRaised.php
diff --git a/src/Events/LLMClient/LLMRequestInitiated.php b/src/Events/LLMClient/LLMRequestInitiated.php
diff --git a/src/Events/LLMClient/LLMRequestSent.php b/src/Events/LLMClient/LLMRequestSent.php
diff --git a/src/Events/LLMClient/LLMStreamConnected.php b/src/Events/LLMClient/LLMStreamConnected.php
diff --git a/src/Events/LLMClient/LLMStreamRequestInitiated.php b/src/Events/LLMClient/LLMStreamRequestInitiated.php
diff --git a/src/Events/LLMClient/LLMStreamRequestSent.php b/src/Events/LLMClient/LLMStreamRequestSent.php
diff --git a/src/Events/LLMClient/LLMStreamResponseReceived.php b/src/Events/LLMClient/LLMStreamResponseReceived.php
diff --git a/src/Events/LLMClient/LLMStreamUpdateReceived.php b/src/Events/LLMClient/LLMStreamUpdateReceived.php
diff --git a/src/Events/LLMClient/RequestBodyCompiled.php b/src/Events/LLMClient/RequestBodyCompiled.php
diff --git a/src/Features/LLM/EventStreamReader.php b/src/Features/LLM/EventStreamReader.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Cognesy\Instructor\Events\EventDispatcher;
+use Cognesy\Instructor\Events\Inference\StreamDataParsed;
 use Cognesy\Instructor\Events\Inference\StreamDataReceived;
 use Cognesy\Instructor\Utils\Debug\Debug;
 use Generator;
@@ -27,8 +28,10 @@ public function __construct(
      */
     public function eventsFrom(Generator $stream): Generator {
         foreach ($this->readLines($stream) as $line) {
+            $this->events->dispatch(new StreamDataReceived($line));
             $processedData = $this->processLine($line);
             if ($processedData !== null) {
+                $this->events->dispatch(new StreamDataParsed($processedData));
                 yield $processedData;
             }
         }
@@ -60,7 +63,6 @@ protected function processLine(string $line): ?string {
         if (false === ($data = $this->parse($line))) {
             return null;
         }
-        $this->events->dispatch(new StreamDataReceived($line, $data));
         return $data;
     }
 

diff --git a/src/Features/LLM/InferenceResponse.php b/src/Features/LLM/InferenceResponse.php
@@ -59,7 +59,7 @@ public function stream() : InferenceStream {
         return new InferenceStream($this->response, $this->driver, $this->config, $this->events);
     }
 
-    // AS API RESPONSE OBJECTS //////////////////////////////////
+    // AS API RESPONSE OBJECT ///////////////////////////////////
 
     public function response() : LLMResponse {
         $response = match($this->isStreamed) {
@@ -72,20 +72,15 @@ public function response() : LLMResponse {
     // INTERNAL /////////////////////////////////////////////////
 
     private function makeLLMResponse() : LLMResponse {
-        $response = $this->driver->toLLMResponse($this->getResponseData());
+        $content = $this->getResponseContent();
+        $data = Json::decode($content) ?? [];
+        $response = $this->driver->toLLMResponse($data);
         $this->events->dispatch(new LLMResponseReceived($response));
         return $response;
     }
 
     // PRIVATE /////////////////////////////////////////////////
 
-    /**
-     * @return array<string, mixed>
-     */
-    private function getResponseData() : array {
-        return Json::decode($this->getResponseContent()) ?? [];
-    }
-
     private function getResponseContent() : string {
         if (empty($this->responseContent)) {
             $this->responseContent = $this->readFromResponse();

diff --git a/src/Features/LLM/InferenceStream.php b/src/Features/LLM/InferenceStream.php
@@ -7,7 +7,6 @@
 use Cognesy\Instructor\Features\Http\Contracts\CanAccessResponse;
 use Cognesy\Instructor\Features\LLM\Contracts\CanHandleInference;
 use Cognesy\Instructor\Features\LLM\Data\LLMConfig;
-use Cognesy\Instructor\Features\LLM\Data\LLMResponse;
 use Cognesy\Instructor\Features\LLM\Data\PartialLLMResponse;
 use Cognesy\Instructor\Utils\Json\Json;
 use Generator;
@@ -97,7 +96,7 @@ private function makePartialLLMResponses(Generator $stream) : Generator {
         $content = '';
         $finishReason = '';
         foreach ($this->getEventStream($stream) as $streamEvent) {
-            if ($streamEvent === false) {
+            if ($streamEvent === null || $streamEvent === '') {
                 continue;
             }
             $data = Json::decode($streamEvent, []);
@@ -123,7 +122,7 @@ private function makePartialLLMResponse(array $data) : ?PartialLLMResponse {
     }
 
     /**
-     * @return Generator<string>
+     * @return Generator<string|null>
      */
     private function getEventStream(Generator $stream) : Generator {
         if (!$this->streamReceived) {