Update default layout='wide'

app.py

@@ -79,12 +79,13 @@ from litbee import __version__
 from litbee.utils import menu_items
 
 from litbee.multipage import Multipage
-from litbee.fetch_upload import fetch_upload
-from litbee.settings import settings
 
+# from litbee.fetch_upload import fetch_upload
 # from litbee.fetch_paste import fetch_paste
 # from litbee.fetch_urls import fetch_urls
 
+from litbee.home import home
+from litbee.settings import settings
 from litbee.info import info
 from litbee.utils import style_css
 
@@ -121,7 +122,7 @@ st.set_page_config(
     page_title=f"litbee v{__version__}",
     # page_icon="🧊",
     page_icon="🐝",
-    # layout="wide",
+    layout="wide",
     initial_sidebar_state="auto",  # "auto" or "expanded" or "collapsed",
     menu_items=menu_items,
 )
@@ -170,7 +171,8 @@ def main():
     # app.add_page("Settings", "gear", settings.app)
     # app.add_page("Info", "info", info.app)
 
-    app.add_page("Home", "house", fetch_upload)
+    # app.add_page("Home", "house", fetch_upload)
+    app.add_page("Home", "house", home)
     app.add_page("Settings", "gear", settings)
     app.add_page("Info", "info", info)
 

litbee/app-.py

@@ -0,0 +1,140 @@
+"""Prep __main__.py.
+
+https://share.streamlit.io/deploy
+    Advanced settings...
+        Python version
+            3.7
+            3.8
+            3.9*
+            3.10
+
+https://docs.streamlit.io/knowledge-base/using-streamlit/hide-row-indices-displaying-dataframe
+    Hide row indices when displaying a dataframe
+# CSS to inject contained in a string
+hide_table_row_index = '''
+            <style>
+            tbody th {display:none}
+            .blank {display:none}
+            </style>
+            '''
+# Inject CSS with Markdown
+st.markdown(hide_table_row_index, unsafe_allow_html=True)
+
+# Display a static table
+st.table(df)
+
+# Hide row indices with st.dataframe
+# CSS to inject contained in a string
+hide_dataframe_row_index = '''
+            <style>
+            .row_heading.level0 {display:none}
+            .blank {display:none}
+            </style>
+           '''
+# Inject CSS with Markdown
+st.markdown(hide_dataframe_row_index, unsafe_allow_html=True)
+
+# Display an interactive table
+st.dataframe(df)
+
+https://medium.com/@avra42/streamlit-python-cool-tricks-to-make-your-web-application-look-better-8abfc3763a5b
+hide_menu_style = '''
+        <style>
+        #MainMenu {visibility: hidden; }
+        footer {visibility: hidden;}
+        </style>
+        '''
+st.markdown(hide_menu_style, unsafe_allow_html=True)
+
+"""
+# pylint: disable=invalid-name
+import os
+import sys
+import time
+from pathlib import Path
+from types import SimpleNamespace
+from typing import Optional
+
+import loguru
+import logzero
+import pandas as pd
+import streamlit as st
+from loguru import logger as loggu
+from logzero import logger
+from set_loglevel import set_loglevel
+from streamlit import session_state as state
+
+from litbee import __version__, litbee
+from litbee.options import options
+
+# from litbee.files2df import files2df
+# from litbee.utils import sb_front_cover, instructions, menu_items
+# from litbee.ezbee_page import ezbee_page
+# from litbee.dzbee_page import dzbee_page
+# from litbee.xbee_page import xbee_page
+from litbee.utils import menu_items
+
+# from ezbee import ezbee
+
+curr_py = sys.version[:3]
+msg = f"Some packages litbee depends on can only run with Python 3.8, current python is {curr_py}, sorry..."
+assert curr_py == "3.8", msg
+
+os.environ["TZ"] = "Asia/Shanghai"
+time.tzset()
+os.environ["LOGLEVEL"] = "10"  # uncomment this in dev
+logzero.loglevel(set_loglevel())
+
+loggu.remove()
+_ = (
+    "<green>{time:YY-MM-DD HH:mm:ss}</green> | "
+    "<level>{level: <5}</level> | <level>{message}</level> "
+    "<cyan>{name}</cyan>:<cyan>{line}</cyan>"
+)
+loggu.add(
+    sys.stderr,
+    format=_,
+    level=set_loglevel(),
+    colorize=True,
+)
+
+# from PIL import Image
+# page_icon=Image.open("icon.ico"),
+st.set_page_config(
+    page_title=f"litbee v{__version__}",
+    # page_icon="🧊",
+    page_icon="🐝",
+    # layout="wide",
+    initial_sidebar_state="auto",  # "auto" or "expanded" or "collapsed",
+    menu_items=menu_items,
+)
+
+# pd.set_option("precision", 2)
+pd.set_option("display.precision", 2)
+pd.options.display.float_format = "{:,.2f}".format
+
+_ = dict(
+    beetype="ezbee",
+    src_filename="",
+    tgt_filename="",
+    src_fileio=b"",
+    tgt_fileio=b"",
+    src_file="",
+    tgt_file="",
+    list1=[""],
+    list2=[""],
+    df=None,
+    df_a=None,
+    df_s_a=None,
+)
+if "ns" not in state:
+    state.ns = SimpleNamespace(**_)
+state.ns.list = [*_]
+
+
+def main():
+    """Bootstrap."""
+    options()
+
+
+main()

