foundry-dev-tools 2.1.16__tar.gz → 2.1.17__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 (81) hide show
  1. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/PKG-INFO +1 -1
  2. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/pyproject.toml +1 -1
  3. foundry_dev_tools-2.1.17/src/foundry_dev_tools/__about__.py +1 -0
  4. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/context_client.py +4 -3
  5. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/config/config.py +3 -3
  6. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/config/context.py +1 -3
  7. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/config/token_provider.py +40 -20
  8. foundry_dev_tools-2.1.17/src/foundry_dev_tools/errors/multipass.py +23 -0
  9. foundry_dev_tools-2.1.16/src/foundry_dev_tools/__about__.py +0 -1
  10. foundry_dev_tools-2.1.16/src/foundry_dev_tools/errors/multipass.py +0 -9
  11. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/README.md +0 -0
  12. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/__init__.py +0 -0
  13. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/_optional/__init__.py +0 -0
  14. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/_optional/pandas.py +0 -0
  15. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/_optional/polars.py +0 -0
  16. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/_optional/pyarrow.py +0 -0
  17. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/_optional/pyspark.py +0 -0
  18. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cached_foundry_client.py +0 -0
  19. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/__init__.py +0 -0
  20. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/build.py +0 -0
  21. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/config.py +0 -0
  22. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/git.py +0 -0
  23. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/git_credential_foundry.py +0 -0
  24. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/info.py +0 -0
  25. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/main.py +0 -0
  26. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/s3.py +0 -0
  27. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/cli/stubs.py +0 -0
  28. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/__init__.py +0 -0
  29. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/api_client.py +0 -0
  30. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/build2.py +0 -0
  31. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/catalog.py +0 -0
  32. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/compass.py +0 -0
  33. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/data_proxy.py +0 -0
  34. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/foundry_sql_server.py +0 -0
  35. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/foundry_stats.py +0 -0
  36. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/jemma.py +0 -0
  37. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/magritte_coordinator.py +0 -0
  38. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/metadata.py +0 -0
  39. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/multipass.py +0 -0
  40. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/public_ontologies_client.py +0 -0
  41. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/s3_client.py +0 -0
  42. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/scheduler.py +0 -0
  43. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/schema_inference.py +0 -0
  44. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/clients/tables.py +0 -0
  45. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/config/__init__.py +0 -0
  46. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/config/config_types.py +0 -0
  47. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/__init__.py +0 -0
  48. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/compass.py +0 -0
  49. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/config.py +0 -0
  50. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/dataset.py +0 -0
  51. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/handling.py +0 -0
  52. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/meta.py +0 -0
  53. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/errors/sql.py +0 -0
  54. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/foundry_api_client.py +0 -0
  55. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/helpers/__init__.py +0 -0
  56. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/helpers/multipass/__init__.py +0 -0
  57. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/helpers/multipass/group.py +0 -0
  58. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/helpers/multipass/principal.py +0 -0
  59. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/helpers/multipass/user.py +0 -0
  60. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/py.typed +0 -0
  61. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/resources/__init__.py +0 -0
  62. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/resources/dataset.py +0 -0
  63. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/resources/folder.py +0 -0
  64. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/resources/resource.py +0 -0
  65. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/__init__.py +0 -0
  66. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/api_types.py +0 -0
  67. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/async_s3.py +0 -0
  68. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/caches/__init__.py +0 -0
  69. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/caches/metadata_store.py +0 -0
  70. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/caches/spark_caches.py +0 -0
  71. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/cli.py +0 -0
  72. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/clients.py +0 -0
  73. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/compat.py +0 -0
  74. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/config.py +0 -0
  75. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/converter/__init__.py +0 -0
  76. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/converter/foundry_spark.py +0 -0
  77. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/misc.py +0 -0
  78. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/public_api_types.py +0 -0
  79. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/repo.py +0 -0
  80. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/s3.py +0 -0
  81. {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.17}/src/foundry_dev_tools/utils/spark.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: foundry-dev-tools
3
- Version: 2.1.16
3
+ Version: 2.1.17
4
4
  Summary: Seamlessly run your Palantir Foundry Repository transforms code on your local machine.
5
5
  Author-Email: Nicolas Renkamp <nicolas.renkamp@merckgroup.com>, Jonas Wunderlich <jonas.wunderlich@merckgroup.com>
6
6
  License: Apache-2.0
@@ -41,7 +41,7 @@ dependencies = [
41
41
  "tomli_w",
42
42
  ]
43
43
  dynamic = []
44
- version = "2.1.16"
44
+ version = "2.1.17"
45
45
 
46
46
  [project.license]
