Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f16ba08
minor fixes to usage.rst (#1090)
mfeurer May 31, 2021
6717e66
Add Windows to Github Action CI matrix (#1095)
PGijsbers Jun 16, 2021
2984403
Add ChunkedError to list of retry exception (#1118)
PGijsbers Oct 27, 2021
a6c0576
Always ignore MaxRetryError but log with warning (#1119)
PGijsbers Oct 27, 2021
b4c868a
Fix/1110 (#1117)
PGijsbers Oct 28, 2021
aed5010
Add AttributeError as suspect for dependency issue (#1121)
PGijsbers Nov 3, 2021
db7bb9a
Add CITATION.cff (#1120)
PGijsbers Jan 11, 2022
493511a
Precommit update (#1129)
PGijsbers Apr 14, 2022
99a62f6
Predictions (#1128)
PGijsbers Apr 19, 2022
c911d6d
Use GET instead of POST for flow exist (#1147)
PGijsbers Jun 28, 2022
c6fab8e
pre-commit update (#1150)
PGijsbers Jul 11, 2022
a8d96d5
Replace removed file with new target for download test (#1158)
PGijsbers Aug 16, 2022
ccb3e8e
Fix outdated docstring for list_tasks function (#1149)
chadmarchand Oct 6, 2022
9ce2a6b
Improve the error message on out-of-sync flow ids (#1171)
PGijsbers Oct 7, 2022
2ed77db
Add scikit-learn 1.0 and 1.1 values for test (#1168)
PGijsbers Oct 7, 2022
2fde8d5
Update Pipeline description for >=1.0 (#1170)
PGijsbers Oct 7, 2022
2ddae0f
Update URL to reflect new endpoint (#1172)
PGijsbers Oct 7, 2022
c17704e
Remove tests which only test scikit-learn functionality (#1169)
PGijsbers Oct 7, 2022
953f84e
fix nonetype error during print for tasks without class labels (#1148)
willcmartin Oct 7, 2022
6da0aac
Flow exists GET is deprecated, use POST (#1173)
PGijsbers Oct 10, 2022
22ee9cd
Test `get_parquet` on production server (#1174)
PGijsbers Oct 11, 2022
5cd6973
Refactor out different test cases to separate tests (#1176)
PGijsbers Oct 18, 2022
e6250fa
Provide clearer error when server provides bad data description XML (…
PGijsbers Oct 24, 2022
75fed8a
Update more sklearn tests (#1175)
PGijsbers Oct 24, 2022
f37ebbe
Remove dtype checking for prediction comparison (#1177)
PGijsbers Nov 24, 2022
a909a0c
feat(minio): Allow for proxies (#1184)
eddiebergman Nov 25, 2022
1dfe398
Update __version__.py (#1189)
PGijsbers Nov 25, 2022
580b536
Download all files (#1188)
PGijsbers Nov 25, 2022
5eb84ce
Skip tests that use arff reading optimization for typecheck (#1185)
PGijsbers Nov 25, 2022
467f6eb
Update configs (#1199)
PGijsbers Feb 20, 2023
dd62f2b
Update tests for sklearn 1.2, server issue (#1200)
PGijsbers Feb 20, 2023
2a7ab17
Version bump to dev and add changelog stub (#1190)
PGijsbers Feb 20, 2023
5f72e2e
Add: dependabot checks for workflow versions (#1155)
eddiebergman Feb 20, 2023
7d069a9
Change the cached file to reflect new standard #1188 (#1203)
PGijsbers Feb 21, 2023
23755bf
Bump actions/checkout from 2 to 3 (#1206)
dependabot[bot] Feb 21, 2023
603fe60
Update docker actions (#1211)
mfeurer Feb 22, 2023
17ff086
Support new numpy (#1215)
mfeurer Feb 23, 2023
d9850be
Allow unknown task types on the server (#1216)
mfeurer Feb 23, 2023
a968288
Mark sklearn tests (#1202)
PGijsbers Feb 23, 2023
beb598c
Bump actions/setup-python from 2 to 4 (#1212)
dependabot[bot] Feb 24, 2023
c590b3a
Make OpenMLTraceIteration a dataclass (#1201)
PGijsbers Feb 24, 2023
bbf09b3
Fix: correctly order the ground truth and prediction for ARFF files i…
LennartPurucker Feb 24, 2023
b84536a
Fix documentation building (#1217)
mfeurer Feb 24, 2023
5730669
Fix CI Python 3.6 (#1218)
mfeurer Feb 24, 2023
5b2ac46
Bump docker/setup-buildx-action from 1 to 2 (#1221)
dependabot[bot] Feb 24, 2023
5dcb7a3
Update run.py (#1194)
v-parmar Feb 24, 2023
687a0f1
Refactor if-statements (#1219)
PGijsbers Mar 1, 2023
c0a75bd
Ci python 38 (#1220)
mfeurer Mar 1, 2023
ce82fd5
Add summary of locally computed metrics to representation of run (#…
LennartPurucker Mar 1, 2023
c177d39
Better Error for Checksum Mismatch (#1225)
LennartPurucker Mar 4, 2023
24cbc5e
Fix coverage (#1226)
PGijsbers Mar 4, 2023
3c00d7b
Issue 1028: public delete functions for run, task, flow and database …
Mirkazemi Mar 21, 2023
7127e9c
Update changelog and version number for new release (#1230)
mfeurer Mar 22, 2023
bb3793d
Merge pull request #1233 from openml/main
mfeurer Mar 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(minio): Allow for proxies (#1184)
* feat(minio): Allow for proxies

* fix: Declared proxy_client as None

* refactor(proxy): Change to `str | None` with "auto"
  • Loading branch information
eddiebergman authored Nov 25, 2022
commit a909a0c31b95d0ffb46bb129d412875ab08d02c8
38 changes: 36 additions & 2 deletions openml/_api_calls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import urllib.parse
import xml
import xmltodict
from urllib3 import ProxyManager
from typing import Dict, Optional, Union

import minio
Expand All @@ -23,6 +24,26 @@
)


def resolve_env_proxies(url: str) -> Optional[str]:
"""Attempt to find a suitable proxy for this url.

Relies on ``requests`` internals to remain consistent. To disable this from the
environment, please set the enviornment varialbe ``no_proxy="*"``.

Parameters
----------
url : str
The url endpoint

Returns
-------
Optional[str]
The proxy url if found, else None
"""
resolved_proxies = requests.utils.get_environ_proxies(url)
selected_proxy = requests.utils.select_proxy(url, resolved_proxies)
return selected_proxy

def _create_url_from_endpoint(endpoint: str) -> str:
url = config.server
if not url.endswith("/"):
Expand Down Expand Up @@ -84,6 +105,7 @@ def _download_minio_file(
source: str,
destination: Union[str, pathlib.Path],
exists_ok: bool = True,
proxy: Optional[str] = "auto",
) -> None:
"""Download file ``source`` from a MinIO Bucket and store it at ``destination``.

Expand All @@ -95,7 +117,10 @@ def _download_minio_file(
Path to store the file to, if a directory is provided the original filename is used.
exists_ok : bool, optional (default=True)
If False, raise FileExists if a file already exists in ``destination``.

proxy: str, optional (default = "auto")
The proxy server to use. By default it's "auto" which uses ``requests`` to
automatically find the proxy to use. Pass None or the environment variable
``no_proxy="*"`` to disable proxies.
"""
destination = pathlib.Path(destination)
parsed_url = urllib.parse.urlparse(source)
Expand All @@ -107,7 +132,16 @@ def _download_minio_file(
if destination.is_file() and not exists_ok:
raise FileExistsError(f"File already exists in {destination}.")

client = minio.Minio(endpoint=parsed_url.netloc, secure=False)
if proxy == "auto":
proxy = resolve_env_proxies(parsed_url.geturl())

proxy_client = ProxyManager(proxy) if proxy else None

client = minio.Minio(
endpoint=parsed_url.netloc,
secure=False,
http_client=proxy_client
)

try:
client.fget_object(
Expand Down