removed patching

Author: klakhov

datumaro/components/environment.py

@@ -12,7 +12,6 @@
 
 from datumaro.components.cli_plugin import CliPlugin, plugin_types
 from datumaro.components.format_detection import RejectionReason, detect_dataset_format
-from datumaro.components.wrappers import wrap_importer
 from datumaro.util.os_util import import_foreign_module, split_path
 
 T = TypeVar("T")
@@ -227,10 +226,6 @@ def _register_plugins(self, plugins):
         self.transforms.batch_register(plugins)
         self.validators.batch_register(plugins)
 
-        for key in self.importers:
-            importer = self.importers.get(key)
-            wrap_importer(importer)
-
     def make_extractor(self, name, *args, **kwargs):
         return self.extractors.get(name)(*args, **kwargs)
 

datumaro/components/extractor.py

@@ -415,6 +415,17 @@ def get(self, id, subset=None):
 
 
 class Importer(CliPlugin):
+    def __init__(self):
+        self.__not_found_error_data = {"ext": "", "filename": ""}
+
+    @property
+    def _not_found_error_data(self):
+        return self.__not_found_error_data
+
+    @_not_found_error_data.setter
+    def _not_found_error_data_setter(self, val):
+        self.__not_found_error_data = val
+
     @classmethod
     def detect(
         cls,
@@ -433,17 +444,17 @@ def find_sources(cls, path) -> List[Dict]:
     def find_sources_with_params(cls, path, **extra_params) -> List[Dict]:
         return cls.find_sources(path)
 
-    @classmethod
-    def _generate_not_found_error(self, path):
-        return DatasetNotFoundError(path)
-
     def __call__(self, path, **extra_params):
         if not path or not osp.exists(path):
             raise DatasetNotFoundError(path)
 
         found_sources = self.find_sources_with_params(osp.normpath(path), **extra_params)
         if not found_sources:
-            raise self._generate_not_found_error(path)
+            raise DatasetNotFoundError(
+                path,
+                self._not_found_error_data.get("ext", ""),
+                self._not_found_error_data.get("filename", ""),
+            )
 
         sources = []
         for desc in found_sources:
@@ -508,6 +519,10 @@ def _find_sources_recursive(
                 )
                 if sources:
                     break
+
+        if not sources:
+            cls._not_found_error_data = {"ext": ext, "filename": filename}
+
         return sources