agentlang 0.2.0 → 0.2.1

package/src/runtime/modules/ai.ts

@@ -1,4 +1,4 @@
-import { isFqName, makeCoreModuleName, makeFqName, splitFqName } from '../util.js';
+import { isFqName, makeCoreModuleName, makeFqName, nameToPath, splitFqName } from '../util.js';
 import {
   Environment,
   GlobalEnvironment,
@@ -7,12 +7,15 @@ import {
 } from '../interpreter.js';
 import {
   asJSONSchema,
+  Decision,
   fetchModule,
+  getDecision,
   Instance,
   instanceToObject,
   isModule,
   makeInstance,
   newInstanceAttributes,
+  Record,
 } from '../module.js';
 import { provider } from '../agents/registry.js';
 import {
@@ -27,6 +30,7 @@ import {
   AgentCondition,
   AgentGlossaryEntry,
   AgentScenario,
+  DecisionAgentInstructions,
   FlowExecInstructions,
   getAgentDirectives,
   getAgentGlossary,
@@ -38,7 +42,8 @@ import {
 import { PathAttributeNameQuery } from '../defs.js';
 import { logger } from '../logger.js';
 import { FlowStep } from '../agents/flows.js';
-import * as Handlebars from 'handlebars';
+import Handlebars from 'handlebars';
+import { Statement } from '../../language/generated/ast.js';
 
 export const CoreAIModuleName = makeCoreModuleName('ai');
 export const AgentEntityName = 'Agent';
@@ -113,6 +118,7 @@ export class AgentInstance {
   private hasModuleTools = false;
   private withSession = true;
   private fqName: string | undefined;
+  private decisionExecutor = false;
 
   private constructor() {}
 
@@ -137,7 +143,7 @@ export class AgentInstance {
       for (let i = 0; i < agent.toolsArray.length; ++i) {
         const n = agent.toolsArray[i];
         if (isFqName(n)) {
-          const parts = splitFqName(n);
+          const parts = nameToPath(n);
           agent.hasModuleTools = isModule(parts.getModuleName());
         } else {
           agent.hasModuleTools = isModule(n);
@@ -148,7 +154,11 @@ export class AgentInstance {
     return agent;
   }
 
-  static FromFlowStep(step: FlowStep, flowAgent: AgentInstance): AgentInstance {
+  static FromFlowStep(step: FlowStep, flowAgent: AgentInstance, context: string): AgentInstance {
+    const desc = getDecision(step, flowAgent.moduleName);
+    if (desc) {
+      return AgentInstance.FromDecision(desc, flowAgent, context);
+    }
     const fqs = isFqName(step) ? step : `${flowAgent.moduleName}/${step}`;
     const instruction = `Analyse the context and generate the pattern required to invoke ${fqs}.
     Never include references in the pattern. All attribute values must be literals derived from the context.`;
@@ -166,6 +176,20 @@ export class AgentInstance {
     return AgentInstance.FromInstance(inst).disableSession();
   }
 
+  static FromDecision(desc: Decision, flowAgent: AgentInstance, context: string): AgentInstance {
+    const instruction = `${DecisionAgentInstructions}\n${context}\n\n${desc.joinedCases()}`;
+    const inst = makeInstance(
+      CoreAIModuleName,
+      AgentEntityName,
+      newInstanceAttributes()
+        .set('llm', flowAgent.llm)
+        .set('name', `${desc.name}_agent`)
+        .set('moduleName', flowAgent.moduleName)
+        .set('instruction', instruction)
+    );
+    return AgentInstance.FromInstance(inst).disableSession().markAsDecisionExecutor();
+  }
+
   disableSession(): AgentInstance {
     this.withSession = false;
     return this;
@@ -188,6 +212,15 @@ export class AgentInstance {
     return this.type == 'flow-exec';
   }
 
+  markAsDecisionExecutor(): AgentInstance {
+    this.decisionExecutor = true;
+    return this;
+  }
+
+  isDecisionExecutor(): boolean {
+    return this.decisionExecutor;
+  }
+
   private directivesAsString(fqName: string): string {
     const conds = getAgentDirectives(fqName);
     if (conds) {
@@ -221,7 +254,8 @@ export class AgentInstance {
     if (scenarios) {
       const scs = new Array<string>();
       scenarios.forEach((sc: AgentScenario) => {
-        scs.push(`User: ${sc.user}\nAI: ${sc.ai}\n`);
+        const aiResp = processScenarioResponse(sc.ai);
+        scs.push(`User: ${sc.user}\nAI: ${aiResp}\n`);
       });
       finalInstruction = `${finalInstruction}\nHere are some example user requests and the corresponding responses you are supposed to produce:\n${scs.join('\n')}`;
     }
@@ -231,8 +265,13 @@ export class AgentInstance {
 Only return a pure JSON object with no extra text, annotations etc.`;
     }
     const spad = env.getScratchPad();
-    if (spad != undefined && finalInstruction.indexOf('{{') > 0) {
-      return AgentInstance.maybeRewriteTemplatePatterns(spad, finalInstruction);
+    if (spad != undefined) {
+      if (finalInstruction.indexOf('{{') > 0) {
+        return AgentInstance.maybeRewriteTemplatePatterns(spad, finalInstruction);
+      } else {
+        const ctx = JSON.stringify(spad);
+        return `${finalInstruction}\nSome additional context:\n${ctx}`;
+      }
     } else {
       return finalInstruction;
     }
@@ -248,7 +287,7 @@ Only return a pure JSON object with no extra text, annotations etc.`;
       const responseSchema = getAgentResponseSchema(this.getFqName());
       if (responseSchema) {
         const attrs = JSON.parse(response);
-        const parts = splitFqName(responseSchema);
+        const parts = nameToPath(responseSchema);
         const moduleName = parts.getModuleName();
         const entryName = parts.getEntryName();
         const attrsMap = new Map(Object.entries(attrs));
@@ -427,7 +466,7 @@ Only return a pure JSON object with no extra text, annotations etc.`;
         let moduleName: string | undefined;
         let entryName: string | undefined;
         if (isFqName(n)) {
-          const parts = splitFqName(n);
+          const parts = nameToPath(n);
           moduleName = parts.getModuleName();
           entryName = parts.getEntryName();
         } else {
@@ -438,7 +477,10 @@ Only return a pure JSON object with no extra text, annotations etc.`;
           if (entryName) {
             const hasmod = slimModules.has(moduleName);
             const defs = hasmod ? slimModules.get(moduleName) : new Array<string>();
-            defs?.push(m.getEntry(entryName).toString());
+            const entry = m.getEntry(entryName);
+            const s =
+              entry instanceof Record ? (entry as Record).toString_(true) : entry.toString();
+            defs?.push(s);
             if (!hasmod && defs) {
               slimModules.set(moduleName, defs);
             }
@@ -577,3 +619,20 @@ export async function saveAgentChatSession(chatId: string, messages: any[], env:
 export function agentName(agentInstance: Instance): string {
   return agentInstance.lookup('name');
 }
+
+function processScenarioResponse(resp: string): string {
+  const r = resp.trimStart();
+  if (r.startsWith('[') || r.startsWith('{')) {
+    return resp;
+  }
+  if (isFqName(r)) {
+    const parts = splitFqName(r);
+    const m = fetchModule(parts[0]);
+    const wf = m.getWorkflowForEvent(parts[1]);
+    const ss = wf.statements.map((stmt: Statement) => {
+      return stmt.$cstNode?.text;
+    });
+    return `[${ss.join(';\n')}]`;
+  }
+  return resp;
+}

package/src/runtime/resolvers/interface.ts

@@ -13,7 +13,7 @@ import {
   newInstanceAttributes,
   Relationship,
 } from '../module.js';
-import { CrudType, splitFqName } from '../util.js';
+import { CrudType, nameToPath } from '../util.js';
 import { DefaultAuthInfo, ResolverAuthInfo } from './authinfo.js';
 
 export type JoinInfo = {
@@ -223,7 +223,7 @@ export class Resolver {
         } else {
           const eventName = getSubscriptionEvent(this.name);
           if (eventName) {
-            const path = splitFqName(eventName);
+            const path = nameToPath(eventName);
             const inst = makeInstance(
               path.getModuleName(),
               path.getEntryName(),

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

@@ -13,7 +13,7 @@ import {
   newInstanceAttributes,
   Relationship,
 } from '../../module.js';
-import { escapeFqName, makeFqName, splitFqName } from '../../util.js';
+import { escapeFqName, makeFqName, nameToPath } from '../../util.js';
 import { JoinInfo, Resolver } from '../interface.js';
 import { asTableReference } from './dbutil.js';
 import {
@@ -259,7 +259,7 @@ export class SqlDbResolver extends Resolver {
     const joinClauses: JoinClause[] = [];
     this.processJoinInfo(tableName, inst, joinsSpec, joinClauses);
     intoSpec.forEach((v: string, k: string) => {
-      const p = splitFqName(v);
+      const p = nameToPath(v);
       const mn = p.hasModule() ? p.getModuleName() : inst.moduleName;
       intoSpec.set(k, asTableReference(mn, p.getEntryName()));
     });

package/src/runtime/util.ts

@@ -141,7 +141,7 @@ export function isFqName(s: string): boolean {
   return s.indexOf('/') > 0;
 }
 
-export function splitFqName(s: string): Path {
+export function nameToPath(s: string): Path {
   if (s.indexOf('/') > 0) {
     const parts: string[] = s.split('/');
     return new Path(parts[0], parts[1]);
@@ -149,6 +149,10 @@ export function splitFqName(s: string): Path {
   return new Path(undefined, s);
 }
 
+export function splitFqName(s: string): string[] {
+  return s.split('/');
+}
+
 export function splitRefs(s: string): string[] {
   if (s.indexOf('.') > 0) {
     return s.split('.');

package/src/syntaxes/agentlang.monarch.ts

@@ -1,12 +1,12 @@
 // Monarch syntax highlighting for the agentlang language.
 export default {
     keywords: [
-        '@actions','@after','@as','@async','@before','@catch','@distinct','@enum','@expr','@from','@into','@meta','@oneof','@rbac','@ref','@then','@upsert','@with_unique','agent','allow','and','await','between','contains','create','delete','else','entity','error','event','extends','false','flow','for','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','subscribe','true','update','upsert','where','workflow'
+        '@actions','@after','@as','@async','@before','@catch','@distinct','@enum','@expr','@from','@into','@meta','@oneof','@rbac','@ref','@then','@upsert','@with_unique','agent','allow','and','await','between','case','contains','create','decision','delete','else','entity','error','event','extends','false','flow','for','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','subscribe','true','update','upsert','where','workflow'
     ],
     operators: [
-        '!=','*','+',',','-','-->','.','/',':',';','<','<=','<>','=','>','>=','?','@'
+        '!=','*','+',',','-','-->','.','/',':',';','<','<=','<>','=','==','>','>=','?','@'
     ],
-    symbols: /!=|\(|\)|\*|\+|,|-|-->|\.|\/|:|;|<|<=|<>|=|>|>=|\?|@|\[|\]|\{|\}/,
+    symbols: /!=|\(|\)|\*|\+|,|-|-->|\.|\/|:|;|<|<=|<>|=|==|>|>=|\?|@|\[|\]|\{|\}/,
 
     tokenizer: {
         initial: [