Revert "Merge branch 'master' of github.com:mo-fu/Annif into mo-fu-ma…

…ster"

This reverts commit aa96ebc, reversing
changes made to eb437a8.

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.8-slim-bullseye
 LABEL maintainer="Juho Inkinen <juho.inkinen@helsinki.fi>"
 SHELL ["/bin/bash", "-c"]
 
-ARG optional_dependencies="fasttext voikko fasttext nn omikuji yake spacy pecos"
+ARG optional_dependencies="fasttext voikko fasttext nn omikuji yake spacy"
 ARG POETRY_VIRTUALENVS_CREATE=false
 
 # Install system dependencies needed at runtime:
@@ -37,10 +37,6 @@ RUN if [[ $optional_dependencies =~ "spacy" ]]; then \
 			python -m spacy download $model; \
 		done; \
 	fi
-RUN if [[ $optional_dependencies =~ "pecos" ]]; then \
-	mkdir /.cache -m a=rwx; \
-	fi
-
 
 # Second round of installation with the actual code:
 COPY annif /Annif/annif

annif/backend/__init__.py

@@ -79,17 +79,6 @@ def _tfidf():
     return tfidf.TFIDFBackend
 
 
-def _xtransformer():
-    try:
-        from . import xtransformer
-
-        return xtransformer.XTransformerBackend
-    except ImportError:
-        raise ValueError(
-            "XTransformer not available, not enabling XTransformer backend"
-        )
-
-
 def _yake():
     try:
         from . import yake
@@ -112,7 +101,6 @@ def _yake():
     "stwfsa": _stwfsa,
     "svc": _svc,
     "tfidf": _tfidf,
-    "xtransformer": _xtransformer,
     "yake": _yake,
 }
 

annif/backend/fasttext.py

@@ -112,7 +112,11 @@ def _create_model(self, params, jobs):
         self.info("creating fastText model")
         trainpath = os.path.join(self.datadir, self.TRAIN_FILE)
         modelpath = os.path.join(self.datadir, self.MODEL_FILE)
-        params = annif.util.apply_param_parse_config(self.FASTTEXT_PARAMS, params)
+        params = {
+            param: self.FASTTEXT_PARAMS[param](val)
+            for param, val in params.items()
+            if param in self.FASTTEXT_PARAMS
+        }
         if jobs != 0:  # jobs set by user to non-default value
             params["thread"] = jobs
         self.debug("Model parameters: {}".format(params))

annif/backend/omikuji.py

@@ -1,6 +1,7 @@
 """Annif backend using the Omikuji classifier"""
 
 import os.path
+import shutil
 
 import omikuji
 
@@ -99,7 +100,9 @@ def _create_model(self, params, jobs):
         hyper_param.collapse_every_n_layers = int(params["collapse_every_n_layers"])
 
         self._model = omikuji.Model.train_on_data(train_path, hyper_param, jobs or None)
-        annif.util.atomic_save_folder(self._model, model_path)
+        if os.path.exists(model_path):
+            shutil.rmtree(model_path)
+        self._model.save(os.path.join(self.datadir, self.MODEL_FILE))
 
     def _train(self, corpus, params, jobs=0):
         if corpus != "cached":

annif/backend/stwfsa.py

@@ -4,7 +4,7 @@
 
 from annif.exception import NotInitializedException, NotSupportedException
 from annif.suggestion import ListSuggestionResult, SubjectSuggestion
-from annif.util import apply_param_parse_config, atomic_save, boolean
+from annif.util import atomic_save, boolean
 
 from . import backend
 
@@ -95,7 +95,11 @@ def _load_data(self, corpus):
 
     def _train(self, corpus, params, jobs=0):
         X, y = self._load_data(corpus)
-        new_params = apply_param_parse_config(self.STWFSA_PARAMETERS, params)
+        new_params = {
+            key: self.STWFSA_PARAMETERS[key](val)
+            for key, val in params.items()
+            if key in self.STWFSA_PARAMETERS
+        }
         p = StwfsapyPredictor(
             graph=self.project.vocab.as_graph(),
             langs=frozenset([params["language"]]),