@dxos/assistant 0.7.4 → 0.7.5-labs.5f04cf6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.7.4",
+  "version": "0.7.5-labs.5f04cf6",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,26 +33,25 @@
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
+    "vendor",
     "src"
   ],
-  "scripts": {
-    "run:chat": "tsx src/bin/chat.ts"
-  },
   "dependencies": {
-    "@dxos/async": "workspace:*",
-    "@dxos/context": "workspace:*",
-    "@dxos/debug": "workspace:*",
-    "@dxos/echo-db": "workspace:*",
-    "@dxos/echo-schema": "workspace:*",
-    "@dxos/invariant": "workspace:*",
-    "@dxos/keys": "workspace:*",
-    "@dxos/live-object": "workspace:*",
-    "@dxos/log": "workspace:*",
-    "@dxos/node-std": "workspace:*",
-    "@dxos/util": "workspace:*",
     "@effect/schema": "^0.75.5",
     "parjs": "^1.3.9",
-    "ulidx": "^2.3.0"
+    "ulidx": "^2.3.0",
+    "@dxos/async": "0.7.5-labs.5f04cf6",
+    "@dxos/context": "0.7.5-labs.5f04cf6",
+    "@dxos/artifact": "0.7.5-labs.5f04cf6",
+    "@dxos/debug": "0.7.5-labs.5f04cf6",
+    "@dxos/echo-db": "0.7.5-labs.5f04cf6",
+    "@dxos/echo-schema": "0.7.5-labs.5f04cf6",
+    "@dxos/invariant": "0.7.5-labs.5f04cf6",
+    "@dxos/keys": "0.7.5-labs.5f04cf6",
+    "@dxos/log": "0.7.5-labs.5f04cf6",
+    "@dxos/live-object": "0.7.5-labs.5f04cf6",
+    "@dxos/node-std": "0.7.5-labs.5f04cf6",
+    "@dxos/util": "0.7.5-labs.5f04cf6"
   },
   "devDependencies": {
     "inquirer": "^12.0.0"
@@ -60,5 +59,8 @@
   "publishConfig": {
     "access": "restricted"
   },
-  "beast": {}
-}
+  "beast": {},
+  "scripts": {
+    "run:chat": "tsx src/bin/chat.ts"
+  }
+}

package/src/ai-service/client.test.ts

@@ -5,26 +5,28 @@
 import { Schema as S } from '@effect/schema';
 import { test, describe } from 'vitest';
 
