foundry-dev-tools 2.0.0__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.
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/PKG-INFO +1 -2
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/pyproject.toml +1 -2
- foundry_dev_tools-2.1.0/src/foundry_dev_tools/__about__.py +1 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/config.py +59 -20
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/dataset.py +5 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/resource.py +23 -8
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/compat.py +10 -14
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/config.py +2 -2
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/misc.py +18 -5
- foundry_dev_tools-2.0.0/src/foundry_dev_tools/__about__.py +0 -1
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/README.md +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pandas.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/polars.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pyarrow.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pyspark.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cached_foundry_client.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/build.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/config.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/git.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/git_credential_foundry.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/info.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/main.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/s3.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cli/stubs.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/api_client.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/build2.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/catalog.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/compass.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/context_client.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/data_proxy.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/foundry_sql_server.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/foundry_stats.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/jemma.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/metadata.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/multipass.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/public_ontologies_client.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/s3_client.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/schema_inference.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/config_types.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/context.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/token_provider.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/compass.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/config.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/dataset.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/handling.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/meta.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/sql.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/foundry_api_client.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/py.typed +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/folder.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/api_types.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/async_s3.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/metadata_store.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/spark_caches.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/cli.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/clients.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/converter/__init__.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/converter/foundry_spark.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/public_api_types.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/repo.py +0 -0
- {foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/s3.py +0 -0
- {foundry_dev_tools-2.0.0 → 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.
|
|
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
|
|
@@ -27,7 +27,6 @@ Requires-Dist: palantir-oauth-client
|
|
|
27
27
|
Requires-Dist: platformdirs
|
|
28
28
|
Requires-Dist: tomli; python_version < "3.11"
|
|
29
29
|
Requires-Dist: typing_extensions; python_version < "3.11"
|
|
30
|
-
Requires-Dist: backports-datetime-fromisoformat==2.0.1; python_version < "3.11"
|
|
31
30
|
Requires-Dist: click
|
|
32
31
|
Requires-Dist: inquirer
|
|
33
32
|
Requires-Dist: websockets
|
|
@@ -33,7 +33,6 @@ dependencies = [
|
|
|
33
33
|
"platformdirs",
|
|
34
34
|
"tomli; python_version <\"3.11\"",
|
|
35
35
|
"typing_extensions; python_version < \"3.11\"",
|
|
36
|
-
"backports-datetime-fromisoformat==2.0.1; python_version < \"3.11\"",
|
|
37
36
|
"click",
|
|
38
37
|
"inquirer",
|
|
39
38
|
"websockets",
|
|
@@ -42,7 +41,7 @@ dependencies = [
|
|
|
42
41
|
"tomli_w",
|
|
43
42
|
]
|
|
44
43
|
dynamic = []
|
|
45
|
-
version = "2.
|
|
44
|
+
version = "2.1.0"
|
|
46
45
|
|
|
47
46
|
[project.license]
|
|
48
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
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
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
|
-
|
|
182
|
-
|
|
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
|
-
|
|
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
|
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/dataset.py
RENAMED
|
@@ -795,5 +795,10 @@ class Dataset(resource.Resource):
|
|
|
795
795
|
except ResourceNotFoundError as e:
|
|
796
796
|
raise DatasetNotFoundError from e
|
|
797
797
|
|
|
798
|
+
def _get_repr_dict(self) -> dict:
|
|
799
|
+
d = super()._get_repr_dict()
|
|
800
|
+
d["branch"] = d["branch"]["id"]
|
|
801
|
+
return d
|
|
802
|
+
|
|
798
803
|
|
|
799
804
|
resource.RID_CLASS_REGISTRY[Dataset.rid_start] = Dataset
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/resource.py
RENAMED
|
@@ -26,17 +26,17 @@ class Resource:
|
|
|
26
26
|
# always included (at least what I can see)
|
|
27
27
|
rid: api_types.Rid
|
|
28
28
|
name: str
|
|
29
|
-
|
|
30
|
-
is_autosave: bool
|
|
31
|
-
is_hidden: bool
|
|
29
|
+
path: api_types.FoundryPath # not optional for this class, normally only included with extra decorations
|
|
32
30
|
created: api_types.Attribution | None
|
|
33
31
|
modified: api_types.Attribution | None
|
|
34
32
|
last_modified: float | None
|
|
33
|
+
directly_trashed: bool
|
|
34
|
+
is_autosave: bool
|
|
35
|
+
is_hidden: bool
|
|
35
36
|
operations: set[str] | None
|
|
36
37
|
url_variables: dict[str, str]
|
|
37
38
|
|
|
38
39
|
# included with extra decoration
|
|
39
|
-
path: api_types.FoundryPath # not optional for this class
|
|
40
40
|
description: str | None = None
|
|
41
41
|
favorite: bool | None = None
|
|
42
42
|
branches: set[api_types.CompassBranch] | None = None
|
|
@@ -117,12 +117,13 @@ class Resource:
|
|
|
117
117
|
):
|
|
118
118
|
self.rid = rid
|
|
119
119
|
self.name = name
|
|
120
|
-
self.
|
|
121
|
-
self.is_autosave = isAutosave
|
|
122
|
-
self.is_hidden = isHidden
|
|
120
|
+
self.path = path
|
|
123
121
|
self.created = created
|
|
124
122
|
self.modified = modified
|
|
125
123
|
self.last_modified = lastModified
|
|
124
|
+
self.directly_trashed = directlyTrashed
|
|
125
|
+
self.is_autosave = isAutosave
|
|
126
|
+
self.is_hidden = isHidden
|
|
126
127
|
self.operations = operations
|
|
127
128
|
self.url_variables = urlVariables
|
|
128
129
|
self.description = description
|
|
@@ -134,7 +135,6 @@ class Resource:
|
|
|
134
135
|
self.has_branches = hasBranches
|
|
135
136
|
self.has_multiple_branches = hasMultipleBranches
|
|
136
137
|
self.backed_object_types = backedObjectTypes
|
|
137
|
-
self.path = path
|
|
138
138
|
self.long_description = longDescription
|
|
139
139
|
self.in_trash = inTrash
|
|
140
140
|
self.deprecation = deprecation
|
|
@@ -249,5 +249,20 @@ class Resource:
|
|
|
249
249
|
self._from_json(**resource_json)
|
|
250
250
|
return self
|
|
251
251
|
|
|
252
|
+
def _get_repr_dict(self) -> dict:
|
|
253
|
+
d = {k: v for k, v in self.__dict__.items() if v is not None and not k.startswith("_")}
|
|
254
|
+
if c := d.get("created"):
|
|
255
|
+
d["created"] = c.get("time")
|
|
256
|
+
if c := d.get("modified"):
|
|
257
|
+
d["modified"] = c.get("time")
|
|
258
|
+
del d["operations"]
|
|
259
|
+
del d["url_variables"]
|
|
260
|
+
del d["last_modified"] # already as a formatted date in "modified"
|
|
261
|
+
del d["name"] # already visible in the "path"
|
|
262
|
+
return d
|
|
263
|
+
|
|
264
|
+
def __repr__(self):
|
|
265
|
+
return f"<{self.__class__.__name__}({self._get_repr_dict()!s})>"
|
|
266
|
+
|
|
252
267
|
|
|
253
268
|
RID_CLASS_REGISTRY: dict[str, type[Resource]] = {}
|
|
@@ -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
|
-
|
|
48
|
-
|
|
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"]["
|
|
52
|
-
_config["credentials"]["token_provider"]["config"] = {"jwt": jwt}
|
|
50
|
+
_config["credentials"]["jwt"] = jwt
|
|
53
51
|
elif client_id is not False:
|
|
54
|
-
_config["credentials"]
|
|
55
|
-
_config["credentials"]["
|
|
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
|
|
55
|
+
if "oauth" in _config.get("credentials", {}):
|
|
60
56
|
if client_secret is not False:
|
|
61
|
-
_config["credentials"]["
|
|
57
|
+
_config["credentials"]["oauth"]["client_secret"] = client_secret
|
|
62
58
|
if grant_type is not False:
|
|
63
|
-
_config["credentials"]["
|
|
59
|
+
_config["credentials"]["oauth"]["grant_type"] = grant_type
|
|
64
60
|
if scopes is not False:
|
|
65
|
-
_config["credentials"]["
|
|
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(
|
|
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
|
|
@@ -14,11 +14,6 @@ LOGGER = logging.getLogger(__name__)
|
|
|
14
14
|
|
|
15
15
|
DECAMELIZE_REGEX = re.compile(r"(?<!^)(?=[A-Z])")
|
|
16
16
|
|
|
17
|
-
if sys.version_info < (3, 11):
|
|
18
|
-
from backports.datetime_fromisoformat import MonkeyPatch
|
|
19
|
-
|
|
20
|
-
MonkeyPatch.patch_fromisoformat()
|
|
21
|
-
|
|
22
17
|
if TYPE_CHECKING:
|
|
23
18
|
from collections.abc import Callable, Sequence
|
|
24
19
|
|
|
@@ -99,4 +94,22 @@ def is_dataset_a_view(dataset_transaction: dict) -> bool:
|
|
|
99
94
|
|
|
100
95
|
def parse_iso(iso_str: str) -> datetime:
|
|
101
96
|
"""Parses iso string to datetime."""
|
|
97
|
+
if sys.version_info < (3, 11):
|
|
98
|
+
# https://stackoverflow.com/a/75499881/3652805
|
|
99
|
+
if "." in iso_str:
|
|
100
|
+
if iso_str.endswith("Z"):
|
|
101
|
+
# palantir s3 api returns an iso string with nanosecond precision, we don't need that
|
|
102
|
+
# and python strptime %f can only parse 6 digits i.e. microsecond precision
|
|
103
|
+
# but its easier to just remove the nanoseconds, as they are not relevant for the expiry_time
|
|
104
|
+
iso_str = iso_str.split(".", maxsplit=1)[0] + "+00:00"
|
|
105
|
+
else:
|
|
106
|
+
return datetime.strptime(
|
|
107
|
+
iso_str,
|
|
108
|
+
"%Y-%m-%dT%H:%M:%S.%f%z",
|
|
109
|
+
)
|
|
110
|
+
return datetime.strptime(
|
|
111
|
+
iso_str,
|
|
112
|
+
"%Y-%m-%dT%H:%M:%S%z",
|
|
113
|
+
)
|
|
114
|
+
|
|
102
115
|
return datetime.fromisoformat(iso_str)
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = '2.0.0'
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pandas.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/polars.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pyarrow.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/_optional/pyspark.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/cached_foundry_client.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/api_client.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/catalog.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/compass.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/context_client.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/data_proxy.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/foundry_stats.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/metadata.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/multipass.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/clients/s3_client.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/config_types.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/config/token_provider.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/errors/handling.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/foundry_api_client.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/resources/folder.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/api_types.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/caches/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.0.0 → foundry_dev_tools-2.1.0}/src/foundry_dev_tools/utils/public_api_types.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|