47
47
  text = "Apache-2.0"
@@ -0,0 +1 @@
1
+ __version__ = '2.1.17'
@@ -4,8 +4,10 @@ from __future__ import annotations
4
4
 
5
5
  import logging
6
6
  import numbers
7
+ import os
7
8
  import time
8
9
  import typing
10
+ from pathlib import Path
9
11
  from typing import TYPE_CHECKING
10
12
 
11
13
  import requests
@@ -72,8 +74,9 @@ class ContextHTTPClient(requests.Session):
72
74
 
73
75
  def __init__(self, debug: bool = False, requests_ca_bundle: PathLike[str] | None = None) -> None:
74
76
  self.debug = debug
75
- self.requests_ca_bundle = requests_ca_bundle
76
77
  super().__init__()
78
+ if requests_ca_bundle is not None and Path(requests_ca_bundle).is_file():
79
+ self.verify = os.fspath(requests_ca_bundle)
77
80
 
78
81
  self._counter = 0
79
82
 
@@ -117,8 +120,6 @@ class ContextHTTPClient(requests.Session):
117
120
  cert: see :py:meth:`requests.Session.request`
118
121
  json: see :py:meth:`requests.Session.request`
119
122
  """
120
- if verify is None and (rcab := self.requests_ca_bundle) is not None:
121
- verify = rcab
122
123
  if self.debug:
123
124
  self._counter = count = self._counter + 1
124
125
  LOGGER.debug(f"(r{count}) Making {method!s} request to {url!s}") # noqa: G004
@@ -46,14 +46,14 @@ class Config:
46
46
 
47
47
  def __init__(
48
48
  self,
49
- requests_ca_bundle: PathLike[str] | None = None,
49
+ requests_ca_bundle: PathLike[str] | str | None = None,
50
50
  transforms_sql_sample_row_limit: int = 5000,
51
51
  transforms_sql_dataset_size_threshold: int = 500,
52
52
  transforms_sql_sample_select_random: bool = False,
53
53
  transforms_force_full_dataset_download: bool = False,
54
- cache_dir: PathLike[str] | None = None,
54
+ cache_dir: PathLike[str] | str | None = None,
55
55
  transforms_freeze_cache: bool = False,
56
- transforms_output_folder: PathLike[str] | None = None,
56
+ transforms_output_folder: PathLike[str] | str | None = None,
57
57
  rich_traceback: bool = False,
58
58
  debug: bool = False,
59
59
  requests_session: requests.Session | None = None,
@@ -2,7 +2,6 @@
2
2
 
3
3
  from __future__ import annotations
4
4
 
5
- import os
6
5
  from functools import cached_property, partial
7
6
  from typing import TYPE_CHECKING
8
7
 
@@ -69,12 +68,11 @@ class FoundryContext:
69
68
  else:
70
69
  self.client = self.config.requests_session
71
70
 
71
+ self.token_provider.set_requests_session(self.client)
72
72
  self.client.auth = lambda r: self.token_provider.requests_auth_handler(r)
73
73
  self.client.headers["User-Agent"] = requests.utils.default_user_agent(
74
74
  f"foundry-dev-tools/{__version__}/python-requests"
75
75
  )
76
- if self.config.requests_ca_bundle:
77
- self.verify = os.fspath(self.config.requests_ca_bundle)
78
76
 
79
77
  if self.config.rich_traceback:
80
78
  from rich.traceback import install
@@ -13,7 +13,8 @@ from requests.structures import CaseInsensitiveDict
13
13
 
14
14
  from foundry_dev_tools.config.config_types import Host
15
15
  from foundry_dev_tools.errors.config import TokenProviderConfigError
16
- from foundry_dev_tools.errors.meta import FoundryAPIError
16
+ from foundry_dev_tools.errors.handling import ErrorHandlingConfig, raise_foundry_api_error
17
+ from foundry_dev_tools.errors.multipass import ClientAuthenticationFailedError
17
18
  from foundry_dev_tools.utils.config import entry_point_fdt_token_provider
18
19
 
19
20
  if TYPE_CHECKING:
@@ -52,6 +53,9 @@ class TokenProvider:
52
53
  r.headers.setdefault("authorization", f"Bearer {self.token}")
53
54
  return r
54
55
 
56
+ def set_requests_session(self, session: requests.Session) -> None:
57
+ """No-op by default."""
58
+
55
59
 
56
60
  class JWTTokenProvider(TokenProvider):
57
61
  """Provides Host and Token."""
@@ -150,6 +154,7 @@ class OAuthTokenProvider(CachedTokenProvider):
150
154
  self.scopes = DEFAULT_OAUTH_SCOPES
151
155
  else:
152
156
  self.scopes = scopes
157
+ self._requests_session = requests.Session()
153
158
 
154
159
  def _scopes_to_list(self, scopes: list[str] | str | None) -> list[str] | None:
155
160
  if scopes is not None and isinstance(scopes, str):
@@ -168,27 +173,38 @@ class OAuthTokenProvider(CachedTokenProvider):
168
173
  )
169
174
  return credentials.token, credentials.expiry.timestamp()
170
175
  if self.grant_type == "client_credentials" and self._client_secret is not None:
171
- resp = requests.request(
172
- "POST",
173
- f"{self.host.url}/multipass/api/oauth2/token",
174
- data={"grant_type": "client_credentials", "scope": " ".join(self.scopes)}
175
- if self.scopes
176
- else {"grant_type": "client_credentials"},
177
- headers={
178
- "Content-Type": "application/x-www-form-urlencoded",
179
- "Authorization": "Basic "
180
- + base64.b64encode(
181
- bytes(
182
- self._client_id + ":" + self._client_secret,
183
- "ISO-8859-1",
184
- ),
185
- ).decode("ascii"),
186
- },
187
- timeout=30,
176
+ # since we share the same requests session everywhere and on this session
177
+ # the auth is set to a lambda function we need to manually disable this
178
+ # for the single token call
179
+ auth_handler = self._requests_session.auth
180
+ self._requests_session.auth = None
181
+ try:
182
+ resp = self._requests_session.request(
183
+ "POST",
184
+ f"{self.host.url}/multipass/api/oauth2/token",
185
+ data={"grant_type": "client_credentials", "scope": " ".join(self.scopes)}
186
+ if self.scopes
187
+ else {"grant_type": "client_credentials"},
188
+ headers={
189
+ "Content-Type": "application/x-www-form-urlencoded",
190
+ "Authorization": "Basic "
191
+ + base64.b64encode(
192
+ bytes(
193
+ self._client_id + ":" + self._client_secret,
194
+ "ISO-8859-1",
195
+ ),
196
+ ).decode("ascii"),
197
+ },
198
+ timeout=30,
199
+ )
200
+ finally:
201
+ # add original auth handler again
202
+ self._requests_session.auth = auth_handler
203
+ raise_foundry_api_error(
204
+ resp,
205
+ error_handling=ErrorHandlingConfig({401: ClientAuthenticationFailedError}, client_id=self._client_id),
188
206
  )
189
207
  credentials = resp.json()
190
- if "error" in credentials:
191
- raise FoundryAPIError(resp)
192
208
  return credentials["access_token"], credentials["expires_in"] + time.time()
193
209
  if self._client_secret is None:
194
210
  msg = f"For grant type {self.grant_type} you need to set a client_secret."
@@ -197,6 +213,10 @@ class OAuthTokenProvider(CachedTokenProvider):
197
213
  msg = f"Grant type {self.grant_type} is not implemented."
198
214
  raise NotImplementedError(msg)
199
215
 
216
+ def set_requests_session(self, session: requests.Session) -> None:
217
+ """Sets request session used for client credentials grant.."""
218
+ self._requests_session = session
219
+
200
220
 
201
221
  class AppServiceTokenProvider(CachedTokenProvider):
202
222
  """Token Provider for the AppService, which gets the token via a header from flask/dash/streamlit."""
@@ -0,0 +1,23 @@
1
+ """Multipass specific errors."""
2
+
3
+ import requests
4
+
5
+ from foundry_dev_tools.errors.meta import FoundryAPIError
6
+
7
+
8
+ class DuplicateGroupNameError(FoundryAPIError):
9
+ """Exception is thrown when the group name already exists."""
10
+
11
+ message = "The group name already exists!"
12
+
13
+
14
+ class ClientAuthenticationFailedError(FoundryAPIError):
15
+ """Exception is thrown when client credentials grant failed."""
16
+
17
+ def __init__(
18
+ self, response: requests.Response | None = None, info: str | None = None, client_id: str | None = None
19
+ ):
20
+ self.client_id = client_id
21
+ self.message = "Client authentication failed (invalid_client)."
22
+
23
+ super().__init__(response=response, info=info, client_id=client_id)
@@ -1 +0,0 @@
1
- __version__ = '2.1.16'
@@ -1,9 +0,0 @@
1
- """Multipass specific errors."""
2
-
3
- from foundry_dev_tools.errors.meta import FoundryAPIError
4
-
5
-
6
- class DuplicateGroupNameError(FoundryAPIError):
7
- """Exception is thrown when the group name already exists."""
8
-
9
- message = "The group name already exists!"