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

package/dist/lib/node-esm/{chunk-DCQJOLSR.mjs → chunk-7JI4MDGL.mjs}

@@ -361,8 +361,6 @@ var GenerationStreamImpl = class {
 };
 
 // packages/experimental/assistant/src/ai-service/edge-client.ts
-import { Schema as S } from "effect";
-import { Message } from "@dxos/artifact";
 import { assertArgument, invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/edge-client.ts";
@@ -370,7 +368,7 @@ var AIServiceEdgeClient = class {
   constructor({ endpoint }) {
     invariant(endpoint, "endpoint is required", {
       F: __dxlog_file2,
-      L: 23,
+      L: 20,
       S: this,
       A: [
         "endpoint",
@@ -380,34 +378,21 @@ var AIServiceEdgeClient = class {
     this._endpoint = endpoint;
   }
   /**
-  * @deprecated
+  * Generate non-streaming response.
   */
-  // TODO(burdon): Remove.
-  async appendMessages(messages) {
-    const url = `${this._endpoint}/message`;
-    const res = await fetch(url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        messages: await S.encodePromise(S.Array(Message))(messages)
-      })
-    });
-    if (!res.ok) {
-      throw new Error(`${await res.text()} [${url}]`);
-    }
+  async exec(request) {
+    throw new Error("Not implemented");
   }
   /**
   * Process request and open message stream.
   */
-  async exec(request) {
+  async execStream(request) {
     assertArgument(typeof request.model === "string", "model is required");
     log2("requesting", {
       endpoint: this._endpoint
     }, {
       F: __dxlog_file2,
-      L: 51,
+      L: 36,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -424,9 +409,12 @@ var AIServiceEdgeClient = class {
         ...request
       })
     });
+    if (!response.ok) {
+      throw await parseErrorResponse(response);
+    }
     invariant(response.body instanceof ReadableStream, void 0, {
       F: __dxlog_file2,
-      L: 64,
+      L: 53,
       S: this,
       A: [
         "response.body instanceof ReadableStream",
@@ -436,6 +424,9 @@ var AIServiceEdgeClient = class {
     return createGenerationStream(response, controller);
   }
 };
+var parseErrorResponse = async (response) => {
+  throw new Error(`AI Service error: ${response.status} ${response.statusText} ${await response.text()}`);
+};
 
 // packages/experimental/assistant/src/ai-service/message-collector.ts
 var MessageCollector = class {
@@ -504,45 +495,49 @@ function* emitMessageAsEvents(message) {
 }
 
 // packages/experimental/assistant/src/ai-service/types.ts
-import { Schema as S2 } from "effect";
-import { Tool, Message as Message2, SpaceIdSchema } from "@dxos/artifact";
-import { ObjectId } from "@dxos/echo-schema";
+import { Schema as S } from "effect";
+import { Tool, Message } from "@dxos/artifact";
 var createArtifactElement = (id) => `<artifact id=${id} />`;
-var LLMModel = S2.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
+var LLMModel = S.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
 var ToolTypes = Object.freeze({
   // TODO(dmaretskyi): Not implemented yet.
   // DatabaseQuery: 'database_query',
   TextToImage: "text_to_image"
 });
-var GenerateRequest = S2.Struct({
-  spaceId: S2.optional(SpaceIdSchema),
-  threadId: S2.optional(ObjectId),
+var GenerateRequest = S.Struct({
   /**
   * Preferred model or system default.
   */
-  model: S2.optional(LLMModel),
+  model: S.optional(LLMModel),
   /**
   * Tools available for the LLM.
   */
-  tools: S2.optional(S2.Array(Tool).pipe(S2.mutable)),
+  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
   /**
   * System instructions to the LLM.
   */
-  systemPrompt: S2.optional(S2.String),
+  systemPrompt: S.optional(S.String),
   /**
   * History of messages to include in the context window.
   */
   // TODO(burdon): Rename messages.
-  history: S2.optional(S2.Array(Message2)),
+  history: S.optional(S.Array(Message)),
   /**
   * Current request.
   */
-  prompt: S2.optional(Message2)
+  prompt: S.optional(Message)
+});
+var GenerateResponse = S.Struct({
+  messages: S.Array(Message),
+  /**
+  * Number of tokens used in the response.
+  */
+  tokenCount: S.optional(S.Number)
 });
 
 // packages/experimental/assistant/src/conversation/conversation.ts
-import { ToolResult, Message as Message3 } from "@dxos/artifact";
-import { createStatic, ObjectId as ObjectId2 } from "@dxos/echo-schema";
+import { ToolResult, Message as Message2 } from "@dxos/artifact";
+import { create, ObjectId } from "@dxos/echo-schema";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log3 } from "@dxos/log";
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/conversation/conversation.ts";
@@ -559,10 +554,8 @@ var runLLM = async (params) => {
       C: (f, a) => f(...a)
     });
     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
@@ -575,7 +568,7 @@ var runLLM = async (params) => {
     const message = messages.at(-1);
     invariant2(message, void 0, {
       F: __dxlog_file3,
-      L: 63,
+      L: 61,
       S: void 0,
       A: [
         "message",
@@ -587,13 +580,13 @@ var runLLM = async (params) => {
       message
     }, {
       F: __dxlog_file3,
-      L: 65,
+      L: 63,
       S: void 0,
       C: (f, a) => f(...a)
     });
     invariant2(message, void 0, {
       F: __dxlog_file3,
-      L: 66,
+      L: 64,
       S: void 0,
       A: [
         "message",
@@ -613,7 +606,7 @@ var runLLM = async (params) => {
       const toolCalls = message.content.filter((block) => block.type === "tool_use");
       invariant2(toolCalls.length === 1, void 0, {
         F: __dxlog_file3,
-        L: 77,
+        L: 75,
         S: void 0,
         A: [
           "toolCalls.length === 1",
@@ -627,7 +620,7 @@ var runLLM = async (params) => {
       }
       invariant2(tool.execute, void 0, {
         F: __dxlog_file3,
-        L: 84,
+        L: 82,
         S: void 0,
         A: [
           "tool.execute",
@@ -641,14 +634,12 @@ var runLLM = async (params) => {
             message: toolResult.message
           }, {
             F: __dxlog_file3,
-            L: 88,
+            L: 86,
             S: void 0,
             C: (f, a) => f(...a)
           });
           const resultMessage = {
-            id: ObjectId2.random(),
-            spaceId: params.spaceId,
-            threadId: params.threadId,
+            id: ObjectId.random(),
             role: "user",
             content: [
               {
@@ -671,14 +662,12 @@ var runLLM = async (params) => {
             result: toolResult.result
           }, {
             F: __dxlog_file3,
-            L: 110,
+            L: 106,
             S: void 0,
             C: (f, a) => f(...a)
           });
           const resultMessage = {
-            id: ObjectId2.random(),
-            spaceId: params.spaceId,
-            threadId: params.threadId,
+            id: ObjectId.random(),
             role: "user",
             content: [
               {
@@ -700,7 +689,7 @@ var runLLM = async (params) => {
             result: toolResult.result
           }, {
             F: __dxlog_file3,
-            L: 131,
+            L: 125,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -722,7 +711,7 @@ var isToolUse = (message, { onlyToolNames } = {}) => {
   const block = message.content.at(-1);
   invariant2(block, void 0, {
     F: __dxlog_file3,
-    L: 152,
+    L: 146,
     S: void 0,
     A: [
       "block",
@@ -735,7 +724,7 @@ var runTools = async ({ message, tools, extensions }) => {
   const toolCalls = message.content.filter((block) => block.type === "tool_use");
   invariant2(toolCalls.length === 1, void 0, {
     F: __dxlog_file3,
-    L: 174,
+    L: 168,
     S: void 0,
     A: [
       "toolCalls.length === 1",
@@ -745,7 +734,7 @@ var runTools = async ({ message, tools, extensions }) => {
   const toolCall = toolCalls[0];
   const tool = tools.find((tool2) => tool2.name === toolCall.name);
   if (!tool) {
-    const resultMessage = createStatic(Message3, {
+    const resultMessage = create(Message2, {
       role: "user",
       content: [
         {
@@ -765,7 +754,7 @@ var runTools = async ({ message, tools, extensions }) => {
   try {
     invariant2(tool.execute, void 0, {
       F: __dxlog_file3,
-      L: 199,
+      L: 193,
       S: void 0,
       A: [
         "tool.execute",
@@ -780,7 +769,7 @@ var runTools = async ({ message, tools, extensions }) => {
       error
     }, {
       F: __dxlog_file3,
-      L: 202,
+      L: 196,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -792,11 +781,11 @@ var runTools = async ({ message, tools, extensions }) => {
         message: toolResult.message
       }, {
         F: __dxlog_file3,
-        L: 208,
+        L: 202,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      const resultMessage = createStatic(Message3, {
+      const resultMessage = create(Message2, {
         role: "user",
         content: [
           {
@@ -817,11 +806,11 @@ var runTools = async ({ message, tools, extensions }) => {
         result: toolResult.result
       }, {
         F: __dxlog_file3,
-        L: 229,
+        L: 223,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      const resultMessage = createStatic(Message3, {
+      const resultMessage = create(Message2, {
         role: "user",
         content: [
           {
@@ -842,7 +831,7 @@ var runTools = async ({ message, tools, extensions }) => {
         result: toolResult.result
       }, {
         F: __dxlog_file3,
-        L: 250,
+        L: 244,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -855,9 +844,9 @@ var runTools = async ({ message, tools, extensions }) => {
 };
 
 // packages/experimental/assistant/src/ai-service/ollama-client.ts
-import { Schema as S3 } from "effect";
+import { Schema as S2 } from "effect";
 import { defineTool, ToolResult as ToolResult2 } from "@dxos/artifact";
-import { ObjectId as ObjectId3 } from "@dxos/echo-schema";
+import { ObjectId as ObjectId2 } from "@dxos/echo-schema";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/experimental/assistant/src/ai-service/ollama-client.ts";
@@ -1002,14 +991,14 @@ var OllamaClient = class {
       signal
     });
     if (!response.ok) {
-      throw await parseErrorResponse(response);
+      throw await parseErrorResponse2(response);
     }
     if (!response.body) {
       throw new Error("Ollama API returned no response body");
     }
     const reader = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new OllamaDecoderStream()).getReader();
     try {
-      const messageId = ObjectId3.random();
+      const messageId = ObjectId2.random();
       yield {
         type: "message_start",
         message: {
@@ -1069,7 +1058,7 @@ var OllamaClient = class {
             index: currentBlockIndex,
             content: {
               type: "tool_use",
-              id: ObjectId3.random(),
+              id: ObjectId2.random(),
               name: data.message.tool_calls[0].function.name,
               input: sanitizeToolArguments(data.message.tool_calls[0].function.arguments)
             }
@@ -1093,7 +1082,13 @@ var OllamaClient = class {
       reader.releaseLock();
     }
   }
+  /**
+  * Generate non-streaming response.
+  */
   async exec(request) {
+    throw new Error("Not implemented");
+  }
+  async execStream(request) {
     const controller = new AbortController();
     try {
       return new GenerationStreamImpl(controller, async function* () {
@@ -1155,15 +1150,15 @@ var WELL_KNOWN_TOOLS = {
   [ToolTypes.TextToImage]: defineTool("system", {
     name: "text-to-image",
     description: "Generate an image from a text prompt",
-    schema: S3.Struct({
-      prompt: S3.String.annotations({
+    schema: S2.Struct({
+      prompt: S2.String.annotations({
         description: "The text prompt describing the image to generate"
       })
     }),
     execute: async ({ prompt }) => {
       const image = await fetch(SAMPLE_IMAGE_URL).then(async (res) => Buffer.from(await res.arrayBuffer()));
       const imageBase64 = image.toString("base64");
-      const id = ObjectId3.random();
+      const id = ObjectId2.random();
       return ToolResult2.Success(`The generation was successful. Image ID: ${id} Prompt: ${prompt}`, [
         {
           type: "image",
@@ -1199,12 +1194,12 @@ var OllamaDecoderStream = class extends TransformStream {
     this._buffer = "";
   }
 };
-var ModelDoesNotSupportToolsError = class extends S3.TaggedError()("ModelDoesNotSupportToolsError", {
-  model: S3.String
+var ModelDoesNotSupportToolsError = class extends S2.TaggedError()("ModelDoesNotSupportToolsError", {
+  model: S2.String
 }) {
 };
-var ModelNotFoundError = class extends S3.TaggedError()("ModelNotFoundError", {
-  model: S3.String
+var ModelNotFoundError = class extends S2.TaggedError()("ModelNotFoundError", {
+  model: S2.String
 }) {
 };
 var parseOllamaError = (error) => {
@@ -1226,7 +1221,7 @@ var parseOllamaError = (error) => {
   }
   throw new Error(`Ollama API error: ${error}`);
 };
-var parseErrorResponse = async (response) => {
+var parseErrorResponse2 = async (response) => {
   if (response.headers.get("content-type")?.includes("application/json")) {
     const body = await response.json();
     return parseOllamaError(body.error);
@@ -1324,9 +1319,9 @@ var StreamTransform = class {
 };
 
 // packages/experimental/assistant/src/ai-service/parser.ts
-import { Message as Message4 } from "@dxos/artifact";
+import { Message as Message3 } from "@dxos/artifact";
 import { Event } from "@dxos/async";
-import { createStatic as createStatic2 } from "@dxos/echo-schema";
+import { create as create2 } from "@dxos/echo-schema";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { log as log5 } from "@dxos/log";
 import { isNotFalsy, safeParseJson } from "@dxos/util";
@@ -1405,7 +1400,7 @@ var MixedStreamParser = class {
               C: (f, a) => f(...a)
             });
           }
-          this._message = createStatic2(Message4, {
+          this._message = create2(Message3, {
             role: event.message.role,
             content: [
               ...event.message.content
@@ -1686,6 +1681,18 @@ var mergeMessageBlock = (contentBlock, streamBlock) => {
           }
           break;
         }
+        case "proposal": {
+          if (streamBlock.content.length === 1 && streamBlock.content[0].type === "text") {
+            return {
+              type: "json",
+              disposition: "proposal",
+              json: JSON.stringify({
+                text: streamBlock.content[0].content
+              })
+            };
+          }
+          break;
+        }
         case "select": {
           return {
             type: "json",
@@ -2183,8 +2190,7 @@ var isReference = (schema) => schema.$id === JSON_SCHEMA_ECHO_REF_ID || schema.t
 // packages/experimental/assistant/src/cypher/echo-data-source.ts
 import { raise as raise2 } from "@dxos/debug";
 import { Filter } from "@dxos/echo-db";
-import { getSchemaTypename, StoredSchema, toJsonSchema } from "@dxos/echo-schema";
-import { getSchema } from "@dxos/live-object";
+import { getSchema, getSchemaTypename, StoredSchema, toJsonSchema } from "@dxos/echo-schema";
 import { log as log8 } from "@dxos/log";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2268,7 +2274,7 @@ var EchoDataSource = class {
 _ts_decorate([
   log8.method(void 0, void 0, {
     F: __dxlog_file8,
-    L: 17,
+    L: 16,
     S: void 0,
     C: (f, a) => f(...a)
   })
@@ -2276,7 +2282,7 @@ _ts_decorate([
 _ts_decorate([
   log8.method(void 0, void 0, {
     F: __dxlog_file8,
-    L: 34,
+    L: 33,
     S: void 0,
     C: (f, a) => f(...a)
   })
@@ -2297,6 +2303,7 @@ export {
   LLMModel,
   ToolTypes,
   GenerateRequest,
+  GenerateResponse,
   runLLM,
   isToolUse,
   runTools,
@@ -2314,4 +2321,4 @@ export {
   isReference,
   EchoDataSource
 };
-//# sourceMappingURL=chunk-DCQJOLSR.mjs.map
+//# sourceMappingURL=chunk-7JI4MDGL.mjs.map