modified imports

cvdatasets/__init__.py

@@ -1,10 +1,29 @@
+from cvdatasets.annotation.base import Annotations
+from cvdatasets.annotation.base import BaseAnnotations
+from cvdatasets.annotation.files import AnnotationFiles
+from cvdatasets.annotation.mixins.bbox_mixin import BBoxMixin
+from cvdatasets.annotation.mixins.features_mixin import FeaturesMixin
+from cvdatasets.annotation.mixins.parts_mixin import PartsMixin
+from cvdatasets.annotation.types import AnnotationType
+from cvdatasets.annotation.types.file_list import FileListAnnotations
+from cvdatasets.annotation.types.folder_annotations import FolderAnnotations
+from cvdatasets.annotation.types.json_annotations import JSONAnnotations
 from cvdatasets.dataset import Dataset
 from cvdatasets.dataset import ImageWrapperDataset
-
-from cvdatasets.annotation import BaseAnnotations
-from cvdatasets.annotation.types import FileListAnnotations
-from cvdatasets.annotation.types import FolderAnnotations
-from cvdatasets.annotation.types import JSONAnnotations
-
 from cvdatasets.utils import _MetaInfo
 
+__all__ = [
+	"_MetaInfo",
+	"Annotations",
+	"AnnotationFiles",
+	"AnnotationType",
+	"BaseAnnotations",
+	"BBoxMixin",
+	"Dataset",
+	"FileListAnnotations",
+	"FolderAnnotations",
+	"FolderAnnotations",
+	"ImageWrapperDataset",
+	"JSONAnnotations",
+	"PartsMixin",
+]

cvdatasets/annotation/__init__.py

@@ -1,38 +0,0 @@
-from cvdatasets.annotation.base import BaseAnnotations
-from cvdatasets.annotation.mixins.bbox_mixin import BBoxMixin
-from cvdatasets.annotation.mixins.parts_mixin import PartsMixin
-from cvdatasets.annotation.types import AnnotationType
-
-# from cvdatasets.annotation.types.birdsnap import BSNAP_Annotations
-# from cvdatasets.annotation.types.cars import CARS_Annotations
-# from cvdatasets.annotation.types.cub import CUB_Annotations
-# from cvdatasets.annotation.types.dogs import DOGS_Annotations
-# from cvdatasets.annotation.types.flowers import FLOWERS_Annotations
-# from cvdatasets.annotation.types.hed import HED_Annotations
-# from cvdatasets.annotation.types.imagenet import INET_Annotations
-# from cvdatasets.annotation.types.inat import INAT18_Annotations
-# from cvdatasets.annotation.types.inat import INAT19_Annotations
-# from cvdatasets.annotation.types.inat import INAT20_Annotations
-# from cvdatasets.annotation.types.nab import NAB_Annotations
-# from cvdatasets.annotation.types.tigers import TIGERS_Annotations
-
-
-
-__all__ = [
-	"AnnotationType",
-	"BaseAnnotations",
-	"BBoxMixin",
-	# "BSNAP_Annotations",
-	# "CARS_Annotations",
-	# "CUB_Annotations",
-	# "DOGS_Annotations",
-	# "FLOWERS_Annotations",
-	# "HED_Annotations",
-	# "INAT18_Annotations",
-	# "INAT19_Annotations",
-	# "INAT20_Annotations",
-	# "INET_Annotations",
-	# "NAB_Annotations",
-	"PartsMixin",
-	# "TIGERS_Annotations",
-]