From 6c74e9ba7b72b6ed04471c2d6d333615ce9ecea9 Mon Sep 17 00:00:00 2001 From: Smartsheet-JB-Brown Date: Thu, 13 Mar 2025 11:12:17 -0700 Subject: [PATCH] PR review cleanup --- src/__mocks__/jest.setup.ts | 8 ++------ src/api/providers/__tests__/bedrock.test.ts | 2 +- src/api/providers/bedrock.ts | 18 ++---------------- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/__mocks__/jest.setup.ts b/src/__mocks__/jest.setup.ts index 61077be6d8..836279bfe4 100644 --- a/src/__mocks__/jest.setup.ts +++ b/src/__mocks__/jest.setup.ts @@ -1,17 +1,13 @@ // Mock the logger globally for all tests jest.mock("../utils/logging", () => ({ logger: { - debug: jest.fn().mockImplementation((message, meta) => { - console.log(`DEBUG: ${message}`, meta ? JSON.stringify(meta) : "") - }), + debug: jest.fn(), info: jest.fn(), warn: jest.fn(), error: jest.fn(), fatal: jest.fn(), child: jest.fn().mockReturnValue({ - debug: jest.fn().mockImplementation((message, meta) => { - console.log(`DEBUG: ${message}`, meta ? JSON.stringify(meta) : "") - }), + debug: jest.fn(), info: jest.fn(), warn: jest.fn(), error: jest.fn(), diff --git a/src/api/providers/__tests__/bedrock.test.ts b/src/api/providers/__tests__/bedrock.test.ts index 1afdc6234f..0094c3f12b 100644 --- a/src/api/providers/__tests__/bedrock.test.ts +++ b/src/api/providers/__tests__/bedrock.test.ts @@ -348,7 +348,7 @@ describe("AwsBedrockHandler", () => { "arn:aws:bedrock:us-west-2:699475926481:inference-profile/us.meta.llama3-8b-instruct-v1:0", ) - // + //these should not be the default fall back. they should be Llama's config expect(modelInfo.info.maxTokens).toBe(2048) expect(modelInfo.info.contextWindow).toBe(4_000) expect(modelInfo.info.supportsImages).toBe(false) diff --git a/src/api/providers/bedrock.ts b/src/api/providers/bedrock.ts index 399c3a74b4..1637fe29f3 100644 --- a/src/api/providers/bedrock.ts +++ b/src/api/providers/bedrock.ts @@ -295,10 +295,6 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH if (region === "us." || region === "eu.") modelName = modelName.slice(3) this.costModelConfig = this.getModelByName(modelName) - logger.debug("Updated modelConfig using invokedModelId from a prompt router response", { - ctx: "bedrock", - modelConfig: this.costModelConfig, - }) } // Handle metadata events for the promptRouter. @@ -528,21 +524,17 @@ Please check: modelData.id = this.options.awsCustomArn if (modelData) { - logger.debug(`Matched custom ARN to model: ${modelName}`, { - ctx: "bedrock", - modelData, - }) return modelData } } // An ARN was used, but no model info match found, use default values based on common patterns - let modelInfo = this.getModelByName(bedrockDefaultPromptRouterModelId) + let model = this.getModelByName(bedrockDefaultPromptRouterModelId) // For custom ARNs, always return the specific values expected by tests return { id: this.options.awsCustomArn, - info: modelInfo.info, + info: model.info, } } @@ -556,11 +548,6 @@ Please check: // For tests, allow any model ID (but not custom ARNs, which are handled above) if (process.env.NODE_ENV === "test") { - logger.debug("Return defaults 4", { - ctx: "bedrock", - customArn: this.options.awsCustomArn, - }) - return { id: this.options.apiModelId, info: { @@ -662,7 +649,6 @@ Please check: try { const outputStr = new TextDecoder().decode(response.output) const output = JSON.parse(outputStr) - logger.debug("Bedrock response", { ctx: "bedrock", output: output }) if (output.content) { return output.content }