@dxos/assistant 0.7.4 → 0.7.5-labs.5f04cf6

package/src/testing/logger.ts

@@ -2,7 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { ImageSource, MessageContentBlock } from '../ai-service';
+import type { ImageSource, MessageContentBlock } from '@dxos/artifact';
+
 import type { ConversationEvent } from '../conversation';
 
 export const createLogger = ({
@@ -34,7 +35,7 @@ export const createLogger = ({
           if (content.id && content.source) {
             images[content.id] = content.source;
           }
-          process.stdout.write(`[Image id=${content.id} media_type=${content.source?.media_type}]`);
+          process.stdout.write(`[Image id=${content.id} mediaType=${content.source?.mediaType}]`);
           break;
         }
       }

package/src/testing/query-promts.ts

@@ -4,10 +4,10 @@
 
 import { Schema as S } from '@effect/schema';
 
+import { defineTool, ToolResult } from '@dxos/artifact';
 import { toJsonSchema } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 
-import { defineTool, LLMToolResult } from '../conversation';
 import { executeQuery, formatJsonSchemaForLLM, type DataSource } from '../cypher';
 import { trim } from '../util';
 
@@ -47,10 +47,10 @@ export const createCypherTool = (dataSource: DataSource, schemaTypes: S.Schema.A
         log('cypher query', { query });
         const results = await executeQuery(dataSource, query);
         log('query complete', { results });
-        return LLMToolResult.Success(results);
+        return ToolResult.Success(results);
       } catch (e: any) {
         log.catch(e);
-        return LLMToolResult.Error(e.message);
+        return ToolResult.Error(e.message);
       }
     },
   });

package/src/testing/query.test.ts

@@ -4,22 +4,23 @@
 
 import { test } from 'vitest';
 
+import { createUserMessage } from '@dxos/artifact';
+import { EchoTestBuilder } from '@dxos/echo-db/testing';
+import { ObjectId } from '@dxos/echo-schema';
 import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { EchoTestBuilder } from '@dxos/echo-db/testing';
 
+import { AI_SERVICE_ENDPOINT } from './defs';
 import { createLogger } from './logger';
 import { createCypherTool, createSystemPrompt } from './query-promts';
 import { createTestData, seedTestData } from './test-data';
 import { Contact, Org, Project, Task } from './test-schema';
-import { AIServiceClientImpl, ObjectId } from '../ai-service';
-import { runLLM, createUserMessage } from '../conversation';
-import { EchoDataSource } from '../cypher/echo-data-source';
-
-const ENDPOINT = 'http://localhost:8787';
+import { AIServiceClientImpl } from '../ai-service';
+import { runLLM } from '../conversation';
+import { EchoDataSource } from '../cypher';
 
 const client = new AIServiceClientImpl({
-  endpoint: ENDPOINT,
+  endpoint: AI_SERVICE_ENDPOINT.LOCAL,
 });
 
 test.skip('cypher query', async () => {
@@ -31,7 +32,7 @@ test.skip('cypher query', async () => {
   const spaceId = SpaceId.random();
   const threadId = ObjectId.random();
 
-  await client.insertMessages([
+  await client.appendMessages([
     createUserMessage(
       spaceId,
       threadId,
@@ -52,7 +53,7 @@ test.skip('cypher query', async () => {
   log.info('DONE', { result: result.result });
 });
 
-test.only('query ECHO', async () => {
+test.skip('query ECHO', async () => {
   await using builder = await new EchoTestBuilder().open();
   const { db, graph } = await builder.createDatabase();
 
@@ -68,7 +69,7 @@ test.only('query ECHO', async () => {
   const spaceId = SpaceId.random();
   const threadId = ObjectId.random();
 
-  await client.insertMessages([
+  await client.appendMessages([
     createUserMessage(
       spaceId,
       threadId,

package/src/testing/test-data.ts

@@ -5,6 +5,7 @@
 import { type Schema as S } from '@effect/schema';
 
 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';
@@ -17,7 +18,6 @@ import {
   formatNodeLabel,
 } from '../cypher';
 import { Contact, Org, Project, Task } from '../testing';
-import type { EchoDatabase } from '@dxos/echo-db';
 
 export const seedTestData = (db: EchoDatabase) => {
   const contactRich = db.add(

package/vendor/parjs-browser.mjs

@@ -0,0 +1,4 @@
+import * as parjs from 'parjs';
+import * as parjsCombinators from 'parjs/combinators';
+
+export { parjsCombinators, parjs };

package/vendor/parjs-default.mjs

@@ -0,0 +1,8 @@
+import { createRequire } from 'node:module';
+
+// TODO(dmaretskyi): Must be like this or it breaks vitest.
+const require = createRequire(import.meta.url);
+const parjs = require('parjs');
+const parjsCombinators = require('parjs/combinators');
+
+export { parjsCombinators, parjs };