ASUllmAPI 2.0.0__tar.gz → 2.0.2__tar.gz

{asullmapi-2.0.0 → asullmapi-2.0.2}/ASUllmAPI/model_config.py

@@ -126,7 +126,7 @@ class ModelConfig:
         self.__validate_access()
 
         response_format = {}
-        if self.response_format_type is not None:
+        if self.response_format_type:
             response_format['type'] = self.response_format_type
         return response_format
 

{asullmapi-2.0.0 → asullmapi-2.0.2}/ASUllmAPI/web_socket.py

@@ -1,18 +1,23 @@
 import asyncio
 import json
 from typing import Dict
+import ssl
+import warnings
 
 import websockets
+import certifi
 
 from .model_config import ModelConfig
 from .utils import load_json_buffer, begin_task_execution
 
+SSL_CONTEXT = ssl.create_default_context(cafile=certifi.where())
+
 
 async def interact_with_websocket(uri: str, query_payload: Dict[str, str], qid: int):
     end_of_stream = "<EOS>"
     payload = {qid: {"response": ""}}
 
-    async with websockets.connect(uri) as websocket:
+    async with websockets.connect(uri, ssl=SSL_CONTEXT) as websocket:
         # Send the user-provided message to the WebSocket server
         await websocket.send(json.dumps(query_payload))
 
@@ -24,30 +29,23 @@ async def interact_with_websocket(uri: str, query_payload: Dict[str, str], qid:
 
                 if isinstance(parsed_response, dict):
                     # Case: json/text response and user is denied entry
-                    if 'message' in parsed_response.keys():
-                        if parsed_response['message'] == 'Forbidden':
-                            # Embed entire Forbidden message payload and leave response blank.
-                            payload[qid].update(parsed_response)
-                            break
-                        else:
-                            raise RuntimeWarning(f"Unknown ASU LLM endpoint edge case detected: `message` as key in "
-                                                 f"parsed response: {parsed_response}.")
-
+                    if 'message' in parsed_response.keys() or 'error' in parsed_response.keys():
+                        # Embed entire Forbidden message payload and leave response blank.
+                        payload[qid].update(parsed_response)
+                        break
                     # Case: json response and user is not denied entry
                     elif 'response' in parsed_response.keys():
                         payload[qid]["response"] += (parsed_response["response"].replace(end_of_stream, ""))
                         if 'metadata' in parsed_response.keys() or end_of_stream in parsed_response['response']:
                             payload[qid]["metadata"] = parsed_response["metadata"]
                             break
-                    # Edge case: user gets a message to contact the administrator after an error
-                    elif 'error' in parsed_response.keys():
-                        payload[qid]["error"] = parsed_response["error"]
                     # Unknown edge case: json getting returned that is not a `message`, `response`, `error`
                     # (not observed yet)
                     else:
-                        raise RuntimeWarning(f"Unknown ASU LLM endpoint edge case detected: JSON parsed but data "
-                                             f"does not contain a message or response field.")
-
+                        warnings.warn(f"Unknown ASU LLM endpoint edge case detected: JSON parsed but data does not "
+                                      f"contain a message or response field.", RuntimeWarning)
+                        payload[qid].update(parsed_response)
+                        break
                 # Intended case: user asked for a response type of `text` and was not denied entry.
                 else:
                     payload[qid]["response"] += response.replace(end_of_stream, "")
@@ -57,8 +55,8 @@ async def interact_with_websocket(uri: str, query_payload: Dict[str, str], qid:
             except websockets.ConnectionClosed:
                 print(f"Question {qid} connection closed by the server")
                 break
-        print(f"......Question {qid} response sent by the WebSocket server.")
-        return payload
+    print(f"......Question {qid} response sent by the WebSocket server.")
+    return payload
 
 
 async def limited_task(semaphore: asyncio.Semaphore, task):

{asullmapi-2.0.0 → asullmapi-2.0.2}/ASUllmAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASUllmAPI
-Version: 2.0.0
+Version: 2.0.2
 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
@@ -13,6 +13,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: tqdm
+Requires-Dist: websockets
+Requires-Dist: certifi
 
 # ASU LLM API
 This package allows individuals at Arizona State University to access ASU GPT through API. You will need API access token, API endpoints in order to use this package.

asullmapi-2.0.2/ASUllmAPI.egg-info/requires.txt

@@ -0,0 +1,4 @@
+requests
+tqdm
+websockets
+certifi

{asullmapi-2.0.0 → asullmapi-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASUllmAPI
-Version: 2.0.0
+Version: 2.0.2
 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
@@ -13,6 +13,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: tqdm
+Requires-Dist: websockets
+Requires-Dist: certifi
 
 # ASU LLM API
 This package allows individuals at Arizona State University to access ASU GPT through API. You will need API access token, API endpoints in order to use this package.

{asullmapi-2.0.0 → asullmapi-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ASUllmAPI"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
     { name="Stella Wenxing Liu", email="stellawenxingliu@gmail.com" },
     { name="Varun Shourie", email="svarun195@gmail.com" }
@@ -15,7 +15,9 @@ classifiers = [
 ]
 dependencies = [
     "requests",
-    "tqdm"
+    "tqdm",
+    "websockets",
+    "certifi"
 ]
 
 [project.urls]

asullmapi-2.0.0/ASUllmAPI.egg-info/requires.txt

@@ -1,2 +0,0 @@
-requests
-tqdm