ASUllmAPI 2.0.4__tar.gz → 2.0.5__tar.gz

{asullmapi-2.0.4 → asullmapi-2.0.5}/ASUllmAPI/utils.py

@@ -3,6 +3,7 @@ from concurrent.futures import ThreadPoolExecutor
 import time
 import json
 import asyncio
+import sys
 
 
 def begin_task_execution(async_func):
@@ -13,17 +14,31 @@ def begin_task_execution(async_func):
     If an event loop doesn't exist, it reverts back to existing asyncio logic.
     """
     def wrap(*args, **kwargs):
-        try:
-            asyncio.get_running_loop()  # Triggers RuntimeError if no running event loop
-            # Create a separate thread so we can block before returning
+        # It is safer to use a if/else statement than try/except since
+        # the underlying code we wrap our function around can also raise RuntimeErrors.
+        # When this happens, multiple asyncio.run() executions occur, which is dangerous.
+        if is_jupyter():
             with ThreadPoolExecutor(1) as pool:
                 result = pool.submit(lambda: asyncio.run(async_func(*args, **kwargs))).result()
-        except RuntimeError:
+        else:
             result = asyncio.run(async_func(*args, **kwargs))
         return result
     return wrap
 
 
+def is_jupyter():
+    try:
+        # Check if 'IPython' is in sys.modules
+        if 'IPython' in sys.modules:
+            from IPython import get_ipython
+            # Check if we're in an IPython environment
+            if get_ipython() is not None:
+                return True
+    except ImportError:
+        pass
+    return False
+
+
 def load_json_buffer(string):
     try:
         return json.loads(string)

{asullmapi-2.0.4 → asullmapi-2.0.5}/ASUllmAPI/web_socket.py

@@ -98,15 +98,6 @@ async def interact_with_websocket(uri: str, queue: asyncio.Queue,
                     queue.task_done()
                 # END - QUERY QUEUE LOOP
         except (asyncio.TimeoutError, websockets.ConnectionClosed, Exception) as exc:
-            time.sleep(reconnect_timeout_secs)
-            # If the query is already complete, we don't want to increment the error count
-            if response_payloads[qid]["success"] == 0:
-                error_ct += 1
-                # Reset buffer stream so that you don't get messed by pre-existing data.
-                response_payloads[qid]["response"] = ""
-            else:
-                logging.info(f"Query ID {qid} completed...")
-                queue.task_done()
             if isinstance(exc, asyncio.TimeoutError):
                 logging.error(f"Error {error_ct} on {qid} stream timeout: resetting connection...")
             elif isinstance(exc, ResponseDataError):
@@ -118,6 +109,16 @@ async def interact_with_websocket(uri: str, queue: asyncio.Queue,
             else:
                 logging.error(f"Error {error_ct} on {qid}: {traceback.format_exc()}")
 
+            time.sleep(reconnect_timeout_secs)
+            # If the query is already complete, we don't want to increment the error count
+            if response_payloads[qid]["success"] == 0:
+                error_ct += 1
+                # Reset buffer stream so that you don't get messed by pre-existing data.
+                response_payloads[qid]["response"] = ""
+            else:
+                logging.info(f"Query ID {qid} completed...")
+                queue.task_done()
+
             # prevent any further retries if at error limit.
             if error_ct == error_threshold:
                 error_ct = 0

{asullmapi-2.0.4 → asullmapi-2.0.5}/ASUllmAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASUllmAPI
-Version: 2.0.4
+Version: 2.0.5
 Summary: A simple python package to facilitate connection to ASU LLM API
 Author-email: Stella Wenxing Liu <stellawenxingliu@gmail.com>, Varun Shourie <svarun195@gmail.com>
 Project-URL: Homepage, https://github.com/ASU/aiml-ssmdv-student-support-ml-data-visualization

{asullmapi-2.0.4 → asullmapi-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASUllmAPI
-Version: 2.0.4
+Version: 2.0.5
 Summary: A simple python package to facilitate connection to ASU LLM API
 Author-email: Stella Wenxing Liu <stellawenxingliu@gmail.com>, Varun Shourie <svarun195@gmail.com>
 Project-URL: Homepage, https://github.com/ASU/aiml-ssmdv-student-support-ml-data-visualization

{asullmapi-2.0.4 → asullmapi-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ASUllmAPI"
-version = "2.0.4"
+version = "2.0.5"
 authors = [
     { name="Stella Wenxing Liu", email="stellawenxingliu@gmail.com" },
     { name="Varun Shourie", email="svarun195@gmail.com" }