@metrio-ai/cli 1.5.0 → 1.5.1

package/dist/commands/verify.js

@@ -307,13 +307,14 @@ async function runVerifyCommand(argv) {
     const targets = resolveTargets(o);
     (0, shared_1.loadEnv)(o.envFile);
     const apiKey = (0, shared_1.resolveApiKey)(o.apiKey);
-    const baseUrl = (0, shared_1.resolveBaseUrl)(o.baseUrl) || 'https://api.metrio.ai'; // the SDK's default
+    // The SDK appends paths as-is, so a trailing slash would give `//v1/...`.
+    const baseUrl = ((0, shared_1.resolveBaseUrl)(o.baseUrl) || 'https://api.metrio.ai').replace(/\/+$/, ''); // the SDK's default
     const client = new client_1.MetrioAI({ apiKey, baseUrl });
     const results = await (0, execute_1.runAll)(client, targets, {
         concurrency: o.concurrency,
         failFast: o.failFast,
         timezone: o.timezone,
-        agentApi: { apiKey, baseUrl },
+        apiKey,
         onResult: (r, done, total) => process.stderr.write((0, sync_1.safe)(`[${done}/${total}] ${r.resource} › ${r.case} ${r.status}\n`)),
     });
     process.stdout.write(o.json ? (0, report_1.formatJson)(results) : (0, report_1.formatHuman)(results));

package/dist/verify/execute.js

@@ -9,47 +9,62 @@ exports.runAll = runAll;
 const client_1 = require("@metrio-ai/client");
 const shared_1 = require("../commands/shared");
 const prompt_1 = require("../commands/prompt");
-const agent_runs_1 = require("./agent-runs");
 const assert_1 = require("./assert");
 const scrubKey = (s, key) => (key ? s.split(key).join('***') : s);
-async function runAgentCase(api, t, c, base, timezone) {
-    const res = await (0, agent_runs_1.runAgentSync)({
-        ...api,
-        agentId: t.ref,
-        messages: c.messages,
-        variables: (0, prompt_1.mergeVariables)([], c.variables),
-        timezone,
-    });
-    const taskId = res.body?.runId !== undefined ? String(res.body.runId) : undefined;
+async function runAgentCase(client, t, c, base, apiKey, timezone) {
+    const started = Date.now();
+    let body;
+    let status = 200;
+    try {
+        body = await client.agents.runs.create(t.ref, {
+            messages: c.messages,
+            variables: (0, prompt_1.mergeVariables)([], c.variables),
+            timezone,
+            mode: 'sync',
+        });
+    }
+    catch (err) {
+        // Without a status it is a network or client-side validation failure: the generic error path.
+        if (!(err instanceof client_1.MetrioApiError) || err.statusCode === undefined)
+            throw err;
+        status = err.statusCode;
+        const text = typeof err.responseData === 'string' ? err.responseData : JSON.stringify(err.responseData ?? '');
+        try {
+            body = JSON.parse(text);
+        }
+        catch {
+            body = { error: text.slice(0, 500) };
+        }
+    }
+    const latencyMs = Date.now() - started;
+    const taskId = body?.runId !== undefined ? String(body.runId) : undefined;
     const ids = taskId ? { taskId } : {};
-    if (res.status < 200 || res.status >= 300) {
-        const detail = typeof res.body?.error === 'string' ? res.body.error : JSON.stringify(res.body?.error ?? '');
+    if (status < 200 || status >= 300) {
+        const detail = typeof body?.error === 'string' ? body.error : JSON.stringify(body?.error ?? '');
         let extra = '';
-        if (res.status >= 400 && res.status < 500 && res.body?.details !== undefined) {
-            const d = typeof res.body.details === 'string' ? res.body.details : JSON.stringify(res.body.details);
+        if (status >= 400 && status < 500 && body?.details !== undefined) {
+            const d = typeof body.details === 'string' ? body.details : JSON.stringify(body.details);
             extra = ` (${d.length > 200 ? `${d.slice(0, 200)}...` : d})`;
         }
-        return { ...base, status: 'error', failures: [], error: { message: scrubKey(`http=${res.status} ${detail}${extra}`.trim(), api.apiKey), status: res.status }, latencyMs: res.latencyMs, ...ids };
+        return { ...base, status: 'error', failures: [], error: { message: scrubKey(`http=${status} ${detail}${extra}`.trim(), apiKey), status }, latencyMs, ...ids };
     }
-    if (typeof res.body?.status !== 'string') {
-        return { ...base, status: 'error', failures: [], error: { message: scrubKey(`unexpected response: http=${res.status} without a run status`, api.apiKey) }, latencyMs: res.latencyMs, ...ids };
+    if (typeof body?.status !== 'string') {
+        return { ...base, status: 'error', failures: [], error: { message: scrubKey(`unexpected response: http=${status} without a run status`, apiKey) }, latencyMs, ...ids };
     }
-    if (res.body.status === 'failed') {
-        const err = res.body.error;
+    if (body.status === 'failed') {
+        const err = body.error;
         const detail = typeof err === 'string' ? err : (err?.message ?? 'no reason given');
-        return { ...base, status: 'error', failures: [], error: { message: scrubKey(`agent run failed: ${detail}`, api.apiKey) }, latencyMs: res.latencyMs, ...ids };
+        return { ...base, status: 'error', failures: [], error: { message: scrubKey(`agent run failed: ${detail}`, apiKey) }, latencyMs, ...ids };
     }
-    const obs = (0, assert_1.observeAgent)(res.body, res.latencyMs);
+    const obs = (0, assert_1.observeAgent)(body, latencyMs);
     const failures = (0, assert_1.evaluate)(c.expect, obs);
     return { ...base, status: failures.length ? 'fail' : 'pass', failures, latencyMs: obs.latencyMs, tokens: obs.tokens, ...ids };
 }
-async function runCase(client, t, c, timezone, agentApi) {
+async function runCase(client, t, c, timezone, apiKey = '') {
     const base = { resource: t.label, case: c.name };
     try {
         if (t.kind === 'agent') {
-            if (!agentApi)
-                throw new Error('agent targets need agentApi (base URL and API key)');
-            return await runAgentCase(agentApi, t, c, base, timezone);
+            return await runAgentCase(client, t, c, base, apiKey, timezone);
         }
         let obs;
         let version;
@@ -124,7 +139,7 @@ async function runCase(client, t, c, timezone, agentApi) {
             status: 'error',
             failures: [],
             error: {
-                message: scrubKey(err instanceof Error ? err.message : String(err), agentApi?.apiKey ?? ''),
+                message: scrubKey(err instanceof Error ? err.message : String(err), apiKey),
                 status: err instanceof client_1.MetrioApiError ? err.statusCode : undefined,
             },
         };
@@ -137,7 +152,7 @@ async function runAll(client, targets, opts) {
     return (0, shared_1.mapWithConcurrency)(jobs, opts.concurrency, async ({ t, c }) => {
         const result = stop
             ? { resource: t.label, case: c.name, status: 'skipped', failures: [] }
-            : await runCase(client, t, c, opts.timezone, opts.agentApi);
+            : await runCase(client, t, c, opts.timezone, opts.apiKey);
         if (opts.failFast && (result.status === 'fail' || result.status === 'error'))
             stop = true;
         done += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metrio-ai/cli",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Metrio AI command-line interface: run prompts and workflows, manage Metrio resources",
   "bin": {
     "metrio": "dist/index.js"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@metrio-ai/client": "^1.5.2",
+    "@metrio-ai/client": "^1.6.3",
     "ajv": "^8.17.1",
     "diff": "^5.2.0",
     "yaml": "^2.8.3"

package/dist/verify/agent-runs.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAgentSync = runAgentSync;
-async function runAgentSync(o) {
-    const doFetch = o.fetchImpl ?? fetch;
-    const url = `${o.baseUrl.replace(/\/+$/, '')}/v1/agents/${o.agentId}/runs`;
-    const started = Date.now();
-    const res = await doFetch(url, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', metrioai_api_key: o.apiKey },
-        body: JSON.stringify({ messages: o.messages, ...(o.variables ? { variables: o.variables } : {}), ...(o.timezone ? { timezone: o.timezone } : {}), mode: 'sync' }),
-    });
-    const text = await res.text();
-    const latencyMs = Date.now() - started;
-    let body;
-    try {
-        body = JSON.parse(text);
-    }
-    catch {
-        body = { error: text.slice(0, 500) };
-    }
-    return { status: res.status, body, latencyMs };
-}