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
refactor(core): add request time out error for ai (#11244)
akumatusac815142b313
diff --git a/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts b/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.tsindex cbc6eef265..cd6e0c32af 100644--- a/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts+++ b/packages/frontend/core/src/blocksuite/ai/actions/doc-handler.ts@@ -10,8 +10,8 @@ import {buildFinishConfig,buildGeneratingConfig,} from '../ai-panel';-import type { AIError, AIItemGroupConfig } from '../components/ai-item/types';-import { AIProvider } from '../provider';+import { type AIItemGroupConfig } from '../components/ai-item/types';+import { type AIError, AIProvider } from '../provider';import { reportResponse } from '../utils/action-reporter';import { getAIPanelWidget } from '../utils/ai-widgets';import { AIContext } from '../utils/context';diff --git a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.tsindex c8205782bf..6464b3ac69 100644--- a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts+++ b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts@@ -20,8 +20,7 @@ import type { TemplateResult } from 'lit';import { getContentFromSlice } from '../../utils';import { AIChatBlockModel } from '../blocks';-import type { AIError } from '../components/ai-item/types';-import { AIProvider } from '../provider';+import { type AIError, AIProvider } from '../provider';import { reportResponse } from '../utils/action-reporter';import { getAIPanelWidget } from '../utils/ai-widgets';import { AIContext } from '../utils/context';diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-context.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-context.tsindex 77a9d664c5..6739678517 100644--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-context.ts+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-context.ts@@ -1,6 +1,6 @@import type { Signal } from '@preact/signals-core';-import type { AIError } from '../components/ai-item/types';+import type { AIError } from '../provider';export type ChatMessage = {id: string;diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.tsindex 04502f26fd..3c06aa275d 100644--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-chips.ts@@ -43,6 +43,7 @@ export class ChatPanelChips extends SignalWatcher(.chips-wrapper {display: flex;flex-wrap: wrap;+ margin: 0 -4px 0 -4px;}.add-button,.collapse-button,diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.tsindex dbd2feb6a5..72885fa6a3 100644--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-input.ts@@ -14,8 +14,7 @@ import { property, query, state } from 'lit/decorators.js';import { repeat } from 'lit/directives/repeat.js';import { ChatAbortIcon, ChatSendIcon } from '../_common/icons';-import type { AIError } from '../components/ai-item/types';-import { AIProvider } from '../provider';+import { type AIError, AIProvider } from '../provider';import { reportResponse } from '../utils/action-reporter';import { readBlobAsURL } from '../utils/image';import type { AINetworkSearchConfig, DocDisplayConfig } from './chat-config';diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.tsindex e37a6f5e5b..7bb10db2f9 100644--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts@@ -14,8 +14,7 @@ import { repeat } from 'lit/directives/repeat.js';import { debounce } from 'lodash-es';import { AffineIcon } from '../_common/icons';-import { type AIError, UnauthorizedError } from '../components/ai-item/types';-import { AIProvider } from '../provider';+import { type AIError, AIProvider, UnauthorizedError } from '../provider';import {type ChatContextValue,type ChatMessage,diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.tsindex 7a51e8dd0a..7164ca4e8c 100644--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts@@ -12,8 +12,8 @@ import {EdgelessEditorActions,PageEditorActions,} from '../../_common/chat-actions-handle';-import { type AIError } from '../../components/ai-item/types';import { AIChatErrorRenderer } from '../../messages/error';+import { type AIError } from '../../provider';import { type ChatMessage, isChatMessage } from '../chat-context';export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.tsindex ba2cfe3a9c..39edd60d63 100644--- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts+++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts@@ -28,44 +28,3 @@ export interface AISubItemConfig {testId?: string;handler?: (host: EditorHost) => void;}--abstract class BaseAIError extends Error {- abstract readonly type: AIErrorType;-}--export enum AIErrorType {- GeneralNetworkError = 'GeneralNetworkError',- PaymentRequired = 'PaymentRequired',- Unauthorized = 'Unauthorized',-}--export class UnauthorizedError extends BaseAIError {- readonly type = AIErrorType.Unauthorized;-- constructor() {- super('Unauthorized');- }-}--// user has used up the quota-export class PaymentRequiredError extends BaseAIError {- readonly type = AIErrorType.PaymentRequired;-- constructor() {- super('Payment required');- }-}--// general 500x error-export class GeneralNetworkError extends BaseAIError {- readonly type = AIErrorType.GeneralNetworkError;-- constructor(message: string = 'Network error') {- super(message);- }-}--export type AIError =- | UnauthorizedError- | PaymentRequiredError- | GeneralNetworkError;diff --git a/packages/frontend/core/src/blocksuite/ai/messages/error.ts b/packages/frontend/core/src/blocksuite/ai/messages/error.tsindex 9a63fb1479..e155b94b95 100644--- a/packages/frontend/core/src/blocksuite/ai/messages/error.ts+++ b/packages/frontend/core/src/blocksuite/ai/messages/error.ts@@ -10,10 +10,10 @@ import { property } from 'lit/decorators.js';import {type AIError,+ AIProvider,PaymentRequiredError,UnauthorizedError,-} from '../components/ai-item/types';-import { AIProvider } from '../provider';+} from '../provider';export class AIErrorWrapper extends SignalWatcher(WithDisposable(LitElement)) {static override styles = css`diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.tsindex 15b92c7f6d..58922b8436 100644--- a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts+++ b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-input.ts@@ -14,8 +14,7 @@ import {PROMPT_NAME_AFFINE_AI,PROMPT_NAME_NETWORK_SEARCH,} from '../chat-panel/const';-import type { AIError } from '../components/ai-item/types';-import { AIProvider } from '../provider';+import { type AIError, AIProvider } from '../provider';import { reportResponse } from '../utils/action-reporter';import { readBlobAsURL } from '../utils/image';import { stopPropagation } from '../utils/selection-utils';diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.tsindex ecb86a2764..a55b01122b 100644--- a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts+++ b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts@@ -28,10 +28,9 @@ import {ChatMessagesSchema,} from '../blocks';import type { AINetworkSearchConfig } from '../chat-panel/chat-config';-import type { AIError } from '../components/ai-item/types';import type { TextRendererOptions } from '../components/text-renderer';import { AIChatErrorRenderer } from '../messages/error';-import { AIProvider } from '../provider';+import { type AIError, AIProvider } from '../provider';import { PeekViewStyles } from './styles';import type { ChatContext } from './types';import { calcChildBound } from './utils';diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/types.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/types.tsindex 8f6b5c17b4..5f06104175 100644--- a/packages/frontend/core/src/blocksuite/ai/peek-view/types.ts+++ b/packages/frontend/core/src/blocksuite/ai/peek-view/types.ts@@ -1,5 +1,5 @@import type { ChatMessage } from '../blocks';-import type { AIError } from '../components/ai-item/types';+import type { AIError } from '../provider';export type ChatStatus =| 'success'diff --git a/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts b/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.tsindex c52f10c5b1..9fecaaa00f 100644--- a/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts+++ b/packages/frontend/core/src/blocksuite/ai/provider/ai-provider.ts@@ -5,8 +5,9 @@ import { Subject } from 'rxjs';import type { ChatContextValue } from '../chat-panel/chat-context';import {PaymentRequiredError,+ RequestTimeoutError,UnauthorizedError,-} from '../components/ai-item/types';+} from './error';export interface AIUserInfo {id: string;@@ -36,6 +37,7 @@ export type ActionEventType =| 'aborted:login-required'| 'aborted:server-error'| 'aborted:stop'+ | 'aborted:timeout'| 'result:insert'| 'result:replace'| 'result:use-as-caption'@@ -199,7 +201,13 @@ export class AIProvider {options,event: 'error',});- if (err instanceof PaymentRequiredError) {+ if (err instanceof RequestTimeoutError) {+ slots.actions.next({+ action: id,+ options,+ event: 'aborted:timeout',+ });+ } else if (err instanceof PaymentRequiredError) {slots.actions.next({action: id,options,diff --git a/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts b/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.tsindex fef24e4177..5bbc602b31 100644--- a/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts+++ b/packages/frontend/core/src/blocksuite/ai/provider/copilot-client.ts@@ -1,8 +1,3 @@-import {- GeneralNetworkError,- PaymentRequiredError,- UnauthorizedError,-} from '@affine/core/blocksuite/ai/components/ai-item/types';import { showAILoginRequiredAtom } from '@affine/core/components/affine/auth/ai-login-required';import type { UserFriendlyError } from '@affine/error';import {@@ -31,6 +26,12 @@ import {} from '@affine/graphql';import { getCurrentStore } from '@toeverything/infra';+import {+ GeneralNetworkError,+ PaymentRequiredError,+ UnauthorizedError,+} from './error';+type OptionsField<T extends GraphQLQuery> =RequestOptions<T>['variables'] extends { options: infer U } ? U : never;diff --git a/packages/frontend/core/src/blocksuite/ai/provider/error.ts b/packages/frontend/core/src/blocksuite/ai/provider/error.tsnew file mode 100644index 0000000000..9c810d468d--- /dev/null+++ b/packages/frontend/core/src/blocksuite/ai/provider/error.ts@@ -0,0 +1,51 @@+abstract class BaseAIError extends Error {+ abstract readonly type: AIErrorType;+}++export enum AIErrorType {+ GeneralNetworkError = 'GeneralNetworkError',+ PaymentRequired = 'PaymentRequired',+ Unauthorized = 'Unauthorized',+ RequestTimeout = 'RequestTimeout',+}++export class UnauthorizedError extends BaseAIError {+ readonly type = AIErrorType.Unauthorized;++ constructor() {+ super('Unauthorized');+ }+}++// user has used up the quota+export class PaymentRequiredError extends BaseAIError {+ readonly type = AIErrorType.PaymentRequired;++ constructor() {+ super('Payment required');+ }+}++// general 500x error+export class GeneralNetworkError extends BaseAIError {+ readonly type = AIErrorType.GeneralNetworkError;++ constructor(message: string = 'Network error') {+ super(message);+ }+}++// request timeout+export class RequestTimeoutError extends BaseAIError {+ readonly type = AIErrorType.RequestTimeout;++ constructor(message: string = 'Request timeout') {+ super(message);+ }+}++export type AIError =+ | UnauthorizedError+ | PaymentRequiredError+ | GeneralNetworkError+ | RequestTimeoutError;diff --git a/packages/frontend/core/src/blocksuite/ai/provider/event-source.ts b/packages/frontend/core/src/blocksuite/ai/provider/event-source.tsindex 34dadcfafb..4fd55c565b 100644--- a/packages/frontend/core/src/blocksuite/ai/provider/event-source.ts+++ b/packages/frontend/core/src/blocksuite/ai/provider/event-source.ts@@ -1,4 +1,5 @@import { handleError } from './copilot-client';+import { RequestTimeoutError } from './error';export function delay(ms: number) {return new Promise(resolve => setTimeout(resolve, ms));@@ -85,7 +86,7 @@ export function toTextStream(messagePromise,delay(timeout).then(() => {if (!signal?.aborted) {- throw new Error('Timeout');+ throw new RequestTimeoutError();}}),])diff --git a/packages/frontend/core/src/blocksuite/ai/provider/index.ts b/packages/frontend/core/src/blocksuite/ai/provider/index.tsindex 2b882bd257..4dee66f374 100644--- a/packages/frontend/core/src/blocksuite/ai/provider/index.ts+++ b/packages/frontend/core/src/blocksuite/ai/provider/index.ts@@ -1,3 +1,4 @@export * from './ai-provider';export * from './copilot-client';+export * from './error';export * from './setup-provider';diff --git a/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts b/packages/frontend/core/src/blocksuite/ai/provider/tracker.tsindex 1afca86535..75eaef5ce5 100644--- a/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts+++ b/packages/frontend/core/src/blocksuite/ai/provider/tracker.ts@@ -39,6 +39,7 @@ type AIActionEventProperties = {| 'policy wall'| 'server error'| 'login required'+ | 'request timeout'| 'insert'| 'replace'| 'use as caption'@@ -193,6 +194,8 @@ function inferControl(return 'server error';} else if (event.event === 'aborted:login-required') {return 'login required';+ } else if (event.event === 'aborted:timeout') {+ return 'request timeout';} else if (event.options.control === 'chat-send') {return 'AI chat send button';} else if (event.options.control === 'block-action-bar') {diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.tsindex af2010cddb..55b745b556 100644--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts@@ -31,10 +31,9 @@ import { property, query } from 'lit/decorators.js';import { choose } from 'lit/directives/choose.js';import { literal, unsafeStatic } from 'lit/static-html.js';-import type { AIError } from '../../components/ai-item/types.js';+import { type AIError } from '../../provider';import type { AIPanelGenerating } from './components/index.js';import type { AffineAIPanelState, AffineAIPanelWidgetConfig } from './type.js';-export const AFFINE_AI_PANEL_WIDGET = 'affine-ai-panel-widget';export class AffineAIPanelWidget extends WidgetComponent {diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.tsindex 28b1a734b9..60a9dc0ded 100644--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/error.ts@@ -5,10 +5,8 @@ import { css, html, LitElement, nothing, unsafeCSS } from 'lit';import { property } from 'lit/decorators.js';import { choose } from 'lit/directives/choose.js';-import {- AIErrorType,- type AIItemGroupConfig,-} from '../../../../components/ai-item/types.js';+import { type AIItemGroupConfig } from '../../../../components/ai-item/types.js';+import { AIErrorType } from '../../../../provider';import type { AIPanelErrorConfig, CopyConfig } from '../../type.js';import { filterAIItemGroup } from '../../utils.js';diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/type.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/type.tsindex 0076a663c1..0dc21c3d87 100644--- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/type.ts+++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/type.ts@@ -1,10 +1,8 @@import type { Signal } from '@preact/signals-core';import type { nothing, TemplateResult } from 'lit';-import type {- AIError,- AIItemGroupConfig,-} from '../../components/ai-item/types';+import type { AIItemGroupConfig } from '../../components/ai-item/types';+import type { AIError } from '../../provider';export interface CopyConfig {allowed: boolean;