sonatoki 0.2.1__tar.gz → 0.2.2__tar.gz

{sonatoki-0.2.1 → sonatoki-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sonatoki
-Version: 0.2.1
+Version: 0.2.2
 Summary: ilo li moku e toki li pana e sona ni: ni li toki ala toki pona?
 Author-Email: "jan Kekan San (@gregdan3)" <gregory.danielson3@gmail.com>
 License: AGPL-3.0-or-later

{sonatoki-0.2.1 → sonatoki-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sonatoki"
-version = "0.2.1"
+version = "0.2.2"
 description = "ilo li moku e toki li pana e sona ni: ni li toki ala toki pona?"
 authors = [
     { name = "jan Kekan San (@gregdan3)", email = "gregory.danielson3@gmail.com" },

{sonatoki-0.2.1 → sonatoki-0.2.2}/src/sonatoki/Filters.py

@@ -16,11 +16,11 @@ from sonatoki.constants import (
     ALLOWABLES,
     CONSONANTS,
     NIMI_LINKU,
-    NIMI_PU_ALE,
     POSIX_PUNCT,
     UNICODE_PUNCT,
-    NIMI_LINKU_ALE,
+    NIMI_LINKU_LILI,
     ALL_PUNCT_RANGES,
+    NIMI_PU_SYNONYMS,
     NIMI_LINKU_SANDBOX,
 )
 
@@ -103,7 +103,7 @@ class NimiPu(MemberFilter):
 
 
 class NimiPuAle(MemberFilter):
-    tokens = set(NIMI_PU_ALE)
+    tokens = set(NIMI_PU + NIMI_PU_SYNONYMS)
 
 
 class NimiLinku(MemberFilter):
@@ -111,11 +111,11 @@ class NimiLinku(MemberFilter):
 
 
 class NimiLinkuAle(MemberFilter):
-    tokens = set(NIMI_LINKU_ALE)
+    tokens = set(NIMI_LINKU + NIMI_LINKU_LILI)
 
 
 class NimiLinkuSandbox(MemberFilter):
-    tokens = set(NIMI_LINKU_SANDBOX)
+    tokens = set(NIMI_LINKU + NIMI_LINKU_LILI + NIMI_LINKU_SANDBOX)
 
 
 class Phonotactic(RegexFilter):

{sonatoki-0.2.1 → sonatoki-0.2.2}/src/sonatoki/constants.py

@@ -38,15 +38,21 @@ ALLOWABLES = {
 with open(LINKU) as f:
     linku: Dict[str, Dict[str, str]] = json.loads(f.read())
     NIMI_PU: List[str] = [d["word"] for d in linku.values() if d["book"] == "pu"]
-    NIMI_PU_ALE: List[str] = NIMI_PU + ["namako", "kin", "oko"]
+    NIMI_PU_SYNONYMS: List[str] = ["namako", "kin", "oko"]
     NIMI_LINKU: List[str] = [
         d["word"] for d in linku.values() if d["usage_category"] in ["core", "common"]
     ]
-    NIMI_LINKU_ALE: List[str] = [d["word"] for d in linku.values()]
+    NIMI_LINKU_LILI: List[str] = [
+        d["word"]
+        for d in linku.values()
+        if d["usage_category"] not in ["core", "common"]
+    ]
 
 with open(SANDBOX) as f:
     sandbox: Dict[str, Dict[str, str]] = json.loads(f.read())
-    NIMI_LINKU_SANDBOX: List[str] = [d["word"] for d in sandbox.values()]
+    NIMI_LINKU_SANDBOX: List[str] = NIMI_LINKU_LILI + [
+        d["word"] for d in sandbox.values()
+    ]
 
 del linku
 del sandbox
@@ -55,10 +61,10 @@ __all__ = [
     "ALPHABET",
     "CONSONANTS",
     "NIMI_LINKU",
-    "NIMI_LINKU_ALE",
+    "NIMI_LINKU_LILI",
     "NIMI_LINKU_SANDBOX",
     "NIMI_PU",
-    "NIMI_PU_ALE",
+    "NIMI_PU_SYNONYMS",
     "VOWELS",
     "UNICODE_PUNCT",
     "ALLOWABLES",

{sonatoki-0.2.1 → sonatoki-0.2.2}/tests/test_utils.py

@@ -6,12 +6,12 @@ import hypothesis.strategies as st
 
 # LOCAL
 from sonatoki.Filters import Syllabic, Phonotactic, AlphabeticRe
-from sonatoki.constants import NIMI_LINKU_ALE
+from sonatoki.constants import NIMI_LINKU, NIMI_LINKU_LILI
 
 PROPER_NAME_RE = r"[A-Z][a-z]*"
 
 token_strategy = (
-    st.sampled_from(NIMI_LINKU_ALE)
+    st.sampled_from(NIMI_LINKU + NIMI_LINKU_LILI)
     | st.from_regex(Phonotactic.pattern.pattern, fullmatch=True)
     | st.from_regex(Syllabic.pattern.pattern, fullmatch=True)
     | st.from_regex(PROPER_NAME_RE, fullmatch=True)