Move event handling to a dedicated Dispatchable trait

Author: gehrisandro

src/Client.php

@@ -42,7 +42,8 @@ public function __construct(
      */
     public function completions(): Completions
     {
-        return new Completions($this->transporter, $this->events);
+        return (new Completions($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -52,7 +53,8 @@ public function completions(): Completions
      */
     public function chat(): Chat
     {
-        return new Chat($this->transporter, $this->events);
+        return (new Chat($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -62,7 +64,8 @@ public function chat(): Chat
      */
     public function embeddings(): Embeddings
     {
-        return new Embeddings($this->transporter, $this->events);
+        return (new Embeddings($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -72,7 +75,8 @@ public function embeddings(): Embeddings
      */
     public function audio(): Audio
     {
-        return new Audio($this->transporter, $this->events);
+        return (new Audio($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -82,7 +86,8 @@ public function audio(): Audio
      */
     public function edits(): Edits
     {
-        return new Edits($this->transporter, $this->events);
+        return (new Edits($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -92,7 +97,8 @@ public function edits(): Edits
      */
     public function files(): Files
     {
-        return new Files($this->transporter, $this->events);
+        return (new Files($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -102,7 +108,8 @@ public function files(): Files
      */
     public function models(): Models
     {
-        return new Models($this->transporter, $this->events);
+        return (new Models($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -112,7 +119,8 @@ public function models(): Models
      */
     public function fineTuning(): FineTuning
     {
-        return new FineTuning($this->transporter, $this->events);
+        return (new FineTuning($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -124,7 +132,8 @@ public function fineTuning(): FineTuning
      */
     public function fineTunes(): FineTunes
     {
-        return new FineTunes($this->transporter, $this->events);
+        return (new FineTunes($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -134,7 +143,8 @@ public function fineTunes(): FineTunes
      */
     public function moderations(): Moderations
     {
-        return new Moderations($this->transporter, $this->events);
+        return (new Moderations($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -144,7 +154,8 @@ public function moderations(): Moderations
      */
     public function images(): Images
     {
-        return new Images($this->transporter, $this->events);
+        return (new Images($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -154,7 +165,8 @@ public function images(): Images
      */
     public function assistants(): Assistants
     {
-        return new Assistants($this->transporter, $this->events);
+        return (new Assistants($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 
     /**
@@ -164,6 +176,7 @@ public function assistants(): Assistants
      */
     public function threads(): ThreadsContract
     {
-        return new Threads($this->transporter, $this->events);
+        return (new Threads($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 }

src/Resources/Assistants.php

@@ -15,6 +15,7 @@
 
 final class Assistants implements AssistantsContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Transportable;
 
     /**
@@ -125,6 +126,7 @@ public function list(array $parameters = []): AssistantListResponse
      */
     public function files(): AssistantsFilesContract
     {
-        return new AssistantsFiles($this->transporter, $this->events);
+        return (new AssistantsFiles($this->transporter))
+            ->setEventDispatcher($this->events);
     }
 }

src/Resources/AssistantsFiles.php

@@ -14,6 +14,7 @@
 
 final class AssistantsFiles implements AssistantsFilesContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Transportable;
 
     /**

src/Resources/Audio.php

@@ -14,6 +14,7 @@
 
 final class Audio implements AudioContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Transportable;
 
     /**

src/Resources/Chat.php

@@ -14,6 +14,7 @@
 
 final class Chat implements ChatContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Streamable;
     use Concerns\Transportable;
 

src/Resources/Completions.php

@@ -14,6 +14,7 @@
 
 final class Completions implements CompletionsContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Streamable;
     use Concerns\Transportable;
 

src/Resources/Concerns/Dispatchable.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenAI\Resources\Concerns;
+
+use OpenAI\Contracts\DispatcherContract;
+
+trait Dispatchable
+{
+    private DispatcherContract $events;
+
+    public function setEventDispatcher(DispatcherContract $events): static
+    {
+        $this->events = $events;
+
+        return $this;
+    }
+
+    public function event(object $event): void
+    {
+        $this->events->dispatch($event);
+    }
+}

src/Resources/Concerns/Transportable.php

@@ -4,23 +4,15 @@
 
 namespace OpenAI\Resources\Concerns;
 
-use OpenAI\Contracts\DispatcherContract;
 use OpenAI\Contracts\TransporterContract;
 
 trait Transportable
 {
     /**
      * Creates a Client instance with the given API token.
      */
-    public function __construct(
-        private readonly TransporterContract $transporter,
-        private readonly DispatcherContract $events,
-    ) {
-        // ..
-    }
-
-    public function event(object $event): void
+    public function __construct(private readonly TransporterContract $transporter)
     {
-        $this->events->dispatch($event);
+        // ..
     }
 }

src/Resources/Edits.php

@@ -12,6 +12,7 @@
 
 final class Edits implements EditsContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Transportable;
 
     /**

src/Resources/Embeddings.php

@@ -12,6 +12,7 @@
 
 final class Embeddings implements EmbeddingsContract
 {
+    use Concerns\Dispatchable;
     use Concerns\Transportable;
 
     /**