[AI Bundle][Platform] Allow configure Bedrock platform via bundle config #1206
+386
−31
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,15 +13,10 @@ | |
|
|
||
| use AsyncAws\BedrockRuntime\BedrockRuntimeClient; | ||
| use AsyncAws\BedrockRuntime\Input\InvokeModelRequest; | ||
| use Symfony\AI\Platform\Bridge\Anthropic\Claude; | ||
| use Symfony\AI\Platform\Bridge\Bedrock\RawBedrockResult; | ||
| use Symfony\AI\Platform\Model; | ||
| use Symfony\AI\Platform\ModelClientInterface; | ||
|
|
||
| /** | ||
| * @author Björn Altmann | ||
|
|
@@ -60,31 +55,6 @@ public function request(Model $model, array|string $payload, array $options = [] | |
| return new RawBedrockResult($this->bedrockRuntimeClient->invokeModel(new InvokeModelRequest($request))); | ||
| } | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. because conversion atm handled with ResultConverter, so this code seems not supposed to be called like that. |
||
| private function getModelId(Model $model): string | ||
| { | ||
| $configuredRegion = $this->bedrockRuntimeClient->getConfiguration()->get('region'); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ | |
| final class PlatformFactory | ||
| { | ||
| public static function create( | ||
| ?BedrockRuntimeClient $bedrockRuntimeClient = null, | ||
|
Contributor
Author
There was a problem hiding this comment. tbh - not sure about this one. i dont mind to have it as required argument and always require it for configuring bedrock platform, but seems like creating client on the fly should work also fine (as soon as creds can be resolved through env vars). would appreciate your input on this
Member
There was a problem hiding this comment. understood - let's keep it like that, but go with explicit null check below: if (null === $bedrockRuntimeClient) { |
||
| ModelCatalogInterface $modelCatalog = new ModelCatalog(), | ||
| ?Contract $contract = null, | ||
| ?EventDispatcherInterface $eventDispatcher = null, | ||
|
|
@@ -42,6 +42,10 @@ public static function create( | |
| throw new RuntimeException('For using the Bedrock platform, the async-aws/bedrock-runtime package is required. Try running "composer require async-aws/bedrock-runtime".'); | ||
| } | ||
|
|
||
| if (null === $bedrockRuntimeClient) { | ||
| $bedrockRuntimeClient = new BedrockRuntimeClient(); | ||
| } | ||
|
|
||
| return new Platform( | ||
| [ | ||
| new ClaudeModelClient($bedrockRuntimeClient), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\AI\Platform\Bridge\Bedrock\Tests\Anthropic; | ||
|
|
||
| use AsyncAws\BedrockRuntime\BedrockRuntimeClient; | ||
| use AsyncAws\BedrockRuntime\Input\InvokeModelRequest; | ||
| use AsyncAws\BedrockRuntime\Result\InvokeModelResponse; | ||
| use AsyncAws\Core\Configuration; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
| use PHPUnit\Framework\TestCase; | ||
| use Symfony\AI\Platform\Bridge\Anthropic\Claude; | ||
| use Symfony\AI\Platform\Bridge\Bedrock\Anthropic\ClaudeModelClient; | ||
| use Symfony\AI\Platform\Bridge\Bedrock\RawBedrockResult; | ||
|
|
||
| final class ClaudeModelClientTest extends TestCase | ||
| { | ||
| private const VERSION = '2023-05-31'; | ||
|
|
||
| private MockObject&BedrockRuntimeClient $bedrockClient; | ||
| private ClaudeModelClient $modelClient; | ||
| private Claude $model; | ||
|
|
||
| protected function setUp(): void | ||
| { | ||
| $this->model = new Claude('claude-sonnet-4-5-20250929'); | ||
| $this->bedrockClient = $this->getMockBuilder(BedrockRuntimeClient::class) | ||
| ->setConstructorArgs([ | ||
| Configuration::create([Configuration::OPTION_REGION => Configuration::DEFAULT_REGION]), | ||
| ]) | ||
| ->onlyMethods(['invokeModel']) | ||
| ->getMock(); | ||
| } | ||
|
|
||
| public function testPassesModelId() | ||
| { | ||
| $this->bedrockClient->expects($this->once()) | ||
| ->method('invokeModel') | ||
| ->with($this->callback(function ($arg) { | ||
| $this->assertInstanceOf(InvokeModelRequest::class, $arg); | ||
| $this->assertSame('us.anthropic.claude-sonnet-4-5-20250929-v1:0', $arg->getModelId()); | ||
| $this->assertSame('application/json', $arg->getContentType()); | ||
| $this->assertTrue(json_validate($arg->getBody())); | ||
|
|
||
| return true; | ||
| })) | ||
| ->willReturn($this->createMock(InvokeModelResponse::class)); | ||
|
|
||
| $this->modelClient = new ClaudeModelClient($this->bedrockClient, self::VERSION); | ||
|
|
||
| $response = $this->modelClient->request($this->model, ['message' => 'test']); | ||
| $this->assertInstanceOf(RawBedrockResult::class, $response); | ||
| } | ||
|
|
||
| public function testUnsetsModelName() | ||
| { | ||
| $this->bedrockClient->expects($this->once()) | ||
| ->method('invokeModel') | ||
| ->with($this->callback(function ($arg) { | ||
| $this->assertInstanceOf(InvokeModelRequest::class, $arg); | ||
| $this->assertSame('application/json', $arg->getContentType()); | ||
| $this->assertTrue(json_validate($arg->getBody())); | ||
|
|
||
| $body = json_decode($arg->getBody(), true); | ||
| $this->assertArrayNotHasKey('model', $body); | ||
|
|
||
| return true; | ||
| })) | ||
| ->willReturn($this->createMock(InvokeModelResponse::class)); | ||
|
|
||
| $this->modelClient = new ClaudeModelClient($this->bedrockClient, self::VERSION); | ||
|
|
||
| $response = $this->modelClient->request($this->model, ['message' => 'test', 'model' => 'claude']); | ||
| $this->assertInstanceOf(RawBedrockResult::class, $response); | ||
| } | ||
|
|
||
| public function testSetsAnthropicVersion() | ||
| { | ||
| $this->bedrockClient->expects($this->once()) | ||
| ->method('invokeModel') | ||
| ->with($this->callback(function ($arg) { | ||
| $this->assertInstanceOf(InvokeModelRequest::class, $arg); | ||
| $this->assertSame('application/json', $arg->getContentType()); | ||
| $this->assertTrue(json_validate($arg->getBody())); | ||
|
|
||
| $body = json_decode($arg->getBody(), true); | ||
| $this->assertSame('bedrock-'.self::VERSION, $body['anthropic_version']); | ||
|
|
||
| return true; | ||
| })) | ||
| ->willReturn($this->createMock(InvokeModelResponse::class)); | ||
|
|
||
| $this->modelClient = new ClaudeModelClient($this->bedrockClient, self::VERSION); | ||
|
|
||
| $response = $this->modelClient->request($this->model, ['message' => 'test']); | ||
| $this->assertInstanceOf(RawBedrockResult::class, $response); | ||
| } | ||
|
|
||
| public function testSetsToolOptionsIfToolsEnabled() | ||
| { | ||
| $this->bedrockClient->expects($this->once()) | ||
| ->method('invokeModel') | ||
| ->with($this->callback(function ($arg) { | ||
| $this->assertInstanceOf(InvokeModelRequest::class, $arg); | ||
| $this->assertSame('application/json', $arg->getContentType()); | ||
| $this->assertTrue(json_validate($arg->getBody())); | ||
|
|
||
| $body = json_decode($arg->getBody(), true); | ||
| $this->assertSame(['type' => 'auto'], $body['tool_choice']); | ||
|
|
||
| return true; | ||
| })) | ||
| ->willReturn($this->createMock(InvokeModelResponse::class)); | ||
|
|
||
| $this->modelClient = new ClaudeModelClient($this->bedrockClient, self::VERSION); | ||
|
|
||
| $options = [ | ||
| 'tools' => ['Tool'], | ||
| ]; | ||
|
|
||
| $response = $this->modelClient->request($this->model, ['message' => 'test'], $options); | ||
| $this->assertInstanceOf(RawBedrockResult::class, $response); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chr-hertel should we go with
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, would be more consistent - see azure
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
then i guess we might want to change here to avoid platform named "ai.platform.bedrock.eu" to become "ai.traceable_platform.eu" that could collide with azure/generic or other platforms. should we go with that change or change azure/generic as atm it seems should handle same strange traceable platform name conversion?