-import { toJsonSchema } from '@dxos/echo-schema';
+import { type Tool } from '@dxos/artifact';
+import { toJsonSchema, ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { AIServiceClientImpl } from './client';
-import { ObjectId, ToolTypes, type LLMTool } from './schema';
+import { ToolTypes } from './defs';
+import { AI_SERVICE_ENDPOINT } from '../testing';
 
-const ENDPOINT = 'http://localhost:8787';
+// log.config({ filter: 'debug' });
 
-describe('AI Service Client', () => {
+describe.skip('AI Service Client', () => {
   test('client generation', async () => {
     const client = new AIServiceClientImpl({
-      endpoint: ENDPOINT,
+      endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
     const spaceId = SpaceId.random();
     const threadId = ObjectId.random();
 
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -42,20 +44,20 @@ describe('AI Service Client', () => {
       tools: [],
     });
     for await (const event of stream) {
-      log.info('event', event);
+      log('event', event);
     }
 
-    log.info('full message', {
+    log('full message', {
       message: await stream.complete(),
     });
   });
 
   test('tool calls', async () => {
     const client = new AIServiceClientImpl({
-      endpoint: ENDPOINT,
+      endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    const custodian: LLMTool = {
+    const custodian: Tool = {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       parameters: toJsonSchema(
@@ -68,7 +70,7 @@ describe('AI Service Client', () => {
     const spaceId = SpaceId.random();
     const threadId = ObjectId.random();
 
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -86,17 +88,15 @@ describe('AI Service Client', () => {
       tools: [custodian],
     });
     for await (const event of stream) {
-      log.info('event', event);
+      log('event', event);
     }
     const [message] = await stream.complete();
-    log.info('full message', {
-      message,
-    });
-    await client.insertMessages([message]);
+    log('full message', { message });
+    await client.appendMessages([message]);
 
     const toolUse = message.content.find(({ type }) => type === 'tool_use')!;
     invariant(toolUse.type === 'tool_use');
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -114,23 +114,21 @@ describe('AI Service Client', () => {
       tools: [custodian],
     });
     for await (const event of stream2) {
-      log.info('event', event);
+      log('event', event);
     }
     const [message2] = await stream2.complete();
-    log.info('full message', {
-      message: message2,
-    });
+    log('full message', { message: message2 });
   });
 
-  test.only('image generation', async () => {
+  test.skip('image generation', async () => {
     const client = new AIServiceClientImpl({
-      endpoint: ENDPOINT,
+      endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
     const spaceId = SpaceId.random();
     const threadId = ObjectId.random();
 
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -148,15 +146,17 @@ describe('AI Service Client', () => {
         {
           name: 'text-to-image',
           type: ToolTypes.TextToImage,
+          // options: {
+          //   model: '@cf/stabilityai/stable-diffusion-xl-base-1.0',
+          // },
         },
       ],
     });
+
     for await (const event of stream) {
-      log.info('event', event);
+      log('event', event);
     }
 
-    log.info('full message', {
-      message: await stream.complete(),
-    });
+    log('full message', { message: await stream.complete() });
   });
 });

package/src/ai-service/client.ts

@@ -2,41 +2,38 @@
 // Copyright 2024 DXOS.org
 //
 
-/* eslint-disable no-console */
-
 import { Schema as S } from '@effect/schema';
 
-import { Trigger } from '@dxos/async';
+import { Message, type Space, type Thread } from '@dxos/artifact';
 import { invariant } from '@dxos/invariant';
-import type { SpaceId } from '@dxos/keys';
-
-import {
-  Message,
-  type GenerateRequest,
-  type ObjectId,
-  type ResultStreamEvent,
-  type Space,
-  type Thread,
-} from './schema';
-import { iterSSEMessages } from './sse';
-import { log } from '@dxos/log';
+import { type SpaceId } from '@dxos/keys';
 
-export type AIServiceClientParams = {
-  endpoint: string;
-};
+import { type GenerateRequest } from './defs';
+import { GenerationStream } from './stream';
 
+// TODO(burdon): Rename.
 export interface AIServiceClient {
   getSpace(spaceId: SpaceId): Promise<Space>;
   getThread(spaceId: SpaceId, threadId: string): Promise<Thread>;
-  getMessagesInThread(spaceId: SpaceId, threadId: string): Promise<Message[]>;
-  insertMessages(messages: Message[]): Promise<void>;
+  getMessages(spaceId: SpaceId, threadId: string): Promise<Message[]>;
+  appendMessages(messages: Message[]): Promise<void>;
   updateMessage(spaceId: SpaceId, threadId: string, messageId: string, message: Message): Promise<void>;
   generate(request: GenerateRequest): Promise<GenerationStream>;
 }
 
+export type AIServiceClientParams = {
+  endpoint: string;
+};
+
+/**
+ * Edge GPT client.
+ */
+// TODO(burdon): Create mock.
 export class AIServiceClientImpl implements AIServiceClient {
   private readonly _endpoint: string;
+
   constructor({ endpoint }: AIServiceClientParams) {
+    invariant(endpoint, 'endpoint is required');
     this._endpoint = endpoint;
   }
 
@@ -48,13 +45,14 @@ export class AIServiceClientImpl implements AIServiceClient {
     throw new Error('Not implemented');
   }
 
-  async getMessagesInThread(spaceId: SpaceId, threadId: string): Promise<Message[]> {
+  async getMessages(spaceId: SpaceId, threadId: string): Promise<Message[]> {
     const res = await fetch(`${this._endpoint}/space/${spaceId}/thread/${threadId}/message`);
     return S.decodePromise(S.Array(Message).pipe(S.mutable))((await res.json()).data.results);
   }
 
-  async insertMessages(messages: Message[]): Promise<void> {
-    const res = await fetch(`${this._endpoint}/message`, {
+  async appendMessages(messages: Message[]): Promise<void> {
+    const url = `${this._endpoint}/message`;
+    const res = await fetch(url, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -63,7 +61,7 @@ export class AIServiceClientImpl implements AIServiceClient {
     });
 
     if (!res.ok) {
-      throw new Error(await res.text());
+      throw new Error(`${await res.text()} [${url}]`);
     }
   }
 
@@ -72,172 +70,28 @@ export class AIServiceClientImpl implements AIServiceClient {
     throw new Error('Not implemented');
   }
 
+  /**
+   * Open message stream.
+   */
   async generate(request: GenerateRequest): Promise<GenerationStream> {
+    const controller = new AbortController();
+    const signal = controller.signal;
+
     const response = await fetch(`${this._endpoint}/generate`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(request),
+      signal,
     });
-    invariant(response.body instanceof ReadableStream);
 
+    invariant(response.body instanceof ReadableStream);
     return GenerationStream.fromSSEResponse(
       {
         spaceId: request.spaceId,
         threadId: request.threadId,
       },
       response,
+      controller,
     );
   }
 }
-
-type GenerationParams = {
-  spaceId: SpaceId;
-  threadId: ObjectId;
-};
-
-export class GenerationStream implements AsyncIterable<ResultStreamEvent> {
-  static fromSSEResponse(params: GenerationParams, response: Response) {
-    const controller = new AbortController();
-    const iterator = async function* () {
-      for await (const sse of iterSSEMessages(response, controller)) {
-        if (sse.event === 'completion') {
-          try {
-            yield JSON.parse(sse.data);
-          } catch (e) {
-            console.error('Could not parse message into JSON:', sse.data);
-            console.error('From chunk:', sse.raw);
-            throw e;
-          }
-        }
-
-        if (
-          sse.event === 'message_start' ||
-          sse.event === 'message_delta' ||
-          sse.event === 'message_stop' ||
-          sse.event === 'content_block_start' ||
-          sse.event === 'content_block_delta' ||
-          sse.event === 'content_block_stop'
-        ) {
-          try {
-            yield JSON.parse(sse.data);
-          } catch (e) {
-            console.error('Could not parse message into JSON:', sse.data);
-            console.error('From chunk:', sse.raw);
-            throw e;
-          }
-        }
-
-        if (sse.event === 'ping') {
-          continue;
-        }
-
-        if (sse.event === 'error') {
-          throw new Error(`Message generation error: ${sse.data}`);
-        }
-      }
-    };
-    return new GenerationStream(params, iterator);
-  }
-
-  private _previousMessages: Message[] = [];
-  private _accumulatedMessage?: Message = undefined;
-  private _done = new Trigger();
-  private _iterator?: AsyncIterator<ResultStreamEvent> = undefined;
-
-  constructor(
-    private readonly _params: GenerationParams,
-    private readonly _getIterator: () => AsyncIterableIterator<ResultStreamEvent>,
-  ) {}
-
-  [Symbol.asyncIterator](): AsyncIterator<ResultStreamEvent> {
-    return this._createIterator();
-  }
-
-  cancel() {
-    throw new Error('Not implemented');
-  }
-
-  get accumulatedMessages(): Message[] {
-    // TODO(dmaretskyi): Support multiple accumulated messages.
-    return [...this._previousMessages, ...(this._accumulatedMessage == null ? [] : [this._accumulatedMessage])];
-  }
-
-  /**
-   * Returns the complete message list generated by the AI service.
-   */
-  async complete(): Promise<Message[]> {
-    await this._done.wait();
-    return this.accumulatedMessages;
-  }
-
-  private _createIterator(): AsyncIterator<ResultStreamEvent> {
-    const self = this;
-    return (this._iterator ??= (async function* () {
-      for await (const event of self._getIterator()) {
-        self._processEvent(event);
-        yield event;
-      }
-    })());
-  }
-
-  private _processEvent(event: ResultStreamEvent) {
-    // TODO(dmaretskyi): Support multiple message, e.g. for service-defined tools.
-    switch (event.type) {
-      case 'message_start': {
-        if (this._accumulatedMessage) {
-          this._previousMessages.push(this._accumulatedMessage);
-          this._accumulatedMessage = undefined;
-        }
-        this._accumulatedMessage = {
-          ...event.message,
-          threadId: this._params.threadId,
-          spaceId: this._params.spaceId,
-        };
-        break;
-      }
-      case 'message_delta': {
-        if (this._accumulatedMessage === undefined) {
-          throw new Error('Received message delta without a message start');
-        }
-        break;
-      }
-      case 'message_stop': {
-        if (this._accumulatedMessage === undefined) {
-          throw new Error('Received message stop without a message start');
-        }
-
-        break;
-      }
-      case 'content_block_start': {
-        invariant(this._accumulatedMessage);
-        this._accumulatedMessage.content.push(event.content);
-        break;
-      }
-      case 'content_block_delta': {
-        invariant(this._accumulatedMessage);
-        const snapshotContent = this._accumulatedMessage.content.at(event.index);
-        if (snapshotContent?.type === 'text' && event.delta.type === 'text_delta') {
-          snapshotContent.text += event.delta.text;
-        } else if (snapshotContent?.type === 'tool_use' && event.delta.type === 'input_json_delta') {
-          snapshotContent.inputJson ??= '';
-          snapshotContent.inputJson += event.delta.partial_json;
-
-          // TODO(dmaretskyi): Partial parsing.
-          // if (jsonBuf) {
-          //   snapshotContent.input = partialParse(jsonBuf);
-          // }
-        }
-        break;
-      }
-      case 'content_block_stop': {
-        invariant(this._accumulatedMessage);
-        const lastBlock = this._accumulatedMessage.content.at(-1);
-        if (lastBlock?.type === 'tool_use') {
-          lastBlock.input = JSON.parse(lastBlock.inputJson ?? '');
-        }
-        break;
-      }
-    }
-    this._done.wake();
-  }
-}

package/src/ai-service/defs.ts

@@ -0,0 +1,98 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Schema as S } from '@effect/schema';
+
+import { Tool, Message, type MessageContentBlock, SpaceIdSchema } from '@dxos/artifact';
+import { ObjectId } from '@dxos/echo-schema';
+
+export const createArtifactElement = (id: ObjectId) => `<artifact id=${id} />`;
+
+export const LLMModel = S.Literal(
+  '@anthropic/claude-3-5-haiku-20241022',
+  '@anthropic/claude-3-5-sonnet-20241022',
+  '@cf/deepseek-ai/deepseek-r1-distill-qwen-32b',
+  '@hf/nousresearch/hermes-2-pro-mistral-7b',
+  '@ollama/llama-3-2-3b',
+  '@ollama/llama-3-1-nemotron-70b-instruct',
+  '@ollama/llama-3-1-nemotron-mini-4b-instruct',
+  '@cf/deepseek-ai/deepseek-r1-distill-qwen-32b',
+);
+export type LLMModel = S.Schema.Type<typeof LLMModel>;
+
+export const ToolTypes = Object.freeze({
+  // TODO(dmaretskyi): Not implemented yet.
+  // DatabaseQuery: 'database_query',
+  TextToImage: 'text_to_image',
+});
+
+/**
+ *
+ */
+export const GenerateRequest = S.Struct({
+  spaceId: S.optional(SpaceIdSchema),
+  threadId: S.optional(ObjectId),
+  model: LLMModel,
+
+  /**
+   * History of messages to include in the context window.
+   */
+  history: S.optional(S.Array(Message)),
+
+  /**
+   * System instructions to the LLM.
+   */
+  // TODO(dmaretskyi): Should this be part of the thread?.
+  systemPrompt: S.optional(S.String),
+
+  /**
+   * Tools available for the LLM.
+   */
+  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
+});
+
+export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
+
+export type LLMStopReason = 'tool_use' | 'end_turn';
+
+// TODO(dmaretskyi): Effect schema.
+// TODO(dmaretskyi): Rename GenerationStreamEvent.
+export type ResultStreamEvent =
+  | {
+      // TODO(dmaretskyi): Normalize types to our schema.
+      type: 'message_start';
+      message: Omit<Message, 'spaceId' | 'threadId'>;
+    }
+  | {
+      type: 'message_delta';
+      delta: {
+        stopReason: LLMStopReason;
+      };
+    }
+  | {
+      type: 'message_stop';
+    }
+  | {
+      type: 'content_block_start';
+      index: number;
+      content: MessageContentBlock;
+    }
+  | {
+      type: 'content_block_delta';
+      index: number;
+      delta:
+        | {
+            type: 'text_delta';
+            text: string;
+          }
+        | {
+            partial_json: string;
+
+            type: 'input_json_delta';
+          };
+    }
+  | {
+      type: 'content_block_stop';
+      index: number;
+    };

package/src/ai-service/index.ts

@@ -3,4 +3,6 @@
 //
 
 export * from './client';
-export * from './schema';
+export * from './defs';
+export * from './parser';
+export * from './stream';