Refactor as a single-class bundle

Author: GromNaN

.gitignore

@@ -4,5 +4,6 @@
 /composer.lock
 /phpunit.xml
 /vendor/
+/var/
 *.swp
 *.swo

composer.json

@@ -27,9 +27,10 @@
     },
     "require-dev": {
         "laravel/pint": "^1.18.1",
-        "phpstan/phpstan": "^1.12.6",
-        "rector/rector": "^0.14.8",
-        "symfony/phpunit-bridge": "^5.4|^6.3|^7.1.4"
+        "phpstan/phpstan": "^2.1.2",
+        "rector/rector": "^2.1.5",
+        "symfony/phpunit-bridge": "^5.4|^6.3|^7.1.4",
+        "symfony/framework-bundle": "^5.4|^6.3|^7.1"
     },
     "autoload": {
         "psr-4": {
@@ -53,7 +54,7 @@
     "scripts": {
         "lint": "pint -v",
         "refactor": "rector --debug",
-        "test:lint": "pint --test -v",
+        "test:lint": "pint --test -v ./src ./tests",
         "test:types": "phpstan analyse --ansi",
         "test:unit": "simple-phpunit --colors=always",
         "test": [

rector.php

@@ -4,16 +4,15 @@
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__.'/src',
-    ]);
-
-    $rectorConfig->skip([
-        __DIR__.'/src/Resources/config/',
+        __DIR__.'/tests',
+        __DIR__.'/rector.php',
     ]);
 
     $rectorConfig->rules([
@@ -28,4 +27,8 @@
         SetList::TYPE_DECLARATION,
         SetList::PRIVATIZATION,
     ]);
+
+    $rectorConfig->skip([
+        FirstClassCallableRector::class,
+    ]);
 };

src/DependencyInjection/Configuration.php

@@ -4,6 +4,51 @@
 
 namespace OpenAI\Symfony;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
+use OpenAI\Client;
+use OpenAI\Contracts\ClientContract;
+use OpenAI\Factory;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\HttpClient\Psr18Client;
+use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
 
-final class OpenAIBundle extends Bundle {}
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+final class OpenAIBundle extends AbstractBundle
+{
+    protected string $extensionAlias = 'openai';
+
+    public function configure(DefinitionConfigurator $definition): void
+    {
+        $root = $definition->rootNode();
+        assert($root instanceof ArrayNodeDefinition);
+        $children = $root->children();
+        $children->scalarNode('api_key')->defaultValue('%env(OPENAI_API_KEY)%');
+        $children->scalarNode('organization')->defaultValue('%env(default::OPENAI_ORGANIZATION)%');
+    }
+
+    /**
+     * @param  array{api_key: string, organization: string}  $config
+     */
+    public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
+    {
+        $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')])
+            ->call('withHttpHeader', ['OpenAI-Beta', 'assistants=v2'])
+            ->call('withApiKey', [$config['api_key']])
+            ->call('withOrganization', [$config['organization']])
+
+            ->set(Client::class)
+            ->factory([service(Factory::class), 'make'])
+
+            ->alias(ClientContract::class, Client::class)
+            ->alias('openai', Client::class);
+    }
+}

src/DependencyInjection/OpenAIExtension.php

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenAI\Symfony\Tests;
+
+use OpenAI\Client;
+use OpenAI\Contracts\ClientContract;
+use OpenAI\Symfony\OpenAIBundle;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\HttpKernel\Kernel;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+final class OpenAIBundleTest extends TestCase
+{
+    public function test_service(): void
+    {
+        $kernel = new class('test', true) extends Kernel
+        {
+            use MicroKernelTrait;
+
+            public function registerBundles(): iterable
+            {
+                yield new FrameworkBundle;
+                yield new OpenAIBundle;
+            }
+
+            protected function configureContainer(ContainerConfigurator $container): void
+            {
+                $container->extension('framework', [
+                    'secret' => 'S0ME_SECRET',
+                ]);
+
+                $container->extension('openai', [
+                    'api_key' => 'pk-123456789',
+                    'organization' => 'org-123456789',
+                ]);
+
+                $container->services()
+                    ->set('http_client', MockHttpClient::class)
+                    ->public()
+
+                    ->set('tested_services', \ArrayObject::class)
+                    ->args([[
+                        'openai' => service('openai'),
+                        Client::class => service(Client::class),
+                        ClientContract::class => service(ClientContract::class),
+                    ]])
+                    ->public();
+            }
+        };
+
+        // Using a mock to test the service configuration
+        $httpClient = new MockHttpClient(function (string $method, string $url, array $options = []): MockResponse {
+            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',
+                    'x-request-id' => '0123456789abcdef0123456789abcdef',
+                ],
+            ]);
+        });
+
+        $kernel->boot();
+        $container = $kernel->getContainer();
+        $container->set('http_client', $httpClient);
+
+        $testedServices = $container->get('tested_services');
+        assert($testedServices instanceof \ArrayObject);
+        $openai = $testedServices['openai'];
+        self::assertInstanceOf(Client::class, $openai);
+        self::assertSame($openai, $testedServices[Client::class]);
+        self::assertSame($openai, $testedServices[ClientContract::class]);
+
+        $response = $openai->files()->delete('file.txt');
+        self::assertSame('file.txt', $response->id);
+    }
+}