From b88b6b1ca375f68432f6624681c0e760960717ed Mon Sep 17 00:00:00 2001
From: Deeka Wong <8337659+huangdijia@users.noreply.github.com>
Date: Fri, 6 Jan 2023 09:51:17 +0800
Subject: [PATCH] Optimize

---
 composer.json          | 7 +++++--
 publish/openai.php     | 2 +-
 src/ClientFactory.php  | 9 +++------
 src/ConfigProvider.php | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index e4ab3da..6208d9d 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
         "php": ">=8.1",
         "hyperf/config": "~3.0.0",
         "hyperf/di": "~3.0.0",
-        "openai-php/client": "^0.2.1",
-        "hyperf/guzzle": "~3.0.0"
+        "hyperf/guzzle": "~3.0.0",
+        "openai-php/client": "^0.2.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
@@ -39,6 +39,9 @@
             "config": "FriendsOfHyperf\\OpenAi\\ConfigProvider"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "scripts": {
         "analyse": "phpstan analyse --memory-limit 300M -l 0 -c phpstan.neon ./src",
diff --git a/publish/openai.php b/publish/openai.php
index 2ee4c43..aad7d25 100644
--- a/publish/openai.php
+++ b/publish/openai.php
@@ -9,6 +9,6 @@
  * @contact  huangdijia@gmail.com
  */
 return [
-    'api_key' => env('OPENAI_API_KEY'),
+    'api_key' => env('OPENAI_API_KEY', ''),
     'organization' => env('OPENAI_ORGANIZATION'),
 ];
diff --git a/src/ClientFactory.php b/src/ClientFactory.php
index 5d696ab..dea65e9 100644
--- a/src/ClientFactory.php
+++ b/src/ClientFactory.php
@@ -24,12 +24,10 @@ class ClientFactory
     public function __invoke(ContainerInterface $container)
     {
         $config = $container->get(ConfigInterface::class);
-        $clientFactory = $container->get(GuzzleClientFactory::class);
-
-        $apiToken = $config->get('openai.api_key');
+        $apiKey = $config->get('openai.api_key');
         $organization = $config->get('openai.organization');
 
-        $apiToken = ApiToken::from($apiToken);
+        $apiToken = ApiToken::from($apiKey);
         $baseUri = BaseUri::from('api.openai.com/v1');
         $headers = Headers::withAuthorization($apiToken);
 
@@ -37,8 +35,7 @@ public function __invoke(ContainerInterface $container)
             $headers = $headers->withOrganization($organization);
         }
 
-        $client = $clientFactory->create();
-
+        $client = $container->get(GuzzleClientFactory::class)->create();
         $transporter = new HttpTransporter($client, $baseUri, $headers);
 
         return new Client($transporter);
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
index aa42406..9595eec 100644
--- a/src/ConfigProvider.php
+++ b/src/ConfigProvider.php
@@ -25,7 +25,7 @@ public function __invoke()
             'publish' => [
                 [
                     'id' => 'config',
-                    'description' => 'The config for openai.',
+                    'description' => 'The config file for OpenAI.',
                     'source' => __DIR__ . '/../publish/openai.php',
                     'destination' => BASE_PATH . '/config/autoload/openai.php',
                 ],