orchestrated 0.1.19 → 0.1.21

package/index.js

@@ -13911,6 +13911,44 @@ var init_zod = __esm(() => {
   zod_default = exports_external;
 });
 
+// src/batch/bedrock-openai-client.ts
+var exports_bedrock_openai_client = {};
+__export(exports_bedrock_openai_client, {
+  BedrockOpenAI: () => BedrockOpenAI
+});
+import OpenAI from "openai";
+function trimToolCallNames(response) {
+  if (!response || typeof response !== "object")
+    return response;
+  const resp = response;
+  if (!Array.isArray(resp.choices))
+    return response;
+  for (const choice of resp.choices) {
+    const toolCalls = choice?.message?.tool_calls;
+    if (!Array.isArray(toolCalls))
+      continue;
+    for (const toolCall of toolCalls) {
+      if (toolCall?.function?.name && typeof toolCall.function.name === "string") {
+        toolCall.function.name = toolCall.function.name.trim();
+      }
+    }
+  }
+  return response;
+}
+var BedrockOpenAI;
+var init_bedrock_openai_client = __esm(() => {
+  BedrockOpenAI = class BedrockOpenAI extends OpenAI {
+    constructor(options) {
+      super(options);
+      const originalCreate = this.chat.completions.create.bind(this.chat.completions);
+      this.chat.completions.create = async (...args) => {
+        const result = await originalCreate(...args);
+        return trimToolCallNames(result);
+      };
+    }
+  };
+});
+
 // node_modules/.pnpm/yaml@2.8.2/node_modules/yaml/dist/nodes/identity.js
 var require_identity = __commonJS((exports) => {
   var ALIAS = Symbol.for("yaml.alias");
@@ -151103,6 +151141,7 @@ function createBedrockConverseClient(region, modelId) {
         finishReason = "content_filter";
         break;
     }
+    console.dir(response, { depth: null });
     const messageContent = response.output?.message?.content?.map((c) => c.text).join("") ?? "";
     return {
       id: `chatcmpl-bedrock-${Date.now()}`,
@@ -176308,7 +176347,7 @@ var init_esm = __esm(() => {
 });
 
 // node_modules/.pnpm/autoevals@0.0.131_encoding@0.1.13_ws@8.18.3/node_modules/autoevals/jsdist/index.mjs
-import { AzureOpenAI, OpenAI as OpenAI3 } from "openai";
+import { AzureOpenAI, OpenAI as OpenAI4 } from "openai";
 function extractOpenAIArgs(args) {
   return args.client ? { client: args.client } : {
     openAiApiKey: args.openAiApiKey,
@@ -176698,7 +176737,7 @@ var import_js_levenshtein, import_compute_cosine_similarity, import_ajv, PROXY_U
       dangerouslyAllowBrowser: openAiDangerouslyAllowBrowser
     });
   }
-  return new OpenAI3({
+  return new OpenAI4({
     apiKey: openAiApiKey || process.env.OPENAI_API_KEY || process.env.BRAINTRUST_API_KEY,
     organization: openAiOrganizationId,
     baseURL: openAiBaseUrl || process.env.OPENAI_BASE_URL || PROXY_URL,
@@ -206304,11 +206343,33 @@ init_zod();
 import { createHash as createHash2 } from "node:crypto";
 
 // src/batch/manager.ts
+init_bedrock_openai_client();
 import { createHash } from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import OpenAI from "openai";
+import OpenAI2 from "openai";
+
+// src/utils/index.ts
+var iso = {
+  writeln: (text) => console.log(text)
+};
+var colors = {
+  reset: "\x1B[0m",
+  blue: "\x1B[34m",
+  brightBlue: "\x1B[94m",
+  white: "\x1B[97m",
+  gray: "\x1B[90m",
+  yellow: "\x1B[33m"
+};
+var warning = (text) => `Warning: ${text}`;
+function logError(e, verbose) {
+  if (!verbose) {
+    console.error(`${e}`);
+  } else {
+    console.error(e);
+  }
+}
 
 // src/batch/bedrock-converse.ts
 function openaiToConverseRecord(requestId, body) {
@@ -206415,27 +206476,6 @@ function converseOutputToBatchResult(record2) {
   };
 }
 
-// src/utils/index.ts
-var iso = {
-  writeln: (text) => console.log(text)
-};
-var colors = {
-  reset: "\x1B[0m",
-  blue: "\x1B[34m",
-  brightBlue: "\x1B[94m",
-  white: "\x1B[97m",
-  gray: "\x1B[90m",
-  yellow: "\x1B[33m"
-};
-var warning = (text) => `Warning: ${text}`;
-function logError(e, verbose) {
-  if (!verbose) {
-    console.error(`${e}`);
-  } else {
-    console.error(e);
-  }
-}
-
 // src/batch/manager.ts
 class S3FileManager {
   bucket;
@@ -206548,8 +206588,8 @@ class BatchClient {
         }
         this.bedrockConfig = opts.bedrock;
         this.s3FileManager = new S3FileManager(opts.bedrock.s3Bucket, opts.bedrock.region);
-        this.client = new OpenAI({
-          baseURL: `https://bedrock-runtime.${opts.bedrock.region}.amazonaws.com/openai/v1`,
+        this.client = new BedrockOpenAI({
+          baseURL: `https://bedrock-mantle.${opts.bedrock.region}.api.aws/v1`,
           apiKey: opts.bedrock.apiKey,
           defaultHeaders: {
             "X-Amzn-Bedrock-RoleArn": opts.bedrock.serviceRoleArn,
@@ -206565,11 +206605,11 @@ class BatchClient {
         this.s3FileManager = new S3FileManager(opts.bedrockNative.s3Bucket, opts.bedrockNative.region);
         this.client = null;
       } else {
-        this.client = new OpenAI(opts.clientOptions ?? {});
+        this.client = new OpenAI2(opts.clientOptions ?? {});
       }
     } else {
       this.mode = "OPENAI";
-      this.client = new OpenAI(options);
+      this.client = new OpenAI2(options);
     }
     this.tempDir = path.join(os.tmpdir(), "batches");
     if (!fs.existsSync(this.tempDir)) {
@@ -206930,7 +206970,7 @@ function createChatCompletionRequest(custom_id, body) {
   };
 }
 // src/batch/client.ts
-import OpenAI2 from "openai";
+import OpenAI3 from "openai";
 
 class BatchingError extends Error {
   request;
@@ -206943,7 +206983,7 @@ function isBatchingError(error48) {
   return error48 instanceof BatchingError;
 }
 
-class EvalClient extends OpenAI2 {
+class EvalClient extends OpenAI3 {
   batchClient;
   constructor({ batchClient, ...config2 }) {
     super(config2);
@@ -206960,6 +207000,10 @@ class EvalClient extends OpenAI2 {
     };
   }
 }
+
+// src/batch/index.ts
+init_bedrock_openai_client();
+
 // src/registry/index.ts
 function getRegistry() {
   if (!globalThis.__ORCHESTRATED_EVAL_REGISTRY__) {
@@ -207795,9 +207839,9 @@ function getEvaluationOptions(name, options, state) {
             s3Bucket: state.bedrockS3Bucket
           }
         });
-        const OpenAI4 = __require("openai").default;
-        openaiClient = new OpenAI4({
-          baseURL: `https://bedrock-runtime.${state.bedrockRegion}.amazonaws.com/openai/v1`,
+        const { BedrockOpenAI: BedrockOpenAI2 } = (init_bedrock_openai_client(), __toCommonJS(exports_bedrock_openai_client));
+        openaiClient = new BedrockOpenAI2({
+          baseURL: `https://bedrock-mantle.${state.bedrockRegion}.api.aws/v1`,
           apiKey: state.bedrockApiKey,
           defaultHeaders: {
             "X-Amzn-Bedrock-RoleArn": state.bedrockServiceRoleArn,
@@ -207818,7 +207862,9 @@ function getEvaluationOptions(name, options, state) {
             s3Bucket: state.bedrockS3Bucket
           }
         });
-        const { createBedrockConverseClient: createBedrockConverseClient2 } = __toCommonJS(exports_bedrock_converse_client);
+        const {
+          createBedrockConverseClient: createBedrockConverseClient2
+        } = __toCommonJS(exports_bedrock_converse_client);
         openaiClient = createBedrockConverseClient2(state.bedrockRegion, state.bedrockModelId);
       } else {
         batchClient = new BatchClient;
@@ -207828,8 +207874,8 @@ function getEvaluationOptions(name, options, state) {
       batchClient
     });
   } else {
-    const OpenAI4 = __require("openai").default;
-    openaiClient = merged.openaiClient || new OpenAI4;
+    const OpenAI5 = __require("openai").default;
+    openaiClient = merged.openaiClient || new OpenAI5;
   }
   const onResult = merged.onResult;
   return {
@@ -207874,9 +207920,11 @@ async function evaluateDataCase(dataCase, evaluator, _ctx, options) {
       expected: dataCase.expected,
       tags: dataCase.tags,
       id: caseId,
-      client: client2,
-      model: options.execute === "sync" && (options.batchProcessor === "BEDROCK_OPENAI" || options.batchProcessor === "BEDROCK") ? _ctx.state.bedrockModelId : undefined
+      client: client2
     };
+    if (options.execute === "sync" && (options.batchProcessor === "BEDROCK_OPENAI" || options.batchProcessor === "BEDROCK")) {
+      scorerArgs.model = _ctx.state.bedrockModelId;
+    }
     const fieldsToExclude = new Set(["state", "ctx", "tags", "id", "client"]);
     const argsForStorage = Object.fromEntries(Object.entries(scorerArgs).filter(([key]) => !fieldsToExclude.has(key)));
     const { scorerFailAsZero, verbose } = options;
@@ -208632,4 +208680,4 @@ export {
   Behavioral
 };
 
-//# debugId=4034857F5C6A089964756E2164756E21
+//# debugId=AD205A8029985CD264756E2164756E21