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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. {eclinical_requester-1.0.5/src/eclinical_requester.egg-info → eclinical_requester-1.0.6}/PKG-INFO +2 -2
  2. eclinical_requester-1.0.6/pyproject.toml +3 -0
  3. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/setup.py +4 -1
  4. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/__init__.py +1 -1
  5. eclinical_requester-1.0.6/src/api_requester/core/__init__.py +0 -0
  6. eclinical_requester-1.0.6/src/api_requester/core/admin/__init__.py +0 -0
  7. eclinical_requester-1.0.6/src/api_requester/core/admin/api/__init__.py +0 -0
  8. eclinical_requester-1.0.6/src/api_requester/core/admin/service/__init__.py +0 -0
  9. eclinical_requester-1.0.6/src/api_requester/core/admin/service/impl/__init__.py +0 -0
  10. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/call_api.py +10 -12
  11. eclinical_requester-1.0.6/src/api_requester/core/common/__init__.py +0 -0
  12. eclinical_requester-1.0.6/src/api_requester/core/common/api/__init__.py +0 -0
  13. eclinical_requester-1.0.6/src/api_requester/core/common/service/__init__.py +0 -0
  14. eclinical_requester-1.0.6/src/api_requester/dto/__init__.py +0 -0
  15. eclinical_requester-1.0.6/src/api_requester/dto/admin/__init__.py +0 -0
  16. eclinical_requester-1.0.6/src/api_requester/http/__init__.py +0 -0
  17. eclinical_requester-1.0.6/src/api_requester/utils/__init__.py +0 -0
  18. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6/src/eclinical_requester.egg-info}/PKG-INFO +2 -2
  19. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/eclinical_requester.egg-info/SOURCES.txt +13 -0
  20. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/eclinical_requester.egg-info/requires.txt +1 -1
  21. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/LICENSE +0 -0
  22. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/MANIFEST.in +0 -0
  23. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/README.md +0 -0
  24. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/setup.cfg +0 -0
  25. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/admin/api/auth_api.py +0 -0
  26. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/admin/api/user_on_board_application_api.py +0 -0
  27. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/admin/service/auth_service.py +0 -0
  28. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/admin/service/impl/system_env_service_impl.py +0 -0
  29. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/admin/service/impl/user_on_board_application_service_impl.py +0 -0
  30. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/admin/service/user_on_board_application_service.py +0 -0
  31. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/common/api/system_env_api.py +0 -0
  32. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/common/service/system_env_service.py +0 -0
  33. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/docs/application.yaml +0 -0
  34. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/dto/admin/cross_user_user_on_board_dto.py +0 -0
  35. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/dto/admin/jwt_authentication_request.py +0 -0
  36. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/dto/admin/user_on_board_dto.py +0 -0
  37. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/dto/base_dto.py +0 -0
  38. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/dto/biz_base.py +0 -0
  39. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/dto/user.py +0 -0
  40. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/app_url.py +0 -0
  41. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/authorize.py +0 -0
  42. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/eclinical_requests.py +0 -0
  43. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/exceptions.py +0 -0
  44. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/gateway.py +0 -0
  45. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/sample_headers.py +0 -0
  46. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/http/token_manager.py +0 -0
  47. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/constant.py +0 -0
  48. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/json_utils.py +0 -0
  49. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/lib.py +0 -0
  50. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/log.py +0 -0
  51. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/path.py +0 -0
  52. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/placeholder_replacer.py +0 -0
  53. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/read_file.py +0 -0
  54. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/rsa.py +0 -0
  55. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/utils/time_utils.py +0 -0
  56. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/eclinical_requester.egg-info/dependency_links.txt +0 -0
  57. {eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/eclinical_requester.egg-info/top_level.txt +0 -0
{eclinical_requester-1.0.5/src/eclinical_requester.egg-info → eclinical_requester-1.0.6}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: eclinical_requester
3
- Version: 1.0.5
3
+ Version: 1.0.6
4
4
  Summary: edetek api requester
5
5
  Home-page: http://example.com
6
6
  Author: xiaodong.li
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
10
10
  License-File: LICENSE
11
11
  Requires-Dist: lxml>=4.8.0
12
12
  Requires-Dist: requests>=2.32.0
13
- Requires-Dist: PyYAML>=6.0.1
13
+ Requires-Dist: PyYAML>=6.0
14
14
  Requires-Dist: requests-toolbelt>=1.0.0
15
15
  Requires-Dist: python-dateutil>=2.9.0.post0
16
16
  Requires-Dist: numpy>=1.23.4
eclinical_requester-1.0.6/pyproject.toml ADDED
@@ -0,0 +1,3 @@
1
+ [build-system]
2
+ requires = ["setuptools", "wheel"]
3
+ build-backend = "setuptools.build_meta"
{eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/setup.py RENAMED
@@ -32,7 +32,7 @@ setuptools.setup(
32
32
  install_requires=[
33
33
  'lxml>=4.8.0',
34
34
  'requests>=2.32.0',
35
- 'PyYAML>=6.0.1',
35
+ 'PyYAML>=6.0',
36
36
  'requests-toolbelt>=1.0.0',
37
37
  'python-dateutil>=2.9.0.post0',
38
38
  'numpy>=1.23.4',
@@ -44,4 +44,7 @@ setuptools.setup(
44
44
  "Programming Language :: Python :: 3.9",
45
45
  ],
46
46
  include_package_data=True,
47
+ package_data={
48
+ 'api_requester.docs': ['*.yaml'], # 列出所有需要包含的文档类型
49
+ }
47
50
  )
{eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/__init__.py RENAMED
@@ -6,4 +6,4 @@
6
6
  @Description: Description
7
7
  @File: __init__.py.py
8
8
  """
9
- __version__ = "1.0.5"
9
+ __version__ = "1.0.6"
{eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/api_requester/core/call_api.py RENAMED
@@ -16,7 +16,7 @@ from api_requester.http.authorize import Authorize
16
16
  from api_requester.utils.placeholder_replacer import PlaceholderReplacer
17
17
 
18
18
 
19
- class CallApi(BizBase):
19
+ class ApiRequester(BizBase):
20
20
 
21
21
  def __init__(self, username=None, password=None, sponsor=None, study=None, test_env=None, app_env=None, app=None,
22
22
  company=None, role=None, external=False):
@@ -44,9 +44,15 @@ class CallApi(BizBase):
44
44
  self.user_onboard_dto = auth.user_onboard_dto
45
45
  return self
46
46
 
47
- def run(self, method, api, **kwargs):
48
- self.login()
49
- replacer = PlaceholderReplacer({
47
+ def request(self, method, api, **kwargs):
48
+ if self.user.external is False:
49
+ url = AppUrl(self.user.app, self.user.test_env).which_url(self.user.app)(api)
50
+ else:
51
+ url = AppUrl(self.user.app, self.user.test_env).external_url(api)
52
+ request(method, url, headers=self.headers, **kwargs)
53
+
54
+ def user_replacer(self):
55
+ return PlaceholderReplacer({
50
56
  "Sponsor ID": self.user_onboard_dto.sponsorId,
51
57
  "Study ID": self.user_onboard_dto.studyId,
52
58
  "Env ID": self.user_onboard_dto.envId,
@@ -54,11 +60,3 @@ class CallApi(BizBase):
54
60
  "Study Name": self.user.study,
55
61
  "Lifecycle": self.user.app_env,
56
62
  })
57
- url = replacer.replace(api)
58
- for key, value in kwargs.items():
59
- kwargs[key] = replacer.replace(value)
60
- if self.user.external is False:
61
- url = AppUrl(self.user.app, self.user.test_env).which_url(self.user.app)(url)
62
- else:
63
- url = AppUrl(self.user.app, self.user.test_env).external_url(url)
64
- request(method, url, headers=self.headers, **kwargs)
{eclinical_requester-1.0.5 → eclinical_requester-1.0.6/src/eclinical_requester.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: eclinical_requester
3
- Version: 1.0.5
3
+ Version: 1.0.6
4
4
  Summary: edetek api requester
5
5
  Home-page: http://example.com
6
6
  Author: xiaodong.li
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
10
10
  License-File: LICENSE
11
11
  Requires-Dist: lxml>=4.8.0
12
12
  Requires-Dist: requests>=2.32.0
13
- Requires-Dist: PyYAML>=6.0.1
13
+ Requires-Dist: PyYAML>=6.0
14
14
  Requires-Dist: requests-toolbelt>=1.0.0
15
15
  Requires-Dist: python-dateutil>=2.9.0.post0
16
16
  Requires-Dist: numpy>=1.23.4
{eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/eclinical_requester.egg-info/SOURCES.txt RENAMED
@@ -1,24 +1,36 @@
1
1
  LICENSE
2
2
  MANIFEST.in
3
3
  README.md
4
+ pyproject.toml
4
5
  setup.py
5
6
  src/api_requester/__init__.py
7
+ src/api_requester/core/__init__.py
6
8
  src/api_requester/core/call_api.py
9
+ src/api_requester/core/admin/__init__.py
10
+ src/api_requester/core/admin/api/__init__.py
7
11
  src/api_requester/core/admin/api/auth_api.py
8
12
  src/api_requester/core/admin/api/user_on_board_application_api.py
13
+ src/api_requester/core/admin/service/__init__.py
9
14
  src/api_requester/core/admin/service/auth_service.py
10
15
  src/api_requester/core/admin/service/user_on_board_application_service.py
16
+ src/api_requester/core/admin/service/impl/__init__.py
11
17
  src/api_requester/core/admin/service/impl/system_env_service_impl.py
12
18
  src/api_requester/core/admin/service/impl/user_on_board_application_service_impl.py
19
+ src/api_requester/core/common/__init__.py
20
+ src/api_requester/core/common/api/__init__.py
13
21
  src/api_requester/core/common/api/system_env_api.py
22
+ src/api_requester/core/common/service/__init__.py
14
23
  src/api_requester/core/common/service/system_env_service.py
15
24
  src/api_requester/docs/application.yaml
25
+ src/api_requester/dto/__init__.py
16
26
  src/api_requester/dto/base_dto.py
17
27
  src/api_requester/dto/biz_base.py
18
28
  src/api_requester/dto/user.py
29
+ src/api_requester/dto/admin/__init__.py
19
30
  src/api_requester/dto/admin/cross_user_user_on_board_dto.py
20
31
  src/api_requester/dto/admin/jwt_authentication_request.py
21
32
  src/api_requester/dto/admin/user_on_board_dto.py
33
+ src/api_requester/http/__init__.py
22
34
  src/api_requester/http/app_url.py
23
35
  src/api_requester/http/authorize.py
24
36
  src/api_requester/http/eclinical_requests.py
@@ -26,6 +38,7 @@ src/api_requester/http/exceptions.py
26
38
  src/api_requester/http/gateway.py
27
39
  src/api_requester/http/sample_headers.py
28
40
  src/api_requester/http/token_manager.py
41
+ src/api_requester/utils/__init__.py
29
42
  src/api_requester/utils/constant.py
30
43
  src/api_requester/utils/json_utils.py
31
44
  src/api_requester/utils/lib.py
{eclinical_requester-1.0.5 → eclinical_requester-1.0.6}/src/eclinical_requester.egg-info/requires.txt RENAMED
@@ -1,6 +1,6 @@
1
1
  lxml>=4.8.0
2
2
  requests>=2.32.0
3
- PyYAML>=6.0.1
3
+ PyYAML>=6.0
4
4
  requests-toolbelt>=1.0.0
5
5
  python-dateutil>=2.9.0.post0
6
6
  numpy>=1.23.4