Merge pull request #29 from noprompt/refactor-follow-up

Refactor follow up

data/data_loader.py

@@ -166,7 +166,7 @@ class DataLoaderMultiAspect():
 
             print (f" * DLMA: {len(items)} images loaded from {len(image_paths)} files")
             
-            self.prepared_train_data = items
+            self.prepared_train_data = [item for item in items if item.error is None]
             random.Random(self.seed).shuffle(self.prepared_train_data)
             self.__report_errors(items)
     

data/image_train_item.py

@@ -351,6 +351,7 @@ class ImageTrainItem:
         return self
     
     def __compute_target_width_height(self):
+        self.target_wh = None
         try:
             with Image.open(self.pathname) as image:
                 width, height = image.size

data/resolver.py

@@ -191,16 +191,12 @@ def resolve_root(path: str, aspects: list[float], flip_p: float = 0.0, seed=555)
     :param flip_p: The probability of flipping the image
     """
     if os.path.isfile(path) and path.endswith('.json'):
-        resolver = JSONResolver(aspects, flip_p, seed)
+        return JSONResolver(aspects, flip_p, seed).image_train_items(path)
     
     if os.path.isdir(path):
-        resolver = DirectoryResolver(aspects, flip_p, seed)
+        return DirectoryResolver(aspects, flip_p, seed).image_train_items(path)
         
-    if not resolver:
-        raise ValueError(f"data_root '{path}' is not a valid directory or JSON file.")
-
-    items = resolver.image_train_items(path)
-    return items
+    raise ValueError(f"data_root '{path}' is not a valid directory or JSON file.")
 
 def resolve(value: typing.Union[dict, str], aspects: list[float], flip_p: float=0.0, seed=555) -> list[ImageTrainItem]:
     """