Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / config.py

diff --git a/nominatim/config.py b/nominatim/config.py
index 785f4acda14d0f0c7f344f79718a8d150bc56001..b3934b491fa9a36a690526d1b1c55be4b524804d 100644 (file)
--- a/nominatim/config.py
+++ b/nominatim/config.py
@@ -18,7 +18,7 @@ from dotenv import dotenv_values
 from nominatim.errors import UsageError
 
 LOG = logging.getLogger()
 from nominatim.errors import UsageError
 
 LOG = logging.getLogger()

-
+CONFIG_CACHE = {}

 
 def flatten_config_list(content, section=''):
     """ Flatten YAML configuration lists that contain include sections
 
 def flatten_config_list(content, section=''):
     """ Flatten YAML configuration lists that contain include sections


@@ -86,26 +86,37 @@ class Configuration:
             Values of '1', 'yes' and 'true' are accepted as truthy values,
             everything else is interpreted as false.
         """
             Values of '1', 'yes' and 'true' are accepted as truthy values,
             everything else is interpreted as false.
         """

-        return self.__getattr__(name).lower() in ('1', 'yes', 'true')
+        return getattr(self, name).lower() in ('1', 'yes', 'true')

 
 
     def get_int(self, name):
         """ Return the given configuration parameter as an int.
         """
         try:
 
 
     def get_int(self, name):
         """ Return the given configuration parameter as an int.
         """
         try:

-            return int(self.__getattr__(name))
+            return int(getattr(self, name))

         except ValueError as exp:
             LOG.fatal("Invalid setting NOMINATIM_%s. Needs to be a number.", name)
             raise UsageError("Configuration error.") from exp
 
 
         except ValueError as exp:
             LOG.fatal("Invalid setting NOMINATIM_%s. Needs to be a number.", name)
             raise UsageError("Configuration error.") from exp
 
 

+    def get_str_list(self, name):
+        """ Return the given configuration parameter as a list of strings.
+            The values are assumed to be given as a comma-sparated list and
+            will be stripped before returning them. On empty values None
+            is returned.
+        """
+        raw = getattr(self, name)
+
+        return [v.strip() for v in raw.split(',')] if raw else None
+
+

     def get_path(self, name):
         """ Return the given configuration parameter as a Path.
             If a relative path is configured, then the function converts this
             into an absolute path with the project directory as root path.
             If the configuration is unset, a falsy value is returned.
         """
     def get_path(self, name):
         """ Return the given configuration parameter as a Path.
             If a relative path is configured, then the function converts this
             into an absolute path with the project directory as root path.
             If the configuration is unset, a falsy value is returned.
         """

-        value = self.__getattr__(name)
+        value = getattr(self, name)

         if value:
             value = Path(value)
 
         if value:
             value = Path(value)
 


@@ -141,10 +152,10 @@ class Configuration:
             name of the standard styles automatically into a file in the
             config style.
         """
             name of the standard styles automatically into a file in the
             config style.
         """

-        style = self.__getattr__('IMPORT_STYLE')
+        style = getattr(self, 'IMPORT_STYLE')

 
         if style in ('admin', 'street', 'address', 'full', 'extratags'):
 
         if style in ('admin', 'street', 'address', 'full', 'extratags'):

-            return self.config_dir / 'import-{}.style'.format(style)
+            return self.config_dir / f'import-{style}.style'

 
         return self.find_config_file('', 'IMPORT_STYLE')
 
 
         return self.find_config_file('', 'IMPORT_STYLE')
 


@@ -181,14 +192,19 @@ class Configuration:
         """
         configfile = self.find_config_file(filename, config)
 
         """
         configfile = self.find_config_file(filename, config)
 

-        if configfile.suffix in ('.yaml', '.yml'):
-            return self._load_from_yaml(configfile)
+        if str(configfile) in CONFIG_CACHE:
+            return CONFIG_CACHE[str(configfile)]

 
 

-        if configfile.suffix == '.json':
-            with configfile.open('r') as cfg:
-                return json.load(cfg)
+        if configfile.suffix in ('.yaml', '.yml'):
+            result = self._load_from_yaml(configfile)
+        elif configfile.suffix == '.json':
+            with configfile.open('r', encoding='utf-8') as cfg:
+                result = json.load(cfg)
+        else:
+            raise UsageError(f"Config file '{configfile}' has unknown format.")

 
 

-        raise UsageError(f"Config file '{configfile}' has unknown format.")
+        CONFIG_CACHE[str(configfile)] = result
+        return result

 
 
     def find_config_file(self, filename, config=None):
 
 
     def find_config_file(self, filename, config=None):


@@ -198,7 +214,7 @@ class Configuration:
             a regular file.
         """
         if config is not None:
             a regular file.
         """
         if config is not None:

-            cfg_filename = self.__getattr__(config)
+            cfg_filename = getattr(self, config)

             if cfg_filename:
                 cfg_filename = Path(cfg_filename)
 
             if cfg_filename:
                 cfg_filename = Path(cfg_filename)