fix: do not defer events

distantmagic · Apr 22, 2024 · 71d5891 · 71d5891
1 parent e615a1a
commit 71d5891
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/src/DatabaseConnection.php b/src/DatabaseConnection.php
@@ -10,7 +10,6 @@
 use Psr\Log\LoggerInterface;
 use Swoole\Database\PDOProxy;
 use Swoole\Database\PDOStatementProxy;
-use Swoole\Event;
 
 readonly class DatabaseConnection implements Connection
 {
@@ -38,9 +37,7 @@ public function __construct(
 
     public function __destruct()
     {
-        Event::defer(function (): void {
-            $this->databaseConnectionPoolRepository->putConnection($this->connectionPoolName, $this->pdo);
-        });
+        $this->databaseConnectionPoolRepository->putConnection($this->connectionPoolName, $this->pdo);
     }
 
     public function beginTransaction(): void

diff --git a/src/EventDispatcher.php b/src/EventDispatcher.php
@@ -8,8 +8,8 @@
 use Distantmagic\SwooleFuture\SwooleFuture;
 use Distantmagic\SwooleFuture\SwooleFutureResult;
 use Psr\Log\LoggerInterface;
-use Swoole\Event;
 
+use function Distantmagic\Resonance\helpers\coroutineMustGo;
 use function Swoole\Coroutine\batch;
 
 #[Singleton(provides: EventDispatcherInterface::class)]
@@ -31,7 +31,7 @@ public function collect(object $event): SwooleFutureResult
 
     public function dispatch(object $event): void
     {
-        Event::defer(function () use ($event): void {
+        coroutineMustGo(function () use ($event): void {
             $this->doDispatch($event);
         });
     }

diff --git a/src/LlamaCppClient.php b/src/LlamaCppClient.php
@@ -29,7 +29,7 @@ public function __construct(
 
     public function generateCompletion(
         LlamaCppCompletionRequest $request,
-        int $timeout = 3600,
+        int $timeout = 10800,
     ): LlamaCppCompletionIterator {
         $serializedRequest = $this->jsonSerializer->serialize($request->toJsonSerializable($this->llmChatHistoryRenderer));
         $responseChunks = $this->streamResponse($serializedRequest, '/completion', $timeout);
@@ -80,7 +80,7 @@ public function generateEmbedding(LlamaCppEmbeddingRequest $request): LlamaCppEm
      */
     public function generateInfill(
         LlamaCppInfillRequest $request,
-        int $timeout = 3600,
+        int $timeout = 10800,
     ): Generator {
         $serializedRequest = $this->jsonSerializer->serialize($request);
         $responseChunks = $this->streamResponse($serializedRequest, '/infill', $timeout);

diff --git a/src/Session.php b/src/Session.php
@@ -6,7 +6,6 @@
 
 use Ds\Map;
 use Redis;
-use Swoole\Event;
 
 readonly class Session
 {
@@ -37,12 +36,10 @@ public function __construct(
 
     public function __destruct()
     {
-        Event::defer(function (): void {
-            $this->redisConnectionPoolRepository->putConnection(
-                $this->sessionConfiguration->redisConnectionPool,
-                $this->redis,
-            );
-        });
+        $this->redisConnectionPoolRepository->putConnection(
+            $this->sessionConfiguration->redisConnectionPool,
+            $this->redis,
+        );
     }
 
     public function persist(): void