Skip to content

Commit cc4ce27

Browse files
Merge pull request #8 from siesto1elemento/my-feature-branch
formatting changes
2 parents 7a889f6 + cc02cd3 commit cc4ce27

File tree

2 files changed

+228
-420
lines changed

2 files changed

+228
-420
lines changed

cvat/apps/dataset_manager/formats/datumaro.py

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,76 +9,62 @@
99

1010
from pyunpack import Archive
1111

12-
from cvat.apps.dataset_manager.bindings import (
13-
GetCVATDataExtractor,
14-
detect_dataset,
15-
import_dm_annotations,
16-
)
12+
from cvat.apps.dataset_manager.bindings import (GetCVATDataExtractor, detect_dataset,
13+
import_dm_annotations)
1714
from cvat.apps.dataset_manager.util import make_zip_archive
1815
from cvat.apps.engine.models import DimensionType
1916

2017
from .registry import dm_env, exporter, importer
2118

22-
2319
class DeleteImagePath(ItemTransform):
2420
def transform_item(self, item):
2521
image = None
2622
if item.has_image and item.image.has_data:
2723
image = Image(data=item.image.data, size=item.image.size)
28-
return item.wrap(image=image, point_cloud="", related_images=[])
24+
return item.wrap(image=image, point_cloud='', related_images=[])
2925

3026

3127
@exporter(name="Datumaro", ext="ZIP", version="1.0")
3228
def _export(dst_file, temp_dir, instance_data, save_images=False):
33-
with GetCVATDataExtractor(
34-
instance_data=instance_data, include_images=save_images
35-
) as extractor:
29+
with GetCVATDataExtractor(instance_data=instance_data, include_images=save_images) as extractor:
3630
dataset = Dataset.from_extractors(extractor, env=dm_env)
3731
if not save_images:
3832
dataset.transform(DeleteImagePath)
39-
dataset.export(temp_dir, "datumaro", save_images=save_images)
33+
dataset.export(temp_dir, 'datumaro', save_images=save_images)
4034

4135
make_zip_archive(temp_dir, dst_file)
4236

43-
4437
@importer(name="Datumaro", ext="ZIP", version="1.0")
4538
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
4639
Archive(src_file.name).extractall(temp_dir)
4740

48-
detect_dataset(
49-
temp_dir, format_name="datumaro", importer=dm_env.importers.get("datumaro")
50-
)
51-
dataset = Dataset.import_from(temp_dir, "datumaro", env=dm_env)
41+
detect_dataset(temp_dir, format_name='datumaro', importer=dm_env.importers.get('datumaro'))
42+
dataset = Dataset.import_from(temp_dir, 'datumaro', env=dm_env)
5243

5344
if load_data_callback is not None:
5445
load_data_callback(dataset, instance_data)
5546
import_dm_annotations(dataset, instance_data)
5647

57-
5848
@exporter(name="Datumaro 3D", ext="ZIP", version="1.0", dimension=DimensionType.DIM_3D)
5949
def _export(dst_file, temp_dir, instance_data, save_images=False):
6050
with GetCVATDataExtractor(
61-
instance_data=instance_data,
62-
include_images=save_images,
51+
instance_data=instance_data, include_images=save_images,
6352
dimension=DimensionType.DIM_3D,
6453
) as extractor:
6554
dataset = Dataset.from_extractors(extractor, env=dm_env)
6655

6756
if not save_images:
6857
dataset.transform(DeleteImagePath)
69-
dataset.export(temp_dir, "datumaro", save_images=save_images)
58+
dataset.export(temp_dir, 'datumaro', save_images=save_images)
7059

7160
make_zip_archive(temp_dir, dst_file)
7261

73-
7462
@importer(name="Datumaro 3D", ext="ZIP", version="1.0", dimension=DimensionType.DIM_3D)
7563
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
7664
Archive(src_file.name).extractall(temp_dir)
7765

78-
detect_dataset(
79-
temp_dir, format_name="datumaro", importer=dm_env.importers.get("datumaro")
80-
)
81-
dataset = Dataset.import_from(temp_dir, "datumaro", env=dm_env)
66+
detect_dataset(temp_dir, format_name='datumaro', importer=dm_env.importers.get('datumaro'))
67+
dataset = Dataset.import_from(temp_dir, 'datumaro', env=dm_env)
8268

8369
if load_data_callback is not None:
8470
load_data_callback(dataset, instance_data)

0 commit comments

Comments
 (0)