agentlang 0.0.8 → 0.0.11

package/src/runtime/modules/auth.ts

@@ -29,7 +29,7 @@ export const CoreAuthModuleName = makeCoreModuleName('auth');
 
 export default `module ${CoreAuthModuleName}
 
-import "./modules/auth.js" as Auth
+import "./modules/auth.js" @as Auth
 
 entity User {
     id UUID @id @default(uuid()),
@@ -52,12 +52,12 @@ workflow CreateUser {
 }
 
 workflow FindUser {
-  {User {id? FindUser.id}} as [user];
+  {User {id? FindUser.id}} @as [user];
   user
 }
 
 workflow FindUserByEmail {
-  {User {email? FindUserByEmail.email}} as [user];
+  {User {email? FindUserByEmail.email}} @as [user];
   user
 }
 
@@ -83,19 +83,19 @@ workflow CreateRole {
 }
 
 workflow FindRole {
-    {Role {name? FindRole.name}} as [role];
+    {Role {name? FindRole.name}} @as [role];
     role
 }
 
 workflow AssignUserToRole {
-    {User {id? AssignUserToRole.userId}} as [user];
-    {Role {name? AssignUserToRole.roleName}} as [role];
+    {User {id? AssignUserToRole.userId}} @as [user];
+    {Role {name? AssignUserToRole.roleName}} @as [role];
     {UserRole {User user, Role role}, @upsert}
 }
 
 workflow AssignUserToRoleByEmail {
-    {User {email? AssignUserToRoleByEmail.email}} as [user];
-    {Role {name? AssignUserToRoleByEmail.roleName}} as [role];
+    {User {email? AssignUserToRoleByEmail.email}} @as [user];
+    {Role {name? AssignUserToRoleByEmail.roleName}} @as [role];
     {UserRole {User user, Role role}, @upsert}
 }
 
@@ -116,8 +116,8 @@ workflow CreatePermission {
 }
 
 workflow AddPermissionToRole {
-    {Role {name? AddPermissionToRole.roleName}} as role;
-    {Permission {id? AddPermissionToRole.permissionId}} as perm;
+    {Role {name? AddPermissionToRole.roleName}} @as role;
+    {Permission {id? AddPermissionToRole.permissionId}} @as perm;
     {RolePermission {Role role, Permission perm}, @upsert}
 }
 
@@ -154,12 +154,12 @@ workflow UpdateSession {
 }
 
 workflow FindSession {
-  {Session {id? FindSession.id}} as [session];
+  {Session {id? FindSession.id}} @as [session];
   session
 }
 
 workflow FindUserSession {
-  {Session {userId? FindUserSession.userId}} as [session];
+  {Session {userId? FindUserSession.userId}} @as [session];
   session
 }
 
@@ -168,7 +168,7 @@ workflow RemoveSession {
 }
 
 workflow RemoveUserSession {
-  {Session {userId? RemoveUserSession.id}} as [session];
+  {Session {userId? RemoveUserSession.id}} @as [session];
   purge {Session {id? session.id}}
 }
 
@@ -837,10 +837,14 @@ export async function refreshUserToken(refreshToken: string, env: Environment):
 }
 
 export function requireAuth(moduleName: string, eventName: string): boolean {
-  const f =
-    moduleName == CoreAuthModuleName &&
-    (eventName == 'login' || eventName == 'signup' || eventName == 'refreshToken');
-  return !f;
+  if (isAuthEnabled()) {
+    const f =
+      moduleName == CoreAuthModuleName &&
+      (eventName == 'login' || eventName == 'signup' || eventName == 'refreshToken');
+    return !f;
+  } else {
+    return false;
+  }
 }
 
 // Export getHttpStatusForError for use in HTTP handlers

package/src/runtime/modules/core.ts

@@ -1,11 +1,23 @@
 import { default as ai } from './ai.js';
 import { default as auth } from './auth.js';
 import { DefaultModuleName, DefaultModules } from '../util.js';
-import { Instance, isInstanceOfType } from '../module.js';
-import { Environment, parseAndEvaluateStatement } from '../interpreter.js';
+import { Instance, isInstanceOfType, makeInstance, newInstanceAttributes } from '../module.js';
+import {
+  Environment,
+  evaluate,
+  evaluateStatements,
+  parseAndEvaluateStatement,
+} from '../interpreter.js';
 import { logger } from '../logger.js';
+import { Statement } from '../../language/generated/ast.js';
+import { parseStatements } from '../../language/parser.js';
+import { Resolver } from '../resolvers/interface.js';
+import { PathAttributeName } from '../defs.js';
 
 const CoreModuleDefinition = `module ${DefaultModuleName}
