Include files in subdirs but ignore dirs as model data files

NatLibFi · Mar 13, 2024 · 47c836c · 47c836c
1 parent eba2b0c
commit 47c836c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/annif/backend/backend.py b/annif/backend/backend.py
@@ -53,14 +53,15 @@ def params(self) -> dict[str, Any]:
 
     @property
     def _model_file_paths(self) -> list:
-        all_paths = glob(os.path.join(self.datadir, "*"))
+        all_paths = glob(os.path.join(self.datadir, "**"), recursive=True)
+        file_paths = [p for p in all_paths if os.path.isfile(p)]
         ignore_patterns = ("*-train*", "tmp-*", "vectorizer")
         ignore_paths = [
             path
             for igp in ignore_patterns
             for path in glob(os.path.join(self.datadir, igp))
         ]
-        return list(set(all_paths) - set(ignore_paths))
+        return list(set(file_paths) - set(ignore_paths))
 
     @property
     def is_trained(self) -> bool: