Skip to content

Commit

Permalink
sync with upstream - renaming some files, moving some classes (#76)
Browse files Browse the repository at this point in the history
* moving ItemStatus, DatasetItemStorage, DatasetItemStorageDatasetView to components/dataset_item_storage.py

* moving DatasetPatch, DatasetStorage to components/dataset_storage.py

* moving DEFAULT_SUBSET to util/definitions.py

* renaming components/dataset_filter.py to components/filter.py

* moving components/hl_ops.py to components/hl_ops/__init__.py

* renaming components/dataset_generator.py to components/generator.py

* moving Importer to components/importer.py

* moving Transform, ItemTransform to components/transformer.py
  • Loading branch information
Eldies authored Jan 8, 2025
1 parent a77ed48 commit 7b38829
Show file tree
Hide file tree
Showing 81 changed files with 963 additions and 877 deletions.
18 changes: 6 additions & 12 deletions src/datumaro/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,17 @@
Skeleton,
)
from .components.cli_plugin import CliPlugin
from .components.dataset import (
Dataset,
DatasetPatch,
DatasetSubset,
IDataset,
ItemStatus,
eager_mode,
)
from .components.dataset import Dataset, DatasetSubset, IDataset, eager_mode
from .components.dataset_base import (
DEFAULT_SUBSET_NAME,
CategoriesInfo,
DatasetBase,
DatasetItem,
FailingImportErrorPolicy,
Importer,
ImportErrorPolicy,
ItemTransform,
SubsetBase,
Transform,
)
from .components.dataset_item_storage import ItemStatus
from .components.dataset_storage import DatasetPatch
from .components.environment import Environment, PluginRegistry
from .components.exporter import Exporter, ExportErrorPolicy, FailingExportErrorPolicy
from .components.hl_ops import ( # pylint: disable=redefined-builtin
Expand All @@ -62,9 +53,12 @@
transform,
validate,
)
from .components.importer import Importer
from .components.launcher import Launcher, ModelTransform
from .components.media import ByteImage, Image, MediaElement, PointCloud, Video, VideoFrame
from .components.media_manager import MediaManager
from .components.progress_reporting import NullProgressReporter, ProgressReporter
from .components.transformer import ItemTransform, Transform
from .components.validator import Validator
from .util.definitions import DEFAULT_SUBSET_NAME
from .version import VERSION
2 changes: 1 addition & 1 deletion src/datumaro/cli/contexts/project/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import os.path as osp
from enum import Enum

from datumaro.components.dataset_filter import DatasetItemEncoder
from datumaro.components.environment import Environment
from datumaro.components.errors import MigrationError, ProjectNotFoundError
from datumaro.components.filter import DatasetItemEncoder
from datumaro.components.operations import compute_ann_statistics, compute_image_statistics
from datumaro.components.project import Project, ProjectBuildTargets
from datumaro.components.validator import TaskType
Expand Down
4 changes: 3 additions & 1 deletion src/datumaro/components/cli_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
def plugin_types() -> List[Type["CliPlugin"]]:
global _plugin_types
if _plugin_types is None:
from datumaro.components.dataset_base import DatasetBase, Importer, Transform
from datumaro.components.dataset_base import DatasetBase
from datumaro.components.exporter import Exporter
from datumaro.components.importer import Importer
from datumaro.components.launcher import Launcher
from datumaro.components.transformer import Transform
from datumaro.components.validator import Validator

_plugin_types = [Launcher, DatasetBase, Transform, Importer, Exporter, Validator]
Expand Down
Loading

0 comments on commit 7b38829

Please sign in to comment.