Skip to content

Commit e14e03c

Browse files
frickjackactions-user
authored andcommitted
Apply automatic documentation changes
1 parent 43cfa39 commit e14e03c

19 files changed

+87
-64
lines changed

docs/_build/doctrees/auth.doctree

2.71 KB
Binary file not shown.
372 Bytes
Binary file not shown.
952 Bytes
Binary file not shown.
-8 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

docs/_build/html/_modules/gen3/auth.html

Lines changed: 31 additions & 39 deletions
Large diffs are not rendered by default.

docs/_build/html/_modules/gen3/index.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,23 @@ <h1>Source code for gen3.index</h1><div class="highlight"><pre>
5656
<span class="sd"> A class for interacting with the Gen3 Index services.</span>
5757

5858
<span class="sd"> Args:</span>
59+
<span class="sd"> endpoint (str): public endpoint for reading/querying indexd - only necessary if auth_provider not provided</span>
5960
<span class="sd"> auth_provider (Gen3Auth): A Gen3Auth class instance or indexd basic creds tuple</span>
6061

6162
<span class="sd"> Examples:</span>
6263
<span class="sd"> This generates the Gen3Index class pointed at the sandbox commons while</span>
6364
<span class="sd"> using the credentials.json downloaded from the commons profile page.</span>
6465

6566
<span class="sd"> &gt;&gt;&gt; auth = Gen3Auth(refresh_file=&quot;credentials.json&quot;)</span>
66-
<span class="sd"> ... sub = Gen3Submission(auth.endpoint, auth)</span>
67+
<span class="sd"> ... sub = Gen3Submission(auth)</span>
6768

6869
<span class="sd"> &quot;&quot;&quot;</span>
6970

7071
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">endpoint</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">auth_provider</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">service_location</span><span class="o">=</span><span class="s2">&quot;index&quot;</span><span class="p">):</span>
72+
<span class="c1"># legacy interface required endpoint as 1st arg</span>
73+
<span class="k">if</span> <span class="n">endpoint</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">endpoint</span><span class="p">,</span><span class="n">Gen3Auth</span><span class="p">):</span>
74+
<span class="n">auth_provider</span> <span class="o">=</span> <span class="n">endpoint</span>
75+
<span class="n">endpoint</span> <span class="o">=</span> <span class="kc">None</span>
7176
<span class="k">if</span> <span class="n">auth_provider</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">auth_provider</span><span class="p">,</span><span class="n">Gen3Auth</span><span class="p">):</span>
7277
<span class="n">endpoint</span> <span class="o">=</span> <span class="n">auth_provider</span><span class="o">.</span><span class="n">endpoint</span>
7378
<span class="n">endpoint</span> <span class="o">=</span> <span class="n">endpoint</span><span class="o">.</span><span class="n">strip</span><span class="p">(</span><span class="s2">&quot;/&quot;</span><span class="p">)</span>

docs/_build/html/_modules/gen3/jobs.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ <h1>Source code for gen3.jobs</h1><div class="highlight"><pre>
8383
<span class="sd"> service_location (str, optional): deployment location relative to the</span>
8484
<span class="sd"> endpoint provided</span>
8585
<span class="sd"> &quot;&quot;&quot;</span>
86+
<span class="c1"># auth_provider legacy interface required endpoint as 1st arg</span>
8687
<span class="n">auth_provider</span> <span class="o">=</span> <span class="n">auth_provider</span> <span class="ow">or</span> <span class="n">endpoint</span>
8788
<span class="n">endpoint</span> <span class="o">=</span> <span class="n">auth_provider</span><span class="o">.</span><span class="n">endpoint</span><span class="o">.</span><span class="n">strip</span><span class="p">(</span><span class="s2">&quot;/&quot;</span><span class="p">)</span>
8889
<span class="c1"># if running locally, mds is deployed by itself without a location relative</span>

docs/_build/html/_modules/gen3/metadata.html

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ <h1>Source code for gen3.metadata</h1><div class="highlight"><pre>
4949
<span class="kn">import</span> <span class="nn">sys</span>
5050

