fixed annotation files reading in the json and folder annotation types

cvdatasets/annotation/base.py

@@ -169,6 +169,7 @@ class BaseAnnotations(abc.ABC):
 
 	@abc.abstractmethod
 	def read_annotation_files(self) -> AnnotationFiles:
+		logging.debug("Creating default AnnotationFiles object")
 		return AnnotationFiles(root=self.root, load_strict=self.load_strict)
 
 	@abc.abstractmethod

cvdatasets/annotation/mixins/bbox_mixin.py

@@ -2,6 +2,8 @@ import abc
 import logging
 import numpy as np
 
+from cvdatasets.annotation.files import AnnotationFiles
+
 class BBoxMixin(abc.ABC):
 
 	dtype = np.dtype([
@@ -11,27 +13,28 @@ class BBoxMixin(abc.ABC):
 		("h", np.int32),
 	])
 
-	def read_annotation_files(self):
+	def read_annotation_files(self) -> AnnotationFiles:
 		files = super(BBoxMixin, self).read_annotation_files()
+		logging.debug("Adding bounding box annotation files")
 		files.load_files(
 			bounding_boxes=("bounding_boxes.txt", True),
 		)
 		return files
 
 	@property
-	def has_bounding_boxes(self):
+	def has_bounding_boxes(self) -> bool:
 		return self.files.bounding_boxes is not None
 
-	def parse_annotations(self):
+	def parse_annotations(self) -> None:
 		super(BBoxMixin, self).parse_annotations()
 
 		if self.has_bounding_boxes:
 			self._parse_bounding_boxes()
 
-	def _parse_bounding_boxes(self):
+	def _parse_bounding_boxes(self) -> None:
 		logging.debug("Parsing bounding box annotations")
 		assert self.has_bounding_boxes, \
-			"Bouding boxes were not loaded!"
+			"Bounding boxes were not loaded!"
 
 		uuid_to_bbox = {}
 		for content in [i.split() for i in self.files.bounding_boxes]:
@@ -42,7 +45,7 @@ class BBoxMixin(abc.ABC):
 			[tuple(uuid_to_bbox[uuid]) for uuid in self.uuids],
 			dtype=self.dtype)
 
-	def bounding_box(self, uuid):
+	def bounding_box(self, uuid) -> np.ndarray:
 		if self.has_bounding_boxes:
 			return self.bounding_boxes[self.uuid_to_idx[uuid]].copy()
 

cvdatasets/annotation/mixins/parts_mixin.py

@@ -1,10 +1,13 @@
 import abc
-import logging
 import copy
+import logging
 import numpy as np
 
 from collections import OrderedDict
 from collections import defaultdict
+from typing import Union
+
+from cvdatasets.annotation.files import AnnotationFiles
 from cvdatasets.utils.decorators import only_with_info
 
 class PartsMixin(abc.ABC):
@@ -25,18 +28,19 @@ class PartsMixin(abc.ABC):
 
 		super(PartsMixin, self).__init__(*args, **kwargs)
 
-	def read_annotation_files(self):
-
+	def read_annotation_files(self) -> AnnotationFiles:
 		files = super(PartsMixin, self).read_annotation_files()
+		logging.debug("Adding part annotation files")
 		files.load_files(
 			part_locs=("parts/part_locs.txt", True),
 			part_names=("parts/parts.txt", True),
 		)
+
 		return files
 
 	@property
 	@only_with_info
-	def dataset_info(self):
+	def dataset_info(self) -> dict:
 		ds_info = super(PartsMixin, self).dataset_info
 		if self.part_type is not None:
 			parts_key = f"{self.dataset_key}_{self.part_type}"
@@ -50,7 +54,7 @@ class PartsMixin(abc.ABC):
 
 		return ds_info
 
-	def check_dataset_kwargs(self, subset, **kwargs):
+	def check_dataset_kwargs(self, subset, **kwargs) -> dict:
 		if self.dataset_info is None:
 			return kwargs
 
