examplesをformat

Author: yuji38kwmt

annofabapi/__version__.py

@@ -1 +1 @@
-__version__ = '0.1.2'
+__version__ = '0.2.0'

examples/cancel_acceptance.py

@@ -9,8 +9,7 @@
 import requests
 
 import annofabapi
-
-from example_utils import read_lines, ExamplesWrapper
+from example_utils import ExamplesWrapper, read_lines
 
 logging_formatter = '%(levelname)s : %(asctime)s : %(name)s : %(funcName)s : %(message)s'
 logging.basicConfig(format=logging_formatter)
@@ -25,28 +24,33 @@ def get_account_id_from_user_id(project_id: str, user_id: str):
     return member['account_id']
 
 
-def cancel_acceptance(project_id: str, task_id_list: List[str], acceptor_user_id: Optional[str] = None):
+def cancel_acceptance(project_id: str,
+                      task_id_list: List[str],
+                      acceptor_user_id: Optional[str] = None):
     """
     タスクを受け入れ取り消しする
     Args:
         project_id:
         task_id_list: 受け入れ取り消しするtask_id_list
         acceptor_user_id: 再度受入を担当させたいユーザのuser_id
     """
-    acceptor_account_id = examples_wrapper.get_account_id_from_user_id(project_id, acceptor_user_id)
+    acceptor_account_id = examples_wrapper.get_account_id_from_user_id(
+        project_id, acceptor_user_id)
 
     for task_id in task_id_list:
         try:
             task, _ = service.api.get_task(project_id, task_id)
             if task["status"] != "complete":
-                logger.warning(f"task_id = {task_id} は受入完了でありません。status = {task['status']}, phase={task['phase']}")
+                logger.warning(
+                    f"task_id = {task_id} は受入完了でありません。status = {task['status']}, phase={task['phase']}"
+                )
             request_body = {
                 "status": "not_started",
                 "account_id": acceptor_account_id,
                 "last_updated_datetime": task["updated_datetime"],
-
             }
-            operated_task, _ = service.api.operate_task(project_id, task_id, request_body=request_body)
+            operated_task, _ = service.api.operate_task(
+                project_id, task_id, request_body=request_body)
             logger.info(f"task_id = {task_id} の受け入れ取り消し完了")
 
         except requests.exceptions.HTTPError as e:
@@ -73,8 +77,7 @@ def main(args):
         metavar='file',
         type=str,
         required=True,