+
+import "./modules/core.js" @as Core
+
 entity timer {
   name String @id,
   duration Int,
@@ -23,6 +35,34 @@ entity auditlog {
   user String,
   token String @optional
 }
+
+entity suspension {
+  id UUID @id,
+  continuation String[], // rest of the patterns to execute
+  env Any, // serialized environment-object
+  createdOn DateTime @default(now()),
+  createdBy String
+}
+
+entity activeSuspension {
+  id UUID @id
+}
+
+resolver servicenow ["${DefaultModuleName}/activeSuspension"] {
+    query Core.lookupActiveSuspension
+}
+
+workflow createSuspension {
+  {suspension 
+    {id createSuspension.id
+     continuation createSuspension.continuation,
+     env createSuspension.env,
+     createdBy createSuspension.createdBy}}
+}
+
+workflow restartSuspension {
+  await Core.restartSuspension(restartSuspension.id, restartSuspension.data)
+}
 `;
 export const CoreModules: string[] = [];
 
@@ -95,3 +135,105 @@ export async function addUpdateAudit(
 ) {
   await addAudit(env, 'u', resource, previous_value);
 }
+
+export async function createSuspension(
+  suspId: string,
+  continuation: string[],
+  env: Environment
+): Promise<string | undefined> {
+  const user = env.getActiveUser();
+  const newEnv = new Environment('susp', env).setInKernelMode(true);
+  const envObj = env.asSerializableObject();
+  const inst = makeInstance(
+    'agentlang',
+    'createSuspension',
+    newInstanceAttributes()
+      .set('id', suspId)
+      .set('continuation', continuation)
+      .set('env', envObj)
+      .set('createdBy', user)
+  );
+  const r: any = await evaluate(inst, undefined, newEnv);
+  if (!isInstanceOfType(r, 'agentlang/suspension')) {
+    logger.warn(`Failed to create suspension for user ${user}`);
+    return undefined;
+  }
+  return (r as Instance).lookup('id');
+}
+
+export type Suspension = {
+  continuation: Statement[];
+  env: Environment;
+};
+
+async function loadSuspension(suspId: string, env?: Environment): Promise<Suspension | undefined> {
+  const newEnv = new Environment('auditlog', env).setInKernelMode(true);
+  const r: any = await parseAndEvaluateStatement(
+    `{agentlang/suspension {id? "${suspId}"}}`,
+    undefined,
+    newEnv
+  );
+  if (r instanceof Array && r.length > 0) {
+    const inst: Instance = r[0];
+    const cont = inst.lookup('continuation');
+    const stmts: Statement[] = await parseStatements(cont);
+    const envStr = inst.lookup('env');
+    const suspEnv: Environment = Environment.FromSerializableObject(JSON.parse(envStr));
+    return {
+      continuation: stmts,
+      env: suspEnv,
+    };
+  }
+  return undefined;
+}
+
+async function deleteSuspension(suspId: string, env?: Environment): Promise<any> {
+  try {
+    await parseAndEvaluateStatement(
+      `purge {agentlang/suspension {id? "${suspId}"}}`,
+      undefined,
+      env
+    );
+    return suspId;
+  } catch (err: any) {
+    logger.warn(`Failed to delete suspension ${suspId} - ${err}`);
+    return undefined;
+  }
+}
+
+export async function restartSuspension(
+  suspId: string,
+  userData: string,
+  env?: Environment
+): Promise<any> {
+  const susp = await loadSuspension(suspId, env);
+  if (susp) {
+    susp.env.bindSuspensionUserData(userData);
+    await evaluateStatements(susp.continuation, susp.env);
+    await deleteSuspension(suspId, env);
+    return susp.env.getLastResult();
+  } else {
+    logger.warn(`Suspension ${suspId} not found`);
+    return undefined;
+  }
+}
+
+export async function lookupActiveSuspension(
+  resolver: Resolver,
+  inst: Instance,
+  queryAll: boolean
+) {
+  if (!queryAll) {
+    const data = inst.lookupQueryVal(PathAttributeName).split('/')[1];
+    if (data) {
+      const parts = data.split(':');
+      const id = parts[0];
+      const userData = parts[1];
+      return await restartSuspension(id, userData, resolver.getEnvironment());
+    } else {
+      return [];
+    }
+  } else {
+    return [];
+  }
+}

package/src/runtime/resolvers/interface.ts

@@ -1,4 +1,4 @@
-import { evaluate } from '../interpreter.js';
+import { Environment, evaluate } from '../interpreter.js';
 import { logger } from '../logger.js';
 import {
   Instance,
@@ -45,7 +45,7 @@ export function getSubscriptionEvent(resolverName: string): string | undefined {
 
 export class Resolver {
   protected authInfo: ResolverAuthInfo = DefaultAuthInfo;
-  protected userData: any;
+  protected env: Environment | undefined;
   protected name: string = 'default';
 
   static Default = new Resolver();
@@ -59,13 +59,13 @@ export class Resolver {
     return this;
   }
 
-  public setUserData(userData: any): Resolver {
-    this.userData = userData;
+  public setEnvironment(env: Environment): Resolver {
+    this.env = env;
     return this;
   }
 
-  public getUserData(): any {
-    return this.userData;
+  public getEnvironment(): Environment | undefined {
+    return this.env;
   }
 
   public getName(): string {

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

@@ -65,7 +65,7 @@ export class SqlDbResolver extends Resolver {
   }
 
   private getDbContext(resourceFqName: string): DbContext {
-    const activeEnv: Environment = this.getUserData() as Environment;
+    const activeEnv: Environment = this.getEnvironment() as Environment;
     if (!activeEnv) {
       throw new Error('Active environment context is required by SqlDbResolver');
     }
@@ -104,7 +104,7 @@ export class SqlDbResolver extends Resolver {
         attrs.set(PathAttributeName, p);
       }
       const n: string = asTableName(inst.moduleName, inst.name);
-      const rowObj: object = inst.attributesAsObject();
+      const rowObj: object = inst.attributesWithStringifiedObjects();
       const ctx = this.getDbContext(inst.getFqName());
       await insertRow(n, rowObj, ctx, orUpdate);
       if (inst.record.getFullTextSearchAttributes()) {

package/src/runtime/util.ts

@@ -49,12 +49,14 @@ function asString(s: MaybeString): string {
   else return s;
 }
 
+const QuoteCharacter = '"';
+
 export function restoreSpecialChars(s: string) {
-  return s.replaceAll('&quote;', '"');
+  return s.replaceAll(QuoteCharacter, '"');
 }
 
 export function escapeSpecialChars(s: string) {
-  return s.replaceAll('"', '&quote;');
+  return s.replaceAll('"', QuoteCharacter);
 }
 
 export class Path {

package/src/syntaxes/agentlang.monarch.ts

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