foundry-dev-tools 2.0.1__tar.gz → 2.1.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 (71) hide show
  1. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/PKG-INFO +1 -1
  2. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/pyproject.toml +1 -1
  3. foundry_dev_tools-2.1.0/src/foundry_dev_tools/__about__.py +1 -0
  4. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/config.py +59 -20
  5. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/compat.py +10 -14
  6. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/config.py +2 -2
  7. foundry_dev_tools-2.0.1/src/foundry_dev_tools/__about__.py +0 -1
  8. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/README.md +0 -0
  9. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/__init__.py +0 -0
  10. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/__init__.py +0 -0
  11. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pandas.py +0 -0
  12. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/polars.py +0 -0
  13. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pyarrow.py +0 -0
  14. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pyspark.py +0 -0
  15. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cached_foundry_client.py +0 -0
  16. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/__init__.py +0 -0
  17. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/build.py +0 -0
  18. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/config.py +0 -0
  19. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/git.py +0 -0
  20. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/git_credential_foundry.py +0 -0
  21. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/info.py +0 -0
  22. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/main.py +0 -0
  23. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/s3.py +0 -0
  24. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/stubs.py +0 -0
  25. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/__init__.py +0 -0
  26. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/api_client.py +0 -0
  27. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/build2.py +0 -0
  28. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/catalog.py +0 -0
  29. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/compass.py +0 -0
  30. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/context_client.py +0 -0
  31. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/data_proxy.py +0 -0
  32. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/foundry_sql_server.py +0 -0
  33. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/foundry_stats.py +0 -0
  34. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/jemma.py +0 -0
  35. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/metadata.py +0 -0
  36. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/multipass.py +0 -0
  37. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/public_ontologies_client.py +0 -0
  38. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/s3_client.py +0 -0
  39. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/schema_inference.py +0 -0
  40. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/__init__.py +0 -0
  41. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/config_types.py +0 -0
  42. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/context.py +0 -0
  43. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/token_provider.py +0 -0
  44. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/__init__.py +0 -0
  45. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/compass.py +0 -0
  46. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/config.py +0 -0
  47. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/dataset.py +0 -0
  48. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/handling.py +0 -0
  49. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/meta.py +0 -0
  50. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/sql.py +0 -0
  51. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/foundry_api_client.py +0 -0
  52. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/py.typed +0 -0
  53. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/__init__.py +0 -0
  54. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/dataset.py +0 -0
  55. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/folder.py +0 -0
  56. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/resource.py +0 -0
  57. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/__init__.py +0 -0
  58. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/api_types.py +0 -0
  59. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/async_s3.py +0 -0
  60. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/__init__.py +0 -0
  61. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/metadata_store.py +0 -0
  62. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/spark_caches.py +0 -0
  63. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/cli.py +0 -0
  64. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/clients.py +0 -0
  65. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/converter/__init__.py +0 -0
  66. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/converter/foundry_spark.py +0 -0
  67. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/misc.py +0 -0
  68. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/public_api_types.py +0 -0
  69. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/repo.py +0 -0
  70. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/s3.py +0 -0
  71. {foundry_dev_tools-2.0.1 → foundry_dev_tools-2.1.0}/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.0.1
3
+ Version: 2.1.0
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.0.1"
44
+ version = "2.1.0"
45
45
 
46
46
  [project.license]
47
47
  text = "Apache-2.0"
@@ -0,0 +1 @@
1
+ __version__ = '2.1.0'
@@ -11,7 +11,6 @@ from foundry_dev_tools.config.config_types import Host
11
11
  from foundry_dev_tools.config.token_provider import (
12
12
  TOKEN_PROVIDER_MAPPING,
13
13
  AppServiceTokenProvider,
14
- JWTTokenProvider,
15
14
  TokenProvider,
16
15
  )
