signwriting 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

signwriting/mouthing/mouthing.py

@@ -2,18 +2,27 @@ import copy
 import functools
 import json
 import re
+from dataclasses import dataclass
 from pathlib import Path
-from typing import Union
+from typing import Union, Optional
 
 from epitran import Epitran
 
 from signwriting.formats.fsw_to_sign import fsw_to_sign
 from signwriting.formats.sign_to_fsw import sign_to_fsw
+from signwriting.formats.fsw_to_swu import fsw2swu
 from signwriting.utils.join_signs import join_signs_horizontal, sign_from_symbols
 
 MOUTHING_INDEX = Path(__file__).parent / "mouthing.json"
 
 
+@dataclass
+class MouthingResult:
+    ipa: str
+    fsw: Optional[str]
+    swu: Optional[str]
+
+
 @functools.lru_cache()
 def get_mouthings():
     with open(MOUTHING_INDEX, "r", encoding="utf-8") as f:
@@ -74,14 +83,17 @@ def mouth_ipa(characters: str, aspiration=False) -> Union[str, None]:
     return join_signs_horizontal(*words, spacing=10)
 
 
-def mouth(word: str, language: str, aspiration=False):
+def mouth(word: str, language: str, aspiration=False) -> MouthingResult:
     epi = Epitran(language, ligatures=True)
     ipa = epi.transliterate(word)
 
     mouthing_fsw = mouth_ipa(ipa, aspiration=aspiration)
     if mouthing_fsw is None:
         print(f"Failed to mouth {word}, IPA: {ipa}")
-    return mouthing_fsw
+
+    mouthing_swu = fsw2swu(mouthing_fsw) if mouthing_fsw else None
+
+    return MouthingResult(ipa=ipa, fsw=mouthing_fsw, swu=mouthing_swu)
 
 
 if __name__ == "__main__":

signwriting/mouthing/server.py

@@ -4,8 +4,8 @@ from flask_restful import Resource, reqparse
 from signwriting.mouthing.mouthing import mouth
 
 parser = reqparse.RequestParser()
