ref

Author: Guikingone

examples/.env

@@ -16,7 +16,7 @@ VOYAGE_API_KEY=
 REPLICATE_API_KEY=
 
 # For using Ollama
-OLLAMA_HOST_URL=http://localhost:11434
+OLLAMA_HOST_URL=http://127.0.0.1:11434
 OLLAMA_LLM=llama3.2
 OLLAMA_EMBEDDINGS=nomic-embed-text
 

examples/ollama/chat-llama-with-cache.php renamed to examples/misc/ollama-chat-with-cache.php

@@ -10,18 +10,18 @@
  */
 
 use Symfony\AI\Agent\Agent;
-use Symfony\AI\Platform\Bridge\Ollama\Ollama;
 use Symfony\AI\Platform\Bridge\Ollama\PlatformFactory;
+use Symfony\AI\Platform\CachedPlatform;
 use Symfony\AI\Platform\Message\Message;
 use Symfony\AI\Platform\Message\MessageBag;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
 require_once dirname(__DIR__).'/bootstrap.php';
 
-$platform = PlatformFactory::create(env('OLLAMA_HOST_URL'), http_client(), cache: new ArrayAdapter());
-$model = new Ollama('llama');
+$platform = PlatformFactory::create(env('OLLAMA_HOST_URL'), http_client());
+$cachedPlatform = new CachedPlatform($platform, new ArrayAdapter());
 
