chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,123 @@
|
||||
/**
|
||||
* @vitest-environment node
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
const mockSend = vi.fn()
|
||||
|
||||
vi.mock('@aws-sdk/client-bedrock-runtime', () => ({
|
||||
BedrockRuntimeClient: vi.fn().mockImplementation(
|
||||
class {
|
||||
send = mockSend
|
||||
}
|
||||
),
|
||||
ConverseCommand: vi.fn(),
|
||||
ConverseStreamCommand: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/providers/bedrock/utils', () => ({
|
||||
getBedrockInferenceProfileId: vi
|
||||
.fn()
|
||||
.mockReturnValue('us.anthropic.claude-3-5-sonnet-20241022-v2:0'),
|
||||
checkForForcedToolUsage: vi.fn(),
|
||||
createReadableStreamFromBedrockStream: vi.fn(),
|
||||
generateToolUseId: vi.fn().mockReturnValue('tool-1'),
|
||||
}))
|
||||
|
||||
vi.mock('@/providers/models', () => ({
|
||||
getProviderFileAttachment: vi
|
||||
.fn()
|
||||
.mockReturnValue({ maxBytes: 10 * 1024 * 1024, strategy: 'inline' }),
|
||||
INLINE_ATTACHMENT_MAX_BYTES: 10 * 1024 * 1024,
|
||||
getProviderModels: vi.fn().mockReturnValue([]),
|
||||
getProviderDefaultModel: vi.fn().mockReturnValue('us.anthropic.claude-3-5-sonnet-20241022-v2:0'),
|
||||
}))
|
||||
|
||||
vi.mock('@/providers/utils', () => ({
|
||||
calculateCost: vi.fn().mockReturnValue({ input: 0, output: 0, total: 0, pricing: null }),
|
||||
prepareToolExecution: vi.fn(),
|
||||
prepareToolsWithUsageControl: vi.fn().mockReturnValue({
|
||||
tools: [],
|
||||
toolChoice: 'auto',
|
||||
forcedTools: [],
|
||||
}),
|
||||
sumToolCosts: vi.fn().mockReturnValue(0),
|
||||
}))
|
||||
|
||||
vi.mock('@/tools', () => ({
|
||||
executeTool: vi.fn(),
|
||||
}))
|
||||
|
||||
import { BedrockRuntimeClient } from '@aws-sdk/client-bedrock-runtime'
|
||||
import { bedrockProvider } from '@/providers/bedrock/index'
|
||||
import { clearProviderClientCacheForTests } from '@/providers/client-cache'
|
||||
|
||||
describe('bedrockProvider credential handling', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
clearProviderClientCacheForTests()
|
||||
mockSend.mockResolvedValue({
|
||||
output: { message: { content: [{ text: 'response' }] } },
|
||||
usage: { inputTokens: 10, outputTokens: 5 },
|
||||
})
|
||||
})
|
||||
|
||||
const baseRequest = {
|
||||
model: 'us.anthropic.claude-3-5-sonnet-20241022-v2:0',
|
||||
systemPrompt: 'You are helpful.',
|
||||
messages: [{ role: 'user' as const, content: 'Hello' }],
|
||||
}
|
||||
|
||||
it('throws when only bedrockAccessKeyId is provided', async () => {
|
||||
await expect(
|
||||
bedrockProvider.executeRequest({
|
||||
...baseRequest,
|
||||
bedrockAccessKeyId: 'AKIAIOSFODNN7EXAMPLE',
|
||||
})
|
||||
).rejects.toThrow('Both bedrockAccessKeyId and bedrockSecretKey must be provided together')
|
||||
})
|
||||
|
||||
it('throws when only bedrockSecretKey is provided', async () => {
|
||||
await expect(
|
||||
bedrockProvider.executeRequest({
|
||||
...baseRequest,
|
||||
bedrockSecretKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
|
||||
})
|
||||
).rejects.toThrow('Both bedrockAccessKeyId and bedrockSecretKey must be provided together')
|
||||
})
|
||||
|
||||
it('creates client with explicit credentials when both are provided', async () => {
|
||||
await bedrockProvider.executeRequest({
|
||||
...baseRequest,
|
||||
bedrockAccessKeyId: 'AKIAIOSFODNN7EXAMPLE',
|
||||
bedrockSecretKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
|
||||
})
|
||||
|
||||
expect(BedrockRuntimeClient).toHaveBeenCalledWith({
|
||||
region: 'us-east-1',
|
||||
credentials: {
|
||||
accessKeyId: 'AKIAIOSFODNN7EXAMPLE',
|
||||
secretAccessKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
it('creates client without credentials when neither is provided', async () => {
|
||||
await bedrockProvider.executeRequest(baseRequest)
|
||||
|
||||
expect(BedrockRuntimeClient).toHaveBeenCalledWith({
|
||||
region: 'us-east-1',
|
||||
})
|
||||
})
|
||||
|
||||
it('uses custom region when provided', async () => {
|
||||
await bedrockProvider.executeRequest({
|
||||
...baseRequest,
|
||||
bedrockRegion: 'eu-west-1',
|
||||
})
|
||||
|
||||
expect(BedrockRuntimeClient).toHaveBeenCalledWith({
|
||||
region: 'eu-west-1',
|
||||
})
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user