@@ -64,20 +68,20 @@ class PartsMixin(abc.ABC):
 		return super(PartsMixin, self).check_dataset_kwargs(subset, **new_kwargs)
 
 	@property
-	def has_parts(self):
+	def has_parts(self) -> bool:
 		return self.files.part_locs is not None
 
 	@property
-	def has_part_names(self):
+	def has_part_names(self) -> bool:
 		return self.files.part_names is not None
 
-	def parse_annotations(self):
+	def parse_annotations(self) -> None:
 		super(PartsMixin, self).parse_annotations()
 
 		if self.has_parts:
 			self._parse_parts()
 
-	def _parse_parts(self):
+	def _parse_parts(self) -> None:
 		logging.debug("Parsing part annotations")
 		assert self.has_parts, \
 			"Part locations were not loaded!"
@@ -96,7 +100,7 @@ class PartsMixin(abc.ABC):
 		if self.has_part_names:
 			self._parse_part_names()
 
-	def _parse_part_names(self):
+	def _parse_part_names(self) -> None:
 		self.part_names.clear()
 		self.part_name_list.clear()
 
@@ -105,7 +109,7 @@ class PartsMixin(abc.ABC):
 			self.part_names[int(part_idx)] = name
 			self.part_name_list.append(name)
 
-	def parts(self, uuid):
+	def parts(self, uuid) -> Union[np.ndarray, None]:
 		if self.has_parts:
 			return self.part_locs[self.uuid_to_idx[uuid]].copy()
 

cvdatasets/annotation/types/file_list.py

@@ -13,6 +13,7 @@ class FileListAnnotations(Annotations):
 	def _parse_uuids(self) -> None:
 		assert self.files.images is not None, \
 			"Images were not loaded!"
+
 		uuid_fnames = [i.split() for i in self.files.images]
 		self.uuids, self.image_names = map(np.array, zip(*uuid_fnames))
 		self.uuid_to_idx = {uuid: i for i, uuid in enumerate(self.uuids)}
@@ -20,14 +21,17 @@ class FileListAnnotations(Annotations):
 	def _parse_labels(self) -> None:
 		assert self.files.labels is not None, \
 			"Labels were not loaded!"
+
 		labs = list(map(int, self.files.labels))
 		self.labels = np.array(labs, dtype=np.int32)
 
 	def _parse_split(self) -> None:
 		assert self.files.tr_ID is not None, \
 			"Train-test split was not loaded!"
+
 		assert hasattr(self, "uuids"), \
 			"UUIDs were not parsed yet! Please call _parse_uuids before this method!"
+
 		uuid_to_split = {uuid: int(split) for uuid, split in zip(self.uuids, self.files.tr_ID)}
 		self.train_split = np.array([uuid_to_split[uuid] for uuid in self.uuids], dtype=bool)
 		self.test_split = np.logical_not(self.train_split)

cvdatasets/annotation/types/folder_annotations.py

@@ -6,13 +6,13 @@ from cvdatasets.annotation.files import AnnotationFiles
 class FolderAnnotations(Annotations):
 
 	def read_annotation_files(self) -> AnnotationFiles:
-		return AnnotationFiles(
+		files = super(FileListAnnotations, self).read_annotation_files()
+		files.load_files(
 			train_images="ILSVRC2012_img_train",
 			val_images="ILSVRC2012_img_val",
 			test_images=("ILSVRC2012_img_test", True),
-			root=self.root,
-			load_strict=True,
 		)
+		return files
 
 	@property
 	def _has_test_set(self) -> bool:

cvdatasets/annotation/types/json_annotations.py

@@ -15,12 +15,12 @@ def _uuid_entry(im_info):
 class JSONAnnotations(Annotations):
 
 	def read_annotation_files(self) -> AnnotationFiles:
-		return AnnotationFiles(
+		files = super(JSONAnnotations, self).read_annotation_files()
+		files.load_files(
 			"trainval.json", "val.json",
 			("unlabeled_train.json", True),
-			root=self.root,
-			load_strict=True,
 		)
+		return files
 
 	@property
 	def has_unlabeled_data(self) -> bool: