agentlang 0.9.9 → 0.9.11

package/src/runtime/modules/core.ts

@@ -1,4 +1,4 @@
-import { default as ai } from './ai.js';
+import { default as ai, normalizeGeneratedCode } from './ai.js';
 import { default as auth } from './auth.js';
 import { default as files } from './files.js';
 import { default as mcp } from './mcp.js';
@@ -527,6 +527,12 @@ export function eventMonitorsData(
 export async function validateModule(moduleDef: any): Promise<Instance> {
   try {
     if (isString(moduleDef)) {
+      moduleDef = normalizeGeneratedCode(moduleDef);
+      if (!moduleDef.startsWith('module')) {
+        moduleDef = `module Temp
+        ${moduleDef}
+        `;
+      }
       await parseModule(moduleDef);
       return makeInstance(
         'agentlang',

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

@@ -241,10 +241,31 @@ export class SqlDbResolver extends Resolver {
         ) {
           const ftsAttrs = inst.record.getFullTextSearchAttributes() || ['*'];
           const textToEmbed = this.extractTextForEmbedding(rowObj, ftsAttrs);
-          const embeddingConfig = inst.record.getEmbeddingConfig();
-          const embeddingService = embeddingConfig
-            ? new EmbeddingService(embeddingConfig)
-            : this.embeddingService;
+          let embeddingConfig: any = undefined;
+          const instanceEmbeddingConfig = inst.get('embeddingConfig');
+          if (instanceEmbeddingConfig) {
+            try {
+              embeddingConfig =
+                typeof instanceEmbeddingConfig === 'string'
+                  ? JSON.parse(instanceEmbeddingConfig)
+                  : instanceEmbeddingConfig;
+            } catch {
+              // If parsing fails, will fall back to env vars
+            }
+          }
+          if (!embeddingConfig) {
+            embeddingConfig = {
+              provider: process.env.AGENTLANG_EMBEDDING_PROVIDER || 'openai',
+              model: process.env.AGENTLANG_EMBEDDING_MODEL || 'text-embedding-3-small',
+              chunkSize: process.env.AGENTLANG_EMBEDDING_CHUNKSIZE
+                ? parseInt(process.env.AGENTLANG_EMBEDDING_CHUNKSIZE, 10)
+                : 1000,
+              chunkOverlap: process.env.AGENTLANG_EMBEDDING_CHUNKOVERLAP
+                ? parseInt(process.env.AGENTLANG_EMBEDDING_CHUNKOVERLAP, 10)
+                : 200,
+            };
+          }
+          const embeddingService = new EmbeddingService(embeddingConfig);
           const res = await embeddingService.embedText(textToEmbed);
           await addRowForFullTextSearch(n, path, res, ctx);
         }
@@ -330,11 +351,20 @@ export class SqlDbResolver extends Resolver {
     const aggregates = SqlDbResolver.normalizedAggregates(inst, tableName);
 
     let vectorResult: Instance[] | undefined;
-    const embeddingConfig = inst.record.getEmbeddingConfig();
+    // Use environment variable based embedding config for queries
+    const embeddingConfig = {
+      provider: process.env.AGENTLANG_EMBEDDING_PROVIDER || 'openai',
+      model: process.env.AGENTLANG_EMBEDDING_MODEL || 'text-embedding-3-small',
+      chunkSize: process.env.AGENTLANG_EMBEDDING_CHUNKSIZE
+        ? parseInt(process.env.AGENTLANG_EMBEDDING_CHUNKSIZE, 10)
+        : 1000,
+      chunkOverlap: process.env.AGENTLANG_EMBEDDING_CHUNKOVERLAP
+        ? parseInt(process.env.AGENTLANG_EMBEDDING_CHUNKOVERLAP, 10)
+        : 200,
+    };
     const ftsAttrs = inst.record.getFullTextSearchAttributes();
     if (
       (await isVectorStoreSupported()) &&
-      embeddingConfig &&
       qattrs &&
       (ftsAttrs || Object.keys(qattrs).some(k => k.endsWith('?')))
     ) {