eclinical-requester 1.0.8__py3-none-any.whl → 1.0.10__py3-none-any.whl

api_requester/__init__.py

@@ -6,4 +6,4 @@
 @Description: Description
 @File: __init__.py.py
 """
-__version__ = "1.0.8"
+__version__ = "1.0.10"

api_requester/docs/application.yaml

@@ -2,6 +2,7 @@ serverUrl:
   dev03: http://dev-03-app-01.chengdudev.edetekapps.cn
   dev04: http://dev-04-app-01.chengdudev.edetekapps.cn
   dev01: http://dev-01-app-01.chengdudev.edetekapps.cn
+  dev02: http://dev-02-app-01.chengdudev.edetekapps.cn
   test01: http://test-01-app-01.chengdudev.edetekapps.cn
   us.dev: https://ec.eclinical-dev.edetekapps.com
   us.demo: https://ec4.ec4demo.edetekapps.com

api_requester/dto/user.py

@@ -24,7 +24,7 @@ class EClinicalUser:
         self.sponsor = sponsor
         self.study = study
         self.app_env = app_env
-        self.test_env = str(test_env)
+        self.test_env = str(test_env) if test_env is not None else None
         self.company = company
         self.role = role
         self.external = external
@@ -32,8 +32,8 @@ class EClinicalUser:
 
     def __repr__(self):
         attributes = self.__dict__
-        info = list()
-        for item in ["test_env", "username", "role", "company", "sponsor", "study"]:
-            if attributes.get(item) is not None:
-                info.append(str(attributes.get(item)))
+        info = [
+            str(attributes[item]) for item in ["test_env", "username", "role", "company", "sponsor", "study", "app_env"]
+            if attributes.get(item) is not None
+        ]
         return "/".join(info)

api_requester/http/authorize.py

@@ -23,8 +23,7 @@ from api_requester.utils.log import Logger
 from api_requester.utils.rsa import encrypt_password
 
 
-class Authorize(BizBase, SampleHeaders, AdminAuthService, AdminUserOnBoardApplicationServiceImpl,
-                CommonSystemEnvServiceImpl):
+class Authorize(BizBase, AdminAuthService, AdminUserOnBoardApplicationServiceImpl, CommonSystemEnvServiceImpl):
 
     def __init__(self, user: EClinicalUser):
         BizBase.__init__(self)
@@ -33,7 +32,6 @@ class Authorize(BizBase, SampleHeaders, AdminAuthService, AdminUserOnBoardApplic
         self.user.app = AppEnum.ADMIN.code
         self.time_mills = time.time()
         self.user_onboard_dto = UserOnBoardDto(-1)
-        SampleHeaders.__init__(self)
         AdminAuthService.__init__(self)
         AdminUserOnBoardApplicationServiceImpl.__init__(self)
         CommonSystemEnvServiceImpl.__init__(self)
@@ -76,7 +74,7 @@ class Authorize(BizBase, SampleHeaders, AdminAuthService, AdminUserOnBoardApplic
             token = response.get("token")
         else:
             token = response.get("jwtAuthenticationResponse").get("token")
-        self.add_authorization(token)
+        self.headers = SampleHeaders().add_authorization(token).to_h()
         self.time_mills = time.time()
         return response.get("type")
 
@@ -86,7 +84,8 @@ class Authorize(BizBase, SampleHeaders, AdminAuthService, AdminUserOnBoardApplic
         self._build_user_onboard_dto(user_onboard_dto)
         self.user_onboard_dto = user_onboard_dto
         response = self.on_board(user_onboard_dto)
-        self.add_authorization(response.get("token"))
+        token = response.get("token")
+        self.headers = SampleHeaders().add_authorization(token).to_h()
 
     def _build_user_onboard_dto(self, dto: UserOnBoardDto):
         onboard_system_list = self.get_user_onboard_application_list(dto.workForCompanyId)
@@ -145,13 +144,13 @@ class Authorize(BizBase, SampleHeaders, AdminAuthService, AdminUserOnBoardApplic
             token = response.get("token")
         else:
             token = response.get("jwtAuthenticationResponse").get("token")
-        self.add_authorization(token)
+        self.headers = SampleHeaders().add_authorization(token).to_h()
         self.time_mills = time.time()
 
     def _entry_portal(self, company_id):
         response = self.login_portal(CrossUserUserOnBoardDto(companyId=company_id))
         try:
             token = response.get("token")
-            self.add_authorization(token)
+            self.headers = SampleHeaders().add_authorization(token).to_h()
         except BaseException as e:
             print(e)

api_requester/http/eclinical_requests.py

@@ -5,6 +5,7 @@ LastEditors: xiaodong.li
 LastEditTime: 2023-07-25 13:33:15
 @Description: eclinical_requests.py
 """