-        help=
-        'task_idの一覧が記載されたファイル。task_idは改行(LF or CRLF)で区切る。')
+        help='task_idの一覧が記載されたファイル。task_idは改行(LF or CRLF)で区切る。')
 
     parser.add_argument('--user_id',
                         metavar='user_id',

examples/example_utils.py

@@ -2,22 +2,26 @@
 
 import annofabapi
 
+
 def read_lines(filepath: str) -> List[str]:
     """ファイルを行単位で読み込む。改行コードを除く"""
     with open(filepath) as f:
         lines = f.readlines()
     return [e.rstrip('\r\n') for e in lines]
 
+
 class ExamplesWrapper:
     """
     Exampleツール用のWrapperクラス
     Returns:
 
     """
+
     def __init__(self, service: annofabapi.Resource):
         self.service = service
 
-    def get_account_id_last_annotation_phase(self, task_histories: List[Dict[str, Any]]):
+    def get_account_id_last_annotation_phase(
+            self, task_histories: List[Dict[str, Any]]):
         """
         タスク履歴の最後のannotation phaseを担当したaccount_idを取得する. なければNoneを返す
         Args:
@@ -27,7 +31,9 @@ def get_account_id_last_annotation_phase(self, task_histories: List[Dict[str, An
 
 
         """
-        annotation_histories = [e for e in task_histories if e["phase"] == "annotation"]
+        annotation_histories = [
+            e for e in task_histories if e["phase"] == "annotation"
+        ]
         if len(annotation_histories) > 0:
             last_history = annotation_histories[-1]
             return last_history["account_id"]
@@ -48,8 +54,8 @@ def get_account_id_from_user_id(self, project_id: str, user_id: str):
         member, _ = self.service.api.get_project_member(project_id, user_id)
         return member['account_id']
 
-
-    def change_operator_of_task(self, project_id: str, task_id: str, account_id: str) -> Dict[str, Any]:
+    def change_operator_of_task(self, project_id: str, task_id: str,
+                                account_id: str) -> Dict[str, Any]:
         """
         タスクの担当者を変更する
         Args:
@@ -68,11 +74,13 @@ def change_operator_of_task(self, project_id: str, task_id: str, account_id: str
             "status": "not_started",
             "account_id": account_id,
             "last_updated_datetime": task["updated_datetime"],
-
         }
-        return self.service.api.operate_task(project_id, task_id, request_body=req)[0]
+        return self.service.api.operate_task(project_id,
+                                             task_id,
+                                             request_body=req)[0]
 
-    def change_to_working_phase(self, project_id: str, task_id: str, account_id: str) -> Dict[str, Any]:
+    def change_to_working_phase(self, project_id: str, task_id: str,
+                                account_id: str) -> Dict[str, Any]:
         """
         タスクを作業中に変更する
         Args:
@@ -91,10 +99,10 @@ def change_to_working_phase(self, project_id: str, task_id: str, account_id: str
             "status": "working",
             "account_id": account_id,
             "last_updated_datetime": task["updated_datetime"],
-
         }
-        return self.service.api.operate_task(project_id, task_id, request_body=req)[0]
-
+        return self.service.api.operate_task(project_id,
+                                             task_id,
+                                             request_body=req)[0]
 
     def reject_task(self, project_id: str, task_id: str, account_id: str):
         """
@@ -110,22 +118,22 @@ def reject_task(self, project_id: str, task_id: str, account_id: str):
 
         # タスクを差し戻す
         task, _ = self.service.api.get_task(project_id, task_id)
-        annotator_account_id = self.get_account_id_last_annotation_phase(task["histories_by_phase"])
+        annotator_account_id = self.get_account_id_last_annotation_phase(
+            task["histories_by_phase"])
 
         req_reject = {
             "status": "rejected",
             "account_id": account_id,
             "last_updated_datetime": task["updated_datetime"],
-
         }
-        rejected_task, _ = self.service.api.operate_task(project_id, task_id, request_body=req_reject)
+        rejected_task, _ = self.service.api.operate_task(
+            project_id, task_id, request_body=req_reject)
 
         req_change_operator = {
             "status": "not_started",
             "account_id": annotator_account_id,
             "last_updated_datetime": rejected_task["updated_datetime"],
-
         }
-        updated_task, _ = self.service.api.operate_task(project_id, task["task_id"], request_body=req_change_operator)
+        updated_task, _ = self.service.api.operate_task(
+            project_id, task["task_id"], request_body=req_change_operator)
         return updated_task
-

examples/reject_tasks_with_adding_comment.py

@@ -5,14 +5,14 @@
 import argparse
 import logging
 import time
+import uuid
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import requests
-import uuid
+
 import annofabapi
 import annofabapi.utils
-
-from example_utils import read_lines, ExamplesWrapper
+from example_utils import ExamplesWrapper, read_lines
 
 logging_formatter = '%(levelname)s : %(asctime)s : %(name)s : %(funcName)s : %(message)s'
 logging.basicConfig(format=logging_formatter)
@@ -21,7 +21,9 @@
 logger = logging.getLogger(__name__)
 logger.setLevel(level=logging.DEBUG)
 
-def add_inspection_comment(project_id: str, task: Dict[str, Any], inspection_comment: str, commenter_account_id: str):
+
+def add_inspection_comment(project_id: str, task: Dict[str, Any],
+                           inspection_comment: str, commenter_account_id: str):
     """
     先頭画像の左上に検査コメントを付与する
     Args:
@@ -53,14 +55,17 @@ def add_inspection_comment(project_id: str, task: Dict[str, Any], inspection_com
             "created_datetime": annofabapi.utils.str_now()
         },
         "_type": "Put",
-
     }]
 
-    return service.api.batch_update_inspections(project_id, task["task_id"], first_input_data_id, request_body=req_inspection)[0]
-
+    return service.api.batch_update_inspections(project_id,
+                                                task["task_id"],
+                                                first_input_data_id,
+                                                request_body=req_inspection)[0]
 
 
-def reject_tasks_with_adding_comment(project_id: str, task_id_list: List[str], inspection_comment: str, commenter_user_id: str):
+def reject_tasks_with_adding_comment(project_id: str, task_id_list: List[str],
+                                     inspection_comment: str,
+                                     commenter_user_id: str):
     """
     検査コメントを付与して、タスクを差し戻す
     Args:
@@ -70,21 +75,25 @@ def reject_tasks_with_adding_comment(project_id: str, task_id_list: List[str], i
         commenter_user_id: 検査コメントを付与して、タスクを差し戻すユーザのuser_id
     """
 
