WASM Bindings collapse

app/bergamot-translator-app-bytearray.cpp

@@ -7,9 +7,9 @@
 
 #include <iostream>
 
-#include "TranslationModel.h"
-#include "translator/parser.h"
 #include "translator/byte_array_util.h"
+#include "translator/parser.h"
+#include "translator/service.h"
 
 int main(int argc, char **argv) {
 
@@ -20,19 +20,20 @@ int main(int argc, char **argv) {
   std::string config = options->asYamlString();
 
   // Route the config string to construct marian model through TranslationModel
-  TranslationModel model(config, marian::bergamot::getModelMemoryFromConfig(options));
+  marian::bergamot::Service model(
+      config, marian::bergamot::getModelMemoryFromConfig(options));
 
   TranslationRequest translationRequest;
   std::vector<std::string> texts;
 
   for (std::string line; std::getline(std::cin, line);) {
-        texts.emplace_back(line);
+    texts.emplace_back(line);
   }
 
-  auto results = model.translate(std::move(texts), translationRequest);
+  auto results = model.translateMultiple(std::move(texts), translationRequest);
 
   // Resolve the future and get the actual result
-  //std::vector<TranslationResult> results = futureResults.get();
+  // std::vector<TranslationResult> results = futureResults.get();
 
   for (auto &result : results) {
     std::cout << result.getTranslatedText() << std::endl;

app/bergamot-translator-app.cpp

@@ -1,16 +1,17 @@
 /*
  * main.cpp
  *
- * An application which accepts line separated texts in stdin and returns translated ones in stdout.
- * It is convenient for batch processing and can be used with tools like SacreBLEU.
+ * An application which accepts line separated texts in stdin and returns
+ * translated ones in stdout. It is convenient for batch processing and can be
+ * used with tools like SacreBLEU.
  *
  */
 
 #include <iostream>
 #include <string>
 
-#include "TranslationModel.h"
 #include "translator/parser.h"
+#include "translator/service.h"
 
 int main(int argc, char **argv) {
 
@@ -21,19 +22,19 @@ int main(int argc, char **argv) {
   std::string config = options->asYamlString();
 
   // Route the config string to construct marian model through TranslationModel
-  TranslationModel model(config);
+  marian::bergamot::Service model(config);
 
   TranslationRequest translationRequest;
   std::vector<std::string> texts;
 
   for (std::string line; std::getline(std::cin, line);) {
-        texts.emplace_back(line);
+    texts.emplace_back(line);
   }
 
-  auto results = model.translate(std::move(texts), translationRequest);
+  auto results = model.translateMultiple(std::move(texts), translationRequest);
 
   // Resolve the future and get the actual result
-  //std::vector<TranslationResult> results = futureResults.get();
+  // std::vector<TranslationResult> results = futureResults.get();
 
   for (auto &result : results) {
     std::cout << result.getTranslatedText() << std::endl;

src/translator/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_library(bergamot-translator STATIC
-    TranslationModel.cpp
     byte_array_util.cpp
     text_processor.cpp
     sentence_splitter.cpp

src/translator/response.h

@@ -64,6 +64,10 @@ struct Response {
   /// sparse matrix representation with indices corresponding
   /// to (sub-)words accessible through Annotation.
   std::vector<Alignment> alignments;
+
+  const std::string &getOriginalText() const { return source.text; }
+
+  const std::string &getTranslatedText() const { return target.text; }
 };
 } // namespace bergamot
 } // namespace marian

src/translator/service.cpp

@@ -28,8 +28,8 @@ loadVocabularies(marian::Ptr<marian::Options> options) {
 namespace marian {
 namespace bergamot {
 
-Service::Service(Ptr<Options> options, AlignedMemory modelMemory, AlignedMemory shortlistMemory)
-    : requestId_(0), vocabs_(std::move(loadVocabularies(options))),
+Service::Service(Ptr<Options> options, AlignedMemory modelMemory, AlignedMemory shortlistMemory) 
+    : requestId_(0), options_(options), vocabs_(std::move(loadVocabularies(options))),
       text_processor_(vocabs_, options), batcher_(options),
       numWorkers_(options->get<int>("cpu-threads")),
       modelMemory_(std::move(modelMemory)), shortlistMemory_(std::move(shortlistMemory))

src/translator/service.h

@@ -123,6 +123,12 @@ class Service {
   translateMultiple(std::vector<std::string> &&source,
                     TranslationRequest translationRequest);
 
+  /// Returns if model is alignment capable or not. Exists for not breaking
+  /// things at the extension.
+  bool isAlignmentSupported() const {
+    return options_->hasAndNotEmpty("alignment");
+  }
+
 private:
   /// Queue an input for translation.
   std::future<Response> queueRequest(std::string &&input,
@@ -149,6 +155,10 @@ class Service {
 
   /// Number of workers to launch.
   size_t numWorkers_; // ORDER DEPENDENCY (pcqueue_)
+
+  /// Options object holding the options Service was instantiated with.
+  Ptr<Options> options_;
+
   /// Model memory to load model passed as bytes.
   AlignedMemory modelMemory_; // ORDER DEPENDENCY (translators_)
   /// Shortlist memory passed as bytes.