litbee/app.py

@@ -58,14 +58,18 @@ from typing import Optional
 import loguru
 import logzero
 import pandas as pd
+import ezbee
+import dzbee
+import debee
+
 import streamlit as st
 from loguru import logger as loggu
 from logzero import logger
 from set_loglevel import set_loglevel
 from streamlit import session_state as state
 
-from litbee import __version__, litbee
-from litbee.options import options
+from litbee import __version__
+# from litbee.options import options
 
 # from litbee.files2df import files2df
 # from litbee.utils import sb_front_cover, instructions, menu_items
@@ -74,15 +78,29 @@ from litbee.options import options
 # from litbee.xbee_page import xbee_page
 from litbee.utils import menu_items
 
+from litbee.multipage import Multipage
+
+# from litbee.fetch_upload import fetch_upload
+# from litbee.fetch_paste import fetch_paste
+# from litbee.fetch_urls import fetch_urls
+
+from litbee.home import home
+from litbee.settings import settings
+from litbee.info import info
+from litbee.utils import style_css
+
 # from ezbee import ezbee
 
 curr_py = sys.version[:3]
-msg = f"Some packages litbee depends on can only run with Python 3.8, current python is {curr_py}, sorry..."
+msg = f"Some packages litbee depends on can only run with Python 3.8, current python is **{curr_py}**, sorry..."
 assert curr_py == "3.8", msg
 
 os.environ["TZ"] = "Asia/Shanghai"
 time.tzset()
-os.environ["LOGLEVEL"] = "10"  # uncomment this in dev
+
+# uncomment this in dev oe set/export LOGLEVEL=10
+# os.environ["LOGLEVEL"] = "10"
+
 logzero.loglevel(set_loglevel())
 
 loggu.remove()
@@ -104,7 +122,7 @@ st.set_page_config(
     page_title=f"litbee v{__version__}",
     # page_icon="🧊",
     page_icon="🐝",
-    # layout="wide",
+    layout="wide",
     initial_sidebar_state="auto",  # "auto" or "expanded" or "collapsed",
     menu_items=menu_items,
 )
