bible-ref-tagger 0.2.2__tar.gz → 0.2.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/PKG-INFO +1 -1
  2. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/pyproject.toml +3 -8
  3. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/providers.py +2 -2
  4. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/reference.py +8 -0
  5. bible_ref_tagger-0.2.3/src/bible_ref_tagger/tagger.py +98 -0
  6. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger.egg-info/PKG-INFO +1 -1
  7. bible_ref_tagger-0.2.2/src/bible_ref_tagger/tagger.py +0 -44
  8. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/LICENSE.txt +0 -0
  9. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/README.md +0 -0
  10. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/setup.cfg +0 -0
  11. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/__init__.py +0 -0
  12. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/books.py +0 -0
  13. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/config.py +0 -0
  14. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/engines.py +0 -0
  15. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/refparser.py +0 -0
  16. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger/utils.py +0 -0
  17. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger.egg-info/SOURCES.txt +0 -0
  18. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger.egg-info/dependency_links.txt +0 -0
  19. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger.egg-info/requires.txt +0 -0
  20. {bible_ref_tagger-0.2.2 → bible_ref_tagger-0.2.3}/src/bible_ref_tagger.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bible-ref-tagger
3
- Version: 0.2.2
3
+ Version: 0.2.3
4
4
  Summary: Bible reference parsing and linking
5
5
  Author-email: "Rev. T. H. Wright" <thwright@thwright.com>
6
6
  License: GNU GENERAL PUBLIC LICENSE
@@ -1,18 +1,13 @@
1
1
  [build-system]
2
- requires = [
3
- "setuptools",
4
- "wheel"
5
- ]
2
+ requires = ["setuptools", "wheel"]
6
3
  build-backend = "setuptools.build_meta"
7
4
 
8
5
  [project]
9
6
  name = "bible-ref-tagger"
10
- version = "0.2.2"
7
+ version = "0.2.3"
11
8
  description = "Bible reference parsing and linking"
12
9
  requires-python = ">=3.8"
13
- authors = [
14
- { name = "Rev. T. H. Wright", email = "thwright@thwright.com" }
15
- ]
10
+ authors = [{ name = "Rev. T. H. Wright", email = "thwright@thwright.com" } ]
16
11
  readme= "README.md"
17
12
  license = { file = "LICENSE.txt" }
