@blocklet/aigne-hub 0.2.17 → 0.2.19

package/lib/cjs/api/call/v2.js

@@ -11,6 +11,7 @@ exports.getUserCreditInfo = getUserCreditInfo;
 const web_1 = require("stream/web");
 const axios_1 = __importDefault(require("axios"));
 const ufo_1 = require("ufo");
+const error_1 = require("../error");
 const types_1 = require("../types");
 const event_stream_1 = require("../utils/event-stream");
 const util_1 = require("../utils/util");
@@ -23,11 +24,12 @@ function isCacheExpired(cacheItem) {
     return Date.now() - cacheItem.timestamp > CACHE_TTL;
 }
 function getConfig() {
+    var _a;
     const baseUrl = process.env.BLOCKLET_AIGNE_API_URL;
     const credentials = JSON.parse(process.env.BLOCKLET_AIGNE_API_CREDENTIAL || '{}');
     const accessKey = credentials === null || credentials === void 0 ? void 0 : credentials.apiKey;
     if (!baseUrl || !accessKey) {
-        throw new Error('Please connect to AIGNE Hub First, baseUrl or accessKey not found');
+        throw new error_1.ConfigError(error_1.ConfigErrorType.MISSING_DASHBOARD_CONFIG, (0, ufo_1.joinURL)(new URL(((_a = process.env) === null || _a === void 0 ? void 0 : _a.BLOCKLET_APP_URL) || '').origin, '.well-known/service/admin/aigne'));
     }
     return { baseUrl, accessKey };
 }
