From 6b6da5c5e5906b4c4d96ffaa09ae499885bba730 Mon Sep 17 00:00:00 2001
From: yuji38kwmt <yuji38kwmt@yahoo.co.jp>
Date: Tue, 19 Nov 2019 16:45:47 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[wrapper.wait=5Ffor=5Fcompletion]=20?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=96=E3=81=8C=E3=81=AA=E3=81=84=E3=81=A8?=
 =?UTF-8?q?=E3=81=8D=E3=81=A7=E3=82=82=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C?=
 =?UTF-8?q?=E8=B5=B7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20fix=20#89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 annofabapi/wrapper.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/annofabapi/wrapper.py b/annofabapi/wrapper.py
index 16fe7ae6..56c649ac 100644
--- a/annofabapi/wrapper.py
+++ b/annofabapi/wrapper.py
@@ -803,17 +803,23 @@ def wait_for_completion(self, project_id: str, job_type: JobType, job_access_int
             Falseならば、ジョブが失敗 or ``max_job_access`` 回アクセスしても、ジョブが完了しなかった。
 
         """
-        def get_latest_job():
+        def get_latest_job() -> Optional[JobInfo]:
             job_list = self.api.get_project_job(project_id, query_params={"type": job_type.value})[0]["list"]
-            assert len(job_list) == 1
-            return job_list[0]
+            if len(job_list) > 0:
+                return job_list[0]
+            else:
+                return None
 
         job_access_count = 0
         while True:
             job = get_latest_job()
-            if job_access_count == 0 and job["job_status"] != "progress":
-                logger.debug("進行中のジョブはありませんでした。")
+            if job is None:
+                logger.debug("ジョブは存在しませんでした。")
                 return True
+            else:
+                if job_access_count == 0 and job["job_status"] != "progress":
+                    logger.debug("進行中のジョブはありませんでした。")
+                    return True
 
             job_access_count += 1
 
@@ -831,5 +837,5 @@ def get_latest_job():
                     logger.debug("job_id = %s のジョブが進行中です。%d 秒間待ちます。", job['job_id'], job_access_interval)
                     time.sleep(job_access_interval)
                 else:
-                    logger.debug("job_id = %s のジョブに %d 回アクセスしましたが、完了しませんでした。", job['job_id'], job_access_interval)
+                    logger.debug("job_id = %s のジョブに %d 回アクセスしましたが、完了しませんでした。", job['job_id'], job_access_count)
                     return False

From d9f03bc9f27a839986c3085c2ff1e06e5a8915b4 Mon Sep 17 00:00:00 2001
From: yuji38kwmt <yuji38kwmt@yahoo.co.jp>
Date: Tue, 19 Nov 2019 16:45:55 +0900
Subject: [PATCH 2/3] update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 29a99582..a3f006a7 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ format:
 	pipenv run yapf --verbose --in-place --recursive annofabapi tests
 
 lint:
-	pipenv run flake8 annofabapi
 	pipenv run mypy annofabapi --config-file setup.cfg
+	pipenv run flake8 annofabapi
 	pipenv run pylint annofabapi --rcfile setup.cfg
 
 test:

From 14d85f97fca5a349da5a97e8fd0775e6e5c7017a Mon Sep 17 00:00:00 2001
From: yuji38kwmt <yuji38kwmt@yahoo.co.jp>
Date: Tue, 19 Nov 2019 16:46:25 +0900
Subject: [PATCH 3/3] version up

---
 annofabapi/__version__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/annofabapi/__version__.py b/annofabapi/__version__.py
index e9734d46..ebcbb295 100644
--- a/annofabapi/__version__.py
+++ b/annofabapi/__version__.py
@@ -1 +1 @@
-__version__ = '0.21.2'
+__version__ = '0.21.3'