+import copy
 import os
 import time
 from functools import wraps
@@ -17,14 +18,15 @@ from api_requester.dto.base_dto import BaseDto, build_file_dto
 from api_requester.dto.biz_base import BizBase
 from api_requester.http.app_url import AppUrl
 from api_requester.http.exceptions import ApiResponseException
+from api_requester.http.sample_headers import SampleHeaders
 
 
 def get(api):
     def __wrapper__(func):
         @url(api)
         @build_request_data()
-        @init_content_type()
         @refresh_token()
+        @refresh_headers()
         @get_request()
         @http_ok
         def __inner__(instance: BizBase, *args, **kwargs):
@@ -39,8 +41,8 @@ def post(api):
     def __wrapper__(func):
         @url(api)
         @build_request_data()
-        @init_content_type()
         @refresh_token()
+        @refresh_headers()
         @post_request()
         @http_ok
         def __inner__(instance: BizBase, *args, **kwargs):
@@ -55,8 +57,8 @@ def delete(api):
     def __wrapper__(func):
         @url(api)
         @build_request_data()
-        @init_content_type()
         @refresh_token()
+        @refresh_headers()
         @delete_request()
         @http_ok
         def __inner__(instance: BizBase, *args, **kwargs):
@@ -71,8 +73,8 @@ def put(api):
     def __wrapper__(func):
         @url(api)
         @build_request_data()
-        @init_content_type()
         @refresh_token()
+        @refresh_headers()
         @put_request()
         @http_ok
         def __inner__(instance: BizBase, *args, **kwargs):
@@ -85,11 +87,11 @@ def put(api):
 
 def get_request():
     def __wrapper__(func):
-        def __inner__(instance: BizBase, **kwargs):
+        def __inner__(instance: BizBase, *args, **kwargs):
             app_url = kwargs.pop("app_url")
-            rsp = requests.get(app_url, headers=instance.headers, **kwargs)
+            rsp = requests.get(app_url, **kwargs)
             kwargs.update(rsp=rsp)
-            return func(instance, **kwargs)
+            return func(instance, *args, **kwargs)
 
         return __inner__
 
@@ -98,11 +100,11 @@ def get_request():
 
 def post_request():
     def __wrapper__(func):
-        def __inner__(instance: BizBase, **kwargs):
+        def __inner__(instance: BizBase, *args, **kwargs):
             app_url = kwargs.pop("app_url")
-            rsp = requests.post(app_url, headers=instance.headers, **kwargs)
+            rsp = requests.post(app_url, **kwargs)
             kwargs.update(rsp=rsp)
-            return func(instance, **kwargs)
+            return func(instance, *args, **kwargs)
 
         return __inner__
 
@@ -111,11 +113,11 @@ def post_request():
 
 def delete_request():
     def __wrapper__(func):
-        def __inner__(instance: BizBase, **kwargs):
+        def __inner__(instance: BizBase, *args, **kwargs):
             app_url = kwargs.pop("app_url")
-            rsp = requests.delete(app_url, headers=instance.headers, **kwargs)
+            rsp = requests.delete(app_url, **kwargs)
             kwargs.update(rsp=rsp)
-            return func(instance, **kwargs)
+            return func(instance, *args, **kwargs)
 
         return __inner__
 
@@ -124,11 +126,11 @@ def delete_request():
 
 def put_request():
     def __wrapper__(func):
-        def __inner__(instance: BizBase, **kwargs):
+        def __inner__(instance: BizBase, *args, **kwargs):
             app_url = kwargs.pop("app_url")
-            rsp = requests.put(app_url, headers=instance.headers, **kwargs)
+            rsp = requests.put(app_url, **kwargs)
             kwargs.update(rsp=rsp)
-            return func(instance, **kwargs)
+            return func(instance, *args, **kwargs)
 
         return __inner__
 
