@blocklet/aigne-hub 0.2.16 → 0.2.18

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

@@ -3,35 +3,81 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.callRemoteApi = callRemoteApi;
 exports.chatCompletionsV2 = chatCompletionsV2;
 exports.imageGenerationsV2 = imageGenerationsV2;
 exports.embeddingsV2 = embeddingsV2;
+exports.getUserCreditInfo = getUserCreditInfo;
 const web_1 = require("stream/web");
-const component_1 = require("@blocklet/sdk/lib/component");
-const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
+const axios_1 = __importDefault(require("axios"));
+const ufo_1 = require("ufo");
 const types_1 = require("../types");
-const auth_1 = require("../utils/auth");
 const event_stream_1 = require("../utils/event-stream");
+const util_1 = require("../utils/util");
 const api_1 = require("./api");
-async function chatCompletionsV2(input, { useAIKitService, ...options } = {}) {
-    const response = (0, api_1.catchAndRethrowUpstreamError)(useAIKitService
-        ? (0, api_1.aiKitApi)('/api/v2/chat/completions', {
-            responseType: 'stream',
-            method: 'POST',
-            data: (0, json_stable_stringify_1.default)(input),
-            headers: {
-                ...(0, auth_1.getRemoteComponentCallHeaders)(input, options.userDid),
-                Accept: 'text/event-stream',
-                'Content-Type': 'application/json',
-            },
-        })
-        : (0, component_1.call)({
-            name: 'ai-kit',
-            path: 'api/v2/chat/completions',
-            data: input,
-            responseType: 'stream',
-            headers: { Accept: 'text/event-stream' },
-        }));
+let cachedUrl = null;
+const CACHE_TTL = 30 * 60 * 1000; // 30分钟
+function isCacheExpired(cacheItem) {
+    if (!cacheItem)
+        return true;
+    return Date.now() - cacheItem.timestamp > CACHE_TTL;
+}
+function getConfig() {
+    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');
+    }
+    return { baseUrl, accessKey };
+}
+async function getCachedUrl(url) {
+    if (url !== (cachedUrl === null || cachedUrl === void 0 ? void 0 : cachedUrl.data)) {
+        cachedUrl = null;
+    }
+    if (isCacheExpired(cachedUrl)) {
+        const { baseUrl } = getConfig();
+        const url = await (0, util_1.getRemoteBaseUrl)(baseUrl);
+        cachedUrl = {
+            data: url,
+            timestamp: Date.now(),
+        };
+    }
+    return cachedUrl.data;
+}
+async function callRemoteApi(input, config, options = {}) {
+    const { accessKey, baseUrl } = getConfig();
+    const url = await getCachedUrl(baseUrl);
+    const headers = {
+        Authorization: `Bearer ${accessKey}`,
+        ...config.additionalHeaders,
+    };
+    if (config.isStreamEndpoint) {
+        headers.Accept = 'text/event-stream';
+        headers['Content-Type'] = 'application/json';
+    }
+    const method = config.method || 'POST';
+    const requestConfig = {
+        method,
+        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;
+    }
+    else {
+        requestConfig.data = input;
+    }
+    return (0, api_1.catchAndRethrowUpstreamError)(axios_1.default.request(requestConfig));
+}
+async function chatCompletionsV2(input, options = {}) {
+    const params = {
+        endpoint: 'api/v2/chat/completions',
+        isStreamEndpoint: true,
+    };
+    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({
@@ -65,37 +111,20 @@ async function chatCompletionsV2(input, { useAIKitService, ...options } = {}) {
         },
     });
 }
