@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.dedc0f3

package/src/parser/query-parser.test.ts

@@ -1,139 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, test } from 'vitest';
-
-import { QueryParser } from './query-parser';
-
-describe('QueryParser', () => {
-  test('empty', ({ expect }) => {
-    const parser = new QueryParser('');
-    expect(parser.parse()).toEqual({
-      type: 'literal',
-      value: '*',
-    });
-  });
-
-  test('invalid queries', ({ expect }) => {
-    const cases = [
-      //
-      '!',
-      'X:',
-      ':Y',
-      'X;Y',
-      'x==100',
-    ];
-
-    for (const query of cases) {
-      const parser = new QueryParser(query);
-      expect(() => parser.parse()).toThrow();
-    }
-  });
-
-  test('valid queries', ({ expect }) => {
-    const cases = [
-      //
-      '',
-      'type:Person',
-      '$title = "foo"',
-      '(type:Person OR type:Organization) AND $title = "DXOS" AND $ts < TODAY',
-    ];
-
-    for (const query of cases) {
-      const parser = new QueryParser(query);
-      expect(parser.parse()).to.exist;
-    }
-  });
-
-  test('simple queries', ({ expect }) => {
-    const cases = [
-      {
-        query: 'type:Person',
-        ast: {
-          type: 'binary',
-          operator: 'EQ',
-          left: { type: 'identifier', name: 'type' },
-          right: { type: 'literal', value: 'Person' },
-        },
-      },
-      {
-        query: '$title = "DXOS"',
-        ast: {
-          type: 'binary',
-          operator: 'EQ',
-          left: { type: 'identifier', name: '$title' },
-          right: { type: 'literal', value: 'DXOS' },
-        },
-      },
-      {
-        query: '(type:Person OR type:Organization) AND $title = "DXOS" AND $ts < TODAY',
-        ast: {
-          left: {
-            left: {
-              left: {
-                left: {
-                  name: 'type',
-                  type: 'identifier',
-                },
-                operator: 'EQ',
-                right: {
-                  type: 'literal',
-                  value: 'Person',
-                },
-                type: 'binary',
-              },
-              operator: 'OR',
-              right: {
-                left: {
-                  name: 'type',
-                  type: 'identifier',
-                },
-                operator: 'EQ',
-                right: {
-                  type: 'literal',
-                  value: 'Organization',
-                },
-                type: 'binary',
-              },
-              type: 'binary',
-            },
-            operator: 'AND',
-            right: {
-              left: {
-                name: '$title',
-                type: 'identifier',
-              },
-              operator: 'EQ',
-              right: {
-                type: 'literal',
-                value: 'DXOS',
-              },
-              type: 'binary',
-            },
-            type: 'binary',
-          },
-          operator: 'AND',
-          right: {
-            left: {
-              name: '$ts',
-              type: 'identifier',
-            },
-            operator: 'LT',
-            right: {
-              type: 'literal',
-              value: 'TODAY',
-            },
-            type: 'binary',
-          },
-          type: 'binary',
-        },
-      },
-    ];
-
-    for (const { query, ast } of cases) {
-      const parser = new QueryParser(query);
-      expect(parser.parse()).toEqual(ast);
-    }
-  });
-});

package/src/parser/query-parser.ts

