タスク作成処理をinitiateTasksGenerationAPIからputTaskAPIを使うように変更しました。
#98
Conversation
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
yuji38kwmt
commented
Jul 18, 2022
Comment on lines
-33
to
-50
| def create_tasks_by_csv(self, csv_path: Path) -> TaskGenerateResponse: | ||
| client = self._client | ||
| project_id = self._project_id | ||
| uploader = AnnofabStorageUploader(client, project_id) | ||
| project = self._project.get_project(project_id) | ||
| if project is None: | ||
| raise RuntimeError("指定されたプロジェクト(={})が見つかりませんでした。".format(project_id)) | ||
|
|
||
| uploaded_path = uploader.upload_tempdata(csv_path) | ||
|
|
||
| body_params = { | ||
| "task_generate_rule": {"csv_data_path": uploaded_path, "_type": "ByInputDataCsv"}, | ||
| "project_last_updated_datetime": project.updated_datetime, | ||
| } | ||
| task_generate_result, _ = client.initiate_tasks_generation(project_id, request_body=body_params) | ||
|
|
||
| return TaskGenerateResponse.from_dict(task_generate_result) | ||
|
|
yuji38kwmt
commented
Jul 18, 2022
| def put_task(self, task_id: str, input_data_ids: List[str]) -> Task: | ||
| client = self._client | ||
| project_id = self._project_id | ||
| result, _ = client.put_task(project_id, task_id, request_body={"input_data_id_list": input_data_ids}) |
There was a problem hiding this comment.
既にタスクが存在していたら、HTTPErrorが発生する。
タスクを上書きするとアノテーションが消える可能性があり、入力データや補助情報データの上書きよりも、慎重に行う必要があるため、--forceが指定されても、タスクは上書きしないようにした。
yuji38kwmt
commented
Jul 18, 2022
anno3d/kitti/scene_uploader.py
Outdated
|
|
||
| logger.info("タスクの作成が完了しました") | ||
| logger.info("タスクの作成を開始します") | ||
| await asyncio.gather(self._create_tasks_async(uploader_input.project_id, task_to_data_dict)) |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
yuji38kwmt
changed the title
initiateTasksGenerationAPIからputTaskAPI
yuji38kwmt
changed the title
initiateTasksGenerationAPIからputTaskAPIinitiateTasksGenerationAPIからputTaskAPIを使うように変更しました。
Merged
yuji38kwmt
commented
Jul 19, 2022
| @@ -57,6 +37,12 @@ def get_task(self, task_id: str) -> Optional[Task]: | |||
|
|
|||
| return self._decode_task(result) | |||
|
|
|||
| def put_task(self, task_id: str, input_data_ids: Collection[str]) -> Task: | |||
There was a problem hiding this comment.
input_daata_idsの型がListでなくCollectionにした理由は、mypyに怒られないようにするため。
poetry run mypy anno3d tests sandbox.py
anno3d/kitti/scene_uploader.py:152: error: Argument 2 to "put_task" of "TaskApi" has incompatible type "List[DataId]"; expected "List[str]"
anno3d/kitti/scene_uploader.py:152: note: "List" is invariant -- see https://mypy.readthedocs.io/en/stable/common_issues.html#variance
anno3d/kitti/scene_uploader.py:152: note: Consider using "Sequence" instead, which is covariant
yuji38kwmt
force-pushed
the
modify-upload-task
branch
3 times, most recently
from
a8b99be
to
e0c1133
Compare
`putTask`APIの方が処理時間が短く、エラー内容が分かりやすいため。
yuji38kwmt
force-pushed
the
modify-upload-task
branch
from
e0c1133
to
420939a
Compare
seraphr
approved these changes
Jul 28, 2022
| loop = asyncio.get_event_loop() | ||
| project = self._project | ||
| task = TaskApi(self._client, project, project_id) | ||
| def _create_tasks(self, project_id: str, task_to_data_dict: Dict[TaskId, List[Tuple[DataId, FilePaths]]]): |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
タスク作成の処理を
initiateTasksGenerationAPIからputTaskAPIを使うように変更しました。理由は以下の通りです。
initiateTasksGenerationAPIでは、タスク作成に失敗した際のエラーが分かりづらい