Skip to content

AWS 模型用量事件抛出 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lihq1403 wants to merge 1 commit into from
Closed

AWS 模型用量事件抛出 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Api/Providers/AwsBedrock/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
use Hyperf\Odin\Api\Response\ChatCompletionStreamResponse;
use Hyperf\Odin\Api\Response\EmbeddingResponse;
use Hyperf\Odin\Contract\Message\MessageInterface;
use Hyperf\Odin\Event\AfterChatCompletionsEvent;
use Hyperf\Odin\Event\AfterChatCompletionsStreamEvent;
use Hyperf\Odin\Exception\LLMException;
use Hyperf\Odin\Exception\LLMException\Api\LLMInvalidRequestException;
use Hyperf\Odin\Exception\LLMException\Api\LLMRateLimitException;
Expand All @@ -32,6 +34,7 @@
use Hyperf\Odin\Message\SystemMessage;
use Hyperf\Odin\Message\ToolMessage;
use Hyperf\Odin\Message\UserMessage;
use Hyperf\Odin\Utils\EventUtil;
use Hyperf\Odin\Utils\LogUtil;
use Psr\Log\LoggerInterface;
use RuntimeException;
Expand Down Expand Up @@ -102,6 +105,8 @@ public function chatCompletions(ChatCompletionRequest $chatRequest): ChatComplet
'content' => $chatCompletionResponse->getContent(),
]);

EventUtil::dispatch(new AfterChatCompletionsEvent($chatRequest, $chatCompletionResponse, $duration));

return $chatCompletionResponse;
} catch (AwsException $e) {
throw $this->convertAwsException($e);
Expand Down Expand Up @@ -151,8 +156,10 @@ public function chatCompletionsStream(ChatCompletionRequest $chatRequest): ChatC
// 创建 AWS Bedrock 格式转换器，负责将 AWS Bedrock 格式转换为 OpenAI 格式
$bedrockConverter = new AwsBedrockFormatConverter($result, $this->logger);

// 创建流式响应对象并返回
return new ChatCompletionStreamResponse(logger: $this->logger, streamIterator: $bedrockConverter);
$chatCompletionStreamResponse = new ChatCompletionStreamResponse(logger: $this->logger, streamIterator: $bedrockConverter);
$chatCompletionStreamResponse->setAfterChatCompletionsStreamEvent(new AfterChatCompletionsStreamEvent($chatRequest, $firstResponseDuration));

return $chatCompletionStreamResponse;
} catch (AwsException $e) {
throw $this->convertAwsException($e);
} catch (Throwable $e) {
Expand Down
11 changes: 9 additions & 2 deletions src/Api/Providers/AwsBedrock/ConverseClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
use Hyperf\Odin\Api\Response\ChatCompletionResponse;
use Hyperf\Odin\Api\Response\ChatCompletionStreamResponse;
use Hyperf\Odin\Contract\Message\MessageInterface;
use Hyperf\Odin\Event\AfterChatCompletionsEvent;
use Hyperf\Odin\Event\AfterChatCompletionsStreamEvent;
use Hyperf\Odin\Message\AssistantMessage;
use Hyperf\Odin\Message\SystemMessage;
use Hyperf\Odin\Message\ToolMessage;
use Hyperf\Odin\Message\UserMessage;
use Hyperf\Odin\Utils\EventUtil;
use Hyperf\Odin\Utils\LogUtil;
use Throwable;

Expand Down Expand Up @@ -70,6 +73,8 @@ public function chatCompletions(ChatCompletionRequest $chatRequest): ChatComplet
'content' => $chatCompletionResponse->getContent(),
]);

EventUtil::dispatch(new AfterChatCompletionsEvent($chatRequest, $chatCompletionResponse, $duration));

return $chatCompletionResponse;
} catch (AwsException $e) {
throw $this->convertAwsException($e);
Expand Down Expand Up @@ -119,8 +124,10 @@ public function chatCompletionsStream(ChatCompletionRequest $chatRequest): ChatC
// 创建 AWS Bedrock 格式转换器，负责将 AWS Bedrock 格式转换为 OpenAI 格式
$bedrockConverter = new AwsBedrockConverseFormatConverter($result, $this->logger, $modelId);

// 创建流式响应对象并返回
return new ChatCompletionStreamResponse(logger: $this->logger, streamIterator: $bedrockConverter);
$chatCompletionStreamResponse = new ChatCompletionStreamResponse(logger: $this->logger, streamIterator: $bedrockConverter);
$chatCompletionStreamResponse->setAfterChatCompletionsStreamEvent(new AfterChatCompletionsStreamEvent($chatRequest, $firstResponseDuration));

return $chatCompletionStreamResponse;
} catch (AwsException $e) {
throw $this->convertAwsException($e);
} catch (Throwable $e) {
Expand Down
Loading