Skip to content

Commit b5ce39d

Browse files
Idempotent docs build (#293)
1 parent c399870 commit b5ce39d

11 files changed

Lines changed: 23 additions & 8 deletions

File tree

120 Bytes
Binary file not shown.
-210 Bytes
Binary file not shown.
-255 Bytes
Binary file not shown.

docs/_build/html/_modules/gen3/tools/indexing/verify_manifest.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ <h1>Source code for gen3.tools.indexing.verify_manifest</h1><div class="highligh
229229
<span class="n">max_concurrent_requests</span><span class="o">=</span><span class="n">MAX_CONCURRENT_REQUESTS</span><span class="p">,</span>
230230
<span class="n">manifest_row_parsers</span><span class="o">=</span><span class="n">manifest_row_parsers</span><span class="p">,</span>
231231
<span class="n">manifest_file_delimiter</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
232-
<span class="n">output_filename</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;verify-manifest-errors-</span><span class="si">{</span><span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span><span class="si">}</span><span class="s2">.log&quot;</span><span class="p">,</span>
232+
<span class="n">output_filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
233233
<span class="p">):</span>
234234
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
235235
<span class="sd"> Verify all file object records into a manifest csv</span>
@@ -242,6 +242,9 @@ <h1>Source code for gen3.tools.indexing.verify_manifest</h1><div class="highligh
242242
<span class="sd"> manifest_file_delimiter (str): delimeter in manifest_file</span>
243243
<span class="sd"> output_filename (str): filename for output logs</span>
244244
<span class="sd"> &quot;&quot;&quot;</span>
245+
<span class="k">if</span> <span class="ow">not</span> <span class="n">output_filename</span><span class="p">:</span>
246+
<span class="n">output_filename</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;verify-manifest-errors-</span><span class="si">{</span><span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span><span class="si">}</span><span class="s2">.log&quot;</span>
247+
245248
<span class="n">start_time</span> <span class="o">=</span> <span class="n">time</span><span class="o">.</span><span class="n">perf_counter</span><span class="p">()</span>
246249
<span class="n">logging</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;start time: </span><span class="si">{</span><span class="n">start_time</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
247250

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ <h1>Source code for gen3.tools.metadata.ingest_manifest</h1><div class="highligh
185185
<span class="n">max_concurrent_requests</span><span class="o">=</span><span class="n">MAX_CONCURRENT_REQUESTS</span><span class="p">,</span>
186186
<span class="n">manifest_row_parsers</span><span class="o">=</span><span class="n">manifest_row_parsers</span><span class="p">,</span>
187187
<span class="n">manifest_file_delimiter</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
188-
<span class="n">output_filename</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;ingest-metadata-manifest-errors-</span><span class="si">{</span><span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span><span class="si">}</span><span class="s2">.log&quot;</span><span class="p">,</span>
188+
<span class="n">output_filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
189189
<span class="n">get_guid_from_file</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
190190
<span class="n">metadata_type</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
191191
<span class="p">):</span>
@@ -211,6 +211,9 @@ <h1>Source code for gen3.tools.metadata.ingest_manifest</h1><div class="highligh
211211
<span class="sd"> if is_indexed_file_object</span>
212212
<span class="sd"> else GUID_TYPE_FOR_NON_INDEXED_FILE_OBJECT)</span>
213213
<span class="sd"> &quot;&quot;&quot;</span>
214+
<span class="k">if</span> <span class="ow">not</span> <span class="n">output_filename</span><span class="p">:</span>
215+
<span class="n">output_filename</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;ingest-metadata-manifest-errors-</span><span class="si">{</span><span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span><span class="si">}</span><span class="s2">.log&quot;</span>
216+
214217
<span class="c1"># if delimiter not specified, try to get based on file ext</span>
215218
<span class="k">if</span> <span class="ow">not</span> <span class="n">manifest_file_delimiter</span><span class="p">:</span>
216219
<span class="n">file_ext</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">splitext</span><span class="p">(</span><span class="n">manifest_file</span><span class="p">)</span>

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/indexing.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ <h1>Indexing Tools<a class="headerlink" href="#indexing-tools" title="Link to th
382382

383383
<dl class="py function">
384384
<dt class="sig sig-object py" id="gen3.tools.indexing.verify_manifest.async_verify_object_manifest">
385-
<span class="property"><span class="k"><span class="pre">async</span></span><span class="w"> </span></span><span class="sig-prename descclassname"><span class="pre">gen3.tools.indexing.verify_manifest.</span></span><span class="sig-name descname"><span class="pre">async_verify_object_manifest</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">commons_url</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">max_concurrent_requests</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">24</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_row_parsers</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">{'acl':</span> <span class="pre">&lt;function</span> <span class="pre">_get_acl_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'authz'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_authz_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'file_name'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_file_name_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'file_size'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_file_size_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'guid'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_guid_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'md5'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_md5_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'urls'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_urls_from_row&gt;}</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file_delimiter</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">output_filename</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'verify-manifest-errors-1774535925.074383.log'</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/gen3/tools/indexing/verify_manifest.html#async_verify_object_manifest"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#gen3.tools.indexing.verify_manifest.async_verify_object_manifest" title="Link to this definition"></a></dt>
385+
<span class="property"><span class="k"><span class="pre">async</span></span><span class="w"> </span></span><span class="sig-prename descclassname"><span class="pre">gen3.tools.indexing.verify_manifest.</span></span><span class="sig-name descname"><span class="pre">async_verify_object_manifest</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">commons_url</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">max_concurrent_requests</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">24</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_row_parsers</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">{'acl':</span> <span class="pre">&lt;function</span> <span class="pre">_get_acl_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'authz'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_authz_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'file_name'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_file_name_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'file_size'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_file_size_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'guid'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_guid_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'md5'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_md5_from_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'urls'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_get_urls_from_row&gt;}</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file_delimiter</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">output_filename</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/gen3/tools/indexing/verify_manifest.html#async_verify_object_manifest"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#gen3.tools.indexing.verify_manifest.async_verify_object_manifest" title="Link to this definition"></a></dt>
386386
<dd><p>Verify all file object records into a manifest csv</p>
387387
<dl class="field-list simple">
388388
<dt class="field-odd">Parameters<span class="colon">:</span></dt>

