Compare commits

..

1 Commits

Author SHA1 Message Date
fengmk2
b1d7011047 chore(server): use jemalloc to reduce RSS 2025-07-10 11:22:37 +08:00
171 changed files with 1105 additions and 3591 deletions

View File

@@ -4,15 +4,9 @@ inputs:
app-version:
description: 'App Version'
required: true
ios-app-version:
description: 'iOS App Store Version (Optional, use App version if empty)'
required: false
type: string
runs:
using: 'composite'
steps:
- name: 'Write Version'
shell: bash
env:
IOS_APP_VERSION: ${{ inputs.ios-app-version }}
run: ./scripts/set-version.sh ${{ inputs.app-version }}

View File

@@ -12,9 +12,6 @@ on:
build-type:
type: string
required: true
ios-app-version:
type: string
required: false
env:
BUILD_TYPE: ${{ inputs.build-type }}
@@ -81,7 +78,7 @@ jobs:
path: packages/frontend/apps/android/dist
ios:
runs-on: 'macos-15'
runs-on: ${{ github.ref_name == 'canary' && 'macos-latest' || 'blaze/macos-14' }}
needs:
- build-ios-web
steps:
@@ -90,7 +87,6 @@ jobs:
uses: ./.github/actions/setup-version
with:
app-version: ${{ inputs.app-version }}
ios-app-version: ${{ inputs.ios-app-version }}
- name: 'Update Code Sign Identity'
shell: bash
run: ./packages/frontend/apps/ios/update_code_sign_identity.sh
@@ -110,7 +106,7 @@ jobs:
enableScripts: false
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: 16.4
xcode-version: 16.2
- name: Install Swiftformat
run: brew install swiftformat
- name: Cap sync

View File

@@ -21,10 +21,6 @@ on:
required: true
type: boolean
default: false
ios-app-version:
description: 'iOS App Store Version (Optional, use tag version if empty)'
required: false
type: string
permissions:
contents: write
@@ -121,4 +117,3 @@ jobs:
build-type: ${{ needs.prepare.outputs.BUILD_TYPE }}
app-version: ${{ needs.prepare.outputs.APP_VERSION }}
git-short-hash: ${{ needs.prepare.outputs.GIT_SHORT_HASH }}
ios-app-version: ${{ inputs.ios-app-version }}

View File

@@ -266,7 +266,6 @@
"./components/toggle-button": "./src/components/toggle-button.ts",
"./components/toggle-switch": "./src/components/toggle-switch.ts",
"./components/toolbar": "./src/components/toolbar.ts",
"./components/tooltip": "./src/components/tooltip.ts",
"./components/view-dropdown-menu": "./src/components/view-dropdown-menu.ts",
"./components/tooltip-content-with-shortcut": "./src/components/tooltip-content-with-shortcut.ts",
"./components/resource": "./src/components/resource.ts",

View File

@@ -1 +0,0 @@
export * from '@blocksuite/affine-components/tooltip';

View File

