eclinical-requester 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

api_requester/__init__.py

@@ -6,4 +6,4 @@
 @Description: Description
 @File: __init__.py.py
 """
-__version__ = "1.0.5"
+__version__ = "1.0.7"

api_requester/core/call_api.py

@@ -16,7 +16,7 @@ from api_requester.http.authorize import Authorize
 from api_requester.utils.placeholder_replacer import PlaceholderReplacer
 
 
-class CallApi(BizBase):
+class ApiRequester(BizBase):
 
     def __init__(self, username=None, password=None, sponsor=None, study=None, test_env=None, app_env=None, app=None,
                  company=None, role=None, external=False):
@@ -44,9 +44,15 @@ class CallApi(BizBase):
         self.user_onboard_dto = auth.user_onboard_dto
         return self
 
-    def run(self, method, api, **kwargs):
-        self.login()
-        replacer = PlaceholderReplacer({
+    def request(self, method, api, **kwargs):
+        if self.user.external is False:
+            url = AppUrl(self.user.app, self.user.test_env).which_url(self.user.app)(api)
+        else:
+            url = AppUrl(self.user.app, self.user.test_env).external_url(api)
+        request(method, url, headers=self.headers, **kwargs)
+
+    def user_replacer(self):
+        return PlaceholderReplacer({
             "Sponsor ID": self.user_onboard_dto.sponsorId,
             "Study ID": self.user_onboard_dto.studyId,
             "Env ID": self.user_onboard_dto.envId,
@@ -54,11 +60,3 @@ class CallApi(BizBase):
             "Study Name": self.user.study,
             "Lifecycle": self.user.app_env,
         })
-        url = replacer.replace(api)
-        for key, value in kwargs.items():
-            kwargs[key] = replacer.replace(value)
-        if self.user.external is False:
-            url = AppUrl(self.user.app, self.user.test_env).which_url(self.user.app)(url)
-        else:
-            url = AppUrl(self.user.app, self.user.test_env).external_url(url)
-        request(method, url, headers=self.headers, **kwargs)

api_requester/http/authorize.py

@@ -61,8 +61,9 @@ class Authorize(BizBase, SampleHeaders, AdminAuthService, AdminUserOnBoardApplic
                 self._entry_portal(company_id)
             Logger().info("The user({0}) logs in to {1} successfully.".format(self.user, login_app_tip))
         except Exception as e:
-            Logger().error("The user({0}) failed to log in to {1}.".format(self.user, login_app_tip))
-            raise Exception(f"Authorize Failed: {e}")
+            tip = "The user({0}) failed to log in to {1}.".format(self.user, login_app_tip)
+            Logger().error(tip)
+            raise Exception(f"{tip} Authorize Failed: {e}")
 
     def _auth(self):
         self.time_mills = time.time()

{eclinical_requester-1.0.5.dist-info → eclinical_requester-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: eclinical_requester
-Version: 1.0.5
+Version: 1.0.7
 Summary: edetek api requester
 Home-page: http://example.com
 Author: xiaodong.li
@@ -9,11 +9,18 @@ Classifier: Programming Language :: Python :: 3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: lxml>=4.8.0
-Requires-Dist: requests>=2.32.0
-Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: requests>=2.28.2
+Requires-Dist: PyYAML>=6.0
 Requires-Dist: requests-toolbelt>=1.0.0
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: numpy>=1.23.4
 Requires-Dist: pycryptodome>=3.17
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 api_requester

{eclinical_requester-1.0.5.dist-info → eclinical_requester-1.0.7.dist-info}/RECORD

@@ -1,27 +1,39 @@
-api_requester/__init__.py,sha256=vd3laGo6gsYGHR6HXrbzD1u8tV9aegrNyABZYB7f-ik,175
-api_requester/core/call_api.py,sha256=g0RIwDOamDeenehHHJRHZKl-iOoR9k-XTjPFIPZ8eHI,2274
+api_requester/__init__.py,sha256=u5yPDFCeA4yHnPJMV61RqCox5WHkvCaVJ8p1JMJ5jrk,175
+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
+api_requester/core/admin/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/api/auth_api.py,sha256=dKKOuEnXIKgzhUfaNfSzNm24LREUcvPZ28xxTZisY6w,861
 api_requester/core/admin/api/user_on_board_application_api.py,sha256=gb7w8NYWsXgnWOla9JMyAyb5gVz3NmLiEb9H7ZlkyQs,897
+api_requester/core/admin/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/service/auth_service.py,sha256=RiXY5fgZd63KKKNqkDmqvjl9iVVvIs1PhadJt6Fxbis,1057
 api_requester/core/admin/service/user_on_board_application_service.py,sha256=qxevIpe26wXtGdBFqPsEdj7nir8MOQ3wAZsO_jxccF0,1353
+api_requester/core/admin/service/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/service/impl/system_env_service_impl.py,sha256=zoR1HZm6tSoaJFe_bNe2cDLV_GfhZrf2qevKt2UmTQc,1519
 api_requester/core/admin/service/impl/user_on_board_application_service_impl.py,sha256=2vNFD3dFZDI5ssvrSgzg2AT-yA3nlty_eCRWRd_5-nc,694
+api_requester/core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+api_requester/core/common/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/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/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=HIjVGYUACtpW1_vKyUGfs5LHJr0s6mDpBl-D6PXEAYk,7498
+api_requester/http/authorize.py,sha256=nNoCpJe7UVN0SnWb_sLusHvdeNLT1bi4lzs9N0KiMv4,7527
 api_requester/http/eclinical_requests.py,sha256=6TATJAt6DjX9N7GZ0RSxEjL-T_-tqLULuBAYrI5eNwA,9496
 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/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
 api_requester/utils/json_utils.py,sha256=0fTXGESYxuiHv4ezx_iIrmXv2qwb3Ozd1qRIXenToOQ,2614
 api_requester/utils/lib.py,sha256=wOXU4hB1tFPHT2X96zmVUfEb7hulowDVO8BN5kV9OpA,14429
@@ -31,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.5.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-eclinical_requester-1.0.5.dist-info/METADATA,sha256=KyF7ddsQz386wjZ-6WNWL_Kn_tuYeF2HMlNWX91elkg,539
-eclinical_requester-1.0.5.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-eclinical_requester-1.0.5.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
-eclinical_requester-1.0.5.dist-info/RECORD,,
+eclinical_requester-1.0.7.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+eclinical_requester-1.0.7.dist-info/METADATA,sha256=8WTNv3FjwcvKE9Iddqo-kcinCZhzl7tvpUc6vTCc0Ko,694
+eclinical_requester-1.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+eclinical_requester-1.0.7.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
+eclinical_requester-1.0.7.dist-info/RECORD,,

{eclinical_requester-1.0.5.dist-info → eclinical_requester-1.0.7.dist-info}/WHEEL

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