@@ -1,199 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { invariant } from '@dxos/invariant';
-
-import { type Expression, type BinaryOperator, type RelationalOperator } from './types';
-
-// TODO(burdon): Move to echo-schema?
-
-type RelationalSymbol = '=' | '<' | '>';
-
-const operators: Record<RelationalSymbol, RelationalOperator> = {
-  '=': 'EQ',
-  '<': 'LT',
-  '>': 'GT',
-};
-
-export class QueryParser {
-  private tokens: string[] = [];
-  private current = 0;
-
-  constructor(input: string) {
-    // Tokenize the input string.
-    this.tokens = this.tokenize(input);
-  }
-
-  private tokenize(input: string): string[] {
-    // Handle empty input.
-    if (!input.trim()) {
-      return [];
-    }
-
-    // Split on spaces but preserve quoted strings.
-    const tokens: string[] = [];
-    let current = '';
-    let inQuotes = false;
-
-    for (let i = 0; i < input.length; i++) {
-      const char = input[i];
-
-      if (char === '"') {
-        // Handle quoted strings.
-        inQuotes = !inQuotes;
-        current += char;
-      } else if (char === '(' || char === ')') {
-        // If we have accumulated tokens, add them first.
-        if (current) {
-          tokens.push(current);
-          current = '';
-        }
-        // Add the parenthesis as a separate token.
-        tokens.push(char);
-      } else if (operators[char as RelationalSymbol]) {
-        // If we have accumulated tokens, add them first.
-        if (current) {
-          tokens.push(current);
-          current = '';
-        }
-        // Add the operator as a separate token.
-        tokens.push(operators[char as RelationalSymbol]);
-      } else if (char === ' ' && !inQuotes) {
-        if (current) {
-          tokens.push(current);
-          current = '';
-        }
-      } else {
-        current += char;
-      }
-    }
-
-    if (current) {
-      tokens.push(current);
-    }
-
-    return tokens;
-  }
-
-  private peek(): string {
-    return this.tokens[this.current];
-  }
-
-  private advance(): string {
-    return this.tokens[this.current++];
-  }
-
-  private match(type: string): boolean {
-    if (this.peek() === type) {
-      this.advance();
-      return true;
-    }
-    return false;
-  }
-
-  private isAtEnd(): boolean {
-    return this.current >= this.tokens.length;
-  }
-
-  private parseExpression(): Expression {
-    let expr = this.parseTerm();
-
-    while (!this.isAtEnd()) {
-      const operator = this.peek();
-      if (operator === 'AND' || operator === 'OR') {
-        this.advance();
-        const right = this.parseTerm();
-        expr = {
-          type: 'binary',
-          operator: operator as BinaryOperator,
-          left: expr,
-          right,
-        };
-      } else {
-        break;
-      }
-    }
-
-    return expr;
-  }
-
-  private parseTerm(): Expression {
-    // Handle NOT operator
-    if (this.peek() === 'NOT') {
-      this.advance();
-      const argument = this.parseTerm();
-      return {
-        type: 'unary',
-        operator: 'NOT',
-        argument,
-      };
-    }
-
-    // Handle parentheses.
-    if (this.match('(')) {
-      const expr = this.parseExpression();
-      if (!this.match(')')) {
-        throw new Error('Expected closing parenthesis');
-      }
-      return expr;
-    }
-
-    const token = this.peek();
-
-    // Handle type:Person style expressions.
-    if (token.includes(':')) {
-      const [field, value] = token.split(':');
-      this.advance();
-      if (!field || !value) {
-        throw new Error(`Invalid type expression: ${token}`);
-      }
-
-      return {
-        type: 'binary',
-        operator: 'EQ',
-        left: { type: 'identifier', name: field },
-        right: { type: 'literal', value },
-      };
-    }
-
-    // Handle $field expressions with operators.
-    if (token.startsWith('$')) {
-      const field = token;
-      this.advance();
-
-      // Get the operator.
-      const operator = this.peek();
-      if (operator !== 'EQ' && operator !== 'LT' && operator !== 'GT') {
-        throw new Error(`Expected operator after field ${field}, got ${operator}`);
-      }
-      this.advance();
-
-      // Get the value
-      const value = this.peek();
-      this.advance();
-      invariant(value);
-
-      return {
-        type: 'binary',
-        operator: operator as BinaryOperator,
-        left: { type: 'identifier', name: field },
-        right: { type: 'literal', value: value.replace(/^"|"$/g, '') },
-      };
-    }
-
-    throw new Error(`Unexpected token: ${token}`);
-  }
-
-  public parse(): Expression {
-    // Return a special expression for empty input.
-    if (this.tokens.length === 0) {
-      return {
-        type: 'literal',
-        value: '*',
-      };
-    }
-
-    return this.parseExpression();
-  }
-}

package/src/parser/types.ts

@@ -1,34 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export type UnaryOperator = 'NOT';
-
-export type RelationalOperator = 'EQ' | 'LT' | 'GT';
-
-export type BinaryOperator = RelationalOperator | 'AND' | 'OR';
-
-export type Expression = BinaryExpression | UnaryExpression | Identifier | Literal;
-
-export interface BinaryExpression {
-  type: 'binary';
-  operator: BinaryOperator;
-  left: Expression;
-  right: Expression;
-}
-
-export interface UnaryExpression {
-  type: 'unary';
-  operator: UnaryOperator;
-  argument: Expression;
-}
-
-export interface Identifier {
-  type: 'identifier';
-  name: string;
-}
-
-export interface Literal {
-  type: 'literal';
-  value: string;
-}

package/src/shims.d.ts

@@ -1,8 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-declare module '*?raw' {
-  const content: string;
-  export default content;
-}

package/src/tools/function.ts