-    commenter_account_id = examples_wrapper.get_account_id_from_user_id(project_id, commenter_user_id)
+    commenter_account_id = examples_wrapper.get_account_id_from_user_id(
+        project_id, commenter_user_id)
 
     for task_id in task_id_list:
         task, _ = service.api.get_task(project_id, task_id)
         logger.debug(f"task_id = {task_id}, {task['status']}, {task['phase']}")
         if task["phase"] == "annotation":
-            logger.warning(f"task_id = {task_id} はannofation phaseのため、差し戻しできません。")
+            logger.warning(
+                f"task_id = {task_id} はannofation phaseのため、差し戻しできません。")
             continue
 
         try:
             # 担当者を変更して、作業中にする
-            examples_wrapper.change_operator_of_task(project_id, task_id, commenter_account_id)
+            examples_wrapper.change_operator_of_task(project_id, task_id,
+                                                     commenter_account_id)
             logger.debug(f"task_id = {task_id}, {commenter_user_id}に担当者変更 完了")
 
-            examples_wrapper.change_to_working_phase(project_id, task_id, commenter_account_id)
+            examples_wrapper.change_to_working_phase(project_id, task_id,
+                                                     commenter_account_id)
             logger.debug(f"task_id = {task_id}, working statusに変更 完了")
         except requests.exceptions.HTTPError as e:
             logger.error(e)
@@ -95,7 +104,8 @@ def reject_tasks_with_adding_comment(project_id: str, task_id_list: List[str], i
         time.sleep(3)
         try:
             # 検査コメントを付与する
-            add_inspection_comment(project_id, task, inspection_comment, commenter_account_id)
+            add_inspection_comment(project_id, task, inspection_comment,
+                                   commenter_account_id)
             logger.debug(f"task_id = {task_id}, 検査コメントの付与 完了")
         except requests.exceptions.HTTPError as e:
             logger.error(e)
@@ -104,7 +114,8 @@ def reject_tasks_with_adding_comment(project_id: str, task_id_list: List[str], i
 
         try:
             # タスクを差し戻す
-            rejected_task = examples_wrapper.reject_task(project_id, task_id, commenter_account_id)
+            rejected_task = examples_wrapper.reject_task(
+                project_id, task_id, commenter_account_id)
 
         except requests.exceptions.HTTPError as e:
             logger.error(e)
@@ -115,17 +126,18 @@ def reject_tasks_with_adding_comment(project_id: str, task_id_list: List[str], i
     return
 
 
-
-
 def main(args):
     task_id_list = read_lines(args.task_id_file)
     user_id = service.api.login_user_id
-    reject_tasks_with_adding_comment(args.project_id, task_id_list, args.comment, user_id)
+    reject_tasks_with_adding_comment(args.project_id, task_id_list,
+                                     args.comment, user_id)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="検査コメントを付与してタスクを差し戻します。検査コメントは先頭の画像の左上(0,0)に付与します。AnnoFab認証情報は`.netrc`に記載すること")
+        description=
+        "検査コメントを付与してタスクを差し戻します。検査コメントは先頭の画像の左上(0,0)に付与します。AnnoFab認証情報は`.netrc`に記載すること"
+    )
     parser.add_argument('--project_id',
                         metavar='project_id',
                         type=str,
@@ -137,8 +149,7 @@ def main(args):
         metavar='file',
         type=str,
         required=True,
-        help=
-        'task_idの一覧が記載されたファイル。task_idは改行(LF or CRLF)で区切る。')
+        help='task_idの一覧が記載されたファイル。task_idは改行(LF or CRLF)で区切る。')
 
     parser.add_argument('--comment',
                         metavar='comment',

tests/test_api.py

@@ -14,7 +14,7 @@
 import uuid
 from distutils.util import strtobool
 
-from annofabapi import AnnofabApi, Wrapper
+import annofabapi
 from tests.utils_for_test import WrapperForTest, create_csv_for_task
 
 # プロジェクトトップに移動する
@@ -27,9 +27,6 @@
 should_print_log_message: bool = strtobool(
     inifile.get('annofab', 'should_print_log_message'))
 
-annofab_user_id = os.getenv('ANNOFAB_USER_ID')
-annofab_password = os.getenv('ANNOFAB_PASSWORD')
-
 test_dir = './tests/data'
 out_dir = './tests/out'
 
@@ -38,8 +35,9 @@
     logging.basicConfig(format=logging_formatter)
     logging.getLogger("annofabapi").setLevel(level=logging.DEBUG)
 
-api = AnnofabApi(annofab_user_id, annofab_password)
-wrapper = Wrapper(api)
+service = annofabapi.build_from_netrc()
+api = service.api
+wrapper = service.wrapper
 test_wrapper = WrapperForTest(api)
 
 my_account_id = api.get_my_account()[0]['account_id']