@output.ai/core 0.2.2 → 0.2.4

package/bin/worker.sh

@@ -23,4 +23,4 @@ sdk_dir="$(dirname "$script_dir")"
 
 cd ${sdk_dir}
 
-exec npm run worker -- ${invocation_dir} "${@:2}"  # Pass remaining args
+exec node "${sdk_dir}/src/worker/index.js" "${invocation_dir}" "${@:2}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@output.ai/core",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "The core module of the output framework",
   "type": "module",
   "exports": {

package/src/interface/evaluator.js

@@ -81,6 +81,7 @@ export class EvaluationStringResult extends EvaluationResult {
    * @param {number} args.confidence - The confidence on the evaluation
    * @param {string} [args.reasoning] - The reasoning behind the result
    */
+  // eslint-disable-next-line no-useless-constructor
   constructor( args ) {
     super( args );
   }
@@ -103,6 +104,7 @@ export class EvaluationBooleanResult extends EvaluationResult {
    * @param {number} args.confidence - The confidence on the evaluation
    * @param {string} [args.reasoning] - The reasoning behind the result
    */
+  // eslint-disable-next-line no-useless-constructor
   constructor( args ) {
     super( args );
   }
@@ -125,6 +127,7 @@ export class EvaluationNumberResult extends EvaluationResult {
    * @param {number} args.confidence - The confidence on the evaluation
    * @param {string} [args.reasoning] - The reasoning behind the result
    */
+  // eslint-disable-next-line no-useless-constructor
   constructor( args ) {
     super( args );
   }

package/src/worker/catalog_workflow/workflow.js

@@ -1,4 +1,4 @@
-import { defineQuery, setHandler } from '@temporalio/workflow';
+import { defineQuery, setHandler, condition } from '@temporalio/workflow';
 
 /**
  * This is a special workflow, unique to each worker, which holds the meta information of all other workflows in that worker.
@@ -9,5 +9,6 @@ import { defineQuery, setHandler } from '@temporalio/workflow';
  */
 export default async function catalogWorkflow( catalog ) {
   setHandler( defineQuery( 'get' ), () => catalog );
-  await new Promise( () => {} ); // stay alive
+  // Wait indefinitely but remain responsive to workflow cancellation
+  await condition( () => false );
 };

package/src/worker/index.js

@@ -56,5 +56,39 @@ const callerDir = process.argv[2];
   } );
 
   console.log( '[Core]', 'Running worker...' );
-  worker.run();
-} )();
+
+  // FORCE_QUIT_GRACE_MS delays the second instance of a shutdown command.
+  // If running output-worker directly with npx, 2 signals are recieved in
+  // rapid succession, and users see the force quit message.
+  const FORCE_QUIT_GRACE_MS = 1000;
+  const state = { isShuttingDown: false, shutdownStartedAt: null };
+
+  const shutdown = signal => {
+    if ( state.isShuttingDown ) {
+      const elapsed = Date.now() - state.shutdownStartedAt;
+      if ( elapsed < FORCE_QUIT_GRACE_MS ) {
+        return; // ignore rapid duplicate signals
+      }
+      process.stderr.write( '[Core] Force quitting...\n' );
+      process.exit( 1 );
+    }
+    state.isShuttingDown = true;
+    state.shutdownStartedAt = Date.now();
+    process.stderr.write( `[Core] Received ${signal}, shutting down...\n` );
+    worker.shutdown();
+  };
+
+  process.on( 'SIGTERM', () => shutdown( 'SIGTERM' ) );
+  process.on( 'SIGINT', () => shutdown( 'SIGINT' ) );
+
+  await worker.run();
+  process.stderr.write( '[Core] Worker stopped.\n' );
+
+  await connection.close();
+  process.stderr.write( '[Core] Connection closed.\n' );
+
+  process.exit( 0 );
+} )().catch( error => {
+  process.stderr.write( `[Core] Fatal error: ${error.message}\n` );
+  process.exit( 1 );
+} );

package/src/worker/webpack_loaders/consts.js

@@ -9,19 +9,6 @@ export const ComponentFile = {
   WORKFLOW: 'workflow'
 };
 
