Update app.py

app.py

@@ -1,116 +1,75 @@
 import gradio as gr
 import os
 import sys
-import json 
+import json
 import requests
 import random
 
-
 MODEL = "gpt-4.1-mini"
 API_URL = os.getenv("API_URL")
 DISABLED = os.getenv("DISABLED") == 'True'
 OPENAI_API_KEYS = os.getenv("OPENAI_API_KEYS").split(',')
-print (API_URL)
-print (OPENAI_API_KEYS)
-NUM_THREADS = int(os.getenv("NUM_THREADS"))
-
-print (NUM_THREADS)
+NUM_THREADS = int(os.getenv("NUM_THREADS", "1"))
 
 def exception_handler(exception_type, exception, traceback):
-    print("%s: %s" % (exception_type.__name__, exception))
+    print(f"{exception_type.__name__}: {exception}")
 sys.excepthook = exception_handler
 sys.tracebacklimit = 0
-    
-def predict(inputs, top_p, temperature, chat_counter, chatbot, history, request:gr.Request):
+
+def predict(inputs, top_p, temperature, chat_counter, chatbot, history, request: gr.Request):
     payload = {
         "model": MODEL,
-        "messages": [{"role": "user", "content": f"{inputs}"}],
+        "messages": [{"role": "user", "content": inputs}],
         "temperature": temperature,
         "top_p": top_p,
-        "n" : 1,
+        "n": 1,
         "stream": True,
-        "presence_penalty":0,
-        "frequency_penalty":0,
+        "presence_penalty": 0,
+        "frequency_penalty": 0,
     }
     OPENAI_API_KEY = random.choice(OPENAI_API_KEYS)
-    print (OPENAI_API_KEY)
-
-    headers_dict = {key.decode('utf-8'): value.decode('utf-8') for key, value in request.headers.raw}
-
+    
     headers = {
         "Content-Type": "application/json",
         "Authorization": f"Bearer {OPENAI_API_KEY}",
-        "Headers": f"{headers_dict}"
     }
 
-    # print(f"chat_counter - {chat_counter}")
-    if chat_counter != 0 :
+    if chat_counter != 0:
         messages = []
         for i, data in enumerate(history):
-            if i % 2 == 0:
-                role = 'user'
-            else:
-                role = 'assistant'
-            message = {}
-            message["role"] = role
-            message["content"] = data
-            messages.append(message)
-        
-        message = {}
-        message["role"] = "user" 
-        message["content"] = inputs
-        messages.append(message)
-        payload = {
-            "model": MODEL,
-            "messages": messages,
-            "temperature" : temperature,
-            "top_p": top_p,
-            "n" : 1,
-            "stream": True,
-            "presence_penalty":0,
-            "frequency_penalty":0,
-        }
+            role = "user" if i % 2 == 0 else "assistant"
+            messages.append({"role": role, "content": data})
+        messages.append({"role": "user", "content": inputs})
+        payload["messages"] = messages
 
     chat_counter += 1
-
     history.append(inputs)
-    token_counter = 0 
-    partial_words = "" 
+    partial_words = ""
+    token_counter = 0
     counter = 0
 
     try:
-        # make a POST request to the API endpoint using the requests.post method, passing in stream=True
         response = requests.post(API_URL, headers=headers, json=payload, stream=True)
-        response_code = f"{response}"
-        #if response_code.strip() != "<Response [200]>":
-        #    #print(f"response code - {response}")
-        #    raise Exception(f"Sorry, hitting rate limit. Please try again later. {response}")
-        
         for chunk in response.iter_lines():
-            #print (chunk)
-            #sys.stdout.flush()
-            #Skipping first chunk
             if counter == 0:
                 counter += 1
                 continue
-                #counter+=1
-            # check whether each line is non-empty
-            if chunk.decode() :
-                chunk = chunk.decode()
-                # decode each line as response data is in bytes
-                if len(chunk) > 12 and "content" in json.loads(chunk[6:])['choices'][0]['delta']:
-                    partial_words = partial_words + json.loads(chunk[6:])['choices'][0]["delta"]["content"]
+            if chunk:
+                chunk_str = chunk.decode()
+                chunk_json = json.loads(chunk_str[6:])
+                delta = chunk_json['choices'][0]['delta']
+                if "content" in delta:
+                    partial_words += delta["content"]
                     if token_counter == 0:
                         history.append(" " + partial_words)
                     else:
                         history[-1] = partial_words
                     token_counter += 1
