badgr-cli 1.0.43 → 1.0.45

package/tests/serve-lifecycle.test.js

@@ -239,6 +239,27 @@ describe('deployment fails during startup', () => {
     const errLines = console.error.mock.calls.flat().join('\n');
     expect(errLines).toContain('likely an OOM');
   });
+
+  it('prints failure_class/next_action from the backend using the shared vocabulary', async () => {
+    api.callApi
+      .mockResolvedValueOnce(makeServeDep())
+      .mockResolvedValueOnce({ status: 'running' })
+      .mockResolvedValueOnce({
+        status: 'failed',
+        error: 'pod_exited',
+        fix_hint: 'The pod stopped running before the endpoint ever responded.',
+        failure_class: 'container_start_failed',
+        next_action: 'Check the image and command, then retry.',
+      });
+
+    const p = serveCommand(config, ['meta-llama/Llama-3.1-8B-Instruct', '--max-cost', '5'], chalk);
+    await vi.advanceTimersByTimeAsync(10000);
+    await p;
+
+    const errLines = console.error.mock.calls.flat().join('\n');
+    expect(errLines).toContain('Class: container_start_failed');
+    expect(errLines).toContain('Next: Check the image and command, then retry.');
+  });
 });
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -510,13 +531,106 @@ describe('input validation for serve', () => {
 // ─────────────────────────────────────────────────────────────────────────────
 
 describe('--list-aliases', () => {
-  it('prints blessed aliases without requiring a model or API call', async () => {
+  it('prints tested model routes without requiring a model or API call', async () => {
     await serveCommand({ apiKey: null, baseUrl: 'https://api.test/v1' }, ['--list-aliases'], chalk);
     expect(api.callApi).not.toHaveBeenCalled();
     expect(process.exitCode).toBeFalsy();
     const logged = console.log.mock.calls.flat().join('\n');
+    expect(logged).toContain('Tested model routes:');
     expect(logged).toContain('qwen-7b');
-    expect(logged).toContain('Qwen/Qwen2.5-7B-Instruct');
+    expect(logged).toContain('You can also try a Hugging Face model ID:');
+  });
+});
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Model support-level messaging — blessed route vs best-effort HF model vs
+// custom container, plus gated-model HF_TOKEN guidance shown only on failure.
+// ─────────────────────────────────────────────────────────────────────────────
+
+describe('model support-level messaging', () => {
+  it('labels a full Hugging Face model ID as best-effort, not tested', async () => {
+    api.callApi
+      .mockResolvedValueOnce(makeServeDep({ model: 'Qwen/Qwen2.5-7B-Instruct' }))
+      .mockResolvedValueOnce({ status: 'running' })
+      .mockResolvedValueOnce(readyStatus());
+
+    const p = serveCommand(config, ['Qwen/Qwen2.5-7B-Instruct', '--max-cost', '10'], chalk);
+    await vi.advanceTimersByTimeAsync(5000);
+    await p;
+
+    const logged = console.log.mock.calls.flat().join('\n');
+    expect(logged).toContain('Route: best-effort Hugging Face model');
+    expect(logged).not.toContain('Route: tested');
+  });
+
+  it('labels a blessed alias as a tested route without extra caveats', async () => {
+    api.callApi
+      .mockResolvedValueOnce(makeServeDep({ model: 'Qwen/Qwen2.5-7B-Instruct' }))
+      .mockResolvedValueOnce({ status: 'running' })
+      .mockResolvedValueOnce(readyStatus());
+
+    const p = serveCommand(config, ['qwen-7b', '--max-cost', '10'], chalk);
+    await vi.advanceTimersByTimeAsync(5000);
+    await p;
+
+    const logged = console.log.mock.calls.flat().join('\n');
+    expect(logged).toContain('Route: tested');
+    expect(logged).not.toContain('best-effort');
+  });
+
+  it('does not show HF_TOKEN guidance up front for a gated model that launches fine', async () => {
+    api.callApi
+      .mockResolvedValueOnce(makeServeDep({ model: 'meta-llama/Llama-3.1-8B-Instruct' }))
+      .mockResolvedValueOnce({ status: 'running' })
+      .mockResolvedValueOnce(readyStatus());
+
+    const p = serveCommand(config, ['meta-llama/Llama-3.1-8B-Instruct', '--max-cost', '10'], chalk);
+    await vi.advanceTimersByTimeAsync(5000);
+    await p;
+
+    const logged = console.log.mock.calls.flat().join('\n');
+    expect(logged).not.toContain('may require Hugging Face access');
+  });
+
+  it('shows HF_TOKEN guidance only once a gated model actually fails to start', async () => {
+    api.callApi
+      .mockResolvedValueOnce(makeServeDep({ model: 'meta-llama/Llama-3.1-8B-Instruct' }))
+      .mockResolvedValueOnce({ status: 'failed', error: 'gated repo — 401' });
+
+    const p = serveCommand(config, ['meta-llama/Llama-3.1-8B-Instruct', '--max-cost', '10'], chalk);
+    await p;
+
+    const logged = console.error.mock.calls.flat().join('\n');
+    expect(logged).toContain('may require Hugging Face access');
+    expect(logged).toContain('--env HF_TOKEN=$HF_TOKEN');
+    expect(process.exitCode).toBe(1);
+  });
+
+  it('omits HF_TOKEN guidance on failure when HF_TOKEN is already provided', async () => {
+    api.callApi
+      .mockResolvedValueOnce(makeServeDep({ model: 'meta-llama/Llama-3.1-8B-Instruct' }))
+      .mockResolvedValueOnce({ status: 'failed', error: 'crashed' });
+
+    const p = serveCommand(config, [
+      'meta-llama/Llama-3.1-8B-Instruct', '--max-cost', '10', '--env', 'HF_TOKEN=hf_abc123',
+    ], chalk);
+    await p;
+
+    const logged = console.error.mock.calls.flat().join('\n');
+    expect(logged).not.toContain('may require Hugging Face access');
+  });
+
+  it('labels a custom container as "custom server", not a Hugging Face model', async () => {
+    api.callApi.mockResolvedValueOnce(makeServeDep({ model: undefined, image: 'my/custom-server:latest' }));
+
+    const p = serveCommand(config, [
+      '--image', 'my/custom-server:latest', '--max-cost', '10', '--no-wait',
+    ], chalk);
+    await p;
+
+    const logged = console.log.mock.calls.flat().join('\n');
+    expect(logged).toContain('custom server');
+    expect(logged).toContain('Your container owns the app behavior.');
   });
 });
 

package/tests/store.test.js

@@ -5,7 +5,7 @@ import { rmSync, existsSync } from 'fs';
 import {
   loadStore, saveStore,
   addDeployment, updateDeployment, removeDeployment, findDeployment, listDeployments,
-  addReceipt, updateReceipt, listReceipts,
+  addReceipt, updateReceipt, listReceipts, findReceipt,
   generateDeploymentId, generateReceiptId,
 } from '../src/store.js';
 
@@ -125,6 +125,27 @@ describe('addReceipt / listReceipts', () => {
   });
 });
 
+describe('findReceipt', () => {
+  // comfy.batch / train.lora mint a local rcpt- id that points at a job_id —
+  // `badgr receipts <id>` needs to resolve either the receipt id itself or
+  // the job_id back to the same local record (see receipts.js).
+  it('finds a receipt by its own receiptId', () => {
+    addReceipt({ receiptId: 'rcpt-1', type: 'comfy.batch', job_id: 'job_abc' }, file);
+    const found = findReceipt('rcpt-1', file);
+    expect(found?.job_id).toBe('job_abc');
+  });
+
+  it('finds a receipt by job_id', () => {
+    addReceipt({ receiptId: 'rcpt-2', type: 'train.lora', job_id: 'job_def' }, file);
+    const found = findReceipt('job_def', file);
+    expect(found?.receiptId).toBe('rcpt-2');
+  });
+
+  it('returns null when nothing matches', () => {
+    expect(findReceipt('nope', file)).toBeNull();
+  });
+});
+
 describe('updateReceipt', () => {
   it('merges updates into an existing receipt', () => {
     addReceipt({ receiptId: 'r-upd', action: 'badgr run', status: 'running' }, file);

package/tests/template.test.js

@@ -105,14 +105,14 @@ afterEach(() => {
 
 describe('TEMPLATES catalog', () => {
   const EXPECTED_NAMES = [
-    'comfyui', 'axolotl', 'batch-inference', 'unsloth', 'vllm', 'llama-cpp',
+    'comfyui', 'axolotl', 'batch-inference', 'unsloth', 'vllm', 'openwebui', 'llama-cpp',
     'invokeai', 'kohya-ss', 'text-gen-webui', 'sglang', 'tgi',
     'auto1111', 'forge', 'nerfstudio', 'openfold', 'blender-render',
     'openmm', 'gromacs', 'lammps', 'diffusers', 'torchtune',
   ];
 
-  it('contains exactly 21 templates', () => {
-    expect(TEMPLATES).toHaveLength(21);
+  it('contains exactly 22 templates', () => {
+    expect(TEMPLATES).toHaveLength(22);
   });
 
   it('contains all expected template names', () => {
@@ -180,7 +180,7 @@ describe('TEMPLATES catalog', () => {
     for (const [k, t] of Object.entries(TEMPLATE_MAP)) {
       expect(k).toBe(t.name);
     }
-    expect(Object.keys(TEMPLATE_MAP)).toHaveLength(21);
+    expect(Object.keys(TEMPLATE_MAP)).toHaveLength(22);
   });
 });
 

package/tests/workload-templates.test.js

@@ -300,6 +300,28 @@ describe('comfyuiCommand', () => {
     }));
     expect(process.exitCode).toBe(1);
   });
+
+  it('prints failure_class/next_action from the backend using the shared vocabulary', async () => {
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(JSON.stringify({ '1': {} }));
+    fallback.callWithFallback.mockResolvedValue(makeServeDep());
+
+    api.callApi.mockResolvedValue({
+      status: 'failed',
+      error: 'OOM',
+      failure_class: 'container_start_failed',
+      next_action: 'Check the image and command, then retry.',
+    });
+    global.fetch = vi.fn().mockRejectedValue(new Error('Connection refused'));
+
+    const p = comfyuiCommand(config, ['wf.json', '--max-cost', '5'], chalk);
+    await vi.advanceTimersByTimeAsync(10000);
+    await p;
+
+    const errLines = console.error.mock.calls.flat().join('\n');
+    expect(errLines).toContain('Class: container_start_failed');
+    expect(errLines).toContain('Next: Check the image and command, then retry.');
+  });
 });
 
 // ─────────────────────────────────────────────────────────────────────────────