Concurrency & spinner fix (#141)

* demo service wip

* Removed verbose logic for spinner

* Close open spinners

* pyproject

Author: themoenen

openad/api.py

@@ -22,7 +22,6 @@ def __init__(self, name="No Name"):
         # import openad.app.main as main_app
 
         self.main_app = self._load_main()
-        self.main_app.GLOBAL_SETTINGS["VERBOSE"] = False
         self.name = name
 
     def _load_main(self):

openad/app/global_var_lib.py

@@ -47,11 +47,6 @@
     # - web: not yet used
     "display": None,
     #
-    # Setting verbose to false will hide spinners
-    # and some other non-essential output
-    # Todo: this is diplocate of "display" is "notebook" (to be confirmed)
-    "VERBOSE": True,
-    #
     # The width in characters we limit the printed output to.
     "max_print_width": 150,
     #

openad/core/grammar.py

@@ -45,9 +45,8 @@
 
 # Helpers
 from openad.helpers.general import is_notebook_mode
-from openad.helpers.output import output_error, output_text
+from openad.helpers.output import output_error
 from openad.helpers.output_msgs import msg
-from openad.helpers.spinner import spinner
 from openad.openad_model_plugin.openad_model_toolkit import service_grammar_add
 
 from openad.openad_model_plugin.catalog_model_services import get_cataloged_service_defs, service_catalog_grammar
@@ -1031,8 +1030,6 @@ def create_statements(cmd_pointer):
 
         # cmd_pointer.current_statements.extend(service_statements)
 
-        spinner.stop()  # Spinner may be started from within get_cataloged_service_defs -> get_short_status -> maybe_refresh_auth
-
         cmd_pointer.current_help.help_model_services.clear()
         cmd_pointer.current_help.help_model_services.extend(temp_help)
         cmd_pointer.current_help.reset_help()
@@ -1410,7 +1407,11 @@ def output_train_statements(cmd_pointer):
     for training_file in glob.glob(
         os.path.expanduser(str(os.path.expanduser(cmd_pointer.home_dir + "/prompt_train/")) + "/*")
     ):
-        os.remove(training_file)
+        # Fail silently when runnning concurrent sessions
+        try:
+            os.remove(training_file)
+        except Exception:  # pylint: disable=broad-except
+            pass
 
     while i < len(grammar_help):
         training_statements.append(

openad/helpers/spinner.py

@@ -16,6 +16,7 @@
 from time import sleep
 from openad.helpers.general import is_notebook_mode
 from openad.helpers.output import output_text
+from openad.app.global_var_lib import GLOBAL_SETTINGS
 
 
 if is_notebook_mode():
@@ -25,13 +26,11 @@
 
 
 class Spinner(Halo):
-    verbose = True
 
-    def __init__(self, verbose=True):
-        self.verbose = verbose
+    def __init__(self):
 
         # Fancy spinner, but requires more CPU, blocking the main thread
-        # To do: see is separating thread for spinner resolves this
+        # To do: see if separating thread for spinner resolves this
         wave_spinner = {
             "interval": 700,
             "frames": [
@@ -47,7 +46,7 @@ def __init__(self, verbose=True):
             ],
         }
 
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             super().__init__(spinner="triangle", color="white", interval=700)
 
             # Fancy spinner
@@ -57,7 +56,7 @@ def __init__(self, verbose=True):
             # https://github.com/sindresorhus/cli-spinners/blob/dac4fc6571059bb9e9bc204711e9dfe8f72e5c6f/spinners.json
 
     def start(self, text=None, no_format=False):
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             if no_format:
                 text = output_text(text, return_val=True, jup_return_format="plain") if text else None
             else:
@@ -67,24 +66,24 @@ def start(self, text=None, no_format=False):
             super().start(text)
 
     def succeed(self, *args, **kwargs):
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             return super().succeed(*args, **kwargs)
 
     def info(self, *args, **kwargs):
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             super().info(*args, **kwargs)
             return super().start(*args, **kwargs)
 
     def warn(self, *args, **kwargs):
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             return super().warn(*args, **kwargs)
 
     def fail(self, *args, **kwargs):
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             return super().fail(*args, **kwargs)
 
     def stop(self):
-        if self.verbose is True:
+        if GLOBAL_SETTINGS["display"] != "api":
             return super().stop()
 
     def countdown(
@@ -108,15 +107,15 @@ def countdown(
         """
 
         msg = msg or "Waiting {sec} seconds before retrying"
-        spinner.start(msg.format(sec=seconds))
+        self.start(msg.format(sec=seconds))
         sleep(1)
         if seconds > 1:
             self.countdown(seconds - 1, msg, stop_msg)
         else:
             if stop_msg:
-                spinner.start(stop_msg)
+                self.start(stop_msg)
             else:
-                spinner.stop()
+                self.stop()
             return True
 
 

openad/llm_assist/llm_interface.py

@@ -16,7 +16,7 @@
 
 from openad.helpers.credentials import write_credentials, get_credentials
 from openad.app.global_var_lib import GLOBAL_SETTINGS
-from openad.helpers.spinner import Spinner
+from openad.helpers.spinner import spinner
 
 # Constants
 TRAINING_LLM_DIR = "/prompt_train/"
@@ -127,23 +127,22 @@ def how_do_i(cmd_pointer, parser):
     else:
         from halo import Halo  # pylint: disable=import-outside-toplevel
 
-    newspin = Spinner(GLOBAL_SETTINGS["VERBOSE"])
-    newspin.start("Processing Request ")
+    spinner.start("Processing Request ")
     # Now we are asking the prompt a Question
 
     try:
         # text = cmd_pointer.llm_handle.how_to_search(CHAT_PRIMER + " ".join(parser["Chat_String"]) + CHAT_PRIMER_SUFFIX)
         text = cmd_pointer.llm_handle.how_to_search(CHAT_PRIMER + " ".join(parser["Chat_String"]))
     except Exception as e:
-        newspin.fail("Running Request Failed")
+        spinner.fail("Running Request Failed")
         output_text(
             "Unable to Execute request. check LLM credentials and or Connectivity",
             return_val=False,
             pad=1,
             edge=True,
         )
         return False
-    newspin.succeed("See Answer Below.")
+    spinner.succeed("See Answer Below.")
     text = clean_up_llm_text(cmd_pointer, text)
 
     if GLOBAL_SETTINGS["display"] == "notebook":

openad/openad_model_plugin/catalog_model_services.py

@@ -143,6 +143,7 @@ def get_cataloged_service_defs() -> Dict[str, dict]:
                 logger.warning(f"remote service defs not found, sevice not available | {name=}")
                 service_definitions[name] = remote_definitions
 
+    spinner.stop()
     return service_definitions
 
 
@@ -1217,7 +1218,6 @@ def service_catalog_grammar(statements: list, help: list):
 - <cmd>model service demo</cmd>
 - <cmd>model service demo restart</cmd>
 - <cmd>model service demo debug</cmd>
-    
 """,
         )
     )

openad/openad_model_plugin/openad_model_toolkit.py

@@ -19,9 +19,7 @@
 from openad.openad_model_plugin.catalog_model_services import Dispatcher
 from openad.app.global_var_lib import GLOBAL_SETTINGS
 from openad.smols.smol_batch_files import merge_molecule_property_data
-from openad.helpers.spinner import Spinner
-
-spinner = Spinner(GLOBAL_SETTINGS["VERBOSE"])
+from openad.helpers.spinner import spinner
 
 from pyparsing import (  # replaceWith,; Combine,; pyparsing_test,; ParseException,
     CaselessKeyword,

openad/openad_model_plugin/services.py

@@ -369,7 +369,6 @@ def get_remote_service_definitions(self, name: str) -> list | None:
     # @auth
     def refresh_remote_service(self, service_name, endpoint, auth_token) -> bool:
         """Refresh remote service with new auth token"""
-        output_warning(f"Refreshing remote service: {service_name}")
         logger.debug(f"refreshing remote service | {service_name=}")
         if service_name not in self.list():
             output_error(f"Service <yellow>{service_name}</yellow> not found in catalog")
@@ -447,6 +446,7 @@ def maybe_refresh_auth(self, service_name, service_data):
                     update_lookup_table(auth_group=auth_group_name, service=service_name, api_key=auth_token)
                 elif "authorization" in params_lower:
                     self.refresh_remote_service(service_name, endpoint, auth_token)
+            spinner.stop()
 
     def get_service_cache(self) -> LruCache[dict]:
         return REMOTE_SERVICES_CACHE

openad/smols/smol_batch_files.py

@@ -19,7 +19,7 @@
 from openad.app.global_var_lib import GLOBAL_SETTINGS
 from openad.helpers.output import output_error, output_warning, output_success, output_text
 from openad.helpers.output_msgs import msg
-from openad.helpers.spinner import Spinner
+from openad.helpers.spinner import spinner
 from openad.helpers.paths import parse_path
 from openad.plugins.style_parser import style
 
@@ -235,7 +235,6 @@ def _enrich_with_pubchem_data(cmd_pointer, molset):
 
     output_molset = []
 
-    spinner = Spinner(GLOBAL_SETTINGS["VERBOSE"])
     spinner.start("Fetching from PubChem")
 
     for i, smol in enumerate(molset):

openad/user_toolkits/RXN/fn_reactions/fn_predict_reaction.py

@@ -164,7 +164,7 @@ def predict_reaction(inputs: dict, cmd_pointer):
 
     output_text("<green>Reaction:</green> " + sources + "    ---->    " + x_y, return_val=False)
     output_text("<green>Confidence:</green> " + str(confidence), return_val=False)
-    if GLOBAL_SETTINGS["display"] == "notebook" or GLOBAL_SETTINGS["VERBOSE"] == False:
+    if GLOBAL_SETTINGS["display"] == "notebook" or GLOBAL_SETTINGS["display"] == "api":
         return get_reaction_from_smiles(predict_reaction_results["response"]["payload"]["attempts"][0]["smiles"])
     else:
         output_text("", return_val=False)