-                    yield [(history[i], history[i + 1]) for i in range(0, len(history) - 1, 2) ], history, chat_counter, response, gr.update(interactive=False), gr.update(interactive=False)  # resembles {chatbot: chat, state: history}  
+                    yield [(history[i], history[i + 1]) for i in range(0, len(history) - 1, 2)], history, chat_counter, gr.update(interactive=False), gr.update(interactive=False)
     except Exception as e:
-        print (f'error found: {e}')
-    yield [(history[i], history[i + 1]) for i in range(0, len(history) - 1, 2) ], history, chat_counter, response, gr.update(interactive=True), gr.update(interactive=True)
-    print(json.dumps({"chat_counter": chat_counter, "payload": payload, "partial_words": partial_words, "token_counter": token_counter, "counter": counter}))
-                   
+        print(f"Error: {e}")
+    
+    yield [(history[i], history[i + 1]) for i in range(0, len(history) - 1, 2)], history, chat_counter, gr.update(interactive=True), gr.update(interactive=True)
 
 def reset_textbox():
     return gr.update(value='', interactive=False), gr.update(interactive=False)
@@ -118,82 +77,31 @@ def reset_textbox():
 title = """<h1 align="center">GPT-4.1 mini: Research Preview (Short-Term Availability)</h1>"""
 if DISABLED:
     title = """<h1 align="center" style="color:red">This app has reached OpenAI's usage limit. Please check back tomorrow.</h1>"""
-description = """Language models can be conditioned to act like dialogue agents through a conversational prompt that typically takes the form:
-```
-User: <utterance>
-Assistant: <utterance>
-User: <utterance>
-Assistant: <utterance>
-...
-```
-In this app, you can explore the outputs of a gpt-4 turbo LLM.
-"""
+description = """Language models can be conditioned to act like dialogue agents through a conversational prompt."""
 
-theme = gr.themes.Default(primary_hue="green")                
+theme = gr.themes.Default(primary_hue="green")
 
-with gr.Blocks(css = """#col_container { margin-left: auto; margin-right: auto;}
-                #chatbot {height: 520px; overflow: auto;}""",
-              theme=theme) as demo:
+with gr.Blocks(css="#col_container { margin-left: auto; margin-right: auto;} #chatbot {height: 520px; overflow: auto;}", theme=theme) as demo:
     gr.HTML(title)
     gr.HTML("""<h3 align="center">This app provides you full access to GPT-4.1 mini (1M token limit). You don't need any OPENAI API key.</h3>""")
-    gr.HTML("""
-<div style="padding: 12px; margin-bottom: 16px; border-radius: 6px; background-color: #e6f4ea; text-align: center;">
-    🚀 <b>Try our new ChatAnnotator</b> powered by Cohere's <b>Command-A</b> model! 
-    It offers a much-improved interface allowing you to <b>highlight and annotate specific errors</b> directly within chatbot responses, and even prompt immediate corrections. 
-    <a href="https://chatannotator.com" target="_blank">Click here to check it out!</a>
-</div>
-""")
-
 
-    #gr.HTML('''<center><a href="https://huggingface.co/spaces/ysharma/ChatGPT4?duplicate=true"><img src="https://bit.ly/3gLdBN6" alt="Duplicate Space"></a>Duplicate the Space and run securely with your OpenAI API Key</center>''')
-    with gr.Column(elem_id = "col_container", visible=False) as main_block:
-        #GPT4 API Key is provided by Huggingface 
-        #openai_api_key = gr.Textbox(type='password', label="Enter only your GPT4 OpenAI API key here")
-        chatbot = gr.Chatbot(elem_id='chatbot') #c
-        inputs = gr.Textbox(placeholder= "Hi there!", label= "Type an input and press Enter") #t
-        state = gr.State([]) #s
+    with gr.Column(elem_id="col_container", visible=not DISABLED) as main_block:
+        chatbot = gr.Chatbot(elem_id='chatbot')
+        inputs = gr.Textbox(placeholder="Hi there!", label="Type an input and press Enter")
+        state = gr.State([])
         with gr.Row():
             with gr.Column(scale=7):
