@blocklet/aigne-hub 0.2.12 → 0.2.14

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

@@ -8,7 +8,8 @@ const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const component_1 = require("@blocklet/sdk/lib/component");
 const verify_sign_1 = require("@blocklet/sdk/lib/util/verify-sign");
-const lodash_1 = require("lodash");
+const isNil_1 = __importDefault(require("lodash/isNil"));
+const pick_1 = __importDefault(require("lodash/pick"));
 const ufo_1 = require("ufo");
 const constants_1 = require("../constants");
 const auth_1 = require("../utils/auth");
@@ -20,7 +21,7 @@ function proxyToAIKit(path, { useAIKitService, proxyReqHeaders = ['accept', 'con
         const userDid = ((_a = req.user) === null || _a === void 0 ? void 0 : _a.did) || (req === null || req === void 0 ? void 0 : req.get('x-app-user-did'));
         const proxyReq = (url.protocol === 'https:' ? https_1.default : http_1.default).request((0, ufo_1.stringifyParsedURL)(url), {
             headers: {
-                ...(0, lodash_1.pick)(req.headers, ...proxyReqHeaders),
+                ...(0, pick_1.default)(req.headers, ...proxyReqHeaders),
                 ...(useAIKitService
                     ? (0, auth_1.getRemoteComponentCallHeaders)(req.body || {}, userDid)
                     : (() => {
@@ -43,8 +44,8 @@ function proxyToAIKit(path, { useAIKitService, proxyReqHeaders = ['accept', 'con
             if (proxyRes.statusCode)
                 res.status(proxyRes.statusCode);
             res.setHeader('X-Accel-Buffering', 'no');
-            for (const [k, v] of Object.entries((0, lodash_1.pick)(proxyRes.headers, ...proxyResHeaders))) {
-                if (!(0, lodash_1.isNil)(v))
+            for (const [k, v] of Object.entries((0, pick_1.default)(proxyRes.headers, ...proxyResHeaders))) {
+                if (!(0, isNil_1.default)(v))
                     res.setHeader(k, v);
             }
             proxyRes.pipe(res);

package/lib/cjs/api/error.js

@@ -29,14 +29,16 @@ const CreditErrors = {
     [CreditErrorType.UNKNOWN]: 'An unknown error occurred',
 };
 class CreditError extends Error {
-    constructor(type, link) {
+    constructor(statusCode, type, link) {
         let message = CreditErrors[type] || CreditErrors[CreditErrorType.UNKNOWN];
         if (type === CreditErrorType.NOT_ENOUGH && link) {
-            message += `\n\n${link}`;
+            message += `\n${link}`;
         }
         super(message);
         this.timestamp = new Date().toISOString();
         this.type = type;
+        this.statusCode = statusCode || 500;
+        this.link = link;
     }
 }
 exports.CreditError = CreditError;

package/lib/cjs/components/conversation/conversation.js

@@ -8,8 +8,8 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const material_1 = require("@mui/material");
 const isNil_1 = __importDefault(require("lodash/isNil"));
 const react_1 = require("react");
+const alert_1 = __importDefault(require("../credit/alert"));
 const image_preview_1 = __importDefault(require("../image-preview"));
-const alert_1 = __importDefault(require("../subscribe/alert"));
 const message_1 = __importDefault(require("./message"));
 const prompt_1 = __importDefault(require("./prompt"));
 function Conversation({ ref, messages, onSubmit, customActions = () => [], renderAvatar = undefined, maxWidth = 1000, scrollContainer = undefined, promptProps = {}, ...props }) {
@@ -32,7 +32,9 @@ function Conversation({ ref, messages, onSubmit, customActions = () => [], rende
                                                         src: url,
                                                         onLoad: () => scrollToBottom(),
                                                     };
-                                                }) })), msg.error ? ((0, jsx_runtime_1.jsx)(alert_1.default, { error: msg.error })) : (msg.loading &&
+                                                }) })), msg.error ? (
+                                            // @ts-ignore
+                                            (0, jsx_runtime_1.jsx)(alert_1.default, { error: msg.error })) : (msg.loading &&
                                                 !msg.response && ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
                                                     minHeight: 24,
                                                     display: 'flex',

package/lib/cjs/components/conversation/use-conversation.js

@@ -79,7 +79,7 @@ function useConversation({ scrollToBottom, textCompletions, imageGenerations, })
                 if (item)
                     item.error = error;
             }));
-            throw error;
+            return null;
         }
         finally {
             setMessages((v) => (0, immer_1.produce)(v, (draft) => {

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

@@ -2,7 +2,8 @@ import http from 'http';
 import https from 'https';
 import { getComponentWebEndpoint } from '@blocklet/sdk/lib/component';
 import { getSignData } from '@blocklet/sdk/lib/util/verify-sign';
-import { isNil, pick } from 'lodash';
+import isNil from 'lodash/isNil';
+import pick from 'lodash/pick';
 import { joinURL, parseURL, stringifyParsedURL, withQuery } from 'ufo';
 import { AI_KIT_BASE_URL } from '../constants';
 import { getRemoteComponentCallHeaders } from '../utils/auth';

package/lib/esm/api/error.js

@@ -25,14 +25,16 @@ const CreditErrors = {
     [CreditErrorType.UNKNOWN]: 'An unknown error occurred',
 };
 export class CreditError extends Error {
-    constructor(type, link) {
+    constructor(statusCode, type, link) {
         let message = CreditErrors[type] || CreditErrors[CreditErrorType.UNKNOWN];
         if (type === CreditErrorType.NOT_ENOUGH && link) {
-            message += `\n\n${link}`;
+            message += `\n${link}`;
         }
         super(message);
         this.timestamp = new Date().toISOString();
         this.type = type;
+        this.statusCode = statusCode || 500;
+        this.link = link;
     }
 }
 export class StatusCodeError extends Error {

package/lib/esm/components/conversation/conversation.js

@@ -2,8 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Avatar, Box, CircularProgress } from '@mui/material';
 import isNil from 'lodash/isNil';
 import { useCallback, useEffect, useImperativeHandle, useRef } from 'react';
+import CreditErrorAlert from '../credit/alert';
 import ImagePreview from '../image-preview';
-import SubscribeErrorAlert from '../subscribe/alert';
 import Message from './message';
 import Prompt from './prompt';
 export default function Conversation({ ref, messages, onSubmit, customActions = () => [], renderAvatar = undefined, maxWidth = 1000, scrollContainer = undefined, promptProps = {}, ...props }) {
@@ -26,7 +26,9 @@ export default function Conversation({ ref, messages, onSubmit, customActions =
                                                         src: url,
                                                         onLoad: () => scrollToBottom(),
                                                     };
-                                                }) })), msg.error ? (_jsx(SubscribeErrorAlert, { error: msg.error })) : (msg.loading &&
+                                                }) })), msg.error ? (
+                                            // @ts-ignore
+                                            _jsx(CreditErrorAlert, { error: msg.error })) : (msg.loading &&
                                                 !msg.response && (_jsx(Box, { sx: {
                                                     minHeight: 24,
                                                     display: 'flex',

package/lib/esm/components/conversation/use-conversation.js

@@ -76,7 +76,7 @@ export default function useConversation({ scrollToBottom, textCompletions, image
                 if (item)
                     item.error = error;
             }));
-            throw error;
+            return null;
         }
         finally {
             setMessages((v) => produce(v, (draft) => {

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

@@ -14,7 +14,9 @@ export declare class SubscriptionError extends Error {
 export declare class CreditError extends Error {
     timestamp: string;
     type: CreditErrorType;
-    constructor(type: CreditErrorType, link?: string);
+    statusCode: number;
+    link?: string;
+    constructor(statusCode: number, type: CreditErrorType, link?: string);
 }
 export declare class StatusCodeError extends Error {
     statusCode: number;

package/lib/types/components/conversation/use-conversation.d.ts

@@ -38,7 +38,7 @@ export default function useConversation({ scrollToBottom, textCompletions, image
             url: string;
         }[];
         data?: undefined;
-    }>;
+    } | null>;
     cancel: ({ id }: Pick<MessageItem, "id">) => void;
     setMessages: import("react").Dispatch<import("react").SetStateAction<MessageItem[]>>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/aigne-hub",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "The react.js component library for AIGNE Hub",
   "publishConfig": {
     "access": "public"
@@ -84,9 +84,9 @@
   },
   "dependencies": {
     "@arcblock/did": "^1.21.0",
-    "@arcblock/ux": "^3.0.27",
+    "@arcblock/ux": "^3.0.33",
     "@blocklet/logger": "^1.16.46",
-    "@blocklet/payment-js": "^1.19.5",
+    "@blocklet/payment-js": "^1.19.6",
     "@blocklet/sdk": "^1.16.46",
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.14.0",