@@ -146,7 +148,7 @@ def url(api):
                 app_url = AppUrl(instance.user.app, instance.user.test_env).external_url(api, **url_kwargs)
             if app_url is None:
                 raise Exception("The url is null.")
-            kwargs.update(dict(app_url=app_url))
+            kwargs.update(app_url=app_url)
             return func(instance, *args, **kwargs)
 
         return __inner__
@@ -197,7 +199,7 @@ def build_request_data():
                             multipart_encoder_data.append((k, v))
                     if len(multipart_encoder_data) > 0:
                         data = MultipartEncoder(fields=multipart_encoder_data)
-                kwargs.update(dict(data=data))
+                kwargs.update(data=data)
             return func(instance, *args, **kwargs)
 
         return __inner__
@@ -205,14 +207,17 @@ def build_request_data():
     return __wrapper__
 
 
-def init_content_type():
+def refresh_headers():
     def __wrapper__(func):
         def __inner__(instance: BizBase, *args, **kwargs):
+            headers = copy.deepcopy(instance.headers)
+            sh = SampleHeaders(headers)
             if instance.refresh_content_type is True:
-                instance.headers.update({"Content-Type": "application/json"})
+                sh.add_content_type("application/json")
             data = kwargs.get("data")
             if isinstance(data, MultipartEncoder):
-                instance.headers.update({"Content-Type": data.content_type})
+                sh.add_content_type(data.content_type)
+            kwargs.update(headers=sh.to_h())
             return func(instance, *args, **kwargs)
 
         return __inner__
@@ -234,9 +239,10 @@ def refresh_token():
 
 def http_ok(func):
     @wraps(func)
-    def _http_ok(instance: BizBase, **kwargs):
+    def _http_ok(instance: BizBase, *args, **kwargs):
         try:
             rsp: Response = kwargs.pop("rsp")
+            kwargs.pop("headers")
             instance.last_kwargs = kwargs
             instance.last_result = rsp
             content_type = rsp.headers.get("content-type")

api_requester/http/sample_headers.py

@@ -9,8 +9,8 @@
 
 
 class SampleHeaders(object):
-    def __init__(self):
-        self.headers = {"Content-Type": "application/json", "Connection": "close"}
+    def __init__(self, headers=None):
+        self.headers = {"Content-Type": "application/json", "Connection": "close"} if headers is None else headers
 
     def add_header(self, **kwargs):
         self.headers.update(kwargs)
@@ -21,3 +21,6 @@ class SampleHeaders(object):
 
     def add_authorization(self, token):
         return self.add_header(Authorization=token)
+
+    def add_content_type(self, content_type):
+        return self.add_header(**{"Content-Type": content_type})

