@dxos/assistant 0.8.4-main.3a94e84 → 0.8.4-main.5acf9ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.4-main.3a94e84",
+  "version": "0.8.4-main.5acf9ea",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,7 +12,8 @@
     ".": {
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "source": "./src/index.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -31,26 +32,26 @@
     "exa-js": "^1.5.12",
     "handlebars": "4.7.8",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/ai": "0.8.4-main.3a94e84",
-    "@dxos/blueprints": "0.8.4-main.3a94e84",
-    "@dxos/async": "0.8.4-main.3a94e84",
-    "@dxos/context": "0.8.4-main.3a94e84",
-    "@dxos/debug": "0.8.4-main.3a94e84",
-    "@dxos/echo": "0.8.4-main.3a94e84",
-    "@dxos/echo-schema": "0.8.4-main.3a94e84",
-    "@dxos/effect": "0.8.4-main.3a94e84",
-    "@dxos/echo-db": "0.8.4-main.3a94e84",
-    "@dxos/echo-protocol": "0.8.4-main.3a94e84",
-    "@dxos/errors": "0.8.4-main.3a94e84",
-    "@dxos/functions": "0.8.4-main.3a94e84",
-    "@dxos/graph": "0.8.4-main.3a94e84",
-    "@dxos/invariant": "0.8.4-main.3a94e84",
-    "@dxos/keys": "0.8.4-main.3a94e84",
-    "@dxos/live-object": "0.8.4-main.3a94e84",
-    "@dxos/log": "0.8.4-main.3a94e84",
-    "@dxos/schema": "0.8.4-main.3a94e84",
-    "@dxos/node-std": "0.8.4-main.3a94e84",
-    "@dxos/util": "0.8.4-main.3a94e84"
+    "@dxos/ai": "0.8.4-main.5acf9ea",
+    "@dxos/async": "0.8.4-main.5acf9ea",
+    "@dxos/blueprints": "0.8.4-main.5acf9ea",
+    "@dxos/context": "0.8.4-main.5acf9ea",
+    "@dxos/debug": "0.8.4-main.5acf9ea",
+    "@dxos/echo-db": "0.8.4-main.5acf9ea",
+    "@dxos/echo-protocol": "0.8.4-main.5acf9ea",
+    "@dxos/echo-schema": "0.8.4-main.5acf9ea",
+    "@dxos/echo": "0.8.4-main.5acf9ea",
+    "@dxos/effect": "0.8.4-main.5acf9ea",
+    "@dxos/errors": "0.8.4-main.5acf9ea",
+    "@dxos/functions": "0.8.4-main.5acf9ea",
+    "@dxos/invariant": "0.8.4-main.5acf9ea",
+    "@dxos/keys": "0.8.4-main.5acf9ea",
+    "@dxos/graph": "0.8.4-main.5acf9ea",
+    "@dxos/live-object": "0.8.4-main.5acf9ea",
+    "@dxos/log": "0.8.4-main.5acf9ea",
+    "@dxos/node-std": "0.8.4-main.5acf9ea",
+    "@dxos/util": "0.8.4-main.5acf9ea",
+    "@dxos/schema": "0.8.4-main.5acf9ea"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",

package/src/functions/services.ts

@@ -6,8 +6,7 @@ import { AiTool } from '@effect/ai';
 import { Context, Effect, Layer, Match, Predicate, Record, Schema } from 'effect';
 
 import { AiToolNotFoundError, ToolExecutionService, ToolResolverService } from '@dxos/ai';
-import { todo } from '@dxos/debug';
-import { FunctionError, type FunctionContext, type FunctionDefinition, type Services } from '@dxos/functions';
+import { LocalFunctionExecutionService, type FunctionDefinition } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 
 export const makeToolResolverFromFunctions = (
@@ -27,24 +26,32 @@ export const makeToolResolverFromFunctions = (
 
 export const makeToolExecutionServiceFromFunctions = (
   functions: FunctionDefinition<any, any>[],
-): Layer.Layer<ToolExecutionService> => {
-  return Layer.succeed(ToolExecutionService, {
-    handlersFor: (toolkit) => {
-      const makeHandler = (tool: AiTool.Any): ((params: unknown) => Effect.Effect<unknown, any, any>) => {
-        return Effect.fn('toolFunctionHandler')(function* (input: any) {
-          const { functionName } = Context.get(FunctionToolAnnotation)(tool.annotations as any);
-          const fnDef = functions.find((f) => f.name === functionName);
-          if (!fnDef) {
-            return yield* Effect.fail(new AiToolNotFoundError(tool.name));
-          }
-
-          return yield* invokeFunction(fnDef, input).pipe(Effect.catchAllDefect((defect) => Effect.fail(defect)));
-        });
+): Layer.Layer<ToolExecutionService, never, LocalFunctionExecutionService> => {
+  return Layer.effect(
+    ToolExecutionService,
+    Effect.gen(function* () {
+      const localFunctionExecutionService = yield* LocalFunctionExecutionService;
+      return {
+        handlersFor: (toolkit) => {
+          const makeHandler = (tool: AiTool.Any): ((params: unknown) => Effect.Effect<unknown, any, any>) => {
+            return Effect.fn('toolFunctionHandler')(function* (input: any) {
+              const { functionName } = Context.get(FunctionToolAnnotation)(tool.annotations as any);
+              const fnDef = functions.find((f) => f.name === functionName);
+              if (!fnDef) {
+                return yield* Effect.fail(new AiToolNotFoundError(tool.name));
+              }
+
+              return yield* localFunctionExecutionService
+                .invokeFunction(fnDef, input)
+                .pipe(Effect.catchAllDefect((defect) => Effect.fail(defect)));
+            });
+          };
+
+          return toolkit.of(Record.map(toolkit.tools, (tool, name) => makeHandler(tool)) as any) as any;
+        },
       };
-
-      return toolkit.of(Record.map(toolkit.tools, (tool, name) => makeHandler(tool)) as any) as any;
-    },
-  });
+    }),
+  );
 };
 
 /**
@@ -90,50 +97,3 @@ const createStructFieldsFromSchema = (schema: Schema.Schema<any, any>): Record<s
     Match.orElseAbsurd,
   );
 };
-
-// TODO(dmaretskyi): Factor out.
-const invokeFunction = (fnDef: FunctionDefinition<any, any>, input: any): Effect.Effect<unknown, never, Services> =>
-  Effect.gen(function* () {
-    // Assert input matches schema
-    const assertInput = fnDef.inputSchema.pipe(Schema.asserts);
-    (assertInput as any)(input);
-
-    const context: FunctionContext = {
-      getService: () => todo(),
-      getSpace: async (_spaceId: any) => {
-        throw new Error('Not available. Use the database service instead.');
-      },
-      space: undefined,
-      get ai(): never {
-        throw new Error('Not available. Use the ai service instead.');
-      },
-    };
-
-    // TODO(dmaretskyi): This should be delegated to a function invoker service.
-    const data = yield* Effect.gen(function* () {
-      const result = fnDef.handler({ context, data: input });
-      if (Effect.isEffect(result)) {
-        return yield* (result as Effect.Effect<unknown, unknown, Services>).pipe(Effect.orDie);
-      } else if (
-        typeof result === 'object' &&
-        result !== null &&
-        'then' in result &&
-        typeof result.then === 'function'
-      ) {
-        return yield* Effect.promise(() => result);
-      } else {
-        return result;
-      }
-    }).pipe(
-      Effect.orDie,
-      Effect.catchAllDefect((defect) =>
-        Effect.die(new FunctionError('Error running function', { context: { name: fnDef.name }, cause: defect })),
-      ),
-    );
-
-    // Assert output matches schema
-    const assertOutput = fnDef.outputSchema?.pipe(Schema.asserts);
-    (assertOutput as any)(data);
-
-    return data;
-  }).pipe(Effect.withSpan('invokeFunction', { attributes: { name: fnDef.name } }));

package/src/research/graph.ts

@@ -134,7 +134,7 @@ export const LocalSearchHandler = LocalSearchToolkit.toLayer({
 /**
  * Attached as an annotation to the writer tool.
  */
-class GraphWriterSchema extends Context.Tag('GraphWriterSchema')<
+class GraphWriterSchema extends Context.Tag('@dxos/assistant/GraphWriterSchema')<
   GraphWriterSchema,
   { schema: Schema.Schema.AnyNoContext[] }
 >() {}

package/src/session/session.ts

@@ -137,7 +137,7 @@ export class AiSession {
         // TODO(dmaretskyi): Loading BP from the Database should be done at the higher level. We need a type for the resolved blueprint.
         const systemPrompt = yield* pipe(
           blueprints,
-          Effect.forEach((blueprint) => DatabaseService.loadRef(blueprint.instructions)),
+          Effect.forEach((blueprint) => Effect.succeed(blueprint.instructions)),
           Effect.flatMap(Effect.forEach((template) => DatabaseService.loadRef(template.source))),
           Effect.map(Array.map((template) => `\n\n<blueprint>${template.content}</blueprint>`)),
           Effect.map(Array.reduce(options.systemPrompt ?? '', String.concat)),
@@ -305,7 +305,7 @@ const createArtifactUpdateBlock = (
  * Can be optionally provided to the session run call.
  */
 // TODO(dmaretskyi): Convert to Context.Reference
-export class ArtifactDiffResolver extends Context.Tag('ArtifactDiffResolver')<
+export class ArtifactDiffResolver extends Context.Tag('@dxos/assistant/ArtifactDiffResolver')<
   ArtifactDiffResolver,
   ArtifactDiffResolver.Service
 >() {}

package/src/summarization/summarization.test.ts

@@ -78,9 +78,8 @@ const summarizationFn = defineFunction({
         ],
       }),
     );
-    return Obj.make(DataType.Text, {
-      content: pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : '')),
-    });
+
+    return DataType.makeText(pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : '')));
   },
 });
 
