philoch-bib-sdk 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

philoch_bib_sdk/adapters/tabular_data/read_journal_volume_number_index.py

@@ -1,21 +1,20 @@
 from functools import partial
 from typing import Callable, NamedTuple
 
+from philoch_bib_sdk.converters.plaintext.bibitem.bibkey_parser import hard_parse_bibkey, parse_bibkey
 from philoch_bib_sdk.logic.functions.journal_article_matcher import (
-    TBibkey,
     TJournalBibkeyIndex,
-    TJournalName,
-    TNumber,
     TReadIndex,
-    TVolume,
 )
 
+from aletk.ResultMonad import Err
+
 
 class ColumnNames(NamedTuple):
-    bibkey: TBibkey
-    journal: TJournalName
-    volume: TVolume
-    number: TNumber
+    bibkey: str
+    journal: str
+    volume: str
+    number: str
 
 
 def _read_from_ods(
@@ -49,8 +48,19 @@ def _read_from_ods(
             f"Tabular data at '{file_path}' is empty or does not contain the expected columns: {column_names}"
         )
 
+    bibkeys_parsed = (parse_bibkey(str(row[column_names.bibkey])) for row in df.to_dicts())
+
+    bibkey_errors = [bibkey for bibkey in bibkeys_parsed if isinstance(bibkey, Err)]
+
+    if bibkey_errors != []:
+        raise ValueError(
+            f"Failed to parse bibkeys in the ODS file at '{file_path}': {' --- '.join(str(bibkey_errors))}"
+        )
+
     return {
-        (row[column_names.journal], row[column_names.volume], row[column_names.number]): row[column_names.bibkey]
+        (row[column_names.journal], row[column_names.volume], row[column_names.number]): hard_parse_bibkey(
+            row[column_names.bibkey]
+        )
         for row in df.to_dicts()
     }
 

philoch_bib_sdk/converters/plaintext/bibitem/bibkey_parser.py

@@ -142,3 +142,17 @@ def parse_bibkey(text: str) -> Ok[BibKeyAttr] | Err:
             error_type="BibkeyError",
             error_trace=f"{traceback.format_exc()}",
         )
+
+
+def hard_parse_bibkey(text: str) -> BibKeyAttr:
+    """
+    Hard parse a bibkey, without any error handling.
+    This is used for testing purposes only.
+    """
+
+    bibkey_parsed = parse_bibkey(text)
+
+    if isinstance(bibkey_parsed, Err):
+        raise ValueError(f"Could not hard parse '{text}' as bibkey: {bibkey_parsed.message}")
+
+    return bibkey_parsed.out

philoch_bib_sdk/logic/functions/journal_article_matcher.py

@@ -1,6 +1,6 @@
 from typing import Callable, Dict, Tuple
 from philoch_bib_sdk.converters.plaintext.journal.formatter import format_journal
-from philoch_bib_sdk.logic.models import BibItem
+from philoch_bib_sdk.logic.models import BibItem, BibKeyAttr
 
 
 type TJournalName = str
@@ -12,10 +12,12 @@ type TNumber = str
 type TBibkey = str
 
 
-type TJournalBibkeyIndex = Dict[Tuple[TJournalName, TVolume, TNumber], TBibkey]  # (journal, volume, number)  # bibkey
+type TJournalBibkeyIndex = Dict[
+    Tuple[TJournalName, TVolume, TNumber], BibKeyAttr
+]  # (journal, volume, number)  # bibkey
 
 
-def get_bibkey_by_journal_volume_number(index: TJournalBibkeyIndex, subject: BibItem) -> TBibkey:
+def get_bibkey_by_journal_volume_number(index: TJournalBibkeyIndex, subject: BibItem) -> BibKeyAttr:
     """
     Simple lookup of a Bibitem on an index for its bibkey, via the combination (journal_name, volume, number). Fails if any of the three fields are missing.
     """

