@dxos/assistant 0.8.1-staging.9eaf14f → 0.8.2-main.12df754

package/src/ai-service/types.ts

@@ -4,8 +4,8 @@
 
 import { Schema as S } from 'effect';
 
-import { Tool, Message, type MessageContentBlock, SpaceIdSchema } from '@dxos/artifact';
-import { ObjectId } from '@dxos/echo-schema';
+import { Tool, Message, type MessageContentBlock } from '@dxos/artifact';
+import { type ObjectId } from '@dxos/echo-schema';
 
 import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from './defs';
 
@@ -25,9 +25,6 @@ export const ToolTypes = Object.freeze({
  * Client GPT request.
  */
 export const GenerateRequest = S.Struct({
-  spaceId: S.optional(SpaceIdSchema),
-  threadId: S.optional(ObjectId),
-
   /**
    * Preferred model or system default.
    */
@@ -54,9 +51,21 @@ export const GenerateRequest = S.Struct({
    */
   prompt: S.optional(Message),
 });
-
 export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
 
+/**
+ * Non-streaming response.
+ */
+export const GenerateResponse = S.Struct({
+  messages: S.Array(Message),
+
+  /**
+   * Number of tokens used in the response.
+   */
+  tokenCount: S.optional(S.Number),
+});
+export type GenerateResponse = S.Schema.Type<typeof GenerateResponse>;
+
 /**
  * Server-Sent Events (SSE) stream from the AI service.
  * https://docs.anthropic.com/en/api/streaming

package/src/bin/chat.ts

@@ -46,7 +46,6 @@ while (true) {
       message: 'Enter a message:',
     },
   ]);
-  await client.appendMessages([createUserMessage(spaceId, threadId, prompt.message)]);
 
   await runLLM({
     model: DEFAULT_EDGE_MODEL,
@@ -61,6 +60,7 @@ while (true) {
       },
     ],
     client,
+    history: [createUserMessage(spaceId, threadId, prompt.message)],
     logger: createLogger({
       stream: true,
       filter: (e) => {

package/src/conversation/conversation.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Tool, ToolResult, Message } from '@dxos/artifact';
-import { createStatic, ObjectId } from '@dxos/echo-schema';
+import { create, ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -43,10 +43,8 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
   const generate = async () => {
     log('llm generate', { tools: params.tools });
     const beginTs = Date.now();
-    const stream = await params.client.exec({
+    const stream = await params.client.execStream({
       model: params.model,
-      spaceId: params.spaceId,
-      threadId: params.threadId,
       history,
       systemPrompt: params.system,
       tools: params.tools as any,
@@ -88,8 +86,6 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
           log.warn('tool error', { message: toolResult.message });
           const resultMessage: Message = {
             id: ObjectId.random(),
-            spaceId: params.spaceId,
-            threadId: params.threadId,
             role: 'user',
             content: [
               {
@@ -110,8 +106,6 @@ export const runLLM = async (params: CreateLLMConversationParams) => {
           log('tool success', { result: toolResult.result });
           const resultMessage: Message = {
             id: ObjectId.random(),
-            spaceId: params.spaceId,
-            threadId: params.threadId,
             role: 'user',
             content: [
               {
@@ -175,7 +169,7 @@ export const runTools = async ({ message, tools, extensions }: RunToolsOptions):
   const toolCall = toolCalls[0];
   const tool = tools.find((tool) => tool.name === toolCall.name);
   if (!tool) {
-    const resultMessage = createStatic(Message, {
+    const resultMessage = create(Message, {
       role: 'user',
       content: [
         {
@@ -206,7 +200,7 @@ export const runTools = async ({ message, tools, extensions }: RunToolsOptions):
   switch (toolResult.kind) {
     case 'error': {
       log('tool error', { message: toolResult.message });
-      const resultMessage = createStatic(Message, {
+      const resultMessage = create(Message, {
         role: 'user',
         content: [
           {
@@ -227,7 +221,7 @@ export const runTools = async ({ message, tools, extensions }: RunToolsOptions):
 
     case 'success': {
       log('tool success', { result: toolResult.result });
-      const resultMessage = createStatic(Message, {
+      const resultMessage = create(Message, {
         role: 'user',
         content: [
           {

package/src/conversation/types.ts

@@ -6,13 +6,10 @@ import { Schema as S } from 'effect';
 
 import { type Message, type MessageContentBlock } from '@dxos/artifact';
 import { toJsonSchema, JsonSchemaType, ObjectId } from '@dxos/echo-schema';
-import type { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
-export const createUserMessage = (spaceId: SpaceId, threadId: ObjectId, text: string): Message => ({
+export const createUserMessage = (text: string): Message => ({
   id: ObjectId.random(),
-  spaceId,
-  threadId,
   role: 'user',
   content: [{ type: 'text', text }],
 });

package/src/cypher/echo-data-source.ts

@@ -4,8 +4,7 @@
 
 import { raise } from '@dxos/debug';
 import { type EchoDatabase, Filter, type ReactiveEchoObject } from '@dxos/echo-db';
-import { type S, getSchemaTypename, StoredSchema, toJsonSchema } from '@dxos/echo-schema';
-import { getSchema } from '@dxos/live-object';
+import { getSchema, getSchemaTypename, type S, StoredSchema, toJsonSchema } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 
 import type { DataSource, Node, Relationship } from './query-executor';

package/src/session/session.test.ts

@@ -15,7 +15,7 @@ import {
   type MessageContentBlock,
 } from '@dxos/artifact';
 import { AIServiceEdgeClient } from '@dxos/assistant';
-import { createStatic, EchoObject, ObjectId } from '@dxos/echo-schema';
+import { create, EchoObject, ObjectId } from '@dxos/echo-schema';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 
@@ -156,31 +156,31 @@ describe.skip('AISession with Ollama', () => {
 
 // Travel to rome, florence, livorno, siena, madrid for conferences
 const CALENDAR_EVENTS: CalendarEvent[] = [
-  createStatic(CalendarEventSchema, {
+  create(CalendarEventSchema, {
     title: 'Exploring Ancient Ruins in Rome',
     startTime: '2024-01-01T10:00:00Z',
     endTime: '2024-01-01T11:00:00Z',
     description: 'Tech conference at the historic Colosseum with networking opportunities',
   }),
-  createStatic(CalendarEventSchema, {
+  create(CalendarEventSchema, {
     title: 'Renaissance Tech Summit in Florence',
     startTime: '2024-01-01T11:00:00Z',
     endTime: '2024-01-01T12:00:00Z',
     description: 'Discussing AI innovations surrounded by Renaissance art',
   }),
-  createStatic(CalendarEventSchema, {
+  create(CalendarEventSchema, {
     title: 'Travel to Livorno',
     startTime: '2024-01-01T12:00:00Z',
     endTime: '2024-01-01T13:00:00Z',
     description: 'Travel to Livorno',
   }),
-  createStatic(CalendarEventSchema, {
+  create(CalendarEventSchema, {
     title: 'Travel to Siena',
     startTime: '2024-01-01T13:00:00Z',
     endTime: '2024-01-01T14:00:00Z',
     description: 'Travel to Siena',
   }),
-  createStatic(CalendarEventSchema, {
+  create(CalendarEventSchema, {
     title: 'Travel to Madrid',
     startTime: '2024-01-01T14:00:00Z',
     endTime: '2024-01-01T15:00:00Z',

package/src/session/session.ts

@@ -6,7 +6,7 @@ import { Schema as S } from 'effect';
 
 import { defineTool, Message, ToolResult, type ArtifactDefinition, type Tool } from '@dxos/artifact';
 import { Event, synchronized } from '@dxos/async';
-import { createStatic } from '@dxos/echo-schema';
+import { create } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
@@ -240,7 +240,7 @@ export class AISession {
 
     this._history = [...options.history];
     this._pending = [
-      createStatic(Message, {
+      create(Message, {
         role: 'user',
         content: [{ type: 'text', text: options.prompt }],
       }),
@@ -268,7 +268,7 @@ export class AISession {
         });
 
         // Open request stream.
-        this._stream = await options.client.exec({
+        this._stream = await options.client.execStream({
           ...(options.generationOptions ?? {}),
           // TODO(burdon): Rename messages or separate history/message.
           history: [...this._history, ...this._pending],

package/src/testing/query.test.ts

@@ -32,20 +32,19 @@ test.skip('cypher query', async () => {
   const spaceId = SpaceId.random();
   const threadId = ObjectId.random();
 
-  await client.appendMessages([
-    createUserMessage(
-      spaceId,
-      threadId,
-      'Query the database and give me all employees from DXOS organization that work on Composer and what their tasks are.',
-    ),
-  ]);
-
   const result = await runLLM({
     model: DEFAULT_EDGE_MODEL,
     tools: [cypherTool],
     spaceId,
     threadId,
     system: createSystemPrompt(schemaTypes),
+    history: [
+      createUserMessage(
+        spaceId,
+        threadId,
+        'Query the database and give me all employees from DXOS organization that work on Composer and what their tasks are.',
+      ),
+    ],
     client,
     logger: createLogger({ stream: false }),
   });
@@ -69,14 +68,6 @@ test.skip('query ECHO', async () => {
   const spaceId = SpaceId.random();
   const threadId = ObjectId.random();
 
-  await client.appendMessages([
-    createUserMessage(
-      spaceId,
-      threadId,
-      'Query the database and give me all employees from DXOS organization that work on Composer and what their tasks are.',
-    ),
-  ]);
-
   const result = await runLLM({
     model: DEFAULT_EDGE_MODEL,
     tools: [cypherTool],
@@ -84,6 +75,13 @@ test.skip('query ECHO', async () => {
     threadId,
     system: createSystemPrompt(schemaTypes),
     client,
+    history: [
+      createUserMessage(
+        spaceId,
+        threadId,
+        'Query the database and give me all employees from DXOS organization that work on Composer and what their tasks are.',
+      ),
+    ],
     logger: createLogger({ stream: false }),
   });
 

package/src/testing/test-data.ts

@@ -8,7 +8,7 @@ import { raise } from '@dxos/debug';
 import type { EchoDatabase } from '@dxos/echo-db';
 import { JSON_SCHEMA_ECHO_REF_ID, ObjectId, toJsonSchema, type JsonSchemaType, type Ref } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { create, makeRef } from '@dxos/live-object';
+import { live, makeRef } from '@dxos/live-object';
 
 import {
   type DataSource,
@@ -21,100 +21,100 @@ import { Contact, Org, Project, Task } from '../testing';
 
 export const seedTestData = (db: EchoDatabase) => {
   const contactRich = db.add(
-    create(Contact, {
+    live(Contact, {
       name: 'Rich',
     }),
   );
   const contactJosiah = db.add(
-    create(Contact, {
+    live(Contact, {
       name: 'Josiah',
     }),
   );
   const contactDima = db.add(
-    create(Contact, {
+    live(Contact, {
       name: 'Dima',
     }),
   );
   const contactFred = db.add(
-    create(Contact, {
+    live(Contact, {
       name: 'Fred',
     }),
   );
 
   const projectComposer = db.add(
-    create(Project, {
+    live(Project, {
       name: 'Composer',
     }),
   );
   const projectEcho = db.add(
-    create(Project, {
+    live(Project, {
       name: 'ECHO',
     }),
   );
   const projectDoodles = db.add(
-    create(Project, {
+    live(Project, {
       name: 'Doodles',
     }),
   );
 
   const _taskComposer1 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Optimize startup performance',
       project: makeRef(projectComposer),
       assignee: makeRef(contactJosiah),
     }),
   );
   const _taskComposer2 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Create form builder',
       project: makeRef(projectComposer),
       assignee: makeRef(contactRich),
     }),
   );
   const _taskComposer3 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Add support for custom themes',
       project: makeRef(projectComposer),
       assignee: makeRef(contactJosiah),
     }),
   );
   const _taskComposer5 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Implement community plugin',
       project: makeRef(projectComposer),
       assignee: makeRef(contactFred),
     }),
   );
   const _taskComposer4 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Implement dark mode',
       project: makeRef(projectComposer),
       assignee: makeRef(contactRich),
     }),
   );
   const _taskEcho1 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Implement cypher query engine',
       project: makeRef(projectEcho),
       assignee: makeRef(contactDima),
     }),
   );
   const _taskEcho2 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Add schema editor',
       project: makeRef(projectEcho),
       assignee: makeRef(contactRich),
     }),
   );
   const _taskDoodles1 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Add support for custom themes',
       project: makeRef(projectDoodles),
       assignee: makeRef(contactFred),
     }),
   );
   const _taskDoodles2 = db.add(
-    create(Task, {
+    live(Task, {
       name: 'Implement dark mode',
       project: makeRef(projectDoodles),
       assignee: makeRef(contactJosiah),
@@ -122,14 +122,14 @@ export const seedTestData = (db: EchoDatabase) => {
   );
 
   const _orgDxos = db.add(
-    create(Org, {
+    live(Org, {
       name: 'DXOS',
       employees: [makeRef(contactRich), makeRef(contactJosiah), makeRef(contactDima)],
       projects: [makeRef(projectEcho)],
     }),
   );
   const _orgBraneframe = db.add(
-    create(Org, {
+    live(Org, {
       name: 'Braneframe',
       employees: [makeRef(contactJosiah), makeRef(contactRich)],
       projects: [makeRef(projectComposer)],