SDK layer 2 - cover RC1 usecases #4813
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ | |
| # B406 : import_xml_sax | ||
| # B410 : import_lxml | ||
| skips: B101,B102,B320,B404,B406,B410 | ||
| exclude: **/tests/**,tests | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| # Copyright (C) 2022 CVAT.ai Corporation | ||
| # | ||
| # SPDX-License-Identifier: MIT | ||
|
|
@@ -11,7 +10,7 @@ | |
| import tqdm | ||
| from cvat_sdk import Client, models | ||
| from cvat_sdk.core.helpers import TqdmProgressReporter | ||
| from cvat_sdk.core.proxies.tasks import ResourceType | ||
|
|
||
|
|
||
| class CLI: | ||
|
|
@@ -26,7 +25,7 @@ def __init__(self, client: Client, credentials: Tuple[str, str]): | |
|
|
||
| def tasks_list(self, *, use_json_output: bool = False, **kwargs): | ||
| """List all tasks in either basic or JSON format.""" | ||
| results = self.client.tasks.list(return_json=use_json_output, **kwargs) | ||
| if use_json_output: | ||
| print(json.dumps(json.loads(results), indent=2)) | ||
| else: | ||
|
|
@@ -50,7 +49,7 @@ def tasks_create( | |
| """ | ||
| Create a new task with the given name and labels JSON and add the files to it. | ||
| """ | ||
| task = self.client.tasks.create_from_data( | ||
| spec=models.TaskWriteRequest(name=name, labels=labels, **kwargs), | ||
| resource_type=resource_type, | ||
| resources=resources, | ||
|
|
@@ -66,7 +65,7 @@ def tasks_create( | |
|
|
||
| def tasks_delete(self, task_ids: Sequence[int]) -> None: | ||
| """Delete a list of tasks, ignoring those which don't exist.""" | ||
| self.client.tasks.remove_by_ids(task_ids=task_ids) | ||
|
There was a problem hiding this comment. @zhiltsov-max , I don't know all use cases, but probably tasks.delete(task_ids) is better. First argument can be array of ids or array of tasks. What do you think? There was a problem hiding this comment. Its almost just a copy-paste from what CLI had. I can't say I prefer one way over another. Both work well and both are convertible to each other. I can say that your variant is more focused on manual typing, while the other is better for passing a container without the need of unpacking. I'm not sure if |
||
|
|
||
| def tasks_frames( | ||
| self, | ||
|
|
@@ -80,11 +79,11 @@ def tasks_frames( | |
| Download the requested frame numbers for a task and save images as | ||
| task_<ID>_frame_<FRAME>.jpg. | ||
| """ | ||
| self.client.tasks.retrieve(obj_id=task_id).download_frames( | ||
|
There was a problem hiding this comment. I don't know if it is possible or not, but it will be great if the first argument is ID. Thus we can just write tasks.retrieve(task_id). There was a problem hiding this comment. I don't think I got the question. It is ID. Did you mean rename id to |
||
| frame_ids=frame_ids, | ||
| outdir=outdir, | ||
| quality=quality, | ||
| filename_pattern=f"task_{task_id}" + "_frame_{frame_id:06d}{frame_ext}", | ||
| ) | ||
|
|
||
| def tasks_dump( | ||
|
|
@@ -99,7 +98,7 @@ def tasks_dump( | |
| """ | ||
| Download annotations for a task in the specified format (e.g. 'YOLO ZIP 1.0'). | ||
| """ | ||
| self.client.tasks.retrieve(obj_id=task_id).export_dataset( | ||
| format_name=fileformat, | ||
| filename=filename, | ||
| pbar=self._make_pbar(), | ||
|
|
@@ -112,7 +111,7 @@ def tasks_upload( | |
| ) -> None: | ||
| """Upload annotations for a task in the specified format | ||
| (e.g. 'YOLO ZIP 1.0').""" | ||
| self.client.tasks.retrieve(obj_id=task_id).import_annotations( | ||
| format_name=fileformat, | ||
| filename=filename, | ||
| status_check_period=status_check_period, | ||
|
|
@@ -121,13 +120,13 @@ def tasks_upload( | |
|
|
||
| def tasks_export(self, task_id: str, filename: str, *, status_check_period: int = 2) -> None: | ||
| """Download a task backup""" | ||
| self.client.tasks.retrieve(obj_id=task_id).download_backup( | ||
| filename=filename, status_check_period=status_check_period, pbar=self._make_pbar() | ||
| ) | ||
|
|
||
| def tasks_import(self, filename: str, *, status_check_period: int = 2) -> None: | ||
| """Import a task from a backup file""" | ||
| self.client.tasks.create_from_backup( | ||
| filename=filename, status_check_period=status_check_period, pbar=self._make_pbar() | ||
| ) | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zhiltsov-max , I'm not sure why we have the line in the PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure either. Probably, we need to review changelog links.