5151
<span class="kn">from</span> <span class="nn">gen3.utils</span> <span class="k">import</span> <span class="n">append_query_params</span><span class="p">,</span> <span class="n">DEFAULT_BACKOFF_SETTINGS</span>
52+
<span class="kn">from</span> <span class="nn">gen3.auth</span> <span class="k">import</span> <span class="n">Gen3Auth</span>
5253

5354

5455
<div class="viewcode-block" id="Gen3Metadata"><a class="viewcode-back" href="../../metadata.html#gen3.metadata.Gen3Metadata">[docs]</a><span class="k">class</span> <span class="nc">Gen3Metadata</span><span class="p">:</span>
@@ -59,17 +60,17 @@ <h1>Source code for gen3.metadata</h1><div class="highlight"><pre>
5960
<span class="sd"> This generates the Gen3Metadata class pointed at the sandbox commons while</span>
6061
<span class="sd"> using the credentials.json downloaded from the commons profile page.</span>
6162

62-
<span class="sd"> &gt;&gt;&gt; auth = Gen3Auth(endpoint, refresh_file=&quot;credentials.json&quot;)</span>
63-
<span class="sd"> ... sub = Gen3Metadata(auth.endpoint, auth)</span>
63+
<span class="sd"> &gt;&gt;&gt; auth = Gen3Auth(refresh_file=&quot;credentials.json&quot;)</span>
64+
<span class="sd"> ... sub = Gen3Metadata(auth)</span>
6465

6566
<span class="sd"> Attributes:</span>
66-
<span class="sd"> admin_endpoint (str): endpoint for admin functionality (Create/Update/Delete)</span>
67-
<span class="sd"> endpoint (str): public endpoint for reading/querying metadata</span>
67+
<span class="sd"> endpoint (str): public endpoint for reading/querying metadata - only necessary if auth_provider not provided</span>
68+
<span class="sd"> auth_provider (Gen3Auth): auth manager</span>
6869
<span class="sd"> &quot;&quot;&quot;</span>
6970

7071
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span>
7172
<span class="bp">self</span><span class="p">,</span>
72-
<span class="n">endpoint</span><span class="p">,</span>
73+
<span class="n">endpoint</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
7374
<span class="n">auth_provider</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
7475
<span class="n">service_location</span><span class="o">=</span><span class="s2">&quot;mds&quot;</span><span class="p">,</span>
7576
<span class="n">admin_endpoint_suffix</span><span class="o">=</span><span class="s2">&quot;-admin&quot;</span><span class="p">,</span>
@@ -84,6 +85,12 @@ <h1>Source code for gen3.metadata</h1><div class="highlight"><pre>
8485
<span class="sd"> service_location (str, optional): deployment location relative to the</span>
8586
<span class="sd"> endpoint provided</span>
8687
<span class="sd"> &quot;&quot;&quot;</span>
88+
<span class="c1"># legacy interface required endpoint as 1st arg</span>
89+
<span class="k">if</span> <span class="n">endpoint</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">endpoint</span><span class="p">,</span><span class="n">Gen3Auth</span><span class="p">):</span>
90+
<span class="n">auth_provider</span> <span class="o">=</span> <span class="n">endpoint</span>
91+
<span class="n">endpoint</span> <span class="o">=</span> <span class="kc">None</span>
92+
<span class="k">if</span> <span class="n">auth_provider</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">auth_provider</span><span class="p">,</span><span class="n">Gen3Auth</span><span class="p">):</span>
93+
<span class="n">endpoint</span> <span class="o">=</span> <span class="n">auth_provider</span><span class="o">.</span><span class="n">endpoint</span>
8794
<span class="n">endpoint</span> <span class="o">=</span> <span class="n">endpoint</span><span class="o">.</span><span class="n">strip</span><span class="p">(</span><span class="s2">&quot;/&quot;</span><span class="p">)</span>
8895
<span class="c1"># if running locally, mds is deployed by itself without a location relative</span>
8996
<span class="c1"># to the commons</span>

0 commit comments

Comments
 (0)