@dxos/assistant 0.8.3-main.7f5a14c → 0.8.3

package/src/blueprint/test-data.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { create } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { DataType } from '@dxos/schema';
 
 // TODO(burdon): Convert to queue.
 export const TEST_EMAILS: DataType.Message[] = [
-  create(DataType.Message, {
+  Obj.make(DataType.Message, {
     properties: {
       subject: 'Introduction email',
     },
@@ -22,7 +22,7 @@ export const TEST_EMAILS: DataType.Message[] = [
     ],
     created: new Date().toISOString(),
   }),
-  create(DataType.Message, {
+  Obj.make(DataType.Message, {
     properties: {
       subject: 'Question about integration',
     },
@@ -37,7 +37,7 @@ export const TEST_EMAILS: DataType.Message[] = [
     ],
     created: new Date().toISOString(),
   }),
-  create(DataType.Message, {
+  Obj.make(DataType.Message, {
     properties: {
       subject: 'MAKE MONEY FAST!!!',
     },

package/src/extraction/extraction-llm-function/extraction-llm-function.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, test, beforeAll } from 'vitest';
 
-import { AIServiceEdgeClient } from '@dxos/ai';
+import { EdgeAiServiceClient } from '@dxos/ai';
 import { AI_SERVICE_ENDPOINT } from '@dxos/ai/testing';
 import { FunctionExecutor, ServiceContainer } from '@dxos/functions';
 import { log } from '@dxos/log';
@@ -21,7 +21,7 @@ describe.skip('LLM EntityExtraction', () => {
     executor = new FunctionExecutor(
       new ServiceContainer().setServices({
         ai: {
-          client: new AIServiceEdgeClient({
+          client: new EdgeAiServiceClient({
             endpoint: AI_SERVICE_ENDPOINT.REMOTE,
             defaultGenerationOptions: {
               // model: '@anthropic/claude-sonnet-4-20250514',

package/src/extraction/extraction-llm-function/extraction-llm-function.ts

@@ -3,6 +3,7 @@
 //
 
 import { Message } from '@dxos/ai';
+import { Obj } from '@dxos/echo';
 import { create } from '@dxos/echo-schema';
 import { AiService, defineFunction, type FunctionDefinition } from '@dxos/functions';
 import { DataType } from '@dxos/schema';
@@ -27,7 +28,7 @@ export const extractionAnthropicFn: FunctionDefinition<ExtractionInput, Extracti
       client: ai.client,
       systemPrompt: PROMPT,
       history: [
-        create(Message, {
+        Obj.make(Message, {
           role: 'user',
           content: [
             {

package/src/extraction/quotes.ts

@@ -4,8 +4,9 @@
 
 import { Schema } from 'effect';
 
+import { Query, Filter } from '@dxos/echo';
 import { type EchoDatabase } from '@dxos/echo-db';
-import { Filter, ObjectId, Query } from '@dxos/echo-schema';
+import { ObjectId } from '@dxos/echo-schema';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 

package/src/research/graph.ts

@@ -6,6 +6,7 @@ import { Schema, identity, Option, SchemaAST } from 'effect';
 
 import { createTool, ToolResult } from '@dxos/ai';
 import type { Obj, Relation } from '@dxos/echo';
+import { Query, Filter } from '@dxos/echo';
 import { type EchoDatabase, type Queue } from '@dxos/echo-db';
 import { isEncodedReference } from '@dxos/echo-protocol';
 import {
@@ -13,13 +14,10 @@ import {
   getSchemaTypename,
   getTypeAnnotation,
   getTypeIdentifierAnnotation,
-  type AnyEchoObject,
   create,
-  Filter,
   getEntityKind,
   getSchemaDXN,
   ObjectId,
-  Query,
   ReferenceAnnotationId,
   type BaseObject,
   RelationSourceDXNId,
@@ -325,7 +323,7 @@ export const createGraphWriterTool = ({
   db: EchoDatabase;
   queue?: Queue;
   schema: Schema.Schema.AnyNoContext[];
-  onDone?: (data: AnyEchoObject[]) => Promise<any>;
+  onDone?: (data: Obj.Any[]) => Promise<any>;
 }) => {
   return createTool('graph', {
     name: 'writer',
@@ -333,7 +331,7 @@ export const createGraphWriterTool = ({
     schema: createExtractionSchema(schema),
     execute: async (input) => {
       const data = await sanitizeObjects(schema, input as any, db, queue);
-      return ToolResult.Success(await onDone(data as AnyEchoObject[]));
+      return ToolResult.Success(await onDone(data as Obj.Any[]));
     },
   });
 };

package/src/research/research.test.ts

@@ -5,13 +5,13 @@
 import { inspect } from 'node:util';
 import { beforeAll, describe, test } from 'vitest';
 
-import { AIServiceEdgeClient, OllamaClient, structuredOutputParser } from '@dxos/ai';
+import { EdgeAiServiceClient, OllamaAiServiceClient, structuredOutputParser } from '@dxos/ai';
 import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from '@dxos/ai/testing';
+import { Obj } from '@dxos/echo';
 import { type EchoDatabase } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
 import { getSchemaDXN } from '@dxos/echo-schema';
 import { ConfiguredCredentialsService, FunctionExecutor, ServiceContainer, TracingService } from '@dxos/functions';
-import { live } from '@dxos/live-object';
 import { DataType, DataTypes } from '@dxos/schema';
 
 import { createExtractionSchema, getSanitizedSchemaName } from './graph';
@@ -28,21 +28,22 @@ describe.skip('Research', () => {
   beforeAll(async () => {
     // TODO(dmaretskyi): Helper to scaffold this from a config.
     builder = await new EchoTestBuilder().open();
-    const { db: db1 } = await builder.createDatabase({ indexing: { vector: true } });
-    db = db1;
+
+    db = (await builder.createDatabase({ indexing: { vector: true } })).db;
     db.graph.schemaRegistry.addSchema(DataTypes);
+
     executor = new FunctionExecutor(
       new ServiceContainer().setServices({
         ai: {
           client: REMOTE_AI
-            ? new AIServiceEdgeClient({
+            ? new EdgeAiServiceClient({
                 endpoint: AI_SERVICE_ENDPOINT.REMOTE,
                 defaultGenerationOptions: {
                   // model: '@anthropic/claude-sonnet-4-20250514',
                   model: '@anthropic/claude-3-5-sonnet-20241022',
                 },
               })
-            : new OllamaClient({
+            : new OllamaAiServiceClient({
                 overrides: {
                   model: 'llama3.1:8b',
                 },
@@ -57,7 +58,7 @@ describe.skip('Research', () => {
 
   test('should generate a research report', { timeout: 300_000 }, async () => {
     db.add(
-      live(DataType.Organization, {
+      Obj.make(DataType.Organization, {
         name: 'Notion',
         website: 'https://www.notion.com',
       }),

package/src/research/research.ts

@@ -41,7 +41,7 @@ export const researchFn = defineFunction({
     const ai = context.getService(AiService);
     const credentials = context.getService(CredentialsService);
     const { db } = context.getService(DatabaseService);
-    // const queues = context.getService(QueuesService);
+    // const queues = context.getService(QueueService);
     const tracing = context.getService(TracingService);
 
     tracing.write(create(AgentStatusReport, { message: 'Researching...' }));

package/src/session/session.test.ts

@@ -5,11 +5,11 @@
 import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
-import { AIServiceEdgeClient, ConsolePrinter, createTool, ToolResult } from '@dxos/ai';
+import { EdgeAiServiceClient, ConsolePrinter, createTool, ToolResult } from '@dxos/ai';
 import { AI_SERVICE_ENDPOINT } from '@dxos/ai/testing';
 import { ArtifactId, defineArtifact } from '@dxos/artifact';
-import { Type } from '@dxos/echo';
-import { create, ObjectId } from '@dxos/echo-schema';
+import { Type, Obj } from '@dxos/echo';
+import { ObjectId } from '@dxos/echo-schema';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 
@@ -33,8 +33,8 @@ type CalendarEvent = Schema.Schema.Type<typeof CalendarEventSchema>;
 // TODO(burdon): Flaky.
 describe.skip('AISession with Ollama', () => {
   test('create calendar itinerary', { timeout: 60_000 }, async () => {
-    const aiClient = new AIServiceEdgeClient({ endpoint: AI_SERVICE_ENDPOINT.REMOTE });
-    // const aiClient = new OllamaClient({
+    const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.REMOTE });
+    // const aiClient = new OllamaAiServiceClient({
     //   overrides: { model: 'llama3.1:8b' },
     // });
     const session = new AISession({ operationModel: 'configured' });
@@ -156,31 +156,31 @@ describe.skip('AISession with Ollama', () => {
 
 // Travel to rome, florence, livorno, siena, madrid for conferences
 const CALENDAR_EVENTS: CalendarEvent[] = [
-  create(CalendarEventSchema, {
+  Obj.make(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',
   }),
-  create(CalendarEventSchema, {
+  Obj.make(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',
   }),
-  create(CalendarEventSchema, {
+  Obj.make(CalendarEventSchema, {
     title: 'Travel to Livorno',
     startTime: '2024-01-01T12:00:00Z',
     endTime: '2024-01-01T13:00:00Z',
     description: 'Travel to Livorno',
   }),
-  create(CalendarEventSchema, {
+  Obj.make(CalendarEventSchema, {
     title: 'Travel to Siena',
     startTime: '2024-01-01T13:00:00Z',
     endTime: '2024-01-01T14:00:00Z',
     description: 'Travel to Siena',
   }),
-  create(CalendarEventSchema, {
+  Obj.make(CalendarEventSchema, {
     title: 'Travel to Madrid',
     startTime: '2024-01-01T14:00:00Z',
     endTime: '2024-01-01T15:00:00Z',

package/src/session/session.ts

@@ -10,7 +10,7 @@ import {
   runTools,
   type AgentStatus,
   structuredOutputParser,
-  type AIServiceClient,
+  type AiServiceClient,
   type GenerationStream,
   type GenerateRequest,
   Message,
@@ -22,6 +22,7 @@ import {
 } from '@dxos/ai';
 import { type ArtifactDefinition } from '@dxos/artifact';
 import { Event, synchronized } from '@dxos/async';
+import { Obj } from '@dxos/echo';
 import { ObjectVersion } from '@dxos/echo-db';
 import { create, type ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
@@ -57,7 +58,7 @@ export type ArtifactDiffResolver = (artifacts: { id: ObjectId; lastVersion: Obje
 >;
 
 export type SessionRunOptions = {
-  client: AIServiceClient;
+  client: AiServiceClient;
 
   artifacts: ArtifactDefinition[];
 
@@ -310,7 +311,7 @@ export class AISession {
       }
     }
 
-    return create(Message, {
+    return Obj.make(Message, {
       role: 'user',
       content: [...prelude, { type: 'text', text: prompt }],
     });

package/src/summarization/summarization.test.ts

@@ -5,13 +5,18 @@
 import { pipe, Schema } from 'effect';
 import { beforeAll, describe, test } from 'vitest';
 
-import { AIServiceEdgeClient, Message, MixedStreamParser, OllamaClient, type TextContentBlock } from '@dxos/ai';
+import {
+  EdgeAiServiceClient,
+  Message,
+  MixedStreamParser,
+  OllamaAiServiceClient,
+  type TextContentBlock,
+} from '@dxos/ai';
 import { AI_SERVICE_ENDPOINT } from '@dxos/ai/testing';
+import { Obj } from '@dxos/echo';
 import type { EchoDatabase } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
-import { create } from '@dxos/echo-schema';
 import { AiService, defineFunction, FunctionExecutor, ServiceContainer } from '@dxos/functions';
-import { live } from '@dxos/live-object';
 import { DataType } from '@dxos/schema';
 import { createTestData } from '@dxos/schema/testing';
 
@@ -47,7 +52,7 @@ const summarizationFn = defineFunction({
         The Transcript Summarizer outputs only the summary text.
       `,
         history: [
-          create(Message, {
+          Obj.make(Message, {
             role: 'user',
             content: [
               {
@@ -75,7 +80,7 @@ const summarizationFn = defineFunction({
         ],
       }),
     );
-    return create(DataType.Text, {
+    return Obj.make(DataType.Text, {
       content: pipe(result[0]?.content[0], (c) => (c?.type === 'text' ? c.text : '')),
     });
   },
@@ -112,7 +117,7 @@ const refinementFn = defineFunction({
         The Transcript Summary Refiner outputs only the summary text.
       `,
         history: [
-          create(Message, {
+          Obj.make(Message, {
             role: 'user',
             content: summaries.map(
               (summary) =>
@@ -130,7 +135,7 @@ const refinementFn = defineFunction({
       }),
     );
     return {
-      summary: create(DataType.Text, {
+      summary: Obj.make(DataType.Text, {
         content: pipe(result[0]?.content[0], (c) => (c?.type === 'text' ? c.text : '')),
       }),
     };
@@ -151,14 +156,14 @@ describe.skip('Summarization', () => {
       new ServiceContainer().setServices({
         ai: {
           client: REMOTE_AI
-            ? new AIServiceEdgeClient({
+            ? new EdgeAiServiceClient({
                 endpoint: AI_SERVICE_ENDPOINT.REMOTE,
                 defaultGenerationOptions: {
                   // model: '@anthropic/claude-sonnet-4-20250514',
                   model: '@anthropic/claude-3-5-sonnet-20241022',
                 },
               })
-            : new OllamaClient({
+            : new OllamaAiServiceClient({
                 overrides: {
                   model: 'llama3.1:8b',
                 },
@@ -174,7 +179,7 @@ describe.skip('Summarization', () => {
   test('keeps transcript outline', { timeout: 1000_000 }, async () => {
     const { transcriptMessages } = createTestData();
 
-    const summary = live(DataType.Text, {
+    const summary = Obj.make(DataType.Text, {
       content: '',
     });
 
@@ -187,7 +192,7 @@ describe.skip('Summarization', () => {
         transcript: blocks,
       });
       summary.content = result.content;
-      summaries.push(live(DataType.Text, { content: result.content }));
+      summaries.push(Obj.make(DataType.Text, { content: result.content }));
 
       console.log(blocks.at(-1));
       console.log();
@@ -202,7 +207,7 @@ describe.skip('Summarization', () => {
           summaries: history,
         });
         summary.content = result.summary.content;
-        summaries.push(live(DataType.Text, { content: result.summary.content }));
+        summaries.push(Obj.make(DataType.Text, { content: result.summary.content }));
 
         console.log('REFINED');
         console.log();