eclinical-requester 1.0.5__tar.gz → 1.0.7__tar.gz

{eclinical_requester-1.0.5/src/eclinical_requester.egg-info → eclinical_requester-1.0.7}/PKG-INFO

@@ -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.7/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"

{eclinical_requester-1.0.5 → eclinical_requester-1.0.7}/setup.py

@@ -31,8 +31,8 @@ setuptools.setup(
     url="http://example.com",
     install_requires=[
         'lxml>=4.8.0',
-        'requests>=2.32.0',
-        'PyYAML>=6.0.1',
+        'requests>=2.28.2',
+        'PyYAML>=6.0',
         'requests-toolbelt>=1.0.0',
         'python-dateutil>=2.9.0.post0',
         'numpy>=1.23.4',
@@ -44,4 +44,7 @@ setuptools.setup(
         "Programming Language :: Python :: 3.9",
     ],
     include_package_data=True,
+    package_data={
+        'api_requester.docs': ['*.yaml'],  # 列出所有需要包含的文档类型
+    }
 )

{eclinical_requester-1.0.5 → eclinical_requester-1.0.7}/src/api_requester/__init__.py

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

{eclinical_requester-1.0.5 → eclinical_requester-1.0.7}/src/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)

{eclinical_requester-1.0.5 → eclinical_requester-1.0.7}/src/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 → eclinical_requester-1.0.7/src/eclinical_requester.egg-info}/PKG-INFO

@@ -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 → eclinical_requester-1.0.7}/src/eclinical_requester.egg-info/SOURCES.txt

@@ -1,24 +1,36 @@
 LICENSE
 MANIFEST.in
 README.md
+pyproject.toml
 setup.py
 src/api_requester/__init__.py
+src/api_requester/core/__init__.py
 src/api_requester/core/call_api.py
+src/api_requester/core/admin/__init__.py
+src/api_requester/core/admin/api/__init__.py
 src/api_requester/core/admin/api/auth_api.py
 src/api_requester/core/admin/api/user_on_board_application_api.py
+src/api_requester/core/admin/service/__init__.py
 src/api_requester/core/admin/service/auth_service.py
 src/api_requester/core/admin/service/user_on_board_application_service.py
+src/api_requester/core/admin/service/impl/__init__.py
 src/api_requester/core/admin/service/impl/system_env_service_impl.py
 src/api_requester/core/admin/service/impl/user_on_board_application_service_impl.py
+src/api_requester/core/common/__init__.py
+src/api_requester/core/common/api/__init__.py
 src/api_requester/core/common/api/system_env_api.py
+src/api_requester/core/common/service/__init__.py
 src/api_requester/core/common/service/system_env_service.py
 src/api_requester/docs/application.yaml
+src/api_requester/dto/__init__.py
 src/api_requester/dto/base_dto.py
 src/api_requester/dto/biz_base.py
 src/api_requester/dto/user.py
+src/api_requester/dto/admin/__init__.py
 src/api_requester/dto/admin/cross_user_user_on_board_dto.py
 src/api_requester/dto/admin/jwt_authentication_request.py
 src/api_requester/dto/admin/user_on_board_dto.py
+src/api_requester/http/__init__.py
 src/api_requester/http/app_url.py
 src/api_requester/http/authorize.py
 src/api_requester/http/eclinical_requests.py
@@ -26,6 +38,7 @@ src/api_requester/http/exceptions.py
 src/api_requester/http/gateway.py
 src/api_requester/http/sample_headers.py
 src/api_requester/http/token_manager.py
+src/api_requester/utils/__init__.py
 src/api_requester/utils/constant.py
 src/api_requester/utils/json_utils.py
 src/api_requester/utils/lib.py

{eclinical_requester-1.0.5 → eclinical_requester-1.0.7}/src/eclinical_requester.egg-info/requires.txt

@@ -1,6 +1,6 @@
 lxml>=4.8.0
-requests>=2.32.0
-PyYAML>=6.0.1
+requests>=2.28.2
+PyYAML>=6.0
 requests-toolbelt>=1.0.0
 python-dateutil>=2.9.0.post0
 numpy>=1.23.4