@dxos/assistant 0.7.5-main.b19bfc8 → 0.7.5-main.e94eead

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.7.5-main.b19bfc8",
+  "version": "0.7.5-main.e94eead",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -41,18 +41,18 @@
     "parjs": "^1.3.9",
     "parsimmon": "^1.18.1",
     "ulidx": "^2.3.0",
-    "@dxos/artifact": "0.7.5-main.b19bfc8",
-    "@dxos/context": "0.7.5-main.b19bfc8",
-    "@dxos/async": "0.7.5-main.b19bfc8",
-    "@dxos/debug": "0.7.5-main.b19bfc8",
-    "@dxos/echo-db": "0.7.5-main.b19bfc8",
-    "@dxos/echo-schema": "0.7.5-main.b19bfc8",
-    "@dxos/invariant": "0.7.5-main.b19bfc8",
-    "@dxos/live-object": "0.7.5-main.b19bfc8",
-    "@dxos/keys": "0.7.5-main.b19bfc8",
-    "@dxos/node-std": "0.7.5-main.b19bfc8",
-    "@dxos/log": "0.7.5-main.b19bfc8",
-    "@dxos/util": "0.7.5-main.b19bfc8"
+    "@dxos/artifact": "0.7.5-main.e94eead",
+    "@dxos/async": "0.7.5-main.e94eead",
+    "@dxos/context": "0.7.5-main.e94eead",
+    "@dxos/debug": "0.7.5-main.e94eead",
+    "@dxos/echo-schema": "0.7.5-main.e94eead",
+    "@dxos/echo-db": "0.7.5-main.e94eead",
+    "@dxos/invariant": "0.7.5-main.e94eead",
+    "@dxos/keys": "0.7.5-main.e94eead",
+    "@dxos/live-object": "0.7.5-main.e94eead",
+    "@dxos/log": "0.7.5-main.e94eead",
+    "@dxos/util": "0.7.5-main.e94eead",
+    "@dxos/node-std": "0.7.5-main.e94eead"
   },
   "devDependencies": {
     "@types/parsimmon": "^1.10.9",

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

@@ -37,7 +37,7 @@ describe.skip('AI Service Client', () => {
       },
     ]);
 