@@ -115,6 +133,7 @@ pd.options.display.float_format = "{:,.2f}".format
 
 _ = dict(
     beetype="ezbee",
+    sourcetype="upload",
     src_filename="",
     tgt_filename="",
     src_fileio=b"",
@@ -126,15 +145,43 @@ _ = dict(
     df=None,
     df_a=None,
     df_s_a=None,
+    count=1,
 )
 if "ns" not in state:
     state.ns = SimpleNamespace(**_)
 state.ns.list = [*_]
 
+logger.info(
+    "versions ezbee dzbee debee: %s, %s, %s",
+    ezbee.__version__,
+    dzbee.__version__,
+    debee.__version__,
+)
+
 
 def main():
     """Bootstrap."""
-    options()
+    # options()
+
+    st.markdown(f"<style>{style_css}</style>", unsafe_allow_html=True)
+
+    app = Multipage()
+
+    # app.add_page("Home", "house", ask.app)
+    # app.add_page("Settings", "gear", settings.app)
+    # app.add_page("Info", "info", info.app)
+
+    # app.add_page("Home", "house", fetch_upload)
+    app.add_page("Home", "house", home)
+    app.add_page("Settings", "gear", settings)
+    app.add_page("Info", "info", info)
+
+    # The main app
+    app.run()
+
+    st.markdown(f"""<div class="text"> run: {state.ns.count}</div>""", unsafe_allow_html=True)
+    loggu.debug(f" run: {state.ns.count}")
+    state.ns.count += 1
 
 
 main()

litbee/home.py

@@ -0,0 +1,305 @@
+"""Fetch content from upload.
+
+org ezbee_page.py.
+"""
+# pylint: disable=invalid-name
+from functools import partial
+import inspect
+from itertools import zip_longest
+from time import perf_counter
+
+import logzero
+import numpy as np
+import pandas as pd
+import streamlit as st
+from dzbee import dzbee  # noqa
+from ezbee import ezbee  # noqa
+from debee import debee  # noqa
+
+# from ezbee.gen_pairs import gen_pairs  # aset2pairs?
+from aset2pairs import aset2pairs
+from fastlid import fastlid
+from icecream import ic
+from loguru import logger as loggu
+from logzero import logger
+from set_loglevel import set_loglevel
+from st_aggrid import AgGrid, GridUpdateMode, GridOptionsBuilder
+# from st_aggrid.grid_options_builder import GridOptionsBuilder
+from streamlit import session_state as state
+
+# logzero.loglevel(set_loglevel())
+
+
+def home():  # noqa
+    """Fetch content from upload."""
+    # st.write(state.ns.beetype)
+
+    if state.ns.sourcetype not in ["upload"]:
+        st.write("Coming soooooooon...")
+        return None
+
+    if state.ns.beetype not in ["ezbee", "dzbee", "debee"]:
+        st.write("Coming soon...")
+        return None
+
+    # src_fileio tgt_fileio
+    with st.form(key='upload_in_form'):
+        _ = st.expander(f"{state.ns.beetype}: Pick two files", expanded=True)
+        with _:
+            col1, col2 = st.columns(2)
+            with col1:
+                src_fileio = st.file_uploader(
+                    "Choose source file (utf8 txt)",
+                    type=[
+                        "txt",
+                    ],
+                    key="src_text",
+                    # accept_multiple_files=True,
+                    # accept_multiple_files=False,
+                )
+
+            with col2:
+                tgt_fileio = st.file_uploader(
+                    "Choose target file (utf8 txt)",
+                    type=[
+                        "txt",
+                    ],
+                    key="tgt_text",
+                    # accept_multiple_files=True,
+                )
+        submitted = st.form_submit_button('Submit')
+
+    # logger.debug(" len(src_fileio): %s", len(src_fileio))
+    # logger.debug(" len(tgt_fileio): %s", len(tgt_fileio))
+
+    filename1 = ""
+    if src_fileio:
+        logger.debug(" type(src_fileio): %s", type(src_fileio))
+
+        # for st.file_uploade accept_multiple_files=True
+        if isinstance(src_fileio, list):
+            logger.debug(" len(src_fileio): %s", len(src_fileio))
+            filenames = []
+            try:
+                filenames = [elm.name for elm in src_fileio]  # type: ignore
+            except Exception as exc:
+                logger.error(exc)
+            logger.debug("src_fileio  names: *%s*", filenames)
+
+            # state.ns.src_fileio = src_fileio
+            state.ns.src_file = src_fileio[-1].getvalue().decode()
+            state.ns.src_filename = src_fileio[-1].name
+        else:
+            logger.debug("src_fileio.name: [%s]", src_fileio.name)
+            filenames = [src_fileio.name]
+            logger.debug("src_fileio  names: %s", filenames)
+
+            # state.ns.src_fileio = src_fileio
+            state.ns.src_file = src_fileio.getvalue().decode()
+            state.ns.src_filename = src_fileio.name
+        filename1 = state.ns.src_filename
+
+    filename2 = ""
+    if tgt_fileio:
+        if isinstance(tgt_fileio, list):
+            logger.warning("not set to handle multiple files")
+            logger.warning("set accept_multiple_files=False in the meantime")
+        else:
+            state.ns.tgt_file = tgt_fileio.getvalue().decode()
+            state.ns.tgt_filename = tgt_fileio.name
+            filename2 = tgt_fileio.name
+
+    # proceed when Submit is clicked
+    msg1 = ""
+    if filename1:
+        msg1 += f" file1: {filename1}"
+    msg2 = ""
+    if filename2:
+        msg2 += f" file2: {filename2}"
+    glue = ""
+    if filename1 and filename2:
+        glue = ", "
+
+    st.write(f"  Submitted upload: {msg1}{glue}{msg2}")
+    if not submitted:
+        return None
+
+    if not (filename1 or filename2):
+        st.write("|  no file uploaded")
+        return None
+    elif not filename1:
+        st.write("|  file1 not ready")
+        return None
+    elif not filename2:
+        st.write("|  file2 not ready")
+        return None
+
+    try:
+        _ = state.ns.src_file.splitlines()
+        list1 = [elm.strip() for elm in _ if elm.strip()]
+        _ = state.ns.tgt_file.splitlines()
+        list2 = [elm.strip() for elm in _ if elm.strip()]
+    except Exception as exc:
+        logger.error(exc)
+        list1 = [""]
+        list2 = [""]
+    state.ns.list1 = list1[:]
+    state.ns.list2 = list2[:]
+
+    df = pd.DataFrame(zip_longest(list1, list2, fillvalue=""))
+    try:
+        df.columns = ["text1", "text2"]
+    except Exception as exc:
+        logger.debug("df: \n%s", df)
+        logger.error("%s", exc)
+
+    state.ns.df = df
+    logger.debug("df: %s", df)
+
+    # st.table(df)  # looks alright
+
+    # stlyed pd dataframe?
+    # bigger, no pagination
+    # st.markdown(df.to_html(), unsafe_allow_html=True)
+
+    # ag_grid smallish, editable, probably slower
+
+    # if "df" not in globals() or "df" not in locals():
+    if "df" not in locals():
+        logger.debug(" df not defined, return")
+
+    if df.empty:
+        logger.debug(" df.empty, return")
+        return None
+
+    # df = pd.DataFrame([["", "", ""]], columns=["text1", "text2", "llh"])
+
+    df_exp = st.expander("to be aligned", expanded=False)
+    with df_exp:
+        st.write(df)  # too small
+
+    _ = """
+    ag_exp = st.expander("done aligned")  # , expanded=False
+    with ag_exp:
+        agdf = AgGrid(
+            df,
+            # fit_columns_on_grid_load=True,
+            editable=True,
+            gridOptions=gridOptions,
+            key="ag_exp",
+        )
+    # """
+
+    list1 = [elm.strip() for elm in df.text1 if elm.strip()]
+    list2 = [elm.strip() for elm in df.text2 if elm.strip()]
+    logger.debug("list1[:3]: %s", list1[:3])
+    logger.debug("list2[:3]: %s", list2[:3])
+
+    logger.info("Processing data... %s", state.ns.beetype)
+    # if state.ns.beetype in ["ezbee", "dzbee"]:
+    if state.ns.beetype in ["ezbee", "dzbee", "debee"]:
+        # bug in json_de2zh.gen_cmat for dzbee and
+        # fast_scores.gen_cmat  for ezbee
+        # temp fix:
+        if state.ns.beetype in ["dzbee"]:
+            fastlid.set_languages = ["de", "zh"]
+        elif state.ns.beetype in ["ezbee"]:
+            fastlid.set_languages = ["en", "zh"]
+        elif state.ns.beetype in ["debee"]:
+            fastlid.set_languages = ["de", "en"]
+        else:
+            fastlid.set_languages = None
+
+        fn = globals()[state.ns.beetype]
+        # logger.debug("type(fn): %s", fn)
+        # logger.debug("dir(fn): %s", dir(fn))
+        # logger.debug("fn.__doc__: %s", fn.__doc__)
+        logger.debug("fn.__name__: %s", fn.__name__)
+
+        from inspect import getabsfile
+        logger.debug("getabsfile(fn): %s", getabsfile(fn))
+
+        with st.spinner(" diggin..."):
+            then = perf_counter()
+            try:
+                # aset = ezbee/dzbee/debee
+                aset = globals()[state.ns.beetype](
+                    list1,
+                    list2,
+                    # eps=eps,
+                    # min_samples=min_samples,
+                )
+            except Exception as e:
+                # logger.error("aset = ezbee(...) exc: %s", e)
+                logger.exception("aset = globals()[state.ns.beetype](...) exc: %s", e)
+                aset = ""
+                # st.write(e)
+                st.write("Collecting inputs...")
+                return None
+        st.success(f"Done, took {perf_counter() - then:.2f} s")
+
+    else:
+        try:
+            filename = inspect.currentframe().f_code.co_filename
+        except Exception as e:
+            logger.error(e)
+            filename = ""
+        try:
+            lineno = inspect.currentframe().f_lineno
+        except Exception as e:
+            logger.error(e)
+            lineno = ""
+        st.write(f"{state.ns.beetype} coming soon...{filename}:{lineno}")
+        return None
+
+    # fastlid changed logger.level to 20
+    # turn back to loglevel
+    logzero.loglevel(set_loglevel())
+    if aset:
+        logger.debug("aset: %s...%s", aset[:3], aset[-3:])
+        # logger.debug("aset[:10]: %s", aset[:10])
+
+    # st.write(aset)
+
+    # aligned_pairs = gen_pairs(list1, list2, aset)
+    aligned_pairs = aset2pairs(list1, list2, aset)
+    if aligned_pairs:
+        logger.debug("%s...%s", aligned_pairs[:1], aligned_pairs[-1:])
+        # logger.debug("aligned_pairs[:20]: \n%s", aligned_pairs[:20])
+
+    df_a = pd.DataFrame(aligned_pairs, columns=["text1", "text2", "llh"], dtype="object")
+
+    # if set_loglevel() <= 10:
+    _ = st.expander("done aligned")
+    with _:
+        st.table(df_a.astype(str))
+
+    # insert seq no
+    df_a.insert(0, "sn", range(len(df_a)))
+
+    gb = GridOptionsBuilder.from_dataframe(df_a)
+    gb.configure_pagination(paginationAutoPageSize=True)
+    options = {
+        "resizable": True,
+        "autoHeight": True,
+        "wrapText": True,
+        "editable": True,
+    }
+    gb.configure_default_column(**options)
+    gridOptions = gb.build()
+
+    # st.write("editable aligned (double-click a cell to edit, drag column header to adjust widths)")
+    _ = "editable aligned (double-click a cell to edit, drag column header to adjust widths)"
+    with st.expander(_, expanded=False):
+        ag_df = AgGrid(
+            # df,
+            df_a,
+            gridOptions=gridOptions,
+            key="outside",
+            reload_data=True,
+            editable=True,
+            # width="100%",  # width parameter is deprecated
+            height=750,
+            # fit_columns_on_grid_load=True,
+            update_mode=GridUpdateMode.MODEL_CHANGED
+        )