@quantum-hub/qhubctl 1.12.1 → 1.14.0

package/README.md

@@ -80,7 +80,7 @@ npm link
 ### Run against staging
 
 ```bash
-node dist/main.js login --base-path https://api.hub.34.90.225.20.nip.io -t <personal access token>
+node dist/main.js login --base-path https://api.hub.34.6.228.233.nip.io -t <personal access token>
 ```
 
 ### Debug output

package/dist/commands/services-build-logs.d.ts

@@ -0,0 +1,6 @@
+import { HubPlatform } from '@quantum-hub/qhub-api/platform';
+import { Command } from 'commander';
+export declare function formatLogEntry(entry: HubPlatform.LogEntry, opts: {
+    isTTY: boolean;
+}): string;
+export declare const servicesBuildLogsCommand: Command;

package/dist/commands/services-build-logs.js

@@ -0,0 +1,85 @@
+import { input } from '@inquirer/prompts';
+import { Command } from 'commander';
+import { error, spinner, stdout } from '../lib/output.js';
+import { requireAuth } from '../model/command.js';
+import QuantumHubService from '../service/quantum-hub-service.js';
+import { readServiceConfig } from '../service/service-config-service.js';
+const SEVERITY_COLUMN_WIDTH = 7;
+const COLUMN_GAP = '  ';
+const ANSI_RESET = '\x1b[0m';
+const ANSI_BY_SEVERITY = {
+    DEBUG: '\x1b[2m',
+    WARNING: '\x1b[33m',
+    ERROR: '\x1b[31m',
+};
+export function formatLogEntry(entry, opts) {
+    const timestamp = entry.timestamp ?? '-';
+    const severity = entry.severity ?? 'INFO';
+    const message = entry.message ?? '';
+    const paddedSeverity = severity.padEnd(SEVERITY_COLUMN_WIDTH, ' ');
+    const ansi = opts.isTTY ? ANSI_BY_SEVERITY[severity] : undefined;
+    const severityCell = ansi ? `${ansi}${paddedSeverity}${ANSI_RESET}` : paddedSeverity;
+    return `${timestamp}${COLUMN_GAP}${severityCell}${COLUMN_GAP}${message}`;
+}
+const EXAMPLES = `
+Examples:
+  $ qhubctl services build-logs
+  $ qhubctl services build-logs --id <serviceId>
+  $ qhubctl services build-logs --id <serviceId> --json`;
+export const servicesBuildLogsCommand = new Command('build-logs')
+    .description('Show the build logs of a service.')
+    .option('--id <value>', 'The ID of the service (reads from qhub.json if omitted)')
+    .option('--json', 'Output in JSON format', false)
+    .addHelpText('after', EXAMPLES)
+    .action(async (opts) => {
+    const userConfig = await requireAuth({ printContext: !opts.json });
+    const quantumHubService = new QuantumHubService(userConfig);
+    let serviceId = opts.id;
+    if (!serviceId) {
+        try {
+            const serviceConfig = readServiceConfig(process.cwd());
+            serviceId = serviceConfig.serviceId;
+        }
+        catch {
+            serviceId = undefined;
+        }
+    }
+    if (!serviceId) {
+        try {
+            serviceId = await input({ message: 'Enter the service ID:' });
+        }
+        catch {
+            // user cancelled (Ctrl+C)
+            process.exit(0);
+        }
+    }
+    if (!serviceId?.trim()) {
+        error('No service ID provided.');
+    }
+    const spin = spinner('Loading build logs');
+    let logs;
+    try {
+        logs = await quantumHubService.getBuildLogs(serviceId);
+    }
+    catch (err) {
+        spin.fail('Failed to load build logs');
+        error(err instanceof Error ? err.message : String(err));
+    }
+    spin.succeed('Build logs loaded');
+    if (opts.json) {
+        stdout(JSON.stringify(logs, null, 2));
+        return;
+    }
+    if (logs.length === 0) {
+        stdout();
+        stdout('No build logs available.');
+        stdout();
+        return;
+    }
+    const isTTY = Boolean(process.stdout.isTTY);
+    stdout();
+    for (const entry of logs) {
+        stdout(formatLogEntry(entry, { isTTY }));
+    }
+    stdout();
+});

package/dist/lib/error.js

@@ -1,7 +1,8 @@
 import { HubPlatformError, HubPlatformTimeoutError } from '@quantum-hub/qhub-api/platform';
