test codeの生成

Author: yuji38kwmt

annofabapi/api2.py

@@ -17,6 +17,7 @@
 class AnnofabApi2(AbstractAnnofabApi2):
     """
     Web API v2に対応したメソッドが存在するクラス。
+    【注意】 開発途上版のため、互換性のない変更がある可能性があります。
     """
 
     def __init__(self, api: AnnofabApi):
@@ -31,20 +32,12 @@ def __init__(self, api: AnnofabApi):
     #: アクセスするURL
     URL_PREFIX = "https://annofab.com/api/v2"
 
+    #: Signed Cookie情報
     cookies: Optional[Dict[str, Any]] = None
 
     #########################################
     # Private Method
     #########################################
-    class __NoAuth(AuthBase):
-        """
-        netrcの有無にかかわらず、authorizationヘッダを空にする
-        http://docs.python-requests.org/en/master/user/advanced/#custom-authentication
-        """
-
-        def __call__(self, req):
-            req.headers['Authorization'] = None
-            return req
 
     @annofabapi.api.my_backoff
     def _request_wrapper(self,
@@ -86,7 +79,6 @@ def _request_wrapper(self,
 
         else:
             kwargs.update({"cookies": self.cookies})
-            kwargs.pop("auth", self.__NoAuth())
 
             # HTTP Requestを投げる
             response: requests.Response = getattr(self.api.session,
@@ -96,7 +88,8 @@ def _request_wrapper(self,
             # CloudFrontから403 Errorが発生したとき
             if response.status_code == requests.codes.forbidden and response.headers.get(
                     "server") == "CloudFront":
-                self.api.login()
+
+                self._get_signed_access_v2(url_path)
                 return self._request_wrapper(http_method, url_path,
                                              query_params, header_params,
                                              request_body)
@@ -109,11 +102,24 @@ def _request_wrapper(self,
         content = self.api._response_to_content(response)
         return content, response
 
+    def _get_signed_access_v2(self, url_path: str):
+        query_params = {"url": f"/api/v2{url_path}"}
+        self.get_signed_access_v2(query_params)
+
     #########################################
     # Public Method : Cache
     #########################################
-    def get_signed_access_v2(self, query_params):
+    def get_signed_access_v2(self, query_params: Dict[str, Any]) -> Tuple[Dict[str, Any], requests.Response]:
         """
+        Signed Cookieを取得して、インスタンスに保持する。
+
+        Args:
+            query_params (Dict[str, Any]): Query Parameters
+                url (str): アクセスするページのURL
+
+        Returns:
+            Tuple[SignedCookie, requests.Response]
+
         """
 
         url_path = f'/sign-url'

tests/test_api2.py

@@ -0,0 +1,47 @@
+"""
+AnnofabApi2のテストメソッド
+
+"""
+import configparser
+import datetime
+import logging
+import os
+import time
+import uuid
+from distutils.util import strtobool
+
+import annofabapi
+import annofabapi.utils
+from tests.utils_for_test import WrapperForTest, create_csv_for_task
+
+# プロジェクトトップに移動する
+os.chdir(os.path.dirname(os.path.abspath(__file__)) + "/../")
+inifile = configparser.ConfigParser()
+inifile.read('./pytest.ini', 'UTF-8')
+project_id = inifile.get('annofab', 'project_id')
+should_execute_job_api: bool = strtobool(
+    inifile.get('annofab', 'should_execute_job_api'))
+should_print_log_message: bool = strtobool(
+    inifile.get('annofab', 'should_print_log_message'))
+
+test_dir = './tests/data'
+out_dir = './tests/out'
+
+if should_print_log_message:
+    logging_formatter = '%(levelname)s : %(asctime)s : %(name)s : %(funcName)s : %(message)s'
+    logging.basicConfig(format=logging_formatter)
+    logging.getLogger("annofabapi").setLevel(level=logging.DEBUG)
+
+service = annofabapi.build_from_netrc()
+test_wrapper = WrapperForTest(service.api)
+
+my_account_id = service.api.get_my_account()[0]['account_id']
+organization_name = service.api.get_organization_of_project(
+    project_id)[0]['organization_name']
+
+annofab_user_id = service.api.login_user_id
+
+
+def test_project():
+    assert type(service.api2.get_project_cache_v2(project_id))
+