Skip to content

Commit 2c07651

Browse files
authored
feat(drs-pull-objects): initial support for supplying a list of DRS I… (#195)
* feat(drs-pull-objects): initial support for supplying a list of DRS IDs to download * Apply automatic documentation changes * feat(logging): add arg for silencing logging (that way we can ensure click.echos are the only stdout) * feat(drs-pull): correctly allow list of object IDs as an arg, support JSON output * Apply automatic documentation changes * chore(spelling): fix typo * Apply automatic documentation changes * chore(drs-pull): refactor to reduce function calls, support passing a list of objects to underlying download functions * Apply automatic documentation changes * chore(tests): fix test and version * Apply automatic documentation changes
1 parent fcef4ac commit 2c07651

File tree

19 files changed

+148
-65
lines changed

19 files changed

+148
-65
lines changed
-7.92 KB
Binary file not shown.
-5.74 KB
Binary file not shown.
-5 Bytes
Binary file not shown.
5 Bytes
Binary file not shown.

docs/_build/html/_modules/gen3/tools/download/drs_download.html

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ <h1>Source code for gen3.tools.download.drs_download</h1><div class="highlight">
12111211
<span class="k">def</span> <span class="nf">_download_obj</span><span class="p">(</span>
12121212
<span class="n">hostname</span><span class="p">,</span>
12131213
<span class="n">auth</span><span class="p">,</span>
1214-
<span class="n">object_id</span><span class="p">,</span>
1214+
<span class="n">object_ids</span><span class="p">,</span>
12151215
<span class="n">output_dir</span><span class="o">=</span><span class="s2">&quot;.&quot;</span><span class="p">,</span>
12161216
<span class="n">show_progress</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
12171217
<span class="n">unpack_packages</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
@@ -1222,7 +1222,7 @@ <h1>Source code for gen3.tools.download.drs_download</h1><div class="highlight">
12221222
<span class="sd"> Args:</span>
12231223
<span class="sd"> hostname (str): hostname of Gen3 commons to use for access and WTS</span>
12241224
<span class="sd"> auth: Gen3 Auth instance</span>
1225-
<span class="sd"> object_id (str): DRS object id</span>
1225+
<span class="sd"> object_ids (List[str]): DRS object id</span>
12261226
<span class="sd"> output_dir: directory to save downloaded files to</span>
12271227
<span class="sd"> show_progress: show progress bar</span>
12281228
<span class="sd"> unpack_packages (bool): set to False to disable the unpacking of downloaded packages</span>
@@ -1237,7 +1237,7 @@ <h1>Source code for gen3.tools.download.drs_download</h1><div class="highlight">
12371237
<span class="n">logger</span><span class="o">.</span><span class="n">critical</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Unable to authenticate your credentials with </span><span class="si">{</span><span class="n">hostname</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
12381238
<span class="k">return</span> <span class="kc">None</span>
12391239

1240-
<span class="n">object_list</span> <span class="o">=</span> <span class="p">[</span><span class="n">Downloadable</span><span class="p">(</span><span class="n">object_id</span><span class="o">=</span><span class="n">object_id</span><span class="p">)]</span>
1240+
<span class="n">object_list</span> <span class="o">=</span> <span class="p">[</span><span class="n">Downloadable</span><span class="p">(</span><span class="n">object_id</span><span class="o">=</span><span class="n">object_id</span><span class="p">)</span> <span class="k">for</span> <span class="n">object_id</span> <span class="ow">in</span> <span class="n">object_ids</span><span class="p">]</span>
12411241
<span class="n">downloader</span> <span class="o">=</span> <span class="n">DownloadManager</span><span class="p">(</span>
12421242
<span class="n">hostname</span><span class="o">=</span><span class="n">hostname</span><span class="p">,</span>
12431243
<span class="n">auth</span><span class="o">=</span><span class="n">auth</span><span class="p">,</span>
@@ -1430,12 +1430,10 @@ <h1>Source code for gen3.tools.download.drs_download</h1><div class="highlight">
14301430

14311431

14321432

1433-
<div class="viewcode-block" id="download_drs_object">
1434-
<a class="viewcode-back" href="../../../../tools/drs_pull.html#gen3.tools.download.drs_download.download_drs_object">[docs]</a>
1435-
<span class="k">def</span> <span class="nf">download_drs_object</span><span class="p">(</span>
1433+
<span class="k">def</span> <span class="nf">download_drs_objects</span><span class="p">(</span>
14361434
<span class="n">hostname</span><span class="p">,</span>
14371435
<span class="n">auth</span><span class="p">,</span>
1438-
<span class="n">object_id</span><span class="p">,</span>
1436+
<span class="n">object_ids</span><span class="p">,</span>
14391437
<span class="n">output_dir</span><span class="p">,</span>
14401438
<span class="n">show_progress</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
14411439
<span class="n">unpack_packages</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
@@ -1446,7 +1444,7 @@ <h1>Source code for gen3.tools.download.drs_download</h1><div class="highlight">
14461444
<span class="sd"> Args:</span>
14471445
<span class="sd"> hostname (str): hostname of Gen3 commons to use for access and WTS</span>
14481446
<span class="sd"> auth: Gen3 Auth instance</span>
1449-
<span class="sd"> object_id (str): DRS object id</span>
1447+
<span class="sd"> object_ids (List[str]): DRS object ids</span>
14501448
<span class="sd"> output_dir: directory to save downloaded files to</span>
14511449
<span class="sd"> unpack_packages (bool): set to False to disable the unpacking of downloaded packages</span>
14521450
<span class="sd"> delete_unpacked_packages (bool): set to True to delete package files after unpacking them</span>
@@ -1457,13 +1455,12 @@ <h1>Source code for gen3.tools.download.drs_download</h1><div class="highlight">
14571455
<span class="k">return</span> <span class="n">_download_obj</span><span class="p">(</span>
14581456
<span class="n">hostname</span><span class="p">,</span>
14591457
<span class="n">auth</span><span class="p">,</span>
1460-
<span class="n">object_id</span><span class="p">,</span>
1458+
<span class="n">object_ids</span><span class="p">,</span>
14611459
<span class="n">output_dir</span><span class="p">,</span>
14621460
<span class="n">show_progress</span><span class="p">,</span>
14631461
<span class="n">unpack_packages</span><span class="p">,</span>
14641462
<span class="n">delete_unpacked_packages</span><span class="p">,</span>
1465-
<span class="p">)</span></div>
1466-
1463+
<span class="p">)</span>
14671464

14681465

14691466
<div class="viewcode-block" id="list_access_in_drs_manifest">

docs/_build/html/genindex.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,6 @@ <h2 id="D">D</h2>
220220
<li><a href="wss.html#gen3.wss.Gen3WsStorage.download">(gen3.wss.Gen3WsStorage method)</a>
221221
</li>
222222
</ul></li>
223-
<li><a href="tools/drs_pull.html#gen3.tools.download.drs_download.download_drs_object">download_drs_object() (in module gen3.tools.download.drs_download)</a>
224-
</li>
225223
<li><a href="tools/drs_pull.html#gen3.tools.download.drs_download.download_files_in_drs_manifest">download_files_in_drs_manifest() (in module gen3.tools.download.drs_download)</a>
226224
</li>
227225
<li><a href="file.html#gen3.file.Gen3File.download_single">download_single() (gen3.file.Gen3File method)</a>

docs/_build/html/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ <h1>Welcome to Gen3 SDK’s documentation!<a class="headerlink" href="#welcome-t
223223
<li class="toctree-l4"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.Manifest.load_manifest"><code class="docutils literal notranslate"><span class="pre">Manifest.load_manifest()</span></code></a></li>
224224
</ul>
225225
</li>
226-
<li class="toctree-l3"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.download_drs_object"><code class="docutils literal notranslate"><span class="pre">download_drs_object()</span></code></a></li>
227226
<li class="toctree-l3"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.download_files_in_drs_manifest"><code class="docutils literal notranslate"><span class="pre">download_files_in_drs_manifest()</span></code></a></li>
228227
<li class="toctree-l3"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.list_access_in_drs_manifest"><code class="docutils literal notranslate"><span class="pre">list_access_in_drs_manifest()</span></code></a></li>
229228
<li class="toctree-l3"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.list_drs_object"><code class="docutils literal notranslate"><span class="pre">list_drs_object()</span></code></a></li>

docs/_build/html/objects.inv

-4 Bytes
Binary file not shown.

docs/_build/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_build/html/tools.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ <h1>Gen3 Tools<a class="headerlink" href="#gen3-tools" title="Link to this headi
8080
<li class="toctree-l3"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.Manifest.load_manifest"><code class="docutils literal notranslate"><span class="pre">Manifest.load_manifest()</span></code></a></li>
8181
</ul>
8282
</li>
83-
<li class="toctree-l2"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.download_drs_object"><code class="docutils literal notranslate"><span class="pre">download_drs_object()</span></code></a></li>
8483
<li class="toctree-l2"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.download_files_in_drs_manifest"><code class="docutils literal notranslate"><span class="pre">download_files_in_drs_manifest()</span></code></a></li>
8584
<li class="toctree-l2"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.list_access_in_drs_manifest"><code class="docutils literal notranslate"><span class="pre">list_access_in_drs_manifest()</span></code></a></li>
8685
<li class="toctree-l2"><a class="reference internal" href="tools/drs_pull.html#gen3.tools.download.drs_download.list_drs_object"><code class="docutils literal notranslate"><span class="pre">list_drs_object()</span></code></a></li>

0 commit comments

Comments
 (0)