fix(ru-exporter): restore missing sc_pli2ru_dpd_json path in paths_ru.py and update sutta central ru exporter

Author: Devamitta

exporter/sutta_central/sutta_central_exporter_ru.py

@@ -36,6 +36,7 @@
 from tools.pali_sort_key import pali_sort_key
 from tools.pali_text_files import sc_texts
 from tools.paths import ProjectPaths
+from tools.paths_ru import RuPaths
 from tools.printer import printer as pr
 from tools.tools_for_ru_exporter import ru_replace_abbreviations
 
@@ -44,6 +45,7 @@
 
 class SuttaCentralExporterRu:
     pth: ProjectPaths = ProjectPaths()
+    ru_pth: RuPaths = RuPaths()
     db_session: Session = get_db_session(pth.dpd_db_path)
 
     sc_books_list = [
@@ -255,8 +257,8 @@ def save_sc_dict(self):
         """Save to JSON."""
 
         pr.green_tmr("saving sc dict")
-        self.pth.sc_pli2ru_dpd_json.parent.mkdir(parents=True, exist_ok=True)
-        with open(self.pth.sc_pli2ru_dpd_json, "w") as f:
+        self.ru_pth.sc_pli2ru_dpd_json.parent.mkdir(parents=True, exist_ok=True)
+        with open(self.ru_pth.sc_pli2ru_dpd_json, "w", encoding="utf-8") as f:
             dump(self.sc_dict_compiled, f, ensure_ascii=False, indent=2)
         pr.yes("OK")
 

tests/test_sutta_central_exporter_ru.py

@@ -8,8 +8,8 @@
 
 import json
 from io import StringIO
-from pathlib import Path
-from unittest.mock import MagicMock, call, patch
+from typing import Any
+from unittest.mock import MagicMock, patch
 
 import pytest
 
@@ -21,12 +21,14 @@
 # Helpers
 # ---------------------------------------------------------------------------
 
-def _bare(with_ai: bool = False, with_eng_fallback: bool = False) -> SuttaCentralExporterRu:
+
+def _bare(with_ai: bool = False, with_eng_fallback: bool = False) -> Any:
     """Return a SuttaCentralExporterRu instance without running __init__."""
     inst = object.__new__(SuttaCentralExporterRu)
     inst.with_ai = with_ai
     inst.with_eng_fallback = with_eng_fallback
     inst.pth = MagicMock()
+    inst.ru_pth = MagicMock()
     inst.db_session = MagicMock()
     inst.sc_word_set = set()
     inst.lookup_dict = {}
@@ -70,6 +72,7 @@ def _lookup(headword_ids=None, deconstructions=None):
 # flip()
 # ---------------------------------------------------------------------------
 
+
 class TestFlip:
     def setup_method(self):
         self.inst = _bare()
@@ -146,28 +149,39 @@ def test_ru_meaning_with_literal_and_construction(self, _abbr):
     def test_empty_ru_meaning_lit_excluded(self, _abbr):
         """Empty ru_meaning_lit (falsy) must not add '; досл.' clause."""
         inst = _bare()
-        result = inst.make_sc_headword_entry(_hw(ru=_ru(ru_meaning="учение", ru_meaning_lit="")))
+        result = inst.make_sc_headword_entry(
+            _hw(ru=_ru(ru_meaning="учение", ru_meaning_lit=""))
+        )
         assert "досл." not in result
         assert result == "сущ. <b>учение</b>"
 
     @patch(f"{MODULE}.ru_replace_abbreviations", return_value="гл")
     def test_ai_entry_when_ai_enabled(self, _abbr):
         inst = _bare(with_ai=True)
-        result = inst.make_sc_headword_entry(_hw(pos="verb", ru=_ru(ru_meaning_raw="понимать")))
+        result = inst.make_sc_headword_entry(
+            _hw(pos="verb", ru=_ru(ru_meaning_raw="понимать"))
+        )
         assert result == "гл. <i>[пер. ИИ]</i> понимать"
 
     @patch(f"{MODULE}.ru_replace_abbreviations", return_value="гл")
     def test_ai_entry_returns_none_when_ai_disabled(self, _abbr):
         inst = _bare(with_ai=False)
-        result = inst.make_sc_headword_entry(_hw(pos="verb", ru=_ru(ru_meaning_raw="понимать")))
+        result = inst.make_sc_headword_entry(
+            _hw(pos="verb", ru=_ru(ru_meaning_raw="понимать"))
+        )
         assert result is None
 
     @patch(f"{MODULE}.ru_replace_abbreviations", return_value="гл")
     def test_ai_entry_includes_construction(self, _abbr):
         inst = _bare(with_ai=True)
         result = inst.make_sc_headword_entry(
-            _hw(pos="verb", ru=_ru(ru_meaning_raw="понимать"), construction_summary="pa + jānā")
+            _hw(
+                pos="verb",
+                ru=_ru(ru_meaning_raw="понимать"),
+                construction_summary="pa + jānā",
+            )
         )
+        assert result is not None
         assert "[pa + jānā]" in result
 
     @patch(f"{MODULE}.make_meaning_combo", return_value="teaching; law")
@@ -189,14 +203,19 @@ def test_eng_fallback_returns_none_when_disabled(self, _abbr):
     @patch(f"{MODULE}.ru_replace_abbreviations", return_value="сущ")
     def test_eng_fallback_includes_construction(self, _abbr, _combo):
         inst = _bare(with_eng_fallback=True)
-        result = inst.make_sc_headword_entry(_hw(ru=None, construction_summary="dhā + ma"))
+        result = inst.make_sc_headword_entry(
+            _hw(ru=None, construction_summary="dhā + ma")
+        )
+        assert result is not None
         assert "[dhā + ma]" in result
 
     @patch(f"{MODULE}.ru_replace_abbreviations", return_value="сущ")
     def test_all_empty_ru_fields_returns_none(self, _abbr):
         """ru object with all empty meaning fields → None."""
         inst = _bare()
-        result = inst.make_sc_headword_entry(_hw(ru=_ru(ru_meaning="", ru_meaning_raw="")))
+        result = inst.make_sc_headword_entry(
+            _hw(ru=_ru(ru_meaning="", ru_meaning_raw=""))
+        )
         assert result is None
 
     @patch(f"{MODULE}.ru_replace_abbreviations", return_value="сущ")
@@ -206,6 +225,7 @@ def test_ru_meaning_preferred_over_raw(self, _abbr):
         result = inst.make_sc_headword_entry(
             _hw(ru=_ru(ru_meaning="учение", ru_meaning_raw="ИИ перевод"))
         )
+        assert result is not None
         assert "<b>учение</b>" in result
         assert "[пер. ИИ]" not in result
 
@@ -222,6 +242,7 @@ def test_pos_abbreviation_always_called(self, mock_abbr):
 # make_sc_dict()
 # ---------------------------------------------------------------------------
 
+
 class TestMakeScDict:
     def test_word_not_in_lookup_dict_skipped(self):
         inst = _bare()
@@ -290,7 +311,9 @@ def test_headwords_and_deconstructor_both_added(self, _abbr):
         hw = _hw(lemma_1="dhamma", pos="masc", ru=_ru(ru_meaning="учение"))
         inst = _bare()
         inst.sc_word_set = {"dhamma"}
-        inst.lookup_dict = {"dhamma": _lookup(headword_ids=[1], deconstructions=["x + y"])}
+        inst.lookup_dict = {
+            "dhamma": _lookup(headword_ids=[1], deconstructions=["x + y"])
+        }
         inst.headword_dict = {1: hw}
         inst.make_sc_dict()
         assert len(inst.sc_dict["dhamma"]) == 2
@@ -322,6 +345,7 @@ def test_multiple_words_each_processed_independently(self):
 # compile_sc_dict()
 # ---------------------------------------------------------------------------
 
+
 class TestCompileScDict:
     def test_empty_word_set(self):
         inst = _bare()
@@ -426,6 +450,7 @@ def test_compiled_entry_has_definition_key(self):
 # make_lookup_dict()
 # ---------------------------------------------------------------------------
 
+
 class TestMakeLookupDict:
     def test_populates_lookup_dict_from_db(self):
         inst = _bare()
@@ -465,6 +490,7 @@ def test_duplicate_keys_last_one_wins(self):
 # make_headwords_dict()
 # ---------------------------------------------------------------------------
 
+
 class TestMakeHeadwordsDict:
     def test_populates_headword_dict_by_id(self):
         inst = _bare()
@@ -512,6 +538,7 @@ def test_queries_dpdheadword_model(self):
 # save_sc_dict()
 # ---------------------------------------------------------------------------
 
+
 class TestSaveScDict:
     def _run_save(self, inst):
         """Run save_sc_dict, capture written bytes, return parsed JSON."""
@@ -532,9 +559,14 @@ def __exit__(self_, *a):
     def test_creates_parent_directory(self):
         inst = _bare()
         inst.sc_dict_compiled = []
-        with patch("builtins.open", return_value=MagicMock(__enter__=lambda s: StringIO(), __exit__=lambda s, *a: None)):
+        with patch(
+            "builtins.open",
+            return_value=MagicMock(
+                __enter__=lambda s: StringIO(), __exit__=lambda s, *a: None
+            ),
+        ):
             inst.save_sc_dict()
-        inst.pth.sc_pli2ru_dpd_json.parent.mkdir.assert_called_once_with(
+        inst.ru_pth.sc_pli2ru_dpd_json.parent.mkdir.assert_called_once_with(
             parents=True, exist_ok=True
         )
 
@@ -575,12 +607,17 @@ def test_opens_file_at_correct_path(self):
         inst = _bare()
         inst.sc_dict_compiled = []
         mock_path = MagicMock()
-        inst.pth.sc_pli2ru_dpd_json = mock_path
-
-        with patch("builtins.open", return_value=MagicMock(__enter__=lambda s: StringIO(), __exit__=lambda s, *a: None)) as m_open:
+        inst.ru_pth.sc_pli2ru_dpd_json = mock_path
+
+        with patch(
+            "builtins.open",
+            return_value=MagicMock(
+                __enter__=lambda s: StringIO(), __exit__=lambda s, *a: None
+            ),
+        ) as m_open:
             inst.save_sc_dict()
 
-        m_open.assert_called_once_with(mock_path, "w")
+        m_open.assert_called_once_with(mock_path, "w", encoding="utf-8")
 
 
 # ---------------------------------------------------------------------------

tools/paths_ru.py

@@ -327,6 +327,11 @@ def __init__(self, base_dir: Optional[Path] = None, create_dirs=True):
             base_dir / "resources/tpr_downloads/release_zips/dpd_with_rus.zip"
         )
 
+        # resources/sc-data/dictionaries/simple/ru
+        self.sc_pli2ru_dpd_json = (
+            base_dir / "resources/sc-data/dictionaries/simple/ru/pli2ru_dpd.json"
+        )
+
         # identity/
         self.dpd_css_path = base_dir / "identity/css/dpd.css"
         self.dpd_variables_css_path = base_dir / "identity/css/dpd-variables.css"