@@ -1,46 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { createTool, type ExecutableTool, ToolResult } from '@dxos/ai';
-import { Type } from '@dxos/echo';
-import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
-import { type FunctionType } from '@dxos/functions';
-import { log } from '@dxos/log';
-import { type SpaceId } from '@dxos/react-client/echo';
-import { getMeta } from '@dxos/react-client/echo';
-
-// TODO(burdon): Move to @dxos/ai.
-export const convertFunctionToTool = (
-  fn: FunctionType,
-  edgeUrl: string,
-  spaceId?: SpaceId | undefined,
-): ExecutableTool | undefined => {
-  if (!fn.description || !fn.inputSchema) {
-    return undefined;
-  }
-  const existingFunctionUrl = getUserFunctionUrlInMetadata(getMeta(fn));
-  if (!existingFunctionUrl) {
-    return undefined;
-  }
-
-  const url = getInvocationUrl(existingFunctionUrl, edgeUrl, { spaceId });
-
-  return createTool('user-function', {
-    name: fn.name,
-    description: fn.description,
-    schema: Type.toEffectSchema(fn.inputSchema),
-    execute: async (input) => {
-      log.info('execute function tool', { name: fn.name, url, input });
-      const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(input),
-      });
-
-      return ToolResult.Success(await response.text());
-    },
-  });
-};

package/src/tools/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './function';
-export * from './openapi';

package/src/tools/openapi.test.ts