@@ -135,9 +134,7 @@ const refinementFn = defineFunction({
       }),
     );
     return {
-      summary: Obj.make(DataType.Text, {
-        content: pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : '')),
-      }),
+      summary: DataType.makeText(pipe(result[0]?.blocks[0], (c) => (c?._tag === 'text' ? c.text : ''))),
     };
   },
 });
@@ -166,9 +163,7 @@ describe.skip('Summarization', () => {
   test('keeps transcript outline', { timeout: 1000_000 }, async () => {
     const { transcriptMessages } = createTestData();
 
-    const summary = Obj.make(DataType.Text, {
-      content: '',
-    });
+    const summary = DataType.makeText();
 
     const summaries = [];
 
@@ -179,12 +174,10 @@ describe.skip('Summarization', () => {
         transcript: blocks,
       });
       summary.content = result.content;
-      summaries.push(Obj.make(DataType.Text, { content: result.content }));
+      summaries.push(DataType.makeText(result.content));
 
       console.log(blocks.at(-1));
       console.log();
-      console.log('--------------------------------');
-      console.log();
       console.log(summary.content);
       console.log();
 
@@ -194,12 +187,10 @@ describe.skip('Summarization', () => {
           summaries: history,
         });
         summary.content = result.summary.content;
-        summaries.push(Obj.make(DataType.Text, { content: result.summary.content }));
+        summaries.push(DataType.makeText(result.summary.content));
 
         console.log('REFINED');
         console.log();
-        console.log('--------------------------------');
-        console.log();
         console.log(summary.content);
         console.log();
       }