-parser.add_argument('text', type=str, required=True, help='Text to mouth')
-parser.add_argument('spoken_language', type=str, required=True,
+parser.add_argument('text', type=str, required=True, location='args', help='Text to mouth')
+parser.add_argument('spoken_language', type=str, required=True, location='args',
                     help='Spoken Language code. See "Language Support" at https://pypi.org/project/epitran/')
 
 
@@ -13,5 +13,10 @@ class Mouthing(Resource):
     def get(self):
         args = parser.parse_args()
 
-        fsw = mouth(args["text"], language=args["spoken_language"])
-        return make_response(jsonify({"fsw": fsw}), 200)
+        result = mouth(args["text"], language=args["spoken_language"])
+
+        return make_response(jsonify({
+            "ipa": result.ipa,
+            "fsw": result.fsw,
+            "swu": result.swu
+        }), 200)

signwriting/visualizer/visualize.py

@@ -87,14 +87,14 @@ def layout_signwriting(images: List[Image.Image], direction: str) -> Image.Image
         max_height = max(img.height for img in images)
         total_width = sum(img.width for img in images) + GAP * (len(images) - 1)
         size = (total_width, max_height)
-        paste_position = lambda offset, img: (offset, (max_height - img.height) // 2)
-        offset_increment = lambda img: img.width + GAP
+        paste_position = lambda offset, img: (offset, (max_height - img.height) // 2) # noqa: E731
+        offset_increment = lambda img: img.width + GAP # noqa: E731
     else:
         max_width = max(img.width for img in images)
         total_height = sum(img.height for img in images) + GAP * (len(images) - 1)
         size = (max_width, total_height)
-        paste_position = lambda offset, img: ((max_width - img.width) // 2, offset)
-        offset_increment = lambda img: img.height + GAP
+        paste_position = lambda offset, img: ((max_width - img.width) // 2, offset) # noqa: E731
+        offset_increment = lambda img: img.height + GAP # noqa: E731
 
     layout_image = Image.new("RGBA", size, (255, 255, 255, 0))
     offset = 0

{signwriting-0.1.1.dist-info → signwriting-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: signwriting
-Version: 0.1.1
+Version: 0.1.2
 Summary: Python utilities for SignWriting.
 Author-email: Amit Moryossef <amitmoryossef@gmail.com>
 Description-Content-Type: text/markdown
@@ -116,7 +116,7 @@ signwriting_to_image(fsw)
 ![AS10011S10019S2e704S2e748M525x535S2e748483x510S10011501x466S20544510x500S10019476x475](signwriting/visualizer/test_assets/AS10011S10019S2e704S2e748M525x535S2e748483x510S10011501x466S20544510x500S10019476x475.png)
 
 To use the visualizer with the server, you can hit:
-https://signwriting-sxie2r74ua-uc.a.run.app//visualizer?fsw=M525x535S2e748483x510S10011501x466S2e704510x500S10019476x475
+https://signwriting-sxie2r74ua-uc.a.run.app/visualizer?fsw=M525x535S2e748483x510S10011501x466S2e704510x500S10019476x475
 
 ### `signwriting.utils`
 
@@ -149,7 +149,7 @@ spell(word, language)
 ```
 
 To use the fingerspelling with the server, you can hit:
-https://signwriting-sxie2r74ua-uc.a.run.app//fingerspelling?text=hello&signed_language=ase
+https://signwriting-sxie2r74ua-uc.a.run.app/fingerspelling?text=hello&signed_language=ase
 
 ### `signwriting.mouthing`
 
@@ -168,7 +168,7 @@ Note: Installing English support for `epitran` requires extra steps,
 see "Install flite" at [mouthing/README.md](signwriting/mouthing/README.md).
 
 To use the mouthing with the server, you can hit:
-https://signwriting-sxie2r74ua-uc.a.run.app//mouthing?text=hello&spoken_language=eng-Latn
+https://signwriting-sxie2r74ua-uc.a.run.app/mouthing?text=hello&spoken_language=eng-Latn
 
 
 ## Cite

{signwriting-0.1.1.dist-info → signwriting-0.1.2.dist-info}/RECORD

@@ -41,8 +41,8 @@ signwriting/formats/test_swu_to_fsw.py,sha256=0nb4LY_m2oVkX1dkGyISryKEz1xnCA8fDF
 signwriting/hamnosys/parallel.json,sha256=-099tSenNNf1mv6QzvkObJCuK9FwrTPQk_2H3EK3V2w,938851
 signwriting/mouthing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 signwriting/mouthing/mouthing.json,sha256=fGL-JHzvNk_J0zB9lncX_PowcTlBUmrr91PL8bvTpZw,16875
-signwriting/mouthing/mouthing.py,sha256=2a1aSEJHIqsH6etrY8W2wmqjZc3aOGMu9xl1WGKv2PY,3836
-signwriting/mouthing/server.py,sha256=iV1-rZqgX01Fq9fb_uAuE-6lLaaJrcaPYHbRvVfGg_Q,627
+signwriting/mouthing/mouthing.py,sha256=QNpE4pqKjUWzfTR1vfidz8J1UxT8vK6c7vgXl4XLc9c,4159
+signwriting/mouthing/server.py,sha256=Z3SuRw3Dsx2mpoSHIJG1WRI-CIbW_qTbVpUH7RFvkFQ,756
 signwriting/mouthing/visualize_mouthing.py,sha256=6y8Gh4T_IyVWktwdVAX_l_C_ujUII8XnMkxFsldD9u8,1868
 signwriting/tokenizer/__init__.py,sha256=A9S7lTIGy9Ki9BQx9OS91-LSEWueM3N7iUQQX0VaYPA,228
 signwriting/tokenizer/base_tokenizer.py,sha256=UvSsgULyBaDbFygYJP80KSSF4Q8B6hQ9ggRSIGCZPmI,2196
@@ -59,9 +59,9 @@ signwriting/visualizer/SuttonSignWritingOneD.ttf,sha256=R-1Kih4jwVOovKdSbVDh9BmA
 signwriting/visualizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 signwriting/visualizer/server.py,sha256=qWgN7kIei7BE1K-kpiS5Dx47t1qNKuU5YfrjKs7douo,1603
 signwriting/visualizer/test_visualize.py,sha256=eH4D89bEb8DpRgNVpd3uLIHuIw5kPosWlVl9ry0y9g4,4059
-signwriting/visualizer/visualize.py,sha256=KUHCtfw6pAJRlEqurXNbUz00GUctbadGqEHUKCZiZSA,3977
-signwriting-0.1.1.dist-info/licenses/LICENSE,sha256=5DdbOXGaeoF-PL0-HkJOUmegksP13HD8FRy6-1m-D-o,1081
-signwriting-0.1.1.dist-info/METADATA,sha256=Iuoqg6W8f6AZ7pjMYkCV3xFDu0p78sXttCqiXIE9Lgo,5972
-signwriting-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-signwriting-0.1.1.dist-info/top_level.txt,sha256=MbwynBxqcjJN-XMzTmwzp7wgQ0mzu7X-bjVQZMrOvGw,12
-signwriting-0.1.1.dist-info/RECORD,,
+signwriting/visualizer/visualize.py,sha256=srMllB8y2u_xM3698YqmY-ychEvaemsM4d06hOVLf68,4029
+signwriting-0.1.2.dist-info/licenses/LICENSE,sha256=5DdbOXGaeoF-PL0-HkJOUmegksP13HD8FRy6-1m-D-o,1081
+signwriting-0.1.2.dist-info/METADATA,sha256=TZyELOmzKObrhRxv4nTyZu1ZfZtr1TOqim4XyVQpJlI,5969
+signwriting-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+signwriting-0.1.2.dist-info/top_level.txt,sha256=MbwynBxqcjJN-XMzTmwzp7wgQ0mzu7X-bjVQZMrOvGw,12
+signwriting-0.1.2.dist-info/RECORD,,