-export const EXTRANEOUS_FILE = 'extraneous';
-export const ExtraneousFileList = [
-  'types',
-  'consts',
-  'constants',
-  'vars',
-  'variables',
-  'utils',
-  'tools',
-  'functions',
-  'shared'
-];
-
 export const CoreModule = {
   LOCAL: 'local_core',
   NPM: '@output.ai/core'

package/src/worker/webpack_loaders/tools.js

@@ -24,7 +24,7 @@ import {
   isExportDefaultDeclaration,
   isFunctionDeclaration
 } from '@babel/types';
-import { ComponentFile, EXTRANEOUS_FILE, ExtraneousFileList, NodeType } from './consts.js';
+import { ComponentFile, NodeType } from './consts.js';
 
 /**
  * Resolve a relative module specifier against a base directory.
@@ -138,8 +138,6 @@ export const isWorkflowPath = value => /(^|\/)workflow\.js$/.test( value );
  */
 export const isTypesPath = value => /(^|\/)types\.js$/.test( value );
 
-export const isExtraneousFile = value => ExtraneousFileList.map( t => new RegExp( `(^|\/)${t}\\.js$` ) ).find( rx => rx.test( value ) );
-
 /**
  * Determine file kind based on its path.
  * @param {string} filename
@@ -158,9 +156,6 @@ export const getFileKind = path => {
   if ( isWorkflowPath( path ) ) {
     return ComponentFile.WORKFLOW;
   }
-  if ( isExtraneousFile( path ) ) {
-    return EXTRANEOUS_FILE;
-  }
   return null;
 };
 

package/src/worker/webpack_loaders/tools.spec.js

@@ -20,7 +20,6 @@ import {
   buildSharedStepsNameMap,
   buildWorkflowNameMap,
   buildEvaluatorsNameMap,
-  isExtraneousFile,
   getFileKind
 } from './tools.js';
 
@@ -170,49 +169,6 @@ describe( 'workflow_rewriter tools', () => {
     expect( isEvaluatorsPath( 'steps.js' ) ).toBe( false );
   } );
 
-  it( 'isExtraneousFile: returns truthy for extraneous files (types/consts/constants/vars/variables)', () => {
-    const ok = [
-      'types.js',
-      './types.js',
-      '/a/b/types.js',
-      'consts.js',
-      './consts.js',
-      '/a/b/consts.js',
-      'constants.js',
-      './constants.js',
-      '/a/b/constants.js',
-      'vars.js',
-      './vars.js',
-      '/a/b/vars.js',
-      'variables.js',
-      './variables.js',
-      '/a/b/variables.js'
-    ];
-    for ( const p of ok ) {
-      expect( Boolean( isExtraneousFile( p ) ) ).toBe( true );
-    }
-  } );
-
-  it( 'isExtraneousFile: returns falsy for non-extraneous or non-.js files', () => {
-    const bad = [
-      'types.ts',
-      '/a/b/types.ts',
-      'types.mjs',
-      'variables.jsx',
-      'variables.mjs',
-      'myconstants.js',
-      'steps.js',
-      'evaluators.js',
-      'shared_steps.js',
-      'workflow.js',
-      'typess.js',
-      '/a/b/c/variables.json'
-    ];
-    for ( const p of bad ) {
-      expect( isExtraneousFile( p ) ).toBeFalsy();
-    }
-  } );
-
   it( 'createThisMethodCall: builds this.method(\'name\', ...args) call', () => {
     const call = createThisMethodCall( 'invoke', 'n', [ t.numericLiteral( 1 ), t.identifier( 'x' ) ] );
     expect( t.isCallExpression( call ) ).toBe( true );

package/src/worker/webpack_loaders/workflow_validator/index.mjs

@@ -1,7 +1,7 @@
 import traverseModule from '@babel/traverse';
 import { dirname } from 'node:path';
 import { parse, toAbsolutePath, getFileKind } from '../tools.js';
-import { ComponentFile, CoreModule, EXTRANEOUS_FILE, ExtraneousFileList } from '../consts.js';
+import { ComponentFile } from '../consts.js';
 import {
   isCallExpression,
   isFunctionExpression,
@@ -17,19 +17,6 @@ import {
 // Handle CJS/ESM interop for Babel packages when executed as a webpack loader
 const traverse = traverseModule.default ?? traverseModule;
 
-/**
- * Check if workflow dependencies
- */
-const validateWorkflowImports = ( { specifier, filename } ) => {
-  const isCore = Object.values( CoreModule ).includes( specifier );
-  const isComponent = Object.values( ComponentFile ).includes( getFileKind( specifier ) );
-  const isAllowedExtraneous = getFileKind( specifier ) === EXTRANEOUS_FILE;
-  if ( !isCore && !isComponent && !isAllowedExtraneous ) {
-    throw new Error( `Invalid dependency in workflow.js: '${specifier}'. \
-Only components (${Object.values( ComponentFile ) } ), @output.ai/core, or whitelisted (${ExtraneousFileList}) imports are allowed in ${filename}` );
-  }
-};
-
 /**
  * Check if evaluators, steps or shared_steps import invalid dependencies
  */
@@ -41,12 +28,10 @@ Steps, shared_steps, evaluators or workflows are not allowed dependencies in ${f
 };
 
 /**
- * Validate import for evaluators, steps, shared_steps, workflow
+ * Validate import for evaluators, steps, shared_steps
  */
 const executeImportValidations = ( { fileKind, specifier, filename } ) => {
-  if ( fileKind === ComponentFile.WORKFLOW ) {
-    validateWorkflowImports( { fileKind, specifier, filename } );
-  } else if ( Object.values( ComponentFile ).includes( fileKind ) ) {
+  if ( Object.values( ComponentFile ).includes( fileKind ) && fileKind !== ComponentFile.WORKFLOW ) {
     validateStepEvaluatorImports( { fileKind, specifier, filename } );
   }
 };
@@ -62,7 +47,6 @@ const executeImportValidations = ( { fileKind, specifier, filename } ) => {
  *  - shared_steps.js: may not import evaluators.js, steps.js, shared_steps.js, workflow.js
  *  - steps.js: at each step().fn body: calling any evaluator, step, shared_step or workflow is forbidden
  *  - steps.js: may not import evaluators.js, steps.js, shared_steps.js, workflow.js
- *  - workflow.js: may only import components: evaluators.js, steps.js, shared_steps.js, workflow.js; and files: types.js or `@output.ai/core`
  *
  * @param {string|Buffer} source
  * @param {any} inputMap

package/src/worker/webpack_loaders/workflow_validator/index.spec.js

@@ -36,13 +36,6 @@ describe( 'workflow_validator loader', () => {
     rmSync( dir, { recursive: true, force: true } );
   } );
 
-  it( 'workflow.js: rejects external dependencies', async () => {
-    const dir = mkdtempSync( join( tmpdir(), 'wf-reject-' ) );
-    const src = 'import x from "./foo.js";';
-    await expect( runLoader( join( dir, 'workflow.js' ), src ) ).rejects.toThrow( /Invalid (import|dependency) in workflow\.js/ );
-    rmSync( dir, { recursive: true, force: true } );
-  } );
-
   it( 'workflow.js: allows imports from @output.ai/core and local_core', async () => {
     const dir = mkdtempSync( join( tmpdir(), 'wf-allow-external-' ) );
     const src = [
@@ -125,24 +118,6 @@ describe( 'workflow_validator loader', () => {
     rmSync( dir, { recursive: true, force: true } );
   } );
 
-  it( 'workflow.js: allows require from steps/shared_steps/evaluators/workflow; rejects others', async () => {
-    const dir = mkdtempSync( join( tmpdir(), 'wf-req-' ) );
-    writeFileSync( join( dir, 'steps.js' ), 'export const S = step({ name: "s" })\n' );
-    writeFileSync( join( dir, 'shared_steps.js' ), 'export const SS = step({ name: "ss" })\n' );
-    writeFileSync( join( dir, 'evaluators.js' ), 'export const E = evaluator({ name: "e" })\n' );
-    writeFileSync( join( dir, 'workflow.js' ), 'export default workflow({ name: "w" })\n' );
-    const ok = [
-      'const { S } = require("./steps.js");',
-      'const { SS } = require("./shared_steps.js");',
-      'const { E } = require("./evaluators.js");',
-      'const W = require("./workflow.js");'
-    ].join( '\n' );
-    await expect( runLoader( join( dir, 'workflow.js' ), ok ) ).resolves.toBeTruthy();
-    const bad = 'const X = require("./util.js");';
-    await expect( runLoader( join( dir, 'workflow.js' ), bad ) ).rejects.toThrow( /Invalid (require|dependency) in workflow\.js/ );
-    rmSync( dir, { recursive: true, force: true } );
-  } );
-
   it( 'steps.js: rejects importing shared_steps/evaluators/workflow variants', async () => {
     const dir = mkdtempSync( join( tmpdir(), 'steps-reject2-' ) );
     await expect( runLoader( join( dir, 'steps.js' ), 'import { SS } from "./shared_steps.js";' ) )
@@ -210,25 +185,6 @@ describe( 'workflow_validator loader', () => {
     rmSync( dir, { recursive: true, force: true } );
   } );
 
-  it( 'workflow.js: allows importing ./types.js and bare types', async () => {
-    const dir = mkdtempSync( join( tmpdir(), 'wf-types-allow-' ) );
-    writeFileSync( join( dir, 'types.js' ), 'export const T = {}\n' );
-    const src1 = 'import { T } from "./types.js";';
-    await expect( runLoader( join( dir, 'workflow.js' ), src1 ) ).resolves.toBeTruthy();
-    rmSync( dir, { recursive: true, force: true } );
-  } );
-
-  it( 'workflow.js: allows importing extraneous files (consts/constants/vars/variables)', async () => {
-    const dir = mkdtempSync( join( tmpdir(), 'wf-extra-allow-' ) );
-    const bases = [ 'consts', 'constants', 'vars', 'variables' ];
-    for ( const base of bases ) {
-      writeFileSync( join( dir, `${base}.js` ), 'export const X = 1\n' );
-      const src = `import x from "./${base}.js";`;
-      await expect( runLoader( join( dir, 'workflow.js' ), src ) ).resolves.toBeTruthy();
-    }
-    rmSync( dir, { recursive: true, force: true } );
-  } );
-
   it( 'steps.js: rejects require of steps/shared_steps/evaluators/workflow; allows other require', async () => {
     const dir = mkdtempSync( join( tmpdir(), 'steps-require-' ) );
     await expect( runLoader( join( dir, 'steps.js' ), 'const { S } = require("./steps.js");' ) )