Merge pull request #23 from swerik-project/dev

BobBorges · web-flow · commit 39a0be1ab0fb · 2025-01-10T14:58:26.000+01:00
prerelease: minor version
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,7 +1,7 @@
 cff-version: 1.2.0
 message: To cite this reposository, please use these metadata.
 title: "The Swedish Parliament Corpus: pyriksdagen"
-version: v1.6.0
+version: v1.7.0
 authors:
   - given-names: Väinö
     family-names: Yrjänäinen
diff --git a/docs/pyriksdagen.html b/docs/pyriksdagen.html
@@ -43,7 +43,7 @@ <h2>Submodules</h2>
             </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/args.html b/docs/pyriksdagen/args.html
@@ -67,7 +67,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/dataset.html b/docs/pyriksdagen/dataset.html
@@ -64,7 +64,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/date_handling.html b/docs/pyriksdagen/date_handling.html
@@ -49,7 +49,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/db.html b/docs/pyriksdagen/db.html
@@ -55,7 +55,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/download.html b/docs/pyriksdagen/download.html
@@ -61,7 +61,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/export.html b/docs/pyriksdagen/export.html
@@ -46,7 +46,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/match_mp.html b/docs/pyriksdagen/match_mp.html
@@ -76,7 +76,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/metadata.html b/docs/pyriksdagen/metadata.html
@@ -130,7 +130,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/motions.html b/docs/pyriksdagen/motions.html
@@ -34,7 +34,7 @@ <h2>Submodules</h2>
             </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/motions/curate.html b/docs/pyriksdagen/motions/curate.html
@@ -37,7 +37,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/mp.html b/docs/pyriksdagen/mp.html
@@ -55,7 +55,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/refine.html b/docs/pyriksdagen/refine.html
diff --git a/docs/pyriksdagen/segmentation.html b/docs/pyriksdagen/segmentation.html
@@ -61,7 +61,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/swerik_catalog.html b/docs/pyriksdagen/swerik_catalog.html
@@ -43,7 +43,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/pyriksdagen/utils.html b/docs/pyriksdagen/utils.html
@@ -109,7 +109,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
@@ -217,7 +217,7 @@ <h1 class="modulename">
 </span><span id="L-85"><a href="#L-85"><span class="linenos"> 85</span></a>                <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;sitting&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">year</span><span class="p">)</span>
 </span><span id="L-86"><a href="#L-86"><span class="linenos"> 86</span></a>
 </span><span id="L-87"><a href="#L-87"><span class="linenos"> 87</span></a>                <span class="c1"># Protocol ids of format 197879 have two years, eg. 1978 and 1979</span>
-</span><span id="L-88"><a href="#L-88"><span class="linenos"> 88</span></a>                <span class="k">if</span> <span class="n">s</span><span class="p">[</span><span class="mi">4</span><span class="p">:</span><span class="mi">6</span><span class="p">]</span><span class="o">.</span><span class="n">isdigit</span><span class="p">():</span>
+</span><span id="L-88"><a href="#L-88"><span class="linenos"> 88</span></a>                <span class="k">if</span> <span class="n">s</span><span class="p">[</span><span class="mi">4</span><span class="p">:</span><span class="mi">6</span><span class="p">]</span><span class="o">.</span><span class="n">isdigit</span><span class="p">()</span> <span class="ow">or</span> <span class="s2">&quot;urtima&quot;</span> <span class="ow">in</span> <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;protocol&quot;</span><span class="p">]:</span>
 </span><span id="L-89"><a href="#L-89"><span class="linenos"> 89</span></a>                    <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;secondary_year&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">year</span> <span class="o">+</span> <span class="mi">1</span>
 </span><span id="L-90"><a href="#L-90"><span class="linenos"> 90</span></a>                    <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;sitting&quot;</span><span class="p">]</span> <span class="o">+=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">s</span><span class="p">[</span><span class="mi">4</span><span class="p">:</span><span class="mi">6</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span>
 </span><span id="L-91"><a href="#L-91"><span class="linenos"> 91</span></a>
@@ -449,7 +449,7 @@ <h1 class="modulename">
 </span><span id="L-317"><a href="#L-317"><span class="linenos">317</span></a>        <span class="n">ns</span> <span class="o">=</span> <span class="n">fetch_ns</span><span class="p">()</span>
 </span><span id="L-318"><a href="#L-318"><span class="linenos">318</span></a>    <span class="k">else</span><span class="p">:</span>
 </span><span id="L-319"><a href="#L-319"><span class="linenos">319</span></a>        <span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;You need to pass a string or etree Element, not </span><span class="si">{</span><span class="nb">type</span><span class="p">(</span><span class="n">protocol</span><span class="p">)</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
-</span><span id="L-320"><a href="#L-320"><span class="linenos">320</span></a>    <span class="n">date_elems</span> <span class="o">=</span> <span class="n">root</span><span class="o">.</span><span class="n">findall</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">ns</span><span class="p">[</span><span class="s1">&#39;tei_ns&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">docDate&quot;</span><span class="p">)</span>
+</span><span id="L-320"><a href="#L-320"><span class="linenos">320</span></a>    <span class="n">date_elems</span> <span class="o">=</span> <span class="n">root</span><span class="o">.</span><span class="n">findall</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;.//</span><span class="si">{</span><span class="n">ns</span><span class="p">[</span><span class="s1">&#39;tei_ns&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">docDate&quot;</span><span class="p">)</span>
 </span><span id="L-321"><a href="#L-321"><span class="linenos">321</span></a>    <span class="k">for</span> <span class="n">de</span> <span class="ow">in</span> <span class="n">date_elems</span><span class="p">:</span>
 </span><span id="L-322"><a href="#L-322"><span class="linenos">322</span></a>        <span class="n">when_attrib</span> <span class="o">=</span> <span class="n">de</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;when&quot;</span><span class="p">)</span>
 </span><span id="L-323"><a href="#L-323"><span class="linenos">323</span></a>        <span class="n">elem_text</span> <span class="o">=</span> <span class="n">de</span><span class="o">.</span><span class="n">text</span>
