feat: use symfony/http-client

Author: GromNaN

composer.json

@@ -12,9 +12,13 @@
     ],
     "require": {
         "php": "^8.1.0",
-        "openai-php/client": "^0.3.5",
+        "nyholm/psr7": "^1.5",
+        "openai-php/client": "^0.4.0",
+        "psr/http-client": "^1.0.1",
+        "psr/http-factory": "^1.0.1",
         "symfony/config": "^5.4.21|^6.2.7",
         "symfony/dependency-injection": "^5.4.21|^6.2.7",
+        "symfony/http-client": "^5.4.21|^6.2.7",
         "symfony/http-kernel": "^5.4.21|^6.2.7"
     },
     "require-dev": {
@@ -37,7 +41,10 @@
     "prefer-stable": true,
     "config": {
         "sort-packages": true,
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     },
     "scripts": {
         "lint": "pint -v",

src/DependencyInjection/Configuration.php

@@ -28,15 +28,8 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         assert($children instanceof NodeBuilder);
 
-        $children = $children->scalarNode('api_key')->defaultValue('%env(OPENAI_API_KEY)%')->end();
-
-        assert($children instanceof NodeBuilder);
-
-        $children = $children->scalarNode('organization')->defaultValue('%env(default::OPENAI_ORGANIZATION)%')->end();
-
-        assert($children instanceof NodeBuilder);
-
-        $children->end();
+        $children->scalarNode('api_key')->defaultValue('%env(OPENAI_API_KEY)%')->end();
+        $children->scalarNode('organization')->defaultValue('%env(default::OPENAI_ORGANIZATION)%')->end();
 
         return $treeBuilder;
     }

src/DependencyInjection/OpenAIExtension.php

@@ -4,7 +4,7 @@
 
 namespace OpenAI\Symfony\DependencyInjection;
 
-use OpenAI\Client;
+use OpenAI\Factory;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -30,8 +30,10 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $config = $this->processConfiguration($configuration, $configs);
 
-        $definition = $container->getDefinition(Client::class);
-        $definition->setArgument(0, $config['api_key']);
-        $definition->setArgument(1, $config['organization']);
+        $definition = $container->getDefinition(Factory::class);
+        $definition->addMethodCall('withApiKey', [$config['api_key']]);
+        if ($config['organization']) {
+            $definition->addMethodCall('withOrganization', [$config['organization']]);
+        }
     }
 }

src/Resources/config/services.php

@@ -6,14 +6,20 @@
 
 use OpenAI;
 use OpenAI\Client;
+use OpenAI\Factory;
+use Symfony\Component\HttpClient\Psr18Client;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
+        ->set('openai.http_client', Psr18Client::class)
+            ->arg(0, service('http_client'))
+
+        ->set(Factory::class)
+            ->factory([OpenAI::class, 'factory'])
+            ->call('withHttpClient', [service('openai.http_client')])
+
         ->set(Client::class)
-            ->factory([OpenAI::class, 'client'])
-            ->args([
-                abstract_arg('API Key'),
-                abstract_arg('Organisation'),
-            ])
+            ->factory([service(Factory::class), 'make'])
+
         ->alias('openai', Client::class);
 };

tests/DependencyInjection/OpenAIExtensionTest.php

@@ -8,12 +8,30 @@
 use OpenAI\Symfony\DependencyInjection\OpenAIExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
 
 final class OpenAIExtensionTest extends TestCase
 {
     public function testService(): void
     {
+        // Using a mock to test the service configuration
+        $httpClient = new MockHttpClient(function (string $method, string $url, array $options = []) {
+            self::assertSame('DELETE', $method);
+            self::assertSame('https://api.openai.com/v1/files/file.txt', $url);
+            self::assertContains('Authorization: Bearer pk-123456789', $options['headers']);
+
+            return new MockResponse('{"id":"file.txt","object":"file","deleted":true}', [
+                'http_code' => 200,
+                'response_headers' => [
+                    'content-type' => 'application/json',
+                ],
+            ]);
+        });
+
         $container = new ContainerBuilder();
+        $container->set('http_client', $httpClient);
+
         $extension = new OpenAIExtension();
         $extension->load([
             'openai' => [
@@ -23,5 +41,8 @@ public function testService(): void
 
         $openai = $container->get('openai');
         self::assertInstanceOf(Client::class, $openai);
+
+        $response = $openai->files()->delete('file.txt');
+        self::assertSame('file.txt', $response->id);
     }
 }