badgr-cli 1.0.4 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badgr-cli",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Badgr — run or serve GPU workloads from one command",
   "type": "module",
   "bin": {

package/src/api.js

@@ -1,6 +1,19 @@
+const DEBUG = process.env.BADGR_DEBUG === '1' || process.env.BADGR_DEBUG === 'true';
+
+function dbg(...args) {
+  if (DEBUG) console.error('[badgr:debug]', ...args);
+}
+
 export async function callApi(path, { method = 'GET', apiKey, baseUrl, body } = {}) {
   const url = `${baseUrl}${path}`;
+  const keyPreview = apiKey ? `${apiKey.slice(0, 8)}…` : '(not set)';
+
+  dbg(`${method} ${url}`);
+  dbg(`API key: ${keyPreview}`);
+  if (body !== undefined) dbg('Request body:', JSON.stringify(body));
+
   let res;
+  const startMs = Date.now();
   try {
     res = await fetch(url, {
       method,
@@ -11,32 +24,52 @@ export async function callApi(path, { method = 'GET', apiKey, baseUrl, body } =
       body: body !== undefined ? JSON.stringify(body) : undefined,
     });
   } catch (cause) {
+    const elapsed = Date.now() - startMs;
+    dbg(`Fetch threw after ${elapsed}ms:`, cause);
     // Network-level failure: DNS, connection refused, timeout, etc.
     const msg = cause?.message ?? String(cause);
+    const code = cause?.cause?.code ?? cause?.code ?? '';
     const hint =
-      msg.includes('ECONNREFUSED') ? `\n  Hint: Connection refused — is the server running at ${baseUrl}?` :
-      msg.includes('ENOTFOUND')    ? `\n  Hint: DNS lookup failed — check your internet connection or BADGR_API_URL` :
-      msg.includes('ETIMEDOUT')    ? `\n  Hint: Request timed out — the server may be overloaded` :
-                                     `\n  Hint: Check your network connection and that BADGR_API_URL is correct`;
+      (code === 'ECONNREFUSED' || msg.includes('ECONNREFUSED'))
+        ? `\n  Hint: Connection refused — is the server running at ${baseUrl}?` :
+      (code === 'ENOTFOUND' || msg.includes('ENOTFOUND'))
+        ? `\n  Hint: DNS lookup failed for ${baseUrl}\n  Check your internet or set BADGR_API_URL to the correct host` :
+      (code === 'ETIMEDOUT' || msg.includes('ETIMEDOUT'))
+        ? `\n  Hint: Request timed out — server may be overloaded` :
+      (msg.includes('fetch failed') || msg === 'fetch failed')
+        ? `\n  Hint: Network error reaching ${url}\n  • Check internet connection\n  • Run: badgr config  (verify baseUrl)\n  • Try: BADGR_DEBUG=1 badgr run … for full details\n  • Test: curl -v ${baseUrl}/models` :
+        `\n  Hint: Check your network and that BADGR_API_URL is correct (${baseUrl})`;
     throw new Error(`Cannot reach ${url} (${msg})${hint}`);
   }
+
+  const elapsed = Date.now() - startMs;
+  dbg(`Response: HTTP ${res.status} in ${elapsed}ms`);
+
   if (!res.ok) {
     let detail = '';
+    let rawBody = '';
+    let errorData = null;
     try {
-      const text = await res.text();
-      // Try to extract a readable detail from JSON error bodies
-      const json = JSON.parse(text);
-      detail = json?.detail ?? json?.message ?? json?.error ?? text;
+      rawBody = await res.text();
+      dbg('Error response body:', rawBody);
+      const json = JSON.parse(rawBody);
+      errorData = json;
+      detail = json?.detail ?? json?.message ?? json?.error ?? rawBody;
     } catch {
-      detail = res.statusText || '';
+      detail = rawBody || res.statusText || '';
     }
+    const isCapacityError = errorData?.code === 'NO_CAPACITY_MATCH';
     const hint =
       res.status === 401 ? '\n  Hint: Invalid or missing API key — run: badgr login' :
       res.status === 403 ? '\n  Hint: Access denied — check your API key permissions' :
       res.status === 404 ? `\n  Hint: Endpoint not found — check BADGR_API_URL (currently: ${baseUrl})` :
-      res.status === 502 || res.status === 503 ? '\n  Hint: Server error — no GPU capacity available or backend is down' :
+      (res.status === 502 || res.status === 503) && !isCapacityError
+        ? '\n  Hint: Server error — no GPU capacity available or backend is down' :
       '';
-    throw new Error(`${method} ${path} → HTTP ${res.status}: ${detail}${hint}`);
+    const err = new Error(`${method} ${path} → HTTP ${res.status}: ${detail}${hint}`);
+    err.errorData = errorData;
+    err.httpStatus = res.status;
+    throw err;
   }
   return res.json();
 }

package/src/badgr.js

@@ -52,11 +52,17 @@ ${chalk.bold('EXAMPLES')}
 
 ${chalk.bold('OPENAI-COMPATIBLE SERVING')}
   ${chalk.dim('After `badgr serve`, point any OpenAI client at the returned URL:')}
-  ${chalk.dim('  client = OpenAI(api_key="sk-...", base_url="https://api.badgr.ai/v1")')}
+  ${chalk.dim('  client = OpenAI(api_key="sk-...", base_url="https://aibadgr.com/v1")')}
   ${chalk.dim('  client.chat.completions.create(model="dep_xxx", messages=[...])')}
 
 ${chalk.bold('ROUTING')}
   ${chalk.dim('Badgr automatically selects best available GPU capacity for your request.')}
+
+${chalk.bold('DEBUGGING')}
+  ${chalk.dim('Set BADGR_DEBUG=1 to print the full URL, API key prefix, request body, and response status:')}
+  ${chalk.dim('  BADGR_DEBUG=1 badgr run python train.py --gpu A100')}
+  ${chalk.dim('  BADGR_DEBUG=1 badgr serve meta-llama/Llama-3.1-8B-Instruct --gpu L40S')}
+  ${chalk.dim('  badgr config                  # show current baseUrl and key')}
 `;
 
 async function main() {

package/src/commands/login.js

@@ -1,4 +1,5 @@
 import { input } from '@inquirer/prompts';
+import { DEFAULTS } from '../config.js';
 
 export async function loginCommand(chalk, saveConfigFn) {
   console.log(chalk.bold('\n🔑  Badgr Login\n'));
@@ -8,12 +9,10 @@ export async function loginCommand(chalk, saveConfigFn) {
     validate: v => v.trim() ? true : 'API key is required',
   });
 
-  const baseUrl = await input({
-    message: 'API base URL:',
-    default: 'https://api.badgr.ai/v1',
+  const config = saveConfigFn({
+    apiKey: apiKey.trim(),
+    baseUrl: DEFAULTS.baseUrl,
   });
-
-  const config = saveConfigFn({ apiKey: apiKey.trim(), baseUrl: baseUrl.trim() });
   console.log(chalk.green('\n✓ Logged in — config saved to ~/.badgr/config.json\n'));
   console.log(chalk.dim(`  Base URL: ${config.baseUrl}\n`));
   return config;

package/src/commands/run.js

@@ -100,6 +100,7 @@ export async function runCommand(config, args, chalk) {
   if (detach)  console.log(`  ${chalk.dim('(detached — returns immediately)')}`);
   console.log();
   console.log(chalk.dim('  Finding best available GPU capacity...'));
+  console.log(chalk.dim(`  API: ${config.baseUrl}`));
 
   let dep;
   try {
@@ -112,15 +113,28 @@ export async function runCommand(config, args, chalk) {
         image,
         gpu: gpu.toUpperCase().replace('-', '_'),
         gpu_count: flags.count || 1,
-        region: flags.region || 'US',
+        ...(flags.region ? { region: flags.region.toUpperCase() } : {}),
         max_price_per_hour: flags.maxPrice,
         name: flags.name,
       },
     });
   } catch (err) {
-    console.error(chalk.red(`\n  ✗ Job failed to start: ${err.message}`));
-    console.error(chalk.dim(`\n  API URL: ${config.baseUrl}`));
-    console.error(chalk.dim(`  Config:  badgr config   Docs: badgr --help\n`));
+    const d = err.errorData;
+    if (d?.code === 'NO_CAPACITY_MATCH') {
+      const f = d.filters ?? {};
+      const scope = f.region && f.region !== 'any' ? `in ${f.region}` : 'globally';
+      console.error(chalk.red(`\n  ✗ No ${f.gpu || gpu} found under ${f.max_price || '$10/hr'} ${scope}.`));
+      if (d.suggestions?.length) {
+        console.error(chalk.dim(`\n  Try:`));
+        for (const s of d.suggestions) console.error(chalk.dim(`    • ${s}`));
+      }
+      console.error('');
+    } else {
+      console.error(chalk.red(`\n  ✗ Job failed to start: ${err.message}`));
+      console.error(chalk.dim(`\n  Debug: BADGR_DEBUG=1 badgr run … — shows full request/response`));
+      console.error(chalk.dim(`  Config:  badgr config`));
+      console.error(chalk.dim(`  Docs:    badgr --help\n`));
+    }
     process.exit(1);
   }
 

package/src/commands/serve.js

@@ -69,6 +69,7 @@ export async function serveCommand(config, args, chalk) {
   console.log(`  ${chalk.bold('GPU:')}    ${gpu}`);
   console.log();
   console.log(chalk.dim('  Finding best available GPU capacity...'));
+  console.log(chalk.dim(`  API: ${config.baseUrl}`));
 
   let dep;
   try {
@@ -87,8 +88,9 @@ export async function serveCommand(config, args, chalk) {
     });
   } catch (err) {
     console.error(chalk.red(`\n  ✗ Serve failed: ${err.message}`));
-    console.error(chalk.dim(`\n  API URL: ${config.baseUrl}`));
-    console.error(chalk.dim(`  Config:  badgr config   Docs: badgr --help\n`));
+    console.error(chalk.dim(`\n  Debug: BADGR_DEBUG=1 badgr serve … — shows full request/response`));
+    console.error(chalk.dim(`  Config:  badgr config`));
+    console.error(chalk.dim(`  Docs:    badgr --help\n`));
     return;
   }
 

package/src/config.js

@@ -6,16 +6,61 @@ export const CONFIG_DIR = join(homedir(), '.badgr');
 export const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
 
 export const DEFAULTS = {
-  baseUrl: 'https://api.badgr.ai/v1',
+  baseUrl: 'https://aibadgr.com/v1',
   defaultModel: 'meta-llama/Llama-3.1-8B-Instruct',
 };
 
+/** URLs that do not resolve or are superseded by aibadgr.com/v1 (nginx) */
+const LEGACY_BASE_URLS = new Set([
+  'https://api.badgr.ai/v1',
+  'https://api.badgr.ai',
+  'http://api.badgr.ai/v1',
+  'http://api.badgr.ai',
+  'https://api.aibadgr.com/v1',
+  'https://api.aibadgr.com',
+  'http://api.aibadgr.com/v1',
+  'http://api.aibadgr.com',
+]);
+
+export function normalizeBaseUrl(url) {
+  if (!url?.trim()) return DEFAULTS.baseUrl;
+  const trimmed = url.trim().replace(/\/+$/, '');
+  if (LEGACY_BASE_URLS.has(trimmed)) return DEFAULTS.baseUrl;
+  return trimmed.endsWith('/v1') ? trimmed : `${trimmed}/v1`;
+}
+
+function applyEnvOverrides(config) {
+  const envBase = process.env.BADGR_API_URL?.trim();
+  if (envBase) config.baseUrl = normalizeBaseUrl(envBase);
+  const envKey = process.env.BADGR_API_KEY?.trim();
+  if (envKey) config.apiKey = envKey;
+  return config;
+}
+
 export function loadConfig(configFile = CONFIG_FILE) {
-  if (!existsSync(configFile)) return { ...DEFAULTS };
+  if (!existsSync(configFile)) {
+    return applyEnvOverrides({ ...DEFAULTS });
+  }
   try {
-    return { ...DEFAULTS, ...JSON.parse(readFileSync(configFile, 'utf8')) };
+    const parsed = JSON.parse(readFileSync(configFile, 'utf8'));
+    const previousBase = parsed.baseUrl;
+    const config = applyEnvOverrides({
+      ...DEFAULTS,
+      ...parsed,
+      baseUrl: normalizeBaseUrl(parsed.baseUrl ?? DEFAULTS.baseUrl),
+    });
+    if (
+      configFile === CONFIG_FILE &&
+      previousBase &&
+      normalizeBaseUrl(previousBase) !== previousBase
+    ) {
+      const merged = { ...parsed, baseUrl: config.baseUrl };
+      mkdirSync(dirname(configFile), { recursive: true });
+      writeFileSync(configFile, JSON.stringify(merged, null, 2));
+    }
+    return config;
   } catch {
-    return { ...DEFAULTS };
+    return applyEnvOverrides({ ...DEFAULTS });
   }
 }
 

package/tests/config.test.js

@@ -2,7 +2,7 @@ import { describe, it, expect, afterEach } from 'vitest';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { rmSync, existsSync } from 'fs';
-import { loadConfig, saveConfig, requireApiKey, DEFAULTS } from '../src/config.js';
+import { loadConfig, saveConfig, requireApiKey, normalizeBaseUrl, DEFAULTS } from '../src/config.js';
 
 const tmp = join(tmpdir(), `badgr-cli-test-${process.pid}`);
 const testConfigFile = join(tmp, 'config.json');
@@ -58,6 +58,29 @@ describe('saveConfig', () => {
   });
 });
 
+describe('normalizeBaseUrl', () => {
+  it('rewrites legacy api.badgr.ai to production host', () => {
+    expect(normalizeBaseUrl('https://api.badgr.ai/v1')).toBe(DEFAULTS.baseUrl);
+    expect(normalizeBaseUrl('https://api.badgr.ai')).toBe(DEFAULTS.baseUrl);
+  });
+
+  it('keeps production and localhost URLs', () => {
+    expect(normalizeBaseUrl('https://api.aibadgr.com/v1')).toBe(DEFAULTS.baseUrl);
+    expect(normalizeBaseUrl('http://localhost:8000/v1')).toBe('http://localhost:8000/v1');
+  });
+});
+
+describe('loadConfig legacy migration', () => {
+  it('migrates saved api.badgr.ai baseUrl on load', () => {
+    saveConfig(
+      { apiKey: 'sk-test', baseUrl: 'https://api.badgr.ai/v1' },
+      testConfigFile,
+    );
+    const config = loadConfig(testConfigFile);
+    expect(config.baseUrl).toBe(DEFAULTS.baseUrl);
+  });
+});
+
 describe('requireApiKey', () => {
   it('returns the key when present', () => {
     expect(requireApiKey({ apiKey: 'sk-abc' })).toBe('sk-abc');