Skip to content

Commit 1fa338b

Browse files
committed
pass api_token directly instead of casting
1 parent c96373c commit 1fa338b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

easyDataverse/dataverse.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def __init__(
9797
self._connect()
9898
self.native_api = NativeApi(
9999
base_url=str(self.server_url),
100-
api_token=str(self.api_token), # type: ignore
100+
api_token=self.api_token,
101101
)
102102

103103
@computed_field(description="The licenses available in the Dataverse installation.")
@@ -298,6 +298,7 @@ def load_from_url(
298298
download_files: bool = True,
299299
filenames: List[str] = [],
300300
n_parallel_downloads: int = 10,
301+
version: Optional[str] = None,
301302
) -> Tuple[Dataset, "Dataverse"]:
302303
"""Fetches a dataset and Dataverse specific information from an URL.
303304
@@ -321,10 +322,11 @@ def load_from_url(
321322
parsed_url = parse.urlparse(url)
322323
p_id = parse.parse_qs(parsed_url.query)["persistentId"][0]
323324

324-
try:
325-
version = parse.parse_qs(parsed_url.query)["version"][0]
326-
except KeyError:
327-
version = "latest"
325+
if version is None:
326+
try:
327+
version = parse.parse_qs(parsed_url.query)["version"][0]
328+
except KeyError:
329+
version = "latest"
328330

329331
server_url = parse.urlunparse(
330332
(parsed_url.scheme, parsed_url.netloc, "", "", "", "")
@@ -512,7 +514,7 @@ def _fetch_dataset_version(
512514

513515
if version not in versions:
514516
raise ValueError(
515-
f"Version {version} not found. These are the available versions: {versions.keys()}"
517+
f"Version {version} not found. These are the available versions: {list(versions.keys())}"
516518
)
517519

518520
return DottedDict({"data": {"latestVersion": versions[version]}})

0 commit comments

Comments
 (0)