18
13
  dependencies = [
@@ -15,7 +15,7 @@ class VerseProvider:
15
15
  def get(self, ref: Reference) -> str:
16
16
  raise NotImplementedError
17
17
 
18
- def get_passage(self, ref: "Ref") -> List[Tuple[int, int, str]]:
18
+ def get_passage(self, ref: Reference) -> List[Tuple[int, int, str]]:
19
19
  raise NotImplementedError
20
20
 
21
21
 
@@ -72,7 +72,7 @@ class JSONVerseProvider(VerseProvider):
72
72
 
73
73
  if ch_num == start_ch and ch_num == end_ch:
74
74
  first_vs = start_vs
75
- last_vs = end_vs if end_vs is not None else start_vs
75
+ last_vs = end_vs if end_vs is not None else (max(verses.keys()) if ref.start_vs is None else start_vs)
76
76
  elif ch_num == start_ch:
77
77
  first_vs = start_vs
78
78
  last_vs = max(verses.keys())
@@ -26,3 +26,11 @@ class Reference:
26
26
  s += f"–{self.end_ch}"
27
27
 
28
28
  return s
29
+
30
+
31
+ @dataclass(frozen=True)
32
+ class ReferenceMatch:
33
+ reference: Reference
34
+ start: int
35
+ end: int
36
+ text: str
@@ -0,0 +1,98 @@
1
+ from typing import Optional
2
+ import re
3
+
4
+ from bible_ref_tagger.reference import Reference, ReferenceMatch
5
+
6
+ from bible_ref_tagger.refparser import parse_tail, MAIN
7
+ from bible_ref_tagger.books import fuzzy_book
8
+ from bible_ref_tagger.engines import ENGINES
9
+ from bible_ref_tagger.providers import VerseProvider
10
+ from bible_ref_tagger.utils import sbl_format, build_tooltip, build_ref_html
11
+
12
+
13
+ class BibleRefTagger:
14
+ def __init__(self, bible_translation="esv", engine: str = "biblegateway", provider: Optional[VerseProvider] = None):
15
+ self.translation = bible_translation
16
+ self.engine = engine
17
+ self.engine_obj = ENGINES.get(engine, ENGINES["biblegateway"])
18
+ self.provider = provider
19
+
20
+ def find_references(self, text: str) -> list[ReferenceMatch]:
21
+ """Find references in plain text, returning source character offsets.
22
+
23
+ Each comma/semicolon-separated reference is a separate match.
24
+ The first match includes the book name; subsequent matches use
25
+ the preceding book and chapter context.
26
+ """
27
+ matches = []
28
+ for match in MAIN.finditer(text):
29
+ book = fuzzy_book(match.group(1).lower())
30
+ if not book:
31
+ continue
32
+ try:
33
+ parsed = parse_tail(book, match.group(2))
34
+ except ValueError:
35
+ continue
36
+ tail = match.group(2)
37
+ cursor = 0
38
+ for index, (reference, display, separator, qualifier) in enumerate(parsed):
39
+ # Find the actual token in the original input, rather than
40
+ # guessing offsets from normalized reference strings.
41
+ token = re.search(re.escape(display), tail[cursor:])
42
+ if token is None:
43
+ break
44
+ token_start = cursor + token.start()
45
+ token_end = cursor + token.end()
46
+ if index == 0:
47
+ start = match.start(1)
48
+ else:
49
+ start = match.start(2) + token_start
50
+ if qualifier:
51
+ prefix = tail[cursor:token_start]
52
+ q = re.search(re.escape(qualifier.strip()) + r"\s*$", prefix)
53
+ if q:
54
+ start = match.start(2) + cursor + q.start()
55
+ end = match.start(2) + token_end
56
+ matches.append(ReferenceMatch(reference, start, end, text[start:end]))
57
+ cursor = token_end
58
+ return matches
59
+
60
+ def get_passage(self, reference: Reference | str):
61
+ """Return (chapter, verse, text) tuples from the configured provider."""
62
+ if self.provider is None:
63
+ raise RuntimeError("No Bible verse provider configured")
64
+ if isinstance(reference, str):
65
+ found = self.find_references(reference)
66
+ if len(found) != 1 or found[0].start != 0 or found[0].end != len(reference):
67
+ raise ValueError(f"Expected a single Bible reference: {reference!r}")
68
+ reference = found[0].reference
69
+ return self.provider.get_passage(reference)
70
+
71
+ def tag(self, html_txt: str) -> str:
72
+ def repl(m):
73
+ raw_book = m.group(1).lower()
74
+ book = fuzzy_book(raw_book)
75
+ if not book:
76
+ return m.group(0)
77
+ parsed_refs = parse_tail(book, m.group(2))
78
+ rendered = []
79
+ for i, (r, display_text, separator, qualifier) in enumerate(parsed_refs):
80
+ canon = r.canonical()
81
+ url = self.engine_obj.build(canon)
82
+ sbl = sbl_format(r)
83
+ tooltip_txt = ""
84
+ if self.provider:
85
+ try:
86
+ verses = self.provider.get_passage(r)
87
+ if verses:
88
+ text = " ".join(t for _, _, t in verses)
89
+ tooltip_txt = build_tooltip(text, sbl, url)
90
+ except Exception:
91
+ tooltip_txt = "[Unable to load passage]"
92
+ if i == 0:
93
+ display_text = f"{m.group(1)} {display_text}"
94
+ ref_html = build_ref_html(canon, sbl, tooltip_txt, display_text)
95
+ rendered.append((separator, qualifier, ref_html))
96
+ return "".join(f"{separator} {qualifier}{ref}" for separator, qualifier, ref in rendered)
97
+
98
+ return MAIN.sub(repl, html_txt)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bible-ref-tagger
3
- Version: 0.2.2
3
+ Version: 0.2.3
4
4
  Summary: Bible reference parsing and linking
5
5
  Author-email: "Rev. T. H. Wright" <thwright@thwright.com>
6
6
  License: GNU GENERAL PUBLIC LICENSE
@@ -1,44 +0,0 @@
1
- from typing import Optional
2
-
3
- from bible_ref_tagger.refparser import parse_tail, MAIN
4
- from bible_ref_tagger.books import fuzzy_book
5
- from bible_ref_tagger.engines import ENGINES
6
- from bible_ref_tagger.providers import VerseProvider
7
- from bible_ref_tagger.utils import sbl_format, build_tooltip, build_ref_html
8
-
9
-
10
- class BibleRefTagger:
11
- def __init__(self, bible_translation="esv", engine: str = "biblegateway", provider: Optional[VerseProvider] = None):
12
- self.translation = bible_translation
13
- self.engine = engine
14
- self.engine_obj = ENGINES.get(engine, ENGINES["biblegateway"])
15
- self.provider = provider
16
-
17
- def tag(self, html_txt: str) -> str:
18
- def repl(m):
19
- raw_book = m.group(1).lower()
20
- book = fuzzy_book(raw_book)
21
- if not book:
22
- return m.group(0)
23
- parsed_refs = parse_tail(book, m.group(2))
24
- rendered = []
25
- for i, (r, display_text, separator, qualifier) in enumerate(parsed_refs):
26
- canon = r.canonical()
27
- url = self.engine_obj.build(canon)
28
- sbl = sbl_format(r)
29
- tooltip_txt = ""
30
- if self.provider:
31
- try:
32
- verses = self.provider.get_passage(r)
33
- if verses:
34
- text = " ".join(t for _, _, t in verses)
35
- tooltip_txt = build_tooltip(text, sbl, url)
36
- except Exception:
37
- tooltip_txt = "[Unable to load passage]"
38
- if i == 0:
39
- display_text = f"{m.group(1)} {display_text}"
40
- ref_html = build_ref_html(canon, sbl, tooltip_txt, display_text)
41
- rendered.append((separator, qualifier, ref_html))
42
- return "".join(f"{separator} {qualifier}{ref}" for separator, qualifier, ref in rendered)
43
-
44
- return MAIN.sub(repl, html_txt)