@@ -823,7 +823,7 @@ <h1 class="modulename">
 </span><span id="infer_metadata-86"><a href="#infer_metadata-86"><span class="linenos"> 86</span></a>                <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;sitting&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">year</span><span class="p">)</span>
 </span><span id="infer_metadata-87"><a href="#infer_metadata-87"><span class="linenos"> 87</span></a>
 </span><span id="infer_metadata-88"><a href="#infer_metadata-88"><span class="linenos"> 88</span></a>                <span class="c1"># Protocol ids of format 197879 have two years, eg. 1978 and 1979</span>
-</span><span id="infer_metadata-89"><a href="#infer_metadata-89"><span class="linenos"> 89</span></a>                <span class="k">if</span> <span class="n">s</span><span class="p">[</span><span class="mi">4</span><span class="p">:</span><span class="mi">6</span><span class="p">]</span><span class="o">.</span><span class="n">isdigit</span><span class="p">():</span>
+</span><span id="infer_metadata-89"><a href="#infer_metadata-89"><span class="linenos"> 89</span></a>                <span class="k">if</span> <span class="n">s</span><span class="p">[</span><span class="mi">4</span><span class="p">:</span><span class="mi">6</span><span class="p">]</span><span class="o">.</span><span class="n">isdigit</span><span class="p">()</span> <span class="ow">or</span> <span class="s2">&quot;urtima&quot;</span> <span class="ow">in</span> <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;protocol&quot;</span><span class="p">]:</span>
 </span><span id="infer_metadata-90"><a href="#infer_metadata-90"><span class="linenos"> 90</span></a>                    <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;secondary_year&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">year</span> <span class="o">+</span> <span class="mi">1</span>
 </span><span id="infer_metadata-91"><a href="#infer_metadata-91"><span class="linenos"> 91</span></a>                    <span class="n">metadata</span><span class="p">[</span><span class="s2">&quot;sitting&quot;</span><span class="p">]</span> <span class="o">+=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">s</span><span class="p">[</span><span class="mi">4</span><span class="p">:</span><span class="mi">6</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span>
 </span><span id="infer_metadata-92"><a href="#infer_metadata-92"><span class="linenos"> 92</span></a>
@@ -1233,7 +1233,7 @@ <h1 class="modulename">
 </span><span id="get_doc_dates-318"><a href="#get_doc_dates-318"><span class="linenos">318</span></a>        <span class="n">ns</span> <span class="o">=</span> <span class="n">fetch_ns</span><span class="p">()</span>
 </span><span id="get_doc_dates-319"><a href="#get_doc_dates-319"><span class="linenos">319</span></a>    <span class="k">else</span><span class="p">:</span>
 </span><span id="get_doc_dates-320"><a href="#get_doc_dates-320"><span class="linenos">320</span></a>        <span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;You need to pass a string or etree Element, not </span><span class="si">{</span><span class="nb">type</span><span class="p">(</span><span class="n">protocol</span><span class="p">)</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
-</span><span id="get_doc_dates-321"><a href="#get_doc_dates-321"><span class="linenos">321</span></a>    <span class="n">date_elems</span> <span class="o">=</span> <span class="n">root</span><span class="o">.</span><span class="n">findall</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">ns</span><span class="p">[</span><span class="s1">&#39;tei_ns&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">docDate&quot;</span><span class="p">)</span>
+</span><span id="get_doc_dates-321"><a href="#get_doc_dates-321"><span class="linenos">321</span></a>    <span class="n">date_elems</span> <span class="o">=</span> <span class="n">root</span><span class="o">.</span><span class="n">findall</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;.//</span><span class="si">{</span><span class="n">ns</span><span class="p">[</span><span class="s1">&#39;tei_ns&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">docDate&quot;</span><span class="p">)</span>
 </span><span id="get_doc_dates-322"><a href="#get_doc_dates-322"><span class="linenos">322</span></a>    <span class="k">for</span> <span class="n">de</span> <span class="ow">in</span> <span class="n">date_elems</span><span class="p">:</span>
 </span><span id="get_doc_dates-323"><a href="#get_doc_dates-323"><span class="linenos">323</span></a>        <span class="n">when_attrib</span> <span class="o">=</span> <span class="n">de</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;when&quot;</span><span class="p">)</span>
 </span><span id="get_doc_dates-324"><a href="#get_doc_dates-324"><span class="linenos">324</span></a>        <span class="n">elem_text</span> <span class="o">=</span> <span class="n">de</span><span class="o">.</span><span class="n">text</span>
diff --git a/docs/pyriksdagen/wikidata.html b/docs/pyriksdagen/wikidata.html
@@ -61,7 +61,7 @@ <h2>API Documentation</h2>
     </ul>
 
 
-            <footer>v1.6.0</footer>
+            <footer>v1.7.0</footer>
 
         <a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
             built with <span class="visually-hidden">pdoc</span><img
diff --git a/docs/search.js b/docs/search.js
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyriksdagen"
-version = "v1.6.0"
+version = "v1.7.0"
 description = "Access the Riksdagen corpus"
 authors = ["ninpnin <vainoyrjanainen@icloud.com>"]
 repository = "https://github.com/welfare-state-analytics/riksdagen-corpus"
diff --git a/pyriksdagen/refine.py b/pyriksdagen/refine.py
diff --git a/pyriksdagen/utils.py b/pyriksdagen/utils.py
