foundry-dev-tools 2.1.16__tar.gz → 2.1.18__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.1.16 → foundry_dev_tools-2.1.18}/PKG-INFO +1 -1
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/pyproject.toml +1 -1
- foundry_dev_tools-2.1.18/src/foundry_dev_tools/__about__.py +1 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cached_foundry_client.py +12 -4
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/context_client.py +4 -3
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/tables.py +42 -1
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/config.py +3 -3
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/context.py +1 -3
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/token_provider.py +40 -20
- foundry_dev_tools-2.1.18/src/foundry_dev_tools/errors/multipass.py +23 -0
- foundry_dev_tools-2.1.16/src/foundry_dev_tools/__about__.py +0 -1
- foundry_dev_tools-2.1.16/src/foundry_dev_tools/errors/multipass.py +0 -9
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/README.md +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/pandas.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/polars.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/pyarrow.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/pyspark.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/build.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/config.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/git.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/git_credential_foundry.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/info.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/main.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/s3.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cli/stubs.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/api_client.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/build2.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/catalog.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/compass.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/data_proxy.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/foundry_sql_server.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/foundry_stats.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/jemma.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/magritte_coordinator.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/metadata.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/multipass.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/public_ontologies_client.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/s3_client.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/scheduler.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/schema_inference.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/config_types.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/compass.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/config.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/dataset.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/handling.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/meta.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/sql.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/foundry_api_client.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/helpers/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/helpers/multipass/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/helpers/multipass/group.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/helpers/multipass/principal.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/helpers/multipass/user.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/py.typed +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/dataset.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/folder.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/resource.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/api_types.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/async_s3.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/caches/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/caches/metadata_store.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/caches/spark_caches.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/cli.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/clients.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/compat.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/config.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/converter/__init__.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/converter/foundry_spark.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/misc.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/public_api_types.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/repo.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/s3.py +0 -0
- {foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/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.
|
|
3
|
+
Version: 2.1.18
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = '2.1.18'
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/cached_foundry_client.py
RENAMED
|
@@ -27,6 +27,7 @@ LOGGER = logging.getLogger(__name__)
|
|
|
27
27
|
|
|
28
28
|
if TYPE_CHECKING:
|
|
29
29
|
import pandas as pd
|
|
30
|
+
import polars as pl
|
|
30
31
|
import pyspark.sql
|
|
31
32
|
|
|
32
33
|
from foundry_dev_tools.utils import api_types
|
|
@@ -185,7 +186,7 @@ class CachedFoundryClient:
|
|
|
185
186
|
|
|
186
187
|
def save_dataset(
|
|
187
188
|
self,
|
|
188
|
-
df: pd.DataFrame | pyspark.sql.DataFrame,
|
|
189
|
+
df: pd.DataFrame | pyspark.sql.DataFrame | pl.DataFrame,
|
|
189
190
|
dataset_path_or_rid: str,
|
|
190
191
|
branch: str = "master",
|
|
191
192
|
exists_ok: bool = False,
|
|
@@ -198,8 +199,8 @@ class CachedFoundryClient:
|
|
|
198
199
|
Creates SNAPSHOT transactions by default.
|
|
199
200
|
|
|
200
201
|
Args:
|
|
201
|
-
df (:external+pandas:py:class:`pandas.DataFrame` | :external+spark:py:class:`pyspark.sql.DataFrame`):
|
|
202
|
-
pyspark
|
|
202
|
+
df (:external+pandas:py:class:`pandas.DataFrame` | :external+polars:py:class:`polars.DataFrame` | :external+spark:py:class:`pyspark.sql.DataFrame`):
|
|
203
|
+
A pyspark, pandas or polars DataFrame to upload
|
|
203
204
|
dataset_path_or_rid (str): Path or Rid of the dataset in which the object should be stored.
|
|
204
205
|
branch (str): Branch of the dataset in which the object should be stored
|
|
205
206
|
exists_ok (bool): By default, this method creates a new dataset.
|
|
@@ -217,7 +218,7 @@ class CachedFoundryClient:
|
|
|
217
218
|
ValueError: when dataframe is None
|
|
218
219
|
ValueError: when branch is None
|
|
219
220
|
|
|
220
|
-
"""
|
|
221
|
+
""" # noqa: E501
|
|
221
222
|
if df is None:
|
|
222
223
|
msg = "Please provide a spark or pandas dataframe object with parameter 'df'"
|
|
223
224
|
raise ValueError(msg)
|
|
@@ -227,6 +228,7 @@ class CachedFoundryClient:
|
|
|
227
228
|
|
|
228
229
|
with tempfile.TemporaryDirectory() as path:
|
|
229
230
|
from foundry_dev_tools._optional.pandas import pd
|
|
231
|
+
from foundry_dev_tools._optional.polars import pl
|
|
230
232
|
|
|
231
233
|
if not pd.__fake__ and isinstance(df, pd.DataFrame):
|
|
232
234
|
df.to_parquet(
|
|
@@ -235,6 +237,12 @@ class CachedFoundryClient:
|
|
|
235
237
|
compression="snappy",
|
|
236
238
|
flavor="spark",
|
|
237
239
|
)
|
|
240
|
+
elif not pl.__fake__ and isinstance(df, pl.DataFrame):
|
|
241
|
+
df.write_parquet(
|
|
242
|
+
os.sep.join([path + "/dataset.parquet"]), # noqa: PTH118
|
|
243
|
+
use_pyarrow=True,
|
|
244
|
+
compression="snappy",
|
|
245
|
+
)
|
|
238
246
|
else:
|
|
239
247
|
df.write.format("parquet").option("compression", "snappy").save(path=path, mode="overwrite")
|
|
240
248
|
|
|
@@ -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
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/tables.py
RENAMED
|
@@ -9,7 +9,7 @@ from foundry_dev_tools.clients.api_client import APIClient
|
|
|
9
9
|
if TYPE_CHECKING:
|
|
10
10
|
import requests
|
|
11
11
|
|
|
12
|
-
from foundry_dev_tools.utils.api_types import FolderRid, SourceRid
|
|
12
|
+
from foundry_dev_tools.utils.api_types import Branch, FolderRid, SourceRid, TableRid
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
class TablesClient(APIClient):
|
|
@@ -143,3 +143,44 @@ class TablesClient(APIClient):
|
|
|
143
143
|
response_json = self.api_list_tables(connection_rid=connection_rid, page_token=next_page_token).json()
|
|
144
144
|
tables.extend(response_json["tables"])
|
|
145
145
|
return tables
|
|
146
|
+
|
|
147
|
+
def api_get_table_schema(self, table_rid: TableRid, branches: list[Branch], **kwargs) -> requests.Response:
|
|
148
|
+
"""Retrieves schema for a Foundry table object per given list of branches.
|
|
149
|
+
|
|
150
|
+
Args:
|
|
151
|
+
table_rid: The RID of the table to get schema for.
|
|
152
|
+
branches: List of branch names to get schema for.
|
|
153
|
+
**kwargs: gets passed to :py:meth:`APIClient.api_request`
|
|
154
|
+
|
|
155
|
+
Returns:
|
|
156
|
+
requests.Response: The API response containing the table schema.
|
|
157
|
+
|
|
158
|
+
Example::
|
|
159
|
+
>>> response = tables_client.api_get_table_schema("ri.foundry.main.dataset.abc123", ["master"])
|
|
160
|
+
>>> schema = response.json()
|
|
161
|
+
>>> schema
|
|
162
|
+
{
|
|
163
|
+
"fieldSchemaList": [
|
|
164
|
+
{
|
|
165
|
+
"type": "DECIMAL",
|
|
166
|
+
"name": "column_A",
|
|
167
|
+
"nullable": false,
|
|
168
|
+
"precision": 38,
|
|
169
|
+
"scale": 0
|
|
170
|
+
},
|
|
171
|
+
{
|
|
172
|
+
"type": "STRING",
|
|
173
|
+
"name": "column_B",
|
|
174
|
+
"nullable": false
|
|
175
|
+
}
|
|
176
|
+
],
|
|
177
|
+
"primaryKey": null,
|
|
178
|
+
"customMetadata": {"format": "snowflake"}
|
|
179
|
+
}
|
|
180
|
+
"""
|
|
181
|
+
return self.api_request(
|
|
182
|
+
"POST",
|
|
183
|
+
api_path=f"tables/{table_rid}/schema",
|
|
184
|
+
json={"branches": branches},
|
|
185
|
+
**kwargs,
|
|
186
|
+
)
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/config.py
RENAMED
|
@@ -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,
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/context.py
RENAMED
|
@@ -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
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/token_provider.py
RENAMED
|
@@ -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.
|
|
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
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
"
|
|
179
|
-
"
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
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'
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/pandas.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/polars.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/pyarrow.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/_optional/pyspark.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.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/api_client.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/build2.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/catalog.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/compass.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/data_proxy.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/foundry_stats.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/jemma.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/metadata.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/multipass.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/s3_client.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/clients/scheduler.py
RENAMED
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/config/config_types.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/compass.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/config.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/dataset.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/errors/handling.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/foundry_api_client.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/helpers/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/dataset.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/folder.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/resources/resource.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/__init__.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/api_types.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/async_s3.py
RENAMED
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/caches/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{foundry_dev_tools-2.1.16 → foundry_dev_tools-2.1.18}/src/foundry_dev_tools/utils/clients.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
|