@@ -73,8 +73,7 @@
"./edgeless-line-styles-panel": "./src/edgeless-line-styles-panel/index.ts",
"./edgeless-shape-color-picker": "./src/edgeless-shape-color-picker/index.ts",
"./open-doc-dropdown-menu": "./src/open-doc-dropdown-menu/index.ts",
"./slider": "./src/slider/index.ts",
"./tooltip": "./src/tooltip/index.ts"
"./slider": "./src/slider/index.ts"
},
"files": [
"src",

View File

@@ -18,7 +18,6 @@ export const LoadingIcon = ({
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
fill="none"
style="fill: none;"
>
<style>
.spinner {

View File

@@ -1,4 +1,3 @@
import { effects as tooltipEffects } from '../tooltip/effect.js';
import { EditorIconButton } from './icon-button.js';
import {
EditorMenuAction,
@@ -7,6 +6,7 @@ import {
} from './menu-button.js';
import { EditorToolbarSeparator } from './separator.js';
import { EditorToolbar } from './toolbar.js';
import { Tooltip } from './tooltip.js';
export { EditorChevronDown } from './chevron-down.js';
export { ToolbarMoreMenuConfigExtension } from './config.js';
@@ -20,6 +20,7 @@ export { MenuContext } from './menu-context.js';
export { EditorToolbarSeparator } from './separator.js';
export { darkToolbarStyles, lightToolbarStyles } from './styles.js';
export { EditorToolbar } from './toolbar.js';
export { Tooltip } from './tooltip.js';
export type {
AdvancedMenuItem,
FatMenuItems,
@@ -37,12 +38,11 @@ export {
} from './utils.js';
export function effects() {
tooltipEffects();
customElements.define('editor-toolbar-separator', EditorToolbarSeparator);
customElements.define('editor-toolbar', EditorToolbar);
customElements.define('editor-icon-button', EditorIconButton);
customElements.define('editor-menu-button', EditorMenuButton);
customElements.define('editor-menu-content', EditorMenuContent);
customElements.define('editor-menu-action', EditorMenuAction);
customElements.define('affine-tooltip', Tooltip);
}

View File

@@ -1,7 +0,0 @@
import { Tooltip } from './tooltip.js';
export function effects() {
if (!customElements.get('affine-tooltip')) {
customElements.define('affine-tooltip', Tooltip);
}
}

View File

@@ -1,2 +0,0 @@
export { effects } from './effect.js';
export { Tooltip } from './tooltip.js';

View File

@@ -30,9 +30,9 @@ function inlineTextStyles(
}
return styleMap({
'font-weight': props.bold ? 'bold' : 'inherit',
'font-style': props.italic ? 'italic' : 'inherit',
'text-decoration': textDecorations.length > 0 ? textDecorations : 'inherit',
'font-weight': props.bold ? 'bold' : 'normal',
'font-style': props.italic ? 'italic' : 'normal',
'text-decoration': textDecorations.length > 0 ? textDecorations : 'none',
...inlineCodeStyle,
});
}

View File

@@ -372,66 +372,3 @@ Generated by [AVA](https://avajs.dev).
[assistant]: Quantum computing uses quantum mechanics principles.`,
promptName: 'Summary as title',
}
## should handle copilot cron jobs correctly
> daily job scheduling calls
[
{
args: [
'copilot.session.cleanupEmptySessions',
{},
{
jobId: 'daily-copilot-cleanup-empty-sessions',
},
],
},
{
args: [
'copilot.session.generateMissingTitles',
{},
{
jobId: 'daily-copilot-generate-missing-titles',
},
],
},
]
> cleanup empty sessions calls
[
{
args: [
'Date',
],
},
]
> title generation calls
{
jobCalls: [
{
args: [
'copilot.session.generateTitle',
{
sessionId: 'session1',
},
],
},
{
args: [
'copilot.session.generateTitle',
{
sessionId: 'session2',
},
],
},
],
modelCalls: [
{
args: [],
},
],
}

View File

@@ -207,7 +207,6 @@ const retry = async (
try {
await callback(t);
} catch (e) {
console.error(`Error during ${action}:`, e);
t.log(`Error during ${action}:`, e);
throw e;
}
@@ -351,10 +350,10 @@ The term **“CRDT”** was first introduced by Marc Shapiro, Nuno Preguiça, Ca
params: {
files: [
{
blobId: 'todo_md',
fileName: 'todo.md',
fileType: 'text/markdown',
fileContent: TestAssets.TODO,
blobId: 'euclidean_distance',
fileName: 'euclidean_distance.rs',
fileType: 'text/rust',
fileContent: TestAssets.Code,
},
],
},
@@ -476,7 +475,6 @@ The term **“CRDT”** was first introduced by Marc Shapiro, Nuno Preguiça, Ca
},
},
],
config: { model: 'gemini-2.5-pro' },
verifier: (t: ExecutionContext<Tester>, result: string) => {
t.notThrows(() => {
TranscriptionResponseSchema.parse(JSON.parse(result));
@@ -485,34 +483,6 @@ The term **“CRDT”** was first introduced by Marc Shapiro, Nuno Preguiça, Ca
type: 'structured' as const,
prefer: CopilotProviderType.Gemini,
},
{
promptName: ['Conversation Summary'],
messages: [
{
role: 'user' as const,
content: '',
params: {
messages: [
{ role: 'user', content: 'what is single source of truth?' },
{ role: 'assistant', content: TestAssets.SSOT },
],
focus: 'technical decisions',
length: 'comprehensive',
},
},
],
verifier: (t: ExecutionContext<Tester>, result: string) => {
assertNotWrappedInCodeBlock(t, result);
const cleared = result.toLowerCase();
t.assert(
cleared.includes('single source of truth') ||
/single.*source/.test(cleared) ||
cleared.includes('ssot'),
'should include original keyword'
);
},
type: 'text' as const,
},
{
promptName: [
'Summary',
@@ -698,12 +668,11 @@ for (const {
t.truthy(provider, 'should have provider');
await retry(`action: ${promptName}`, t, async t => {
const finalConfig = Object.assign({}, prompt.config, config);
const modelId = finalConfig.model || prompt.model;
switch (type) {
case 'text': {
const result = await provider.text(
{ modelId },
{ modelId: prompt.model },
[
...prompt.finish(
messages.reduce(
@@ -722,7 +691,7 @@ for (const {
}
case 'structured': {
const result = await provider.structure(
{ modelId },
{ modelId: prompt.model },
[
...prompt.finish(
messages.reduce(
@@ -741,7 +710,7 @@ for (const {
case 'object': {
const streamObjects: StreamObject[] = [];
for await (const chunk of provider.streamObject(
{ modelId },
{ modelId: prompt.model },
[
...prompt.finish(
messages.reduce(
@@ -773,7 +742,7 @@ for (const {
});
}
const stream = provider.streamImages(
{ modelId },
{ modelId: prompt.model },
[
...prompt.finish(
finalMessage.reduce(

View File

@@ -18,7 +18,6 @@ import {
} from '../models';
import { CopilotModule } from '../plugins/copilot';
import { CopilotContextService } from '../plugins/copilot/context';
import { CopilotCronJobs } from '../plugins/copilot/cron';
import {
CopilotEmbeddingJob,
MockEmbeddingClient,
@@ -78,7 +77,6 @@ type Context = {
jobs: CopilotEmbeddingJob;
storage: CopilotStorage;
workflow: CopilotWorkflowService;
cronJobs: CopilotCronJobs;
executors: {
image: CopilotChatImageExecutor;
text: CopilotChatTextExecutor;
@@ -139,7 +137,6 @@ test.before(async t => {
const jobs = module.get(CopilotEmbeddingJob);
const transcript = module.get(CopilotTranscriptionService);
const workspaceEmbedding = module.get(CopilotWorkspaceService);
const cronJobs = module.get(CopilotCronJobs);
t.context.module = module;
t.context.auth = auth;
@@ -156,7 +153,6 @@ test.before(async t => {
t.context.jobs = jobs;
t.context.transcript = transcript;
t.context.workspaceEmbedding = workspaceEmbedding;
t.context.cronJobs = cronJobs;
t.context.executors = {
image: module.get(CopilotChatImageExecutor),
@@ -1935,71 +1931,3 @@ test('should handle generateSessionTitle correctly under various conditions', as
);
}
});
test('should handle copilot cron jobs correctly', async t => {
const { cronJobs, copilotSession } = t.context;
// mock calls
const mockCleanupResult = { removed: 2, cleaned: 3 };
const mockSessions = [
{ id: 'session1', _count: { messages: 1 } },
{ id: 'session2', _count: { messages: 2 } },
];
const cleanupStub = Sinon.stub(
copilotSession,
'cleanupEmptySessions'
).resolves(mockCleanupResult);
const toBeGenerateStub = Sinon.stub(
copilotSession,
'toBeGenerateTitle'
).resolves(mockSessions);
const jobAddStub = Sinon.stub(cronJobs['jobs'], 'add').resolves();
// daily cleanup job scheduling
{
await cronJobs.dailyCleanupJob();
t.snapshot(
jobAddStub.getCalls().map(call => ({
args: call.args,
})),
'daily job scheduling calls'
);
jobAddStub.reset();
cleanupStub.reset();
toBeGenerateStub.reset();
}
// cleanup empty sessions
{
// mock
cleanupStub.resolves(mockCleanupResult);
toBeGenerateStub.resolves(mockSessions);
await cronJobs.cleanupEmptySessions();
t.snapshot(
cleanupStub.getCalls().map(call => ({
args: call.args.map(arg => (arg instanceof Date ? 'Date' : arg)), // Replace Date with string for stable snapshot
})),
'cleanup empty sessions calls'
);
}
// generate missing titles
await cronJobs.generateMissingTitles();
t.snapshot(
{
modelCalls: toBeGenerateStub.getCalls().map(call => ({
args: call.args,
})),
jobCalls: jobAddStub.getCalls().map(call => ({
args: call.args,
})),
},
'title generation calls'
);
cleanupStub.restore();
toBeGenerateStub.restore();
jobAddStub.restore();
});

View File

@@ -99,56 +99,3 @@ e2e(
t.is(result2.workspace.doc.public, true);
}
);
e2e('should get doc with title and summary', async t => {
const owner = await app.signup();
const workspace = await app.create(Mockers.Workspace, {
owner: { id: owner.id },
});
const docSnapshot = await app.create(Mockers.DocSnapshot, {
workspaceId: workspace.id,
user: owner,
});
const doc = await app.create(Mockers.DocMeta, {
workspaceId: workspace.id,
docId: docSnapshot.id,
title: 'doc1',
summary: 'summary1',
});
const result = await app.gql({
query: getWorkspacePageByIdQuery,
variables: { workspaceId: workspace.id, pageId: doc.docId },
});
t.is(result.workspace.doc.title, doc.title);
t.is(result.workspace.doc.summary, doc.summary);
});
e2e('should get doc with title and null summary', async t => {
const owner = await app.signup();
const workspace = await app.create(Mockers.Workspace, {
owner: { id: owner.id },
});
const docSnapshot = await app.create(Mockers.DocSnapshot, {
workspaceId: workspace.id,
user: owner,
});
const doc = await app.create(Mockers.DocMeta, {
workspaceId: workspace.id,
docId: docSnapshot.id,
title: 'doc1',
});
const result = await app.gql({
query: getWorkspacePageByIdQuery,
variables: { workspaceId: workspace.id, pageId: doc.docId },
});
t.is(result.workspace.doc.title, doc.title);
t.is(result.workspace.doc.summary, null);
});

View File

@@ -111,19 +111,6 @@ export class MockCopilotProvider extends OpenAIProvider {
},
],
},
{
id: 'gemini-2.5-pro',
capabilities: [
{
input: [ModelInputType.Text, ModelInputType.Image],
output: [
ModelOutputType.Text,
ModelOutputType.Object,
ModelOutputType.Structured,
],
},
],
},
];
override async text(

View File

@@ -565,65 +565,3 @@ Generated by [AVA](https://avajs.dev).
workspaceSessionExists: true,
},
}
## should cleanup empty sessions correctly
> cleanup empty sessions results
{
cleanupResult: {
cleaned: 0,
removed: 0,
},
remainingSessions: [
{
deleted: false,
pinned: false,
type: 'zeroCost',
},
{
deleted: false,
pinned: false,
type: 'zeroCost',
},
{
deleted: false,
pinned: false,
type: 'noMessages',
},
{
deleted: false,
pinned: false,
type: 'noMessages',
},
{
deleted: false,
pinned: false,
type: 'recent',
},
{
deleted: false,
pinned: false,
type: 'withMessages',
},
],
}
## should get sessions for title generation correctly
> sessions for title generation results
{
onlyValidSessionsReturned: true,
sessions: [
{
assistantMessageCount: 1,
isValid: true,
},
{
assistantMessageCount: 2,
isValid: true,
},
],
total: 2,
}

View File

@@ -917,178 +917,3 @@ test('should handle fork and session attachment operations', async t => {
'attach and detach operation results'
);
});
test('should cleanup empty sessions correctly', async t => {
const { copilotSession, db } = t.context;
await createTestPrompts(copilotSession, db);
const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
const twoHoursAgo = new Date(Date.now() - 2 * 60 * 60 * 1000);
// should be deleted
const neverUsedSessionIds: string[] = [randomUUID(), randomUUID()];
await Promise.all(
neverUsedSessionIds.map(async id => {
await createTestSession(t, { sessionId: id });
await db.aiSession.update({
where: { id },
data: { messageCost: 0, updatedAt: oneDayAgo },
});
})
);
// should be marked as deleted
const emptySessionIds: string[] = [randomUUID(), randomUUID()];
await Promise.all(
emptySessionIds.map(async id => {
await createTestSession(t, { sessionId: id });
await db.aiSession.update({
where: { id },
data: { messageCost: 100, updatedAt: oneDayAgo },
});
})
);
// should not be affected
const recentSessionId = randomUUID();
await createTestSession(t, { sessionId: recentSessionId });
await db.aiSession.update({
where: { id: recentSessionId },
data: { messageCost: 0, updatedAt: twoHoursAgo },
});
// Create session with messages (should not be affected)
const sessionWithMsgId = randomUUID();
await createSessionWithMessages(
t,
{ sessionId: sessionWithMsgId },
'test message'
);
const result = await copilotSession.cleanupEmptySessions(oneDayAgo);
const remainingSessions = await db.aiSession.findMany({
where: {
id: {
in: [
...neverUsedSessionIds,
...emptySessionIds,
recentSessionId,
sessionWithMsgId,
],
},
},
select: { id: true, deletedAt: true, pinned: true },
});
t.snapshot(
{
cleanupResult: result,
remainingSessions: remainingSessions.map(s => ({
deleted: !!s.deletedAt,
pinned: s.pinned,
type: neverUsedSessionIds.includes(s.id)
? 'zeroCost'
: emptySessionIds.includes(s.id)
? 'noMessages'
: s.id === recentSessionId
? 'recent'
: 'withMessages',
})),
},
'cleanup empty sessions results'
);
});
test('should get sessions for title generation correctly', async t => {
const { copilotSession, db } = t.context;
await createTestPrompts(copilotSession, db);
// create valid sessions with messages
const sessionIds: string[] = [randomUUID(), randomUUID()];
await Promise.all(
sessionIds.map(async (id, index) => {
await createTestSession(t, { sessionId: id });
await db.aiSession.update({
where: { id },
data: {
updatedAt: new Date(Date.now() - index * 1000),
messages: {
create: Array.from({ length: index + 1 }, (_, i) => ({
role: 'assistant',
content: `assistant message ${i}`,
})),
},
},
});
})
);
// create excluded sessions
const excludedSessions = [
{
reason: 'hasTitle',
setupFn: async (id: string) => {
await createTestSession(t, { sessionId: id });
await db.aiSession.update({
where: { id },
data: { title: 'Existing Title' },
});
},
},
{
reason: 'isDeleted',
setupFn: async (id: string) => {
await createTestSession(t, { sessionId: id });
await db.aiSession.update({
where: { id },
data: { deletedAt: new Date() },
});
},
},
{
reason: 'noMessages',
setupFn: async (id: string) => {
await createTestSession(t, { sessionId: id });
},
},
{
reason: 'isAction',
setupFn: async (id: string) => {
await createTestSession(t, {
sessionId: id,
promptName: TEST_PROMPTS.ACTION,
});
},
},
{
reason: 'noAssistantMessages',
setupFn: async (id: string) => {
await createTestSession(t, { sessionId: id });
await db.aiSessionMessage.create({
data: { sessionId: id, role: 'user', content: 'User message only' },
});
},
},
];
await Promise.all(
excludedSessions.map(async session => {
await session.setupFn(randomUUID());
})
);
const result = await copilotSession.toBeGenerateTitle();
t.snapshot(
{
total: result.length,
sessions: result.map(s => ({
assistantMessageCount: s._count.messages,
isValid: sessionIds.includes(s.id),
})),
onlyValidSessionsReturned: result.every(s => sessionIds.includes(s.id)),
},
'sessions for title generation results'
);
});

View File

@@ -669,10 +669,7 @@ test('should get doc info', async t => {
};
await t.context.doc.upsert(snapshot);
await t.context.doc.upsertMeta(workspace.id, docId, {
title: 'test title',
summary: 'test summary',
});
await t.context.doc.upsertMeta(workspace.id, docId);
const docInfo = await t.context.doc.getDocInfo(workspace.id, docId);
@@ -682,8 +679,6 @@ test('should get doc info', async t => {
updatedAt: new Date(snapshot.timestamp),
creatorId: user.id,
lastUpdaterId: user.id,
title: 'test title',
summary: 'test summary',
});
});

View File

@@ -433,7 +433,7 @@ export async function submitAudioTranscription(
for (const [idx, buffer] of content.entries()) {
resp = resp.attach(idx.toString(), buffer, {
filename: fileName,
contentType: 'audio/opus',
contentType: 'application/octet-stream',
});
}

View File

@@ -36,7 +36,6 @@ import { DocRendererModule } from './core/doc-renderer';
import { DocServiceModule } from './core/doc-service';
import { FeatureModule } from './core/features';
import { MailModule } from './core/mail';
import { MonitorModule } from './core/monitor';
import { NotificationModule } from './core/notification';
import { PermissionModule } from './core/permission';
import { QuotaModule } from './core/quota';
@@ -113,8 +112,6 @@ export const FunctionalityModules = [
WebSocketModule,
JobModule.forRoot(),
ModelsModule,
ScheduleModule.forRoot(),
MonitorModule,
];
export class AppModuleBuilder {
@@ -154,8 +151,12 @@ export function buildAppModule(env: Env) {
// basic
.use(...FunctionalityModules)
// enable indexer module on graphql server and doc service
.useIf(() => env.flavors.graphql || env.flavors.doc, IndexerModule)
// enable schedule module on graphql server and doc service
.useIf(
() => env.flavors.graphql || env.flavors.doc,
ScheduleModule.forRoot(),
IndexerModule
)
// auth
.use(UserModule, AuthModule, PermissionModule)

View File

@@ -653,19 +653,12 @@ export const USER_FRIENDLY_ERRORS = {
},
no_copilot_provider_available: {
type: 'internal_server_error',
args: { modelId: 'string' },
message: ({ modelId }) => `No copilot provider available: ${modelId}`,
message: `No copilot provider available.`,
},
copilot_failed_to_generate_text: {
type: 'internal_server_error',
message: `Failed to generate text.`,
},
copilot_failed_to_generate_embedding: {
type: 'internal_server_error',
args: { provider: 'string', message: 'string' },
message: ({ provider, message }) =>
`Failed to generate embedding with ${provider}: ${message}`,
},
copilot_failed_to_create_message: {
type: 'internal_server_error',
message: `Failed to create chat message.`,

View File

@@ -668,14 +668,10 @@ export class CopilotSessionDeleted extends UserFriendlyError {
super('action_forbidden', 'copilot_session_deleted', message);
}
}
@ObjectType()
class NoCopilotProviderAvailableDataType {
@Field() modelId!: string
}
export class NoCopilotProviderAvailable extends UserFriendlyError {
constructor(args: NoCopilotProviderAvailableDataType, message?: string | ((args: NoCopilotProviderAvailableDataType) => string)) {
super('internal_server_error', 'no_copilot_provider_available', message, args);
constructor(message?: string) {
super('internal_server_error', 'no_copilot_provider_available', message);
}
}
@@ -684,17 +680,6 @@ export class CopilotFailedToGenerateText extends UserFriendlyError {
super('internal_server_error', 'copilot_failed_to_generate_text', message);
}
}
@ObjectType()
class CopilotFailedToGenerateEmbeddingDataType {
@Field() provider!: string
@Field() message!: string
}
export class CopilotFailedToGenerateEmbedding extends UserFriendlyError {
constructor(args: CopilotFailedToGenerateEmbeddingDataType, message?: string | ((args: CopilotFailedToGenerateEmbeddingDataType) => string)) {
super('internal_server_error', 'copilot_failed_to_generate_embedding', message, args);
}
}
export class CopilotFailedToCreateMessage extends UserFriendlyError {
constructor(message?: string) {
@@ -1194,7 +1179,6 @@ export enum ErrorNames {
COPILOT_SESSION_DELETED,
NO_COPILOT_PROVIDER_AVAILABLE,
COPILOT_FAILED_TO_GENERATE_TEXT,
COPILOT_FAILED_TO_GENERATE_EMBEDDING,
COPILOT_FAILED_TO_CREATE_MESSAGE,
UNSPLASH_IS_NOT_CONFIGURED,
COPILOT_ACTION_TAKEN,
@@ -1255,5 +1239,5 @@ registerEnumType(ErrorNames, {
export const ErrorDataUnionType = createUnionType({
name: 'ErrorDataUnion',
types: () =>
[GraphqlBadRequestDataType, HttpRequestErrorDataType, QueryTooLongDataType, ValidationErrorDataType, WrongSignInCredentialsDataType, UnknownOauthProviderDataType, InvalidOauthCallbackCodeDataType, MissingOauthQueryParameterDataType, InvalidOauthResponseDataType, InvalidEmailDataType, InvalidPasswordLengthDataType, WorkspacePermissionNotFoundDataType, SpaceNotFoundDataType, MemberNotFoundInSpaceDataType, NotInSpaceDataType, AlreadyInSpaceDataType, SpaceAccessDeniedDataType, SpaceOwnerNotFoundDataType, SpaceShouldHaveOnlyOneOwnerDataType, DocNotFoundDataType, DocActionDeniedDataType, DocUpdateBlockedDataType, VersionRejectedDataType, InvalidHistoryTimestampDataType, DocHistoryNotFoundDataType, BlobNotFoundDataType, ExpectToGrantDocUserRolesDataType, ExpectToRevokeDocUserRolesDataType, ExpectToUpdateDocUserRoleDataType, NoMoreSeatDataType, UnsupportedSubscriptionPlanDataType, SubscriptionAlreadyExistsDataType, SubscriptionNotExistsDataType, SameSubscriptionRecurringDataType, SubscriptionPlanNotFoundDataType, NoCopilotProviderAvailableDataType, CopilotFailedToGenerateEmbeddingDataType, CopilotDocNotFoundDataType, CopilotMessageNotFoundDataType, CopilotPromptNotFoundDataType, CopilotProviderNotSupportedDataType, CopilotProviderSideErrorDataType, CopilotInvalidContextDataType, CopilotContextFileNotSupportedDataType, CopilotFailedToModifyContextDataType, CopilotFailedToMatchContextDataType, CopilotFailedToMatchGlobalContextDataType, CopilotFailedToAddWorkspaceFileEmbeddingDataType, RuntimeConfigNotFoundDataType, InvalidRuntimeConfigTypeDataType, InvalidLicenseToActivateDataType, InvalidLicenseUpdateParamsDataType, UnsupportedClientVersionDataType, MentionUserDocAccessDeniedDataType, InvalidAppConfigDataType, InvalidAppConfigInputDataType, InvalidSearchProviderRequestDataType, InvalidIndexerInputDataType] as const,
[GraphqlBadRequestDataType, HttpRequestErrorDataType, QueryTooLongDataType, ValidationErrorDataType, WrongSignInCredentialsDataType, UnknownOauthProviderDataType, InvalidOauthCallbackCodeDataType, MissingOauthQueryParameterDataType, InvalidOauthResponseDataType, InvalidEmailDataType, InvalidPasswordLengthDataType, WorkspacePermissionNotFoundDataType, SpaceNotFoundDataType, MemberNotFoundInSpaceDataType, NotInSpaceDataType, AlreadyInSpaceDataType, SpaceAccessDeniedDataType, SpaceOwnerNotFoundDataType, SpaceShouldHaveOnlyOneOwnerDataType, DocNotFoundDataType, DocActionDeniedDataType, DocUpdateBlockedDataType, VersionRejectedDataType, InvalidHistoryTimestampDataType, DocHistoryNotFoundDataType, BlobNotFoundDataType, ExpectToGrantDocUserRolesDataType, ExpectToRevokeDocUserRolesDataType, ExpectToUpdateDocUserRoleDataType, NoMoreSeatDataType, UnsupportedSubscriptionPlanDataType, SubscriptionAlreadyExistsDataType, SubscriptionNotExistsDataType, SameSubscriptionRecurringDataType, SubscriptionPlanNotFoundDataType, CopilotDocNotFoundDataType, CopilotMessageNotFoundDataType, CopilotPromptNotFoundDataType, CopilotProviderNotSupportedDataType, CopilotProviderSideErrorDataType, CopilotInvalidContextDataType, CopilotContextFileNotSupportedDataType, CopilotFailedToModifyContextDataType, CopilotFailedToMatchContextDataType, CopilotFailedToMatchGlobalContextDataType, CopilotFailedToAddWorkspaceFileEmbeddingDataType, RuntimeConfigNotFoundDataType, InvalidRuntimeConfigTypeDataType, InvalidLicenseToActivateDataType, InvalidLicenseUpdateParamsDataType, UnsupportedClientVersionDataType, MentionUserDocAccessDeniedDataType, InvalidAppConfigDataType, InvalidAppConfigInputDataType, InvalidSearchProviderRequestDataType, InvalidIndexerInputDataType] as const,
});

View File

@@ -59,9 +59,7 @@ export type KnownMetricScopes =
| 'mail'
| 'ai'
| 'event'
| 'queue'
| 'storage'
| 'process';
| 'queue';
const metricCreators: MetricCreators = {
counter(meter: Meter, name: string, opts?: MetricOptions) {

View File

@@ -100,7 +100,7 @@ export class PgWorkspaceDocStorageAdapter extends DocStorageAdapter {
{
// keep it simple to let all update merged in one job
jobId: `doc:merge-pending-updates:${workspaceId}:${docId}`,
delay: 5 * 1000 /* 5s */,
delay: 30 * 1000 /* 30s */,
priority: 100,
}
);

View File

@@ -1,9 +0,0 @@
import { Global, Module } from '@nestjs/common';
import { MonitorService } from './service';
@Global()
@Module({
providers: [MonitorService],
})
export class MonitorModule {}

View File

@@ -1,28 +0,0 @@
import { Injectable, Logger } from '@nestjs/common';
import { Cron, CronExpression } from '@nestjs/schedule';
import { metrics } from '../../base';
@Injectable()
export class MonitorService {
protected logger = new Logger(MonitorService.name);
@Cron(CronExpression.EVERY_MINUTE)
async monitor() {
const memoryUsage = process.memoryUsage();
this.logger.log(
`memory usage: rss: ${memoryUsage.rss}, heapTotal: ${memoryUsage.heapTotal}, heapUsed: ${memoryUsage.heapUsed}, external: ${memoryUsage.external}, arrayBuffers: ${memoryUsage.arrayBuffers}`
);
metrics.process.gauge('node_process_rss').record(memoryUsage.rss);
metrics.process
.gauge('node_process_heap_total')
.record(memoryUsage.heapTotal);
metrics.process
.gauge('node_process_heap_used')
.record(memoryUsage.heapUsed);
metrics.process.gauge('node_process_external').record(memoryUsage.external);
metrics.process
.gauge('node_process_array_buffers')
.record(memoryUsage.arrayBuffers);
}
}

View File

@@ -4,7 +4,6 @@ import {
autoMetadata,
Config,
EventBus,
metrics,
OnEvent,
type StorageProvider,
StorageProviderFactory,
@@ -70,23 +69,15 @@ export class CommentAttachmentStorage {
blob,
meta
);
const mime = meta.contentType ?? 'application/octet-stream';
const size = blob.length;
await this.models.commentAttachment.upsert({
workspaceId,
docId,
key,
name,
mime,
size,
mime: meta.contentType ?? 'application/octet-stream',
size: blob.length,
createdBy: userId,
});
metrics.storage.histogram('comment_attachment_size').record(size, { mime });
metrics.storage.counter('comment_attachment_total').add(1, { mime });
this.logger.log(
`uploaded comment attachment ${workspaceId}/${docId}/${key} with size ${size}, mime: ${mime}, name: ${name}, user: ${userId}`
);
}
async get(

View File

@@ -79,9 +79,6 @@ class DocType {
@Field(() => String, { nullable: true })
title?: string | null;
@Field(() => String, { nullable: true })
summary?: string | null;
}
@InputType()
@@ -253,11 +250,10 @@ export class WorkspaceDocResolver {
deprecationReason: 'use [WorkspaceType.doc] instead',
})
async publicPage(
@CurrentUser() me: CurrentUser,
@Parent() workspace: WorkspaceType,
@Args('pageId') pageId: string
) {
return this.doc(me, workspace, pageId);
return this.doc(workspace, pageId);
}
@ResolveField(() => PaginatedDocType)
@@ -298,14 +294,11 @@ export class WorkspaceDocResolver {
complexity: 2,
})
async doc(
@CurrentUser() me: CurrentUser,
@Parent() workspace: WorkspaceType,
@Args('docId') docId: string
): Promise<DocType> {
const doc = await this.models.doc.getDocInfo(workspace.id, docId);
if (doc) {
// check if doc is readable
await this.ac.user(me.id).doc(workspace.id, docId).assert('Doc.Read');
return doc;
}

View File

@@ -165,13 +165,6 @@ export class CopilotContextModel extends BaseModel {
fileId: string,
embeddings: Embedding[]
) {
if (embeddings.length === 0) {
this.logger.warn(
`No embeddings provided for contextId: ${contextId}, fileId: ${fileId}. Skipping insertion.`
);
return;
}
const values = this.processEmbeddings(contextId, fileId, embeddings);
await this.db.$executeRaw`
@@ -211,13 +204,6 @@ export class CopilotContextModel extends BaseModel {
docId: string,
embeddings: Embedding[]
) {
if (embeddings.length === 0) {
this.logger.warn(
`No embeddings provided for workspaceId: ${workspaceId}, docId: ${docId}. Skipping insertion.`
);
return;
}
const values = this.processEmbeddings(
workspaceId,
docId,

View File

@@ -582,56 +582,4 @@ export class CopilotSessionModel extends BaseModel {
.map(({ messageCost, prompt: { action } }) => (action ? 1 : messageCost))
.reduce((prev, cost) => prev + cost, 0);
}
@Transactional()
async cleanupEmptySessions(earlyThen: Date) {
// delete never used sessions
const { count: removed } = await this.db.aiSession.deleteMany({
where: {
messageCost: 0,
deletedAt: null,
// filter session updated more than 24 hours ago
updatedAt: { lt: earlyThen },
},
});
// mark empty sessions as deleted
const { count: cleaned } = await this.db.aiSession.updateMany({
where: {
deletedAt: null,
messages: { none: {} },
// filter session updated more than 24 hours ago
updatedAt: { lt: earlyThen },
},
data: {
deletedAt: new Date(),
pinned: false,
},
});
return { removed, cleaned };
}
@Transactional()
async toBeGenerateTitle() {
const sessions = await this.db.aiSession
.findMany({
where: {
title: null,
deletedAt: null,
messages: { some: {} },
// only generate titles for non-actions sessions
prompt: { action: null },
},
select: {
id: true,
// count assistant messages
_count: { select: { messages: { where: { role: 'assistant' } } } },
},
orderBy: { updatedAt: 'desc' },
})
.then(s => s.filter(s => s._count.messages > 0));
return sessions;
}
}

View File

@@ -283,13 +283,6 @@ export class CopilotWorkspaceConfigModel extends BaseModel {
fileId: string,
embeddings: Embedding[]
) {
if (embeddings.length === 0) {
this.logger.warn(
`No embeddings provided for workspaceId: ${workspaceId}, fileId: ${fileId}. Skipping insertion.`
);
return;
}
const values = this.processEmbeddings(workspaceId, fileId, embeddings);
await this.db.$executeRaw`
INSERT INTO "ai_workspace_file_embeddings"

View File

@@ -558,8 +558,6 @@ export class DocModel extends BaseModel {
mode: PublicDocMode;
public: boolean;
defaultRole: DocRole;
title: string | null;
summary: string | null;
createdAt: Date;
updatedAt: Date;
creatorId?: string;
@@ -572,8 +570,6 @@ export class DocModel extends BaseModel {
"workspace_pages"."mode" as "mode",
"workspace_pages"."public" as "public",
"workspace_pages"."defaultRole" as "defaultRole",
"workspace_pages"."title" as "title",
"workspace_pages"."summary" as "summary",
"snapshots"."created_at" as "createdAt",
"snapshots"."updated_at" as "updatedAt",
"snapshots"."created_by" as "creatorId",

View File

@@ -125,10 +125,7 @@ export class CopilotContextService implements OnApplicationBootstrap {
async get(id: string): Promise<ContextSession> {
if (!this.embeddingClient) {
throw new NoCopilotProviderAvailable(
{ modelId: 'embedding' },
'embedding client not configured'
);
throw new NoCopilotProviderAvailable('embedding client not configured');
}
const context = await this.getCachedSession(id);

View File

@@ -124,7 +124,7 @@ export class CopilotController implements BeforeApplicationShutdown {
modelId: model,
});
if (!provider) {
throw new NoCopilotProviderAvailable({ modelId: model });
throw new NoCopilotProviderAvailable();
}
return { provider, model, hasAttachment };
@@ -299,13 +299,6 @@ export class CopilotController implements BeforeApplicationShutdown {
this.ongoingStreamCount$.next(this.ongoingStreamCount$.value + 1);
const { signal, onConnectionClosed } = getSignal(req);
let endBeforePromiseResolve = false;
onConnectionClosed(isAborted => {
if (isAborted) {
endBeforePromiseResolve = true;
}
});
const { messageId, reasoning, webSearch } = ChatQuerySchema.parse(query);
const source$ = from(
@@ -329,21 +322,21 @@ export class CopilotController implements BeforeApplicationShutdown {
shared$.pipe(
reduce((acc, chunk) => acc + chunk, ''),
tap(buffer => {
session.push({
role: 'assistant',
content: endBeforePromiseResolve
? '> Request aborted'
: buffer,
createdAt: new Date(),
onConnectionClosed(isAborted => {
session.push({
role: 'assistant',
content: isAborted ? '> Request aborted' : buffer,
createdAt: new Date(),
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
}),
ignoreElements()
)
@@ -391,13 +384,6 @@ export class CopilotController implements BeforeApplicationShutdown {
this.ongoingStreamCount$.next(this.ongoingStreamCount$.value + 1);
const { signal, onConnectionClosed } = getSignal(req);
let endBeforePromiseResolve = false;
onConnectionClosed(isAborted => {
if (isAborted) {
endBeforePromiseResolve = true;
}
});
const { messageId, reasoning, webSearch } = ChatQuerySchema.parse(query);
const source$ = from(
@@ -421,25 +407,25 @@ export class CopilotController implements BeforeApplicationShutdown {
shared$.pipe(
reduce((acc, chunk) => acc.concat([chunk]), [] as StreamObject[]),
tap(result => {
const parser = new StreamObjectParser();
const streamObjects = parser.mergeTextDelta(result);
const content = parser.mergeContent(streamObjects);
session.push({
role: 'assistant',
content: endBeforePromiseResolve
? '> Request aborted'
: content,
streamObjects: endBeforePromiseResolve ? null : streamObjects,
createdAt: new Date(),
onConnectionClosed(isAborted => {
const parser = new StreamObjectParser();
const streamObjects = parser.mergeTextDelta(result);
const content = parser.mergeContent(streamObjects);
session.push({
role: 'assistant',
content: isAborted ? '> Request aborted' : content,
streamObjects: isAborted ? null : streamObjects,
createdAt: new Date(),
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
}),
ignoreElements()
)
@@ -491,13 +477,6 @@ export class CopilotController implements BeforeApplicationShutdown {
this.ongoingStreamCount$.next(this.ongoingStreamCount$.value + 1);
const { signal, onConnectionClosed } = getSignal(req);
let endBeforePromiseResolve = false;
onConnectionClosed(isAborted => {
if (isAborted) {
endBeforePromiseResolve = true;
}
});
const source$ = from(
this.workflow.runGraph(params, session.model, {
...session.config.promptConfig,
@@ -547,21 +526,21 @@ export class CopilotController implements BeforeApplicationShutdown {
return acc;
}, ''),
tap(content => {
session.push({
role: 'assistant',
content: endBeforePromiseResolve
? '> Request aborted'
: content,
createdAt: new Date(),
onConnectionClosed(isAborted => {
session.push({
role: 'assistant',
content: isAborted ? '> Request aborted' : content,
createdAt: new Date(),
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
}),
ignoreElements()
)
@@ -625,13 +604,6 @@ export class CopilotController implements BeforeApplicationShutdown {
this.ongoingStreamCount$.next(this.ongoingStreamCount$.value + 1);
const { signal, onConnectionClosed } = getSignal(req);
let endBeforePromiseResolve = false;
onConnectionClosed(isAborted => {
if (isAborted) {
endBeforePromiseResolve = true;
}
});
const source$ = from(
provider.streamImages(
{
@@ -667,20 +639,22 @@ export class CopilotController implements BeforeApplicationShutdown {
shared$.pipe(
reduce((acc, chunk) => acc.concat([chunk]), [] as string[]),
tap(attachments => {
session.push({
role: 'assistant',
content: endBeforePromiseResolve ? '> Request aborted' : '',
attachments: endBeforePromiseResolve ? [] : attachments,
createdAt: new Date(),
onConnectionClosed(isAborted => {
session.push({
role: 'assistant',
content: isAborted ? '> Request aborted' : '',
attachments: isAborted ? [] : attachments,
createdAt: new Date(),
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
});
void session
.save()
.catch(err =>
this.logger.error(
'Failed to save session in sse stream',
err
)
);
}),
ignoreElements()
)

View File

@@ -1,71 +0,0 @@
import { Injectable, Logger } from '@nestjs/common';
import { Cron, CronExpression } from '@nestjs/schedule';
import { JobQueue, OneDay, OnJob } from '../../base';
import { Models } from '../../models';
declare global {
interface Jobs {
'copilot.session.cleanupEmptySessions': {};
'copilot.session.generateMissingTitles': {};
}
}
@Injectable()
export class CopilotCronJobs {
private readonly logger = new Logger(CopilotCronJobs.name);
constructor(
private readonly models: Models,
private readonly jobs: JobQueue
) {}
@Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT)
async dailyCleanupJob() {
await this.jobs.add(
'copilot.session.cleanupEmptySessions',
{},
{ jobId: 'daily-copilot-cleanup-empty-sessions' }
);
await this.jobs.add(
'copilot.session.generateMissingTitles',
{},
{ jobId: 'daily-copilot-generate-missing-titles' }
);
}
async triggerGenerateMissingTitles() {
await this.jobs.add(
'copilot.session.generateMissingTitles',
{},
{ jobId: 'trigger-copilot-generate-missing-titles' }
);
}
@OnJob('copilot.session.cleanupEmptySessions')
async cleanupEmptySessions() {
const { removed, cleaned } =
await this.models.copilotSession.cleanupEmptySessions(
new Date(Date.now() - OneDay)
);
this.logger.log(
`Cleanup completed: ${removed} sessions deleted, ${cleaned} sessions marked as deleted`
);
}
@OnJob('copilot.session.generateMissingTitles')
async generateMissingTitles() {
const sessions = await this.models.copilotSession.toBeGenerateTitle();
for (const session of sessions) {
await this.jobs.add('copilot.session.generateTitle', {
sessionId: session.id,
});
}
this.logger.log(
`Scheduled title generation for ${sessions.length} sessions`
);
}
}

View File

@@ -5,7 +5,6 @@ import {
CopilotPromptNotFound,
CopilotProviderNotSupported,
} from '../../../base';
import { CopilotFailedToGenerateEmbedding } from '../../../base/error/errors.gen';
import { ChunkSimilarity, Embedding } from '../../../models';
import { PromptService } from '../prompt';
import {
@@ -75,12 +74,6 @@ class ProductionEmbeddingClient extends EmbeddingClient {
input,
{ dimensions: EMBEDDING_DIMENSIONS }
);
if (embeddings.length !== input.length) {
throw new CopilotFailedToGenerateEmbedding({
provider: provider.type,
message: `Expected ${input.length} embeddings, got ${embeddings.length}`,
});
}
return Array.from(embeddings.entries()).map(([index, embedding]) => ({
index,

View File

@@ -15,7 +15,6 @@ import {
CopilotContextService,
} from './context';
import { CopilotController } from './controller';
import { CopilotCronJobs } from './cron';
import { CopilotEmbeddingJob } from './embedding';
import { ChatMessageCache } from './message';
import { PromptService } from './prompt';
@@ -65,8 +64,6 @@ import {
CopilotContextResolver,
CopilotContextService,
CopilotEmbeddingJob,
// cron jobs
CopilotCronJobs,
// transcription
CopilotTranscriptionService,
CopilotTranscriptionResolver,

View File

@@ -303,8 +303,7 @@ const textActions: Prompt[] = [
{
name: 'Transcript audio',
action: 'Transcript audio',
model: 'gemini-2.5-pro',
optionalModels: ['gemini-2.5-flash', 'gemini-2.5-pro'],
model: 'gemini-2.5-flash',
messages: [
{
role: 'system',
@@ -367,31 +366,6 @@ Convert a multi-speaker audio recording into a structured JSON format by transcr
requireAttachment: true,
},
},
{
name: 'Conversation Summary',
action: 'Conversation Summary',
model: 'gpt-4.1-2025-04-14',
messages: [
{
role: 'system',
content: `You are an expert conversation summarizer. Your job is to distill long dialogues into clear, compact summaries that preserve every key decision, fact, and open question. When asked, always:
• Honor any explicit “focus” the user gives you.
• Match the desired length style:
- “brief” → 1-2 sentences
- “detailed” → ≈ 5 sentences or short bullet list
- “comprehensive” → full paragraph(s) covering all salient points.
• Write in neutral, third-person prose and never add new information.
Return only the summary text—no headings, labels, or commentary.`,
},
{
role: 'user',
content: `Summarize the conversation below so it can be carried forward without loss.\n\nFocus: {{focus}}\nDesired length: {{length}}\n\nConversation:\n{{#messages}}\n{{role}}: {{content}}\n{{/messages}}`,
},
],
config: {
requireContent: false,
},
},
{
name: 'Summary',
action: 'Summary',
@@ -1796,74 +1770,11 @@ const chat: Prompt[] = [
},
];
const artifactActions: Prompt[] = [
{
name: 'Code Artifact',
model: 'claude-sonnet-4@20250514',
messages: [
{
role: 'system',
content: `
When sent new notes, respond ONLY with the contents of the html file.
DO NOT INCLUDE ANY OTHER TEXT, EXPLANATIONS, APOLOGIES, OR INTRODUCTORY/CLOSING PHRASES.
IF USER DOES NOT SPECIFY A STYLE, FOLLOW THE DEFAULT STYLE.
<generate_guide>
- The results should be a single HTML file.
- Use tailwindcss to style the website
- Put any additional CSS styles in a style tag and any JavaScript in a script tag.
- Use unpkg or skypack to import any required dependencies.
- Use Google fonts to pull in any open source fonts you require.
- Use lucide icons for any icons.
- If you have any images, load them from Unsplash or use solid colored rectangles.
</generate_guide>
<DO_NOT_USE_COLORS>
- DO NOT USE ANY COLORS
</DO_NOT_USE_COLORS>
<DO_NOT_USE_GRADIENTS>
- DO NOT USE ANY GRADIENTS
</DO_NOT_USE_GRADIENTS>
<COLOR_THEME>
- --affine-blue-300: #93e2fd
- --affine-blue-400: #60cffa
- --affine-blue-500: #3ab5f7
- --affine-blue-600: #1e96eb
- --affine-blue-700: #1e67af
- --affine-text-primary-color: #121212
- --affine-text-secondary-color: #8e8d91
- --affine-text-disable-color: #a9a9ad
- --affine-background-overlay-panel-color: #fbfbfc
- --affine-background-secondary-color: #f4f4f5
- --affine-background-primary-color: #fff
</COLOR_THEME>
<default_style_guide>
- MUST USE White and Blue(#1e96eb) as the primary color
- KEEP THE DEFAULT STYLE SIMPLE AND CLEAN
- DO NOT USE ANY COMPLEX STYLES
- DO NOT USE ANY GRADIENTS
- USE LESS SHADOWS
- USE RADIUS 4px or 8px for rounded corners
- USE 12px or 16px for padding
- Use the tailwind color gray, zinc, slate, neutral much more.
- Use 0.5px border should be better
</default_style_guide>
`,
},
{
role: 'user',
content: '{{content}}',
},
],
},
];
export const prompts: Prompt[] = [
...textActions,
...imageActions,
...chat,
...workflows,
...artifactActions,
];
export async function refreshPrompts(db: PrismaClient) {

View File

@@ -21,7 +21,6 @@ import {
buildDocKeywordSearchGetter,
buildDocSearchGetter,
createCodeArtifactTool,
createConversationSummaryTool,
createDocComposeTool,
createDocEditTool,
createDocKeywordSearchTool,
@@ -140,11 +139,6 @@ export abstract class CopilotProvider<C = any> {
if (options?.tools?.length) {
this.logger.debug(`getTools: ${JSON.stringify(options.tools)}`);
const ac = this.moduleRef.get(AccessController, { strict: false });
const docReader = this.moduleRef.get(DocReader, { strict: false });
const models = this.moduleRef.get(Models, { strict: false });
const prompt = this.moduleRef.get(PromptService, {
strict: false,
});
for (const tool of options.tools) {
const toolDef = this.getProviderSpecificTools(tool, model);
@@ -156,20 +150,9 @@ export abstract class CopilotProvider<C = any> {
continue;
}
switch (tool) {
case 'codeArtifact': {
tools.code_artifact = createCodeArtifactTool(prompt, this.factory);
break;
}
case 'conversationSummary': {
tools.conversation_summary = createConversationSummaryTool(
options.session,
prompt,
this.factory
);
break;
}
case 'docEdit': {
const getDocContent = buildContentGetter(ac, docReader);
const doc = this.moduleRef.get(DocReader, { strict: false });
const getDocContent = buildContentGetter(ac, doc);
tools.doc_edit = createDocEditTool(
this.factory,
getDocContent.bind(null, options)
@@ -180,15 +163,11 @@ export abstract class CopilotProvider<C = any> {
const context = this.moduleRef.get(CopilotContextService, {
strict: false,
});
const docContext = options.session
? await context.getBySessionId(options.session)
: null;
const searchDocs = buildDocSearchGetter(
ac,
context,
docContext,
models
);
const searchDocs = buildDocSearchGetter(ac, context, docContext);
tools.doc_semantic_search = createDocSemanticSearchTool(
searchDocs.bind(null, options)
);
@@ -196,6 +175,9 @@ export abstract class CopilotProvider<C = any> {
}
case 'docKeywordSearch': {
if (this.AFFiNEConfig.indexer.enabled) {
const ac = this.moduleRef.get(AccessController, {
strict: false,
});
const indexerService = this.moduleRef.get(IndexerService, {
strict: false,
});
@@ -210,6 +192,9 @@ export abstract class CopilotProvider<C = any> {
break;
}
case 'docRead': {
const ac = this.moduleRef.get(AccessController, { strict: false });
const models = this.moduleRef.get(Models, { strict: false });
const docReader = this.moduleRef.get(DocReader, { strict: false });
const getDoc = buildDocContentGetter(ac, docReader, models);
tools.doc_read = createDocReadTool(getDoc.bind(null, options));
break;
@@ -220,7 +205,23 @@ export abstract class CopilotProvider<C = any> {
break;
}
case 'docCompose': {
tools.doc_compose = createDocComposeTool(prompt, this.factory);
const promptService = this.moduleRef.get(PromptService, {
strict: false,
});
tools.doc_compose = createDocComposeTool(
promptService,
this.factory
);
break;
}
case 'codeArtifact': {
const promptService = this.moduleRef.get(PromptService, {
strict: false,
});
tools.code_artifact = createCodeArtifactTool(
promptService,
this.factory
);
break;
}
}

View File

@@ -60,8 +60,6 @@ export const VertexSchema: JSONSchema = {
export const PromptConfigStrictSchema = z.object({
tools: z
.enum([
'codeArtifact',
'conversationSummary',
// work with morph
'docEdit',
// work with indexer
@@ -73,6 +71,7 @@ export const PromptConfigStrictSchema = z.object({
'webSearch',
// artifact tools
'docCompose',
'codeArtifact',
])
.array()
.nullable()

View File

@@ -6,10 +6,20 @@ import {
ImagePart,
TextPart,
TextStreamPart,
ToolSet,
} from 'ai';
import { ZodType } from 'zod';
import { CustomAITools } from '../tools';
import {
createCodeArtifactTool,
createDocComposeTool,
createDocEditTool,
createDocKeywordSearchTool,
createDocReadTool,
createDocSemanticSearchTool,
createExaCrawlTool,
createExaSearchTool,
} from '../tools';
import { PromptMessage, StreamObject } from './types';
type ChatMessage = CoreUserMessage | CoreAssistantMessage;
@@ -375,6 +385,17 @@ export class CitationParser {
}
}
export interface CustomAITools extends ToolSet {
doc_edit: ReturnType<typeof createDocEditTool>;
doc_semantic_search: ReturnType<typeof createDocSemanticSearchTool>;
doc_keyword_search: ReturnType<typeof createDocKeywordSearchTool>;
doc_read: ReturnType<typeof createDocReadTool>;
doc_compose: ReturnType<typeof createDocComposeTool>;
web_search_exa: ReturnType<typeof createExaSearchTool>;
web_crawl_exa: ReturnType<typeof createExaCrawlTool>;
code_artifact: ReturnType<typeof createCodeArtifactTool>;
}
type ChunkType = TextStreamPart<CustomAITools>['type'];
export function toError(error: unknown): Error {
@@ -430,10 +451,6 @@ export class TextStreamParser {
);
result = this.addPrefix(result);
switch (chunk.toolName) {
case 'conversation_summary': {
result += `\nSummarizing context\n`;
break;
}
case 'web_search_exa': {
result += `\nSearching the web "${chunk.args.query}"\n`;
break;

View File

@@ -37,7 +37,6 @@ import { Admin } from '../../core/common';
import { AccessController } from '../../core/permission';
import { UserType } from '../../core/user';
import type { ListSessionOptions, UpdateChatSession } from '../../models';
import { CopilotCronJobs } from './cron';
import { PromptService } from './prompt';
import { PromptMessage, StreamObject } from './providers';
import { ChatSessionService } from './session';
@@ -774,18 +773,7 @@ class CreateCopilotPromptInput {
@Admin()
@Resolver(() => String)
export class PromptsManagementResolver {
constructor(
private readonly cron: CopilotCronJobs,
private readonly promptService: PromptService
) {}
@Query(() => Boolean, {
description: 'Trigger generate missing titles cron job',
})
async triggerGenerateTitleCron() {
await this.cron.triggerGenerateMissingTitles();
return true;
}
constructor(private readonly promptService: PromptService) {}
@Query(() => [CopilotPromptType], {
description: 'List all copilot prompts',

View File

@@ -569,7 +569,7 @@ export class ChatSessionService {
});
if (!provider) {
throw new NoCopilotProviderAvailable({ modelId: prompt.model });
throw new NoCopilotProviderAvailable();
}
return provider.text(cond, [...prompt.finish({}), msg], config);

View File

@@ -5,7 +5,9 @@ import { z } from 'zod';
import type { PromptService } from '../prompt';
import type { CopilotProviderFactory } from '../providers';
import { toolError } from './error';
const logger = new Logger('CodeArtifactTool');
/**
* A copilot tool that produces a completely self-contained HTML artifact.
* The returned HTML must include <style> and <script> tags directly so that
@@ -35,20 +37,23 @@ export const createCodeArtifactTool = (
}),
execute: async ({ title, userPrompt }) => {
try {
const prompt = await promptService.get('Code Artifact');
const prompt = await promptService.get('Make it real with text');
if (!prompt) {
throw new Error('Prompt not found');
}
const provider = await factory.getProviderByModel(prompt.model);
if (!provider) {
throw new Error('Provider not found');
}
const content = await provider.text(
{
modelId: prompt.model,
},
prompt.finish({ content: userPrompt })
[...prompt.finish({}), { role: 'user', content: userPrompt }]
);
// Remove surrounding ``` or ```html fences if present
let stripped = content.trim();
if (stripped.startsWith('```')) {
@@ -60,6 +65,7 @@ export const createCodeArtifactTool = (
stripped = stripped.slice(0, -3);
}
}
return {
title,
html: stripped,

View File

@@ -1,76 +0,0 @@
import { Logger } from '@nestjs/common';
import { tool } from 'ai';
import { z } from 'zod';
import type { PromptService } from '../prompt';
import type { CopilotProviderFactory } from '../providers';
import { toolError } from './error';
const logger = new Logger('ConversationSummaryTool');
export const createConversationSummaryTool = (
sessionId: string | undefined,
promptService: PromptService,
factory: CopilotProviderFactory
) => {
return tool({
description:
'Create a concise, AI-generated summary of the conversation so far—capturing key topics, decisions, and critical details. Use this tool whenever the context becomes lengthy to preserve essential information that might otherwise be lost to truncation in future turns.',
parameters: z.object({
focus: z
.string()
.optional()
.describe(
'Optional focus area for the summary (e.g., "technical decisions", "user requirements", "project status")'
),
length: z
.enum(['brief', 'detailed', 'comprehensive'])
.default('detailed')
.describe(
'The desired length of the summary: brief (1-2 sentences), detailed (paragraph), comprehensive (multiple paragraphs)'
),
}),
execute: async ({ focus, length }, { messages }) => {
try {
if (!messages || messages.length === 0) {
return toolError(
'No Conversation Context',
'No messages available to summarize'
);
}
const prompt = await promptService.get('Conversation Summary');
const provider = await factory.getProviderByModel(prompt?.model || '');
if (!prompt || !provider) {
return toolError(
'Prompt Not Found',
'Failed to summarize conversation.'
);
}
const summary = await provider.text(
{ modelId: prompt.model },
prompt.finish({
messages: messages.map(m => ({
...m,
content: m.content.toString(),
})),
focus: focus || 'general',
length,
})
);
return {
focusArea: focus || 'general',
messageCount: messages.length,
summary,
timestamp: new Date().toISOString(),
};
} catch (err: any) {
logger.error(`Failed to summarize conversation (${sessionId})`, err);
return toolError('Conversation Summary Failed', err.message);
}
},
});
};

View File

@@ -2,7 +2,7 @@ import { tool } from 'ai';
import { z } from 'zod';
import type { AccessController } from '../../../core/permission';
import type { ChunkSimilarity, Models } from '../../../models';
import type { ChunkSimilarity } from '../../../models';
import type { CopilotContextService } from '../context';
import type { ContextSession } from '../context/session';
import type { CopilotChatOptions } from '../providers';
@@ -11,8 +11,7 @@ import { toolError } from './error';
export const buildDocSearchGetter = (
ac: AccessController,
context: CopilotContextService,
docContext: ContextSession | null,
models: Models
docContext: ContextSession | null
) => {
const searchDocs = async (
options: CopilotChatOptions,
@@ -46,24 +45,7 @@ export const buildDocSearchGetter = (
}
if (!docChunks.length && !fileChunks.length)
return `No results found for "${query}".`;
const docMetas = await models.doc
.findAuthors(
docChunks.map(c => ({
// oxlint-disable-next-line no-non-null-assertion
workspaceId: options.workspace!,
docId: c.docId,
}))
)
.then(docs => new Map(docs.filter(d => !!d).map(doc => [doc.id, doc])));
return [
...fileChunks,
...docChunks.map(c => ({
...c,
...docMetas.get(c.docId),
})),
] as ChunkSimilarity[];
return [...fileChunks, ...docChunks];
};
return searchDocs;
};

View File

@@ -1,29 +1,4 @@
import { ToolSet } from 'ai';
import { createCodeArtifactTool } from './code-artifact';
import { createConversationSummaryTool } from './conversation-summary';
import { createDocComposeTool } from './doc-compose';
import { createDocEditTool } from './doc-edit';
import { createDocKeywordSearchTool } from './doc-keyword-search';
import { createDocReadTool } from './doc-read';
import { createDocSemanticSearchTool } from './doc-semantic-search';
import { createExaCrawlTool } from './exa-crawl';
import { createExaSearchTool } from './exa-search';
export interface CustomAITools extends ToolSet {
code_artifact: ReturnType<typeof createCodeArtifactTool>;
conversation_summary: ReturnType<typeof createConversationSummaryTool>;
doc_edit: ReturnType<typeof createDocEditTool>;
doc_semantic_search: ReturnType<typeof createDocSemanticSearchTool>;
doc_keyword_search: ReturnType<typeof createDocKeywordSearchTool>;
doc_read: ReturnType<typeof createDocReadTool>;
doc_compose: ReturnType<typeof createDocComposeTool>;
web_search_exa: ReturnType<typeof createExaSearchTool>;
web_crawl_exa: ReturnType<typeof createExaCrawlTool>;
}
export * from './code-artifact';
export * from './conversation-summary';
export * from './doc-compose';
export * from './doc-edit';
export * from './doc-keyword-search';

View File

@@ -171,7 +171,7 @@ export class CopilotTranscriptionService {
);
if (!provider) {
throw new NoCopilotProviderAvailable({ modelId });
throw new NoCopilotProviderAvailable();
}
return provider;

View File

@@ -140,13 +140,10 @@ export class ElasticsearchProvider extends SearchProvider {
const result = await this.request(
'POST',
url.toString(),
JSON.stringify({ query }),
'application/json',
// ignore 409 error: version_conflict_engine_exception, version conflict, required seqNo [255898790], primary term [3]. current document has seqNo [256133002] and primary term [3]
[409]
JSON.stringify({ query })
);
this.logger.debug(
`deleted by query ${table} ${JSON.stringify(query)} in ${Date.now() - start}ms, result: ${JSON.stringify(result).substring(0, 500)}`
`deleted by query ${table} ${JSON.stringify(query)} in ${Date.now() - start}ms, result: ${JSON.stringify(result)}`
);
}
@@ -267,8 +264,7 @@ export class ElasticsearchProvider extends SearchProvider {
method: 'POST' | 'PUT',
url: string,
body: string,
contentType = 'application/json',
ignoreErrorStatus?: number[]
contentType = 'application/json'
) {
const headers = {
'Content-Type': contentType,
@@ -284,10 +280,6 @@ export class ElasticsearchProvider extends SearchProvider {
headers,
});
const data = await response.json();
if (ignoreErrorStatus?.includes(response.status)) {
return data;
}
// handle error, status >= 400
// {
// "error": {

View File

@@ -291,11 +291,6 @@ type CopilotFailedToAddWorkspaceFileEmbeddingDataType {
message: String!
}
type CopilotFailedToGenerateEmbeddingDataType {
message: String!
provider: String!
}
type CopilotFailedToMatchContextDataType {
content: String!
contextId: String!
@@ -600,7 +595,6 @@ type DocType {
mode: PublicDocMode!
permissions: DocPermissions!
public: Boolean!
summary: String
title: String
updatedAt: DateTime
workspaceId: String!
@@ -621,7 +615,7 @@ type EditorType {
name: String!
}
union ErrorDataUnion = AlreadyInSpaceDataType | BlobNotFoundDataType | CopilotContextFileNotSupportedDataType | CopilotDocNotFoundDataType | CopilotFailedToAddWorkspaceFileEmbeddingDataType | CopilotFailedToGenerateEmbeddingDataType | CopilotFailedToMatchContextDataType | CopilotFailedToMatchGlobalContextDataType | CopilotFailedToModifyContextDataType | CopilotInvalidContextDataType | CopilotMessageNotFoundDataType | CopilotPromptNotFoundDataType | CopilotProviderNotSupportedDataType | CopilotProviderSideErrorDataType | DocActionDeniedDataType | DocHistoryNotFoundDataType | DocNotFoundDataType | DocUpdateBlockedDataType | ExpectToGrantDocUserRolesDataType | ExpectToRevokeDocUserRolesDataType | ExpectToUpdateDocUserRoleDataType | GraphqlBadRequestDataType | HttpRequestErrorDataType | InvalidAppConfigDataType | InvalidAppConfigInputDataType | InvalidEmailDataType | InvalidHistoryTimestampDataType | InvalidIndexerInputDataType | InvalidLicenseToActivateDataType | InvalidLicenseUpdateParamsDataType | InvalidOauthCallbackCodeDataType | InvalidOauthResponseDataType | InvalidPasswordLengthDataType | InvalidRuntimeConfigTypeDataType | InvalidSearchProviderRequestDataType | MemberNotFoundInSpaceDataType | MentionUserDocAccessDeniedDataType | MissingOauthQueryParameterDataType | NoCopilotProviderAvailableDataType | NoMoreSeatDataType | NotInSpaceDataType | QueryTooLongDataType | RuntimeConfigNotFoundDataType | SameSubscriptionRecurringDataType | SpaceAccessDeniedDataType | SpaceNotFoundDataType | SpaceOwnerNotFoundDataType | SpaceShouldHaveOnlyOneOwnerDataType | SubscriptionAlreadyExistsDataType | SubscriptionNotExistsDataType | SubscriptionPlanNotFoundDataType | UnknownOauthProviderDataType | UnsupportedClientVersionDataType | UnsupportedSubscriptionPlanDataType | ValidationErrorDataType | VersionRejectedDataType | WorkspacePermissionNotFoundDataType | WrongSignInCredentialsDataType
union ErrorDataUnion = AlreadyInSpaceDataType | BlobNotFoundDataType | CopilotContextFileNotSupportedDataType | CopilotDocNotFoundDataType | CopilotFailedToAddWorkspaceFileEmbeddingDataType | CopilotFailedToMatchContextDataType | CopilotFailedToMatchGlobalContextDataType | CopilotFailedToModifyContextDataType | CopilotInvalidContextDataType | CopilotMessageNotFoundDataType | CopilotPromptNotFoundDataType | CopilotProviderNotSupportedDataType | CopilotProviderSideErrorDataType | DocActionDeniedDataType | DocHistoryNotFoundDataType | DocNotFoundDataType | DocUpdateBlockedDataType | ExpectToGrantDocUserRolesDataType | ExpectToRevokeDocUserRolesDataType | ExpectToUpdateDocUserRoleDataType | GraphqlBadRequestDataType | HttpRequestErrorDataType | InvalidAppConfigDataType | InvalidAppConfigInputDataType | InvalidEmailDataType | InvalidHistoryTimestampDataType | InvalidIndexerInputDataType | InvalidLicenseToActivateDataType | InvalidLicenseUpdateParamsDataType | InvalidOauthCallbackCodeDataType | InvalidOauthResponseDataType | InvalidPasswordLengthDataType | InvalidRuntimeConfigTypeDataType | InvalidSearchProviderRequestDataType | MemberNotFoundInSpaceDataType | MentionUserDocAccessDeniedDataType | MissingOauthQueryParameterDataType | NoMoreSeatDataType | NotInSpaceDataType | QueryTooLongDataType | RuntimeConfigNotFoundDataType | SameSubscriptionRecurringDataType | SpaceAccessDeniedDataType | SpaceNotFoundDataType | SpaceOwnerNotFoundDataType | SpaceShouldHaveOnlyOneOwnerDataType | SubscriptionAlreadyExistsDataType | SubscriptionNotExistsDataType | SubscriptionPlanNotFoundDataType | UnknownOauthProviderDataType | UnsupportedClientVersionDataType | UnsupportedSubscriptionPlanDataType | ValidationErrorDataType | VersionRejectedDataType | WorkspacePermissionNotFoundDataType | WrongSignInCredentialsDataType
enum ErrorNames {
ACCESS_DENIED
@@ -650,7 +644,6 @@ enum ErrorNames {
COPILOT_EMBEDDING_UNAVAILABLE
COPILOT_FAILED_TO_ADD_WORKSPACE_FILE_EMBEDDING
COPILOT_FAILED_TO_CREATE_MESSAGE
COPILOT_FAILED_TO_GENERATE_EMBEDDING
COPILOT_FAILED_TO_GENERATE_TEXT
COPILOT_FAILED_TO_MATCH_CONTEXT
COPILOT_FAILED_TO_MATCH_GLOBAL_CONTEXT
@@ -1342,10 +1335,6 @@ type Mutation {
verifyEmail(token: String!): Boolean!
}
type NoCopilotProviderAvailableDataType {
modelId: String!
}
type NoMoreSeatDataType {
spaceId: String!
}

View File

@@ -82,10 +82,6 @@ export type RequestOptions<Q extends GraphQLQuery> = QueryVariablesOption<Q> & {
* @default 15000
*/
timeout?: number;
/**
* Abort signal
*/
signal?: AbortSignal;
};
export type QueryOptions<Q extends GraphQLQuery> = RequestOptions<Q> & {
@@ -211,7 +207,6 @@ export const gqlFetcherFactory = (
headers,
body: isFormData ? body : JSON.stringify(body),
timeout: options.timeout,
signal: options.signal,
})
).then(async res => {
if (res.headers.get('content-type')?.startsWith('application/json')) {

View File

@@ -3,17 +3,15 @@
query getCopilotRecentSessions(
$workspaceId: String!
$limit: Int = 10
$offset: Int = 0
) {
currentUser {
copilot(workspaceId: $workspaceId) {
chats(
pagination: { first: $limit, offset: $offset }
pagination: { first: $limit }
options: {
action: false
fork: false
sessionOrder: desc
withMessages: false
withMessages: true
}
) {
...PaginatedCopilotChats

View File

@@ -5,8 +5,6 @@ query getWorkspacePageById($workspaceId: String!, $pageId: String!) {
mode
defaultRole
public
title
summary
}
}
}

View File

@@ -1068,12 +1068,12 @@ ${paginatedCopilotChatsFragment}`,
export const getCopilotRecentSessionsQuery = {
id: 'getCopilotRecentSessionsQuery' as const,
op: 'getCopilotRecentSessions',
query: `query getCopilotRecentSessions($workspaceId: String!, $limit: Int = 10, $offset: Int = 0) {
query: `query getCopilotRecentSessions($workspaceId: String!, $limit: Int = 10) {
currentUser {
copilot(workspaceId: $workspaceId) {
chats(
pagination: {first: $limit, offset: $offset}
options: {action: false, fork: false, sessionOrder: desc, withMessages: false}
pagination: {first: $limit}
options: {fork: false, sessionOrder: desc, withMessages: true}
) {
...PaginatedCopilotChats
}
@@ -1584,8 +1584,6 @@ export const getWorkspacePageByIdQuery = {
mode
defaultRole
public
title
summary
}
}
}`,

View File

@@ -375,12 +375,6 @@ export interface CopilotFailedToAddWorkspaceFileEmbeddingDataType {
message: Scalars['String']['output'];
}
export interface CopilotFailedToGenerateEmbeddingDataType {
__typename?: 'CopilotFailedToGenerateEmbeddingDataType';
message: Scalars['String']['output'];
provider: Scalars['String']['output'];
}
export interface CopilotFailedToMatchContextDataType {
__typename?: 'CopilotFailedToMatchContextDataType';
content: Scalars['String']['output'];
@@ -709,7 +703,6 @@ export interface DocType {
mode: PublicDocMode;
permissions: DocPermissions;
public: Scalars['Boolean']['output'];
summary: Maybe<Scalars['String']['output']>;
title: Maybe<Scalars['String']['output']>;
updatedAt: Maybe<Scalars['DateTime']['output']>;
workspaceId: Scalars['String']['output'];
@@ -743,7 +736,6 @@ export type ErrorDataUnion =
| CopilotContextFileNotSupportedDataType
| CopilotDocNotFoundDataType
| CopilotFailedToAddWorkspaceFileEmbeddingDataType
| CopilotFailedToGenerateEmbeddingDataType
| CopilotFailedToMatchContextDataType
| CopilotFailedToMatchGlobalContextDataType
| CopilotFailedToModifyContextDataType
@@ -776,7 +768,6 @@ export type ErrorDataUnion =
| MemberNotFoundInSpaceDataType
| MentionUserDocAccessDeniedDataType
| MissingOauthQueryParameterDataType
| NoCopilotProviderAvailableDataType
| NoMoreSeatDataType
| NotInSpaceDataType
| QueryTooLongDataType
@@ -824,7 +815,6 @@ export enum ErrorNames {
COPILOT_EMBEDDING_UNAVAILABLE = 'COPILOT_EMBEDDING_UNAVAILABLE',
COPILOT_FAILED_TO_ADD_WORKSPACE_FILE_EMBEDDING = 'COPILOT_FAILED_TO_ADD_WORKSPACE_FILE_EMBEDDING',
COPILOT_FAILED_TO_CREATE_MESSAGE = 'COPILOT_FAILED_TO_CREATE_MESSAGE',
COPILOT_FAILED_TO_GENERATE_EMBEDDING = 'COPILOT_FAILED_TO_GENERATE_EMBEDDING',
COPILOT_FAILED_TO_GENERATE_TEXT = 'COPILOT_FAILED_TO_GENERATE_TEXT',
COPILOT_FAILED_TO_MATCH_CONTEXT = 'COPILOT_FAILED_TO_MATCH_CONTEXT',
COPILOT_FAILED_TO_MATCH_GLOBAL_CONTEXT = 'COPILOT_FAILED_TO_MATCH_GLOBAL_CONTEXT',
@@ -1890,11 +1880,6 @@ export interface MutationVerifyEmailArgs {
token: Scalars['String']['input'];
}
export interface NoCopilotProviderAvailableDataType {
__typename?: 'NoCopilotProviderAvailableDataType';
modelId: Scalars['String']['output'];
}
export interface NoMoreSeatDataType {
__typename?: 'NoMoreSeatDataType';
spaceId: Scalars['String']['output'];
@@ -4365,7 +4350,6 @@ export type GetCopilotSessionQuery = {
export type GetCopilotRecentSessionsQueryVariables = Exact<{
workspaceId: Scalars['String']['input'];
limit?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
}>;
export type GetCopilotRecentSessionsQuery = {
@@ -5163,8 +5147,6 @@ export type GetWorkspacePageByIdQuery = {
mode: PublicDocMode;
defaultRole: DocRole;
public: boolean;
title: string | null;
summary: string | null;
};
};
};

View File

@@ -541,7 +541,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 0.23.1;
MARKETING_VERSION = 0.22.2;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -577,7 +577,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 0.23.1;
MARKETING_VERSION = 0.22.2;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro;
PRODUCT_NAME = "$(TARGET_NAME)";

View File

@@ -1,6 +1,5 @@
import type { MindmapElementModel } from '@blocksuite/affine/model';
import type { EditorHost } from '@blocksuite/affine/std';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import { createAIScrollableTextRenderer } from '../components/ai-scrollable-text-renderer';
import {
@@ -53,11 +52,5 @@ export function actionToAnswerRenderer<
return createImageRenderer(host, { height: 300 });
}
return createAIScrollableTextRenderer(
{
theme: host.std.get(ThemeProvider).app$,
},
320,
true
);
return createAIScrollableTextRenderer(host, {}, 320, true);
}

View File

@@ -11,7 +11,6 @@ import {
} from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { GfxControllerIdentifier } from '@blocksuite/affine/std/gfx';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import {
ChatWithAiIcon,
DeleteIcon,
@@ -307,13 +306,7 @@ export function buildAIPanelConfig(
const ctx = new AIContext();
const searchService = framework.get(AINetworkSearchService);
return {
answerRenderer: createAIScrollableTextRenderer(
{
theme: panel.host.std.get(ThemeProvider).app$,
},
320,
true
),
answerRenderer: createAIScrollableTextRenderer(panel.host, {}, 320, true),
finishStateConfig: buildFinishConfig(panel, 'chat', ctx),
generatingStateConfig: buildGeneratingConfig(),
errorStateConfig: buildErrorConfig(panel),

View File

@@ -20,15 +20,16 @@ import { property, state } from 'lit/decorators.js';
import { keyed } from 'lit/directives/keyed.js';
import { AffineIcon } from '../_common/icons';
import type { SearchMenuConfig } from '../components/ai-chat-add-context';
import type { DocDisplayConfig } from '../components/ai-chat-chips';
import type {
DocDisplayConfig,
SearchMenuConfig,
} from '../components/ai-chat-chips';
import type { ChatContextValue } from '../components/ai-chat-content';
import type {
AINetworkSearchConfig,
AIPlaygroundConfig,
AIReasoningConfig,
} from '../components/ai-chat-input';
import type { ChatStatus } from '../components/ai-chat-messages';
import { createPlaygroundModal } from '../components/playground/modal';
import { AIProvider } from '../provider';
import type { AppSidebarConfig } from './chat-config';
@@ -137,9 +138,6 @@ export class ChatPanel extends SignalWatcher(
@state()
accessor embeddingProgress: [number, number] = [0, 0];
@state()
accessor status: ChatStatus = 'idle';
private isSidebarOpen: Signal<boolean | undefined> = signal(false);
private sidebarWidth: Signal<number | undefined> = signal(undefined);
@@ -173,7 +171,6 @@ export class ChatPanel extends SignalWatcher(
.session=${this.session}
.workspaceId=${this.doc.workspace.id}
.docId=${this.doc.id}
.status=${this.status}
.onNewSession=${this.newSession}
.onTogglePin=${this.togglePin}
.onOpenSession=${this.openSession}
@@ -362,7 +359,6 @@ export class ChatPanel extends SignalWatcher(
private readonly onContextChange = async (
context: Partial<ChatContextValue>
) => {
this.status = context.status ?? 'idle';
if (context.status === 'success') {
await this.rebindSession();
}
@@ -383,7 +379,6 @@ export class ChatPanel extends SignalWatcher(
.affineFeatureFlagService=${this.affineFeatureFlagService}
.affineThemeService=${this.affineThemeService}
.notificationService=${this.notificationService}
.affineWorkspaceDialogService=${this.affineWorkspaceDialogService}
></playground-content>
`;

View File

@@ -3,11 +3,8 @@ import type { AppThemeService } from '@affine/core/modules/theme';
import type { CopilotChatHistoryFragment } from '@affine/graphql';
import { WithDisposable } from '@blocksuite/affine/global/lit';
import { isInsidePageEditor } from '@blocksuite/affine/shared/utils';
import {
type BlockStdScope,
type EditorHost,
ShadowlessElement,
} from '@blocksuite/affine/std';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
import type { ExtensionType } from '@blocksuite/affine/store';
import type { NotificationService } from '@blocksuite/affine-shared/services';
import type { Signal } from '@preact/signals-core';
@@ -18,7 +15,6 @@ import {
EdgelessEditorActions,
PageEditorActions,
} from '../../_common/chat-actions-handle';
import type { DocDisplayConfig } from '../../components/ai-chat-chips';
import {
type ChatMessage,
type ChatStatus,
@@ -41,9 +37,6 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor host: EditorHost | null | undefined;
@property({ attribute: false })
accessor std: BlockStdScope | null | undefined;
@property({ attribute: false })
accessor item!: ChatMessage;
@@ -80,12 +73,6 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor notificationService!: NotificationService;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
@property({ attribute: false })
accessor docDisplayService!: DocDisplayConfig;
get state() {
const { isLast, status } = this;
return isLast
@@ -137,7 +124,6 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
private renderStreamObjects(answer: StreamObject[]) {
return html`<chat-content-stream-objects
.host=${this.host}
.std=${this.std}
.answer=${answer}
.state=${this.state}
.width=${this.width}
@@ -145,7 +131,6 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
.affineFeatureFlagService=${this.affineFeatureFlagService}
.notificationService=${this.notificationService}
.theme=${this.affineThemeService.appTheme.themeSignal}
.docDisplayService=${this.docDisplayService}
></chat-content-stream-objects>`;
}
@@ -183,7 +168,7 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
: EdgelessEditorActions
: null;
const showActions = host && !!markdown && !this.independentMode;
const showActions = host && !!markdown;
return html`
<chat-copy-more

View File

@@ -1,101 +0,0 @@
import { createLitPortal } from '@blocksuite/affine/components/portal';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { ShadowlessElement } from '@blocksuite/affine/std';
import { PlusIcon } from '@blocksuite/icons/lit';
import { flip, offset } from '@floating-ui/dom';
import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
import type { ChatChip, DocDisplayConfig } from '../ai-chat-chips';
import type { SearchMenuConfig } from './type';
export class AIChatAddContext extends SignalWatcher(
WithDisposable(ShadowlessElement)
) {
static override styles = css`
.ai-chat-add-context {
display: flex;
flex-shrink: 0;
flex-grow: 0;
align-items: center;
justify-content: center;
cursor: pointer;
}
`;
@property({ attribute: false })
accessor docId: string | undefined;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
@property({ attribute: false })
accessor addChip!: (chip: ChatChip) => Promise<void>;
@property({ attribute: false })
accessor addImages!: (images: File[]) => void;
@property({ attribute: false })
accessor docDisplayConfig!: DocDisplayConfig;
@property({ attribute: false })
accessor searchMenuConfig!: SearchMenuConfig;
@property({ attribute: false })
accessor portalContainer: HTMLElement | null = null;
@query('.ai-chat-add-context')
accessor addButton!: HTMLDivElement;
private abortController: AbortController | null = null;
override render() {
return html`
<div
class="ai-chat-add-context"
data-testid="chat-panel-with-button"
@click=${this.toggleAddDocMenu}
>
${PlusIcon()}
</div>
`;
}
private readonly toggleAddDocMenu = () => {
if (this.abortController) {
this.abortController.abort();
return;
}
this.abortController = new AbortController();
this.abortController.signal.addEventListener('abort', () => {
this.abortController = null;
});
createLitPortal({
template: html`
<chat-panel-add-popover
.docId=${this.docId}
.independentMode=${this.independentMode}
.addChip=${this.addChip}
.addImages=${this.addImages}
.searchMenuConfig=${this.searchMenuConfig}
.docDisplayConfig=${this.docDisplayConfig}
.abortController=${this.abortController}
></chat-panel-add-popover>
`,
portalStyles: {
zIndex: 'var(--affine-z-index-popover)',
},
container: this.portalContainer ?? document.body,
computePosition: {
referenceElement: this.addButton,
placement: 'top-start',
middleware: [offset({ crossAxis: -30, mainAxis: 8 }), flip()],
autoUpdate: { animationFrame: true },
},
abortController: this.abortController,
closeOnClickAway: true,
});
};
}

View File

@@ -1,2 +0,0 @@
export * from './ai-chat-add-context';
export * from './type';

View File

@@ -1,24 +0,0 @@
import type {
SearchCollectionMenuAction,
SearchDocMenuAction,
SearchTagMenuAction,
} from '@affine/core/modules/search-menu/services';
import type { LinkedMenuGroup } from '@blocksuite/affine/widgets/linked-doc';
export interface SearchMenuConfig {
getDocMenuGroup: (
query: string,
action: SearchDocMenuAction,
abortSignal: AbortSignal
) => LinkedMenuGroup;
getTagMenuGroup: (
query: string,
action: SearchTagMenuAction,
abortSignal: AbortSignal
) => LinkedMenuGroup;
getCollectionMenuGroup: (
query: string,
action: SearchCollectionMenuAction,
abortSignal: AbortSignal
) => LinkedMenuGroup;
}

View File

@@ -1,7 +1,7 @@
import { toast } from '@affine/component';
import type { TagMeta } from '@affine/core/components/page-list';
import type { CollectionMeta } from '@affine/core/modules/collection';
import track, { type EventArgs } from '@affine/track';
import track from '@affine/track';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { scrollbarStyle } from '@blocksuite/affine/shared/styles';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';
@@ -21,8 +21,8 @@ import { css, html, type TemplateResult } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
import type { SearchMenuConfig } from '../ai-chat-add-context';
import type { ChatChip, DocDisplayConfig } from './type';
import { MAX_IMAGE_COUNT } from '../ai-chat-input';
import type { ChatChip, DocDisplayConfig, SearchMenuConfig } from './type';
enum AddPopoverMode {
Default = 'default',
@@ -120,12 +120,6 @@ export class ChatPanelAddPopover extends SignalWatcher(
private accessor _query = '';
@property({ attribute: false })
accessor independentMode: boolean | undefined;
@property({ attribute: false })
accessor docId: string | undefined;
@state()
private accessor _searchGroups: MenuGroup[] = [];
@@ -171,31 +165,35 @@ export class ChatPanelAddPopover extends SignalWatcher(
const files = await openFilesWith();
if (!files || files.length === 0) return;
this.abortController.abort();
const images = files.filter(file => file.type.startsWith('image/'));
if (images.length > 0) {
this.addImages(images);
}
const others = files.filter(file => !file.type.startsWith('image/'));
const addChipPromises = others.map(async file => {
for (const file of others) {
if (file.size > 50 * 1024 * 1024) {
toast(`${file.name} is too large, please upload a file less than 50MB`);
return;
} else {
await this.addChip({
file,
state: 'processing',
});
}
await this.addChip({
file,
state: 'processing',
});
});
await Promise.all(addChipPromises);
}
this._track('file');
this.abortController.abort();
};
private readonly _addImageChip = async () => {
if (this.isImageUploadDisabled) return;
const images = await openFilesWith('Images');
if (!images) return;
this.abortController.abort();
if (this.uploadImageCount + images.length > MAX_IMAGE_COUNT) {
toast(`You can only upload up to ${MAX_IMAGE_COUNT} images`);
return;
}
this.addImages(images);
};
@@ -291,6 +289,9 @@ export class ChatPanelAddPopover extends SignalWatcher(
@property({ attribute: 'data-testid', reflect: true })
accessor testId: string = 'ai-search-input';
@property({ attribute: false })
accessor isImageUploadDisabled!: boolean;
@property({ attribute: false })
accessor uploadImageCount!: number;
@@ -497,32 +498,31 @@ export class ChatPanelAddPopover extends SignalWatcher(
}
private readonly _addDocChip = async (meta: DocMeta) => {
this.abortController.abort();
await this.addChip({
docId: meta.id,
state: 'processing',
});
const mode = this.docDisplayConfig.getDocPrimaryMode(meta.id);
const method = meta.id === this.docId ? 'cur-doc' : 'doc';
this._track(method, mode);
this._track('doc', mode);
this.abortController.abort();
};
private readonly _addTagChip = async (tag: TagMeta) => {
this.abortController.abort();
await this.addChip({
tagId: tag.id,
state: 'processing',
});
this._track('tags');
this.abortController.abort();
};
private readonly _addCollectionChip = async (collection: CollectionMeta) => {
this.abortController.abort();
await this.addChip({
collectionId: collection.id,
state: 'processing',
});
this._track('collections');
this.abortController.abort();
};
private readonly _handleKeyDown = (event: KeyboardEvent) => {
@@ -568,13 +568,10 @@ export class ChatPanelAddPopover extends SignalWatcher(
}
private _track(
method: EventArgs['addEmbeddingDoc']['method'],
method: 'doc' | 'file' | 'tags' | 'collections',
type?: 'page' | 'edgeless'
) {
const page = this.independentMode
? track.$.intelligence
: track.$.chatPanel;
page.chatPanelInput.addEmbeddingDoc({
track.$.chatPanel.chatPanelInput.addEmbeddingDoc({
control: 'addButton',
method,
type,

View File

@@ -3,7 +3,7 @@ import { createLitPortal } from '@blocksuite/affine/components/portal';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';
import { ShadowlessElement } from '@blocksuite/affine/std';
import { MoreVerticalIcon } from '@blocksuite/icons/lit';
import { MoreVerticalIcon, PlusIcon } from '@blocksuite/icons/lit';
import { flip, offset } from '@floating-ui/dom';
import { computed, type Signal, signal } from '@preact/signals-core';
import { css, html, nothing, type PropertyValues } from 'lit';
@@ -11,7 +11,16 @@ import { property, query, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
import { isEqual } from 'lodash-es';
import type { ChatChip, DocChip, DocDisplayConfig, FileChip } from './type';
import { AIProvider } from '../../provider';
import type {
ChatChip,
CollectionChip,
DocChip,
DocDisplayConfig,
FileChip,
SearchMenuConfig,
TagChip,
} from './type';
import {
estimateTokenCount,
getChipKey,
@@ -30,46 +39,44 @@ export class ChatPanelChips extends SignalWatcher(
WithDisposable(ShadowlessElement)
) {
static override styles = css`
.ai-chat-panel-chips {
.chips-wrapper {
display: flex;
gap: 8px;
align-items: center;
flex-wrap: wrap;
padding: 4px 12px;
.collapse-button,
.more-candidate-button {
display: flex;
flex-shrink: 0;
flex-grow: 0;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
border: 0.5px solid ${unsafeCSSVarV2('layer/insideBorder/border')};
border-radius: 4px;
box-sizing: border-box;
cursor: pointer;
font-size: 12px;
color: ${unsafeCSSVarV2('icon/primary')};
}
.collapse-button:hover,
.more-candidate-button:hover {
background-color: ${unsafeCSSVarV2('layer/background/hoverOverlay')};
}
.more-candidate-button {
border-width: 1px;
border-style: dashed;
border-color: ${unsafeCSSVarV2('icon/tertiary')};
background: ${unsafeCSSVarV2('layer/background/secondary')};
color: ${unsafeCSSVarV2('icon/secondary')};
}
.more-candidate-button svg {
color: ${unsafeCSSVarV2('icon/secondary')};
}
}
.add-button,
.collapse-button,
.more-candidate-button {
display: flex;
flex-shrink: 0;
flex-grow: 0;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
border: 0.5px solid ${unsafeCSSVarV2('layer/insideBorder/border')};
border-radius: 4px;
box-sizing: border-box;
cursor: pointer;
font-size: 12px;
color: ${unsafeCSSVarV2('icon/primary')};
}
.add-button:hover,
.collapse-button:hover,
.more-candidate-button:hover {
background-color: ${unsafeCSSVarV2('layer/background/hoverOverlay')};
}
.more-candidate-button {
border-width: 1px;
border-style: dashed;
border-color: ${unsafeCSSVarV2('icon/tertiary')};
background: ${unsafeCSSVarV2('layer/background/secondary')};
color: ${unsafeCSSVarV2('icon/secondary')};
}
.more-candidate-button svg {
color: ${unsafeCSSVarV2('icon/secondary')};
}
`;
@@ -79,38 +86,38 @@ export class ChatPanelChips extends SignalWatcher(
accessor chips!: ChatChip[];
@property({ attribute: false })
accessor isCollapsed!: boolean;
accessor createContextId!: () => Promise<string | undefined>;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
accessor updateChips!: (chips: ChatChip[]) => void;
@property({ attribute: false })
accessor addChip!: (chip: ChatChip) => Promise<void>;
accessor addImages!: (images: File[]) => void;
@property({ attribute: false })
accessor updateChip!: (
chip: ChatChip,
options: Partial<DocChip | FileChip>
) => void;
@property({ attribute: false })
accessor removeChip!: (chip: ChatChip) => Promise<void>;
@property({ attribute: false })
accessor toggleCollapse!: () => void;
accessor pollContextDocsAndFiles!: () => void;
@property({ attribute: false })
accessor docDisplayConfig!: DocDisplayConfig;
@property({ attribute: false })
accessor searchMenuConfig!: SearchMenuConfig;
@property({ attribute: false })
accessor portalContainer: HTMLElement | null = null;
@property({ attribute: 'data-testid', reflect: true })
accessor testId = 'chat-panel-chips';
@query('.add-button')
accessor addButton!: HTMLDivElement;
@query('.more-candidate-button')
accessor moreCandidateButton!: HTMLDivElement;
@state()
accessor isCollapsed = false;
@state()
accessor referenceDocs: Signal<
Array<{
@@ -137,7 +144,14 @@ export class ChatPanelChips extends SignalWatcher(
const isCollapsed = this.isCollapsed && allChips.length > 1;
const chips = isCollapsed ? allChips.slice(0, 1) : allChips;
return html`<div class="ai-chat-panel-chips">
return html`<div class="chips-wrapper">
<div
class="add-button"
data-testid="chat-panel-with-button"
@click=${this._toggleAddDocMenu}
>
${PlusIcon()}
</div>
${repeat(
chips,
chip => getChipKey(chip),
@@ -145,10 +159,9 @@ export class ChatPanelChips extends SignalWatcher(
if (isDocChip(chip)) {
return html`<chat-panel-doc-chip
.chip=${chip}
.independentMode=${this.independentMode}
.addChip=${this.addChip}
.updateChip=${this.updateChip}
.removeChip=${this.removeChip}
.addChip=${this._addChip}
.updateChip=${this._updateChip}
.removeChip=${this._removeChip}
.checkTokenLimit=${this._checkTokenLimit}
.docDisplayConfig=${this.docDisplayConfig}
></chat-panel-doc-chip>`;
@@ -156,7 +169,7 @@ export class ChatPanelChips extends SignalWatcher(
if (isFileChip(chip)) {
return html`<chat-panel-file-chip
.chip=${chip}
.removeChip=${this.removeChip}
.removeChip=${this._removeChip}
></chat-panel-file-chip>`;
}
if (isTagChip(chip)) {
@@ -167,7 +180,7 @@ export class ChatPanelChips extends SignalWatcher(
return html`<chat-panel-tag-chip
.chip=${chip}
.tag=${tag}
.removeChip=${this.removeChip}
.removeChip=${this._removeChip}
></chat-panel-tag-chip>`;
}
if (isCollectionChip(chip)) {
@@ -180,7 +193,7 @@ export class ChatPanelChips extends SignalWatcher(
return html`<chat-panel-collection-chip
.chip=${chip}
.collection=${collection}
.removeChip=${this.removeChip}
.removeChip=${this._removeChip}
></chat-panel-collection-chip>`;
}
return null;
@@ -195,7 +208,7 @@ export class ChatPanelChips extends SignalWatcher(
</div>`
: nothing}
${isCollapsed
? html`<div class="collapse-button" @click=${this.toggleCollapse}>
? html`<div class="collapse-button" @click=${this._toggleCollapse}>
+${allChips.length - 1}
</div>`
: nothing}
@@ -214,6 +227,14 @@ export class ChatPanelChips extends SignalWatcher(
}
protected override updated(_changedProperties: PropertyValues): void {
if (
_changedProperties.has('chatContextValue') &&
_changedProperties.get('chatContextValue')?.status === 'loading' &&
this.isCollapsed === false
) {
this.isCollapsed = true;
}
if (_changedProperties.has('chips')) {
this._updateReferenceDocs();
}
@@ -224,6 +245,46 @@ export class ChatPanelChips extends SignalWatcher(
this._cleanup?.();
}
private readonly _toggleCollapse = () => {
this.isCollapsed = !this.isCollapsed;
};
private readonly _toggleAddDocMenu = () => {
if (this._abortController) {
this._abortController.abort();
return;
}
this._abortController = new AbortController();
this._abortController.signal.addEventListener('abort', () => {
this._abortController = null;
});
createLitPortal({
template: html`
<chat-panel-add-popover
.addChip=${this._addChip}
.addImages=${this.addImages}
.searchMenuConfig=${this.searchMenuConfig}
.docDisplayConfig=${this.docDisplayConfig}
.abortController=${this._abortController}
></chat-panel-add-popover>
`,
portalStyles: {
zIndex: 'var(--affine-z-index-popover)',
},
container: this.portalContainer ?? document.body,
computePosition: {
referenceElement: this.addButton,
placement: 'top-start',
middleware: [offset({ crossAxis: -30, mainAxis: 8 }), flip()],
autoUpdate: { animationFrame: true },
},
abortController: this._abortController,
closeOnClickAway: true,
});
};
private readonly _toggleMoreCandidatesMenu = () => {
if (this._abortController) {
this._abortController.abort();
@@ -242,7 +303,7 @@ export class ChatPanelChips extends SignalWatcher(
createLitPortal({
template: html`
<chat-panel-candidates-popover
.addChip=${this.addChip}
.addChip=${this._addChip}
.referenceDocs=${referenceDocs}
.docDisplayConfig=${this.docDisplayConfig}
.abortController=${this._abortController}
@@ -263,6 +324,190 @@ export class ChatPanelChips extends SignalWatcher(
});
};
private readonly _addChip = async (chip: ChatChip) => {
this.isCollapsed = false;
// remove the chip if it already exists
const chips = this._omitChip(this.chips, chip);
this.updateChips([...chips, chip]);
if (chips.length < this.chips.length) {
await this._removeFromContext(chip);
}
await this._addToContext(chip);
this.pollContextDocsAndFiles();
};
private readonly _updateChip = (
chip: ChatChip,
options: Partial<DocChip | FileChip>
) => {
const index = this._findChipIndex(this.chips, chip);
if (index === -1) {
return;
}
const nextChip: ChatChip = {
...chip,
...options,
};
this.updateChips([
...this.chips.slice(0, index),
nextChip,
...this.chips.slice(index + 1),
]);
};
private readonly _removeChip = async (chip: ChatChip) => {
const chips = this._omitChip(this.chips, chip);
this.updateChips(chips);
if (chips.length < this.chips.length) {
await this._removeFromContext(chip);
}
};
private readonly _addToContext = async (chip: ChatChip) => {
if (isDocChip(chip)) {
return await this._addDocToContext(chip);
}
if (isFileChip(chip)) {
return await this._addFileToContext(chip);
}
if (isTagChip(chip)) {
return await this._addTagToContext(chip);
}
if (isCollectionChip(chip)) {
return await this._addCollectionToContext(chip);
}
return null;
};
private readonly _addDocToContext = async (chip: DocChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
await AIProvider.context.addContextDoc({
contextId,
docId: chip.docId,
});
} catch (e) {
this._updateChip(chip, {
state: 'failed',
tooltip: e instanceof Error ? e.message : 'Add context doc error',
});
}
};
private readonly _addFileToContext = async (chip: FileChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
const contextFile = await AIProvider.context.addContextFile(chip.file, {
contextId,
});
this._updateChip(chip, {
state: contextFile.status,
blobId: contextFile.blobId,
fileId: contextFile.id,
});
} catch (e) {
this._updateChip(chip, {
state: 'failed',
tooltip: e instanceof Error ? e.message : 'Add context file error',
});
}
};
private readonly _addTagToContext = async (chip: TagChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
// TODO: server side docIds calculation
const docIds = this.docDisplayConfig.getTagPageIds(chip.tagId);
await AIProvider.context.addContextTag({
contextId,
tagId: chip.tagId,
docIds,
});
this._updateChip(chip, {
state: 'finished',
});
} catch (e) {
this._updateChip(chip, {
state: 'failed',
tooltip: e instanceof Error ? e.message : 'Add context tag error',
});
}
};
private readonly _addCollectionToContext = async (chip: CollectionChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
// TODO: server side docIds calculation
const docIds = this.docDisplayConfig.getCollectionPageIds(
chip.collectionId
);
await AIProvider.context.addContextCollection({
contextId,
collectionId: chip.collectionId,
docIds,
});
this._updateChip(chip, {
state: 'finished',
});
} catch (e) {
this._updateChip(chip, {
state: 'failed',
tooltip:
e instanceof Error ? e.message : 'Add context collection error',
});
}
};
private readonly _removeFromContext = async (
chip: ChatChip
): Promise<boolean> => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
return true;
}
if (isDocChip(chip)) {
return await AIProvider.context.removeContextDoc({
contextId,
docId: chip.docId,
});
}
if (isFileChip(chip) && chip.fileId) {
return await AIProvider.context.removeContextFile({
contextId,
fileId: chip.fileId,
});
}
if (isTagChip(chip)) {
return await AIProvider.context.removeContextTag({
contextId,
tagId: chip.tagId,
});
}
if (isCollectionChip(chip)) {
return await AIProvider.context.removeContextCollection({
contextId,
collectionId: chip.collectionId,
});
}
return true;
} catch {
return true;
}
};
private readonly _checkTokenLimit = (
newChip: DocChip,
newTokenCount: number
@@ -299,4 +544,44 @@ export class ChatPanelChips extends SignalWatcher(
this.referenceDocs = signal;
this._cleanup = cleanup;
};
private readonly _omitChip = (chips: ChatChip[], chip: ChatChip) => {
return chips.filter(item => {
if (isDocChip(chip)) {
return !isDocChip(item) || item.docId !== chip.docId;
}
if (isFileChip(chip)) {
return !isFileChip(item) || item.file !== chip.file;
}
if (isTagChip(chip)) {
return !isTagChip(item) || item.tagId !== chip.tagId;
}
if (isCollectionChip(chip)) {
return (
!isCollectionChip(item) || item.collectionId !== chip.collectionId
);
}
return true;
});
};
private readonly _findChipIndex = (chips: ChatChip[], chip: ChatChip) => {
return chips.findIndex(item => {
if (isDocChip(chip)) {
return isDocChip(item) && item.docId === chip.docId;
}
if (isFileChip(chip)) {
return isFileChip(item) && item.file === chip.file;
}
if (isTagChip(chip)) {
return isTagChip(item) && item.tagId === chip.tagId;
}
if (isCollectionChip(chip)) {
return (
isCollectionChip(item) && item.collectionId === chip.collectionId
);
}
return -1;
});
};
}

View File

@@ -18,9 +18,6 @@ export class ChatPanelDocChip extends SignalWatcher(
@property({ attribute: false })
accessor chip!: DocChip;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
@property({ attribute: false })
accessor addChip!: (chip: DocChip) => void;
@@ -84,10 +81,7 @@ export class ChatPanelDocChip extends SignalWatcher(
state: 'processing',
});
const mode = this.docDisplayConfig.getDocPrimaryMode(this.chip.docId);
const page = this.independentMode
? track.$.intelligence
: track.$.chatPanel;
page.chatPanelInput.addEmbeddingDoc({
track.$.chatPanel.chatPanelInput.addEmbeddingDoc({
control: 'addButton',
method: 'suggestion',
type: mode,

View File

@@ -1,5 +1,11 @@
import type { TagMeta } from '@affine/core/components/page-list';
import type {
SearchCollectionMenuAction,
SearchDocMenuAction,
SearchTagMenuAction,
} from '@affine/core/modules/search-menu/services';
import type { DocMeta, Store } from '@blocksuite/affine/store';
import type { LinkedMenuGroup } from '@blocksuite/affine/widgets/linked-doc';
import type { Signal } from '@preact/signals-core';
export type ChipState = 'candidate' | 'processing' | 'finished' | 'failed';
@@ -69,3 +75,21 @@ export interface DocDisplayConfig {
};
getCollectionPageIds: (collectionId: string) => string[];
}
export interface SearchMenuConfig {
getDocMenuGroup: (
query: string,
action: SearchDocMenuAction,
abortSignal: AbortSignal
) => LinkedMenuGroup;
getTagMenuGroup: (
query: string,
action: SearchTagMenuAction,
abortSignal: AbortSignal
) => LinkedMenuGroup;
getCollectionMenuGroup: (
query: string,
action: SearchCollectionMenuAction,
abortSignal: AbortSignal
) => LinkedMenuGroup;
}

View File

@@ -78,42 +78,6 @@ export function getChipKey(chip: ChatChip) {
return null;
}
export function omitChip(chips: ChatChip[], chip: ChatChip) {
return chips.filter(item => {
if (isDocChip(chip)) {
return !isDocChip(item) || item.docId !== chip.docId;
}
if (isFileChip(chip)) {
return !isFileChip(item) || item.file !== chip.file;
}
if (isTagChip(chip)) {
return !isTagChip(item) || item.tagId !== chip.tagId;
}
if (isCollectionChip(chip)) {
return !isCollectionChip(item) || item.collectionId !== chip.collectionId;
}
return true;
});
}
export function findChipIndex(chips: ChatChip[], chip: ChatChip) {
return chips.findIndex(item => {
if (isDocChip(chip)) {
return isDocChip(item) && item.docId === chip.docId;
}
if (isFileChip(chip)) {
return isFileChip(item) && item.file === chip.file;
}
if (isTagChip(chip)) {
return isTagChip(item) && item.tagId === chip.tagId;
}
if (isCollectionChip(chip)) {
return isCollectionChip(item) && item.collectionId === chip.collectionId;
}
return -1;
});
}
export function estimateTokenCount(text: string): number {
const chinese = text.match(/[\u4e00-\u9fa5]/g)?.length || 0;
const english = text.replace(/[\u4e00-\u9fa5]/g, '');

View File

@@ -12,28 +12,20 @@ import type {
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
import type { NotificationService } from '@blocksuite/affine-shared/services';
import { css, html, type PropertyValues } from 'lit';
import { css, html } from 'lit';
import { property, state } from 'lit/decorators.js';
import { AIProvider } from '../../provider';
import type { SearchMenuConfig } from '../ai-chat-add-context';
import type {
ChatChip,
CollectionChip,
DocChip,
DocDisplayConfig,
FileChip,
SearchMenuConfig,
TagChip,
} from '../ai-chat-chips';
import {
findChipIndex,
isCollectionChip,
isDocChip,
isFileChip,
isTagChip,
omitChip,
} from '../ai-chat-chips';
import { isCollectionChip, isDocChip, isTagChip } from '../ai-chat-chips';
import type {
AIChatInputContext,
AINetworkSearchConfig,
@@ -59,7 +51,7 @@ export class AIChatComposer extends SignalWatcher(
`;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
accessor independentMode!: boolean;
@property({ attribute: false })
accessor host: EditorHost | null | undefined;
@@ -85,9 +77,9 @@ export class AIChatComposer extends SignalWatcher(
accessor updateContext!: (context: Partial<AIChatInputContext>) => void;
@property({ attribute: false })
accessor onEmbeddingProgressChange:
| ((count: Record<ContextEmbedStatus, number>) => void)
| undefined;
accessor onEmbeddingProgressChange!: (
count: Record<ContextEmbedStatus, number>
) => void;
@property({ attribute: false })
accessor docDisplayConfig!: DocDisplayConfig;
@@ -113,15 +105,9 @@ export class AIChatComposer extends SignalWatcher(
@property({ attribute: false })
accessor affineWorkspaceDialogService!: WorkspaceDialogService;
@property({ attribute: false })
accessor notificationService!: NotificationService;
@state()
accessor chips: ChatChip[] = [];
@state()
accessor isChipsCollapsed = false;
@state()
accessor embeddingCompleted = false;
@@ -135,13 +121,11 @@ export class AIChatComposer extends SignalWatcher(
return html`
<chat-panel-chips
.chips=${this.chips}
.isCollapsed=${this.isChipsCollapsed}
.independentMode=${this.independentMode}
.addChip=${this.addChip}
.updateChip=${this.updateChip}
.removeChip=${this.removeChip}
.toggleCollapse=${this.toggleChipsCollapse}
.createContextId=${this._createContextId}
.updateChips=${this.updateChips}
.pollContextDocsAndFiles=${this._pollContextDocsAndFiles}
.docDisplayConfig=${this.docDisplayConfig}
.searchMenuConfig=${this.searchMenuConfig}
.portalContainer=${this.portalContainer}
.addImages=${this.addImages}
></chat-panel-chips>
@@ -152,18 +136,15 @@ export class AIChatComposer extends SignalWatcher(
.docId=${this.docId}
.session=${this.session}
.chips=${this.chips}
.addChip=${this.addChip}
.addImages=${this.addImages}
.createSession=${this.createSession}
.chatContextValue=${this.chatContextValue}
.updateContext=${this.updateContext}
.networkSearchConfig=${this.networkSearchConfig}
.reasoningConfig=${this.reasoningConfig}
.docDisplayConfig=${this.docDisplayConfig}
.searchMenuConfig=${this.searchMenuConfig}
.portalContainer=${this.portalContainer}
.onChatSuccess=${this.onChatSuccess}
.trackOptions=${this.trackOptions}
.addImages=${this.addImages}
></ai-chat-input>
<div class="chat-panel-footer">
<ai-chat-composer-tip
@@ -184,7 +165,7 @@ export class AIChatComposer extends SignalWatcher(
override connectedCallback() {
super.connectedCallback();
this.initComposer().catch(console.error);
this._initComposer().catch(console.error);
}
override disconnectedCallback() {
@@ -193,17 +174,6 @@ export class AIChatComposer extends SignalWatcher(
this._abortPollEmbeddingStatus();
}
protected override willUpdate(changedProperties: PropertyValues): void {
if (
changedProperties.has('chatContextValue') &&
changedProperties.get('chatContextValue')?.status !== 'loading' &&
this.chatContextValue.status === 'loading' &&
this.isChipsCollapsed === false
) {
this.isChipsCollapsed = true;
}
}
private readonly _getContextId = async () => {
if (this._contextId) {
return this._contextId;
@@ -220,7 +190,7 @@ export class AIChatComposer extends SignalWatcher(
return this._contextId;
};
private readonly createContextId = async () => {
private readonly _createContextId = async () => {
if (this._contextId) {
return this._contextId;
}
@@ -235,7 +205,7 @@ export class AIChatComposer extends SignalWatcher(
return this._contextId;
};
private readonly initChips = async () => {
private readonly _initChips = async () => {
// context not initialized
const sessionId = this.session?.sessionId;
const contextId = await this._getContextId();
@@ -305,206 +275,14 @@ export class AIChatComposer extends SignalWatcher(
this.chips = chips;
};
private readonly updateChip = (
chip: ChatChip,
options: Partial<DocChip | FileChip>
) => {
const index = findChipIndex(this.chips, chip);
if (index === -1) {
return;
}
const nextChip: ChatChip = {
...chip,
...options,
};
this.updateChips([
...this.chips.slice(0, index),
nextChip,
...this.chips.slice(index + 1),
]);
};
private readonly addChip = async (chip: ChatChip) => {
this.isChipsCollapsed = false;
// if already exists
const index = findChipIndex(this.chips, chip);
if (index !== -1) {
this.notificationService.toast('chip already exists');
return;
}
this.updateChips([...this.chips, chip]);
await this.addToContext(chip);
await this.pollContextDocsAndFiles();
};
private readonly removeChip = async (chip: ChatChip) => {
const chips = omitChip(this.chips, chip);
this.updateChips(chips);
await this.removeFromContext(chip);
};
private readonly addToContext = async (chip: ChatChip) => {
if (isDocChip(chip)) {
return await this.addDocToContext(chip);
}
if (isFileChip(chip)) {
return await this.addFileToContext(chip);
}
if (isTagChip(chip)) {
return await this.addTagToContext(chip);
}
if (isCollectionChip(chip)) {
return await this.addCollectionToContext(chip);
}
return null;
};
private readonly addDocToContext = async (chip: DocChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
await AIProvider.context.addContextDoc({
contextId,
docId: chip.docId,
});
} catch (e) {
this.updateChip(chip, {
state: 'failed',
tooltip: e instanceof Error ? e.message : 'Add context doc error',
});
}
};
private readonly addFileToContext = async (chip: FileChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
const contextFile = await AIProvider.context.addContextFile(chip.file, {
contextId,
});
this.updateChip(chip, {
state: contextFile.status,
blobId: contextFile.blobId,
fileId: contextFile.id,
});
} catch (e) {
this.updateChip(chip, {
state: 'failed',
tooltip: e instanceof Error ? e.message : 'Add context file error',
});
}
};
private readonly addTagToContext = async (chip: TagChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
// TODO: server side docIds calculation
const docIds = this.docDisplayConfig.getTagPageIds(chip.tagId);
await AIProvider.context.addContextTag({
contextId,
tagId: chip.tagId,
docIds,
});
this.updateChip(chip, {
state: 'finished',
});
} catch (e) {
this.updateChip(chip, {
state: 'failed',
tooltip: e instanceof Error ? e.message : 'Add context tag error',
});
}
};
private readonly addCollectionToContext = async (chip: CollectionChip) => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
throw new Error('Context not found');
}
// TODO: server side docIds calculation
const docIds = this.docDisplayConfig.getCollectionPageIds(
chip.collectionId
);
await AIProvider.context.addContextCollection({
contextId,
collectionId: chip.collectionId,
docIds,
});
this.updateChip(chip, {
state: 'finished',
});
} catch (e) {
this.updateChip(chip, {
state: 'failed',
tooltip:
e instanceof Error ? e.message : 'Add context collection error',
});
}
};
private readonly removeFromContext = async (
chip: ChatChip
): Promise<boolean> => {
try {
const contextId = await this.createContextId();
if (!contextId || !AIProvider.context) {
return true;
}
if (isDocChip(chip)) {
return await AIProvider.context.removeContextDoc({
contextId,
docId: chip.docId,
});
}
if (isFileChip(chip) && chip.fileId) {
return await AIProvider.context.removeContextFile({
contextId,
fileId: chip.fileId,
});
}
if (isTagChip(chip)) {
return await AIProvider.context.removeContextTag({
contextId,
tagId: chip.tagId,
});
}
if (isCollectionChip(chip)) {
return await AIProvider.context.removeContextCollection({
contextId,
collectionId: chip.collectionId,
});
}
return true;
} catch {
return true;
}
};
private readonly toggleChipsCollapse = () => {
this.isChipsCollapsed = !this.isChipsCollapsed;
};
private readonly addImages = (images: File[]) => {
const oldImages = this.chatContextValue.images;
if (oldImages.length + images.length > MAX_IMAGE_COUNT) {
this.notificationService.toast(
`You can only upload up to ${MAX_IMAGE_COUNT} images`
);
}
this.updateContext({
images: [...oldImages, ...images].slice(0, MAX_IMAGE_COUNT),
});
};
private readonly pollContextDocsAndFiles = async () => {
private readonly _pollContextDocsAndFiles = async () => {
const sessionId = this.session?.sessionId;
const contextId = await this._getContextId();
if (!sessionId || !contextId || !AIProvider.context) {
@@ -524,7 +302,7 @@ export class AIChatComposer extends SignalWatcher(
);
};
private readonly pollEmbeddingStatus = async () => {
private readonly _pollEmbeddingStatus = async () => {
if (this._pollEmbeddingStatusAbortController) {
this._pollEmbeddingStatusAbortController.abort();
}
@@ -539,11 +317,12 @@ export class AIChatComposer extends SignalWatcher(
this.embeddingCompleted = false;
return;
}
const prevCompleted = this.embeddingCompleted;
const completed = status.embedded === status.total;
this.embeddingCompleted = completed;
if (prevCompleted !== completed) {
this.requestUpdate();
if (completed) {
this.embeddingCompleted = true;
} else {
this.embeddingCompleted = false;
}
},
signal
@@ -604,7 +383,7 @@ export class AIChatComposer extends SignalWatcher(
return chip;
});
this.updateChips(nextChips);
this.onEmbeddingProgressChange?.(count);
this.onEmbeddingProgressChange(count);
if (count.processing === 0) {
this._abortPoll();
}
@@ -620,18 +399,18 @@ export class AIChatComposer extends SignalWatcher(
this._pollEmbeddingStatusAbortController = null;
};
private readonly initComposer = async () => {
private readonly _initComposer = async () => {
const userId = (await AIProvider.userInfo)?.id;
if (!userId || !this.session) return;
await this.initChips();
await this._initChips();
const needPoll = this.chips.some(
chip =>
chip.state === 'processing' || isTagChip(chip) || isCollectionChip(chip)
);
if (needPoll) {
await this.pollContextDocsAndFiles();
await this._pollContextDocsAndFiles();
}
await this.pollEmbeddingStatus();
await this._pollEmbeddingStatus();
};
}

View File

@@ -6,7 +6,8 @@ import type {
CopilotChatHistoryFragment,
} from '@affine/graphql';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
import type { ExtensionType } from '@blocksuite/affine/store';
import type { NotificationService } from '@blocksuite/affine-shared/services';
import { type Signal } from '@preact/signals-core';
@@ -25,8 +26,7 @@ import { styleMap } from 'lit/directives/style-map.js';
import { HISTORY_IMAGE_ACTIONS } from '../../chat-panel/const';
import { type AIChatParams, AIProvider } from '../../provider/ai-provider';
import { extractSelectedContent } from '../../utils/extract';
import type { SearchMenuConfig } from '../ai-chat-add-context';
import type { DocDisplayConfig } from '../ai-chat-chips';
import type { DocDisplayConfig, SearchMenuConfig } from '../ai-chat-chips';
import type {
AINetworkSearchConfig,
AIReasoningConfig,
@@ -63,7 +63,7 @@ export class AIChatContent extends SignalWatcher(
.ai-chat-title {
background: var(--affine-background-primary-color);
position: relative;
padding: 8px var(--h-padding);
padding: 8px 0px;
width: 100%;
height: 36px;
display: flex;
@@ -80,8 +80,7 @@ export class AIChatContent extends SignalWatcher(
ai-chat-messages {
flex: 1;
overflow-y: auto;
padding: 0 var(--h-padding);
overflow-y: hidden;
transition:
flex-grow 0.32s cubic-bezier(0.07, 0.83, 0.46, 1),
padding-top 0.32s ease,
@@ -100,31 +99,24 @@ export class AIChatContent extends SignalWatcher(
container-name: chat-panel-split-view;
}
.chat-panel-main {
--h-padding: 8px;
display: flex;
flex-direction: column;
justify-content: center;
height: 100%;
width: 100%;
padding: 8px calc(24px - var(--h-padding)) 0 calc(24px - var(--h-padding));
padding: 8px 24px 0 24px;
max-width: 800px;
margin: 0 auto;
}
ai-chat-composer {
padding: 0 var(--h-padding);
}
@container chat-panel-split-view (width < 540px) {
.chat-panel-main {
padding: 8px calc(12px - var(--h-padding)) 0
calc(12px - var(--h-padding));
padding: 8px 12px 0 12px;
}
}
`;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
accessor independentMode!: boolean;
@property({ attribute: false })
accessor onboardingOffsetY!: number;
@@ -177,9 +169,9 @@ export class AIChatContent extends SignalWatcher(
accessor notificationService!: NotificationService;
@property({ attribute: false })
accessor onEmbeddingProgressChange:
| ((count: Record<ContextEmbedStatus, number>) => void)
| undefined;
accessor onEmbeddingProgressChange!: (
count: Record<ContextEmbedStatus, number>
) => void;
@property({ attribute: false })
accessor onContextChange!: (context: Partial<ChatContextValue>) => void;
@@ -219,7 +211,14 @@ export class AIChatContent extends SignalWatcher(
}
get showActions() {
return false;
if (this.docId) {
if (!this.session) {
return true;
}
return this.session.docId === this.docId;
} else {
return false;
}
}
private readonly updateHistory = async () => {
@@ -262,7 +261,7 @@ export class AIChatContent extends SignalWatcher(
};
private readonly updateActions = async () => {
if (!this.docId || !AIProvider.histories || !this.showActions) {
if (!this.docId || !AIProvider.histories) {
return;
}
const actions = await AIProvider.histories.actions(
@@ -396,7 +395,7 @@ export class AIChatContent extends SignalWatcher(
<ai-chat-messages
class=${classMap({
'ai-chat-messages': true,
'independent-mode': !!this.independentMode,
'independent-mode': this.independentMode,
'no-message': this.messages.length === 0,
})}
${ref(this.chatMessagesRef)}
@@ -417,7 +416,6 @@ export class AIChatContent extends SignalWatcher(
.width=${this.width}
.independentMode=${this.independentMode}
.messages=${this.messages}
.docDisplayService=${this.docDisplayConfig}
></ai-chat-messages>
<ai-chat-composer
style=${styleMap({
@@ -438,7 +436,6 @@ export class AIChatContent extends SignalWatcher(
.docDisplayConfig=${this.docDisplayConfig}
.searchMenuConfig=${this.searchMenuConfig}
.affineWorkspaceDialogService=${this.affineWorkspaceDialogService}
.notificationService=${this.notificationService}
.trackOptions=${{
where: 'chat-panel',
control: 'chat-send',

View File

@@ -1,9 +1,11 @@
import { toast } from '@affine/component';
import type { CopilotChatHistoryFragment } from '@affine/graphql';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';
import { openFilesWith } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
import { ArrowUpBigIcon, CloseIcon } from '@blocksuite/icons/lit';
import { ArrowUpBigIcon, CloseIcon, ImageIcon } from '@blocksuite/icons/lit';
import { css, html, nothing } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
@@ -14,7 +16,6 @@ import { type AIError, AIProvider, type AISendParams } from '../../provider';
import { reportResponse } from '../../utils/action-reporter';
import { readBlobAsURL } from '../../utils/image';
import { mergeStreamObjects } from '../../utils/stream-objects';
import type { SearchMenuConfig } from '../ai-chat-add-context';
import type { ChatChip, DocDisplayConfig } from '../ai-chat-chips/type';
import { isDocChip } from '../ai-chat-chips/utils';
import {
@@ -22,6 +23,7 @@ import {
isChatMessage,
StreamObjectSchema,
} from '../ai-chat-messages';
import { MAX_IMAGE_COUNT } from './const';
import type {
AIChatInputContext,
AINetworkSearchConfig,
@@ -290,7 +292,7 @@ export class AIChatInput extends SignalWatcher(
`;
@property({ attribute: false })
accessor independentMode: boolean | undefined;
accessor independentMode!: boolean;
@property({ attribute: false })
accessor host: EditorHost | null | undefined;
@@ -333,12 +335,6 @@ export class AIChatInput extends SignalWatcher(
@property({ attribute: false })
accessor updateContext!: (context: Partial<AIChatInputContext>) => void;
@property({ attribute: false })
accessor addImages!: (images: File[]) => void;
@property({ attribute: false })
accessor addChip!: (chip: ChatChip) => Promise<void>;
@property({ attribute: false })
accessor networkSearchConfig!: AINetworkSearchConfig;
@@ -348,9 +344,6 @@ export class AIChatInput extends SignalWatcher(
@property({ attribute: false })
accessor docDisplayConfig!: DocDisplayConfig;
@property({ attribute: false })
accessor searchMenuConfig!: SearchMenuConfig;
@property({ attribute: false })
accessor isRootSession: boolean = true;
@@ -364,7 +357,7 @@ export class AIChatInput extends SignalWatcher(
accessor testId = 'chat-panel-input-container';
@property({ attribute: false })
accessor portalContainer: HTMLElement | null = null;
accessor addImages!: (images: File[]) => void;
private get _isNetworkActive() {
return (
@@ -377,6 +370,10 @@ export class AIChatInput extends SignalWatcher(
return !!this.reasoningConfig.enabled.value;
}
private get _isImageUploadDisabled() {
return this.chatContextValue.images.length >= MAX_IMAGE_COUNT;
}
override connectedCallback() {
super.connectedCallback();
this._disposables.add(
@@ -456,16 +453,14 @@ export class AIChatInput extends SignalWatcher(
data-testid="chat-panel-input"
></textarea>
<div class="chat-panel-input-actions">
<div class="chat-input-icon">
<ai-chat-add-context
.docId=${this.docId}
.independentMode=${this.independentMode}
.addChip=${this.addChip}
.addImages=${this.addImages}
.docDisplayConfig=${this.docDisplayConfig}
.searchMenuConfig=${this.searchMenuConfig}
.portalContainer=${this.portalContainer}
></ai-chat-add-context>
<div
class="chat-input-icon"
data-testid="chat-panel-input-image-upload"
aria-disabled=${this._isImageUploadDisabled}
@click=${this._uploadImageFiles}
>
${ImageIcon()}
<affine-tooltip>Upload</affine-tooltip>
</div>
<div class="chat-input-footer-spacer"></div>
<chat-input-preference
@@ -560,6 +555,18 @@ export class AIChatInput extends SignalWatcher(
this.updateContext({ images: newImages });
};
private readonly _uploadImageFiles = async (_e: MouseEvent) => {
if (this._isImageUploadDisabled) return;
const images = await openFilesWith('Images');
if (!images) return;
if (this.chatContextValue.images.length + images.length > MAX_IMAGE_COUNT) {
toast(`You can only upload up to ${MAX_IMAGE_COUNT} images`);
return;
}
this.addImages(images);
};
private readonly _onTextareaSend = async (e: MouseEvent | KeyboardEvent) => {
e.preventDefault();
e.stopPropagation();

View File

@@ -6,7 +6,8 @@ import {
type FeatureFlagService,
type NotificationService,
} from '@blocksuite/affine/shared/services';
import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
import type { BaseSelection, ExtensionType } from '@blocksuite/affine/store';
import { ArrowDownBigIcon as ArrowDownIcon } from '@blocksuite/icons/lit';
import type { Signal } from '@preact/signals-core';
@@ -20,7 +21,6 @@ import { AffineIcon } from '../../_common/icons';
import { AIPreloadConfig } from '../../chat-panel/preload-config';
import { type AIError, AIProvider, UnauthorizedError } from '../../provider';
import { mergeStreamObjects } from '../../utils/stream-objects';
import type { DocDisplayConfig } from '../ai-chat-chips';
import { type ChatContextValue } from '../ai-chat-content/type';
import type {
AINetworkSearchConfig,
@@ -43,8 +43,9 @@ export class AIChatMessages extends WithDisposable(ShadowlessElement) {
display: flex;
flex-direction: column;
gap: 24px;
min-height: 100%;
height: 100%;
position: relative;
overflow-y: auto;
}
chat-panel-assistant-message,
@@ -151,7 +152,7 @@ export class AIChatMessages extends WithDisposable(ShadowlessElement) {
accessor avatarUrl = '';
@property({ attribute: false })
accessor independentMode: boolean | undefined;
accessor independentMode!: boolean;
@property({ attribute: false })
accessor messages!: HistoryMessage[];
@@ -203,9 +204,6 @@ export class AIChatMessages extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor width: Signal<number | undefined> | undefined;
@property({ attribute: false })
accessor docDisplayService!: DocDisplayConfig;
@query('.chat-panel-messages-container')
accessor messagesContainer: HTMLDivElement | null = null;
@@ -279,7 +277,7 @@ export class AIChatMessages extends WithDisposable(ShadowlessElement) {
<div
class=${classMap({
'chat-panel-messages-container': true,
'independent-mode': !!this.independentMode,
'independent-mode': this.independentMode,
})}
data-testid="chat-panel-messages-container"
@scroll=${() => this._debouncedOnScroll()}
@@ -331,8 +329,6 @@ export class AIChatMessages extends WithDisposable(ShadowlessElement) {
.notificationService=${this.notificationService}
.retry=${() => this.retry()}
.width=${this.width}
.independentMode=${this.independentMode}
.docDisplayService=${this.docDisplayService}
></chat-message-assistant>`;
} else if (isChatAction(item) && this.host) {
return html`<chat-message-action
@@ -441,7 +437,6 @@ export class AIChatMessages extends WithDisposable(ShadowlessElement) {
const last = messages[messages.length - 1];
if ('content' in last) {
last.content = '';
last.streamObjects = [];
last.createdAt = new Date().toISOString();
}
this.updateContext({

View File

@@ -15,7 +15,6 @@ import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
import type { DocDisplayConfig } from '../ai-chat-chips';
import type { ChatStatus } from '../ai-chat-messages';
export class AIChatToolbar extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
@@ -27,9 +26,6 @@ export class AIChatToolbar extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor docId: string | undefined;
@property({ attribute: false })
accessor status!: ChatStatus;
@property({ attribute: false })
accessor onNewSession!: () => void;
@@ -53,10 +49,6 @@ export class AIChatToolbar extends WithDisposable(ShadowlessElement) {
private abortController: AbortController | null = null;
get isGenerating() {
return this.status === 'transmitting' || this.status === 'loading';
}
static override styles = css`
.ai-chat-toolbar {
display: flex;
@@ -80,10 +72,6 @@ export class AIChatToolbar extends WithDisposable(ShadowlessElement) {
height: 16px;
color: ${unsafeCSSVarV2('icon/primary')};
}
&[data-disabled='true'] {
cursor: not-allowed;
}
}
}
`;
@@ -96,11 +84,7 @@ export class AIChatToolbar extends WithDisposable(ShadowlessElement) {
${PlusIcon()}
<affine-tooltip>New Chat</affine-tooltip>
</div>
<div
class="chat-toolbar-icon"
@click=${this.onPinClick}
data-disabled=${this.isGenerating}
>
<div class="chat-toolbar-icon" @click=${this.onTogglePin}>
${pinned ? PinedIcon() : PinIcon()}
<affine-tooltip>
${pinned ? 'Unpin this Chat' : 'Pin this Chat'}
@@ -117,16 +101,6 @@ export class AIChatToolbar extends WithDisposable(ShadowlessElement) {
`;
}
private readonly onPinClick = async () => {
if (this.isGenerating) {
this.notificationService.toast(
'Cannot pin a chat while generating an answer'
);
return;
}
await this.onTogglePin();
};
private readonly unpinConfirm = async () => {
if (this.session && this.session.pinned) {
try {

View File

@@ -225,7 +225,7 @@ export class AISessionHistory extends WithDisposable(ShadowlessElement) {
}}
>
<div class="ai-session-title">
${session.title || 'New chat'}
${session.sessionId}
<affine-tooltip .offsetX=${60}>
Click to open this chat
</affine-tooltip>

View File

@@ -1,11 +1,7 @@
import type { FeatureFlagService } from '@affine/core/modules/feature-flag';
import { WithDisposable } from '@blocksuite/affine/global/lit';
import type { ColorScheme } from '@blocksuite/affine/model';
import {
type BlockStdScope,
type EditorHost,
ShadowlessElement,
} from '@blocksuite/affine/std';
import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std';
import type { ExtensionType } from '@blocksuite/affine/store';
import type { NotificationService } from '@blocksuite/affine-shared/services';
import type { Signal } from '@preact/signals-core';
@@ -13,7 +9,6 @@ import { css, html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
import type { AffineAIPanelState } from '../../widgets/ai-panel/type';
import type { DocDisplayConfig } from '../ai-chat-chips';
import type { StreamObject } from '../ai-chat-messages';
export class ChatContentStreamObjects extends WithDisposable(
@@ -34,9 +29,6 @@ export class ChatContentStreamObjects extends WithDisposable(
@property({ attribute: false })
accessor host: EditorHost | null | undefined;
@property({ attribute: false })
accessor std: BlockStdScope | null | undefined;
@property({ attribute: false })
accessor state: AffineAIPanelState = 'finished';
@@ -55,9 +47,6 @@ export class ChatContentStreamObjects extends WithDisposable(
@property({ attribute: false })
accessor notificationService!: NotificationService;
@property({ attribute: false })
accessor docDisplayService!: DocDisplayConfig;
private renderToolCall(streamObject: StreamObject) {
if (streamObject.type !== 'tool-call') {
return nothing;
@@ -81,7 +70,7 @@ export class ChatContentStreamObjects extends WithDisposable(
case 'doc_compose':
return html`
<doc-compose-tool
.std=${this.std || this.host?.std}
.std=${this.host?.std}
.data=${streamObject}
.width=${this.width}
.theme=${this.theme}
@@ -91,10 +80,9 @@ export class ChatContentStreamObjects extends WithDisposable(
case 'code_artifact':
return html`
<code-artifact-tool
.std=${this.std || this.host?.std}
.std=${this.host?.std}
.data=${streamObject}
.width=${this.width}
.theme=${this.theme}
></code-artifact-tool>
`;
case 'doc_edit':
@@ -105,21 +93,6 @@ export class ChatContentStreamObjects extends WithDisposable(
.notificationService=${this.notificationService}
></doc-edit-tool>
`;
case 'doc_semantic_search':
return html`<doc-semantic-search-result
.data=${streamObject}
.width=${this.width}
></doc-semantic-search-result>`;
case 'doc_keyword_search':
return html`<doc-keyword-search-result
.data=${streamObject}
.width=${this.width}
></doc-keyword-search-result>`;
case 'doc_read':
return html`<doc-read-result
.data=${streamObject}
.width=${this.width}
></doc-read-result>`;
default: {
const name = streamObject.toolName + ' tool calling';
return html`
@@ -152,7 +125,7 @@ export class ChatContentStreamObjects extends WithDisposable(
case 'doc_compose':
return html`
<doc-compose-tool
.std=${this.std || this.host?.std}
.std=${this.host?.std}
.data=${streamObject}
.width=${this.width}
.theme=${this.theme}
@@ -162,7 +135,7 @@ export class ChatContentStreamObjects extends WithDisposable(
case 'code_artifact':
return html`
<code-artifact-tool
.std=${this.std || this.host?.std}
.std=${this.host?.std}
.data=${streamObject}
.width=${this.width}
.theme=${this.theme}
@@ -178,22 +151,6 @@ export class ChatContentStreamObjects extends WithDisposable(
.notificationService=${this.notificationService}
></doc-edit-tool>
`;
case 'doc_semantic_search':
return html`<doc-semantic-search-result
.data=${streamObject}
.width=${this.width}
.docDisplayService=${this.docDisplayService}
></doc-semantic-search-result>`;
case 'doc_keyword_search':
return html`<doc-keyword-search-result
.data=${streamObject}
.width=${this.width}
></doc-keyword-search-result>`;
case 'doc_read':
return html`<doc-read-result
.data=${streamObject}
.width=${this.width}
></doc-read-result>`;
default: {
const name = streamObject.toolName + ' tool result';
return html`

View File

@@ -1,6 +1,6 @@
import { WithDisposable } from '@blocksuite/affine/global/lit';
import { scrollbarStyle } from '@blocksuite/affine/shared/styles';
import { ShadowlessElement } from '@blocksuite/affine/std';
import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std';
import type { PropertyValues } from 'lit';
import { css, html } from 'lit';
import { property, query } from 'lit/decorators.js';
@@ -81,6 +81,9 @@ export class AIScrollableTextRenderer extends WithDisposable(
@property({ attribute: false })
accessor answer!: string;
@property({ attribute: false })
accessor host!: EditorHost;
@property({ attribute: false })
accessor state: AffineAIPanelState | undefined;
@@ -98,16 +101,19 @@ export class AIScrollableTextRenderer extends WithDisposable(
}
export const createAIScrollableTextRenderer: (
host: EditorHost,
textRendererOptions: TextRendererOptions,
maxHeight: number,
autoScroll: boolean
) => AffineAIPanelWidgetConfig['answerRenderer'] = (
host,
textRendererOptions,
maxHeight,
autoScroll
) => {
return (answer: string, state: AffineAIPanelState | undefined) => {
return html`<ai-scrollable-text-renderer
.host=${host}
.answer=${answer}
.state=${state}
.textRendererOptions=${textRendererOptions}

View File

@@ -3,7 +3,6 @@ import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
import type { ColorScheme } from '@blocksuite/affine/model';
import { ShadowlessElement } from '@blocksuite/affine/std';
import { type NotificationService } from '@blocksuite/affine-shared/services';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import type { Signal } from '@preact/signals-core';
import {
css,
@@ -30,17 +29,12 @@ export abstract class ArtifactTool<
> extends SignalWatcher(WithDisposable(ShadowlessElement)) {
static override styles = css`
.artifact-tool-card {
cursor: pointer;
margin: 8px 0;
padding: 10px 0;
}
.affine-embed-linked-doc-block {
box-shadow: ${unsafeCSSVar('buttonShadow')};
cursor: pointer;
}
.affine-embed-linked-doc-block:hover {
background-color: ${unsafeCSSVarV2('layer/background/hoverOverlay')};
}
.artifact-tool-card:hover {
opacity: 0.8;
}
`;
@@ -125,24 +119,23 @@ export abstract class ArtifactTool<
return html`
<div
class="artifact-tool-card ${className ?? ''}"
class="affine-embed-linked-doc-block artifact-tool-card ${className ??
''} horizontal"
@click=${this.onCardClick}
>
<div class="affine-embed-linked-doc-block horizontal">
<div class="affine-embed-linked-doc-content">
<div class="affine-embed-linked-doc-content-title">
<div class="affine-embed-linked-doc-content-title-icon">
${resolvedIcon}
</div>
<div class="affine-embed-linked-doc-content-title-text">
${title}
</div>
<div class="affine-embed-linked-doc-content">
<div class="affine-embed-linked-doc-content-title">
<div class="affine-embed-linked-doc-content-title-icon">
${resolvedIcon}
</div>
<div class="affine-embed-linked-doc-content-title-text">
${title}
</div>
</div>
${banner
? html`<div class="affine-embed-linked-doc-banner">${banner}</div>`
: nothing}
</div>
${banner
? html`<div class="affine-embed-linked-doc-banner">${banner}</div>`
: nothing}
</div>
`;
}

View File

@@ -104,6 +104,10 @@ export class ArtifactPreviewPanel extends WithDisposable(ShadowlessElement) {
color: ${unsafeCSSVarV2('icon/secondary')};
}
.artifact-panel-content {
height: calc(100% - 52px);
}
.artifact-panel-close:hover {
background-color: ${unsafeCSSVarV2('layer/background/tertiary')};
}

View File

@@ -4,6 +4,7 @@ import { getEmbedLinkedDocIcons } from '@blocksuite/affine/blocks/embed-doc';
import { LoadingIcon } from '@blocksuite/affine/components/icons';
import { RefNodeSlotsProvider } from '@blocksuite/affine/inlines/reference';
import type { ColorScheme } from '@blocksuite/affine/model';
import { NotificationProvider } from '@blocksuite/affine/shared/services';
import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';
import { MarkdownTransformer } from '@blocksuite/affine/widgets/linked-doc';
import { CopyIcon, PageIcon, ToolIcon } from '@blocksuite/icons/lit';
@@ -110,6 +111,7 @@ export class DocComposeTool extends ArtifactTool<
protected override getPreviewContent() {
if (!this.std) return html``;
const std = this.std;
const resultData = this.data;
const title = this.data.args.title;
const result = resultData.type === 'tool-result' ? resultData.result : null;
@@ -120,11 +122,11 @@ export class DocComposeTool extends ArtifactTool<
${successResult
? html`<text-renderer
.answer=${successResult.markdown}
.schema=${this.std?.store.schema}
.host=${std.host}
.schema=${std.store.schema}
.options=${{
customHeading: true,
extensions: getCustomPageEditorBlockSpecs(),
theme: this.theme,
}}
></text-renderer>`
: html`<div class="doc-compose-result-preview-loading">
@@ -159,6 +161,7 @@ export class DocComposeTool extends ArtifactTool<
return;
}
const workspace = std.store.workspace;
const notificationService = std.get(NotificationProvider);
const refNodeSlots = std.getOptional(RefNodeSlotsProvider);
const docId = await MarkdownTransformer.importMarkdownToDoc({
collection: workspace,
@@ -168,7 +171,7 @@ export class DocComposeTool extends ArtifactTool<
extensions: getStoreManager().config.init().value.get('store'),
});
if (docId) {
const open = await this.notificationService.confirm({
const open = await notificationService.confirm({
title: 'Open the doc you just created',
message: 'Doc saved successfully! Would you like to open it now?',
cancelText: 'Cancel',

View File

@@ -1,4 +1,3 @@
import track from '@affine/track';
import { WithDisposable } from '@blocksuite/affine/global/lit';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';
import { type EditorHost, ShadowlessElement } from '@blocksuite/affine/std';
@@ -204,33 +203,24 @@ export class DocEditTool extends WithDisposable(ShadowlessElement) {
}
private async _handleApply(markdown: string) {
if (!this.host || this.data.type !== 'tool-result') {
if (!this.host) {
return;
}
track.applyModel.chat.$.apply({
instruction: this.data.args.instructions,
});
await this.blockDiffService?.apply(this.host.store, markdown);
}
private async _handleReject(changedMarkdown: string) {
if (!this.host || this.data.type !== 'tool-result') {
if (!this.host) {
return;
}
track.applyModel.chat.$.reject({
instruction: this.data.args.instructions,
});
this.blockDiffService?.setChangedMarkdown(changedMarkdown);
this.blockDiffService?.rejectAll();
}
private async _handleAccept(changedMarkdown: string) {
if (!this.host || this.data.type !== 'tool-result') {
if (!this.host) {
return;
}
track.applyModel.chat.$.accept({
instruction: this.data.args.instructions,
});
await this.blockDiffService?.apply(this.host.store, changedMarkdown);
await this.blockDiffService?.acceptAll(this.host.store);
}
@@ -243,7 +233,6 @@ export class DocEditTool extends WithDisposable(ShadowlessElement) {
if (!this.host) {
return;
}
track.applyModel.chat.$.copy();
const success = await copyText(removeMarkdownComments(changedMarkdown));
if (success) {
this.notificationService.notify({

View File

@@ -1,70 +0,0 @@
import { WithDisposable } from '@blocksuite/global/lit';
import { PageIcon, SearchIcon } from '@blocksuite/icons/lit';
import { ShadowlessElement } from '@blocksuite/std';
import type { Signal } from '@preact/signals-core';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
import type { ToolResult } from './tool-result-card';
interface DocKeywordSearchToolCall {
type: 'tool-call';
toolCallId: string;
toolName: string;
args: { query: string };
}
interface DocKeywordSearchToolResult {
type: 'tool-result';
toolCallId: string;
toolName: string;
args: { query: string };
result: Array<{
title: string;
docId: string;
}>;
}
export class DocKeywordSearchResult extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor data!: DocKeywordSearchToolCall | DocKeywordSearchToolResult;
@property({ attribute: false })
accessor width: Signal<number | undefined> | undefined;
renderToolCall() {
return html`<tool-call-card
.name=${`Searching workspace documents for "${this.data.args.query}"`}
.icon=${SearchIcon()}
.width=${this.width}
></tool-call-card>`;
}
renderToolResult() {
if (this.data.type !== 'tool-result') {
return nothing;
}
let results: ToolResult[] = [];
try {
results = this.data.result.map(item => ({
title: item.title,
icon: PageIcon(),
}));
} catch (err) {
console.error('Failed to parse result', err);
}
return html`<tool-result-card
.name=${`Found ${this.data.result.length} pages for "${this.data.args.query}"`}
.icon=${SearchIcon()}
.width=${this.width}
.results=${results}
></tool-result-card>`;
}
protected override render() {
if (this.data.type === 'tool-call') {
return this.renderToolCall();
}
return this.renderToolResult();
}
}

View File

@@ -1,70 +0,0 @@
import { WithDisposable } from '@blocksuite/global/lit';
import { PageIcon, ViewIcon } from '@blocksuite/icons/lit';
import { ShadowlessElement } from '@blocksuite/std';
import type { Signal } from '@preact/signals-core';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
interface DocReadToolCall {
type: 'tool-call';
toolCallId: string;
toolName: string;
args: { doc_id: string };
}
interface DocReadToolResult {
type: 'tool-result';
toolCallId: string;
toolName: string;
args: { doc_id: string };
result: {
title: string;
markdown: string;
};
}
export class DocReadResult extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor data!: DocReadToolCall | DocReadToolResult;
@property({ attribute: false })
accessor width: Signal<number | undefined> | undefined;
renderToolCall() {
// TODO: get document name by doc_id
return html`<tool-call-card
.name=${`Reading document`}
.icon=${ViewIcon()}
.width=${this.width}
></tool-call-card>`;
}
renderToolResult() {
if (this.data.type !== 'tool-result') {
return nothing;
}
// TODO: better markdown rendering
return html`<tool-result-card
.name=${`Read "${this.data.result.title}"`}
.icon=${ViewIcon()}
.width=${this.width}
.results=${[
{
title: this.data.result.title,
icon: PageIcon(),
content: this.data.result.markdown,
},
]}
></tool-result-card>`;
}
protected override render() {
if (this.data.type === 'tool-call') {
return this.renderToolCall();
}
if (this.data.type === 'tool-result') {
return this.renderToolResult();
}
return nothing;
}
}

View File

@@ -1,108 +0,0 @@
import { WithDisposable } from '@blocksuite/global/lit';
import { AiEmbeddingIcon, PageIcon } from '@blocksuite/icons/lit';
import { ShadowlessElement } from '@blocksuite/std';
import type { Signal } from '@preact/signals-core';
import { html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
import type { DocDisplayConfig } from '../ai-chat-chips';
interface DocSemanticSearchToolCall {
type: 'tool-call';
toolCallId: string;
toolName: string;
args: { query: string };
}
interface DocSemanticSearchToolResult {
type: 'tool-result';
toolCallId: string;
toolName: string;
args: { query: string };
result: Array<{
content: string;
docId: string;
}>;
}
function parseResultContent(content: string) {
const properties = [
'Title',
'Created at',
'Updated at',
'Created by',
'Updated by',
];
try {
// A row starts with "Title: ${title}\n"
const title = content.match(/^Title:\s+(.*)\n/)?.[1];
// from first row that not starts with "${propertyName}:" to end of the content
const rows = content.split('\n');
const startIndex = rows.findIndex(
line => !properties.some(property => line.startsWith(`${property}:`))
);
const text = rows.slice(startIndex).join('\n');
return {
title,
content: text,
icon: PageIcon(),
};
} catch (error) {
console.error('Failed to parse result content', error);
return null;
}
}
export class DocSemanticSearchResult extends WithDisposable(ShadowlessElement) {
@property({ attribute: false })
accessor data!: DocSemanticSearchToolCall | DocSemanticSearchToolResult;
@property({ attribute: false })
accessor width: Signal<number | undefined> | undefined;
@property({ attribute: false })
accessor docDisplayService!: DocDisplayConfig;
renderToolCall() {
return html`<tool-call-card
.name=${`Finding semantically related pages for "${this.data.args.query}"`}
.icon=${AiEmbeddingIcon()}
.width=${this.width}
></tool-call-card>`;
}
renderToolResult() {
if (this.data.type !== 'tool-result') {
return nothing;
}
return html`<tool-result-card
.name=${`Found semantically related pages for "${this.data.args.query}"`}
.icon=${AiEmbeddingIcon()}
.width=${this.width}
.results=${this.data.result
.map(result => ({
...parseResultContent(result.content),
title: this.docDisplayService.getTitle(result.docId),
}))
.filter(Boolean)}
></tool-result-card>`;
}
protected override render() {
const { data } = this;
if (data.type === 'tool-call') {
return this.renderToolCall();
}
if (data.type === 'tool-result') {
return this.renderToolResult();
}
return nothing;
}
}
declare global {
interface HTMLElementTagNameMap {
'doc-semantic-search-result': DocSemanticSearchResult;
}
}

View File

@@ -7,7 +7,7 @@ import { type Signal } from '@preact/signals-core';
import { css, html, nothing, type TemplateResult } from 'lit';
import { property, state } from 'lit/decorators.js';
export interface ToolResult {
interface ToolResult {
title: string;
icon?: string | TemplateResult<1>;
content?: string;

View File

@@ -1,5 +1,5 @@
import type { CopilotChatHistoryFragment } from '@affine/graphql';
import { Tooltip } from '@blocksuite/affine/components/tooltip';
import { Tooltip } from '@blocksuite/affine/components/toolbar';
import { WithDisposable } from '@blocksuite/affine/global/lit';
import { noop } from '@blocksuite/affine/global/utils';
import { unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';

View File

@@ -1,4 +1,3 @@
import type { WorkspaceDialogService } from '@affine/core/modules/dialogs';
import type { FeatureFlagService } from '@affine/core/modules/feature-flag';
import type { AppThemeService } from '@affine/core/modules/theme';
import type {
@@ -20,8 +19,7 @@ import { throttle } from 'lodash-es';
import type { AppSidebarConfig } from '../../chat-panel/chat-config';
import { HISTORY_IMAGE_ACTIONS } from '../../chat-panel/const';
import { AIProvider } from '../../provider';
import type { SearchMenuConfig } from '../ai-chat-add-context';
import type { DocDisplayConfig } from '../ai-chat-chips';
import type { DocDisplayConfig, SearchMenuConfig } from '../ai-chat-chips';
import type { ChatContextValue } from '../ai-chat-content';
import type {
AINetworkSearchConfig,
@@ -167,9 +165,6 @@ export class PlaygroundChat extends SignalWatcher(
@property({ attribute: false })
accessor affineThemeService!: AppThemeService;
@property({ attribute: false })
accessor affineWorkspaceDialogService!: WorkspaceDialogService;
@property({ attribute: false })
accessor notificationService!: NotificationService;
@@ -356,8 +351,6 @@ export class PlaygroundChat extends SignalWatcher(
.playgroundConfig=${this.playgroundConfig}
.docDisplayConfig=${this.docDisplayConfig}
.searchMenuConfig=${this.searchMenuConfig}
.notificationService=${this.notificationService}
.affineWorkspaceDialogService=${this.affineWorkspaceDialogService}
></ai-chat-composer>
</div>`;
}

View File

@@ -12,8 +12,7 @@ import { repeat } from 'lit/directives/repeat.js';
import type { AppSidebarConfig } from '../../chat-panel/chat-config';
import { AIProvider } from '../../provider';
import type { SearchMenuConfig } from '../ai-chat-add-context';
import type { DocDisplayConfig } from '../ai-chat-chips';
import type { DocDisplayConfig, SearchMenuConfig } from '../ai-chat-chips';
import type {
AINetworkSearchConfig,
AIPlaygroundConfig,

View File

@@ -1,5 +1,3 @@
import { effects as tooltipEffects } from '@blocksuite/affine-components/tooltip';
import { AIChatBlockComponent } from './blocks/ai-chat-block/ai-chat-block';
import { EdgelessAIChatBlockComponent } from './blocks/ai-chat-block/ai-chat-edgeless-block';
import { LitTranscriptionBlock } from './blocks/ai-chat-block/ai-transcription-block';
@@ -26,7 +24,6 @@ import { ChatMessageAction } from './chat-panel/message/action';
import { ChatMessageAssistant } from './chat-panel/message/assistant';
import { ChatMessageUser } from './chat-panel/message/user';
import { ChatPanelSplitView } from './chat-panel/split-view';
import { AIChatAddContext } from './components/ai-chat-add-context';
import { ChatPanelAddPopover } from './components/ai-chat-chips/add-popover';
import { ChatPanelCandidatesPopover } from './components/ai-chat-chips/candidates-popover';
import { ChatPanelChips } from './components/ai-chat-chips/chat-panel-chips';
@@ -57,9 +54,6 @@ import {
} from './components/ai-tools/code-artifact';
import { DocComposeTool } from './components/ai-tools/doc-compose';
import { DocEditTool } from './components/ai-tools/doc-edit';
import { DocKeywordSearchResult } from './components/ai-tools/doc-keyword-search-result';
import { DocReadResult } from './components/ai-tools/doc-read-result';
import { DocSemanticSearchResult } from './components/ai-tools/doc-semantic-search-result';
import { ToolCallCard } from './components/ai-tools/tool-call-card';
import { ToolFailedCard } from './components/ai-tools/tool-failed-card';
import { ToolResultCard } from './components/ai-tools/tool-result-card';
@@ -119,7 +113,6 @@ export function registerAIEffects() {
registerMiniMindmapBlocks();
componentAiItemEffects();
componentPlaygroundEffects();
tooltipEffects();
customElements.define('ask-ai-icon', AskAIIcon);
customElements.define('ask-ai-button', AskAIButton);
@@ -142,7 +135,6 @@ export function registerAIEffects() {
customElements.define('ai-chat-messages', AIChatMessages);
customElements.define('chat-panel', ChatPanel);
customElements.define('ai-chat-input', AIChatInput);
customElements.define('ai-chat-add-context', AIChatAddContext);
customElements.define(
'ai-chat-embedding-status-tooltip',
AIChatEmbeddingStatusTooltip
@@ -211,9 +203,6 @@ export function registerAIEffects() {
customElements.define('tool-call-card', ToolCallCard);
customElements.define('tool-result-card', ToolResultCard);
customElements.define('tool-call-failed', ToolFailedCard);
customElements.define('doc-semantic-search-result', DocSemanticSearchResult);
customElements.define('doc-keyword-search-result', DocKeywordSearchResult);
customElements.define('doc-read-result', DocReadResult);
customElements.define('web-crawl-tool', WebCrawlTool);
customElements.define('web-search-tool', WebSearchTool);
customElements.define('doc-compose-tool', DocComposeTool);

View File

@@ -29,8 +29,10 @@ import {
queryHistoryMessages,
} from '../_common/chat-actions-handle';
import { type AIChatBlockModel } from '../blocks';
import type { SearchMenuConfig } from '../components/ai-chat-add-context';
import type { DocDisplayConfig } from '../components/ai-chat-chips';
import type {
DocDisplayConfig,
SearchMenuConfig,
} from '../components/ai-chat-chips';
import type {
AINetworkSearchConfig,
AIReasoningConfig,
@@ -370,7 +372,7 @@ export class AIChatBlockPeekView extends LitElement {
const last = messages[messages.length - 1];
if ('content' in last) {
last.content = '';
last.streamObjects = [];
last.id = '';
last.createdAt = new Date().toISOString();
}
this.updateContext({
@@ -607,7 +609,6 @@ export class AIChatBlockPeekView extends LitElement {
.docDisplayConfig=${this.docDisplayConfig}
.searchMenuConfig=${this.searchMenuConfig}
.affineWorkspaceDialogService=${this.affineWorkspaceDialogService}
.notificationService=${notificationService}
.onChatSuccess=${this._onChatSuccess}
.trackOptions=${{
where: 'ai-chat-block',

View File

@@ -165,8 +165,7 @@ export class CopilotClient {
docId?: string,
options?: RequestOptions<
typeof getCopilotSessionsQuery
>['variables']['options'],
signal?: AbortSignal
>['variables']['options']
) {
try {
const res = await this.gql({
@@ -177,7 +176,6 @@ export class CopilotClient {
docId,
options,
},
signal,
});
return res.currentUser?.copilot?.chats.edges.map(e => e.node);
} catch (err) {

View File

@@ -1,4 +1,3 @@
import track from '@affine/track';
import { WithDisposable } from '@blocksuite/affine/global/lit';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine/shared/theme';
import { CloseIcon, DoneIcon } from '@blocksuite/icons/lit';
@@ -51,12 +50,12 @@ export class BlockDiffOptions extends WithDisposable(LitElement) {
accessor onReject!: (op: PatchOp) => void;
private readonly _handleAcceptClick = () => {
track.applyModel.widget.block.accept();
console.log('accept', this.op);
this.onAccept(this.op);
};
private readonly _handleRejectClick = () => {
track.applyModel.widget.block.reject();
console.log('reject', this.op);
this.onReject(this.op);
};

View File

@@ -1,4 +1,3 @@
import { track } from '@affine/track';
import { WidgetComponent, WidgetViewExtension } from '@blocksuite/affine/std';
import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
import {
@@ -83,16 +82,6 @@ export class AffineBlockDiffWidgetForPage extends WidgetComponent {
diffs[this.currentIndex].scrollIntoView({ behavior: 'smooth' });
}
async _handleAcceptAll() {
track.applyModel.widget.page.acceptAll();
await this.diffService.acceptAll(this.std.store);
}
_handleRejectAll() {
track.applyModel.widget.page.rejectAll();
this.diffService.rejectAll();
}
get diffService() {
return this.std.get(BlockDiffProvider);
}
@@ -123,7 +112,7 @@ export class AffineBlockDiffWidgetForPage extends WidgetComponent {
</div>
<div
class="ai-block-diff-all-option"
@click=${() => this._handleRejectAll()}
@click=${() => this.diffService.rejectAll()}
>
${CloseIcon({
style: `color: ${unsafeCSSVarV2('icon/secondary')}`,
@@ -132,7 +121,7 @@ export class AffineBlockDiffWidgetForPage extends WidgetComponent {
</div>
<div
class="ai-block-diff-all-option"
@click=${() => this._handleAcceptAll()}
@click=${() => this.diffService.acceptAll(this.std.store)}
>
${DoneIcon({
style: `color: ${unsafeCSSVarV2('icon/activated')}`,

View File

@@ -87,7 +87,7 @@ const usePatchSpecs = (mode: DocMode, shared?: boolean) => {
// comment may not be supported by the server
const enableComment =
isCloud && serverConfig.features.includes(ServerFeature.Comment) && !shared;
serverConfig.features.includes(ServerFeature.Comment) && !shared;
const patchedSpecs = useMemo(() => {
const manager = getViewManager()

View File

@@ -44,8 +44,6 @@ const optionsSchema = z.object({
.args(z.custom<ConfirmModalProps>().optional(), z.any().optional()),
closeConfirmModal: z.function(),
}),
scope: z.enum(['doc', 'workspace']).optional(),
});
export type AffineEditorViewOptions = z.infer<typeof optionsSchema>;
@@ -95,7 +93,16 @@ export class AffineEditorViewExtension extends ViewExtensionProvider<AffineEdito
if (!options) {
return;
}
const { framework, reactToLit, confirmModal, scope = 'doc' } = options;
const {
framework,
reactToLit,
confirmModal,
} = options;
const docService = framework.get(DocService);
const docsService = framework.get(DocsService);
const editorService = framework.get(EditorService);
const referenceRenderer = this._getCustomReferenceRenderer(framework);
@@ -105,20 +112,12 @@ export class AffineEditorViewExtension extends ViewExtensionProvider<AffineEdito
patchNotificationService(confirmModal),
patchOpenDocExtension(),
patchSideBarService(framework),
patchDocModeService(docService, docsService, editorService),
patchFileSizeLimitExtension(framework),
buildDocDisplayMetaExtension(framework),
patchForAudioEmbedView(reactToLit),
])
.register(patchDocUrlExtensions(framework))
.register(patchQuickSearchService(framework));
if (scope === 'doc') {
const docService = framework.get(DocService);
const docsService = framework.get(DocsService);
const editorService = framework.get(EditorService);
context.register([
patchDocModeService(docService, docsService, editorService),
]);
}
}
}

View File

@@ -1,9 +1,8 @@
import { IconButton, notify, toast } from '@affine/component';
import { IconButton, notify } from '@affine/component';
import { LitDocEditor, type PageEditor } from '@affine/core/blocksuite/editors';
import { SnapshotHelper } from '@affine/core/modules/comment/services/snapshot-helper';
import type { CommentAttachment } from '@affine/core/modules/comment/types';
import { PeekViewService } from '@affine/core/modules/peek-view';
import { downloadResourceWithUrl } from '@affine/core/utils/resource';
import { DebugLogger } from '@affine/debug';
import { getAttachmentFileIconRC } from '@blocksuite/affine/components/icons';
import { type RichText, selectTextModel } from '@blocksuite/affine/rich-text';
@@ -81,6 +80,16 @@ export interface CommentEditorRef {
focus: () => void;
}
const download = (url: string, name: string) => {
const element = document.createElement('a');
element.setAttribute('download', name);
element.setAttribute('href', url);
element.style.display = 'none';
document.body.append(element);
element.click();
element.remove();
};
// todo: get rid of circular data changes
const useSnapshotDoc = (
defaultSnapshotOrDoc: DocSnapshot | Store,
@@ -304,28 +313,6 @@ export const CommentEditor = forwardRef<CommentEditorRef, CommentEditorProps>(
[addAttachments]
);
const handleDragOver = useCallback(
(e: React.DragEvent) => {
if (readonly) return;
// Prevent default to allow drop
e.preventDefault();
},
[readonly]
);
const handleDrop = useCallback(
(e: React.DragEvent) => {
if (readonly) return;
e.preventDefault();
e.stopPropagation();
const files = Array.from(e.dataTransfer?.files ?? []);
if (files.length) {
addAttachments(files);
}
},
[addAttachments, readonly]
);
const openFilePicker = useAsyncCallback(async () => {
if (isUploadDisabled) return;
const files = await openFilesWith('Any');
@@ -395,6 +382,8 @@ export const CommentEditor = forwardRef<CommentEditorRef, CommentEditorProps>(
if (!attachments) return;
const att = attachments[index];
if (!att) return;
const url = att.url || att.localUrl;
if (!url) return;
if (isImageAttachment(att)) {
// translate attachment index to image index
const imageAttachments = attachments.filter(isImageAttachment);
@@ -402,19 +391,13 @@ export const CommentEditor = forwardRef<CommentEditorRef, CommentEditorProps>(
if (imageIndex >= 0) {
handleImagePreview(imageIndex);
}
} else if (att.url) {
} else if (att.url || att.localUrl) {
// todo: open attachment preview. for now, just download it
downloadResourceWithUrl(
att.url,
att.filename ?? att.file?.name ?? 'attachment'
).catch(e => {
console.error('Failed to download attachment', e);
notify.error({
title: 'Failed to download attachment',
message: e.message,
});
download(url, att.filename ?? att.file?.name ?? 'attachment');
notify({
title: 'Downloading attachment',
message: 'The attachment is being downloaded to your computer.',
});
toast('The attachment is being downloaded to your computer.');
}
},
[attachments, handleImagePreview]
@@ -555,8 +538,6 @@ export const CommentEditor = forwardRef<CommentEditorRef, CommentEditorProps>(
onClick={readonly ? undefined : handleClickEditor}
onKeyDown={handleKeyDown}
onPaste={handlePaste}
onDragOver={handleDragOver}
onDrop={handleDrop}
data-readonly={!!readonly}
className={clsx(styles.container, 'comment-editor-viewport')}
>

View File

@@ -596,7 +596,7 @@ const CommentList = ({ entity }: { entity: DocCommentEntity }) => {
const [filterState, setFilterState] = useState<CommentFilterState>({
showResolvedComments: false,
onlyMyReplies: false,
onlyCurrentMode: false,
onlyCurrentMode: true,
});
const onFilterChange = useCallback(

Some files were not shown because too many files have changed in this diff Show More