Implement load_config() in EvaluatorBase class

Author: orviz

fair_eva/__init__.py

@@ -1,50 +1,8 @@
 #!/usr/bin/env python3
 
-import configparser
-import logging
-import os
-import sys
-
 import connexion
 from connexion.resolver import RestyResolver
 
-logging.basicConfig(
-    stream=sys.stdout,
-    level=logging.DEBUG,
-    format="%(levelname)s:'%(name)s:%(lineno)s' | %(message)s",
-)
-logger = logging.getLogger("api")
-
-app_dirname = os.path.dirname(os.path.abspath(__file__))
-
-
-def load_config(plugin, fail_if_no_config=True):
-    config_file_main = os.path.join(app_dirname, "config.ini")
-    config_file_plugin = os.path.join(app_dirname, "plugins/%s/config.ini" % plugin)
-    config = configparser.ConfigParser()
-    try:
-        config.read([config_file_main, config_file_plugin])
-        logging.debug(
-            "Successfully loaded main & plugin's configuration files (%s, %s)"
-            % (config_file_main, config_file_plugin)
-        )
-    except FileNotFoundError as e:
-        logging.error("Could not load config file: %s" % str(e))
-        if fail_if_no_config:
-            raise (e)
-    except configparser.MissingSectionHeaderError as e:
-        message = "Could not find any/all of the following config files: %s, %s" % (
-            config_file_main,
-            config_file_plugin,
-        )
-        logging.error(message)
-        logging.debug(e)
-        error = {"code": 500, "message": "%s" % message}
-        logging.debug("Returning API response: %s" % error)
-        return json.dumps(error), 500
-
-    return config
-
 
 def main():
     app = connexion.FlaskApp(__name__)

fair_eva/api/evaluator.py

@@ -9,6 +9,7 @@
 import xml.etree.ElementTree as ET
 from abc import ABC, abstractmethod
 from functools import wraps
+from importlib.resources import read_text
 
 import idutils
 import pandas as pd
@@ -182,6 +183,29 @@ def __init__(
         global _
         _ = self.translation()
 
+    @staticmethod
+    def load_config(plugin_path, fail_if_no_config=True):
+        """Find the path to a data file."""
+        config = configparser.ConfigParser()
+        try:
+            config.read_string(read_text("fair_eva", "config.ini"))
+            config.read_string(read_text(plugin_path, "config.ini"))
+        except FileNotFoundError as e:
+            logging.error("Could not load config file: %s" % str(e))
+            if fail_if_no_config:
+                raise (e)
+        except configparser.MissingSectionHeaderError as e:
+            message = "Bad INI format in main and/or plugin's configuration files"
+            logging.error(message)
+            logging.debug(e)
+            error = {"code": 500, "message": "%s" % message}
+            logging.debug("Returning API response: %s" % error)
+            return json.dumps(error), 500
+        else:
+            logging.debug("Successfully loaded main & plugin's configuration files")
+
+        return config
+
     def translation(self):
         # Translations
         t = gettext.translation(

fair_eva/api/rda.py

@@ -9,7 +9,6 @@
 from connexion import NoContent
 
 import fair_eva.api.utils as ut
-from fair_eva import app_dirname, load_config
 from fair_eva.api import evaluator
 
 PLUGIN_PATH = "fair_eva.plugin"  # FIXME get it from main config.ini
@@ -97,7 +96,7 @@ def wrapper(body, **kwargs):
         downstream_logger.addHandler(evaluator_handler)
 
         # Load configuration
-        config_data = load_config(plugin=plugin_name)
+        config_data = plugin_module.Plugin.load_config(f"{PLUGIN_PATH}.{plugin_name}")
 
         # Collect FAIR checks per metadata identifier
         result = {}
@@ -1355,9 +1354,7 @@ def rda_all(body, eva):
     num_of_tests = 10
 
     generic_config = eva.config["Generic"]
-    api_config = os.path.join(
-        app_dirname, generic_config.get("api_config", "fair-api.yaml")
-    )
+    api_config = generic_config.get("api_config", "fair-api.yaml")
     try:
         with open(api_config, "r") as f:
             documents = yaml.full_load(f)