+import { HubUserError, HubUserTimeoutError } from '@quantum-hub/qhub-api/user';
 import { debugEnabled } from './debug.js';
 export const handleError = async (error) => {
-    if (error instanceof HubPlatformError) {
+    if (error instanceof HubPlatformError || error instanceof HubUserError) {
         const httpStatus = error.statusCode;
         // message is either in body.errorMessage, body.error or body.detail
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -18,7 +19,7 @@ export const handleError = async (error) => {
         }
         return errorMessage ? `${errorMessage} (${httpStatus})` : `${httpStatus}`;
     }
-    if (error instanceof HubPlatformTimeoutError) {
+    if (error instanceof HubPlatformTimeoutError || error instanceof HubUserTimeoutError) {
         return `Internal error occurred, please try again later (${error.message})`;
     }
     if (debugEnabled()) {

package/dist/program.js

@@ -11,6 +11,7 @@ import { logoutCommand } from './commands/logout.js';
 import { openapiCommand } from './commands/openapi.js';
 import { runCommand } from './commands/run.js';
 import { serveCommand } from './commands/serve.js';
+import { servicesBuildLogsCommand } from './commands/services-build-logs.js';
 import { servicesBuildStatusCommand } from './commands/services-build-status.js';
 import { servicesListCommand } from './commands/services-list.js';
 import { setContextCommand } from './commands/set-context.js';
@@ -37,6 +38,7 @@ program.addCommand(serveCommand);
 const servicesCommand = new Command('services').description('Manage services');
 servicesCommand.addCommand(servicesListCommand);
 servicesCommand.addCommand(servicesBuildStatusCommand);
+servicesCommand.addCommand(servicesBuildLogsCommand);
 program.addCommand(servicesCommand);
 program.addCommand(setContextCommand);
 program.addCommand(upCommand);

package/dist/service/auth-service.d.ts

@@ -1,9 +1,9 @@
-import { UserDto } from '../client/users/index.js';
+import { HubUser } from '@quantum-hub/qhub-api/user';
 import UserConfig from '../model/user-config.js';
 import UserService from './user-service.js';
 export default class AuthService {
     userConfig: UserConfig;
     userService: UserService;
     constructor(userConfig: UserConfig);
-    authenticate(apiKey: string): Promise<UserDto>;
+    authenticate(apiKey: string): Promise<HubUser.UserDto>;
 }

package/dist/service/quantum-hub-service.d.ts

@@ -8,6 +8,7 @@ export default class QuantumHubService extends CommandService {
     getAccounts(): Promise<HubPlatform.AccountDto[]>;
     createService(serviceConfig: ManagedServiceConfig, sourceCode: Blob, apiDefinition?: Blob): Promise<HubPlatform.ServiceDto>;
     getBuildJob(id: string): Promise<HubPlatform.BuildJobDto>;
+    getBuildLogs(id: string): Promise<HubPlatform.LogEntry[]>;
     getJobById(id: string): Promise<HubPlatform.ServiceJobDto>;
     getService(id: string): Promise<HubPlatform.ServiceDto>;
     getServices(): Promise<HubPlatform.ServiceOverviewDto[]>;

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

@@ -1,4 +1,4 @@
-import { HubPlatformClient } from "@quantum-hub/qhub-api/platform";
+import { HubPlatform, HubPlatformClient } from "@quantum-hub/qhub-api/platform";
 import { handleError } from '../lib/error.js';
 import { defaultBasePath } from '../model/user-config.js';
 import { CommandService } from './command-service.js';
@@ -19,7 +19,7 @@ export default class QuantumHubService extends CommandService {
     }
     async getAccounts() {
         try {
-            return await this.apiClient.users.getAccounts();
+            return await this.apiClient.users.getMyAccounts();
         }
         catch (error) {
             const errorMessage = await handleError(error);
@@ -69,6 +69,18 @@ export default class QuantumHubService extends CommandService {
             throw new Error(errorMessage);
         }
     }
+    async getBuildLogs(id) {
+        try {
+            return await this.apiClient.managedServices.getManagedServiceBuildLogs(id);
+        }
+        catch (error) {
+            if (error instanceof HubPlatform.NotFoundError) {
+                return [];
+            }
+            const errorMessage = await handleError(error);
+            throw new Error(errorMessage);
+        }
+    }
     async getJobById(id) {
         try {
             return await this.apiClient.serviceJobs.getServiceJob(id);

package/dist/service/user-service.d.ts

@@ -1,9 +1,9 @@
-import { UserDto, UserSettingsApi } from '../client/users/index.js';
+import { HubUser, HubUserClient } from '@quantum-hub/qhub-api/user';
 import UserConfig from '../model/user-config.js';
 export default class UserService {
     basePath: string;
     defaultHeaders: Record<string, string>;
-    userSettingsApi: UserSettingsApi;
+    apiClient: HubUserClient;
     constructor(userConfig: UserConfig);
-    getCurrentUser(apiKey: string): Promise<UserDto>;
+    getCurrentUser(apiKey: string): Promise<HubUser.UserDto>;
 }

package/dist/service/user-service.js

@@ -1,28 +1,28 @@
-import { Configuration, UserSettingsApi } from '../client/users/index.js';
+import { HubUserClient } from '@quantum-hub/qhub-api/user';
 import { handleError } from '../lib/error.js';
 import { defaultBasePath } from '../model/user-config.js';
 export default class UserService {
     basePath;
     defaultHeaders;
-    userSettingsApi;
+    apiClient;
     constructor(userConfig) {
         this.basePath = (userConfig.endpoint?.basePath || defaultBasePath) + '/user-service';
         this.defaultHeaders = userConfig.endpoint?.defaultHeaders || {};
         const apiKey = userConfig.auth?.value;
-        this.userSettingsApi = new UserSettingsApi(new Configuration({
+        this.apiClient = new HubUserClient({
             apiKey,
-            basePath: this.basePath,
+            baseUrl: this.basePath,
             headers: this.defaultHeaders,
-        }));
+        });
     }
     async getCurrentUser(apiKey) {
-        const userSettingsApi = new UserSettingsApi(new Configuration({
+        const apiClient = new HubUserClient({
             apiKey,
-            basePath: this.basePath,
+            baseUrl: this.basePath,
             headers: this.defaultHeaders,
-        }));
+        });
         try {
-            return await userSettingsApi.getUser();
+            return await apiClient.userSettings.getCurrentUser();
         }
         catch (error) {
             const errorMessage = await handleError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantum-hub/qhubctl",
-  "version": "1.12.1",
+  "version": "1.14.0",
   "description": "Kipu Quantum Hub CLI",
   "author": "Kipu Quantum GmbH",
   "contributors": [

package/dist/client/users/apis/AuthenticationApi.d.ts

@@ -1,31 +0,0 @@
-/**
- * Quantum Platform User Service API
- * Part of the OpenAPI specification for the Quantum Platform.
- *
- * The version of the OpenAPI document: 1.0
- * Contact: support-hub@kipu-quantum.com
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import * as runtime from '../runtime.js';
-import type { PersonalAccessTokenPrincipal } from '../models/index.js';
-export interface AuthorizeUserRequest {
-    xAuthToken?: string;
-}
-/**
- *
- */
-export declare class AuthenticationApi extends runtime.BaseAPI {
-    /**
-     * Checks the given personal access token and returns the user details.
-     * Checks the given personal access token and returns the user details.
-     */
-    authorizeUserRaw(requestParameters: AuthorizeUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PersonalAccessTokenPrincipal>>;
-    /**
-     * Checks the given personal access token and returns the user details.
-     * Checks the given personal access token and returns the user details.
-     */
-    authorizeUser(requestParameters?: AuthorizeUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PersonalAccessTokenPrincipal>;
-}

package/dist/client/users/apis/AuthenticationApi.js

@@ -1,46 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Quantum Platform User Service API
- * Part of the OpenAPI specification for the Quantum Platform.
- *
- * The version of the OpenAPI document: 1.0
- * Contact: support-hub@kipu-quantum.com
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import * as runtime from '../runtime.js';
-import { PersonalAccessTokenPrincipalFromJSON, } from '../models/index.js';
-/**
- *
- */
-export class AuthenticationApi extends runtime.BaseAPI {
-    /**
-     * Checks the given personal access token and returns the user details.
-     * Checks the given personal access token and returns the user details.
-     */
-    async authorizeUserRaw(requestParameters, initOverrides) {
-        const queryParameters = {};
-        const headerParameters = {};
-        if (requestParameters['xAuthToken'] != null) {
-            headerParameters['X-Auth-Token'] = String(requestParameters['xAuthToken']);
-        }
-        const response = await this.request({
-            path: `/authorize`,
-            method: 'POST',
-            headers: headerParameters,
-            query: queryParameters,
-        }, initOverrides);
-        return new runtime.JSONApiResponse(response, (jsonValue) => PersonalAccessTokenPrincipalFromJSON(jsonValue));
-    }
-    /**
-     * Checks the given personal access token and returns the user details.
-     * Checks the given personal access token and returns the user details.
-     */
-    async authorizeUser(requestParameters = {}, initOverrides) {
-        const response = await this.authorizeUserRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-}

package/dist/client/users/apis/ExpertsApi.d.ts

@@ -1,44 +0,0 @@
-/**
- * Quantum Platform User Service API
- * Part of the OpenAPI specification for the Quantum Platform.
- *
- * The version of the OpenAPI document: 1.0
- * Contact: support-hub@kipu-quantum.com
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import * as runtime from '../runtime.js';
-import type { PageUserDto, Pageable, UserDto } from '../models/index.js';
-export interface FindExpertByIdRequest {
-    id: string;
-}
-export interface GetExpertsRequest {
-    pageable: Pageable;
-}
-/**
- *
- */
-export declare class ExpertsApi extends runtime.BaseAPI {
-    /**
-     * Returns the expert details with the given id.
-     * Returns the expert details with the given id.
-     */
-    findExpertByIdRaw(requestParameters: FindExpertByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<UserDto>>;
-    /**
-     * Returns the expert details with the given id.
-     * Returns the expert details with the given id.
-     */
-    findExpertById(requestParameters: FindExpertByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<UserDto>;
-    /**
-     * Lists all experts.
-     * Lists all experts.
-     */
-    getExpertsRaw(requestParameters: GetExpertsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PageUserDto>>;
-    /**
-     * Lists all experts.
-     * Lists all experts.
-     */
-    getExperts(requestParameters: GetExpertsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PageUserDto>;
-}

package/dist/client/users/apis/ExpertsApi.js

@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Quantum Platform User Service API
- * Part of the OpenAPI specification for the Quantum Platform.
- *
- * The version of the OpenAPI document: 1.0
- * Contact: support-hub@kipu-quantum.com
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import * as runtime from '../runtime.js';
-import { PageUserDtoFromJSON, UserDtoFromJSON, } from '../models/index.js';
-/**
- *
- */
-export class ExpertsApi extends runtime.BaseAPI {
-    /**
-     * Returns the expert details with the given id.
-     * Returns the expert details with the given id.
-     */
-    async findExpertByIdRaw(requestParameters, initOverrides) {
-        if (requestParameters['id'] == null) {
-            throw new runtime.RequiredError('id', 'Required parameter "id" was null or undefined when calling findExpertById().');
-        }
-        const queryParameters = {};
-        const headerParameters = {};
-        const response = await this.request({
-            path: `/experts/{id}`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id']))),
-            method: 'GET',
-            headers: headerParameters,
-            query: queryParameters,
-        }, initOverrides);
-        return new runtime.JSONApiResponse(response, (jsonValue) => UserDtoFromJSON(jsonValue));
-    }
-    /**
-     * Returns the expert details with the given id.
-     * Returns the expert details with the given id.
-     */
-    async findExpertById(requestParameters, initOverrides) {
-        const response = await this.findExpertByIdRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-    /**
-     * Lists all experts.
-     * Lists all experts.
-     */
-    async getExpertsRaw(requestParameters, initOverrides) {
-        if (requestParameters['pageable'] == null) {
-            throw new runtime.RequiredError('pageable', 'Required parameter "pageable" was null or undefined when calling getExperts().');
-        }
-        const queryParameters = {};
-        if (requestParameters['pageable'] != null) {
-            queryParameters['pageable'] = requestParameters['pageable'];
-        }
-        const headerParameters = {};
-        const response = await this.request({
-            path: `/experts`,
-            method: 'GET',
-            headers: headerParameters,
-            query: queryParameters,
-        }, initOverrides);
-        return new runtime.JSONApiResponse(response, (jsonValue) => PageUserDtoFromJSON(jsonValue));
-    }
-    /**
-     * Lists all experts.
-     * Lists all experts.
-     */
-    async getExperts(requestParameters, initOverrides) {
-        const response = await this.getExpertsRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-}

package/dist/client/users/apis/SearchApi.d.ts

@@ -1,46 +0,0 @@
-/**
- * Quantum Platform User Service API
- * Part of the OpenAPI specification for the Quantum Platform.
- *
- * The version of the OpenAPI document: 1.0
- * Contact: support-hub@kipu-quantum.com
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import * as runtime from '../runtime.js';
-import type { PageUserDto, UserDto } from '../models/index.js';
-export interface FindByLastname11Request {
-    lastname: string;
-    firstname: string;
-    email: string;
-}
-export interface SearchExpertsRequest {
-    q: string;
-}
-/**
- *
- */
-export declare class SearchApi extends runtime.BaseAPI {
-    /**
-     * Search for users based on the given query parameter.
-     * Search for users based on the given query parameter.
-     */
-    findByLastname11Raw(requestParameters: FindByLastname11Request, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<UserDto>>>;
-    /**
-     * Search for users based on the given query parameter.
-     * Search for users based on the given query parameter.
-     */
-    findByLastname11(requestParameters: FindByLastname11Request, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<UserDto>>;
-    /**
-     * Search for experts based on the given query parameter.
-     * Search for experts based on the given query parameter.
-     */
-    searchExpertsRaw(requestParameters: SearchExpertsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<PageUserDto>>;
-    /**
-     * Search for experts based on the given query parameter.
-     * Search for experts based on the given query parameter.
-     */
-    searchExperts(requestParameters: SearchExpertsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<PageUserDto>;
-}

package/dist/client/users/apis/SearchApi.js

@@ -1,97 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Quantum Platform User Service API
- * Part of the OpenAPI specification for the Quantum Platform.
- *
- * The version of the OpenAPI document: 1.0
- * Contact: support-hub@kipu-quantum.com
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import * as runtime from '../runtime.js';
-import { PageUserDtoFromJSON, UserDtoFromJSON, } from '../models/index.js';
-/**
- *
- */
-export class SearchApi extends runtime.BaseAPI {
-    /**
-     * Search for users based on the given query parameter.
-     * Search for users based on the given query parameter.
-     */
-    async findByLastname11Raw(requestParameters, initOverrides) {
-        if (requestParameters['lastname'] == null) {
-            throw new runtime.RequiredError('lastname', 'Required parameter "lastname" was null or undefined when calling findByLastname11().');
-        }
-        if (requestParameters['firstname'] == null) {
-            throw new runtime.RequiredError('firstname', 'Required parameter "firstname" was null or undefined when calling findByLastname11().');
-        }
-        if (requestParameters['email'] == null) {
-            throw new runtime.RequiredError('email', 'Required parameter "email" was null or undefined when calling findByLastname11().');
-        }
-        const queryParameters = {};
-        if (requestParameters['lastname'] != null) {
-            queryParameters['lastname'] = requestParameters['lastname'];
-        }
-        if (requestParameters['firstname'] != null) {
-            queryParameters['firstname'] = requestParameters['firstname'];
-        }
-        if (requestParameters['email'] != null) {
-            queryParameters['email'] = requestParameters['email'];
-        }
-        const headerParameters = {};
-        if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Auth-Token"] = await this.configuration.apiKey("X-Auth-Token"); // apiKey authentication
-        }
-        if (this.configuration && this.configuration.accessToken) {
-            // oauth required
-            headerParameters["Authorization"] = await this.configuration.accessToken("oauth2", []);
-        }
-        const response = await this.request({
-            path: `/search`,
-            method: 'GET',
-            headers: headerParameters,
-            query: queryParameters,
-        }, initOverrides);
-        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(UserDtoFromJSON));
-    }
-    /**
-     * Search for users based on the given query parameter.
-     * Search for users based on the given query parameter.
-     */
-    async findByLastname11(requestParameters, initOverrides) {
-        const response = await this.findByLastname11Raw(requestParameters, initOverrides);
-        return await response.value();
-    }
-    /**
-     * Search for experts based on the given query parameter.
-     * Search for experts based on the given query parameter.
-     */
-    async searchExpertsRaw(requestParameters, initOverrides) {
-        if (requestParameters['q'] == null) {
-            throw new runtime.RequiredError('q', 'Required parameter "q" was null or undefined when calling searchExperts().');
-        }
-        const queryParameters = {};
-        if (requestParameters['q'] != null) {
-            queryParameters['q'] = requestParameters['q'];
-        }
-        const headerParameters = {};
-        const response = await this.request({
-            path: `/search/experts`,
-            method: 'GET',
-            headers: headerParameters,
-            query: queryParameters,
-        }, initOverrides);
-        return new runtime.JSONApiResponse(response, (jsonValue) => PageUserDtoFromJSON(jsonValue));
-    }
-    /**
-     * Search for experts based on the given query parameter.
-     * Search for experts based on the given query parameter.
-     */
-    async searchExperts(requestParameters, initOverrides) {
-        const response = await this.searchExpertsRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-}