qa pass

Author: Andrei Bratu

src/evals/run.ts

@@ -157,12 +157,12 @@ export async function runEval<
     if (function_ === undefined) {
         // TODO: trigger run when updated API is available
         process.stdout.write(
-            `${CYAN}\nRunning '${hlFile.name}' ${_.capitalize(hlFile.type)} over the Dataset '${hlDataset.name}'${RESET}\n`,
+            `${CYAN}\nRunning '${hlFile.name}' ${_.capitalize(hlFile.type)} over the '${hlDataset.name}' Dataset${RESET}\n`,
         );
     } else {
         // Running the evaluation locally
         process.stdout.write(
-            `${CYAN}\nRunning '${hlFile.name}' ${_.capitalize(hlFile.type)} over the Dataset '${hlDataset.name}' locally...${RESET}\n\n`,
+            `${CYAN}\nRunning '${hlFile.name}' ${_.capitalize(hlFile.type)} over the '${hlDataset.name}' Dataset locally...${RESET}\n\n`,
         );
     }
 
@@ -609,39 +609,54 @@ async function resolveFile<I extends Record<string, unknown> & { message?: any[]
     client: HumanloopClient,
     fileConfig: FileEvalConfig<I, O>,
 ): Promise<[EvaluatedFile, FileEvalConfig<I, O>["callable"]]> {
-    const version = fileConfig.version;
-    const path = fileConfig.path;
     const fileId = fileConfig.id;
+    const path = fileConfig.path;
+    const versionId = fileConfig.versionId;
+    const environment = fileConfig.environment;
     const callable = getFileCallable(fileConfig);
+    const version = fileConfig.version;
 
-    if (version && !path && !fileId) {
+    if (callable && !path && !fileId) {
         throw new HumanloopRuntimeError(
-            `You are trying to create a new version of the File by passing the ${version} argument. You must pass either the file.path or file.fileId argument.`,
+            `You are trying to create a new version of the File by passing the ${callable} argument. You must pass either the \`file.path\` or \`file.fileId\` argument and provide proper \`file.version\` for upserting the File.`,
         );
     }
     let hlFile = await safeGetDefaultFileVersion(client, fileConfig);
-    if (fileConfig.version) {
-        return [hlFile as unknown as EvaluatedFile, getFileCallable(fileConfig)];
-    }
-    const versionId = fileConfig.version;
-    const environment = fileConfig.environment;
 
-    if (!versionId && !environment) {
-        return [await upsertFile(client, fileConfig), callable];
+    if ((versionId || environment) && (callable || version)) {
+        throw new HumanloopRuntimeError(
+            "You are trying to create a local Evaluation while requesting a specific File version by version ID or environment.",
+        );
     }
 
     if (callable) {
-        throw new HumanloopRuntimeError(
-            "You cannot request local evaluation while requesting a specific File version by version ID or environment",
+        // User responsibility to provide adequate file.version for upserting the file
+        console.info(
+            `${CYAN}Upserting a new File version based on \`file.version\`. Will use provided callable for generating Logs.${RESET}\n`,
         );
+        try {
+            return [await upsertFile(client, fileConfig), callable];
+        } catch (error: any) {
+            throw new HumanloopRuntimeError(
+                `Error upserting File. Please ensure \`file.version\` is valid: ${error.toString()}`,
+            );
+        }
+    }
+
+    if (!versionId && !environment) {
+        // Return default version of the file
+        return [hlFile as unknown as EvaluatedFile, undefined];
     }
 
     if (!fileId && (versionId || environment)) {
         throw new HumanloopRuntimeError(
             "You must provide the `file.id` when addressing a file by version ID or environment",
         );
     }
+
+    // Use version_id or environment to retrieve specific version of the File
     const subclient = getSubclient(client, fileConfig);
+    // Let backend handle case where both or none of version_id and environment are provided
     return [await subclient.get(fileId!, { versionId, environment }), undefined];
 }