From 9071773dd980b82ed143daa7b874f0537fea2069 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Mon, 22 Aug 2022 15:26:59 +0200
Subject: Application embedders can reuse vespa embedder configs

---
 .../test/cfg/application/embed_generic/services.xml  | 12 ++++--------
 .../embed_generic_using_provided_model/services.xml  | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 config-model/src/test/cfg/application/embed_generic_using_provided_model/services.xml

(limited to 'config-model/src/test/cfg')

diff --git a/config-model/src/test/cfg/application/embed_generic/services.xml b/config-model/src/test/cfg/application/embed_generic/services.xml
index 7947b8b707c..ab2c1be9745 100644
--- a/config-model/src/test/cfg/application/embed_generic/services.xml
+++ b/config-model/src/test/cfg/application/embed_generic/services.xml
@@ -4,14 +4,10 @@
 
   <container version="1.0">
 
-    <!--
-    <embedder id='transformer' class='ai.vespa.example.paragraph.SentenceBertEmbedder' bundle='exampleEmbedder' def='ai.vespa.example.paragraph.sentence-embedder'>
-      <model>files/model.onnx</model>
-      <vocab>files/vocab.txt</vocab>
-    </embedder>
-    -->
-
-    <embedder id='transformer' class='ai.vespa.example.paragraph.SentenceBertEmbedder' bundle='exampleEmbedder' def='ai.vespa.example.paragraph.sentence-embedder'>
+    <embedder id='transformer'
+              class='ai.vespa.example.paragraph.ApplicationSpecificEmbedder'
+              bundle='exampleEmbedder'
+              def='ai.vespa.example.paragraph.sentence-embedder'>
       <model path="files/model.onnx" /> <!-- Embedder syntax for file path -->
       <vocab>files/vocab.txt</vocab>   <!-- Generic config syntax for file path -->
     </embedder>
diff --git a/config-model/src/test/cfg/application/embed_generic_using_provided_model/services.xml b/config-model/src/test/cfg/application/embed_generic_using_provided_model/services.xml
new file mode 100644
index 00000000000..4190e5c9286
--- /dev/null
+++ b/config-model/src/test/cfg/application/embed_generic_using_provided_model/services.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<services version="1.0">
+
+  <container version="1.0">
+
+    <embedder id='transformer'
+              class='ai.vespa.example.paragraph.ApplicationSpecificEmbedder'
+              bundle='exampleEmbedder'
+              def='embedding.bert-base-embedder'>
+      <model id="test-model-id" url="test-model-url"/>
+      <vocab path="files/vocab.txt"/>
+    </embedder>
+
+    <nodes>
+      <node hostalias='node1'/>
+    </nodes>
+  </container>
+
+</services>
-- 
cgit v1.2.3