Update refactoring with blocks

nohup.out

@@ -1,97 +0,0 @@
-[nodemon] 2.0.18
-[nodemon] to restart at any time, enter `rs`
-[nodemon] watching path(s): app.py ubee/**/*
-[nodemon] watching extensions: py,json
-[nodemon] starting `python -t py app.py`
-events.js:377
-      throw er; // Unhandled 'error' event
-      ^
-
-Error: EBADF: bad file descriptor, read
-Emitted 'error' event on ReadStream instance at:
-    at internal/fs/streams.js:173:14
-    at FSReqCallback.wrapper [as oncomplete] (fs.js:563:5) {
-  errno: -9,
-  code: 'EBADF',
-  syscall: 'read'
-}
-python: can't open file 'py': [Errno 2] No such file or directory
-[nodemon] 2.0.18
-[nodemon] to restart at any time, enter `rs`
-[nodemon] watching path(s): app.py ubee/**/*
-[nodemon] watching extensions: py
-[nodemon] starting `python app.py`
-events.js:377
-      throw er; // Unhandled 'error' event
-      ^
-
-Error: EBADF: bad file descriptor, read
-Emitted 'error' event on ReadStream instance at:
-    at internal/fs/streams.js:173:14
-    at FSReqCallback.wrapper [as oncomplete] (fs.js:563:5) {
-  errno: -9,
-  code: 'EBADF',
-  syscall: 'read'
-}
-[E 220701 19:47:16 fetch_check_aux:54]
-    Traceback (most recent call last):
-      File "/usr/lib/python3.8/pathlib.py", line 1288, in mkdir
-        self._accessor.mkdir(self, mode)
-    PermissionError: [Errno 13] Permission denied: '/root/.cache/huggingface/transformers'
-    
-    During handling of the above exception, another exception occurred:
-    
-    Traceback (most recent call last):
-      File "/home/mu2018/github/ultimatumbee/.venv/lib/python3.8/site-packages/model_pool/fetch_check_aux.py", line 52, in fetch_check_aux
-        local_dir.mkdir(parents=True, exist_ok=True)
-      File "/usr/lib/python3.8/pathlib.py", line 1297, in mkdir
-        if not exist_ok or not self.is_dir():
-      File "/usr/lib/python3.8/pathlib.py", line 1422, in is_dir
-        return S_ISDIR(self.stat().st_mode)
-      File "/usr/lib/python3.8/pathlib.py", line 1198, in stat
-        return self._accessor.stat(self)
-    PermissionError: [Errno 13] Permission denied: '/root/.cache/huggingface/transformers'
-[W 220701 19:47:16 fetch_check_aux:55] You will need to run this as admin or root, or create /root (C:
-[W 220701 19:47:16 load_model:44] You ll need to run as root or admin or give write permission to /root/.cache/huggingface or C:
-[I 220701 19:47:17 model_s:32] Fetching and caching model_s from huggingface.co... The first time may take a while depending on your net.
- Subsequent loading takes ~2-3 secs ... |███| 1/1 [100%] in 2.9s (0.34/s) 
-[I 220701 19:47:20 load_model:73] Fetching and caching clas-l-user from huggingface.co... The first time may take a while depending on your net.
- Subsequent loading takes ~2-3 secs ... |███| 1/1 [100%] in 7.8s (0.13/s) 
-/home/mu2018/github/ultimatumbee/.venv/lib/python3.8/site-packages/gradio/deprecation.py:40: UserWarning: `optional` parameter is deprecated, and it has no effect
-  warnings.warn(value)
-/home/mu2018/github/ultimatumbee/.venv/lib/python3.8/site-packages/gradio/deprecation.py:40: UserWarning: `numeric` parameter is deprecated, and it has no effect
-  warnings.warn(value)
-/home/mu2018/github/ultimatumbee/.venv/lib/python3.8/site-packages/gradio/deprecation.py:40: UserWarning: The 'type' parameter has been deprecated. Use the Number component instead.
-  warnings.warn(value)
-/home/mu2018/github/ultimatumbee/.venv/lib/python3.8/site-packages/gradio/deprecation.py:40: UserWarning: `layout` parameter is deprecated, and it has no effect
-  warnings.warn(value)
-/home/mu2018/github/ultimatumbee/.venv/lib/python3.8/site-packages/gradio/interface.py:292: UserWarning: Currently, only the 'default' theme is supported.
-  warnings.warn("Currently, only the 'default' theme is supported.")
-[I 220701 20:43:48 icecream:185] ic| __main__.py:56 in greet()
-        res1: ['她', '望望', '我', '往', '她', '的', '椅背', '一靠', '不', '动', '也', '不', '出声']
-[I 220701 20:43:48 icecream:185] ic| __main__.py:57 in greet()
-        res2: ['She',
-               'at',
-               'me',
-               'leaning',
-               'and',
-               'mute',
-               'remained',
-               'in',
-               'her',
-               'chair',
-               'back',
-               'and',
-               'looked',
-               'motionless']
-[I 220701 20:43:48 icecream:185] ic| ubee.py:33 in ubee()- seq: '她'
-[I 220701 20:44:24 icecream:185] ic| ubee.py:33 in ubee()- seq: '望望'
-[I 220701 20:44:58 icecream:185] ic| ubee.py:33 in ubee()- seq: '我'
-[I 220701 20:45:31 icecream:185] ic| ubee.py:33 in ubee()- seq: '往'
-[I 220701 20:46:06 icecream:185] ic| ubee.py:33 in ubee()- seq: '她'
-[E 220701 20:46:06 ubee:41] list.remove(x): x not in list
-[I 220701 20:46:06 ubee:42] seq: 她, lable: She
-[I 220701 20:46:06 icecream:185] ic| ubee.py:33 in ubee()- seq: '的'
-[E 220701 20:46:38 ubee:41] list.remove(x): x not in list
-[I 220701 20:46:38 ubee:42] seq: 的, lable: at
-[I 220701 20:46:38 icecream:185] ic| ubee.py:33 in ubee()- seq: '椅背'

ubee/__main__.py

@@ -16,9 +16,9 @@ from icecream import install as ic_install
 from logzero import logger
 
 # for embeddable python
-if "." not in sys.path:
-    sys.path.insert(0, ".")
+# if "." not in sys.path: sys.path.insert(0, ".")
 
+from ubee import __version__
 from ubee.ubee import ubee
 
 # logzero.loglevel(10)
@@ -36,7 +36,7 @@ def greet1(name):
     return "Hello " + name + "!!"
 
 
-def greet(
+def ifn(
     text1,
     text2,
     # segment: str
@@ -89,7 +89,7 @@ def main():
     shuffle(_)
     text_en = "\n\n".join(_)
 
-    title = "Ultimatumbee Aligner"
+    title = "Ultimatumbee"
     theme = "dark-grass"
     theme = "grass"
     description = """WIP showcasing a novel aligner"""
@@ -106,24 +106,24 @@ def main():
     ex1_zh = [
         '雪开始下大了。',
         '我握住门柄又试一回。',
-        '这时一个没穿外衣的年轻人，扛着一根草耙，在后面院子里出现了。',        '他招呼我跟着他走，穿过了一个洗衣房和一片铺平的地，那儿有煤棚、抽水机和鸽笼，我们终于到了我上次被接待过的那间温暖的、热闹的大屋子。',
+        '这时一个没穿外衣的年轻人，扛着一根草耙，在后面院子里出现了。', '他招呼我跟着他走，穿过了一个洗衣房和一片铺平的地，那儿有煤棚、抽水机和鸽笼，我们终于到了我上次被接待过的那间温暖的、热闹的大屋子。',
         '煤、炭和木材混合在一起燃起的熊熊炉火，使这屋子放着光彩。', '在准备摆上丰盛晚餐的桌旁，我很高兴地看到了那位“太太”，以前我从未料想到会有这么一个人存在的。',
         '我鞠躬等候，以为她会叫我坐下。',
         '她望望我，往她的椅背一靠，不动，也不出声。'
     ]
     ex1_en = [
         'The snow began to drive thickly.',
-         'I seized the handle to essay another trial; when a young man without coat, and shouldering a pitchfork, appeared in the yard behind.',
-         'He hailed me to follow him, and, after marching through a wash-house, and a paved area containing a coal shed, pump, and pigeon cot, we at length arrived in the huge, warm, cheerful apartment, where I was formerly received.',
-         "It glowed delightfully in the radiance of an immense fire, compounded of coal, peat, and wood; and near the table, laid for a plentiful evening meal, I was pleased to observe the `missis', an individual whose existence I had never previously suspected.",
-         'I bowed and waited, thinking she would bid me take a seat.',
-         'She looked at me, leaning back in her chair, and remained motionless and mute.'
+        'I seized the handle to essay another trial; when a young man without coat, and shouldering a pitchfork, appeared in the yard behind.',
+        'He hailed me to follow him, and, after marching through a wash-house, and a paved area containing a coal shed, pump, and pigeon cot, we at length arrived in the huge, warm, cheerful apartment, where I was formerly received.',
+        "It glowed delightfully in the radiance of an immense fire, compounded of coal, peat, and wood; and near the table, laid for a plentiful evening meal, I was pleased to observe the `missis', an individual whose existence I had never previously suspected.",
+        'I bowed and waited, thinking she would bid me take a seat.',
+        'She looked at me, leaning back in her chair, and remained motionless and mute.'
     ]
     shuffle(ex1_en)
     ex1_zh = "\n".join(ex1_zh)
     ex1_en = "\n".join(ex1_en)
 
-    ex2_zh = "她\n望望\n我\n往\n她\n的\n椅背\n一靠\n不\n动\n也\n不\n出声"
+    ex2_zh = "她\n望望\n我\n往\n她的\n椅背\n一靠\n不\n动\n也\n不\n出声"
     ex2_en = "She looked at me leaning back in her chair and remained motionless and mute".split()
     shuffle(ex2_en)
     ex2_en = "\n".join(ex2_en)
@@ -137,10 +137,10 @@ def main():
 
     inputs = [
         gr.inputs.Textbox(
-            lines=lines, placeholder=placeholder, default=ex1_zh, label="text1"
+            lines=lines, placeholder=placeholder, default=ex2_zh, label="text1"
         ),
         gr.inputs.Textbox(
-            lines=lines, placeholder=placeholder, default=ex1_en, label="text2"
+            lines=lines, placeholder=placeholder, default=ex2_en, label="text2"
         ),
         gr.inputs.Slider(
             minimum=0.0,
@@ -181,6 +181,7 @@ def main():
         leftover,
     ]
 
+    _ = """ # switch to blocks
     iface = gr.Interface(
         fn=greet,
         # fn=ubee,
@@ -200,6 +201,72 @@ def main():
         enable_queue=True,
         share=True,
     )
+    # """
+    blocks = gr.Blocks()
+
+    with blocks:
+        gr.Markdown(
+            dedent(f"""
+            ## Ultimatumbee {__version__}
+
+            Align non-sequential dualtexts.
+
+            """).strip()
+        )
+        with gr.Column():
+            with gr.Row():
+                text1 = gr.inputs.Textbox(
+                    lines=lines, placeholder=placeholder, default=ex2_zh, label="text1"
+                ),
+                text2 = gr.inputs.Textbox(
+                    lines=lines, placeholder=placeholder, default=ex2_en, label="text2"
+                )
+            with gr.Row():
+                slider = gr.inputs.Slider(
+                    minimum=0.0,
+                    maximum=1.0,
+                    step=0.1,
+                    default=0.4,
+                    label="threshold",
+                )
+                btn = gr.Button("Run")
+            out_df = gr.outputs.Dataframe(
+                headers=None,
+                max_rows=lines,  # 20
+                max_cols=None,
+                overflow_row_behaviour="paginate",
+                type="auto",
+                label="To be aligned",
+            )
+            with gr.Row():
+                aligned = gr.outputs.Dataframe(
+                    headers=None,
+                    max_rows=lines,  # 20
+                    max_cols=None,
+                    overflow_row_behaviour="paginate",
+                    type="auto",
+                    label="Aligned",
+                )
+                leftover = gr.outputs.Dataframe(
+                    headers=None,
+                    max_rows=lines,  # 20
+                    max_cols=None,
+                    overflow_row_behaviour="paginate",
+                    type="auto",
+                    label="Leftover",
+                )
+            btn.click(
+                fn=ifn,
+                inputs=[
+                    text1,
+                    text2,
+                ],
+                outputs=[
+                    out_df,
+                    aligned,
+                    leftover,
+                ]
+            )
 
 
 if __name__ == "__main__":
@@ -212,4 +279,4 @@ _ = """
             default="para",
             label="segment"
         )
-# """
+# """

ubee/__main__.py-

@@ -0,0 +1,215 @@
+"""Gen ubee main."""
+# pylint: disable=unused-import, wrong-import-position, wrong-import-order, too-many-locals, broad-except, line-too-long
+
+import sys
+from itertools import zip_longest
+from pathlib import Path
+from random import shuffle
+from textwrap import dedent
+from typing import Optional, Tuple
+
+import gradio as gr
+import logzero
+import pandas as pd
+from icecream import ic
+from icecream import install as ic_install
+from logzero import logger
+
+# for embeddable python
+if "." not in sys.path:
+    sys.path.insert(0, ".")
+
+from ubee.ubee import ubee
+
+# logzero.loglevel(10)
+ic_install()
+ic.configureOutput(
+    includeContext=True,
+    outputFunction=logger.info,
+)
+ic.enable()
+# ic.disenable()  # to turn off
+
+
+def greet1(name):
+    """Dummy."""
+    return "Hello " + name + "!!"
+
+
+def greet(
+    text1,
+    text2,
+    # segment: str
+    thresh: float
+) -> Tuple[pd.DataFrame, pd.DataFrame, pd.DataFrame]:
+    """Take inputs, return outputs.
+
+    Args:
+        text1: text
+        text2: text
+    Returns:
+        pd.DataFrame
+    """
+    res1 = [elm.strip() for elm in text1.splitlines() if elm.strip()]
+    res2 = [elm.strip() for elm in text2.splitlines() if elm.strip()]
+
+    ic(res1)
+    ic(res2)
+
+    # _ = pd.DataFrame(zip_longest(res1, res2), columns=["text1", "text2"])
+    # return _
+
+    res1_, res2_ = ubee(res1, res2, thresh)
+
+    out_df = pd.DataFrame(
+        zip_longest(res1, res2),
+        columns=["text1", "text2"],
+    )
+
+    if res2_:
+        _ = pd.DataFrame(res2_, columns=["text1", "text2"])
+    else:
+        _ = None
+
+    return out_df, pd.DataFrame(res1_, columns=["text1", "text2", "likelihood"]), _
+
+
+def main():
+    """Create main entry."""
+    text_zh = Path("data/test_zh.txt").read_text(encoding="utf8")
+    text_zh = [elm.strip() for elm in text_zh.splitlines() if elm.strip()][:10]
+    text_zh = "\n\n".join(text_zh)
+
+    text_en = [
+        elm.strip()
+        for elm in Path("data/test_en.txt").read_text(encoding="utf8").splitlines()
+        if elm.strip()
+    ]
+    _ = text_en[:9]
+    shuffle(_)
+    text_en = "\n\n".join(_)
+
+    title = "Ultimatumbee Aligner"
+    theme = "dark-grass"
+    theme = "grass"
+    description = """WIP showcasing a novel aligner"""
+    article = dedent("""
+        ## NB
+
+        *   The ultimatumbee aligner (``ubee`` for short) is intended for aligning text blocks (be it paragraphs, sentences or words). Since it is rather slow (30 para pairs (Wuthering Height ch1. for example) can take 10 to 20 mniutes), anything more than 50 blocks should probably be avaoided. Nevertheless, you are welcome to try. No big brother is watching.
+
+        *   ``thresh``: longer text blocks justify a larger value; `.5` appears to be just right for paragraphs for Wuthering Height ch1.
+
+        Stay tuned for more details coming soon...
+        """).strip()
+
+    ex1_zh = [
+        '雪开始下大了。',
+        '我握住门柄又试一回。',
+        '这时一个没穿外衣的年轻人，扛着一根草耙，在后面院子里出现了。',        '他招呼我跟着他走，穿过了一个洗衣房和一片铺平的地，那儿有煤棚、抽水机和鸽笼，我们终于到了我上次被接待过的那间温暖的、热闹的大屋子。',
+        '煤、炭和木材混合在一起燃起的熊熊炉火，使这屋子放着光彩。', '在准备摆上丰盛晚餐的桌旁，我很高兴地看到了那位“太太”，以前我从未料想到会有这么一个人存在的。',
+        '我鞠躬等候，以为她会叫我坐下。',
+        '她望望我，往她的椅背一靠，不动，也不出声。'
+    ]
+    ex1_en = [
+        'The snow began to drive thickly.',
+         'I seized the handle to essay another trial; when a young man without coat, and shouldering a pitchfork, appeared in the yard behind.',
+         'He hailed me to follow him, and, after marching through a wash-house, and a paved area containing a coal shed, pump, and pigeon cot, we at length arrived in the huge, warm, cheerful apartment, where I was formerly received.',
+         "It glowed delightfully in the radiance of an immense fire, compounded of coal, peat, and wood; and near the table, laid for a plentiful evening meal, I was pleased to observe the `missis', an individual whose existence I had never previously suspected.",
+         'I bowed and waited, thinking she would bid me take a seat.',
+         'She looked at me, leaning back in her chair, and remained motionless and mute.'
+    ]
+    shuffle(ex1_en)
+    ex1_zh = "\n".join(ex1_zh)
+    ex1_en = "\n".join(ex1_en)
+
+    ex2_zh = "她\n望望\n我\n往\n她\n的\n椅背\n一靠\n不\n动\n也\n不\n出声"
+    ex2_en = "She looked at me leaning back in her chair and remained motionless and mute".split()
+    shuffle(ex2_en)
+    ex2_en = "\n".join(ex2_en)
+
+    examples = [
+        [ex2_zh, ex2_en, .3],
+        [text_zh, text_en, .5],
+    ]
+    lines = 15
+    placeholder = "Type or paste text here"
+
+    inputs = [
+        gr.inputs.Textbox(
+            lines=lines, placeholder=placeholder, default=ex1_zh, label="text1"
+        ),
+        gr.inputs.Textbox(
+            lines=lines, placeholder=placeholder, default=ex1_en, label="text2"
+        ),
+        gr.inputs.Slider(
+            minimum=0.0,
+            maximum=1.0,
+            step=0.1,
+            default=0.4,
+            label="threshold",
+        ),
+    ]
+
+    out_df = gr.outputs.Dataframe(
+        headers=None,
+        max_rows=lines,  # 20
+        max_cols=None,
+        overflow_row_behaviour="paginate",
+        type="auto",
+        label="To be aligned",
+    )
+    aligned = gr.outputs.Dataframe(
+        headers=None,
+        max_rows=lines,  # 20
+        max_cols=None,
+        overflow_row_behaviour="paginate",
+        type="auto",
+        label="Aligned",
+    )
+    leftover = gr.outputs.Dataframe(
+        headers=None,
+        max_rows=lines,  # 20
+        max_cols=None,
+        overflow_row_behaviour="paginate",
+        type="auto",
+        label="Leftover",
+    )
+    outputs = [  # tot. 3
+        out_df,
+        aligned,
+        leftover,
+    ]
+
+    iface = gr.Interface(
+        fn=greet,
+        # fn=ubee,
+        title=title,
+        theme=theme,
+        layout="vertical",  # horizontal unaligned
+        description=description,
+        article=article,
+        # inputs="text",
+        # outputs="text",
+        inputs=inputs,  # text1, text2, segment, thresh
+        outputs=outputs,
+        examples=examples,
+        # enable_queue=True,
+    )
+    iface.launch(
+        enable_queue=True,
+        share=True,
+    )
+
+
+if __name__ == "__main__":
+    main()
+
+_ = """
+
+        gr.inputs.Radio(
+            ["para", "sent", "word"],
+            default="para",
+            label="segment"
+        )
+# """