docs/_build/html/tools/metadata.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ <h1>Metadata Tools<a class="headerlink" href="#metadata-tools" title="Link to th
103103

104104
<dl class="py function">
105105
<dt class="sig sig-object py" id="gen3.tools.metadata.ingest_manifest.async_ingest_metadata_manifest">
106-
<span class="property"><span class="k"><span class="pre">async</span></span><span class="w"> </span></span><span class="sig-prename descclassname"><span class="pre">gen3.tools.metadata.ingest_manifest.</span></span><span class="sig-name descname"><span class="pre">async_ingest_metadata_manifest</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">commons_url</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">metadata_source</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">auth</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">max_concurrent_requests</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">24</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_row_parsers</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">{'guid_for_row':</span> <span class="pre">&lt;function</span> <span class="pre">_get_guid_for_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'indexed_file_object_guid'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_query_for_associated_indexd_record_guid&gt;}</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file_delimiter</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">output_filename</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'ingest-metadata-manifest-errors-1774535925.327315.log'</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">get_guid_from_file</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">metadata_type</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/gen3/tools/metadata/ingest_manifest.html#async_ingest_metadata_manifest"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#gen3.tools.metadata.ingest_manifest.async_ingest_metadata_manifest" title="Link to this definition"></a></dt>
106+
<span class="property"><span class="k"><span class="pre">async</span></span><span class="w"> </span></span><span class="sig-prename descclassname"><span class="pre">gen3.tools.metadata.ingest_manifest.</span></span><span class="sig-name descname"><span class="pre">async_ingest_metadata_manifest</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">commons_url</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">metadata_source</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">auth</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">max_concurrent_requests</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">24</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_row_parsers</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">{'guid_for_row':</span> <span class="pre">&lt;function</span> <span class="pre">_get_guid_for_row&gt;</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">'indexed_file_object_guid'</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">&lt;function</span> <span class="pre">_query_for_associated_indexd_record_guid&gt;}</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">manifest_file_delimiter</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">output_filename</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">get_guid_from_file</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">metadata_type</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/gen3/tools/metadata/ingest_manifest.html#async_ingest_metadata_manifest"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#gen3.tools.metadata.ingest_manifest.async_ingest_metadata_manifest" title="Link to this definition"></a></dt>
107107
<dd><p>Ingest all metadata records into a manifest csv</p>
108108
<dl class="field-list simple">
109109
<dt class="field-odd">Parameters<span class="colon">:</span></dt>

gen3/tools/indexing/verify_manifest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ async def async_verify_object_manifest(
194194
max_concurrent_requests=MAX_CONCURRENT_REQUESTS,
195195
manifest_row_parsers=manifest_row_parsers,
196196
manifest_file_delimiter=None,
197-
output_filename=f"verify-manifest-errors-{time.time()}.log",
197+
output_filename=None,
198198
):
199199
"""
200200
Verify all file object records into a manifest csv
@@ -207,6 +207,9 @@ async def async_verify_object_manifest(
207207
manifest_file_delimiter (str): delimeter in manifest_file
208208
output_filename (str): filename for output logs
209209
"""
210+
if not output_filename:
211+
output_filename = f"verify-manifest-errors-{time.time()}.log"
212+
210213
start_time = time.perf_counter()
211214
logging.info(f"start time: {start_time}")
212215

gen3/tools/metadata/ingest_manifest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ async def async_ingest_metadata_manifest(
150150
max_concurrent_requests=MAX_CONCURRENT_REQUESTS,
151151
manifest_row_parsers=manifest_row_parsers,
152152
manifest_file_delimiter=None,
153-
output_filename=f"ingest-metadata-manifest-errors-{time.time()}.log",
153+
output_filename=None,
154154
get_guid_from_file=True,
155155
metadata_type=None,
156156
):
@@ -176,6 +176,9 @@ async def async_ingest_metadata_manifest(
176176
if is_indexed_file_object
177177
else GUID_TYPE_FOR_NON_INDEXED_FILE_OBJECT)
178178
"""
179+
if not output_filename:
180+
output_filename = f"ingest-metadata-manifest-errors-{time.time()}.log"
181+
179182
# if delimiter not specified, try to get based on file ext
180183
if not manifest_file_delimiter:
181184
file_ext = os.path.splitext(manifest_file)

0 commit comments

Comments
 (0)