17
16
  from foundry_dev_tools.errors.config import (
@@ -130,6 +129,20 @@ def _pure_config_dict(env: bool = True) -> dict:
130
129
  return config
131
130
 
132
131
 
132
+ def _find_token_provider(credentials: dict) -> str | None:
133
+ # go backwards, to use the last defined token provider in the config
134
+ for k in reversed(credentials):
135
+ if k in TOKEN_PROVIDER_MAPPING:
136
+ return k
137
+ return None
138
+
139
+
140
+ MISSING_TP_ERROR = TokenProviderConfigError(
141
+ "To authenticate with Foundry you need a TokenProvider. The token provider can be configured either via the"
142
+ " configuration file or the token_provider FoundryContext parameter."
143
+ )
144
+
145
+
133
146
  def get_config_dict(profile: str | None = None, env: bool = True) -> dict | None:
134
147
  """Loads config from the config files and environment variables.
135
148
 
@@ -158,13 +171,43 @@ def get_config_dict(profile: str | None = None, env: bool = True) -> dict | None
158
171
  if profile in ("config", "credentials"):
159
172
  msg = f"Profile name can't be {profile}"
160
173
  raise AttributeError(msg)
161
- if profile is not None and (profile_config := config.get(profile)) and isinstance(profile_config, dict):
162
- # merge the profile config with the non-prefixed config
163
- config = {
164
- "config": merge_dicts(config.get("config", {}), profile_config.get("config", {})),
165
- "credentials": merge_dicts(config.get("credentials", {}), profile_config.get("credentials", {})),
166
- }
167
- return config
174
+ if profile and (profile_config := config.get(profile)) and isinstance(profile_config, dict):
175
+ profile_credentials = profile_config.get("credentials", {})
176
+ profile_config = profile_config.get("config", {})
177
+ else:
178
+ # use an empty profile config if no profile is specified
179
+ # this aims to reduce duplicate code
180
+ # but is going to do useless operations
181
+ profile_credentials = {}
182
+ profile_config = {}
183
+
184
+ default_credentials = config.get("credentials", {})
185
+ domain = profile_credentials.pop("domain", default_credentials.pop("domain", None))
186
+ # a domain must always be provided
187
+ if not domain:
188
+ raise MissingFoundryHostError
189
+
190
+ scheme = profile_credentials.pop("scheme", default_credentials.pop("scheme", None))
191
+
192
+ # decide which will be the token provider used
193
+ token_provider_name = _find_token_provider(profile_credentials) or _find_token_provider(default_credentials)
194
+ if not token_provider_name:
195
+ raise MISSING_TP_ERROR
196
+ # merge the profile config with the non-prefixed config
197
+ return_config = {}
198
+ merged_config = merge_dicts(config.get("config", {}), profile_config.get("config", {}))
199
+ if merged_config:
200
+ return_config["config"] = merged_config
201
+ return_config["credentials"] = {
202
+ "domain": domain,
203
+ token_provider_name: merge_dicts(
204
+ default_credentials.get(token_provider_name), profile_credentials.get(token_provider_name)
205
+ ),
206
+ }
207
+
208
+ if scheme is not None:
209
+ return_config["credentials"]["scheme"] = scheme
210
+ return return_config
168
211
 
169
212
 
170
213
  def parse_credentials_config(config_dict: dict | None) -> TokenProvider:
@@ -178,8 +221,13 @@ def parse_credentials_config(config_dict: dict | None) -> TokenProvider:
178
221
  # create a host object with the domain and the optional scheme setting
179
222
  host = Host(credentials_config.pop("domain"), credentials_config.pop("scheme", None))
180
223
  # get the token provider config setting, if it does not exist use an empty dict
181
- token_provider = credentials_config.pop("token_provider", {})
182
- tp_name, tp_config = token_provider.get("name"), token_provider.get("config", {})
224
+ try:
225
+ tp_name, tp_config = credentials_config.popitem()
226
+ # make it possible to do jwt = "eyJ" instead of jwt = {jwt="eyJ"}
227
+ if not isinstance(tp_config, dict):
228
+ tp_config = {tp_name: tp_config}
229
+ except KeyError:
230
+ tp_name, tp_config = None, None
183
231
 
184
232
  if tp_name:
185
233
  if mapped_class := TOKEN_PROVIDER_MAPPING.get(tp_name):
@@ -190,19 +238,10 @@ def parse_credentials_config(config_dict: dict | None) -> TokenProvider:
190
238
  msg = f"The token provider implementation {tp_name} does not exist."
191
239
  raise TokenProviderConfigError(msg)
192
240
 
193
- # the jwt token provider needs a config
194
- if tp_config:
195
- ci = check_init(JWTTokenProvider, "credentials", {"host": host, **tp_config})
196
- return JWTTokenProvider(**ci)
197
-
198
241
  # use flask/dash/streamlit provider when used in the app service
199
242
  if "APP_SERVICE_TS" in os.environ:
200
243
  return AppServiceTokenProvider(host=host)
201
- msg = (
202
- "To authenticate with Foundry you need a TokenProvider. The token provider can be configured either via the"
203
- " configuration file or the token_provider FoundryContext parameter."
204
- )
205
- raise TokenProviderConfigError(msg)
244
+ raise MISSING_TP_ERROR
206
245
  raise MissingCredentialsConfigError
207
246
 
208
247
 
@@ -7,6 +7,7 @@ import warnings
7
7
  from urllib.parse import urlparse
8
8
 
9
9
  from foundry_dev_tools.config.config import TokenProvider, get_config_dict, parse_credentials_config
10
+ from foundry_dev_tools.config.config_types import DEFAULT_SCHEME
10
11
 
11
12
 
12
13
  def v1_to_v2_config_dict(config: dict, env: bool = True, get_config: bool = True) -> dict: # noqa: C901
@@ -30,8 +31,6 @@ def v1_to_v2_config_dict(config: dict, env: bool = True, get_config: bool = True
30
31
  scheme = None
31
32
  if jwt or foundry_url or client_id is not False:
32
33
  _config.setdefault("credentials", {})
33
- if jwt or client_id is not False:
34
- _config["credentials"].setdefault("token_provider", {})
35
34
 
36
35
  if foundry_url:
37
36
  parsed_foundry_url = urlparse(foundry_url)
@@ -44,25 +43,22 @@ def v1_to_v2_config_dict(config: dict, env: bool = True, get_config: bool = True
44
43
  if scheme:
45
44
  _config["credentials"]["scheme"] = scheme
46
45
 
47
- elif domain := _config.get("credentials", {}).get("domain"):
48
- scheme = _config.get("credentials", {}).get("scheme")
46
+ if "credentials" in _config and (scheme := _config["credentials"].get("scheme")) and scheme == DEFAULT_SCHEME:
47
+ del _config["credentials"]["scheme"]
49
48
 
50
49
  if jwt:
51
- _config["credentials"]["token_provider"]["name"] = "jwt"
52
- _config["credentials"]["token_provider"]["config"] = {"jwt": jwt}
50
+ _config["credentials"]["jwt"] = jwt
53
51
  elif client_id is not False:
54
- _config["credentials"]["token_provider"]["name"] = "oauth"
55
- _config["credentials"]["token_provider"].setdefault("config", {})
56
- _config["credentials"]["token_provider"]["config"].pop("jwt", None)
57
- _config["credentials"]["token_provider"]["config"]["client_id"] = client_id
52
+ _config["credentials"].setdefault("oauth", {})
53
+ _config["credentials"]["oauth"]["client_id"] = client_id
58
54
 
59
- if _config.get("credentials", {}).get("token_provider", {}).get("name") == "oauth":
55
+ if "oauth" in _config.get("credentials", {}):
60
56
  if client_secret is not False:
61
- _config["credentials"]["token_provider"]["config"]["client_secret"] = client_secret
57
+ _config["credentials"]["oauth"]["client_secret"] = client_secret
62
58
  if grant_type is not False:
63
- _config["credentials"]["token_provider"]["config"]["grant_type"] = grant_type
59
+ _config["credentials"]["oauth"]["grant_type"] = grant_type
64
60
  if scopes is not False:
65
- _config["credentials"]["token_provider"]["config"]["scopes"] = scopes
61
+ _config["credentials"]["oauth"]["scopes"] = scopes
66
62
  return _config
67
63
 
68
64
 
@@ -88,7 +88,7 @@ def merge_dicts(a: dict, b: dict) -> dict:
88
88
  else:
89
89
  a[k] = b[k]
90
90
  return a
91
- return b
91
+ return b if b is not None else a
92
92
 
93
93
 
94
94
  def path_from_path_or_str(path: Path | PathLike[str] | str) -> Path:
@@ -144,7 +144,7 @@ def get_environment_variable_config() -> dict:
144
144
  from foundry_dev_tools.utils.compat import get_v1_environment_variables # otherwise circular import
145
145
 
146
146
  v1_env_dict = get_v1_environment_variables()
147
- return merge_dicts(env_dict, v1_env_dict)
147
+ return merge_dicts(v1_env_dict, env_dict)
148
148
 
149
149
 
150
150
  def _try_convert_to_bool(value: Any) -> Any: # noqa: ANN401
@@ -1 +0,0 @@
1
- __version__ = '2.0.1'