chembfn-webui 1.1.0__tar.gz → 1.2.1__tar.gz

{chembfn_webui-1.1.0 → chembfn_webui-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chembfn_webui
-Version: 1.1.0
+Version: 1.2.1
 Summary: WebUI for ChemBFN
 Home-page: https://github.com/Augus1999/ChemBFN-WebUI
 Author: Nianze A. Tao

{chembfn_webui-1.1.0 → chembfn_webui-1.2.1}/chembfn_webui/bin/app.py

@@ -7,7 +7,7 @@ import sys
 import argparse
 from pathlib import Path
 from functools import partial
-from typing import Tuple, List, Dict, Union
+from typing import Tuple, List, Dict, Union, Literal
 
 sys.path.append(str(Path(__file__).parent.parent))
 from rdkit.Chem import Draw, MolFromSmiles  # type: ignore
@@ -42,9 +42,8 @@ from lib.version import __version__
 
 vocabs = find_vocab()
 models = find_model()
-_lora_selected = False  # lora select flag
-_run_in_public = False  # public flag
 cache_dir = Path(__file__).parent.parent / "cache"
+_result_count = 0
 
 HTML_STYLE = gr.InputHTMLAttributes(
     autocapitalize="off",
@@ -131,13 +130,9 @@ def select_lora(evt: gr.SelectData, prompt: str) -> str:
     :return: new prompt string
     :rtype: str
     """
-    global _lora_selected
-    if _lora_selected and not _run_in_public:  # avoid double select
-        _lora_selected = False
-        return prompt
     selected_lora = evt.value
-    _lora_selected = True
-    if evt.index[1] != 0:
+    exist_lora = parse_prompt(prompt)["lora"]
+    if evt.index[1] != 0 or selected_lora in exist_lora:
         return prompt
     if not prompt:
         return f"<{selected_lora}:1>"
@@ -179,15 +174,16 @@ def run(
     batch_size: int,
     sequence_size: int,
     guidance_strength: float,
-    method: str,
+    method: Literal["BFN", "ODE"],
     temperature: float,
     prompt: str,
     scaffold: str,
     template: str,
     sar_control: str,
     exclude_token: str,
-    quantise: str,
-    jited: str,
+    quantise: Literal["on", "off"],
+    jited: Literal["on", "off"],
+    sorted_: Literal["on", "off"],
 ) -> Tuple[Union[List, None], List[str], str, gr.TextArea, str]:
     """
     Run generation or inpainting.
@@ -208,6 +204,7 @@ def run(
     :param exclude_token: unwanted tokens
     :param quantise: `"on"` or `"off"`
     :param jited: `"on"` or `"off"`
+    :param sorted\\_: whether to sort the reulst; `"on"` or `"off"`
     :type model_name: str
     :type token_name: str
     :type vocab_fn: str
@@ -224,6 +221,7 @@ def run(
     :type exclude_token: str
     :type quantise: str
     :type jited: str
+    :type sorted\\_: str
     :return: list of images \n
              list of generated molecules \n
              Chemfig code \n
@@ -249,7 +247,7 @@ def run(
     if token_name == "FASTA":
         vocab_keys = FASTA_VOCAB_KEYS
         tokeniser = fasta2vec
-        trans_fn = lambda x: x
+        trans_fn = lambda x: [i for i in x if i]
         img_fn = lambda _: None  # senseless to provide dumb 2D images
         chemfig_fn = lambda _: [""]  # senseless to provide very long Chemfig code
     if token_name == "SELFIES":
@@ -257,7 +255,7 @@ def run(
         vocab_keys = vocab_data["vocab_keys"]
         vocab_dict = vocab_data["vocab_dict"]
         tokeniser = partial(selfies2vec, vocab_dict=vocab_dict)
-        trans_fn = lambda x: x
+        trans_fn = lambda x: [i for i in x if i]
         img_fn = lambda x: [
             Draw.MolToImage(MolFromSmiles(decoder(i)), (500, 500)) for i in x
         ]
@@ -291,7 +289,7 @@ def run(
                     y = mlp.forward(y)
             else:
                 y = None
-            _message.append(f"Sequence length is set to {lmax} from model metadata.")
+            _message.append(f"Sequence length set to {lmax} from model metadata.")
         bfn.semi_autoregressive = sar_flag[0]
         if quantise == "on":
             quantise_model_(bfn)
@@ -323,7 +321,7 @@ def run(
             y = None
         if prompt_info["lora_scaling"][0] != 1.0:
             adjust_lora_(bfn, prompt_info["lora_scaling"][0])
-        _message.append(f"Sequence length is set to {lmax} from model metadata.")
+        _message.append(f"Sequence length set to {lmax} from model metadata.")
         bfn.semi_autoregressive = sar_flag[0]
         if quantise == "on":
             quantise_model_(bfn)
@@ -354,7 +352,7 @@ def run(
             bfn.quantise()
         if jited == "on":
             bfn.compile()
-        _message.append(f"Sequence length is set to {lmax} from model metadata.")
+        _message.append(f"Sequence length set to {lmax} from model metadata.")
     # ------- inference -------
     allowed_tokens = parse_exclude_token(exclude_token, vocab_keys)
     if not allowed_tokens:
@@ -374,6 +372,7 @@ def run(
             vocab_keys=vocab_keys,
             method=_method,
             allowed_tokens=allowed_tokens,
+            sort=sorted_ == "on",
         )
         mols = trans_fn(mols)
         imgs = img_fn(mols)
@@ -393,6 +392,7 @@ def run(
             vocab_keys=vocab_keys,
             method=_method,
             allowed_tokens=allowed_tokens,
+            sort=sorted_ == "on",
         )
         mols = trans_fn(mols)
         imgs = img_fn(mols)
@@ -408,6 +408,7 @@ def run(
             vocab_keys=vocab_keys,
             method=_method,
             allowed_tokens=allowed_tokens,
+            sort=sorted_ == "on",
         )
         mols = trans_fn(mols)
         imgs = img_fn(mols)
@@ -418,6 +419,8 @@ def run(
     _message.append(
         f"{n_mol} smaples generated and saved to cache that can be downloaded."
     )
+    global _result_count
+    _result_count = n_mol
     return (
         imgs,
         mols,
@@ -547,6 +550,12 @@ with gr.Blocks(title="ChemBFN WebUI") as app:
                 )
                 quantise = gr.Radio(["on", "off"], value="off", label="quantisation")
                 jited = gr.Radio(["on", "off"], value="off", label="JIT")
+                sorted_ = gr.Radio(
+                    ["on", "off"],
+                    value="off",
+                    label="sort result",
+                    info="sorting based on entropy",
+                )
     # ------ user interaction events -------
     btn.click(
         fn=run,
@@ -567,6 +576,7 @@ with gr.Blocks(title="ChemBFN WebUI") as app:
             exclude_token,
             quantise,
             jited,
+            sorted_,
         ],
         outputs=[img, result, chemfig, message, btn_download],
     )
@@ -601,7 +611,7 @@ with gr.Blocks(title="ChemBFN WebUI") as app:
     )
     lora_tabel.select(fn=select_lora, inputs=prompt, outputs=prompt)
     result.change(
-        fn=lambda x: gr.File(x, label="download", visible=True),
+        fn=lambda x: gr.File(x, label="download", visible=_result_count > 0),
         inputs=btn_download,
         outputs=btn_download,
     )
@@ -625,8 +635,6 @@ def main() -> None:
     )
     parser.add_argument("-V", "--version", action="version", version=__version__)
     args = parser.parse_args()
-    global _run_in_public
-    _run_in_public = args.public
     app.launch(share=args.public, allowed_paths=[cache_dir.absolute().__str__()])
 
 

chembfn_webui-1.2.1/chembfn_webui/cache/results.csv

@@ -0,0 +1,5 @@
+CN(Cc1ccccc1)C(=O)Cc1cccc(F)c1F
+Cc1cnc(NC(=O)c2cccc3ccccc23)s1
+COc1ccc(NC(=O)Cc2ccccc2C)cc1
+O=C(CNC(=O)c1ccccc1)NCc1ccccc1
+CCOc1ccccc1C(=O)Nc1ccc(F)cc1

{chembfn_webui-1.1.0 → chembfn_webui-1.2.1}/chembfn_webui/lib/version.py

@@ -4,5 +4,5 @@
 Version info.
 """
 
-__version__ = "1.1.0"
+__version__ = "1.2.1"
 __author__ = "Nianze A. TAO"

{chembfn_webui-1.1.0 → chembfn_webui-1.2.1}/chembfn_webui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chembfn_webui
-Version: 1.1.0
+Version: 1.2.1
 Summary: WebUI for ChemBFN
 Home-page: https://github.com/Augus1999/ChemBFN-WebUI
 Author: Nianze A. Tao