There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat: handle copilot error (#7760)
darkskygit744cc542dea0
diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/error.tsindex 8c85571a5f..9b4c8c3614 100644--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/error.ts@@ -106,12 +106,23 @@ export const PaymentRequiredErrorRenderer = (host: EditorHost) => html`>`;-export const GeneralErrorRenderer = (- text: TemplateResult<1> = html`An error occurred, If this issue persists- please let us know.- <a href="mailto:[email protected]"> [email protected] </a>`,- template: TemplateResult<1> = html`${nothing}`-) => html` <ai-error-wrapper .text=${text}>${template}</ai-error-wrapper>`;+type ErrorProps = {+ text?: TemplateResult<1>;+ template?: TemplateResult<1>;+ error?: TemplateResult<1>;+};++const generateText = (error?: TemplateResult<1>) =>+ html`${error || 'An error occurred'}, If this issue persists please let us+ know.<a href="mailto:[email protected]">+ </a>`;++const nope = html`${nothing}`;+const GeneralErrorRenderer = (props: ErrorProps = {}) => {+ const { text = generateText(props.error), template = nope } = props;+ return html`<ai-error-wrapper .text=${text}>${template}</ai-error-wrapper>`;+};declare global {interface HTMLElementTagNameMap {@@ -123,9 +134,9 @@ export function AIChatErrorRenderer(host: EditorHost, error: AIError) {if (error instanceof PaymentRequiredError) {return PaymentRequiredErrorRenderer(host);} else if (error instanceof UnauthorizedError) {- return GeneralErrorRenderer(- html`You need to login to AFFiNE Cloud to continue using AFFiNE AI.`,- html`<div+ return GeneralErrorRenderer({+ text: html`You need to login to AFFiNE Cloud to continue using AFFiNE AI.`,+ template: html`<divstyle=${styleMap({padding: '4px 12px',borderRadius: '8px',@@ -136,9 +147,31 @@ export function AIChatErrorRenderer(host: EditorHost, error: AIError) {@click=${() => AIProvider.slots.requestLogin.emit({ host })}>Login- </div>`- );+ </div>`,+ });} else {- return GeneralErrorRenderer();+ const tip = error.message;+ return GeneralErrorRenderer({+ error: html`<style>+ .tip {+ position: relative;+ cursor: pointer;+ }++ .tip:hover::after {+ content: attr(data-tip);+ position: absolute;+ left: 0;+ top: 20px;+ background-color: black;+ color: white;+ padding: 5px 10px;+ border-radius: 5px;+ z-index: 1000;+ white-space: pre;+ }+ </style>+ <a class="tip" href="#" data-tip="${tip}">An error occurred</a>`,+ });}}diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.tsindex 46230857c7..1a30678b85 100644--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/ai/copilot-client.ts@@ -25,14 +25,18 @@ import { getCurrentStore } from '@toeverything/infra';type OptionsField<T extends GraphQLQuery> =RequestOptions<T>['variables'] extends { options: infer U } ? U : never;-function codeToError(code: number) {- switch (code) {+function codeToError(error: UserFriendlyError) {+ switch (error.status) {case 401:return new UnauthorizedError();case 402:return new PaymentRequiredError();default:- return new GeneralNetworkError();+ return new GeneralNetworkError(+ error.code+ ? `${error.code}: ${error.message}\nIdentify: ${error.name}`+ : undefined+ );}}@@ -42,7 +46,7 @@ export function resolveError(err: any) {? new UserFriendlyError(err.extensions): UserFriendlyError.fromAnyError(err);- return codeToError(standardError.status);+ return codeToError(standardError);}export function handleError(src: any) {