orchestrated 0.1.29 → 0.1.31

package/index.d.ts

@@ -815,6 +815,7 @@ declare const InteractionsDatasetOptionsSchema: z.ZodObject<{
     month: z.ZodOptional<z.ZodString>;
     startDate: z.ZodOptional<z.ZodString>;
     endDate: z.ZodOptional<z.ZodString>;
+    limit: z.ZodOptional<z.ZodNumber>;
     timeout: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 
@@ -1287,6 +1288,7 @@ declare const SessionsDatasetOptionsSchema: z.ZodObject<{
     month: z.ZodOptional<z.ZodString>;
     startDate: z.ZodOptional<z.ZodString>;
     endDate: z.ZodOptional<z.ZodString>;
+    limit: z.ZodOptional<z.ZodNumber>;
     timeout: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 

package/index.js

@@ -21230,6 +21230,7 @@ function resetState() {
   globalState = null;
   isInitialized = false;
   globalThis.__ORCHESTRATED_LAZY_LOAD__ = undefined;
+  if (false) {}
 }
 function isStateInitialized() {
   return isInitialized || globalThis.__ORCHESTRATED_SHARED_STATE__ !== undefined;
@@ -58802,6 +58803,9 @@ async function getDataset(datasetName, source, options) {
   const timeout = options.timeout ?? 30000;
   const allResults = [];
   let cursor;
+  let latestHasMore = false;
+  let latestLastEvalTimestamp = null;
+  const hasExplicitLimit = typeof options.limit === "number" && options.limit > 0;
   do {
     const controller = new AbortController;
     const timeoutId = setTimeout(() => controller.abort(), timeout);
@@ -58835,7 +58839,9 @@ async function getDataset(datasetName, source, options) {
       const rawData = await response.json();
       const data = DatasetResponseSchema.parse(rawData);
       allResults.push(...data.data);
-      cursor = data.nextCursor;
+      cursor = hasExplicitLimit ? undefined : data.nextCursor;
+      latestHasMore = data.hasMore ?? Boolean(data.nextCursor);
+      latestLastEvalTimestamp = data.lastEvalTimestamp ?? null;
     } catch (error48) {
       clearTimeout(timeoutId);
       if (error48 instanceof Error && error48.name === "AbortError") {
@@ -58844,11 +58850,17 @@ async function getDataset(datasetName, source, options) {
       throw error48;
     }
   } while (cursor);
+  globalThis[DATASET_METADATA_KEY] = {
+    datasetName,
+    count: allResults.length,
+    hasMore: latestHasMore,
+    lastEvalTimestamp: latestLastEvalTimestamp
+  };
   return allResults;
 }
 var getApiUrl = () => {
   return getState().apiUrl;
-}, DatasetResponseSchema;
+}, DatasetResponseSchema, DATASET_METADATA_KEY = "__ORCHESTRATED_DATASET_METADATA__";
 var init_data_source = __esm(() => {
   init_zod();
   DatasetResponseSchema = exports_external.object({
@@ -58860,7 +58872,9 @@ var init_data_source = __esm(() => {
       input: exports_external.string(),
       output: exports_external.string()
     }).loose()),
-    nextCursor: exports_external.string().optional()
+    nextCursor: exports_external.string().optional(),
+    hasMore: exports_external.boolean().optional(),
+    lastEvalTimestamp: exports_external.string().nullable().optional()
   }).passthrough();
 });
 
@@ -113999,8 +114013,27 @@ class S3FileManager {
   async upload(content, key) {
     const { getState: getState2 } = await Promise.resolve().then(() => exports_state);
     const state = getState2();
+    if (state.awsAccessKeyId && state.awsSecretAccessKey) {
+      const { PutObjectCommand, S3Client } = require_dist_cjs79();
+      const s3Key = state.tenantId && state.serviceName ? `${state.tenantId}/${state.serviceName}/${key}` : key;
+      const s3Client = new S3Client({
+        region: this.region,
+        credentials: {
+          accessKeyId: state.awsAccessKeyId,
+          secretAccessKey: state.awsSecretAccessKey,
+          sessionToken: state.awsSessionToken || undefined
+        }
+      });
+      await s3Client.send(new PutObjectCommand({
+        Bucket: this.bucket,
+        Key: s3Key,
+        Body: content,
+        ContentType: "application/jsonl"
+      }));
+      return `s3://${this.bucket}/${s3Key}`;
+    }
     if (!state.accessToken) {
-      throw new Error("No access token found. Please run 'orcha login' to authenticate before using Bedrock batch mode.");
+      throw new Error("No AWS credentials or access token found. Please run 'orcha login' to authenticate before using Bedrock batch mode.");
     }
     if (!state.tenantId || !state.serviceName) {
       throw new Error("tenantId and serviceName are required for Bedrock batch uploads.");
@@ -114155,13 +114188,16 @@ class BatchClient {
       fs.mkdirSync(this.tempDir, { recursive: true });
     }
   }
-  async initialize(name, checksum, dataSourceType, maxAgeDays = 3) {
+  async initialize(name, checksum, dataSourceType, maxAgeDays = 2) {
     this.metadata = { name, checksum };
-    const batches = await this.listBatches(2);
+    console.log(`BatchClient.initialize: searching for name="${name}", checksum="${checksum}", mode=${this.mode}, dataSourceType=${dataSourceType ?? "unknown"}`);
+    const batches = await this.listBatches(100);
+    console.log(`BatchClient.initialize: listBatches returned ${batches.length} batch(es): ${JSON.stringify(batches.map((b) => ({ id: b.id, status: b.status, created_at: b.created_at, metadata: b.metadata })))}`);
     const maxAgeMs = maxAgeDays * 24 * 60 * 60 * 1000;
     const cutoff = Date.now() - maxAgeMs;
     const matchingBatches = batches.filter((batch) => {
-      if (batch.created_at * 1000 < cutoff) {
+      const createdAtMs = this.mode === "OPENAI" ? batch.created_at * 1000 : batch.created_at;
+      if (createdAtMs < cutoff) {
         return false;
       }
       const nameMatches = batch.metadata?.name === this.metadata?.name;
@@ -114172,22 +114208,27 @@ class BatchClient {
       }
     });
     if (matchingBatches.length === 0) {
+      console.log("BatchClient.initialize: no matching batches found");
       return;
     }
+    console.log(`BatchClient.initialize: ${matchingBatches.length} matching batch(es): ${JSON.stringify(matchingBatches.map((b) => ({ id: b.id, status: b.status })))}`);
     const pendingBatches = matchingBatches.filter((batch) => !this.isBatchComplete(batch));
     const successfulBatches = matchingBatches.filter((batch) => batch.status === "completed");
     if (pendingBatches.length > 0) {
+      console.log(`BatchClient.initialize: ${pendingBatches.length} pending batch(es), waiting`);
       this.hasPendingBatch = true;
       this.pendingBatches = pendingBatches;
       return;
     }
     if (successfulBatches.length > 0) {
+      console.log(`BatchClient.initialize: loading results from ${successfulBatches.length} completed batch(es)`);
       this.hasCompletedBatch = true;
       this.completedBatches = successfulBatches;
       const allResponses = [];
       for (const batch of successfulBatches) {
         try {
           const results = await this.getBatchResults(batch.id);
+          console.log(`BatchClient.initialize: loaded ${results.length} results from batch ${batch.id}`);
           allResponses.push(...results);
         } catch (error48) {
           console.warn(`Failed to load results from batch ${batch.id}:`, error48);
@@ -115221,6 +115262,8 @@ function getEvaluationOptions(name, options, state) {
         });
       } else {
         batchClient = new BatchClient;
+        const OpenAI5 = __require("openai").default;
+        openaiClient = new OpenAI5;
       }
     }
     evalClient = merged.evalClient || new EvalClient({
@@ -115541,10 +115584,9 @@ async function runEval(name, evaluator, options) {
       [ATTR_DATASET_SOURCE_TYPE]: data.ctx.sourceType,
       [ATTR_EVAL_EXECUTION_METADATA_TEST_CASE_COUNT]: data.ctx.caseCount
     });
-    const totalBatchRequests = data.dataset.length * evaluator.scores.length;
-    if (execute === "batch" && batchProcessor === "BEDROCK_OPENAI" && totalBatchRequests < 100) {
+    if (execute === "batch" && data.dataset.length < 100) {
       execute = "sync";
-      iso.writeln(`ℹ ${totalBatchRequests} batch request(s) (${data.dataset.length} records × ${evaluator.scores.length} scorers) is below the 100 minimum for Bedrock batch. Falling back to sync mode.`);
+      iso.writeln(`ℹ ${data.dataset.length} record(s) is below the 100-record threshold for batch mode. Falling back to sync (individual requests).`);
     }
     if (execute === "batch" && batchClient) {
       await batchClient.initialize(name, data.ctx.checksum, data.ctx.dataSourceType);
@@ -115762,6 +115804,7 @@ var InteractionsDatasetOptionsSchema = exports_external.object({
   month: exports_external.string().optional(),
   startDate: exports_external.string().optional(),
   endDate: exports_external.string().optional(),
+  limit: exports_external.number().optional(),
   timeout: exports_external.number().optional()
 });
 function interactions(options = {}) {
@@ -115784,6 +115827,7 @@ function interactions(options = {}) {
         month: options.month,
         startDate: options.startDate,
         endDate: options.endDate,
+        limit: options.limit,
         timeout: options.timeout
       },
       args: argsJsonSchema
@@ -115798,6 +115842,7 @@ var SessionsDatasetOptionsSchema = exports_external.object({
   month: exports_external.string().optional(),
   startDate: exports_external.string().optional(),
   endDate: exports_external.string().optional(),
+  limit: exports_external.number().optional(),
   timeout: exports_external.number().optional()
 });
 function sessions(options = {}) {
@@ -115820,6 +115865,7 @@ function sessions(options = {}) {
         month: options.month,
         startDate: options.startDate,
         endDate: options.endDate,
+        limit: options.limit,
         timeout: options.timeout
       },
       args: argsJsonSchema
@@ -116034,4 +116080,4 @@ export {
   Behavioral
 };
 
-//# debugId=05DB886F5F4CE9D864756E2164756E21
+//# debugId=26267E7384DF594064756E2164756E21