cmsdials 1.5.0__tar.gz → 1.6.0__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 (52) hide show
  1. {cmsdials-1.5.0 → cmsdials-1.6.0}/PKG-INFO +1 -1
  2. cmsdials-1.6.0/cmsdials/__init__.py +5 -0
  3. cmsdials-1.6.0/cmsdials/_version.py +1 -0
  4. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/client.py +3 -0
  5. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/oms_proxy/client.py +4 -1
  6. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/utils/api_client.py +13 -1
  7. {cmsdials-1.5.0 → cmsdials-1.6.0}/pyproject.toml +6 -3
  8. cmsdials-1.5.0/cmsdials/__init__.py +0 -4
  9. {cmsdials-1.5.0 → cmsdials-1.6.0}/LICENSE +0 -0
  10. {cmsdials-1.5.0 → cmsdials-1.6.0}/README.md +0 -0
  11. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/__init__.py +0 -0
  12. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/_base.py +0 -0
  13. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/bearer.py +0 -0
  14. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/exceptions.py +0 -0
  15. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/models.py +0 -0
  16. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/auth/secret_key.py +0 -0
  17. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/__init__.py +0 -0
  18. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/dataset_index/__init__.py +0 -0
  19. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/dataset_index/client.py +0 -0
  20. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/dataset_index/models.py +0 -0
  21. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/file_index/__init__.py +0 -0
  22. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/file_index/client.py +0 -0
  23. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/file_index/models.py +0 -0
  24. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/h1d/__init__.py +0 -0
  25. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/h1d/client.py +0 -0
  26. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/h1d/models.py +0 -0
  27. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/h2d/__init__.py +0 -0
  28. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/h2d/client.py +0 -0
  29. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/h2d/models.py +0 -0
  30. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/lumisection/__init__.py +0 -0
  31. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/lumisection/client.py +0 -0
  32. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/lumisection/models.py +0 -0
  33. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/mes/__init__.py +0 -0
  34. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/mes/client.py +0 -0
  35. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/mes/models.py +0 -0
  36. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/ml_bad_lumisection/__init__.py +0 -0
  37. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/ml_bad_lumisection/client.py +0 -0
  38. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/ml_bad_lumisection/models.py +0 -0
  39. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/ml_models_index/__init__.py +0 -0
  40. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/ml_models_index/client.py +0 -0
  41. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/ml_models_index/models.py +0 -0
  42. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/oms_proxy/__init__.py +0 -0
  43. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/oms_proxy/models.py +0 -0
  44. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/run/__init__.py +0 -0
  45. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/run/client.py +0 -0
  46. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/clients/run/models.py +0 -0
  47. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/cmsdials.py +0 -0
  48. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/filters.py +0 -0
  49. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/utils/__init__.py +0 -0
  50. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/utils/_json.py +0 -0
  51. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/utils/base_model.py +0 -0
  52. {cmsdials-1.5.0 → cmsdials-1.6.0}/cmsdials/utils/logger.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cmsdials
3
- Version: 1.5.0
3
+ Version: 1.6.0
4
4
  Summary: The Python api client interface to DIALS service
5
5
  Home-page: https://github.com/cms-DQM/dials-py
6
6
  Author: Gabriel Moreira
@@ -0,0 +1,5 @@
1
+ from ._version import __version__
2
+ from .cmsdials import Dials
3
+
4
+
5
+ __all__ = ["__version__", "Dials"]
@@ -0,0 +1 @@
1
+ __version__ = "1.6.0"
@@ -25,6 +25,7 @@ class AuthClient(BaseAPIClient):
25
25
  url=endpoint_url,
26
26
  headers={
27
27
  "accept": "application/json",
28
+ "User-Agent": self._build_user_agent()
28
29
  },
29
30
  timeout=self.default_timeout,
30
31
  )
@@ -39,6 +40,7 @@ class AuthClient(BaseAPIClient):
39
40
  headers={
40
41
  "accept": "application/json",
41
42
  "Content-Type": "application/json",
43
+ "User-Agent": self._build_user_agent()
42
44
  },
43
45
  json={"device_code": device_code},
44
46
  timeout=self.default_timeout,
@@ -65,6 +67,7 @@ class AuthClient(BaseAPIClient):
65
67
  "accept": "application/json",
66
68
  "Content-Type": "application/json",
67
69
  "Authorization": f"{token_type} {access_token}",
70
+ "User-Agent": self._build_user_agent()
68
71
  },
69
72
  json={"refresh_token": refresh_token},
70
73
  timeout=self.default_timeout,
@@ -23,7 +23,10 @@ class OMSProxyClient(BaseAPIClient):
23
23
  self.creds = creds
24
24
 
25
25
  def _build_headers(self) -> dict:
26
- base = {"accept": "application/json"}
26
+ base = {
27
+ "accept": "application/json",
28
+ "User-Agent": self._build_user_agent()
29
+ }
27
30
  self.creds.before_request(base)
28
31
  return base
29
32
 
@@ -1,13 +1,16 @@
1
+ import sys
1
2
  from importlib import util as importlib_util
2
3
  from traceback import format_exc
3
4
  from typing import Optional
4
5
  from urllib.parse import parse_qs, urlparse
5
6
  from warnings import warn
6
7
 
8
+ import requests
7
9
  from requests import Response, Session
8
10
  from requests.adapters import DEFAULT_RETRIES, HTTPAdapter
9
11
  from requests.exceptions import HTTPError
10
12
 
13
+ from .._version import __version__
11
14
  from ..auth._base import BaseCredentials
12
15
  from ..utils.logger import logger
13
16
 
@@ -51,6 +54,12 @@ class BaseAPIClient:
51
54
  ret = s.get(*args, **kwargs)
52
55
  return ret
53
56
 
57
+ @staticmethod
58
+ def _build_user_agent():
59
+ py_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
60
+ req_version = requests.__version__
61
+ return f"dials-py/{__version__} (python/{py_version}, python-requests/{req_version})"
62
+
54
63
  @property
55
64
  def api_url(self):
56
65
  return self.base_url + self.route + self.version
@@ -75,7 +84,10 @@ class BaseAuthorizedAPIClient(BaseAPIClient):
75
84
  self.workspace = workspace
76
85
 
77
86
  def _build_headers(self) -> dict:
78
- base = {"accept": "application/json"}
87
+ base = {
88
+ "accept": "application/json",
89
+ "User-Agent": self._build_user_agent()
90
+ }
79
91
  if self.workspace is not None:
80
92
  base["Workspace"] = self.workspace
81
93
  self.creds.before_request(base)
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "cmsdials"
3
- version = "1.5.0"
3
+ version = "1.6.0"
4
4
  description = "The Python api client interface to DIALS service"
5
5
  authors = ["Gabriel Moreira <gabrielmscampos@gmail.com>"]
6
6
  readme = "README.md"
@@ -130,6 +130,9 @@ lines-after-imports = 2
130
130
  "**/{tests,docs}/*" = ["E402", "F403", "F405", "S", "N802"]
131
131
  "**/*test*.py" = ["E402", "F403", "F405", "S", "N802"]
132
132
 
133
+ [tool.poetry-dynamic-versioning]
134
+ enable = false
135
+
133
136
  [build-system]
134
- requires = ["poetry-core"]
135
- build-backend = "poetry.core.masonry.api"
137
+ requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
138
+ build-backend = "poetry_dynamic_versioning.backend"
@@ -1,4 +0,0 @@
1
- from .cmsdials import Dials
2
-
3
-
4
- __all__ = ["Dials"]
File without changes
File without changes
File without changes
File without changes