-$agent = new Agent($platform, $model, logger: logger());
+$agent = new Agent($cachedPlatform, 'gemma3n', logger: logger());
 $messages = new MessageBag(
     Message::forSystem('You are a helpful assistant.'),
     Message::ofUser('Tina has one brother and one sister. How many sisters do Tina\'s siblings have?'),
@@ -32,19 +32,8 @@
 
 echo $result->getContent().\PHP_EOL;
 
-assert($result->getMetadata()->get('cached'));
-assert('chat' === $result->getMetadata()->get('prompt_cache_key'));
-assert(0 !== $result->getMetadata()->get('cached_prompt_count'));
-assert(0 !== $result->getMetadata()->get('cached_completion_count'));
-
 $secondResult = $agent->call($messages, [
     'prompt_cache_key' => 'chat',
 ]);
 
 echo $secondResult->getContent().\PHP_EOL;
-
-assert($secondResult->getMetadata()->get('cached'));
-assert('chat' === $secondResult->getMetadata()->get('prompt_cache_key'));
-assert($result->getMetadata()->get('cached_prompt_count') === $secondResult->getMetadata()->get('cached_prompt_count'));
-assert($result->getMetadata()->get('cached_completion_count') === $secondResult->getMetadata()->get('cached_completion_count'));
-assert($result->getMetadata()->get('cached_time') === $secondResult->getMetadata()->get('cached_time'));

src/platform/src/Bridge/Ollama/OllamaClient.php

@@ -15,10 +15,7 @@
 use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\ModelClientInterface;
 use Symfony\AI\Platform\Result\RawHttpResult;
-use Symfony\Component\HttpClient\Response\MockResponse;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Symfony\Contracts\HttpClient\ResponseInterface;
 
 /**
  * @author Christopher Hertel <[email protected]>
@@ -28,7 +25,6 @@
     public function __construct(
         private HttpClientInterface $httpClient,
         private string $hostUrl,
-        private ?CacheInterface $cache = null,
     ) {
     }
 
@@ -72,40 +68,10 @@ private function doCompletionRequest(array|string $payload, array $options = [])
             unset($options['response_format']);
         }
 
-        $requestCallback = fn ($options, $payload): ResponseInterface => $this->httpClient->request('POST', \sprintf('%s/api/chat', $this->hostUrl), [
-            'headers' => [
-                'Content-Type' => 'application/json',
-            ],
-            'json' => [
-                ...$options,
-                ...$payload,
-            ],
-        ]);
-
-        if ($this->cache instanceof CacheInterface && (\array_key_exists('prompt_cache_key', $options) && '' !== $options['prompt_cache_key'])) {
-            $cacheKey = \sprintf('%s_%s', $options['prompt_cache_key'], md5(\is_array($payload) ? json_encode($payload) : ['context' => $payload]));
-
-            unset($options['prompt_cache_key']);
-
-            $cachedResponse = $this->cache->get($cacheKey, static function () use ($requestCallback, $options, $payload): array {
-                $response = $requestCallback($options, $payload);
-
-                return [
-                    'content' => $response->getContent(),
-                    'headers' => $response->getHeaders(),
-                    'http_code' => $response->getStatusCode(),
-                ];
-            });
-
-            $mockedResponse = new MockResponse($cachedResponse['content'], [
-                'http_code' => $cachedResponse['http_code'],
-                'response_headers' => $cachedResponse['headers'],
-            ]);
-
-            return new RawHttpResult(MockResponse::fromRequest('POST', \sprintf('%s/api/chat', $this->hostUrl), $options, $mockedResponse));
-        }
-
-        return new RawHttpResult($requestCallback($options, $payload));
+        return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/api/chat', $this->hostUrl), [
+            'headers' => ['Content-Type' => 'application/json'],
+            'json' => array_merge($options, $payload),
+        ]));
     }
 
     /**

src/platform/src/Bridge/Ollama/PlatformFactory.php

@@ -16,7 +16,6 @@
 use Symfony\AI\Platform\ModelCatalog\ModelCatalogInterface;
 use Symfony\AI\Platform\Platform;
 use Symfony\Component\HttpClient\EventSourceHttpClient;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -29,12 +28,11 @@ public static function create(
         ?HttpClientInterface $httpClient = null,
         ModelCatalogInterface $modelCatalog = new ModelCatalog(),
         ?Contract $contract = null,
-        ?CacheInterface $cache = null,
     ): Platform {
         $httpClient = $httpClient instanceof EventSourceHttpClient ? $httpClient : new EventSourceHttpClient($httpClient);
 
         return new Platform(
-            [new OllamaClient($httpClient, $hostUrl, $cache)],
+            [new OllamaClient($httpClient, $hostUrl)],
             [new OllamaResultConverter()],
             $modelCatalog,
             $contract ?? OllamaContract::create(),

src/platform/src/CachedPlatform.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\AI\Platform;
+
+use Symfony\AI\Platform\ModelCatalog\ModelCatalogInterface;
+use Symfony\AI\Platform\Result\ResultPromise;
+use Symfony\Contracts\Cache\CacheInterface;
+
+/**
+ * @author Guillaume Loulier <[email protected]>
+ */
+final readonly class CachedPlatform implements PlatformInterface
+{
+    public function __construct(
+        private PlatformInterface $platform,
+        private CacheInterface $cache,
+    ) {
+    }
+
+    public function invoke(string $model, object|array|string $input, array $options = []): ResultPromise
+    {
+        $invokeCall = fn (string $model, object|array|string $input, array $options = []): ResultPromise => $this->platform->invoke($model, $input, $options);
+
+        if ($this->cache instanceof CacheInterface && (\array_key_exists('prompt_cache_key', $options) && '' !== $options['prompt_cache_key'])) {
+            $cacheKey = \sprintf('%s_%s', $options['prompt_cache_key'], md5($model));
+
+            unset($options['prompt_cache_key']);
+
+            return $this->cache->get($cacheKey, static fn (): ResultPromise => $invokeCall($model, $input, $options));
+        }
+
+        return $invokeCall($model, $input, $options);
+    }
+
+    public function getModelCatalog(): ModelCatalogInterface
+    {
+        return $this->platform->getModelCatalog();
+    }
+}

src/platform/tests/CachedPlatformTest.php

@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\AI\Platform\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+final class CachedPlatformTest extends TestCase
+{
+}