@wix/evalforge-evaluator 0.221.0 → 0.223.0

package/build/index.mjs

@@ -6946,6 +6946,12 @@ function rethrowWithRequestId(err, action) {
   }
   throw err;
 }
+function requireEntity(entity, notFound) {
+  if (!entity) {
+    throw new Error(notFound);
+  }
+  return entity;
+}
 function resolveAmbassadorBaseUrl(serverUrl) {
   try {
     return new URL(serverUrl).origin;
@@ -6996,52 +7002,50 @@ function createApiClient(serverUrl, options = "") {
       const res = await httpClient.request(
         getEvalRun({ projectId: projectId2, evalRunId: id })
       );
-      const evalRun = res.data.evalRun;
-      if (!evalRun) {
-        throw new Error(`Eval run ${id} not found in project ${projectId2}`);
-      }
+      const evalRun = requireEntity(
+        res.data.evalRun,
+        `Eval run ${id} not found in project ${projectId2}`
+      );
       return evalRunFromProto(evalRun);
     },
     async getScenario(projectId2, id) {
       const res = await httpClient.request(
         getTestScenario({ projectId: projectId2, testScenarioId: id })
       );
-      const scenario = res.data.testScenario;
-      if (!scenario) {
-        throw new Error(
-          `Test scenario ${id} not found in project ${projectId2}`
-        );
-      }
+      const scenario = requireEntity(
+        res.data.testScenario,
+        `Test scenario ${id} not found in project ${projectId2}`
+      );
       return testScenarioFromProto(scenario);
     },
     async getAgent(projectId2, id) {
       const res = await httpClient.request(
         getAgent({ projectId: projectId2, agentId: id })
       );
-      const agent = res.data.agent;
-      if (!agent) {
-        throw new Error(`Agent ${id} not found in project ${projectId2}`);
-      }
+      const agent = requireEntity(
+        res.data.agent,
+        `Agent ${id} not found in project ${projectId2}`
+      );
       return agentFromProto(agent);
     },
     async getTemplate(projectId2, id) {
       const res = await httpClient.request(
         getTemplate({ projectId: projectId2, templateId: id })
       );
-      const template = res.data.template;
-      if (!template) {
-        throw new Error(`Template ${id} not found in project ${projectId2}`);
-      }
+      const template = requireEntity(
+        res.data.template,
+        `Template ${id} not found in project ${projectId2}`
+      );
       return templateFromProto(template);
     },
     async getPreset(projectId2, id) {
       const res = await httpClient.request(
         getPreset({ projectId: projectId2, presetId: id })
       );
-      const preset = res.data.preset;
-      if (!preset) {
-        throw new Error(`Preset ${id} not found in project ${projectId2}`);
-      }
+      const preset = requireEntity(
+        res.data.preset,
+        `Preset ${id} not found in project ${projectId2}`
+      );
       return presetFromProto(preset);
     },
     // The legacy REST endpoint enriched the capability with its latest version
@@ -7062,10 +7066,10 @@ function createApiClient(serverUrl, options = "") {
       if (capResult.status === "rejected") {
         throw capResult.reason;
       }
-      const capability = capResult.value.data.capability;
-      if (!capability) {
-        throw new Error(`Capability ${id} not found in project ${projectId2}`);
-      }
+      const capability = requireEntity(
+        capResult.value.data.capability,
+        `Capability ${id} not found in project ${projectId2}`
+      );
       let latestVersion;
       if (versionResult.status === "fulfilled" && versionResult.value.data.capabilityVersion) {
         latestVersion = capabilityVersionFromProto(
@@ -7088,12 +7092,10 @@ function createApiClient(serverUrl, options = "") {
           capabilityVersionId: versionId
         })
       );
-      const version = res.data.capabilityVersion;
-      if (!version) {
-        throw new Error(
-          `Capability version ${versionId} not found for capability ${capabilityId}`
-        );
-      }
+      const version = requireEntity(
+        res.data.capabilityVersion,
+        `Capability version ${versionId} not found for capability ${capabilityId}`
+      );
       return capabilityVersionFromProto(version, projectId2);
     },
     async addResult(projectId2, evalRunId2, result) {
@@ -7409,7 +7411,7 @@ import {
 } from "@wix/eval-assertions";
 
 // src/run-scenario/environment.ts
-import { mkdirSync as mkdirSync2, existsSync as existsSync2, rmSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { mkdirSync, existsSync as existsSync2, rmSync, readFileSync, writeFileSync } from "fs";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
 import { tmpdir } from "os";
 import path2, { sep as sep2 } from "path";
@@ -7436,15 +7438,7 @@ async function writeFilesToDirectory(targetDir, files) {
 }
 
 // src/run-scenario/install-dependencies.ts
-import {
-  mkdirSync,
-  existsSync,
-  readFileSync,
-  readdirSync,
-  copyFileSync,
-  cpSync
-} from "fs";
-import { createHash } from "crypto";
+import { existsSync, readdirSync } from "fs";
 import path from "path";
 import { spawn, execFileSync } from "child_process";
 var INSTALL_TIMEOUT_MS = 18e4;
@@ -7543,18 +7537,16 @@ function detectPackageManager(workDir) {
   if (existsSync(path.join(workDir, "pnpm-lock.yaml"))) {
     return {
       cmd: "pnpm",
-      args: ["install", "--frozen-lockfile"],
-      cacheSourceFile: "pnpm-lock.yaml"
+      args: ["install", "--frozen-lockfile"]
     };
   }
   if (existsSync(path.join(workDir, "package-lock.json"))) {
-    return { cmd: "npm", args: ["ci"], cacheSourceFile: "package-lock.json" };
+    return { cmd: "npm", args: ["ci"] };
   }
   if (existsSync(path.join(workDir, "yarn.lock"))) {
     return {
       cmd: "yarn",
-      args: ["install", "--frozen-lockfile"],
-      cacheSourceFile: "yarn.lock"
+      args: ["install", "--frozen-lockfile"]
     };
   }
   return {
@@ -7565,17 +7557,9 @@ function detectPackageManager(workDir) {
       "--prefer-offline",
       "--no-fund",
       "--no-audit"
-    ],
-    cacheSourceFile: "package.json"
+    ]
   };
 }
-function cloneDirectory(src, dest) {
-  if (process.platform === "darwin") {
-    execFileSync("cp", ["-rc", src, dest]);
-  } else {
-    cpSync(src, dest, { recursive: true });
-  }
-}
 async function runInstall(exec, pm, workDir, onProgress) {
   reportRegistry(workDir, onProgress);
   onProgress(`[diag] npm install starting: ${pm.cmd} ${pm.args.join(" ")}`);
@@ -7606,64 +7590,13 @@ async function runInstall(exec, pm, workDir, onProgress) {
     clearInterval(heartbeat);
   }
 }
-async function installWithCache(workDir, exec, cacheBase, pm, onProgress) {
-  const sourceContent = readFileSync(
-    path.join(workDir, pm.cacheSourceFile),
-    "utf-8"
-  );
-  const cacheKey = createHash("sha256").update(sourceContent).digest("hex").slice(0, 16);
-  const cachedNodeModules = path.join(cacheBase, cacheKey, "node_modules");
-  const targetNodeModules = path.join(workDir, "node_modules");
-  const cacheDir = path.dirname(cachedNodeModules);
-  const cachedYarnLock = path.join(cacheDir, "yarn.lock");
-  if (existsSync(cachedNodeModules)) {
-    console.log(
-      `[environment] Restoring node_modules from cache (key: ${cacheKey})`
-    );
-    onProgress(`[diag] node_modules cache HIT (key: ${cacheKey}) \u2014 restoring`);
-    if (!existsSync(targetNodeModules)) {
-      cloneDirectory(cachedNodeModules, targetNodeModules);
-    }
-    if (existsSync(cachedYarnLock)) {
-      copyFileSync(cachedYarnLock, path.join(workDir, "yarn.lock"));
-    }
-    onProgress("[diag] node_modules cache restore complete");
-    return;
-  }
-  onProgress(`[diag] node_modules cache MISS (key: ${cacheKey})`);
-  const ok = await runInstall(exec, pm, workDir, onProgress);
-  if (!ok) {
-    return;
-  }
-  console.log(
-    "[environment] Dependency installation complete \u2014 saving to cache"
-  );
-  try {
-    mkdirSync(cacheDir, { recursive: true });
-    const yarnLockPath = path.join(workDir, "yarn.lock");
-    if (existsSync(yarnLockPath)) {
-      copyFileSync(yarnLockPath, cachedYarnLock);
-    }
-    cloneDirectory(targetNodeModules, cachedNodeModules);
-  } catch (err) {
-    console.error(
-      "[environment] Failed to save to cache (installation still succeeded):",
-      err instanceof Error ? err.message : String(err)
-    );
-  }
-}
 async function installDependencies(workDir, onProgress, options = {}) {
   if (!existsSync(path.join(workDir, "package.json"))) {
     return;
   }
   const exec = options.exec ?? defaultExec;
-  const cacheBase = options.cacheBase;
   onProgress("Installing dependencies...");
   const pm = detectPackageManager(workDir);
-  if (cacheBase) {
-    await installWithCache(workDir, exec, cacheBase, pm, onProgress);
-    return;
-  }
   await runInstall(exec, pm, workDir, onProgress);
 }
 
@@ -7791,7 +7724,7 @@ function writeWixEnvFile(workDir) {
     return;
   }
   try {
-    const config = JSON.parse(readFileSync2(configPath, "utf-8"));
+    const config = JSON.parse(readFileSync(configPath, "utf-8"));
     if (config.appId) {
       writeFileSync(
         path2.join(workDir, ".env"),
@@ -7808,7 +7741,6 @@ function writeWixEnvFile(workDir) {
 async function prepareWorkingDirectory(config, evalRunId2, targetId, scenarioId, onProgress, options = {}) {
   const template = options.template;
   const baseDir = config.evaluationsDir ?? path2.join(tmpdir(), "evalforge-evaluations");
-  const nodeModulesCacheDir = path2.join(baseDir, "_node_modules_cache");
   if (template) {
     if (!config.evaluationsDir) {
       console.warn(
@@ -7819,7 +7751,7 @@ async function prepareWorkingDirectory(config, evalRunId2, targetId, scenarioId,
     if (existsSync2(workDir2)) {
       rmSync(workDir2, { recursive: true });
     }
-    mkdirSync2(workDir2, { recursive: true });
+    mkdirSync(workDir2, { recursive: true });
     onProgress("Fetching template files...");
     await fetchAndWriteTemplateFiles(template, workDir2, onProgress);
     console.log(`Template files written to ${workDir2}`);
@@ -7827,7 +7759,6 @@ async function prepareWorkingDirectory(config, evalRunId2, targetId, scenarioId,
     writeWixEnvFile(workDir2);
     onProgress("[diag] entering installDependencies");
     await installDependencies(workDir2, onProgress, {
-      cacheBase: nodeModulesCacheDir,
       exec: createLoggingInstallExec(onProgress)
     });
     onProgress("[diag] installDependencies returned");
@@ -7838,7 +7769,7 @@ async function prepareWorkingDirectory(config, evalRunId2, targetId, scenarioId,
   if (existsSync2(workDir)) {
     rmSync(workDir, { recursive: true });
   }
-  mkdirSync2(workDir, { recursive: true });
+  mkdirSync(workDir, { recursive: true });
   console.log(`Empty working directory created at ${workDir}`);
   return workDir;
 }
@@ -11630,7 +11561,7 @@ var simpleAgentAdapter = new SimpleAgentAdapter();
 defaultRegistry.register(simpleAgentAdapter);
 
 // src/run-scenario/file-diff.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync3, statSync, existsSync as existsSync3 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync2, statSync, existsSync as existsSync3 } from "fs";
 import { join as join10, relative } from "path";
 
 // ../../node_modules/diff/lib/index.mjs
@@ -12273,7 +12204,7 @@ function snapshotDirectory(dir, baseDir) {
         if (stats.size > MAX_FILE_SIZE) {
           continue;
         }
-        const content = readFileSync3(fullPath, "utf-8");
+        const content = readFileSync2(fullPath, "utf-8");
         snapshot[relativePath] = content;
       } catch {
         continue;