Skip to content

Commit 7a889f6

Browse files
siesto1elementosiesto1elemento
authored
Merge pull request #7 from siesto1elemento/my-feature-branch
formatting_changes
2 parents b054a47 + 60a5873 commit 7a889f6

24 files changed

+1056
-1710
lines changed

‎cvat/apps/dataset_manager/formats/aud_common_voice.py‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,66 +4,59 @@
44
# SPDX-License-Identifier: MIT
55

66

7+
8+
9+
710
import os.path as osp
811
from glob import glob
912

1013
from pyunpack import Archive
1114

12-
from cvat.apps.dataset_manager.bindings import (
13-
GetCVATDataExtractor,
14-
import_dm_annotations,
15-
match_dm_item,
16-
find_dataset_root,
17-
)
15+
from cvat.apps.dataset_manager.bindings import (GetCVATDataExtractor,
16+
import_dm_annotations, match_dm_item, find_dataset_root)
1817
from cvat.apps.dataset_manager.util import make_zip_archive
1918
from datumaro.components.extractor import DatasetItem
2019
from datumaro.components.project import Dataset
2120
from datumaro.plugins.yolo_format.extractor import YoloExtractor
2221

2322
from .registry import dm_env, exporter, importer
2423
from cvat.apps.engine.log import ServerLogManager
25-
2624
slogger = ServerLogManager(__name__)
2725

2826

29-
@exporter(name="YOLO", ext="ZIP", version="1.1")
27+
@exporter(name='YOLO', ext='ZIP', version='1.1')
3028
def _export(dst_file, temp_dir, instance_data, save_images=False):
3129
slogger.glob.info("HEYLO YOLO EXPORTER AUDINO")
3230
# slogger.glob.debug()
33-
dataset = Dataset.from_extractors(
34-
GetCVATDataExtractor(instance_data, include_images=save_images), env=dm_env
35-
)
31+
dataset = Dataset.from_extractors(GetCVATDataExtractor(
32+
instance_data, include_images=save_images), env=dm_env)
3633

37-
dataset.export(temp_dir, "yolo", save_images=save_images)
34+
dataset.export(temp_dir, 'yolo', save_images=save_images)
3835

3936
make_zip_archive(temp_dir, dst_file)
4037

41-
42-
@importer(name="YOLO", ext="ZIP", version="1.1")
38+
@importer(name='YOLO', ext='ZIP', version='1.1')
4339
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
4440
Archive(src_file.name).extractall(temp_dir)
4541

4642
image_info = {}
47-
frames = [
48-
YoloExtractor.name_from_path(osp.relpath(p, temp_dir))
49-
for p in glob(osp.join(temp_dir, "**", "*.txt"), recursive=True)
50-
]
43+
frames = [YoloExtractor.name_from_path(osp.relpath(p, temp_dir))
44+
for p in glob(osp.join(temp_dir, '**', '*.txt'), recursive=True)]
5145
root_hint = find_dataset_root(
52-
[DatasetItem(id=frame) for frame in frames], instance_data
53-
)
46+
[DatasetItem(id=frame) for frame in frames], instance_data)
5447
for frame in frames:
5548
frame_info = None
5649
try:
57-
frame_id = match_dm_item(
58-
DatasetItem(id=frame), instance_data, root_hint=root_hint
59-
)
50+
frame_id = match_dm_item(DatasetItem(id=frame), instance_data,
51+
root_hint=root_hint)
6052
frame_info = instance_data.frame_info[frame_id]
61-
except Exception: # nosec
53+
except Exception: # nosec
6254
pass
6355
if frame_info is not None:
64-
image_info[frame] = (frame_info["height"], frame_info["width"])
56+
image_info[frame] = (frame_info['height'], frame_info['width'])
6557

66-
dataset = Dataset.import_from(temp_dir, "yolo", env=dm_env, image_info=image_info)
58+
dataset = Dataset.import_from(temp_dir, 'yolo',
59+
env=dm_env, image_info=image_info)
6760
if load_data_callback is not None:
6861
load_data_callback(dataset, instance_data)
6962
import_dm_annotations(dataset, instance_data)

‎cvat/apps/dataset_manager/formats/camvid.py‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,39 @@
66
from datumaro.components.dataset import Dataset
77
from pyunpack import Archive
88

9-
from cvat.apps.dataset_manager.bindings import (
10-
GetCVATDataExtractor,
11-
import_dm_annotations,
12-
)
9+
from cvat.apps.dataset_manager.bindings import (GetCVATDataExtractor,
10+
import_dm_annotations)
1311
from cvat.apps.dataset_manager.util import make_zip_archive
1412

1513
from .transformations import MaskToPolygonTransformation, RotatedBoxesToPolygons
1614
from .registry import dm_env, exporter, importer
1715
from .utils import make_colormap
1816

