@quantum-hub/qhubctl 1.17.0 → 1.19.0

package/dist/commands/datapool-upload.js

@@ -103,8 +103,8 @@ async function selectExistingDatapool(client) {
         const selection = await input({
             message: `Select a data pool (1-${dataPools.length}) or enter the ID directly:`,
         });
-        const index = parseInt(selection, 10);
-        if (!isNaN(index) && index >= 1 && index <= dataPools.length) {
+        const index = Number.parseInt(selection, 10);
+        if (!Number.isNaN(index) && index >= 1 && index <= dataPools.length) {
             return dataPools[index - 1].id;
         }
         return selection;

package/dist/commands/logout.js

@@ -1,8 +1,7 @@
 import { Command } from 'commander';
 import { spinner } from '../lib/output.js';
-import { configDir } from '../model/command.js';
+import { configDir, getUserConfig } from '../model/command.js';
 import { writeUserConfig } from '../service/user-config-service.js';
-import { getUserConfig } from '../model/command.js';
 const EXAMPLES = `
 Examples:
   $ qhubctl logout`;

package/dist/commands/openapi.js

@@ -151,13 +151,13 @@ async function generateFromCode(entrypoint) {
     catch {
         warn(`Could not load qhub.json configuration. Using default title: ${title}`);
     }
-    const safeEntrypoint = entrypoint.replace(/"/g, '\\"');
-    const safeTitle = title.replace(/"/g, '\\"');
-    const safeDescription = description ? description.replace(/"/g, '\\"') : 'None';
-    const pySnippet = `from qhub.commons.openapi.generator import generate_openapi; generate_openapi(entrypoint='${safeEntrypoint}', title='${safeTitle}', description=${safeDescription === 'None' ? 'None' : `'${safeDescription}'`})`;
-    const command = `uv run --no-sync --project ${process.cwd()} python -c "${pySnippet}"`;
+    const pySnippet = 'import sys; from qhub.commons.openapi.generator import generate_openapi; ' +
+        'generate_openapi(entrypoint=sys.argv[1], title=sys.argv[2], description=sys.argv[3] or None)';
     try {
-        const result = await executeAsyncCommand(command);
+        const result = await executeAsyncCommand('uv', [
+            'run', '--no-sync', '--project', process.cwd(),
+            'python', '-c', pySnippet, entrypoint, title, description ?? '',
+        ]);
         const { stdout: out } = validateCommandResult(result);
         return out;
     }

package/dist/commands/run.d.ts

@@ -4,5 +4,5 @@ export interface RunCommandOptions {
     tag: string[];
     storeInput: boolean;
 }
-export declare function buildCreateJobRequest(serviceId: string, input: Record<string, never> | undefined, opts: RunCommandOptions): HubPlatform.CreateServiceJobRequest;
+export declare function buildCreateJobRequest(serviceId: string, input: HubPlatform.JsonNode | undefined, opts: RunCommandOptions): HubPlatform.CreateServiceJobRequest;
 export declare const runCommand: Command;

package/dist/commands/set-context.js

@@ -21,7 +21,14 @@ export const setContextCommand = new Command('set-context')
     .action(async (contextId) => {
     const userConfig = await requireAuth();
     const quantumHubService = new QuantumHubService(userConfig);
-    if (!contextId) {
+    if (contextId) {
+        const accounts = await quantumHubService.getAccounts();
+        const selectedContext = accounts.find(account => account.id === contextId);
+        if (!selectedContext) {
+            error(`Context with id "${contextId}" not found.`);
+        }
+    }
+    else {
         const spin = spinner('Loading available contexts');
         const accounts = await quantumHubService.getAccounts();
         spin.succeed('Contexts loaded');
@@ -32,13 +39,6 @@ export const setContextCommand = new Command('set-context')
         });
         contextId = response.id;
     }
-    else {
-        const accounts = await quantumHubService.getAccounts();
-        const selectedContext = accounts.find(account => account.id === contextId);
-        if (!selectedContext) {
-            error(`Context with id "${contextId}" not found.`);
-        }
-    }
     const accounts = await quantumHubService.getAccounts();
     const selectedContext = accounts.find(account => account.id === contextId);
     if (!selectedContext) {

package/dist/commands/up.js

@@ -34,8 +34,7 @@ async function buildServiceJob(qhubService, service, silentMode) {
             if (!silentMode) {
                 if (buildJob.step !== currentStep) {
                     if (buildJob.step === HubPlatform.BuildJobDto.Step.BuildImage) {
-                        if (!spin)
-                            spin = spinner('Building Image (1/2)');
+                        spin ??= spinner('Building Image (1/2)');
                     }
                     else if (buildJob.step === HubPlatform.BuildJobDto.Step.PushImage) {
                         if (spin) {

package/dist/lib/command.d.ts

@@ -1,6 +1,4 @@
-import { StdioOptions } from "node:child_process";
-export declare const executeAsyncCommand: (command: string) => Promise<{
-    stderr: string;
+export declare const executeAsyncCommand: (file: string, args: string[]) => Promise<{
     stdout: string;
+    stderr: string;
 }>;
-export declare const executeCommand: (command: string, stdioOption?: StdioOptions) => void;

package/dist/lib/command.js

@@ -1,16 +1,4 @@
-import { exec, execSync } from "node:child_process";
-export const executeAsyncCommand = async (command) => {
-    return new Promise((resolve, reject) => {
-        exec(command, (error, stdout, stderr) => {
-            if (error) {
-                reject(error);
-            }
-            else {
-                resolve({ stderr, stdout });
-            }
-        });
-    });
-};
-export const executeCommand = (command, stdioOption) => {
-    execSync(`${command}`, { stdio: stdioOption ?? 'inherit' });
-};
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+export const executeAsyncCommand = (file, args) => execFileAsync(file, args);

package/dist/lib/fetch.js

@@ -27,11 +27,11 @@ export const getErrorMessage = async (response) => {
     const httpStatus = response.status && response.statusText ? `${response.status} - ${response.statusText}` : response.status;
     // message is either in body.errorMessage, body.error or body.detail
     let errorMessage;
-    if (body && body.errorMessage)
+    if (body?.errorMessage)
         errorMessage = body.errorMessage;
-    if (!errorMessage && body && body.error)
+    if (!errorMessage && body?.error)
         errorMessage = body.error;
-    if (!errorMessage && body && body.detail)
+    if (!errorMessage && body?.detail)
         errorMessage = body.detail;
     return errorMessage ? `${errorMessage} (${httpStatus})` : `${httpStatus}`;
 };

package/dist/lib/output.d.ts

@@ -1,5 +1,5 @@
 import { type Ora } from 'ora';
-export type { Ora };
+export type { Ora } from 'ora';
 /**
  * Output helpers — replaces oclif's `ux.*` surface.
  *

package/dist/model/command.d.ts

@@ -1,6 +1,5 @@
-import { configDir } from '../lib/config-dir.js';
 import UserConfig from './user-config.js';
-export { configDir };
+export { configDir } from '../lib/config-dir.js';
 export declare function getUserConfig(): UserConfig;
 export declare function getContextDisplayString(userConfig: UserConfig): string;
 export declare function showCustomBasePathWarning(): void;

package/dist/model/command.js

@@ -2,7 +2,7 @@ import { configDir } from '../lib/config-dir.js';
 import { stdout, warn } from '../lib/output.js';
 import AuthService from '../service/auth-service.js';
 import { readUserConfig, writeUserConfig } from '../service/user-config-service.js';
-export { configDir };
+export { configDir } from '../lib/config-dir.js';
 export function getUserConfig() {
     return readUserConfig(configDir);
 }

package/dist/service/quantum-hub-service.js

@@ -12,9 +12,7 @@ export default class QuantumHubService extends CommandService {
         this.apiClient = new HubPlatformClient({
             apiKey,
             baseUrl: basePath,
-            headers: {
-                'X-OrganizationId': organizationId,
-            },
+            organizationId,
         });
     }
     async getAccounts() {
@@ -149,17 +147,15 @@ export default class QuantumHubService extends CommandService {
                 await this.apiClient.services.updateServiceSummary(serviceId, { summary: serviceConfig.summary });
             }
             await this.apiClient.managedServices.updateManagedServiceResourceConfiguration(serviceId, {
-                body: { type: 'cpu', amount: milliCpus, unit: 'm' },
+                type: 'cpu', amount: milliCpus, unit: 'm',
             });
             await this.apiClient.managedServices.updateManagedServiceResourceConfiguration(serviceId, {
-                body: { type: 'memory', amount: memoryInMegabytes, unit: 'M' },
+                type: 'memory', amount: memoryInMegabytes, unit: 'M',
             });
             await this.apiClient.managedServices.updateManagedServiceResourceConfiguration(serviceId, {
-                body: {
-                    type: 'gpu',
-                    amount: gpuCount,
-                    accelerator: gpuAccelerator
-                },
+                type: 'gpu',
+                amount: gpuCount,
+                accelerator: gpuAccelerator,
             });
             if (openapi) {
                 await this.apiClient.services.updateServiceOpenApi(serviceId, { file: openapi });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantum-hub/qhubctl",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "description": "Kipu Quantum Hub CLI",
   "author": "Kipu Quantum GmbH",
   "contributors": [
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@inquirer/prompts": "^8",
-    "@quantum-hub/qhub-api": "^1",
+    "@quantum-hub/qhub-api": "^2",
     "adm-zip": "^0.5.17",
     "async-wait-until": "^2",
     "commander": "^14",