{eclinical_requester-1.0.8.dist-info → eclinical_requester-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: eclinical_requester
-Version: 1.0.8
+Version: 1.0.10
 Summary: edetek api requester
 Home-page: http://example.com
 Author: xiaodong.li
@@ -20,6 +20,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{eclinical_requester-1.0.8.dist-info → eclinical_requester-1.0.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-api_requester/__init__.py,sha256=OkDm3kvIa_sZSqpi0CXMGeEX_iVzJmFvIOUbALQI7pY,175
+api_requester/__init__.py,sha256=voa3D8SKm31uC9BTkWCyrTNfZn2UOBxVTt2I_kSBPMY,176
 api_requester/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/call_api.py,sha256=OumIPQSNv5JJeghv_r2tDVzmQCDEsvTS4CEmQNz5dO8,2158
 api_requester/core/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,22 +16,22 @@ api_requester/core/common/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 api_requester/core/common/api/system_env_api.py,sha256=Ogrc2vSpbjQBUIr_cUfz-TLX4DD_9eg_PabX433VQuA,634
 api_requester/core/common/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/common/service/system_env_service.py,sha256=SIKQCG2tIf1s4dUsSiFvOMAgai6JQ-xRP5HJ8MKF3Ts,787
-api_requester/docs/application.yaml,sha256=5R27yfD5QNfiPE1_UYnCJgBHqgL_j821PTtqRmjl4hI,1095
+api_requester/docs/application.yaml,sha256=_yTaHYLd9CdGfM4ua3qbYOO3x36cWjFEcJmPGDB_Pak,1151
 api_requester/dto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/dto/base_dto.py,sha256=nyBGidUblKE6MSK-yvcVSlYDyqPbIEdXiTOvymcFZp0,6904
 api_requester/dto/biz_base.py,sha256=4lzf6FoXCNBr0OlxbFryf-7v16wfP3Hv6c7WUh-DgNs,874
-api_requester/dto/user.py,sha256=X9CWYdRWNBKtQQtJN5ZyxR2l3USC1-JD9XE_8mOQ3WM,1280
+api_requester/dto/user.py,sha256=zY3vPS-xaKyFzstig55kwmyfPUuMm5vKRhQQKLDTKf0,1299
 api_requester/dto/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/dto/admin/cross_user_user_on_board_dto.py,sha256=VSsihBthlfJORhhVeumDQxuF0lUj5vsLUcF3131Wi1s,489
 api_requester/dto/admin/jwt_authentication_request.py,sha256=Wo9xTzpVIUJjkr4nYdnXsB7Q2nu3oFpy36K2aUUSy90,472
 api_requester/dto/admin/user_on_board_dto.py,sha256=zsCKgnEttnsCkFlXKfuzkXWbvIhfiWv3jEj8jY6GRbQ,692
 api_requester/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/http/app_url.py,sha256=jTGwxPcu_yts4WZbE9wDl6HqGOB48BdEIGw4Otmo1F0,939
-api_requester/http/authorize.py,sha256=nNoCpJe7UVN0SnWb_sLusHvdeNLT1bi4lzs9N0KiMv4,7527
-api_requester/http/eclinical_requests.py,sha256=6TATJAt6DjX9N7GZ0RSxEjL-T_-tqLULuBAYrI5eNwA,9496
+api_requester/http/authorize.py,sha256=3MWW2n6SEeDz1E_gp3w6yRmcyoJZKsR2ffHiCWwrlvY,7612
+api_requester/http/eclinical_requests.py,sha256=JUQ7EPeAvspz-J6GvpoVM2kA4hyGN4AP166hyQlmeFM,9640
 api_requester/http/exceptions.py,sha256=BG0eSOkYT50Qib_PpjSrNWkcv9p9gBanOvXOWrP7Jz8,2685
 api_requester/http/gateway.py,sha256=Ntnj-3OtyKLoGpkcCczMWQ0-0XrS5J_qkEcc9jB5AUk,3676
-api_requester/http/sample_headers.py,sha256=Tz-_gLUx1jBzXd8niTZGgF1MDl6HTZHiVbriIUOqt78,544
+api_requester/http/sample_headers.py,sha256=4a2z0ITPvnNhXiX0xZHfcexiRQdkIvEv8YUK-eGRwDU,705
 api_requester/http/token_manager.py,sha256=sQO4zd3smA0XfmEndBwXs-8rRCmjkEU48S8jWxxXevA,919
 api_requester/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/utils/constant.py,sha256=l1qhn0TkRhX6YAgJUEpiymtTmi1rSmzJVKdPVpayROs,2422
@@ -43,8 +43,8 @@ api_requester/utils/placeholder_replacer.py,sha256=umNGeA1KCQ6Ewzsv1xEehLmHtKkgv
 api_requester/utils/read_file.py,sha256=QRE2hZaPaCo7tyY0fW7c6PLXSmc7Zp1HA-SsN_B-2gs,2325
 api_requester/utils/rsa.py,sha256=dr2m3a2M_LYu1Us97EEiMcjZAkpn1yWKIOjyYYubZeg,1202
 api_requester/utils/time_utils.py,sha256=u1hHO0POBhdXaTQ7VGY_2YjaYxwlrWXGb5phP8iLfOY,579
-eclinical_requester-1.0.8.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-eclinical_requester-1.0.8.dist-info/METADATA,sha256=esMZHeMSfNPhyl3AjyqUOrOf78bymIKsXUnPjGnhzhw,695
-eclinical_requester-1.0.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-eclinical_requester-1.0.8.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
-eclinical_requester-1.0.8.dist-info/RECORD,,
+eclinical_requester-1.0.10.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+eclinical_requester-1.0.10.dist-info/METADATA,sha256=QkApRVkLEqaBAk2NIiySwE3LoHLI1kz_Hicrp-MTkOc,719
+eclinical_requester-1.0.10.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+eclinical_requester-1.0.10.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
+eclinical_requester-1.0.10.dist-info/RECORD,,

{eclinical_requester-1.0.8.dist-info → eclinical_requester-1.0.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any