fix: typing errors

Author: jlahovnik

eodag/config.py

@@ -933,14 +933,22 @@ def build_mapping_from_env(
             # try converting env_value type from type hints
             if "list" in str(env_type):
                 # convert str to array and then cast (only working for list[str] type)
-                env_value = env_value.split(",")
-            try:
-                env_value = cast_scalar_value(env_value, env_type)
-            except TypeError:
-                logger.warning(
-                    f"Could not convert {parts[0]} value {env_value} to {env_type}"
-                )
-            mapping[parts[0]] = env_value
+                env_value_list = env_value.split(",")
+                try:
+                    env_value_list = cast_scalar_value(env_value_list, env_type)
+                except TypeError:
+                    logger.warning(
+                        f"Could not convert {parts[0]} value {env_value} to {env_type}"
+                    )
+                mapping[parts[0]] = env_value_list
+            else:
+                try:
+                    env_value = cast_scalar_value(env_value, env_type)
+                except TypeError:
+                    logger.warning(
+                        f"Could not convert {parts[0]} value {env_value} to {env_type}"
+                    )
+                mapping[parts[0]] = env_value
         else:
             new_map = mapping.setdefault(parts[0], {})
             build_mapping_from_env("__".join(parts[1:]), env_value, new_map)

eodag/plugins/manager.py

@@ -266,7 +266,7 @@ def get_plugin() -> Union[Search, Api]:
         for config in sorted(configs, key=attrgetter("priority"), reverse=True):
             yield get_plugin()
 
-    def get_download_plugin(self, product: EOProduct) -> Union[Download, Api]:
+    def get_download_plugin(self, product: EOProduct) -> PluginTopic:
         """Build and return the download plugin capable of downloading the given
         product.
 
@@ -278,9 +278,9 @@ def get_download_plugin(self, product: EOProduct) -> Union[Download, Api]:
         if api := getattr(plugin_conf, "api", None):
             plugin_conf.api.products = plugin_conf.products
             plugin_conf.api.priority = plugin_conf.priority
-            plugin = cast(Api, self._build_plugin(product.provider, api, Api))
+            return cast(Api, self._build_plugin(product.provider, api, Api))
         elif getattr(plugin_conf, "download", None):
-            plugin = next(
+            return next(
                 self.get_auth_or_download_plugins(
                     "download", product.provider, matching_url=matching_url
                 )
@@ -289,11 +289,10 @@ def get_download_plugin(self, product: EOProduct) -> Union[Download, Api]:
             raise MisconfiguredError(
                 f"No download plugin configured for provider {plugin_conf.name}."
             )
-        return plugin
 
     def get_auth_plugin(
         self, associated_plugin: PluginTopic, product: Optional[EOProduct] = None
-    ) -> Optional[Authentication]:
+    ) -> Optional[PluginTopic]:
         """Build and return the authentication plugin associated to the given
         search/download plugin
 
@@ -307,7 +306,7 @@ def get_auth_plugin(
         :returns: The Authentication plugin
         """
         # matching url from product to download
-        matching_url = ""
+        matching_url = None
         if product:
             matching_url = _get_matching_url_for_product(product)
         if not matching_url:
@@ -333,7 +332,7 @@ def get_auth_or_download_plugins(
         provider: str,
         matching_url: Optional[str] = None,
         matching_conf: Optional[PluginConfig] = None,
-    ) -> Iterator[Authentication]:
+    ) -> Iterator[Union[Authentication, Download]]:
         """Build and return the authentication plugin for the given provider and
         matching conf or url
 
@@ -379,18 +378,17 @@ def get_auth_or_download_plugins(
                 ):
                     plugin_conf.priority = provider_conf.priority
                     if plugin_type == "auth":
-                        plugin = cast(
+                        yield cast(
                             Authentication,
                             self._build_plugin(
                                 plugin_provider, plugin_conf, Authentication
                             ),
                         )
                     else:
-                        plugin = cast(
+                        yield cast(
                             Download,
                             self._build_plugin(plugin_provider, plugin_conf, Download),
                         )
-                    yield plugin
                 else:
                     continue
 
@@ -419,7 +417,11 @@ def get_auth(
             ):
                 # not the plugin we were looking for
                 continue
-            if auth_plugin and callable(getattr(auth_plugin, "authenticate", None)):
+            if (
+                auth_plugin
+                and isinstance(auth_plugin, Authentication)
+                and callable(getattr(auth_plugin, "authenticate", None))
+            ):
                 try:
                     auth = auth_plugin.authenticate()
                     return auth