{philoch_bib_sdk-0.1.4.dist-info → philoch_bib_sdk-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: philoch-bib-sdk
-Version: 0.1.4
+Version: 0.1.5
 Summary: Standard development kit for the Philosophie Bibliography project
 License: MIT
 Author: Luis Alejandro Bordo García

{philoch_bib_sdk-0.1.4.dist-info → philoch_bib_sdk-0.1.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
 philoch_bib_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-philoch_bib_sdk/adapters/tabular_data/read_journal_volume_number_index.py,sha256=espgeln4xH29X1STIDLKiO1IRwmzN5WMjr5QYjPCKls,1757
+philoch_bib_sdk/adapters/tabular_data/read_journal_volume_number_index.py,sha256=6ocGGl9nZXqyHkPxJp5GH1NIfb-BUMTYqr84QwZOPd8,2210
 philoch_bib_sdk/converters/latex.py,sha256=LuAKLrClECuBeaDQYJc7tIJECEV4h0kt0VE_ssv3s0o,236
 philoch_bib_sdk/converters/plaintext/author/formatter.py,sha256=hsqKUyNhIZeqisnEQU43DokAfEfG78rgQ8POTjYnToM,965
 philoch_bib_sdk/converters/plaintext/author/parser.py,sha256=LL12mtgN59eJCv551c6s7YfMTjfJAJqm-jRQkdntmIg,2514
 philoch_bib_sdk/converters/plaintext/bib_string_formatter.py,sha256=5Z97u5GryHUgZcPhWE41thgWCB4wYu22pZ9et6nakmw,329
 philoch_bib_sdk/converters/plaintext/bibitem/bibkey_formatter.py,sha256=YivsY0gblKJdC4yKYZ3tvWmKIvFXW4iNht9zhz8oFUs,565
-philoch_bib_sdk/converters/plaintext/bibitem/bibkey_parser.py,sha256=lmcDD-NN0hiAF_uKRUcucTBELd_F9q_qjbW9Df7srwY,4624
+philoch_bib_sdk/converters/plaintext/bibitem/bibkey_parser.py,sha256=TKHFQ9QeZ2Jgm3sFCjTqz_PDfous0amvz3DB0AJA51E,4991
 philoch_bib_sdk/converters/plaintext/bibitem/date_formatter.py,sha256=G2mbaJidDg8avKBbro1rVcEznPC92XVTDQ4fSdmvhJo,1480
 philoch_bib_sdk/converters/plaintext/bibitem/date_parser.py,sha256=3ZYGhhGqILzrvnwOvG4NPAjErLwVva0dfsN0B9eFomg,2242
 philoch_bib_sdk/converters/plaintext/bibitem/formatter.py,sha256=EjSwHYAPn0YRjeLGK_rCi26Wtug6X5x5DFEKPjStn30,6298
@@ -17,12 +17,12 @@ philoch_bib_sdk/converters/plaintext/journal/parser.py,sha256=kT1YHwc9Am82WHRhaS
 philoch_bib_sdk/converters/plaintext/shared/renderable_formatter.py,sha256=oS5u8RJpkRXaDTmauVqZi-uuXsyG-UQZMK2pgzSk-qo,686
 philoch_bib_sdk/logic/default_models.py,sha256=cHHKSFmNR29qBxQkPwelQ09sx66isHlAIr1PiIHAvH4,10467
 philoch_bib_sdk/logic/functions/comparator.py,sha256=4G5EUEVf8v6URt1v1Fqk1pjqni6fxUs_Goh4EQ4RBJY,4034
-philoch_bib_sdk/logic/functions/journal_article_matcher.py,sha256=qow-szblPDF9ZFaL3nIj-h54rVUwDJz9YXjxycTlTT8,1195
+philoch_bib_sdk/logic/functions/journal_article_matcher.py,sha256=IcnTv07Gk68M1LGB0Y9Z2DZsLYsWRzJCeL_c1r29bqg,1219
 philoch_bib_sdk/logic/literals.py,sha256=_9poyFdSqbMWNg686xaexvkZTIrpCbQqPNTCVi0PlFc,1573
 philoch_bib_sdk/logic/models.py,sha256=xHCQWFq_rEcX967icALD4oOQjM8AlLKLzXQ8SP-YNis,8681
 philoch_bib_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-philoch_bib_sdk-0.1.4.dist-info/LICENSE,sha256=nplGobji9gkYmJxDBbBz2SKjZY27SUaqhqKkpUB-C30,1070
-philoch_bib_sdk-0.1.4.dist-info/METADATA,sha256=uZJQLAGQRjOtQZCskgWwjaLPZ8UyGkFEAVLcdYjF82I,816
-philoch_bib_sdk-0.1.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-philoch_bib_sdk-0.1.4.dist-info/entry_points.txt,sha256=5PDcoKK00cdaL0CabioRUz08ZJeXLa94Ca-C0umGPTU,46
-philoch_bib_sdk-0.1.4.dist-info/RECORD,,
+philoch_bib_sdk-0.1.5.dist-info/LICENSE,sha256=nplGobji9gkYmJxDBbBz2SKjZY27SUaqhqKkpUB-C30,1070
+philoch_bib_sdk-0.1.5.dist-info/METADATA,sha256=wGBNDCmurQsZbrDFiO9PrTHUfp0B3dLeLOLre7Io6Ns,816
+philoch_bib_sdk-0.1.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+philoch_bib_sdk-0.1.5.dist-info/entry_points.txt,sha256=5PDcoKK00cdaL0CabioRUz08ZJeXLa94Ca-C0umGPTU,46
+philoch_bib_sdk-0.1.5.dist-info/RECORD,,