Skip to content

Commit 200fb11

Browse files
agyurjinagyurjin
committed
2 parents c273826 + 881cc42 commit 200fb11

File tree

4 files changed

+24
-39
lines changed

4 files changed

+24
-39
lines changed

‎superannotate/db/exports.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
from ..api import API
1515
from ..common import annotation_status_str_to_int
16-
from ..exceptions import (SABaseException, SAExistingExportNameException,
17-
SANonExistingExportNameException)
16+
from ..exceptions import (
17+
SABaseException, SAExistingExportNameException,
18+
SANonExistingExportNameException
19+
)
1820
from .projects import get_project_metadata
1921

2022
logger = logging.getLogger("superannotate-python-sdk")
@@ -141,7 +143,8 @@ def prepare_export(
141143
)
142144
res = response.json()
143145
logger.info(
144-
"Prepared export %s for project %s (ID %s).", res['name'], project["name"], project["id"]
146+
"Prepared export %s for project %s (ID %s).", res['name'],
147+
project["name"], project["id"]
145148
)
146149
return res["name"]
147150

@@ -181,7 +184,7 @@ def __upload_files_to_aws_thread(
181184
file = filepaths[i]
182185
try:
183186
relative_filename = file.relative_to(tmpdirname)
184-
s3_key = f'{folder_path}/{relative_filename}'
187+
s3_key = f'{folder_path}/{relative_filename.as_posix()}'
185188
to_s3.upload_file(str(file), s3_key)
186189
except Exception as e:
187190
logger.warning("Unable to upload to data server %s", e)
@@ -245,7 +248,7 @@ def download_export(
245248
f.extractall(tmpdirname)
246249
Path.unlink(filepath)
247250
files_to_upload = []
248-
for file in Path(tmpdirname).rglob("*"):
251+
for file in Path(tmpdirname).rglob("*.*"):
249252
if not file.is_file():
250253
continue
251254
files_to_upload.append(file)

‎tests/test_cli.py‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ def test_cli_image_upload_project_export(tmpdir):
1717
for pr in projects_found:
1818
sa.delete_project(pr)
1919
subprocess.run(
20-
[
21-
f'superannotate create-project --name "{PROJECT_NAME}" --description gg --type Vector '
22-
],
20+
f'superannotate create-project --name "{PROJECT_NAME}" --description gg --type Vector',
2321
check=True,
2422
shell=True
2523
)
@@ -28,18 +26,16 @@ def test_cli_image_upload_project_export(tmpdir):
2826
PROJECT_NAME, "./tests/sample_recursive_test/classes/classes.json"
2927
)
3028
subprocess.run(
31-
[
32-
f'superannotate upload-images --project "{PROJECT_NAME}" --folder ./tests/sample_recursive_test --extensions=jpg --set-annotation-status QualityCheck'
33-
],
29+
f'superannotate upload-images --project "{PROJECT_NAME}" --folder ./tests/sample_recursive_test --extensions=jpg --set-annotation-status QualityCheck'
30+
,
3431
check=True,
3532
shell=True
3633
)
3734
time.sleep(1)
3835
assert len(sa.search_images(project)) == 1
3936
subprocess.run(
40-
[
41-
f'superannotate upload-images --project "{PROJECT_NAME}" --folder ./tests/sample_recursive_test --extensions=jpg --recursive'
42-
],
37+
f'superannotate upload-images --project "{PROJECT_NAME}" --folder ./tests/sample_recursive_test --extensions=jpg --recursive'
38+
,
4339
check=True,
4440
shell=True
4541
)
@@ -50,9 +46,8 @@ def test_cli_image_upload_project_export(tmpdir):
5046
project, "./tests/sample_recursive_test"
5147
)
5248
subprocess.run(
53-
[
54-
f'superannotate export-project --project "{PROJECT_NAME}" --folder {tmpdir}'
55-
],
49+
f'superannotate export-project --project "{PROJECT_NAME}" --folder {tmpdir}'
50+
,
5651
check=True,
5752
shell=True
5853
)
@@ -63,9 +58,8 @@ def test_cli_image_upload_project_export(tmpdir):
6358
time.sleep(60)
6459

6560
subprocess.run(
66-
[
67-
f'superannotate export-project --project "{PROJECT_NAME}" --folder {tmpdir} --include-fuse'
68-
],
61+
f'superannotate export-project --project "{PROJECT_NAME}" --folder {tmpdir} --include-fuse'
62+
,
6963
check=True,
7064
shell=True
7165
)

‎tests/test_preannotation_upload_cli.py‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ def test_preannotation_folder_upload_download_cli(
3434
project, from_folder / "classes" / "classes.json"
3535
)
3636
subprocess.run(
37-
[
38-
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}"'
39-
],
37+
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}"',
4038
check=True,
4139
shell=True
4240
)
@@ -72,9 +70,7 @@ def test_annotation_folder_upload_download_cli_vector_COCO(tmpdir):
7270
# project, from_folder / "classes" / "classes.json"
7371
# )
7472
subprocess.run(
75-
[
76-
f'superannotate upload-annotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}'
77-
],
73+
f'superannotate upload-annotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}',
7874
check=True,
7975
shell=True
8076
)
@@ -110,9 +106,7 @@ def test_preannotation_folder_upload_download_cli_vector_COCO(tmpdir):
110106
# project, from_folder / "classes" / "classes.json"
111107
# )
112108
subprocess.run(
113-
[
114-
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}'
115-
],
109+
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}',
116110
check=True,
117111
shell=True
118112
)
@@ -148,9 +142,7 @@ def test_preannotation_folder_upload_download_cli_vector_object_COCO(tmpdir):
148142
# project, from_folder / "classes" / "classes.json"
149143
# )
150144
subprocess.run(
151-
[
152-
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}'
153-
],
145+
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}',
154146
check=True,
155147
shell=True
156148
)
@@ -176,9 +168,7 @@ def test_preannotation_folder_upload_download_cli_pixel_object_COCO(tmpdir):
176168
# project, from_folder / "classes" / "classes.json"
177169
# )
178170
subprocess.run(
179-
[
180-
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}'
181-
],
171+
f'superannotate upload-preannotations --project "{name}" --folder "{from_folder}" --format COCO --task {task} --dataset-name {dataset_name}',
182172
check=True,
183173
shell=True
184174
)

‎tests/test_video.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ def test_image_quality_setting1(tmpdir):
2828
for project in projects:
2929
sa.delete_project(project)
3030

31-
project2 = sa.create_project(PROJECT_NAME2, "test", "Vector")
31+
sa.create_project(PROJECT_NAME2, "test", "Vector")
3232

3333
subprocess.run(
34-
[
35-
f'superannotate upload-videos --project "{PROJECT_NAME2}" --folder ./tests/sample_videos --target-fps 2'
36-
],
34+
f'superannotate upload-videos --project "{PROJECT_NAME2}" --folder ./tests/sample_videos --target-fps 2',
3735
check=True,
3836
shell=True
3937
)

0 commit comments

Comments
 (0)