Skip to content

Commit 8aa1ea4

Browse files
committed
fix(config): update generator name
- Changed generator name from 'openai' to 'openaichat'
1 parent 63bb6ac commit 8aa1ea4

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

app/Generators/OpenAIChatGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function generate(string $prompt): string
4747
{
4848
$parameters = Arr::get($this->config, 'completion_parameters', []);
4949
$parameters['messages'] = [
50-
['role' => 'committer', 'content' => $prompt],
50+
['role' => 'assistant', 'content' => $prompt],
5151
];
5252
$output = resolve(OutputStyle::class);
5353

@@ -60,11 +60,11 @@ public function generate(string $prompt): string
6060

6161
// (正常|错误|流)响应
6262
$rowResponse = (array) json_decode($this->openAI::hydrateData($data), true);
63-
$messages .= $text = Arr::get($rowResponse, 'choices.0.message.content', '');
63+
$messages .= $text = Arr::get($rowResponse, 'choices.0.delta.content', '');
6464
$output->write($text);
6565
});
6666

6767
// fake 响应
68-
return (string) ($messages ?? $response->json('choices.0.message.content'));
68+
return (string) ($messages ?? $response->json('choices.0.delta.content'));
6969
}
7070
}

app/Support/OpenAI.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,11 @@ protected function validateConfig(array $config): array
280280
protected function buildDefaultPendingRequest(array $config): PendingRequest
281281
{
282282
return parent::buildDefaultPendingRequest($config)
283+
283284
->baseUrl($config['base_url'])
284285
->asJson()
285286
->withToken($config['api_key'])
287+
// ->dump()
286288
// ->throw()
287289
// ->retry(
288290
// $config['retry']['times'],

config/ai-commit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
/**
7474
* The generator name.
7575
*/
76-
'generator' => 'openai',
76+
'generator' => 'openaichat',
7777

7878
/**
7979
* The list of generators.

tests/Feature/CommitCommandTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
$this
104104
->artisan(CommitCommand::class, [
105105
'path' => repository_path(),
106+
'--generator' => 'openai',
106107
'--no-edit' => true,
107108
'--verbose' => true,
108109
])

tests/Pest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ function setup_http_fake(): void
8181
{
8282
Http::fake([
8383
'*://api.openai.com/v1/*' => function (Request $request, array $options): PromiseInterface {
84-
$status = transform($prompt = $options['laravel_data']['prompt'], function ($prompt) {
84+
$prompt = $options['laravel_data']['prompt'];
85+
$status = transform($prompt, function ($prompt) {
8586
return array_flip(Response::$statusTexts)[$prompt] ?? 200;
8687
});
8788

tests/TestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ protected function setUp(): void
4444

4545
$configManager = ConfigManager::createFrom($this->app->configPath('ai-commit.php'));
4646
$configManager->set('generators.openai.api_key', 'sk-...');
47-
4847
config()->set('ai-commit', $configManager);
4948
}
5049

0 commit comments

Comments
 (0)