agentlang 0.9.4 → 0.9.6

package/src/language/generated/module.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 3.5.2.
+ * This file was generated by langium-cli 4.1.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

package/src/language/parser.ts

@@ -411,27 +411,27 @@ function asFnCallPattern(fnCall: FnCall): FunctionCallPattern {
 }
 
 function introspectLiteral(lit: Literal): BasePattern {
-  if (lit.id) {
+  if (lit.id !== undefined) {
     return LiteralPattern.Id(lit.id);
-  } else if (lit.num) {
+  } else if (lit.num !== undefined) {
     return LiteralPattern.Number(lit.num);
-  } else if (lit.ref) {
+  } else if (lit.ref !== undefined) {
     return LiteralPattern.Reference(lit.ref);
   } else if (lit.str !== undefined) {
     return LiteralPattern.String(lit.str);
-  } else if (lit.bool) {
+  } else if (lit.bool !== undefined) {
     return LiteralPattern.Boolean(lit.bool == 'true' ? true : false);
-  } else if (lit.fnCall) {
+  } else if (lit.fnCall !== undefined) {
     return asFnCallPattern(lit.fnCall);
-  } else if (lit.asyncFnCall) {
+  } else if (lit.asyncFnCall !== undefined) {
     return asFnCallPattern(lit.asyncFnCall.fnCall).asAsync();
-  } else if (lit.array) {
+  } else if (lit.array !== undefined) {
     return LiteralPattern.Array(
       lit.array.vals.map((stmt: Statement) => {
         return introspectStatement(stmt);
       })
     );
-  } else if (lit.map) {
+  } else if (lit.map !== undefined) {
     return introspectMapLiteral(lit.map);
   } else {
     throw new Error(`Invalid literal - ${lit}`);

package/src/runtime/agents/common.ts

@@ -167,6 +167,9 @@ The following usage is NOT valid:
 
 <pattern> if (<expr>)
 
+Also C-style ternary-expressions of the form \`condition ? consequent : alternative\` IS INVALID in Agentlang. Always use a proper
+\`if-else\` statement.
+
 A pattern may execute asynchronously and its eventual result can be handled by patterns provided in the '@then' clause. An example is shown below:
 
 {sendChatMessage {to "amy", "text" "hello"}} @as response @then {
@@ -362,6 +365,105 @@ case or cases you selected and no additional text or comments. If you decide to
 Also select the case that is the best match for the given context, no need to look for a perfect match for all values specified in the context.
 Now apply the same analysis to the following context and cases provided by the user.
 `;
+export const EvalInstructions = `Consider the following request passed to an intelligent agent and its response. Rate the response on a scale of
+1-5, where 1 being the lowest score (response unacceptable) and 5 being the highest score (best response). Also describe why you gave a particular score.
+Reply in the JSON format {score: <score-for-the-response, summary: <your-reasons-for-giving-the-score>}`;
+
+export const LearningAgentInstructions = `Summarize requirements and use-cases as three constructs: 'decisions' and 'glossaries'.
+Your response must be encoded in JSON. The exact schema will be described later, but let's first consider an example that will help clarify
+how decisions and glossaries could be generate from a use-case. This use-case is from the insurance industry:
+
+In insurance, a claim is a formal request made by a policyholder (or beneficiary) to an insurance company asking for financial
+compensation or service because a covered event (loss) has occurred. When the company receives a claim, look at its risk-factor and
+set its approval-mode accordingly. If the risk-factor is 'low', then set the approval-mode to 'auto', if it's 'medium' then set approval-mode to
+'manual'. If the risk-factor is 'high', then set approval-mode to 'investigate'.
+
+Given the above use-case you should return the summary as:
+{
+  "summary": "A claim is a request for insurance benefits after a covered loss, and its risk level determines
+  whether it is auto-approved, manually reviewed, or investigated.",
+  "glossary": [
+    {
+      "word": "claim",
+      "meaning": "A claim is a request to an insurer for payment or service after a covered loss."
+    }
+  ],
+  "decisions": [
+    {
+      "name": "setApprovalByRiskFactor",
+      "conditions": [
+        {
+          "if": "risk-factor is low",
+          "then": "auto"
+        },
+        {
+          "if": "risk-factor is medium",
+          "then": "manual"
+        },
+        {
+          "if": "risk-factor is high",
+          "then": "investigate"
+        }
+      ]
+    }
+  ]
+}
+
+Sometimes, the use-case will also contain some examples, which you can summarize as 'scenarios'. An example follows:
+
+The ACME company gives salary-hikes to employees based on their sales. If the sales is $50000 or above, a 5-percent hike is given.
+If the sales is between $20000 and $50000, a hike of 2.5% is given. For sales below $20000, no hike is given. An employee who hit
+the target of $50000 is said to have hit a "jackpot". For example, if you see a message that says - "jake@acme.com hit a jackpot", that means
+the employee 'jake@acme.com' is eligible for a 5% hike.
+
+Given the above instruction, you should return:
+
+{
+  "summary": "ACME determines employee salary hikes based on achieved sales figures, with higher sales resulting in higher percentage increases. Employees who meet or exceed the top sales threshold are described as having hit a jackpot.",
+  "glossary": [
+    {
+      "word": "salary-hike",
+      "meaning": "An increase in an employee's salary based on defined performance criteria."
+    },
+    {
+      "word": "sales",
+      "meaning": "The total revenue generated by an employee, used as the basis for determining salary hikes."
+    },
+    {
+      "word": "jackpot",
+      "meaning": "A term used for employees whose sales are 50000 or above, making them eligible for the highest salary hike."
+    }
+  ],
+  "decisions": [
+    {
+      "name": "determineSalaryHikeBySales",
+      "conditions": [
+        {
+          "if": "sales is 50000 or above",
+          "then": "5-percent hike"
+        },
+        {
+          "if": "sales is between 20000 and 50000",
+          "then": "2.5-percent hike"
+        },
+        {
+          "if": "sales is below 20000",
+          "then": "no hike"
+        }
+      ]
+    }
+  ],
+  "scenarios": [
+    {
+      "user": "jake@acme.com hit a jackpot",
+      "ai": "give jake@acme.com a hike of 5-percent"
+    }
+  ]
+}
+
+For some user-requests, it may not be able to produce glossary or decisions (or both). In such cases, just return the 'summary'.
+Now process the user-request that follows.
+`;
 
 export type AgentCondition = {
   if: string;
@@ -575,3 +677,8 @@ export function getAgentScratchNames(agentFqName: string): Set<string> | undefin
 export function removeAgentScratchNames(agentFqName: string) {
   AgentScratchNames.delete(agentFqName);
 }
+
+export type AgentSummary = {
+  data: string;
+  summary: string;
+};

package/src/runtime/agents/impl/anthropic.ts

@@ -181,15 +181,15 @@ export class AnthropicProvider implements AgentServiceProvider {
     if (!config) {
       return {
         ...defaultConfig,
-        apiKey: process.env.ANTHROPIC_API_KEY || getLocalEnv('ANTHROPIC_API_KEY'),
+        apiKey: process.env.AGENTLANG_ANTHROPIC_KEY || getLocalEnv('AGENTLANG_ANTHROPIC_KEY'),
       };
     }
 
     const apiKey =
       config.get('apiKey') ||
       config.get('api_key') ||
-      process.env.ANTHROPIC_API_KEY ||
-      getLocalEnv('ANTHROPIC_API_KEY');
+      process.env.AGENTLANG_ANTHROPIC_KEY ||
+      getLocalEnv('AGENTLANG_ANTHROPIC_KEY');
 
     return {
       model: config.get('model') || defaultConfig.model,
@@ -266,7 +266,7 @@ export class AnthropicProvider implements AgentServiceProvider {
   ): Promise<AIResponse> {
     if (!this.config.apiKey) {
       throw new Error(
-        'Anthropic API key is required. Set ANTHROPIC_API_KEY environment variable or use setLocalEnv("ANTHROPIC_API_KEY", key) or provide apiKey in config.'
+        'Anthropic API key is required. Set AGENTLANG_ANTHROPIC_KEY environment variable or use setLocalEnv("AGENTLANG_ANTHROPIC_KEY", key) or provide apiKey in config.'
       );
     }
 

package/src/runtime/agents/impl/openai.ts

@@ -69,15 +69,15 @@ export class OpenAIProvider implements AgentServiceProvider {
     if (!config) {
       return {
         ...defaultConfig,
-        apiKey: process.env.OPENAI_API_KEY || getLocalEnv('OPENAI_API_KEY'),
+        apiKey: process.env.AGENTLANG_OPENAI_KEY || getLocalEnv('AGENTLANG_OPENAI_KEY'),
       };
     }
 
     const apiKey =
       config.get('apiKey') ||
       config.get('api_key') ||
-      process.env.OPENAI_API_KEY ||
-      getLocalEnv('OPENAI_API_KEY');
+      process.env.AGENTLANG_OPENAI_KEY ||
+      getLocalEnv('AGENTLANG_OPENAI_KEY');
 
     return {
       model: config.get('model') || defaultConfig.model,
@@ -105,7 +105,7 @@ export class OpenAIProvider implements AgentServiceProvider {
   async invoke(messages: BaseMessage[], externalToolSpecs: any[] | undefined): Promise<AIResponse> {
     if (!this.config.apiKey) {
       throw new Error(
-        'OpenAI API key is required. Set OPENAI_API_KEY environment variable or use setLocalEnv("OPENAI_API_KEY", key) or provide apiKey in config.'
+        'OpenAI API key is required. Set AGENTLANG_OPENAI_KEY environment variable or use setLocalEnv("AGENTLANG_OPENAI_KEY", key) or provide apiKey in config.'
       );
     }
     if (externalToolSpecs) {

package/src/runtime/auth/defs.ts

@@ -1,7 +1,7 @@
 import { AppConfig } from '../state.js';
 
 // TODO: AdminUserId must be dynamically set based on auth-service-config and a valid admin-login
-export const AdminUserId = '00000000-0000-0000-0000-000000000000';
+export const AdminUserId = '12345678-1234-1234-1234-123456789abc';
 
 export function isAuthEnabled(): boolean {
   if (AppConfig?.auth?.enabled == true) {

package/src/runtime/defs.ts

@@ -457,7 +457,7 @@ export function setInternDynamicModuleFn(f: Function) {
   InternDynamicModule = f;
 }
 
-export const DefaultTenantId = '00000000-0000-0000-0000-000000000000';
+export const DefaultTenantId = '12345678-1234-1234-1234-123456789abc';
 
 export let getUserTenantId = async function (_: string, env: any): Promise<string> {
   env;

package/src/runtime/exec-graph.ts

@@ -468,15 +468,18 @@ export async function executeEventHelper(eventInstance: Instance, env?: Environm
     isLocalEnv = true;
   }
   let g: ExecGraph | undefined;
+  let escalatedRole: string | undefined;
   if (!isAgentEventInstance(eventInstance)) {
     g = await generateExecutionGraph(fqn);
     if (!g) {
       throw new Error(`Failed to generate graph for event ${fqn}`);
     }
+    escalatedRole = getWorkflowForEvent(fqn).getRoleEscalation();
   }
   const oldModuleName = env.switchActiveModuleName(eventInstance.moduleName);
   env.bind(eventInstance.name, eventInstance);
   env.bind(eventInstance.getFqName(), eventInstance);
+  if (escalatedRole) env.setEscalatedRole(escalatedRole);
   try {
     if (g) {
       await executeGraph(g, env);
@@ -498,6 +501,7 @@ export async function executeEventHelper(eventInstance: Instance, env?: Environm
     }
     throw err;
   } finally {
+    env.resetEscalatedRole();
     if (!isLocalEnv) env.switchActiveModuleName(oldModuleName);
   }
 }

package/src/runtime/interpreter.ts

@@ -86,7 +86,7 @@ import {
   AgentEntityName,
   AgentFqName,
   findAgentByName,
-  trimGeneratedCode,
+  normalizeGeneratedCode,
 } from './modules/ai.js';
 import { logger } from './logger.js';
 import {
@@ -165,6 +165,7 @@ export class Environment extends Instance {
   private agentMode: 'chat' | 'planner' | undefined = undefined;
   private agentChatId: string | undefined = undefined;
   private monitor: Monitor | undefined = undefined;
+  private escalatedRole: string | undefined;
 
   private activeUserData: any = undefined;
 
@@ -191,6 +192,7 @@ export class Environment extends Instance {
       this.eventExecutor = parent.eventExecutor;
       this.agentChatId = parent.agentChatId;
       this.monitor = parent.monitor;
+      this.escalatedRole = parent.escalatedRole;
     } else {
       this.activeModule = DefaultModuleName;
       this.activeResolvers = new Map<string, Resolver>();
@@ -287,6 +289,20 @@ export class Environment extends Instance {
     return this;
   }
 
+  setEscalatedRole(s: string): Environment {
+    this.escalatedRole = s;
+    return this;
+  }
+
+  getEscalatedRole(): string | undefined {
+    return this.escalatedRole;
+  }
+
+  resetEscalatedRole(): Environment {
+    this.escalatedRole = undefined;
+    return this;
+  }
+
   private static FlowContextTag = 'flow-context';
 
   setFlowContext(s: string): Environment {
@@ -900,6 +916,8 @@ export let evaluate = async function (
       if (!isEmptyWorkflow(wf)) {
         env = new Environment(eventInstance.name + '.env', activeEnv);
         env.setActiveEvent(eventInstance);
+        const er = wf.getRoleEscalation();
+        if (er) env.setEscalatedRole(er);
         if (kernelCall) {
           env.setInKernelMode(true);
         }
@@ -934,6 +952,7 @@ export let evaluate = async function (
       throw err;
     }
   } finally {
+    env?.resetEscalatedRole();
     if (!txnRolledBack && env !== undefined && activeEnv === undefined) {
       await env.commitAllTransactions();
     }
@@ -1959,7 +1978,7 @@ async function agentInvoke(agent: AgentInstance, msg: string, env: Environment):
       let retries = 0;
       while (true) {
         try {
-          let rs: string = result ? trimGeneratedCode(result) : '';
+          let rs: string = result ? normalizeGeneratedCode(result) : '';
           let isWf = rs.startsWith('workflow');
           if (isWf && !agent.runWorkflows) {
             await parseWorkflow(rs);
@@ -2013,7 +2032,7 @@ async function agentInvoke(agent: AgentInstance, msg: string, env: Environment):
       let retries = 0;
       while (true) {
         try {
-          result = trimGeneratedCode(result);
+          result = normalizeGeneratedCode(result);
           const obj = agent.maybeValidateJsonResponse(result);
           if (obj !== undefined) {
             env.setLastResult(obj);
@@ -2219,7 +2238,7 @@ async function preprocessStep(
   env: Environment
 ): Promise<PreprocStepResult> {
   let needAgentProcessing = true;
-  spec = trimGeneratedCode(spec);
+  spec = normalizeGeneratedCode(spec);
   if (spec.startsWith('{') || spec.indexOf(' ') > 0) {
     const newEnv = Environment.from(env, env.name + '_flow_eval', false, true).setActiveModuleName(
       activeModuleName

package/src/runtime/loader.ts

@@ -1,4 +1,3 @@
-import chalk from 'chalk';
 import { createAgentlangServices } from '../language/agentlang-module.js';
 import {
   Import,
@@ -48,6 +47,8 @@ import {
   RetryDefinition,
   SetAttribute,
   CrudMap,
+  isAgentEvaluatorDefinition,
+  AgentEvaluatorDefinition,
 } from '../language/generated/ast.js';
 import {
   addEntity,
@@ -70,6 +71,7 @@ import {
   fetchModule,
   Retry,
   addGlobalRetry,
+  AgentEvaluator,
 } from './module.js';
 import {
   asStringLiteralsMap,
@@ -102,7 +104,13 @@ import {
 import { logger } from './logger.js';
 import { Environment, evaluateStatements, GlobalEnvironment } from './interpreter.js';
 import { createPermission, createRole } from './modules/auth.js';
-import { AgentEntityName, CoreAIModuleName, LlmEntityName } from './modules/ai.js';
+import {
+  AgentEntityName,
+  AgentInstance,
+  AgentLearnerType,
+  CoreAIModuleName,
+  LlmEntityName,
+} from './modules/ai.js';
 import { getDefaultLLMService } from './agents/registry.js';
 import { GenericResolver, GenericResolverMethods } from './resolvers/interface.js';
 import { registerResolver, setResolver } from './resolvers/registry.js';
@@ -125,6 +133,7 @@ import {
   registerAgentScenarios,
   registerAgentScratchNames,
 } from './agents/common.js';
+import chalk from 'chalk';
 
 export async function extractDocument(
   fileName: string,
@@ -418,7 +427,7 @@ export async function loadAppConfig(configDirOrContent: string): Promise<Config>
   } catch (err: any) {
     if (err instanceof z.ZodError) {
       console.log(chalk.red('Config validation failed:'));
-      err.errors.forEach((error: any, index: number) => {
+      err.issues.forEach((error: any, index: number) => {
         console.log(chalk.red(`  ${index + 1}. ${error.path.join('.')}: ${error.message}`));
       });
     } else {
@@ -584,7 +593,7 @@ export function addWorkflowFromDef(
   moduleName: string,
   ispub: boolean = false
 ): Workflow {
-  return addWorkflow(def.name || '', moduleName, def.statements, def.header, ispub);
+  return addWorkflow(def.name || '', moduleName, def.statements, def.header, def.directives, ispub);
 }
 
 const StandaloneStatements = new Map<string, Statement[]>();
@@ -842,6 +851,12 @@ async function addAgentDefinition(
     const service = getDefaultLLMService();
     wf = `{${CoreAIModuleName}/${LlmEntityName} {name "${llmName}", service "${service}"}, @upsert}; ${wf}`;
   }
+  if (attrs.get('type') === 'planner' || attrs.get('tools')) {
+    const llmn = llmName || attrs.get('llm');
+    wf = `${wf}; {${CoreAIModuleName}/${AgentEntityName}
+        {name "${name}_${AgentLearnerType}", moduleName "${moduleName}", llm "${llmn}",
+         type "${AgentLearnerType}", role "You are an agent that summarizes user-provided scenarios."}, @upsert}`;
+  }
   (await parseWorkflow(`workflow A {${wf}}`)).statements.forEach((stmt: Statement) => {
     addStandaloneStatement(stmt, moduleName, false);
   });
@@ -1090,6 +1105,29 @@ function addRetryDefinition(def: RetryDefinition, moduleName: string) {
   fetchModule(moduleName).addRetry(retry);
 }
 
+function addAgentEvaluatorDefinition(def: AgentEvaluatorDefinition, moduleName: string) {
+  if (!def.name) throw new Error('Evaluator definition must have a name');
+  const e = new AgentEvaluator(def.name, moduleName);
+  def.attributes.forEach((sa: SetAttribute) => {
+    const isins = sa.name === 'instruction';
+    if (isins || sa.name === 'llm') {
+      if (isLiteral(sa.value)) {
+        const s = sa.value.id || sa.value.str;
+        if (s) {
+          if (isins) e.setInstruction(s);
+          else e.setLlm(s);
+        } else throw new Error(`Invalid value for evaluator-${sa.name} in ${def.name}`);
+      } else {
+        throw new Error(`evaluator ${sa.name} must be a string in ${def.name}`);
+      }
+    } else {
+      throw new Error(`invalid attribute ${sa.name} in evaluator ${def.name}`);
+    }
+  });
+  fetchModule(moduleName).addAgentEvaluator(e);
+  AgentInstance.RegisterEvaluator(e);
+}
+
 function addResolverDefinition(def: ResolverDefinition, moduleName: string) {
   const resolverName = `${moduleName}/${def.name}`;
   const paths = def.paths;
@@ -1157,6 +1195,7 @@ export async function addFromDef(def: Definition, moduleName: string) {
   else if (isDirectiveDefinition(def)) addDirectiveDefintion(def, moduleName);
   else if (isGlossaryEntryDefinition(def)) addGlossaryEntryDefintion(def, moduleName);
   else if (isRetryDefinition(def)) addRetryDefinition(def, moduleName);
+  else if (isAgentEvaluatorDefinition(def)) addAgentEvaluatorDefinition(def, moduleName);
 }
 
 export async function parseAndIntern(code: string, moduleName?: string) {

package/src/runtime/module.ts

@@ -22,6 +22,7 @@ import {
   WorkflowHeader,
   FlowDefinition,
   FlowEntry,
+  WorkflowDirectives,
 } from '../language/generated/ast.js';
 import {
   Path,
@@ -1517,11 +1518,19 @@ export class Relationship extends Record {
 export class Workflow extends ModuleEntry {
   statements: Statement[];
   isPrePost: boolean;
+  directives: WorkflowDirectives | undefined;
 
-  constructor(name: string, patterns: Statement[], moduleName: string, isPrePost: boolean = false) {
+  constructor(
+    name: string,
+    patterns: Statement[],
+    moduleName: string,
+    isPrePost: boolean = false,
+    directives?: WorkflowDirectives
+  ) {
     super(name, moduleName);
     this.statements = patterns;
     this.isPrePost = isPrePost;
+    this.directives = directives;
   }
 
   async addStatement(stmtCode: string): Promise<Workflow> {
@@ -1648,10 +1657,29 @@ export class Workflow extends ModuleEntry {
     return this;
   }
 
+  getRoleEscalation(): string | undefined {
+    if (this.directives !== undefined) {
+      for (let i = 0; i < this.directives.entries.length; ++i) {
+        const e = this.directives.entries[i];
+        if (e.tag === '@withRole') {
+          return e.value;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  private directivesToString(): string {
+    if (this.directives !== undefined) {
+      return ` ${this.directives.$cstNode?.text || ''} `;
+    }
+    return ' ';
+  }
+
   override toString() {
     const n = this.isPrePost ? untangleWorkflowName(this.name) : this.name;
     const nn = normalizeWorkflowName(n);
-    let s: string = `workflow ${nn} {\n`;
+    let s: string = `workflow ${nn}${this.directivesToString()}{\n`;
     const ss = this.statementsToStringsHelper(this.statements);
     s = s.concat(joinStatements(ss));
     if (!this.isPrePost) {
@@ -2091,6 +2119,49 @@ export class Retry extends ModuleEntry {
   }
 }
 
+export class AgentEvaluator extends ModuleEntry {
+  instruction: string | undefined;
+  llm: string | undefined;
+
+  constructor(name: string, moduleName: string) {
+    super(name, moduleName);
+  }
+
+  setInstruction(ins: string): AgentEvaluator {
+    this.instruction = ins;
+    return this;
+  }
+
+  setLlm(llm: string): AgentEvaluator {
+    this.llm = llm;
+    return this;
+  }
+
+  private static suffix = '_eval';
+
+  escapeName(): AgentEvaluator {
+    this.name = `${this.name}${AgentEvaluator.suffix}`;
+    return this;
+  }
+
+  normalizedName(): string {
+    const i = this.name.lastIndexOf(AgentEvaluator.suffix);
+    if (i >= 0) {
+      return this.name.substring(0, i);
+    }
+    return this.name;
+  }
+
+  override toString(): string {
+    let s = '';
+    if (this.instruction) s = `    instruction "${this.instruction}"`;
+    if (this.llm) s = `${s}\n    llm "${this.llm}"`;
+    return `evaluator ${this.normalizedName()} {
+    ${s}
+    }`;
+  }
+}
+
 export class Decision extends ModuleEntry {
   cases: string[];
 
@@ -2395,6 +2466,11 @@ export class Module {
     return this;
   }
 
+  addAgentEvaluator(e: AgentEvaluator): Module {
+    this.addEntry(e.escapeName());
+    return this;
+  }
+
   getRetry(name: string): Retry | undefined {
     if (this.hasEntry(name)) {
       const e = this.getEntry(name);
@@ -3092,6 +3168,7 @@ export function addWorkflow(
   moduleName = activeModule,
   statements?: Statement[],
   hdr?: WorkflowHeader | ThinWfHeader,
+  directives?: WorkflowDirectives,
   ispub: boolean = false
 ): Workflow {
   if (hdr) {
@@ -3130,7 +3207,7 @@ export function addWorkflow(
     });
   }
   return module.addEntry(
-    new Workflow(asWorkflowName(name), statements, moduleName, hdr ? true : false)
+    new Workflow(asWorkflowName(name), statements, moduleName, hdr ? true : false, directives)
   ) as Workflow;
 }