agentlang 0.0.33 → 0.0.35

package/src/runtime/integrations.ts

@@ -19,26 +19,31 @@ export async function prepareIntegrations(
     const configPath = integConfig.get(configName);
     if (configPath) {
       const apiUrl = mkApiUrl(integManagerHost, configPath);
-      const response = await fetch(apiUrl, {
-        method: 'GET',
-        headers: standardHeaders,
-      });
+      try {
+        const response = await fetch(apiUrl, {
+          method: 'GET',
+          headers: standardHeaders,
+        });
 
-      if (!response.ok) {
-        throw new Error(
-          `Failed to fetch integration for ${configPath}, HTTP error! status: ${response.status} ${response.text} ${response.statusText}`
-        );
-      }
+        if (!response.ok) {
+          console.error(
+            `Failed to fetch integration for ${configPath}, HTTP error! status: ${response.status} ${response.text} ${response.statusText}`
+          );
+          continue;
+        }
 
-      const data = await response.json();
-      if (data.length > 0) {
-        const inst: any = data[0].config;
-        if (inst.type == 'custom' && isString(inst.parameter)) {
-          inst.parameter = new Map(Object.entries(JSON.parse(inst.parameter)));
+        const data = await response.json();
+        if (data.length > 0) {
+          const inst: any = data[0].config;
+          if (inst.type == 'custom' && isString(inst.parameter)) {
+            inst.parameter = new Map(Object.entries(JSON.parse(inst.parameter)));
+          }
+          Integrations.set(configName, inst);
+        } else {
+          console.error(`Integration not found for ${configPath}`);
         }
-        Integrations.set(configName, inst);
-      } else {
-        throw new Error(`Integration not found for ${configPath}`);
+      } catch (error: any) {
+        console.error(`Error fetching integration for ${configPath}:`, error.message);
       }
     }
   }

package/src/runtime/interpreter.ts

@@ -302,6 +302,16 @@ export class Environment extends Instance {
     return this.returnFlag;
   }
 
+  resetReturnFlag(): Environment {
+    if (this.returnFlag) {
+      this.returnFlag = false;
+      if (this.parent) {
+        this.parent.resetReturnFlag();
+      }
+    }
+    return this;
+  }
+
   protected propagateSuspension(suspId: string) {
     this.suspensionId = suspId;
     if (this.parent) {
@@ -767,10 +777,10 @@ function maybeBindStatementResultToAlias(hints: RuntimeHint[], env: Environment)
             const resArr: Array<any> = result as Array<any>;
             for (let i = 0; i < aliases.length; ++i) {
               const k: string = aliases[i];
-              if (k == '_') {
+              if (k == '__') {
                 env.bind(aliases[i + 1], resArr.splice(i));
                 break;
-              } else {
+              } else if (k != '_') {
                 env.bind(aliases[i], resArr[i]);
               }
             }
@@ -1212,7 +1222,10 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
     if (isAgentEventInstance(inst)) await handleAgentInvocation(inst, env);
     else if (isOpenApiEventInstance(inst)) await handleOpenApiEvent(inst, env);
     else if (isDocEventInstance(inst)) await handleDocEvent(inst, env);
-    else await evaluate(inst, (result: Result) => env.setLastResult(result), env);
+    else {
+      await evaluate(inst, (result: Result) => env.setLastResult(result), env);
+      env.resetReturnFlag();
+    }
   } else {
     env.setLastResult(inst);
   }

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

@@ -217,15 +217,17 @@ export class SqlDbResolver extends Resolver {
       inst.addQuery(col, '=', connectedInstance.lookup(PathAttributeName));
       return await this.queryInstances(inst, false);
     } else {
+      const from = relationship.getAliasFor(connectedInstance);
+      const to = relationship.getInverseAliasFor(connectedInstance);
       await getAllConnected(
         asTableReference(inst.moduleName, inst.name),
         inst.queryAttributesAsObject(),
         inst.queryAttributeValuesAsObject(),
         {
           connectionTable: asTableReference(inst.moduleName, relationship.name),
-          fromColumn: relationship.node1.alias,
+          fromColumn: from,
           fromValue: `'${connectedInstance.lookup(PathAttributeName)}'`,
-          toColumn: relationship.node2.alias,
+          toColumn: to,
           toRef: PathAttributeName,
         },
         this.getDbContext(inst.getFqName())