Separate config and observation on model execute signature

examples/ompls/sci.yml

@@ -4,8 +4,9 @@ tags: null
 initialize:
   models:
     - name: sci
-      kind: builtin
-      path: ''
+      kind: plugin
+      path: '@grnsft/if-models'
+      model: SciModel
 graph:
   children:
     child:
@@ -30,7 +31,5 @@ graph:
           operational-carbon: 5
           embodied-carbon: 0.02
           requests: 100
-          functional-unit-duration: 1
-          functional-unit-time: minutes
-          functional-unit: requests
+          carbon: 0.0013944444444444442
           sci: 0.0008366666666666665

src/__tests__/unit/lib/supercomputer.test.ts

@@ -306,6 +306,123 @@ describe('lib/supercomputer: ', () => {
       );
     });
 
+    it('passes output from earlier executed model to the later ones as an input', async () => {
+      const testImpl: any = {
+        name: 'test-impl',
+        graph: {
+          children: {
+            child: {
+              pipeline: ['model-one', 'model-two'],
+              inputs: [{testProp: 5}],
+            },
+          },
+        },
+      };
+
+      const mockModelOneExecutor = jest.fn(() => [
+        {testProp: 5, 'model-one-output': true},
+      ]);
+      const mockModelTwoExecutor = jest.fn();
+
+      const modelsHandbook = {
+        getInitializedModel: jest.fn(modelName => {
+          if (modelName === 'model-one') return {execute: mockModelOneExecutor};
+          if (modelName === 'model-two') return {execute: mockModelTwoExecutor};
+          return;
+        }),
+      };
+
+      const supercomputer = new Supercomputer(
+        testImpl,
+        modelsHandbook as unknown as ModelsUniverse
+      );
+      await supercomputer.compute();
+
+      expect(modelsHandbook.getInitializedModel).toHaveBeenNthCalledWith(
+        1,
+        'model-one',
+        {}
+      );
+
+      expect(modelsHandbook.getInitializedModel).toHaveBeenNthCalledWith(
+        2,
+        'model-two',
+        {}
+      );
+
+      expect(mockModelOneExecutor).toHaveBeenNthCalledWith(
+        1,
+        [{testProp: 5}],
+        {}
+      );
+
+      expect(mockModelTwoExecutor).toHaveBeenNthCalledWith(
+        1,
+        [{testProp: 5, 'model-one-output': true}],
+        {}
+      );
+    });
+
+    it('runs model execute method with two arguments: inputs and properly merged config', async () => {
+      const testImpl: any = {
+        name: 'test-impl',
+        graph: {
+          children: {
+            child: {
+              pipeline: ['model-one'],
+              config: {
+                'model-one': {
+                  'config-prop-one': true,
+                  'config-prop-two': 'test',
+                },
+              },
+              children: {
+                child: {
+                  config: {
+                    'model-one': {
+                      'config-prop-one': false,
+                      'config-prop-three': 1,
+                    },
+                  },
+                  inputs: [{testProp: 5}],
+                },
+              },
+            },
+          },
+        },
+      };
+
+      const mockModelOneExecutor = jest.fn();
+
+      const modelsHandbook = {
+        getInitializedModel: jest.fn(() => ({
+          execute: mockModelOneExecutor,
+        })),
+      };
+
+      const supercomputer = new Supercomputer(
+        testImpl,
+        modelsHandbook as unknown as ModelsUniverse
+      );
+      await supercomputer.compute();
+
+      expect(modelsHandbook.getInitializedModel).toHaveBeenNthCalledWith(
+        1,
+        'model-one',
+        {
+          'config-prop-one': false,
+          'config-prop-two': 'test',
+          'config-prop-three': 1,
+        }
+      );
+
+      expect(mockModelOneExecutor).toHaveBeenNthCalledWith(1, [{testProp: 5}], {
+        'config-prop-one': false,
+        'config-prop-two': 'test',
+        'config-prop-three': 1,
+      });
+    });
+
     it('throws `structure malformed` error if nested children component misses `inputs`.', async () => {
       const jsonObj = JSON.stringify(impl);
       const implCopy = JSON.parse(jsonObj);

src/lib/models-universe.ts

@@ -6,7 +6,6 @@ import {CONFIG, STRINGS} from '../config';
 
 import {
   ClassContainerParams,
-  GraphOptions,
   ImplInitializeModel,
   InitalizedModels,
 } from '../types/models-universe';
@@ -100,7 +99,7 @@ export class ModelsUniverse {
    * Initializes and registers model.
    */
   public async writeDown(modelToInitalize: ImplInitializeModel) {
-    const {model, path, config, name} = modelToInitalize;
+    const {model, path, config: initConfig, name} = modelToInitalize;
 
     if (!model) {
       throw new ModelCredentialError(MISSING_CLASSNAME);
@@ -112,10 +111,10 @@ export class ModelsUniverse {
 
     const Model = await this.handModel(model, path);
 
-    const callback = async (graphOptions: GraphOptions) => {
+    const callback = async (nodeConfig: Record<string, any>) => {
       const params = {
-        ...config,
-        ...graphOptions,
+        ...initConfig,
+        ...nodeConfig,
       };
 
       const initalizedModel = await new Model().configure(params);