Bump openai-php/client to 0.3.4 (#2)

* Revert ClientFactory

* Format

* Bump openai-client to 0.3.4

composer.json

@@ -17,7 +17,7 @@
  "hyperf/config": "~3.0.0",
  "hyperf/di": "~3.0.0",
  "hyperf/guzzle": "~3.0.0",
- "openai-php/client": "^0.3.2"
+ "openai-php/client": "^0.3.4"
  },
  "require-dev": {
  "friendsofphp/php-cs-fixer": "^3.0",

src/ClientFactory.php

@@ -11,7 +11,12 @@
 namespace FriendsOfHyperf\OpenAi;
 
 use FriendsOfHyperf\OpenAi\Exception\ApiKeyIsMissing;
-use OpenAI;
+use Hyperf\Guzzle\ClientFactory as GuzzleClientFactory;
+use OpenAI\Client;
+use OpenAI\Transporters\HttpTransporter;
+use OpenAI\ValueObjects\ApiKey;
+use OpenAI\ValueObjects\Transporter\BaseUri;
+use OpenAI\ValueObjects\Transporter\Headers;
 use Psr\Container\ContainerInterface;
 
 class ClientFactory
@@ -25,6 +30,17 @@ public function __invoke(ContainerInterface $container)
  throw ApiKeyIsMissing::create();
  }
 
- return OpenAI::client($apiKey, $organization);
+ $apiKey = ApiKey::from($apiKey);
+ $baseUri = BaseUri::from('api.openai.com/v1');
+ $headers = Headers::withAuthorization($apiKey);
+
+ if ($organization !== null) {
+ $headers = $headers->withOrganization($organization);
+ }
+
+ $client = $container->get(GuzzleClientFactory::class)->create();
+ $transporter = new HttpTransporter($client, $baseUri, $headers);
+
+ return new Client($transporter);
  }
 }

tests/Pest.php

@@ -1,16 +1,13 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
-|
-*/
-
+declare(strict_types=1);
+/**
+ * This file is part of openai-client.
+ *
+ * @link https://github.com/friendsofhyperf/openai-client
+ * @document https://github.com/friendsofhyperf/openai-client/blob/main/README.md
+ * @contact [email protected]
+ */
 // uses(Tests\TestCase::class)->in('Feature');
 
 /*

tests/TestCase.php

@@ -1,10 +1,17 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of openai-client.
+ *
+ * @link https://github.com/friendsofhyperf/openai-client
+ * @document https://github.com/friendsofhyperf/openai-client/blob/main/README.md
+ * @contact [email protected]
+ */
 namespace Tests;
 
 use PHPUnit\Framework\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {
- //
 }