fix: psalm

distantmagic · Jan 16, 2024 · 82119d4 · 82119d4
1 parent 0df6f49
commit 82119d4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/src/Command/OllamaCompletion.php b/src/Command/OllamaCompletion.php
@@ -55,8 +55,8 @@ protected function executeInCoroutine(InputInterface $input, OutputInterface $ou
             prompt: $prompt,
         );
 
-        foreach ($this->ollamaClient->generateCompletion($completionRequest) as $chunk) {
-            $output->write($chunk);
+        foreach ($this->ollamaClient->generateCompletion($completionRequest) as $token) {
+            $output->write($token);
         }
 
         return Command::SUCCESS;

diff --git a/src/OllamaClient.php b/src/OllamaClient.php
@@ -38,12 +38,12 @@ public function __destruct()
     public function generateCompletion(OllamaCompletionRequest $request): Generator
     {
         $channel = new Channel(1);
-        $data = json_encode($request);
+        $requestData = json_encode($request);
 
-        $cid = go(function () use ($channel, $data) {
+        $cid = go(function () use ($channel, $requestData) {
             try {
                 curl_setopt($this->ch, CURLOPT_URL, $this->ollamaLinkBuilder->build('/api/generate'));
-                curl_setopt($this->ch, CURLOPT_POSTFIELDS, $data);
+                curl_setopt($this->ch, CURLOPT_POSTFIELDS, $requestData);
                 curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, false);
                 curl_setopt($this->ch, CURLOPT_WRITEFUNCTION, function (CurlHandle $ch, string $data) use ($channel) {
                     if (!empty($data)) {
@@ -73,21 +73,27 @@ public function generateCompletion(OllamaCompletionRequest $request): Generator
             throw new RuntimeException('Unable to start a coroutine');
         }
 
-        foreach (new SwooleChannelIterator($channel) as $data) {
-            if ($data) {
-                yield $data->response;
-            }
+        /**
+         * @var SwooleChannelIterator<object{ response: string }>
+         */
+        $swooleChannelIterator = new SwooleChannelIterator($channel);
+
+        foreach ($swooleChannelIterator as $token) {
+            yield $token->response;
         }
     }
 
     public function generateEmbedding(OllamaEmbeddingRequest $request): OllamaEmbeddingResponse
     {
-        $data = json_encode($request);
+        $requestData = json_encode($request);
 
         curl_setopt($this->ch, CURLOPT_URL, $this->ollamaLinkBuilder->build('/api/embeddings'));
-        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $data);
+        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $requestData);
         curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 
+        /**
+         * @var false|string $responseContent
+         */
         $responseContent = curl_exec($this->ch);
 
         if (false === $responseContent) {
@@ -96,12 +102,15 @@ public function generateEmbedding(OllamaEmbeddingRequest $request): OllamaEmbedd
 
         $this->assertStatusCode(200);
 
-        $data = $this
+        /**
+         * @var object{ embedding: array<float> } $responseData
+         */
+        $responseData = $this
             ->jsonSerializer
             ->unserialize($responseContent)
         ;
 
-        return new OllamaEmbeddingResponse($data->embedding);
+        return new OllamaEmbeddingResponse($responseData->embedding);
     }
 
     private function assertStatusCode(int $expectedStatusCode): void

diff --git a/src/OllamaRequestOptions.php b/src/OllamaRequestOptions.php
@@ -17,10 +17,7 @@ public function jsonSerialize(): array
     {
         $ret = [];
 
-        if (isset($this->stopDelimiter)) {
-            $ret['stop'] = $this->stopDelimiter;
-        }
-
+        $ret['stop'] = $this->stopDelimiter;
         $ret['temperature'] = $this->temperature;
 
         return $ret;

diff --git a/src/SwooleChannelIterator.php b/src/SwooleChannelIterator.php
@@ -24,16 +24,17 @@ public function __construct(private Channel $channel) {}
     public function getIterator(): Generator
     {
         do {
+            /**
+             * @var mixed $data explicitly mixed for typechecks
+             */
             $data = $this->channel->pop();
 
             if (false === $data) {
                 switch ($this->channel->errCode) {
                     case SWOOLE_CHANNEL_CLOSED:
                         return;
                     case SWOOLE_CHANNEL_OK:
-                        yield $data;
-
-                        break;
+                        throw new RuntimeException('Using "false" is ambiguous in channels');
                     case SWOOLE_CHANNEL_TIMEOUT:
                         throw new RuntimeException('Swoole channel timed out');
                 }