-async function imageGenerationsV2(input, { useAIKitService, ...options } = {}) {
-    const response = await (0, api_1.catchAndRethrowUpstreamError)(useAIKitService
-        ? api_1.aiKitApi.post('/api/v2/image/generations', input, {
-            responseType: options.responseType,
-            headers: { ...(0, auth_1.getRemoteComponentCallHeaders)(input, options.userDid) },
-        })
-        : // @ts-ignore
-            (0, component_1.call)({
-                name: 'ai-kit',
-                path: '/api/v2/image/generations',
-                data: input,
-                responseType: options === null || options === void 0 ? void 0 : options.responseType,
-                timeout: options === null || options === void 0 ? void 0 : options.timeout,
-            }));
+async function imageGenerationsV2(input, 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, { useAIKitService, ...options } = {}) {
-    const response = await (0, api_1.catchAndRethrowUpstreamError)(useAIKitService
-        ? api_1.aiKitApi.post('/api/v2/embeddings', input, {
-            responseType: options.responseType,
-            headers: { ...(0, auth_1.getRemoteComponentCallHeaders)(input, options.userDid) },
-        })
-        : (0, component_1.call)({
-            name: 'ai-kit',
-            path: '/api/v2/embeddings',
-            data: input,
-            responseType: options === null || options === void 0 ? void 0 : options.responseType,
-        }));
-    if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream')
+async function embeddingsV2(input, 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' });
     return response.data;
 }

package/lib/cjs/api/types/user.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/api/user.js

@@ -8,12 +8,13 @@ const error_1 = require("@blocklet/error");
 const axios_1 = __importDefault(require("axios"));
 const ufo_1 = require("ufo");
 const util_1 = require("./utils/util");
-async function getUserInfo({ baseUrl, accessKey, }) {
+async function getUserInfo({ baseUrl = '', accessKey = '', }) {
     let finalBaseUrl = (0, util_1.getPrefix)();
+    const windowExist = typeof window !== 'undefined';
     try {
         if (baseUrl) {
             const tmp = new URL(baseUrl);
-            if (tmp.origin !== window.location.origin) {
+            if (!windowExist || (windowExist && tmp.origin !== window.location.origin)) {
                 finalBaseUrl = await (0, util_1.getRemoteBaseUrl)(baseUrl);
             }
         }
@@ -22,6 +23,9 @@ async function getUserInfo({ baseUrl, accessKey, }) {
         console.warn('Failed to parse baseUrl:', err);
         throw new Error(`Failed to parse baseUrl: ${(0, error_1.formatError)(err)}`);
     }
+    if (!finalBaseUrl || !accessKey) {
+        throw new Error('baseUrl or accessKey is not set');
+    }
     return axios_1.default
         .get((0, ufo_1.joinURL)(finalBaseUrl, '/api/user/info'), {
         headers: {

package/lib/cjs/api/utils/util.js

@@ -9,7 +9,7 @@ const ufo_1 = require("ufo");
 const AIGNE_HUB_DID = 'z8ia3xzq2tMq8CRHfaXj1BTYJyYnEcHbqP8cJ';
 const getRemoteBaseUrl = async (url) => {
     const tmp = new URL(url);
-    if (tmp.origin === window.location.origin) {
+    if (typeof window !== 'undefined' && tmp.origin === window.location.origin) {
         return (0, exports.getPrefix)();
     }
     const scriptUrl = (0, ufo_1.joinURL)(tmp.origin, '__blocklet__.js?type=json');
@@ -24,6 +24,9 @@ const getRemoteBaseUrl = async (url) => {
 exports.getRemoteBaseUrl = getRemoteBaseUrl;
 const getPrefix = () => {
     var _a, _b, _c, _d;
+    if (typeof window === 'undefined') {
+        return '';
+    }
     const prefix = ((_a = window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || '/';
     const baseUrl = (_b = window.location) === null || _b === void 0 ? void 0 : _b.origin; // required when use payment feature cross origin
     const componentId = (((_c = window.blocklet) === null || _c === void 0 ? void 0 : _c.componentId) || '').split('/').pop();

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

@@ -1,29 +1,73 @@
 import { ReadableStream, TextDecoderStream } from 'stream/web';
-import { call } from '@blocklet/sdk/lib/component';
-import stringify from 'json-stable-stringify';
+import axios from 'axios';
+import { joinURL } from 'ufo';
 import { isChatCompletionError, } from '../types';
-import { getRemoteComponentCallHeaders } from '../utils/auth';
 import { EventSourceParserStream, readableToWeb } from '../utils/event-stream';
-import { aiKitApi, catchAndRethrowUpstreamError } from './api';
-export async function chatCompletionsV2(input, { useAIKitService, ...options } = {}) {
-    const response = catchAndRethrowUpstreamError(useAIKitService
-        ? aiKitApi('/api/v2/chat/completions', {
-            responseType: 'stream',
-            method: 'POST',
-            data: stringify(input),
-            headers: {
-                ...getRemoteComponentCallHeaders(input, options.userDid),
-                Accept: 'text/event-stream',
-                'Content-Type': 'application/json',
-            },
-        })
-        : call({
-            name: 'ai-kit',
-            path: 'api/v2/chat/completions',
-            data: input,
-            responseType: 'stream',
-            headers: { Accept: 'text/event-stream' },
-        }));
+import { getRemoteBaseUrl } from '../utils/util';
+import { catchAndRethrowUpstreamError } from './api';
+let cachedUrl = null;
+const CACHE_TTL = 30 * 60 * 1000; // 30分钟
+function isCacheExpired(cacheItem) {
+    if (!cacheItem)
+        return true;
+    return Date.now() - cacheItem.timestamp > CACHE_TTL;
+}
+function getConfig() {
+    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');
+    }
+    return { baseUrl, accessKey };
+}
+async function getCachedUrl(url) {
+    if (url !== (cachedUrl === null || cachedUrl === void 0 ? void 0 : cachedUrl.data)) {
+        cachedUrl = null;
+    }
+    if (isCacheExpired(cachedUrl)) {
+        const { baseUrl } = getConfig();
+        const url = await getRemoteBaseUrl(baseUrl);
+        cachedUrl = {
+            data: url,
+            timestamp: Date.now(),
+        };
+    }
+    return cachedUrl.data;
+}
+export async function callRemoteApi(input, config, options = {}) {
+    const { accessKey, baseUrl } = getConfig();
+    const url = await getCachedUrl(baseUrl);
+    const headers = {
+        Authorization: `Bearer ${accessKey}`,
+        ...config.additionalHeaders,
+    };
+    if (config.isStreamEndpoint) {
+        headers.Accept = 'text/event-stream';
+        headers['Content-Type'] = 'application/json';
+    }
+    const method = config.method || 'POST';
+    const requestConfig = {
+        method,
+        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;
+    }
+    else {
+        requestConfig.data = input;
+    }
+    return catchAndRethrowUpstreamError(axios.request(requestConfig));
+}
+export async function chatCompletionsV2(input, options = {}) {
+    const params = {
+        endpoint: 'api/v2/chat/completions',
+        isStreamEndpoint: true,
+    };
+    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({
@@ -57,37 +101,20 @@ export async function chatCompletionsV2(input, { useAIKitService, ...options } =
         },
     });
 }
-export async function imageGenerationsV2(input, { useAIKitService, ...options } = {}) {
-    const response = await catchAndRethrowUpstreamError(useAIKitService
-        ? aiKitApi.post('/api/v2/image/generations', input, {
-            responseType: options.responseType,
-            headers: { ...getRemoteComponentCallHeaders(input, options.userDid) },
-        })
-        : // @ts-ignore
-            call({
-                name: 'ai-kit',
-                path: '/api/v2/image/generations',
-                data: input,
-                responseType: options === null || options === void 0 ? void 0 : options.responseType,
-                timeout: options === null || options === void 0 ? void 0 : options.timeout,
-            }));
+export async function imageGenerationsV2(input, 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, { useAIKitService, ...options } = {}) {
-    const response = await catchAndRethrowUpstreamError(useAIKitService
-        ? aiKitApi.post('/api/v2/embeddings', input, {
-            responseType: options.responseType,
-            headers: { ...getRemoteComponentCallHeaders(input, options.userDid) },
-        })
-        : call({
-            name: 'ai-kit',
-            path: '/api/v2/embeddings',
-            data: input,
-            responseType: options === null || options === void 0 ? void 0 : options.responseType,
-        }));
-    if ((options === null || options === void 0 ? void 0 : options.responseType) === 'stream')
+export async function embeddingsV2(input, 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' });
     return response.data;
 }

package/lib/esm/api/types/user.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/api/user.js

@@ -2,12 +2,13 @@ import { formatError } from '@blocklet/error';
 import axios from 'axios';
 import { joinURL } from 'ufo';
 import { getPrefix, getRemoteBaseUrl } from './utils/util';
-export async function getUserInfo({ baseUrl, accessKey, }) {
+export async function getUserInfo({ baseUrl = '', accessKey = '', }) {
     let finalBaseUrl = getPrefix();
+    const windowExist = typeof window !== 'undefined';
     try {
         if (baseUrl) {
             const tmp = new URL(baseUrl);
-            if (tmp.origin !== window.location.origin) {
+            if (!windowExist || (windowExist && tmp.origin !== window.location.origin)) {
                 finalBaseUrl = await getRemoteBaseUrl(baseUrl);
             }
         }
@@ -16,6 +17,9 @@ export async function getUserInfo({ baseUrl, accessKey, }) {
         console.warn('Failed to parse baseUrl:', err);
         throw new Error(`Failed to parse baseUrl: ${formatError(err)}`);
     }
+    if (!finalBaseUrl || !accessKey) {
+        throw new Error('baseUrl or accessKey is not set');
+    }
     return axios
         .get(joinURL(finalBaseUrl, '/api/user/info'), {
         headers: {

package/lib/esm/api/utils/util.js

@@ -3,7 +3,7 @@ import { joinURL } from 'ufo';
 const AIGNE_HUB_DID = 'z8ia3xzq2tMq8CRHfaXj1BTYJyYnEcHbqP8cJ';
 export const getRemoteBaseUrl = async (url) => {
     const tmp = new URL(url);
-    if (tmp.origin === window.location.origin) {
+    if (typeof window !== 'undefined' && tmp.origin === window.location.origin) {
         return getPrefix();
     }
     const scriptUrl = joinURL(tmp.origin, '__blocklet__.js?type=json');
@@ -17,6 +17,9 @@ export const getRemoteBaseUrl = async (url) => {
 };
 export const getPrefix = () => {
     var _a, _b, _c, _d;
+    if (typeof window === 'undefined') {
+        return '';
+    }
     const prefix = ((_a = window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || '/';
     const baseUrl = (_b = window.location) === null || _b === void 0 ? void 0 : _b.origin; // required when use payment feature cross origin
     const componentId = (((_c = window.blocklet) === null || _c === void 0 ? void 0 : _c.componentId) || '').split('/').pop();

package/lib/types/api/call/v2.d.ts

@@ -2,29 +2,41 @@ import type { IncomingMessage } from 'http';
 import { ReadableStream } from 'stream/web';
 import { AxiosResponse } from 'axios';
 import { ChatCompletionError, ChatCompletionInput, ChatCompletionResponse, EmbeddingInput, EmbeddingResponse, ImageGenerationInput, ImageGenerationResponse } from '../types';
+import { UserInfoResult } from '../types/user';
+interface RemoteApiOptions {
+    responseType?: 'stream';
+    timeout?: number;
+}
+interface RemoteApiConfig {
+    endpoint: string;
+    method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+    additionalHeaders?: Record<string, string>;
+    isStreamEndpoint?: boolean;
+}
+export declare function callRemoteApi<T = any>(input: any, config: RemoteApiConfig, options?: RemoteApiOptions): Promise<AxiosResponse<T, any>>;
 export declare function chatCompletionsV2(input: ChatCompletionInput, options?: {
-    useAIKitService?: boolean;
     responseType?: undefined;
+    timeout?: number;
 }): Promise<ReadableStream<Exclude<ChatCompletionResponse, ChatCompletionError>>>;
 export declare function chatCompletionsV2(input: ChatCompletionInput, options: {
-    useAIKitService?: boolean;
     responseType: 'stream';
+    timeout?: number;
 }): Promise<AxiosResponse<IncomingMessage, any>>;
 export declare function imageGenerationsV2(input: ImageGenerationInput, options?: {
-    useAIKitService?: boolean;
     responseType?: undefined;
     timeout?: number;
 }): Promise<ImageGenerationResponse>;
 export declare function imageGenerationsV2(input: ImageGenerationInput, options: {
-    useAIKitService?: boolean;
     responseType: 'stream';
     timeout?: number;
 }): Promise<AxiosResponse<IncomingMessage, any>>;
 export declare function embeddingsV2(input: EmbeddingInput, options?: {
-    useAIKitService?: boolean;
     responseType?: undefined;
+    timeout?: number;
 }): Promise<EmbeddingResponse>;
 export declare function embeddingsV2(input: EmbeddingInput, options: {
-    useAIKitService?: boolean;
     responseType: 'stream';
+    timeout?: number;
 }): Promise<AxiosResponse<IncomingMessage, any>>;
+export declare function getUserCreditInfo(): Promise<UserInfoResult>;
+export {};

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

@@ -0,0 +1,15 @@
+import type { User } from '@arcblock/ux/lib/type';
+import type { TPaymentCurrency } from '@blocklet/payment-js';
+export interface UserInfoResult {
+    user: User;
+    enableCredit: boolean;
+    creditBalance: {
+        balance: string;
+        total: string;
+        grantCount: number;
+        pendingCredit: string;
+    } | null;
+    paymentLink: string | null;
+    currency?: TPaymentCurrency;
+    profileLink: string;
+}

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

@@ -1,18 +1,4 @@
-import { User } from '@arcblock/ux/lib/type';
-import type { TPaymentCurrency } from '@blocklet/payment-js';
-export interface UserInfoResult {
-    user: User;
-    enableCredit: boolean;
-    creditBalance: {
-        balance: string;
-        total: string;
-        grantCount: number;
-        pendingCredit: string;
-    } | null;
-    paymentLink: string | null;
-    currency?: TPaymentCurrency;
-    profileLink: string;
-}
+import { UserInfoResult } from './types/user';
 export declare function getUserInfo({ baseUrl, accessKey, }: {
     baseUrl: string;
     accessKey: string;

package/lib/types/components/user-credit-card.d.ts

@@ -1,4 +1,4 @@
-import { UserInfoResult } from '../api/user';
+import { UserInfoResult } from '../api/types/user';
 interface UserCreditCardProps {
     baseUrl: string;
     accessKey: string;

package/package.json

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