From b2fd3aaa947372922cc26b331c2cfffe61527f66 Mon Sep 17 00:00:00 2001 From: GoldenAnpu Date: Wed, 4 Dec 2024 21:21:31 +0100 Subject: [PATCH] Rollback v3.2.0->3.1.6 --- config.json | 54 ++++++++++++++++++++++++-------------------- dev_requirements.txt | 2 +- src/main.py | 13 ++--------- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/config.json b/config.json index 0ba9c40..35a9a19 100644 --- a/config.json +++ b/config.json @@ -1,25 +1,31 @@ { - "name": "Export to Supervisely format", - "type": "app", - "version": "2.0.0", - "categories": ["images", "export"], - "description": "images and JSON annotations", - "docker_image": "supervisely/import-export:6.73.248", - "instance_version": "6.12.12", - "main_script": "src/main.py", - "modal_template": "src/modal.html", - "modal_template_state": { - "download": "all", - "fixExtension": false - }, - "task_location": "workspace_tasks", - "isolate": true, - "headless": true, - "icon": "https://i.imgur.com/1hqGMyg.png", - "icon_background": "#FFFFFF", - "context_menu": { - "target": ["images_project", "images_dataset"], - "context_root": "Download as" - }, - "poster": "https://user-images.githubusercontent.com/106374579/186665737-ec3da9cc-193f-43ee-85db-a6f802b2dfe4.png" -} + "name": "Export to Supervisely format", + "type": "app", + "version": "2.0.0", + "categories": [ + "images", + "export" + ], + "description": "images and JSON annotations", + "docker_image": "supervisely/import-export:6.73.162", + "instance_version": "6.11.8", + "main_script": "src/main.py", + "modal_template": "src/modal.html", + "modal_template_state": { + "download": "all", + "fixExtension": false + }, + "task_location": "workspace_tasks", + "isolate": true, + "headless": true, + "icon": "https://i.imgur.com/1hqGMyg.png", + "icon_background": "#FFFFFF", + "context_menu": { + "target": [ + "images_project", + "images_dataset" + ], + "context_root": "Download as" + }, + "poster": "https://user-images.githubusercontent.com/106374579/186665737-ec3da9cc-193f-43ee-85db-a6f802b2dfe4.png" +} \ No newline at end of file diff --git a/dev_requirements.txt b/dev_requirements.txt index 8fb9dfa..5d6a7a6 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1 +1 @@ -supervisely==6.73.248 \ No newline at end of file +supervisely==6.73.162 \ No newline at end of file diff --git a/src/main.py b/src/main.py index fab5b64..f156729 100644 --- a/src/main.py +++ b/src/main.py @@ -1,4 +1,3 @@ -import asyncio import os from distutils import util @@ -122,24 +121,16 @@ def download(project: sly.Project) -> str: sly.logger.info(f"Starting download of project {project.name} to {download_dir}...") - loop = sly.fs.get_or_create_event_loop() - coro = sly.Project.download_async( + sly.Project.download( api, project_id, dest_dir=download_dir, dataset_ids=dataset_ids, log_progress=True, + batch_size=batch_size, save_image_meta=True, save_images=save_images, ) - if loop.is_running(): - sly.logger.debug("Loop is already running, using run_coroutine_threadsafe") - future = asyncio.run_coroutine_threadsafe(coro, loop) - future.result() - else: - sly.logger.debug("Loop is not running, using run_until_complete") - loop.run_until_complete(coro) - meta_path = os.path.join(download_dir, "meta.json") meta = sly.ProjectMeta.from_json(sly.json.load_json_file(meta_path)) if any(obj_cls.geometry_type == sly.Cuboid2d for obj_cls in meta.obj_classes):