-                b1 = gr.Button(visible=not DISABLED) #.style(full_width=True)
+                b1 = gr.Button(visible=not DISABLED)
             with gr.Column(scale=3):
-                server_status_code = gr.Textbox(label="Status code from OpenAI server", )
-    
-        #inputs, top_p, temperature, top_k, repetition_penalty
+                server_status_code = gr.Textbox(label="Status code from OpenAI server")
         with gr.Accordion("Parameters", open=False):
-            top_p = gr.Slider( minimum=-0, maximum=1.0, value=1.0, step=0.05, interactive=True, label="Top-p (nucleus sampling)",)
-            temperature = gr.Slider( minimum=-0, maximum=5.0, value=1.0, step=0.1, interactive=True, label="Temperature",)
-            #top_k = gr.Slider( minimum=1, maximum=50, value=4, step=1, interactive=True, label="Top-k",)
-            #repetition_penalty = gr.Slider( minimum=0.1, maximum=3.0, value=1.03, step=0.01, interactive=True, label="Repetition Penalty", )
+            top_p = gr.Slider(minimum=0, maximum=1.0, value=1.0, step=0.05, interactive=True, label="Top-p (nucleus sampling)")
+            temperature = gr.Slider(minimum=0, maximum=5.0, value=1.0, step=0.1, interactive=True, label="Temperature")
             chat_counter = gr.Number(value=0, visible=False, precision=0)
-    
-    with gr.Column(elem_id = "user_consent_container") as user_consent_block:
-        # Get user consent
-        accept_checkbox = gr.Checkbox(visible=False)
-        js = "(x) => confirm('By clicking \"OK\", I agree that my data may be published or shared.')"
-        with gr.Accordion("User Consent for Data Collection, Use, and Sharing", open=True):
-            gr.HTML("""
-            <div>
-                <p>By using our app, which is powered by OpenAI's API, you acknowledge and agree to the following terms regarding the data you provide:</p>
-                <ol>
-                    <li><strong>Collection:</strong> We may collect information, including the inputs you type into our app, the outputs generated by OpenAI's API, and certain technical details about your device and connection (such as browser type, operating system, and IP address) provided by your device's request headers.</li>
-                    <li><strong>Use:</strong> We may use the collected data for research purposes, to improve our services, and to develop new products or services, including commercial applications, and for security purposes, such as protecting against unauthorized access and attacks.</li>
-                    <li><strong>Sharing and Publication:</strong> Your data, including the technical details collected from your device's request headers, may be published, shared with third parties, or used for analysis and reporting purposes.</li>
-                    <li><strong>Data Retention:</strong> We may retain your data, including the technical details collected from your device's request headers, for as long as necessary.</li>
-                </ol>
-                <p>By continuing to use our app, you provide your explicit consent to the collection, use, and potential sharing of your data as described above. If you do not agree with our data collection, use, and sharing practices, please do not use our app.</p>
-            </div>
-            """)
-            accept_button = gr.Button("I Agree")
-
-        def enable_inputs():
-            return gr.update(visible=False), gr.update(visible=True)
-
-    accept_button.click(None, None, accept_checkbox, js=js, queue=False)
-    accept_checkbox.change(fn=enable_inputs, inputs=[], outputs=[user_consent_block, main_block], queue=False)
 
     inputs.submit(reset_textbox, [], [inputs, b1], queue=False)
-    inputs.submit(predict, [inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter, server_status_code, inputs, b1],)  #openai_api_key
+    inputs.submit(predict, [inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter, inputs, b1])
     b1.click(reset_textbox, [], [inputs, b1], queue=False)
-    b1.click(predict, [inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter, server_status_code, inputs, b1],)  #openai_api_key
-             
+    b1.click(predict, [inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter, inputs, b1])
+
     demo.queue(max_size=10, default_concurrency_limit=NUM_THREADS, api_open=False).launch(share=False)