内部リソースにアクセスする処理を変更 (#346)

* 内部リソースにアクセスする処理を変更

* version up

* poetry update

Author: yuji38kwmt

annofabapi/__version__.py

@@ -1 +1 @@
-__version__ = "0.46.4"
+__version__ = "0.46.5"

annofabapi/api.py

@@ -199,7 +199,7 @@ def _request_wrapper(
         request_body: Optional[Any] = None,
     ) -> Tuple[Any, requests.Response]:
         """
-        HTTP　Requestを投げて、Responseを返す。
+        HTTP Requestを投げて、Responseを返す。
 
         Args:
             http_method:
@@ -236,7 +236,9 @@ def _request_wrapper(
         content = self._response_to_content(response)
         return content, response
 
-    def _get_signed_cookie(self, project_id) -> Tuple[Dict[str, Any], requests.Response]:
+    def _get_signed_cookie(
+        self, project_id, query_params: Optional[Dict[str, Any]] = None
+    ) -> Tuple[Dict[str, Any], requests.Response]:
         """
         アノテーション仕様の履歴情報を取得するために、非公開APIにアクセスする。
         変更される可能性あり.
@@ -250,7 +252,7 @@ def _get_signed_cookie(self, project_id) -> Tuple[Dict[str, Any], requests.Respo
         """
         url_path = f"/internal/projects/{project_id}/sign-headers"
         http_method = "GET"
-        keyword_params: Dict[str, Any] = {}
+        keyword_params: Dict[str, Any] = {"query_params": query_params}
         return self._request_wrapper(http_method, url_path, **keyword_params)
 
     def _request_get_with_cookie(self, project_id: str, url: str) -> requests.Response:
@@ -265,23 +267,22 @@ def _request_get_with_cookie(self, project_id: str, url: str) -> requests.Respon
             Response
 
         """
-
-        def request(cookies):
-            kwargs = {"cookies": cookies}
-            return self.session.get(url, **kwargs)
-
-        if self.cookies is None:
-            _, r = self._get_signed_cookie(project_id)
-            self.cookies = r.cookies
-
-        response = request(self.cookies)
+        # Sessionオブジェクトに保存されているCookieを利用して、URLにアクセスする
+        response = self.session.get(url)
 
         # CloudFrontから403 Errorが発生したときは、別プロジェクトのcookieを渡している可能性があるので、
         # Signed Cookieを発行して、再度リクエストを投げる
         if response.status_code == requests.codes.forbidden and response.headers.get("server") == "CloudFront":
-            _, r = self._get_signed_cookie(project_id)
-            self.cookies = r.cookies
-            response = request(self.cookies)
+            query_params = {}
+            if "/input_data_set/" in url:
+                query_params.update({"resource": "input_data_set"})
+            else:
+                query_params.update({"resource": "project"})
+
+            _, r = self._get_signed_cookie(project_id, query_params=query_params)
+            for cookie in r.cookies:
+                self.session.cookies.set_cookie(cookie)
+            response = self.session.get(url)
 
         _log_error_response(logger, response)
         _raise_for_status(response)

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "annofabapi"
-version = "0.46.4"
+version = "0.46.5"
 description = "Python Clinet Library of AnnoFab WebAPI (https://annofab.com/docs/api/)"
 authors = ["yuji38kwmt"]
 license = "MIT"

pyproject.toml

@@ -594,11 +594,20 @@ def test_get_task_or_none(self):
 
 
 class TestProtectedMethod:
-    def test__request_get_with_cookie(self):
+    @classmethod
+    def setup_class(cls):
+        cls.input_data_id = test_wrapper.get_first_input_data_id_in_task(project_id, task_id)
+
+    def test__request_get_with_cookie_with_project_url(self):
         images, _ = api.get_instruction_images(project_id)
         url = images[0]["url"]
         r = api._request_get_with_cookie(project_id, url)
-        # エラーがないことを確認する
+        assert r.status_code == 200
+
+    def test__request_get_with_cookie_with_input_data_set_url(self):
+        input_data, _ = api.get_input_data(project_id, self.input_data_id)
+        r = api._request_get_with_cookie(project_id, input_data["url"])
+        assert r.status_code == 200
 
     def test_request_get_with_cookie_failed(self):
         # SignedCookieに対応するプロジェクトと、アクセス対象のプロジェクトが異なっているときの対応