Update app.py

app.py

@@ -102,153 +102,155 @@ def supabase_fetch_user(user_name):
 #         response += token
 #         yield response
 
-def get_completion(message,history,profile: gr.OAuthProfile | None,oauth_token: gr.OAuthToken | None,request: gr.Request):
-    if request:
-        ip = request.client.host
-        print("Query parameters:", dict(request.query_params))
-        sign = dict(request.query_params).get('__sign')
-
-        # get cookie
-        headers = request.headers.raw 
+# def get_completion(message,history,profile: gr.OAuthProfile | None,oauth_token: gr.OAuthToken | None,request: gr.Request):
+#     if request:
+#         ip = request.client.host
+#         print("Query parameters:", dict(request.query_params))
+#         sign = dict(request.query_params).get('__sign')
+
+#         # get cookie
+#         headers = request.headers.raw 
         
-        # find 'cookie'
-        cookie_header = next((header for header in headers if header[0] == b'cookie'), None)
+#         # find 'cookie'
+#         cookie_header = next((header for header in headers if header[0] == b'cookie'), None)
         
-        if cookie_header:
-            # extract cookie
-            cookie_value = cookie_header[1].decode()
-            print(f"Cookie: {cookie_value}")
-        else:
-            cookie_value = ''
-            print("No cookie found in request headers")
+#         if cookie_header:
+#             # extract cookie
+#             cookie_value = cookie_header[1].decode()
+#             print(f"Cookie: {cookie_value}")
+#         else:
+#             cookie_value = ''
+#             print("No cookie found in request headers")
             
     
-    # check login
-    if profile is None:
-        # raise gr.Error('Click "Sign in with Hugging Face" to continue')
-        user_name = 'unknown'
-        user_oauth_token = ''
-        name = 'unknown'
-        pf = ''
-        pic = ''
-    else:
-        user_name = profile.username
-        user_oauth_token = oauth_token.token
-        name = profile.name
-        pf = profile.profile
-        pic = profile.picture
+#     # check login
+#     if profile is None:
+#         # raise gr.Error('Click "Sign in with Hugging Face" to continue')
+#         user_name = 'unknown'
+#         user_oauth_token = ''
+#         name = 'unknown'
+#         pf = ''
+#         pic = ''
+#     else:
+#         user_name = profile.username
+#         user_oauth_token = oauth_token.token
+#         name = profile.name
+#         pf = profile.profile
+#         pic = profile.picture
         
-    # check if user exists
-    user_data = supabase_fetch_user(user_name)
-    if not user_data[1]:
-        supabase_insert_user(name,user_name,pf,pic,user_oauth_token)
+#     # check if user exists
+#     user_data = supabase_fetch_user(user_name)
+#     if not user_data[1]:
+#         supabase_insert_user(name,user_name,pf,pic,user_oauth_token)
 
     
-    # check if messages are empty
-    if message["text"].strip() == "" and not message["files"]:
-        raise gr.Error("Please input a query and optionally image(s).")
+#     # check if messages are empty
+#     if message["text"].strip() == "" and not message["files"]:
+#         raise gr.Error("Please input a query and optionally image(s).")
     
-    if message["text"].strip() == "" and message["files"]:
-        raise gr.Error("Please input a text query along the image(s).")
+#     if message["text"].strip() == "" and message["files"]:
+#         raise gr.Error("Please input a text query along the image(s).")
     
-    text = message['text']
-    user_message = [
-        {"type": "text", "text": text},
-    ]
-    content_type = 'text'
-    if message['files']:
-        file = message['files'][0]
-        public_url = upload_file_to_gcs_blob(file)
-        if is_image(file): # only support image file now
-            content_image = {
-                "type": "image_url",
-                "image_url": {
-                    "url": public_url,
-                },}
-            user_message.append(content_image)
-            content_type = 'image'
-        else:
-            raise gr.Error("Only support image files now.")
-
-    history_openai_format = []
-    for human, assistant in history:
-        # check if there is image info in the history message or empty history messages
+#     text = message['text']
+#     user_message = [
+#         {"type": "text", "text": text},
+#     ]
+#     content_type = 'text'
+#     if message['files']:
+#         file = message['files'][0]
+#         public_url = upload_file_to_gcs_blob(file)
+#         if is_image(file): # only support image file now
+#             content_image = {
+#                 "type": "image_url",
+#                 "image_url": {
+#                     "url": public_url,
+#                 },}
+#             user_message.append(content_image)
+#             content_type = 'image'
+#         else:
+#             raise gr.Error("Only support image files now.")
+
+#     history_openai_format = []
+#     for human, assistant in history:
+#         # check if there is image info in the history message or empty history messages
         
-        if isinstance(human, tuple) or human == "" or assistant is None:
-            continue
+#         if isinstance(human, tuple) or human == "" or assistant is None:
+#             continue
             
-        history_openai_format.append({"role": "user", "content": human })
-        history_openai_format.append({"role": "assistant", "content":assistant})
-    history_openai_format.append({"role": "user", "content": user_message})
-    # print(history_openai_format)
+#         history_openai_format.append({"role": "user", "content": human })
+#         history_openai_format.append({"role": "assistant", "content":assistant})
+#     history_openai_format.append({"role": "user", "content": user_message})
+#     # print(history_openai_format)
     