1917

20-
@exporter(name="CamVid", ext="ZIP", version="1.0")
18+
@exporter(name='CamVid', ext='ZIP', version='1.0')
2119
def _export(dst_file, temp_dir, instance_data, save_images=False):
2220
with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
2321
dataset = Dataset.from_extractors(extractor, env=dm_env)
2422
dataset.transform(RotatedBoxesToPolygons)
25-
dataset.transform("polygons_to_masks")
26-
dataset.transform("boxes_to_masks")
27-
dataset.transform("merge_instance_segments")
23+
dataset.transform('polygons_to_masks')
24+
dataset.transform('boxes_to_masks')
25+
dataset.transform('merge_instance_segments')
2826
label_map = make_colormap(instance_data)
2927

30-
dataset.export(
31-
temp_dir,
32-
"camvid",
33-
save_images=save_images,
34-
apply_colormap=True,
35-
label_map={label: label_map[label][0] for label in label_map},
36-
)
28+
dataset.export(temp_dir, 'camvid',
29+
save_images=save_images, apply_colormap=True,
30+
label_map={label: label_map[label][0] for label in label_map})
3731

3832
make_zip_archive(temp_dir, dst_file)
3933

40-
41-
@importer(name="CamVid", ext="ZIP", version="1.0")
34+
@importer(name='CamVid', ext='ZIP', version='1.0')
4235
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
4336
Archive(src_file.name).extractall(temp_dir)
4437

4538
# We do not run detect_dataset before import because the Camvid format
4639
# has problem with the dataset detection in case of empty annotation file(s)
4740
# Details in: https://github.com/cvat-ai/datumaro/issues/43
48-
dataset = Dataset.import_from(temp_dir, "camvid", env=dm_env)
41+
dataset = Dataset.import_from(temp_dir, 'camvid', env=dm_env)
4942
dataset = MaskToPolygonTransformation.convert_dataset(dataset, **kwargs)
5043
if load_data_callback is not None:
5144
load_data_callback(dataset, instance_data)

‎cvat/apps/dataset_manager/formats/cityscapes.py‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,42 @@
99
from datumaro.plugins.cityscapes_format import write_label_map
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

1916
from .transformations import MaskToPolygonTransformation, RotatedBoxesToPolygons
2017
from .registry import dm_env, exporter, importer
2118
from .utils import make_colormap
2219

2320

24-
@exporter(name="Cityscapes", ext="ZIP", version="1.0")
21+
@exporter(name='Cityscapes', ext='ZIP', version='1.0')
2522
def _export(dst_file, temp_dir, instance_data, save_images=False):
2623
with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
2724
dataset = Dataset.from_extractors(extractor, env=dm_env)
2825
dataset.transform(RotatedBoxesToPolygons)
29-
dataset.transform("polygons_to_masks")
30-
dataset.transform("boxes_to_masks")
31-
dataset.transform("merge_instance_segments")
26+
dataset.transform('polygons_to_masks')
27+
dataset.transform('boxes_to_masks')
28+
dataset.transform('merge_instance_segments')
3229

33-
dataset.export(
34-
temp_dir,
35-
"cityscapes",
36-
save_images=save_images,
37-
apply_colormap=True,
38-
label_map={
39-
label: info[0] for label, info in make_colormap(instance_data).items()
40-
},
41-
)
30+
dataset.export(temp_dir, 'cityscapes', save_images=save_images,
31+
apply_colormap=True, label_map={label: info[0]
32+
for label, info in make_colormap(instance_data).items()})
4233

4334
make_zip_archive(temp_dir, dst_file)
4435

45-
46-
@importer(name="Cityscapes", ext="ZIP", version="1.0")
36+
@importer(name='Cityscapes', ext='ZIP', version='1.0')
4737
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
4838
Archive(src_file.name).extractall(temp_dir)
4939

50-
labelmap_file = osp.join(temp_dir, "label_colors.txt")
40+
labelmap_file = osp.join(temp_dir, 'label_colors.txt')
5141
if not osp.isfile(labelmap_file):
52-
colormap = {
53-
label: info[0] for label, info in make_colormap(instance_data).items()
54-
}
42+
colormap = {label: info[0]
43+
for label, info in make_colormap(instance_data).items()}
5544
write_label_map(labelmap_file, colormap)
5645

57-
detect_dataset(
58-
temp_dir, format_name="cityscapes", importer=dm_env.importers.get("cityscapes")
59-
)
60-
dataset = Dataset.import_from(temp_dir, "cityscapes", env=dm_env)
46+
detect_dataset(temp_dir, format_name='cityscapes', importer= dm_env.importers.get('cityscapes'))
47+
dataset = Dataset.import_from(temp_dir, 'cityscapes', env=dm_env)
6148
dataset = MaskToPolygonTransformation.convert_dataset(dataset, **kwargs)
6249
if load_data_callback is not None:
6350
load_data_callback(dataset, instance_data)