-    const stream = await client.generate({
+    const stream = await client.exec({
       model: DEFAULT_LLM_MODEL,
       spaceId,
       threadId,
@@ -82,7 +82,7 @@ describe.skip('AI Service Client', () => {
     ]);
 
     {
-      const stream1 = await client.generate({
+      const stream1 = await client.exec({
         model: DEFAULT_LLM_MODEL,
         spaceId,
         threadId,
@@ -116,7 +116,7 @@ describe.skip('AI Service Client', () => {
     }
 
     {
-      const stream2 = await client.generate({
+      const stream2 = await client.exec({
         model: DEFAULT_LLM_MODEL,
         spaceId,
         threadId,
@@ -154,7 +154,7 @@ describe.skip('AI Service Client', () => {
       },
     ]);
 
-    const stream = await client.generate({
+    const stream = await client.exec({
       model: DEFAULT_LLM_MODEL,
       spaceId,
       threadId,

package/src/ai-service/client.ts

@@ -4,22 +4,19 @@
 
 import { Schema as S } from '@effect/schema';
 
-import { Message, type Space, type Thread } from '@dxos/artifact';
+import { Message } from '@dxos/artifact';
 import { invariant } from '@dxos/invariant';
-import { type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { createGenerationStream, type GenerationStream } from './stream';
 import { type GenerateRequest } from './types';
 
-// TODO(burdon): Rename.
-export interface AIServiceClient {
-  getSpace(spaceId: SpaceId): Promise<Space>;
-  getThread(spaceId: SpaceId, threadId: string): Promise<Thread>;
-  getMessages(spaceId: SpaceId, threadId: string): Promise<Message[]>;
+export interface AIService {
+  exec(request: GenerateRequest): Promise<GenerationStream>;
+}
+
+export interface AIServiceClient extends AIService {
   appendMessages(messages: Message[]): Promise<void>;
-  updateMessage(spaceId: SpaceId, threadId: string, messageId: string, message: Message): Promise<void>;
-  generate(request: GenerateRequest): Promise<GenerationStream>;
 }
 
 export type AIServiceClientParams = {
@@ -38,19 +35,6 @@ export class AIServiceClientImpl implements AIServiceClient {
     this._endpoint = endpoint;
   }
 
-  async getSpace(spaceId: SpaceId): Promise<Space> {
-    throw new Error('Not implemented');
-  }
-
-  async getThread(spaceId: SpaceId, threadId: string): Promise<Thread> {
-    throw new Error('Not implemented');
-  }
-
-  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 appendMessages(messages: Message[]): Promise<void> {
     const url = `${this._endpoint}/message`;
     const res = await fetch(url, {
@@ -66,15 +50,10 @@ export class AIServiceClientImpl implements AIServiceClient {
     }
   }
 
-  // TODO(dmaretskyi): Accept partial message schema.
-  async updateMessage(spaceId: SpaceId, threadId: string, messageId: string, message: Message): Promise<void> {
-    throw new Error('Not implemented');
-  }
-
   /**
-   * Open message stream.
+   * Process request and open message stream.
    */
-  async generate(request: GenerateRequest): Promise<GenerationStream> {
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
     // TODO(dmaretskyi): Errors if tools are not provided.
     request = {
       tools: request.tools ?? [],

package/src/ai-service/stream.ts

@@ -11,7 +11,7 @@ import { iterSSEMessages } from './util';
 /**
  * Creates a stream from an SSE response.
  */
-export const createGenerationStream = (response: Response, controller = new AbortController()) => {
+export const createGenerationStream = (response: Response, controller = new AbortController()): GenerationStream => {
   const iterator = async function* () {
     for await (const sse of iterSSEMessages(response, controller)) {
       if (sse.event === 'completion') {

package/src/ai-service/testing/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './mock';
+export * from './test-stream';

package/src/ai-service/testing/mock.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type GenerationStream, type AIService, type GenerateRequest, createGenerationStream } from '@dxos/assistant';
+
+import { createTestSSEStream } from './test-stream';
+
+export class MockAIService implements AIService {
+  constructor(private readonly _responses: string[]) {}
+
+  // TODO(burdon): Match response to request.
+  // TODO(burdon): See MockGpt (from conductor).
+  async exec(request: GenerateRequest): Promise<GenerationStream> {
+    return createGenerationStream(new Response(createTestSSEStream(this._responses)));
+  }
+}

package/src/ai-service/{testing.ts → testing/test-stream.ts}

@@ -4,7 +4,7 @@
 
 import { ObjectId } from '@dxos/echo-schema';
 
-import { type GenerationStreamEvent } from './types';
+import { type GenerationStreamEvent } from '../types';
 
 /**
  * Mock server-side events (SSE) stream.

package/src/ai-service/types.ts

@@ -34,25 +34,25 @@ export const GenerateRequest = S.Struct({
   model: S.optional(LLMModel),
 
   /**
-   * System instructions to the LLM.
+   * Tools available for the LLM.
    */
-  systemPrompt: S.optional(S.String),
+  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
 
   /**
-   * Current request.
+   * System instructions to the LLM.
    */
-  // TODO(burdon): Remove from history.
-  // prompt: Message,
+  systemPrompt: S.optional(S.String),
 
   /**
    * History of messages to include in the context window.
    */
+  // TODO(burdon): Rename messages.
   history: S.optional(S.Array(Message)),
 
   /**
-   * Tools available for the LLM.
+   * Current request.
    */
-  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
+  prompt: S.optional(Message),
 });
 
 export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;

package/src/conversation/conversation.test.ts

@@ -37,7 +37,7 @@ describe.skip('Conversation tests', () => {
   });
 
   test('tool call', async ({ expect }) => {
-    const custodian = defineTool({
+    const custodian = defineTool('testing', {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       schema: S.Struct({

package/src/conversation/conversation.ts

@@ -43,7 +43,7 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
   const generate = async () => {
     log('llm generate', { tools: params.tools });
     const beginTs = Date.now();
-    const stream = await params.client.generate({
+    const stream = await params.client.exec({
       model: params.model,
       spaceId: params.spaceId,
       threadId: params.threadId,

package/src/testing/artifacts.test.ts

@@ -41,16 +41,16 @@ const list: ArtifactDef = {
   description: 'Ordered set of text items.',
   schema: ListSchema,
   actions: [
-    defineTool({
-      name: 'list.query',
+    defineTool('list', {
+      name: 'query',
       description: 'Query all lists',
       schema: S.Struct({}),
       execute: async ({}, context) => {
         return ToolResult.Success(LISTS[id]);
       },
     }),
-    defineTool({
-      name: 'list.inspect',
+    defineTool('list', {
+      name: 'inspect',
       description: 'Get contents of the list',
       schema: S.Struct({
         id: ObjectId.annotations({ description: 'The list to inspect' }),
@@ -59,8 +59,8 @@ const list: ArtifactDef = {
         return ToolResult.Success(LISTS[id]);
       },
     }),
-    defineTool({
-      name: 'list.add',
+    defineTool('list', {
+      name: 'create',
       description: 'Add one or more items to an existing list',
       schema: S.Struct({
         id: ObjectId.annotations({ description: 'The list to add items to' }),
@@ -78,7 +78,7 @@ const LISTS: Record<ObjectId, ListSchema> = {};
 
 const artifacts = [list];
 
-const getArtifactDefinitions = defineTool({
+const getArtifactDefinitions = defineTool('system', {
   name: 'getArtifactDefinitions',
   description: 'Queries the definitions and metadata of artifacts defined in the system',
   schema: S.Any,

package/src/testing/query-promts.ts

@@ -12,34 +12,34 @@ import { executeQuery, formatJsonSchemaForLLM, type DataSource } from '../cypher
 import { trim } from '../util';
 
 export const createCypherTool = (dataSource: DataSource, schemaTypes: S.Schema.Any[] = []) =>
-  defineTool({
-    name: 'graphQuery',
+  defineTool('dxos.org/echo', {
+    name: 'query',
     description:
       'Query the ECHO graph database in cypher query language. Returns data from the database.' +
       (schemaTypes.length > 0 ? `\n\n${createSystemPrompt(schemaTypes)}` : ''),
     schema: S.Struct({
       query: S.String.annotations({
         description: `
-      A valid cypher query string to execute.
-      Query must have one MATCH clause.
-      Match clause can have multiple patterns but they must all be connected via a relationship chain.
-      Query might have zero or one WHERE clauses.
-      Query must have one RETURN clause.
-      RETURN clause can have multiple expressions separated by commas.
-      DISTINCT keyword is not allowed.
+          A valid cypher query string to execute.
+          Query must have one MATCH clause.
+          Match clause can have multiple patterns but they must all be connected via a relationship chain.
+          Query might have zero or one WHERE clauses.
+          Query must have one RETURN clause.
+          RETURN clause can have multiple expressions separated by commas.
+          DISTINCT keyword is not allowed.
 
-      <example>
-      MATCH (n:Person) RETURN n.name
-      </example>
+          <example>
+          MATCH (n:Person) RETURN n.name
+          </example>
 
-      <example>
-      MATCH (s:Studio)-[:PRODUCED]->(m:Movie)-[:PRODUCED_IN]->(c:City {name: "Las Vegas"}) RETURN s
-      </example>
-      
-      <example>
-      MATCH (a:Actor)-[:STARRED_IN]->(m:Movie)<-[:PRODUCED]-(s:Studio {name: "Cinema Pictures"}) WHERE m.name = "Once upon a time" RETURN m.name, a.name
-      </example>
-      `,
+          <example>
+          MATCH (s:Studio)-[:PRODUCED]->(m:Movie)-[:PRODUCED_IN]->(c:City {name: "Las Vegas"}) RETURN s
+          </example>
+          
+          <example>
+          MATCH (a:Actor)-[:STARRED_IN]->(m:Movie)<-[:PRODUCED]-(s:Studio {name: "Cinema Pictures"}) WHERE m.name = "Once upon a time" RETURN m.name, a.name
+          </example>
+        `,
       }),
     }),
     execute: async ({ query }) => {

package/dist/types/src/ai-service/testing.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/testing.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,eAAO,MAAM,mBAAmB,SACxB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,gBACH;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,KACvD,cA8EF,CAAC"}