agentlang 0.9.4 → 0.9.6

package/src/runtime/resolvers/sqldb/database.ts

@@ -1,3 +1,4 @@
+import 'reflect-metadata';
 import {
   DataSource,
   EntityManager,
@@ -44,6 +45,7 @@ import {
 import { saveMigration } from '../../modules/core.js';
 import { getAppSpec } from '../../loader.js';
 import { WhereClause } from '../interface.js';
+import { AppConfig } from '../../state.js';
 
 export let defaultDataSource: DataSource | undefined;
 
@@ -227,7 +229,7 @@ function makeSqliteDataSource(
   const synchronize = needSync();
   //const runMigrations = isRuntimeMode_migration() || isRuntimeMode_undo_migration() || !synchronize;
   return new DataSource({
-    type: 'sqlite',
+    type: 'better-sqlite3',
     database: config?.dbname || mkDbName(),
     synchronize: synchronize,
     entities: entities,
@@ -322,9 +324,7 @@ function makeSqljsDataSource(
   });
 }
 
-const DbType = 'sqlite';
-
-function getDbType(config?: DatabaseConfig): string {
+function forceGetDbType(config: DatabaseConfig | undefined): string {
   if (config?.type) return config.type;
   let envType: string | undefined;
   try {
@@ -334,6 +334,13 @@ function getDbType(config?: DatabaseConfig): string {
   } catch {}
   if (envType) return envType;
   if (isBrowser()) return 'sqljs';
+  return 'sqlite';
+}
+
+let DbType: string | undefined;
+
+function getDbType(config: DatabaseConfig | undefined): string {
+  if (DbType === undefined) DbType = forceGetDbType(config);
   return DbType;
 }
 
@@ -357,16 +364,16 @@ function getDsFunction(
 }
 
 export function isUsingSqlite(): boolean {
-  return getDbType() == 'sqlite';
+  return getDbType(AppConfig?.store) == 'sqlite';
 }
 
 export function isUsingSqljs(): boolean {
-  return getDbType() == 'sqljs';
+  return getDbType(AppConfig?.store) == 'sqljs';
 }
 
 export function isVectorStoreSupported(): boolean {
   // Only Postgres supports pgvector
-  return getDbType() === 'postgres';
+  return getDbType(AppConfig?.store) === 'postgres';
 }
 
 export async function initDatabase(config: DatabaseConfig | undefined) {
@@ -402,7 +409,7 @@ export async function initDatabase(config: DatabaseConfig | undefined) {
         await initVectorStore(vectEnts, DbContext.getGlobalContext());
       }
     } else {
-      throw new Error(`Unsupported database type - ${DbType}`);
+      throw new Error(`Unsupported database type - ${getDbType(AppConfig?.store)}`);
     }
   }
 }
@@ -453,7 +460,7 @@ export async function addRowForFullTextSearch(
 
 export async function initVectorStore(tableNames: string[], ctx: DbContext) {
   if (!isVectorStoreSupported()) {
-    logger.info(`Vector store not supported for ${getDbType()}, skipping init...`);
+    logger.info(`Vector store not supported for ${getDbType(AppConfig?.store)}, skipping init...`);
     return;
   }
   let notInited = true;
@@ -474,6 +481,7 @@ export async function initVectorStore(tableNames: string[], ctx: DbContext) {
       `CREATE TABLE IF NOT EXISTS ${vecTableName} (
           id varchar PRIMARY KEY,
           embedding vector(${DefaultVectorDimension}),
+          ${TenantAttributeName} varchar,
           __is_deleted__ boolean default false
         )`
     );
@@ -510,7 +518,8 @@ ${ot}.path = ${vecTableName}.id and ${ot}.user_id = '${ctx.authInfo.userId}' and
 and ${ot}.${TenantAttributeName} = '${tenantId}' and ${vecTableName}.${TenantAttributeName} = '${tenantId}'`;
     }
     const sql = `select ${vecTableName}.id from ${vecTableName} ${ownersJoinCond} order by embedding <-> $1 LIMIT ${limit}`;
-    return await qb.query(sql, [pgvector.toSql(searchVec)]);
+    const args = pgvector.toSql(searchVec);
+    return await qb.query(sql, [args]);
   } catch (err: any) {
     logger.error(`Vector store search failed - ${err}`);
     return [];
@@ -528,7 +537,7 @@ export async function vectorStoreSearchEntryExists(
     const vecTableName = tableName + VectorSuffix;
     const tenantId = await ctx.getTenantId();
     const result: any[] = await qb.query(
-      `select id from ${vecTableName} where id = $1 abd ${TenantAttributeName} = '${tenantId}'`,
+      `select id from ${vecTableName} where id = $1 and ${TenantAttributeName} = '${tenantId}'`,
       [id]
     );
     return result !== null && result.length > 0;

package/src/runtime/resolvers/sqldb/impl.ts

@@ -553,13 +553,13 @@ export class SqlDbResolver extends Resolver {
     entryName: string,
     moduleName: string,
     query: string,
-    options?: Map<string, any>
+    options?: any
   ): Promise<any> {
     const queryVec = await this.embeddings.embedQuery(query);
     const ctx = this.getDbContext(makeFqName(moduleName, entryName));
     let limit = 5;
-    if (options && options.has('limit')) {
-      limit = options.get('limit') as number;
+    if (options && options.limit) {
+      limit = options.limit as number;
     }
     return await vectorStoreSearch(asTableReference(moduleName, entryName), queryVec, limit, ctx);
   }

package/src/runtime/state.ts

@@ -200,4 +200,8 @@ export class TtlCache<T> {
   delete(key: string) {
     this.store.delete(key);
   }
+
+  clear() {
+    this.store.clear();
+  }
 }

package/src/syntaxes/agentlang.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the agentlang language.
 export default {
     keywords: [
-        '@actions','@after','@as','@asc','@async','@before','@catch','@desc','@distinct','@enum','@expr','@from','@full_join','@groupBy','@inner_join','@into','@join','@left_join','@meta','@oneof','@orderBy','@public','@rbac','@ref','@right_join','@then','@upsert','@where','@with_unique','agent','agentlang/retry','allow','and','attempts','await','backoff','between','case','commitTransaction','contains','create','decision','delete','directive','else','entity','error','event','extends','false','flow','for','glossaryEntry','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','rollbackTransaction','scenario','startTransaction','subscribe','throw','true','update','upsert','where','workflow'
+        '@actions','@after','@as','@asc','@async','@before','@catch','@desc','@distinct','@enum','@expr','@from','@full_join','@groupBy','@inner_join','@into','@join','@left_join','@meta','@oneof','@orderBy','@public','@rbac','@ref','@right_join','@then','@upsert','@where','@withRole','@with_unique','agent','agentlang/retry','allow','and','attempts','await','backoff','between','case','commitTransaction','contains','create','decision','delete','directive','else','entity','error','eval','event','extends','false','flow','for','glossaryEntry','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','rollbackTransaction','scenario','startTransaction','subscribe','throw','true','update','upsert','where','workflow'
     ],
     operators: [
         '!=','*','+',',','-','-->','.','/',':',';','<','<=','<>','=','==','>','>=','?','@'
@@ -10,10 +10,10 @@ export default {
 
     tokenizer: {
         initial: [
-            { regex: /(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
+            { regex: /(?:[_a-zA-Z][\w_]*)(\/(?:[_a-zA-Z][\w_]*))?/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
             { regex: /[_a-zA-Z][\w_]*/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
-            { regex: /("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/, action: {"token":"string"} },
-            { regex: /(`(((\\([\s\S]))|((?!(((\\|`)|\r)|\n))[\s\S]*?))|(\r?\n))*`)/, action: {"token":"string"} },
+            { regex: /"(\\(?:[\s\S])|(?:(?!(\\|"|\r|\n))[\s\S]*?)|\r?\n)*"/, action: {"token":"string"} },
+            { regex: /`(\\(?:[\s\S])|(?:(?!(\\|`|\r|\n))[\s\S]*?)|\r?\n)*`/, action: {"token":"string"} },
             { regex: /-?[0-9]+/, action: {"token":"number"} },
             { include: '@whitespace' },
             { regex: /@symbols/, action: { cases: { '@operators': {"token":"operator"}, '@default': {"token":""} }} },