Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move: Immediately authenticate client after creation #1480

Merged
merged 1 commit into from
Aug 12, 2024
Merged

move: Immediately authenticate client after creation #1480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions dandi/move.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@
raise TypeError("`dandiset` must be a Path when work_on='both'")
local_ds, subpath = find_dandiset_and_subpath(dandiset)
client = DandiAPIClient.for_dandi_instance(dandi_instance)
client.dandi_authenticate()

Check warning on line 815 in dandi/move.py

View check run for this annotation

Codecov / codecov/patch

dandi/move.py#L815 

Added line #L815 was not covered by tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in principle we do not need to authenticate if doing dry_run do we?

Would it be feasible in general to provide logic to authenticate when receiving 401 and haven't been authenticated before?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Authentication is still needed for dry runs so that the list of assets can be fetched for an embargoed Dandiset.

stack.enter_context(client)
remote_ds = client.get_dandiset(
local_ds.identifier, version_id="draft", lazy=False
Expand All @@ -833,6 +834,7 @@
if not isinstance(url, DandisetURL):
raise ValueError("URL does not point to a Dandiset")
client = url.get_client()
client.dandi_authenticate()

Check warning on line 837 in dandi/move.py

View check run for this annotation

Codecov / codecov/patch

dandi/move.py#L837 

Added line #L837 was not covered by tests
stack.enter_context(client)
rds = url.get_dandiset(client, lazy=False)
assert rds is not None
Expand All @@ -841,6 +843,7 @@
else:
local_ds, subpath = find_dandiset_and_subpath(dandiset)
client = DandiAPIClient.for_dandi_instance(dandi_instance)
client.dandi_authenticate()

Check warning on line 846 in dandi/move.py

View check run for this annotation

Codecov / codecov/patch

dandi/move.py#L846 

Added line #L846 was not covered by tests
stack.enter_context(client)
remote_ds = client.get_dandiset(
local_ds.identifier, version_id="draft", lazy=False
Expand All @@ -866,8 +869,6 @@
if not plan:
lgr.info("Nothing to move")
return
if not dry_run and client is not None:
client.dandi_authenticate()
if devel_debug:
for gen in mover.process_moves_debug(plan, dry_run):
for r in gen:
Expand Down
Loading