@@ -62,6 +64,7 @@ async function callRemoteApi(input, config, options = {}) {
         url: (0, ufo_1.joinURL)(url, config.endpoint),
         headers,
         timeout: options === null || options === void 0 ? void 0 : options.timeout,
+        responseType: options === null || options === void 0 ? void 0 : options.responseType,
     };
     if (method === 'GET') {
         requestConfig.params = input;
@@ -72,16 +75,17 @@ async function callRemoteApi(input, config, options = {}) {
     return (0, api_1.catchAndRethrowUpstreamError)(axios_1.default.request(requestConfig));
 }
 async function chatCompletionsV2(input, options = {}) {
-    const response = await callRemoteApi(input, {
+    const params = {
         endpoint: 'api/v2/chat/completions',
         isStreamEndpoint: true,
-    }, options);
+    };
+    const response = await callRemoteApi(input, params, { ...options, responseType: 'stream' });
     if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream')
         return response;
     return new web_1.ReadableStream({
         async start(controller) {
             try {
-                const stream = (0, event_stream_1.readableToWeb)(response.data)
+                const stream = (0, event_stream_1.readableToWeb)((await response).data)
                     .pipeThrough(new web_1.TextDecoderStream())
                     .pipeThrough(new event_stream_1.EventSourceParserStream());
                 for await (const chunk of stream) {
@@ -110,26 +114,19 @@ async function chatCompletionsV2(input, options = {}) {
     });
 }
 async function imageGenerationsV2(input, options = {}) {
-    const response = await callRemoteApi(input, {
-        endpoint: 'api/v2/image/generations',
-    }, options);
+    const response = await callRemoteApi(input, { endpoint: 'api/v2/image/generations' }, options);
     if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream')
         return response;
     return response.data;
 }
 async function embeddingsV2(input, options = {}) {
-    const response = await callRemoteApi(input, {
-        endpoint: 'api/v2/embeddings',
-    }, options);
+    const response = await callRemoteApi(input, { endpoint: 'api/v2/embeddings' }, options);
     if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream') {
         return response;
     }
     return response.data;
 }
 async function getUserCreditInfo() {
-    const response = await callRemoteApi({}, {
-        endpoint: 'api/user/info',
-        method: 'GET',
-    });
+    const response = await callRemoteApi({}, { endpoint: 'api/user/info', method: 'GET' });
     return response.data;
 }

package/lib/cjs/api/error.js

@@ -1,16 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatusCodeError = exports.CreditError = exports.SubscriptionError = exports.CreditErrorType = exports.SubscriptionErrorType = void 0;
+exports.StatusCodeError = exports.CreditError = exports.CreditErrorType = exports.ConfigError = exports.ConfigErrorType = exports.SubscriptionError = exports.SubscriptionErrorType = void 0;
+// Subscription 为v1版本订阅错误, 新版本将废弃，保留是为了兼容
 var SubscriptionErrorType;
 (function (SubscriptionErrorType) {
     SubscriptionErrorType["UNSUBSCRIBED"] = "UNSUBSCRIBED";
     SubscriptionErrorType["UNKNOWN"] = "UNKNOWN";
 })(SubscriptionErrorType || (exports.SubscriptionErrorType = SubscriptionErrorType = {}));
-var CreditErrorType;
-(function (CreditErrorType) {
-    CreditErrorType["NOT_ENOUGH"] = "NOT_ENOUGH";
-    CreditErrorType["UNKNOWN"] = "UNKNOWN";
-})(CreditErrorType || (exports.CreditErrorType = CreditErrorType = {}));
 const SubscriptionErrors = {
     [SubscriptionErrorType.UNSUBSCRIBED]: 'Hello, in order to continue chatting, please first subscribe to AI-KIT service',
     [SubscriptionErrorType.UNKNOWN]: 'An unknown error occurred',
@@ -24,6 +20,36 @@ class SubscriptionError extends Error {
     }
 }
 exports.SubscriptionError = SubscriptionError;
+// ConfigError 为v2版本配置错误, 用于v1版本订阅错误
+var ConfigErrorType;
+(function (ConfigErrorType) {
+    ConfigErrorType["UNKNOWN"] = "UNKNOWN";
+    ConfigErrorType["MISSING_API_KEY"] = "MISSING_API_KEY";
+    ConfigErrorType["MISSING_DASHBOARD_CONFIG"] = "MISSING_DASHBOARD_CONFIG";
+})(ConfigErrorType || (exports.ConfigErrorType = ConfigErrorType = {}));
+const ConfigErrors = {
+    [ConfigErrorType.UNKNOWN]: 'An unknown error occurred',
+    [ConfigErrorType.MISSING_API_KEY]: 'Hello, in order to continue chatting, please first configure the API key in the dashboard.',
+    [ConfigErrorType.MISSING_DASHBOARD_CONFIG]: 'Unable to connect to AIGNE Hub: missing baseUrl or accessKey.\n If you are an administrator, please configure them in the dashboard.\n If you are not an administrator, please contact your system admin for assistance.',
+};
+class ConfigError extends Error {
+    constructor(type, link) {
+        let message = ConfigErrors[type] || ConfigErrors[ConfigErrorType.UNKNOWN];
+        if (link) {
+            message += `\n${link}`;
+        }
+        super(message);
+        this.timestamp = new Date().toISOString();
+        this.type = type;
+        this.link = link;
+    }
+}
+exports.ConfigError = ConfigError;
+var CreditErrorType;
+(function (CreditErrorType) {
+    CreditErrorType["NOT_ENOUGH"] = "NOT_ENOUGH";
+    CreditErrorType["UNKNOWN"] = "UNKNOWN";
+})(CreditErrorType || (exports.CreditErrorType = CreditErrorType = {}));
 const CreditErrors = {
     [CreditErrorType.NOT_ENOUGH]: 'Hello, in order to continue chatting, please first buy some credits in the link below.',
     [CreditErrorType.UNKNOWN]: 'An unknown error occurred',

package/lib/esm/api/call/v2.js

@@ -1,6 +1,7 @@
 import { ReadableStream, TextDecoderStream } from 'stream/web';
 import axios from 'axios';
 import { joinURL } from 'ufo';
+import { ConfigError, ConfigErrorType } from '../error';
 import { isChatCompletionError, } from '../types';
 import { EventSourceParserStream, readableToWeb } from '../utils/event-stream';
 import { getRemoteBaseUrl } from '../utils/util';
@@ -13,11 +14,12 @@ function isCacheExpired(cacheItem) {
     return Date.now() - cacheItem.timestamp > CACHE_TTL;
 }
 function getConfig() {
+    var _a;
     const baseUrl = process.env.BLOCKLET_AIGNE_API_URL;
     const credentials = JSON.parse(process.env.BLOCKLET_AIGNE_API_CREDENTIAL || '{}');
     const accessKey = credentials === null || credentials === void 0 ? void 0 : credentials.apiKey;
     if (!baseUrl || !accessKey) {
-        throw new Error('Please connect to AIGNE Hub First, baseUrl or accessKey not found');
+        throw new ConfigError(ConfigErrorType.MISSING_DASHBOARD_CONFIG, joinURL(new URL(((_a = process.env) === null || _a === void 0 ? void 0 : _a.BLOCKLET_APP_URL) || '').origin, '.well-known/service/admin/aigne'));
     }
     return { baseUrl, accessKey };
 }
@@ -52,6 +54,7 @@ export async function callRemoteApi(input, config, options = {}) {
         url: joinURL(url, config.endpoint),
         headers,
         timeout: options === null || options === void 0 ? void 0 : options.timeout,
+        responseType: options === null || options === void 0 ? void 0 : options.responseType,
     };
     if (method === 'GET') {
         requestConfig.params = input;
@@ -62,16 +65,17 @@ export async function callRemoteApi(input, config, options = {}) {
     return catchAndRethrowUpstreamError(axios.request(requestConfig));
 }
 export async function chatCompletionsV2(input, options = {}) {
-    const response = await callRemoteApi(input, {
+    const params = {
         endpoint: 'api/v2/chat/completions',
         isStreamEndpoint: true,
-    }, options);
+    };
+    const response = await callRemoteApi(input, params, { ...options, responseType: 'stream' });
     if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream')
         return response;
     return new ReadableStream({
         async start(controller) {
             try {
-                const stream = readableToWeb(response.data)
+                const stream = readableToWeb((await response).data)
                     .pipeThrough(new TextDecoderStream())
                     .pipeThrough(new EventSourceParserStream());
                 for await (const chunk of stream) {
@@ -100,26 +104,19 @@ export async function chatCompletionsV2(input, options = {}) {
     });
 }
 export async function imageGenerationsV2(input, options = {}) {
-    const response = await callRemoteApi(input, {
-        endpoint: 'api/v2/image/generations',
-    }, options);
+    const response = await callRemoteApi(input, { endpoint: 'api/v2/image/generations' }, options);
     if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream')
         return response;
     return response.data;
 }
 export async function embeddingsV2(input, options = {}) {
-    const response = await callRemoteApi(input, {
-        endpoint: 'api/v2/embeddings',
-    }, options);
+    const response = await callRemoteApi(input, { endpoint: 'api/v2/embeddings' }, options);
     if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream') {
         return response;
     }
     return response.data;
 }
 export async function getUserCreditInfo() {
-    const response = await callRemoteApi({}, {
-        endpoint: 'api/user/info',
-        method: 'GET',
-    });
+    const response = await callRemoteApi({}, { endpoint: 'api/user/info', method: 'GET' });
     return response.data;
 }

package/lib/esm/api/error.js

@@ -1,13 +1,9 @@
+// Subscription 为v1版本订阅错误, 新版本将废弃，保留是为了兼容
 export var SubscriptionErrorType;
 (function (SubscriptionErrorType) {
     SubscriptionErrorType["UNSUBSCRIBED"] = "UNSUBSCRIBED";
     SubscriptionErrorType["UNKNOWN"] = "UNKNOWN";
 })(SubscriptionErrorType || (SubscriptionErrorType = {}));
-export var CreditErrorType;
-(function (CreditErrorType) {
-    CreditErrorType["NOT_ENOUGH"] = "NOT_ENOUGH";
-    CreditErrorType["UNKNOWN"] = "UNKNOWN";
-})(CreditErrorType || (CreditErrorType = {}));
 const SubscriptionErrors = {
     [SubscriptionErrorType.UNSUBSCRIBED]: 'Hello, in order to continue chatting, please first subscribe to AI-KIT service',
     [SubscriptionErrorType.UNKNOWN]: 'An unknown error occurred',
@@ -20,6 +16,35 @@ export class SubscriptionError extends Error {
         this.type = type;
     }
 }
+// ConfigError 为v2版本配置错误, 用于v1版本订阅错误
+export var ConfigErrorType;
+(function (ConfigErrorType) {
+    ConfigErrorType["UNKNOWN"] = "UNKNOWN";
+    ConfigErrorType["MISSING_API_KEY"] = "MISSING_API_KEY";
+    ConfigErrorType["MISSING_DASHBOARD_CONFIG"] = "MISSING_DASHBOARD_CONFIG";
+})(ConfigErrorType || (ConfigErrorType = {}));
+const ConfigErrors = {
+    [ConfigErrorType.UNKNOWN]: 'An unknown error occurred',
+    [ConfigErrorType.MISSING_API_KEY]: 'Hello, in order to continue chatting, please first configure the API key in the dashboard.',
+    [ConfigErrorType.MISSING_DASHBOARD_CONFIG]: 'Unable to connect to AIGNE Hub: missing baseUrl or accessKey.\n If you are an administrator, please configure them in the dashboard.\n If you are not an administrator, please contact your system admin for assistance.',
+};
+export class ConfigError extends Error {
+    constructor(type, link) {
+        let message = ConfigErrors[type] || ConfigErrors[ConfigErrorType.UNKNOWN];
+        if (link) {
+            message += `\n${link}`;
+        }
+        super(message);
+        this.timestamp = new Date().toISOString();
+        this.type = type;
+        this.link = link;
+    }
+}
+export var CreditErrorType;
+(function (CreditErrorType) {
+    CreditErrorType["NOT_ENOUGH"] = "NOT_ENOUGH";
+    CreditErrorType["UNKNOWN"] = "UNKNOWN";
+})(CreditErrorType || (CreditErrorType = {}));
 const CreditErrors = {
     [CreditErrorType.NOT_ENOUGH]: 'Hello, in order to continue chatting, please first buy some credits in the link below.',
     [CreditErrorType.UNKNOWN]: 'An unknown error occurred',

package/lib/types/api/error.d.ts

@@ -2,15 +2,26 @@ export declare enum SubscriptionErrorType {
     UNSUBSCRIBED = "UNSUBSCRIBED",
     UNKNOWN = "UNKNOWN"
 }
-export declare enum CreditErrorType {
-    NOT_ENOUGH = "NOT_ENOUGH",
-    UNKNOWN = "UNKNOWN"
-}
 export declare class SubscriptionError extends Error {
     timestamp: string;
     type: SubscriptionErrorType;
     constructor(type: SubscriptionErrorType);
 }
+export declare enum ConfigErrorType {
+    UNKNOWN = "UNKNOWN",
+    MISSING_API_KEY = "MISSING_API_KEY",
+    MISSING_DASHBOARD_CONFIG = "MISSING_DASHBOARD_CONFIG"
+}
+export declare class ConfigError extends Error {
+    timestamp: string;
+    type: ConfigErrorType;
+    link?: string;
+    constructor(type: ConfigErrorType, link?: string);
+}
+export declare enum CreditErrorType {
+    NOT_ENOUGH = "NOT_ENOUGH",
+    UNKNOWN = "UNKNOWN"
+}
 export declare class CreditError extends Error {
     timestamp: string;
     type: CreditErrorType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/aigne-hub",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "description": "The react.js component library for AIGNE Hub",
   "publishConfig": {
     "access": "public"