-    system_message = '''You are GPT-4o("o" for omni), OpenAI's new flagship model that can reason across audio, vision, and text in real time. 
-    GPT-4o matches GPT-4 Turbo performance on text in English and code, with significant improvement on text in non-English languages, while also being much faster. 
-    GPT-4o is especially better at vision and audio understanding compared to existing models.
-    GPT-4o's text and image capabilities are avaliable for users now. More capabilities like audio and video will be rolled out iteratively in the future.
-    '''
+#     system_message = '''You are GPT-4o("o" for omni), OpenAI's new flagship model that can reason across audio, vision, and text in real time. 
+#     GPT-4o matches GPT-4 Turbo performance on text in English and code, with significant improvement on text in non-English languages, while also being much faster. 
+#     GPT-4o is especially better at vision and audio understanding compared to existing models.
+#     GPT-4o's text and image capabilities are avaliable for users now. More capabilities like audio and video will be rolled out iteratively in the future.
+#     '''
 
     
-    # headers
-    openai_api_key = os.environ.get('openai_api_key')
-    base_url = os.environ.get('base_url')
-    headers = {
-      'Authorization': f'Bearer {openai_api_key}'
-    }
-
-    temperature = 0.7
-    max_tokens = 2048
-
-    init_message = [{"role": "system", "content": system_message}]
-    messages = init_message + history_openai_format[-5:] #system message + latest 2 round dialogues + user input
-    print(messages)
-    # request body
-    data = {
-        'model': 'gpt-4o',  # we use gpt-4o here
-        'messages': messages,
-        'temperature':temperature, 
-        'max_tokens':max_tokens,
-        'stream':True,
-        # 'stream_options':{"include_usage": True}, # retrieving token usage for stream response
-    }
-
-    # get response
-    # response = requests.post(base_url, headers=headers, json=data)
-    # response_data = response.json()
-    # print(response_data)
-    # print('-----------------------------------\n')
-    # if 'error' in response_data:
-    #     response_content = response_data['error']['message']
-    # else:
-    #     response_content = response_data['choices'][0]['message']['content']
-    #     usage = response_data['usage']
-    # return response_content
-
-    # get response with stream
-    response = requests.post(base_url, headers=headers, json=data,stream=True)
-    response_content = ""
-    for line in response.iter_lines():
-        line = line.decode().strip()
-        if line == "data: [DONE]":
-            continue
-        elif line.startswith("data: "):
-            line = line[6:] # remove prefix "data: "
-            try:
-                data = json.loads(line)
-                if "delta" in data["choices"][0]:
-                    content = data["choices"][0]["delta"].get("content", "")
-                    response_content += content
-                    yield response_content
-            except json.JSONDecodeError:
-                print(f"Error decoding line: {line}")
-
-    print(response_content)
-    print('-----------------------------------\n')
-    response_data = {}
+#     # headers
+#     openai_api_key = os.environ.get('openai_api_key')
+#     base_url = os.environ.get('base_url')
+#     headers = {
+#       'Authorization': f'Bearer {openai_api_key}'
+#     }
+
+#     temperature = 0.7
+#     max_tokens = 2048
+
+#     init_message = [{"role": "system", "content": system_message}]
+#     messages = init_message + history_openai_format[-5:] #system message + latest 2 round dialogues + user input
+#     print(messages)
+#     # request body
+#     data = {
+#         'model': 'gpt-4o',  # we use gpt-4o here
+#         'messages': messages,
+#         'temperature':temperature, 
+#         'max_tokens':max_tokens,
+#         'stream':True,
+#         # 'stream_options':{"include_usage": True}, # retrieving token usage for stream response
+#     }
+
+#     # get response
+#     # response = requests.post(base_url, headers=headers, json=data)
+#     # response_data = response.json()
+#     # print(response_data)
+#     # print('-----------------------------------\n')
+#     # if 'error' in response_data:
+#     #     response_content = response_data['error']['message']
+#     # else:
+#     #     response_content = response_data['choices'][0]['message']['content']
+#     #     usage = response_data['usage']
+#     # return response_content
+
+#     # get response with stream
+#     response = requests.post(base_url, headers=headers, json=data,stream=True)
+#     response_content = ""
+#     for line in response.iter_lines():
+#         line = line.decode().strip()
+#         if line == "data: [DONE]":
+#             continue
+#         elif line.startswith("data: "):
+#             line = line[6:] # remove prefix "data: "
+#             try:
+#                 data = json.loads(line)
+#                 if "delta" in data["choices"][0]:
+#                     content = data["choices"][0]["delta"].get("content", "")
+#                     response_content += content
+#                     yield response_content
+#             except json.JSONDecodeError:
+#                 print(f"Error decoding line: {line}")
+
+#     print(response_content)
+#     print('-----------------------------------\n')
+#     response_data = {}
     
-    supabase_insert_message(user_message,response_content,messages,response_data,user_name,user_oauth_token,ip,sign,cookie_value,content_type)
+#     supabase_insert_message(user_message,response_content,messages,response_data,user_name,user_oauth_token,ip,sign,cookie_value,content_type)
     
 
+def get_completion(message,history):
+    return "**Important Announcement:**  \n\nThis space is shutting down now. \n\nVisit [chatgpt-4o](https://chatgpt-4o.streamlit.app/) for an improved UI experience and future enhancements."
 
 
 """