@quantum-hub/qhubctl 1.1.2 → 1.1.3

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

@@ -1,26 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const platform_1 = require("@quantum-hub/qhub-api/dist/api/platform");
-const kqh_1 = require("../client/kqh");
-const error_1 = require("../lib/error");
-const fetch_1 = require("../lib/fetch");
-const user_config_1 = require("../model/user-config");
-const command_service_1 = require("./command-service");
-class QuantumHubService extends command_service_1.CommandService {
+import { HubPlatformClient } from "@quantum-hub/qhub-api/platform";
+import { Configuration, ServicePlatformServicesApi, } from '../client/kqh/index.js';
+import { handleError } from '../lib/error.js';
+import { fetchOrThrow } from '../lib/fetch.js';
+import { defaultBasePath } from '../model/user-config.js';
+import { CommandService } from './command-service.js';
+export default class QuantumHubService extends CommandService {
     serviceApi;
     apiClient;
     constructor(cmd, config, userConfig) {
         super(cmd, config, userConfig);
-        const basePath = (userConfig.endpoint?.basePath || user_config_1.defaultBasePath) + '/qc-catalog';
+        const basePath = (userConfig.endpoint?.basePath || defaultBasePath) + '/qc-catalog';
         const defaultHeaders = userConfig.endpoint?.defaultHeaders || {};
         const apiKey = userConfig.auth?.value;
         const organizationId = this.userConfig.context?.isOrganization ? this.userConfig.context.id : undefined;
-        this.serviceApi = new kqh_1.ServicePlatformServicesApi(new kqh_1.Configuration({
+        this.serviceApi = new ServicePlatformServicesApi(new Configuration({
             apiKey,
             basePath,
             headers: defaultHeaders,
         }));
-        this.apiClient = new platform_1.HubPlatformClient({
+        this.apiClient = new HubPlatformClient({
             apiKey,
             baseUrl: basePath,
             organizationId
@@ -46,20 +44,20 @@ class QuantumHubService extends command_service_1.CommandService {
             });
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
     async getAccounts() {
-        const basePath = (this.userConfig.endpoint?.basePath || user_config_1.defaultBasePath) + '/qc-catalog';
+        const basePath = (this.userConfig.endpoint?.basePath || defaultBasePath) + '/qc-catalog';
         try {
-            const response = await (0, fetch_1.fetchOrThrow)(basePath + '/my/accounts', {
+            const response = await fetchOrThrow(basePath + '/my/accounts', {
                 headers: { 'X-Auth-Token': this.userConfig.auth.value },
             });
             return (await response.json());
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -73,7 +71,7 @@ class QuantumHubService extends command_service_1.CommandService {
             });
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -82,7 +80,7 @@ class QuantumHubService extends command_service_1.CommandService {
             return await this.apiClient.serviceJobs.getServiceJob({ "id": id });
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -92,7 +90,7 @@ class QuantumHubService extends command_service_1.CommandService {
             return await this.serviceApi.getService({ id, xOrganizationId: organizationId });
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -102,7 +100,7 @@ class QuantumHubService extends command_service_1.CommandService {
             return await this.serviceApi.getServices({ xOrganizationId: organizationId });
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -111,7 +109,7 @@ class QuantumHubService extends command_service_1.CommandService {
             return await this.apiClient.serviceJobs.createServiceJob(request);
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -128,7 +126,7 @@ class QuantumHubService extends command_service_1.CommandService {
             });
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
@@ -214,9 +212,8 @@ class QuantumHubService extends command_service_1.CommandService {
             return service;
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
 }
-exports.default = QuantumHubService;

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

@@ -1,3 +1,3 @@
-import ManagedServiceConfig from '../model/managed-service-config';
+import ManagedServiceConfig from '../model/managed-service-config.js';
 export declare const readServiceConfig: (location: string) => ManagedServiceConfig;
 export declare const writeServiceConfig: (location: string, serviceConfig: ManagedServiceConfig) => ManagedServiceConfig;

package/dist/service/service-config-service.js

@@ -1,26 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeServiceConfig = exports.readServiceConfig = void 0;
-const fs_extra_1 = require("fs-extra");
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const readServiceConfig = (location) => {
-    const file = node_path_1.default.join(location, 'qhub.json');
-    if (!node_fs_1.default.existsSync(file)) {
+import fsExtra from 'fs-extra';
+const { createFileSync, readJsonSync, writeJsonSync } = fsExtra;
+import fs from 'node:fs';
+import path from 'node:path';
+export const readServiceConfig = (location) => {
+    const file = path.join(location, 'qhub.json');
+    if (!fs.existsSync(file)) {
         throw new Error('No qhub.json file found in current directory');
     }
-    return (0, fs_extra_1.readJsonSync)(file, { encoding: 'utf8' });
+    return readJsonSync(file, { encoding: 'utf8' });
 };
-exports.readServiceConfig = readServiceConfig;
-const writeServiceConfig = (location, serviceConfig) => {
-    const file = node_path_1.default.join(location, 'qhub.json');
-    if (!node_fs_1.default.existsSync(file)) {
-        (0, fs_extra_1.createFileSync)(file);
+export const writeServiceConfig = (location, serviceConfig) => {
+    const file = path.join(location, 'qhub.json');
+    if (!fs.existsSync(file)) {
+        createFileSync(file);
     }
-    (0, fs_extra_1.writeJsonSync)(file, serviceConfig, { encoding: 'utf8', spaces: 2 });
-    return (0, exports.readServiceConfig)(location);
+    writeJsonSync(file, serviceConfig, { encoding: 'utf8', spaces: 2 });
+    return readServiceConfig(location);
 };
-exports.writeServiceConfig = writeServiceConfig;

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

@@ -1,3 +1,3 @@
-import UserConfig from '../model/user-config';
+import UserConfig from '../model/user-config.js';
 export declare const readUserConfig: (location: string) => UserConfig;
 export declare const writeUserConfig: (location: string, userConfig: UserConfig) => UserConfig;

package/dist/service/user-config-service.js

@@ -1,26 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeUserConfig = exports.readUserConfig = void 0;
-const fs_extra_1 = require("fs-extra");
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const readUserConfig = (location) => {
-    const file = node_path_1.default.join(location, 'config.json');
-    if (!node_fs_1.default.existsSync(file)) {
+import fsExtra from 'fs-extra';
+const { createFileSync, readJsonSync, writeJsonSync } = fsExtra;
+import fs from 'node:fs';
+import path from 'node:path';
+export const readUserConfig = (location) => {
+    const file = path.join(location, 'config.json');
+    if (!fs.existsSync(file)) {
         return {};
     }
-    return (0, fs_extra_1.readJsonSync)(file, { encoding: 'utf8' });
+    return readJsonSync(file, { encoding: 'utf8' });
 };
-exports.readUserConfig = readUserConfig;
-const writeUserConfig = (location, userConfig) => {
-    const file = node_path_1.default.join(location, 'config.json');
-    if (!node_fs_1.default.existsSync(file)) {
-        (0, fs_extra_1.createFileSync)(file);
+export const writeUserConfig = (location, userConfig) => {
+    const file = path.join(location, 'config.json');
+    if (!fs.existsSync(file)) {
+        createFileSync(file);
     }
-    (0, fs_extra_1.writeJsonSync)(file, userConfig, { encoding: 'utf8', spaces: 2 });
-    return (0, exports.readUserConfig)(location);
+    writeJsonSync(file, userConfig, { encoding: 'utf8', spaces: 2 });
+    return readUserConfig(location);
 };
-exports.writeUserConfig = writeUserConfig;

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

@@ -1,5 +1,5 @@
-import { UserDto, UserSettingsApi } from '../client/users';
-import UserConfig from '../model/user-config';
+import { UserDto, UserSettingsApi } from '../client/users/index.js';
+import UserConfig from '../model/user-config.js';
 export default class UserService {
     basePath: string;
     defaultHeaders: Record<string, string>;

package/dist/service/user-service.js

@@ -1,24 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const users_1 = require("../client/users");
-const error_1 = require("../lib/error");
-const user_config_1 = require("../model/user-config");
-class UserService {
+import { Configuration, UserSettingsApi } from '../client/users/index.js';
+import { handleError } from '../lib/error.js';
+import { defaultBasePath } from '../model/user-config.js';
+export default class UserService {
     basePath;
     defaultHeaders;
     userSettingsApi;
     constructor(userConfig) {
-        this.basePath = (userConfig.endpoint?.basePath || user_config_1.defaultBasePath) + '/user-service';
+        this.basePath = (userConfig.endpoint?.basePath || defaultBasePath) + '/user-service';
         this.defaultHeaders = userConfig.endpoint?.defaultHeaders || {};
         const apiKey = userConfig.auth?.value;
-        this.userSettingsApi = new users_1.UserSettingsApi(new users_1.Configuration({
+        this.userSettingsApi = new UserSettingsApi(new Configuration({
             apiKey,
             basePath: this.basePath,
             headers: this.defaultHeaders,
         }));
     }
     async getCurrentUser(apiKey) {
-        const userSettingsApi = new users_1.UserSettingsApi(new users_1.Configuration({
+        const userSettingsApi = new UserSettingsApi(new Configuration({
             apiKey,
             basePath: this.basePath,
             headers: this.defaultHeaders,
@@ -27,9 +25,8 @@ class UserService {
             return await userSettingsApi.getUser();
         }
         catch (error) {
-            const errorMessage = await (0, error_1.handleError)(error);
+            const errorMessage = await handleError(error);
             throw new Error(errorMessage);
         }
     }
 }
-exports.default = UserService;

package/oclif.manifest.json

@@ -15,7 +15,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -59,7 +59,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -67,6 +67,29 @@
         "upload.js"
       ]
     },
+    "get-context": {
+      "aliases": [],
+      "args": {},
+      "description": "Get the current context, i.e., the personal or organization account you are currently working with.",
+      "examples": [
+        "$ qhubctl get-context"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "get-context",
+      "pluginAlias": "@quantum-hub/qhubctl",
+      "pluginName": "@quantum-hub/qhubctl",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "get-context",
+        "index.js"
+      ]
+    },
     "init": {
       "aliases": [],
       "args": {},
@@ -98,7 +121,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -106,26 +129,26 @@
         "index.js"
       ]
     },
-    "get-context": {
+    "list-contexts": {
       "aliases": [],
       "args": {},
-      "description": "Get the current context, i.e., the personal or organization account you are currently working with.",
+      "description": "Retrieves the available contexts, i.e., the personal or organizational accounts available to you to work with.",
       "examples": [
-        "$ qhubctl get-context"
+        "$ qhubctl list-contexts"
       ],
       "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "get-context",
+      "id": "list-contexts",
       "pluginAlias": "@quantum-hub/qhubctl",
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
-        "get-context",
+        "list-contexts",
         "index.js"
       ]
     },
@@ -163,7 +186,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -186,7 +209,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -194,108 +217,6 @@
         "index.js"
       ]
     },
-    "list-contexts": {
-      "aliases": [],
-      "args": {},
-      "description": "Retrieves the available contexts, i.e., the personal or organizational accounts available to you to work with.",
-      "examples": [
-        "$ qhubctl list-contexts"
-      ],
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "list-contexts",
-      "pluginAlias": "@quantum-hub/qhubctl",
-      "pluginName": "@quantum-hub/qhubctl",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "list-contexts",
-        "index.js"
-      ]
-    },
-    "openapi": {
-      "aliases": [],
-      "args": {},
-      "description": "Generates the OpenAPI description for your project based on the parameter and return types of your run() method. The output of this command will be used when creating or updating your service. Supports PYTHON_TEMPLATE (with src/program.py), PYTHON and DOCKER runtimes (with explicit entrypoint). The Python dependency \"qhub-commons\" must be installed in your activated Python environment to use this command.",
-      "examples": [
-        "$ qhubctl openapi",
-        "$ qhubctl openapi --file=./openapi.yaml --format=yaml --force",
-        "$ qhubctl openapi --entrypoint=src.program:run",
-        "$ qhubctl openapi --package=src.program --method=run",
-        "$ qhubctl openapi --package=src.program"
-      ],
-      "flags": {
-        "force": {
-          "char": "f",
-          "description": "Overwrite the output file if it already exists",
-          "name": "force",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "file": {
-          "description": "The file to write the OpenAPI description to",
-          "name": "file",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "format": {
-          "description": "The format to generate the OpenAPI description [possible values: yaml]",
-          "name": "format",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "yaml"
-          ],
-          "type": "option"
-        },
-        "entrypoint": {
-          "description": "The entrypoint to your program in the format \"package.module:function\" (default: \"src.program:run\"). Overrides package and method flags.",
-          "name": "entrypoint",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "package": {
-          "description": "The package/module path to your program (e.g., \"src.program\" or \"my_package.main\"). Only used if entrypoint is not provided.",
-          "name": "package",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "method": {
-          "description": "The method/function name in your program (default: \"run\"). Only used if entrypoint is not provided.",
-          "name": "method",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "openapi",
-      "pluginAlias": "@quantum-hub/qhubctl",
-      "pluginName": "@quantum-hub/qhubctl",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "openapi",
-        "index.js"
-      ]
-    },
     "run": {
       "aliases": [],
       "args": {
@@ -347,7 +268,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -392,7 +313,7 @@
       "strict": true,
       "CONTAINER_NAME": "planqk-cli-serve",
       "IMAGE": "registry.gitlab.com/planqk-foss/planqk-cli-serve:latest",
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -440,7 +361,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -468,7 +389,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -476,6 +397,85 @@
         "index.js"
       ]
     },
+    "openapi": {
+      "aliases": [],
+      "args": {},
+      "description": "Generates the OpenAPI description for your project based on the parameter and return types of your run() method. The output of this command will be used when creating or updating your service. Supports PYTHON_TEMPLATE (with src/program.py), PYTHON and DOCKER runtimes (with explicit entrypoint). The Python dependency \"qhub-commons\" must be installed in your activated Python environment to use this command.",
+      "examples": [
+        "$ qhubctl openapi",
+        "$ qhubctl openapi --file=./openapi.yaml --format=yaml --force",
+        "$ qhubctl openapi --entrypoint=src.program:run",
+        "$ qhubctl openapi --package=src.program --method=run",
+        "$ qhubctl openapi --package=src.program"
+      ],
+      "flags": {
+        "force": {
+          "char": "f",
+          "description": "Overwrite the output file if it already exists",
+          "name": "force",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "file": {
+          "description": "The file to write the OpenAPI description to",
+          "name": "file",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "format": {
+          "description": "The format to generate the OpenAPI description [possible values: yaml]",
+          "name": "format",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "yaml"
+          ],
+          "type": "option"
+        },
+        "entrypoint": {
+          "description": "The entrypoint to your program in the format \"package.module:function\" (default: \"src.program:run\"). Overrides package and method flags.",
+          "name": "entrypoint",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "package": {
+          "description": "The package/module path to your program (e.g., \"src.program\" or \"my_package.main\"). Only used if entrypoint is not provided.",
+          "name": "package",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "method": {
+          "description": "The method/function name in your program (default: \"run\"). Only used if entrypoint is not provided.",
+          "name": "method",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "openapi",
+      "pluginAlias": "@quantum-hub/qhubctl",
+      "pluginName": "@quantum-hub/qhubctl",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "openapi",
+        "index.js"
+      ]
+    },
     "up": {
       "aliases": [],
       "args": {},
@@ -517,7 +517,7 @@
       "pluginName": "@quantum-hub/qhubctl",
       "pluginType": "core",
       "strict": true,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -526,5 +526,5 @@
       ]
     }
   },
-  "version": "1.1.2"
+  "version": "1.1.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantum-hub/qhubctl",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Quantum Hub CLI",
   "author": "Kipu Quantum GmbH",
   "contributors": [
@@ -10,6 +10,7 @@
     "Harzenetter, Lukas <lukas.harzenetter@kipu-quantum.com>"
   ],
   "license": "Apache-2.0",
+  "type": "module",
   "keywords": [
     "hub",
     "kipu",
@@ -32,7 +33,7 @@
     "@oclif/plugin-not-found": "^3.2.74",
     "@oclif/plugin-version": "^2.2.36",
     "@oclif/plugin-warn-if-update-available": "^3.1.55",
-    "@quantum-hub/qhub-api": "^1",
+    "@quantum-hub/qhub-api": "^1.0.24",
     "adm-zip": "^0.5.16",
     "async-wait-until": "^2.0.31",
     "fs-extra": "^11.3.3",
@@ -61,6 +62,7 @@
     "oclif": "^4.22.81",
     "shx": "^0.4.0",
     "ts-node": "^10.9.2",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.56.1"
   },