@@ -1,217 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, expect, test } from 'vitest';
-
-import { log } from '@dxos/log';
-
-import { createToolsFromApi, resolveAuthorization } from './openapi';
-import { ChatProcessor } from '../hooks';
-import { type ApiAuthorization } from '../types';
-
-describe.skip('openapi', () => {
-  describe.skip('mapping', () => {
-    test('amadeus flight availabilities', async () => {
-      const tools = await createToolsFromApi(FLIGHT_SEARCH_API);
-      log.info('tools', { tools });
-      // for (const tool of tools) {
-      //   const schema = tool.parameters;
-      //   // log.info('schema', { schema });
-      // }
-    });
-
-    test('amadeus hotel search', async () => {
-      const tools = await createToolsFromApi(HOTEL_SEARCH_API);
-      log.info('tools', { tools });
-    });
-
-    test('amadeus hotel name autocomplete', async () => {
-      const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API);
-      log.info('tools', { tools });
-    });
-
-    test('weather', async () => {
-      const tools = await createToolsFromApi(WEATHER_API, { authorization: VISUAL_CROSSING_CREDENTIALS });
-      log.info('tools', { tools });
-    });
-  });
-
-  describe.skip('invoke tools', () => {
-    test('amadeus hotel name autocomplete', async () => {
-      const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API, { authorization: AMADEUS_AUTH });
-      const result = await tools[0].execute(
-        {
-          keyword: 'William Vale Brooklyn',
-          subType: ['HOTEL_LEISURE', 'HOTEL_GDS'],
-          countryCode: 'US',
-        },
-        {},
-      );
-
-      log.info('result', { result });
-    });
-
-    test('weather API', async () => {
-      const tools = await createToolsFromApi(WEATHER_API, { authorization: VISUAL_CROSSING_CREDENTIALS });
-      const forecastTool = tools.find((tool) => tool.name.includes('forecast'));
-      const result = await forecastTool?.execute(
-        {
-          locations: 'Brooklyn, NY',
-          aggregateHours: '24',
-        },
-        {},
-      );
-
-      log.info('result', { result });
-    });
-  });
-
-  describe.skip('AI uses tools', () => {
-    test('amadeus flight availabilities', { timeout: 60_000 }, async () => {
-      const tools = await createToolsFromApi(FLIGHT_SEARCH_API, { authorization: AMADEUS_AUTH });
-      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
-      // TODO(dmaretskyi): FIX ME.
-      const processor = new ChatProcessor(null as any, null as any, { tools });
-      const reply = await processor.request(
-        `What is the cheapest flight from New York to Paris? going on ${new Date().toISOString()} and returning after a week. 1 adult traveler`,
-      );
-
-      log.info('reply', { reply });
-    });
-
-    // TODO(dmaretskyi): Doesn't work.
-    test('amadeus hotel name autocomplete', { timeout: 60_000 }, async () => {
-      const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API, { authorization: AMADEUS_AUTH });
-      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
-      // TODO(dmaretskyi): FIX ME.
-      const processor = new ChatProcessor(null as any, null as any, { tools });
-      const reply = await processor.request('Find me the William Wale in Brooklyn New York');
-
-      log.info('reply', { reply });
-    });
-
-    test.only('weather forecast', { timeout: 60_000 }, async () => {
-      const tools = await createToolsFromApi(WEATHER_API, {
-        authorization: VISUAL_CROSSING_CREDENTIALS,
-        instructions: WEATHER_INSTRUCTIONS,
-      });
-      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
-      // TODO(dmaretskyi): FIX ME.
-      const processor = new ChatProcessor(null as any, null as any, { tools });
-      const reply = await processor.request(
-        `Today's date is ${new Date().toISOString().split('T')[0]}. Give me weather forecast for Warsaw for next 5 days.`,
-      );
-
-      log.info('reply', { reply });
-    });
-  });
-
-  describe.skip('invoke api directly', { timeout: 10_000 }, () => {
-    test('amadeus flight availabilities', async () => {
-      const response = await fetch('https://test.api.amadeus.com/v1/shopping/availability/flight-availabilities', {
-        method: 'POST',
-        headers: {
-          accept: 'application/vnd.amadeus+json',
-          'X-HTTP-Method-Override': 'GET',
-          'Content-Type': 'application/vnd.amadeus+json',
-          Authorization: await resolveAuthorization(AMADEUS_AUTH),
-        },
-        body: JSON.stringify({
-          originDestinations: [
-            {
-              departureDateTime: {
-                date: new Date().toISOString().split('T')[0],
-                time: new Date().toTimeString().split(' ')[0],
-              },
-              destinationLocationCode: 'MAD',
-              id: '1',
-              originLocationCode: 'BOS',
-            },
-          ],
-          sources: ['GDS'],
-          travelers: [
-            {
-              id: '1',
-              travelerType: 'ADULT',
-            },
-          ],
-        }),
-      });
-
-      log.info('response', { status: response.status, body: await response.json() });
-      expect(response.status).toBe(200);
-    });
-
-    test.only('amadeus hotel name autocomplete', async () => {
-      const response = await fetch(
-        'https://test.api.amadeus.com/v1/reference-data/locations/hotel?keyword=PARI&subtype=HOTEL_LEISURE,HOTEL_GDS',
-        {
-          method: 'GET',
-          headers: {
-            // accept: 'application/vnd.amadeus+json',
-            // 'X-HTTP-Method-Override': 'GET',
-            Authorization: await resolveAuthorization(AMADEUS_AUTH),
-          },
-        },
-      );
-
-      log.info('response', { status: response.status, body: await response.json() });
-      expect(response.status).toBe(200);
-    });
-  });
-
-  describe.skip('rapidapi', () => {
-    test('amadeus flight availabilities', async () => {
-      const departureDate = new Date().toISOString().split('T')[0];
-      const arrivalDate = new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0];
-
-      const url = `https://amadeus-api2.p.rapidapi.com/serpapi-flight-search?departure_id=PEK&arrival_id=AUS&outbound_date=${departureDate}&return_date=${arrivalDate}&currency=USD&hl=en`;
-      const options = {
-        method: 'GET',
-        headers: {
-          'x-rapidapi-key': RAPID_API_CREDENTIALS.key,
-          'x-rapidapi-host': 'amadeus-api2.p.rapidapi.com',
-        },
-      };
-
-      const response = await fetch(url, options);
-      log.info('response', { status: response.status, body: await response.json() });
-      expect(response.status).toBe(200);
-    });
-  });
-});
-
-const FLIGHT_SEARCH_API =
-  'https://api.apis.guru/v2/specs/amadeus.com/amadeus-flight-availabilities-search/1.0.2/swagger.json';
-const HOTEL_SEARCH_API = 'https://api.apis.guru/v2/specs/amadeus.com/amadeus-hotel-search/3.0.8/swagger.json';
-const HOTEL_NAME_AUTOCOMPLETE_API =
-  'https://api.apis.guru/v2/specs/amadeus.com/amadeus-hotel-name-autocomplete/1.0.3/swagger.json';
-const WEATHER_API = 'https://api.apis.guru/v2/specs/visualcrossing.com/weather/4.6/openapi.json';
-
-const WEATHER_INSTRUCTIONS = `
-  If the user doesn't provide a date, use today's date.
-  Make sure to provide the start and end dates when possible to reduce the amount of data returned.
-  Use the tool that accepts the date parameters.
-`;
-
-const AMADEUS_AUTH: ApiAuthorization = {
-  type: 'oauth',
-  clientId: 'BOEnpLd1sMyKjAPGKYeAPFFy60u53QEG',
-  clientSecret: 'n4qldSN7usvD57gm',
-  tokenUrl: 'https://test.api.amadeus.com/v1/security/oauth2/token',
-  grantType: 'client_credentials',
-};
-
-const VISUAL_CROSSING_CREDENTIALS: ApiAuthorization = {
-  type: 'api-key',
-  key: 'FDPRVS953KB4GQQLD25GRT975',
-  placement: {
-    type: 'query',
-    name: 'key',
-  },
-};
-
-const RAPID_API_CREDENTIALS = {
-  key: '92271b6740msh32fd821d70f050dp16665bjsna69195c9e838',
-};