Revert "Revert "Add type resolving for ONNX models""

This reverts commit 882d574ab53e8d10a2a8765a64487c20661dc63f.

1 files changed, 53 insertions, 23 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java
index d9b0c70dfdd..5060aafb55f 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java
@@ -25,43 +25,61 @@ public class RankingExpressionWithOnnxModelTestCase {
         OnnxModelsConfig.Builder builder = new OnnxModelsConfig.Builder();
         ((OnnxModelsConfig.Producer) db).getConfig(builder);
         OnnxModelsConfig config = new OnnxModelsConfig(builder);
-        assertEquals(3, config.model().size());
+        assertEquals(5, config.model().size());
 
-        assertEquals("my_model", config.model(1).name());
+        assertEquals("my_model", config.model(0).name());
+        assertEquals(3, config.model(0).input().size());
+        assertEquals("second/input:0", config.model(0).input(0).name());
+        assertEquals("constant(my_constant)", config.model(0).input(0).source());
+        assertEquals("first_input", config.model(0).input(1).name());
+        assertEquals("attribute(document_field)", config.model(0).input(1).source());
+        assertEquals("third_input", config.model(0).input(2).name());
+        assertEquals("rankingExpression(my_function)", config.model(0).input(2).source());
+        assertEquals(3, config.model(0).output().size());
+        assertEquals("path/to/output:0", config.model(0).output(0).name());
+        assertEquals("out", config.model(0).output(0).as());
+        assertEquals("path/to/output:1", config.model(0).output(1).name());
+        assertEquals("path_to_output_1", config.model(0).output(1).as());
+        assertEquals("path/to/output:2", config.model(0).output(2).name());
+        assertEquals("path_to_output_2", config.model(0).output(2).as());
+
+        assertEquals("files_model_onnx", config.model(1).name());
         assertEquals(3, config.model(1).input().size());
-        assertEquals("first_input", config.model(1).input(0).name());
-        assertEquals("attribute(document_field)", config.model(1).input(0).source());
-        assertEquals("second/input:0", config.model(1).input(1).name());
-        assertEquals("constant(my_constant)", config.model(1).input(1).source());
-        assertEquals("third_input", config.model(1).input(2).name());
-        assertEquals("rankingExpression(my_function)", config.model(1).input(2).source());
-        assertEquals(1, config.model(1).output().size());
+        assertEquals(3, config.model(1).output().size());
         assertEquals("path/to/output:0", config.model(1).output(0).name());
-        assertEquals("out", config.model(1).output(0).as());
-
-        assertEquals("files_ranking_model_onnx", config.model(0).name());
-        assertEquals(0, config.model(0).input().size());
-        assertEquals(2, config.model(0).output().size());
-        assertEquals("path/to/output:1", config.model(0).output(0).name());
-        assertEquals("path_to_output_1", config.model(0).output(0).as());
-        assertEquals("path/to/output:2", config.model(0).output(1).name());
-        assertEquals("path_to_output_2", config.model(0).output(1).as());
+        assertEquals("path_to_output_0", config.model(1).output(0).as());
+        assertEquals("path/to/output:1", config.model(1).output(1).name());
+        assertEquals("path_to_output_1", config.model(1).output(1).as());
+        assertEquals("path/to/output:2", config.model(1).output(2).name());
+        assertEquals("path_to_output_2", config.model(1).output(2).as());
+        assertEquals("files_model_onnx", config.model(1).name());
 
         assertEquals("another_model", config.model(2).name());
         assertEquals("third_input", config.model(2).input(2).name());
         assertEquals("rankingExpression(another_function)", config.model(2).input(2).source());
+
+        assertEquals("files_summary_model_onnx", config.model(3).name());
+        assertEquals(3, config.model(3).input().size());
+        assertEquals(3, config.model(3).output().size());
+
+        assertEquals("dynamic_model", config.model(4).name());
+        assertEquals(1, config.model(4).input().size());
+        assertEquals(1, config.model(4).output().size());
+        assertEquals("rankingExpression(my_function)", config.model(4).input(0).source());
     }
 
     private void assertTransformedFeature(DocumentDatabase db) {
         RankProfilesConfig.Builder builder = new RankProfilesConfig.Builder();
         ((RankProfilesConfig.Producer) db).getConfig(builder);
         RankProfilesConfig config = new RankProfilesConfig(builder);
-        assertEquals(5, config.rankprofile().size());
+        assertEquals(7, config.rankprofile().size());
 
         assertEquals("test_model_config", config.rankprofile(2).name());
         assertEquals("rankingExpression(my_function).rankingScript", config.rankprofile(2).fef().property(0).name());
         assertEquals("vespa.rank.firstphase", config.rankprofile(2).fef().property(2).name());
-        assertEquals("onnxModel(my_model).out", config.rankprofile(2).fef().property(2).value());
+        assertEquals("rankingExpression(firstphase)", config.rankprofile(2).fef().property(2).value());
+        assertEquals("rankingExpression(firstphase).rankingScript", config.rankprofile(2).fef().property(3).name());
+        assertEquals("onnxModel(my_model).out{d0:1}", config.rankprofile(2).fef().property(3).value());
 
         assertEquals("test_generated_model_config", config.rankprofile(3).name());
         assertEquals("rankingExpression(my_function).rankingScript", config.rankprofile(3).fef().property(0).name());
@@ -69,16 +87,28 @@ public class RankingExpressionWithOnnxModelTestCase {
         assertEquals("rankingExpression(second_input).rankingScript", config.rankprofile(3).fef().property(4).name());
         assertEquals("rankingExpression(third_input).rankingScript", config.rankprofile(3).fef().property(6).name());
         assertEquals("vespa.rank.firstphase", config.rankprofile(3).fef().property(8).name());
-        assertEquals("onnxModel(files_ranking_model_onnx).path_to_output_1", config.rankprofile(3).fef().property(8).value());
+        assertEquals("rankingExpression(firstphase)", config.rankprofile(3).fef().property(8).value());
+        assertEquals("rankingExpression(firstphase).rankingScript", config.rankprofile(3).fef().property(9).name());
+        assertEquals("onnxModel(files_model_onnx).path_to_output_1{d0:1}", config.rankprofile(3).fef().property(9).value());
 
         assertEquals("test_summary_features", config.rankprofile(4).name());
         assertEquals("rankingExpression(another_function).rankingScript", config.rankprofile(4).fef().property(0).name());
         assertEquals("rankingExpression(firstphase).rankingScript", config.rankprofile(4).fef().property(3).name());
         assertEquals("1", config.rankprofile(4).fef().property(3).value());
         assertEquals("vespa.summary.feature", config.rankprofile(4).fef().property(4).name());
-        assertEquals("onnxModel(another_model).out", config.rankprofile(4).fef().property(4).value());
+        assertEquals("onnxModel(files_summary_model_onnx).path_to_output_2", config.rankprofile(4).fef().property(4).value());
         assertEquals("vespa.summary.feature", config.rankprofile(4).fef().property(5).name());
-        assertEquals("onnxModel(files_ranking_model_onnx).path_to_output_2", config.rankprofile(4).fef().property(5).value());
+        assertEquals("onnxModel(another_model).out", config.rankprofile(4).fef().property(5).value());
+
+        assertEquals("test_dynamic_model", config.rankprofile(5).name());
+        assertEquals("rankingExpression(my_function).rankingScript", config.rankprofile(5).fef().property(0).name());
+        assertEquals("rankingExpression(firstphase).rankingScript", config.rankprofile(5).fef().property(3).name());
+        assertEquals("onnxModel(dynamic_model).my_output{d0:0, d1:1}", config.rankprofile(5).fef().property(3).value());
+
+        assertEquals("test_dynamic_model_2", config.rankprofile(6).name());
+        assertEquals("rankingExpression(firstphase).rankingScript", config.rankprofile(6).fef().property(5).name());
+        assertEquals("onnxModel(dynamic_model).my_output{d0:0, d1:2}", config.rankprofile(6).fef().property(5).value());
+
     }
 
 }