‎cvat/apps/dataset_manager/formats/coco.py‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,77 +9,64 @@
99
from datumaro.components.annotation import AnnotationType
1010
from datumaro.plugins.coco_format.importer import CocoImporter
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

1916
from .registry import dm_env, exporter, importer
2017

21-
22-
@exporter(name="COCO", ext="ZIP", version="1.0")
18+
@exporter(name='COCO', ext='ZIP', version='1.0')
2319
def _export(dst_file, temp_dir, instance_data, save_images=False):
2420
with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
2521
dataset = Dataset.from_extractors(extractor, env=dm_env)
26-
dataset.export(
27-
temp_dir, "coco_instances", save_images=save_images, merge_images=True
28-
)
22+
dataset.export(temp_dir, 'coco_instances', save_images=save_images,
23+
merge_images=True)
2924

3025
make_zip_archive(temp_dir, dst_file)
3126

32-
33-
@importer(name="COCO", ext="JSON, ZIP", version="1.0")
27+
@importer(name='COCO', ext='JSON, ZIP', version='1.0')
3428
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
3529
if zipfile.is_zipfile(src_file):
3630
zipfile.ZipFile(src_file).extractall(temp_dir)
3731
# We use coco importer because it gives better error message
38-
detect_dataset(temp_dir, format_name="coco", importer=CocoImporter)
39-
dataset = Dataset.import_from(temp_dir, "coco_instances", env=dm_env)
32+
detect_dataset(temp_dir, format_name='coco', importer=CocoImporter)
33+
dataset = Dataset.import_from(temp_dir, 'coco_instances', env=dm_env)
4034
if load_data_callback is not None:
4135
load_data_callback(dataset, instance_data)
4236
import_dm_annotations(dataset, instance_data)
4337
else:
44-
dataset = Dataset.import_from(src_file.name, "coco_instances", env=dm_env)
38+
dataset = Dataset.import_from(src_file.name,
39+
'coco_instances', env=dm_env)
4540
import_dm_annotations(dataset, instance_data)
4641

47-
48-
@exporter(name="COCO Keypoints", ext="ZIP", version="1.0")
42+
@exporter(name='COCO Keypoints', ext='ZIP', version='1.0')
4943
def _export(dst_file, temp_dir, instance_data, save_images=False):
5044
with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
5145
dataset = Dataset.from_extractors(extractor, env=dm_env)
52-
dataset.export(
53-
temp_dir,
54-
"coco_person_keypoints",
55-
save_images=save_images,
56-
merge_images=True,
57-
)
46+
dataset.export(temp_dir, 'coco_person_keypoints', save_images=save_images,
47+
merge_images=True)
5848

5949
make_zip_archive(temp_dir, dst_file)
6050

61-
62-
@importer(name="COCO Keypoints", ext="JSON, ZIP", version="1.0")
51+
@importer(name='COCO Keypoints', ext='JSON, ZIP', version='1.0')
6352
def _import(src_file, temp_dir, instance_data, load_data_callback=None, **kwargs):
6453
def remove_extra_annotations(dataset):
6554
for item in dataset:
66-
annotations = [
67-
ann for ann in item.annotations if ann.type != AnnotationType.bbox
68-
]
55+
annotations = [ann for ann in item.annotations
56+
if ann.type != AnnotationType.bbox]
6957
item.annotations = annotations
7058

7159
if zipfile.is_zipfile(src_file):
7260
zipfile.ZipFile(src_file).extractall(temp_dir)
7361
# We use coco importer because it gives better error message
74-
detect_dataset(temp_dir, format_name="coco", importer=CocoImporter)
75-
dataset = Dataset.import_from(temp_dir, "coco_person_keypoints", env=dm_env)
62+
detect_dataset(temp_dir, format_name='coco', importer=CocoImporter)
63+
dataset = Dataset.import_from(temp_dir, 'coco_person_keypoints', env=dm_env)
7664
remove_extra_annotations(dataset)
7765
if load_data_callback is not None:
7866
load_data_callback(dataset, instance_data)
7967
import_dm_annotations(dataset, instance_data)
8068
else:
81-
dataset = Dataset.import_from(
82-
src_file.name, "coco_person_keypoints", env=dm_env
83-
)
69+
dataset = Dataset.import_from(src_file.name,
70+
'coco_person_keypoints', env=dm_env)
8471
remove_extra_annotations(dataset)
8572
import_dm_annotations(dataset, instance_data)

0 commit comments

Comments
 (0)