Update stable branch

.gitignore

@@ -1,2 +1,4 @@
 .env
-env/
+env/
+.python-version
+Google-AI-Playground/

Tabs/Gemini_Chabot_Stable.py

@@ -6,7 +6,7 @@ from dotenv import load_dotenv
 load_dotenv()
 
 GEMINI_API_KEY = os.getenv("GEMINI_API_KEY")
-model_name = "gemini-1.5-flash-exp-0827"
+# model_name = "gemini-1.5-flash-exp-0827"
 
 TITLE = """<h1 align="center">🎮Chat with Gemini 1.5🔥</h1>"""
 NOTICE = """
@@ -15,10 +15,10 @@ NOTICE = """
 - Some features may not work as expected
 """
 ABOUT = """
-**Updates (2024-8-28)** 📈: Upgrade model to SOTA Gemini 1.5 Flash Experimental 0827
+**Updates (2024-9-25)** 📈: Upgrade model to SOTA Gemini 1.5 Flash Experimental 0924
 
 **Info** 📄:
-- Model: Gemini 1.5 Flash Experimental 0827
+- Model: Gemini 1.5 Flash Experimental 0924 and other Gemini models
 - Chat with Gemini 1.5 Flash model with images and documents
 """
 ERRORS = """
@@ -26,40 +26,99 @@ Known errors ⚠️:
 """
 FUTURE_IMPLEMENTATIONS = """
 Future features 🚀:
-- Select other Gemini / Gemma models
 - More tools such as web search
 """
 
+# genai.configure(api_key=GEMINI_API_KEY)
+# model = genai.GenerativeModel(
+#     model_name,
+#     safety_settings=[
+#         {
+#             "category": "HARM_CATEGORY_HARASSMENT",
+#             "threshold": "BLOCK_NONE"
+#         },
+#         {
+#             "category": "HARM_CATEGORY_HATE_SPEECH",
+#             "threshold": "BLOCK_NONE"
+#         },
+#         {
+#             "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+#             "threshold": "BLOCK_NONE"
+#         },
+#         {
+#             "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
+#             "threshold": "BLOCK_NONE"
+#         }
+#     ],
+#     generation_config={
+#         "temperature": 1,
+#         "top_p": 0.95,
+#         "top_k": 64,
+#         "max_output_tokens": 8192,
+#         "response_mime_type": "text/plain",
+#     }
+# )
+# chat = model.start_chat(history=[])
+
+# def clear_chat_history():
+#     chat.history = []
+    
+# def undo_chat():
+#     last_send, last_received = chat.rewind()
+
+# def transform_history(history):
+#     new_history = []
+#     for user_msg, model_msg in history:
+#         new_history.append({"role": "user", "parts": [user_msg]})
+#         new_history.append({"role": "model", "parts": [model_msg]})
+#     return new_history
+
+# def chatbot_stable(message, history):
+#     message_text = message["text"]
+#     message_files = message["files"]
+#     if message_files:
+#         image_uris = [genai.upload_file(path=file_path["path"]) for file_path in message_files]
+#         message_content = [message_text] + image_uris
+#     else:
+#         message_content = [message_text]
+
+#     response = chat.send_message(message_content, stream=True)
+#     response.resolve()
+
+#     return response.text
+
+# gemini_chatbot_interface = gr.Chatbot(
+#     height=400,
+#     likeable=True,
+#     avatar_images=(
+#         None,
+#         "https://media.roboflow.com/spaces/gemini-icon.png"
+#     ),
+#     show_copy_button=True,
+#     show_share_button=True,
+#     render_markdown=True
+# )
+
+# clear_chat_button = gr.ClearButton(
+#     components=[gemini_chatbot_interface],
+#     value="🗑️ Clear"
+# )
+
+# undo_chat_button = gr.Button(
+#     value="↩️ Undo"
+# )
+
+# gemini_chatbot = gr.ChatInterface(
+#     fn=chatbot_stable,
+#     chatbot=gemini_chatbot_interface,
+#     multimodal=True,
+#     clear_btn=clear_chat_button,
+#     undo_btn=undo_chat_button
+# )
+
+model_list = ["gemini-1.5-pro", "gemini-1.5-pro-002", "gemini-1.5-pro-exp-0827", "gemini-1.5-flash", "gemini-1.5-flash-002", "gemini-1.5-flash-8b-exp-0924"]
+
 genai.configure(api_key=GEMINI_API_KEY)
-model = genai.GenerativeModel(
-    model_name,
-    safety_settings=[
-        {
-            "category": "HARM_CATEGORY_HARASSMENT",
-            "threshold": "BLOCK_NONE"
-        },
-        {
-            "category": "HARM_CATEGORY_HATE_SPEECH",
-            "threshold": "BLOCK_NONE"
-        },
-        {
-            "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-            "threshold": "BLOCK_NONE"
-        },
-        {
-            "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-            "threshold": "BLOCK_NONE"
-        }
-    ],
-    generation_config={
-        "temperature": 1,
-        "top_p": 0.95,
-        "top_k": 64,
-        "max_output_tokens": 8192,
-        "response_mime_type": "text/plain",
-    }
-)
-chat = model.start_chat(history=[])
 
 def clear_chat_history():
     chat.history = []
@@ -74,7 +133,38 @@ def transform_history(history):
         new_history.append({"role": "model", "parts": [model_msg]})
     return new_history
 
-def chatbot_stable(message, history):
+def chatbot_stable(message, history, model_id, system_message, max_tokens, temperature, top_p,):
+    global model, chat
+    model = genai.GenerativeModel(
+        model_name=model_id,
+        system_instruction=system_message,
+        safety_settings=[
+            {
+                "category": "HARM_CATEGORY_HARASSMENT",
+                "threshold": "BLOCK_NONE"
+            },
+            {
+                "category": "HARM_CATEGORY_HATE_SPEECH",
+                "threshold": "BLOCK_NONE"
+            },
+            {
+                "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+                "threshold": "BLOCK_NONE"
+            },
+            {
+                "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
+                "threshold": "BLOCK_NONE"
+            }
+        ],
+        generation_config={
+            "temperature": temperature,
+            "top_p": top_p,
+            "top_k": 64,
+            "max_output_tokens": max_tokens,
+            "response_mime_type": "text/plain",
+        }
+    )
+    chat = model.start_chat(history=[])
     message_text = message["text"]
     message_files = message["files"]
     if message_files:
@@ -89,7 +179,7 @@ def chatbot_stable(message, history):
     return response.text
 
 gemini_chatbot_interface = gr.Chatbot(
-    height=400,
+    height=500,
     likeable=True,
     avatar_images=(
         None,
@@ -114,5 +204,22 @@ gemini_chatbot = gr.ChatInterface(
     chatbot=gemini_chatbot_interface,
     multimodal=True,
     clear_btn=clear_chat_button,
-    undo_btn=undo_chat_button
+    undo_btn=undo_chat_button,
+    additional_inputs=[
+        gr.Dropdown(
+            choices=model_list,
+            value="gemini-1.5-flash-002",
+            label="Models"
+        ),
+        gr.Textbox(value="You are a friendly Chatbot.", label="System message"),
+        gr.Slider(minimum=1, maximum=8192, value=4096, step=1, label="Max new tokens"),
+        gr.Slider(minimum=0.1, maximum=1.0, value=1, step=0.1, label="Temperature"),
+        gr.Slider(
+            minimum=0.1,
+            maximum=1.0,
+            value=0.95,
+            step=0.05,
+            label="Top-p (nucleus sampling)",
+        ),
+    ],
 )

Tabs/Gemini_Chatbot_Preview.py

@@ -6,7 +6,7 @@ from dotenv import load_dotenv
 load_dotenv()
 
 GEMINI_API_KEY_PREVIEW = os.getenv("GEMINI_API_KEY_PREVIEW")
-model_list = ["gemini-1.5-pro", "gemini-1.5-pro-exp-0801", "gemini-1.5-pro-exp-0827", "gemini-1.5-flash", "gemini-1.5-flash-exp-0827", "gemini-1.5-flash-8b-exp-0827"]
+model_list = ["gemini-1.5-pro", "gemini-1.5-pro-002", "gemini-1.5-pro-exp-0827", "gemini-1.5-flash", "gemini-1.5-flash-002", "gemini-1.5-flash-8b-exp-0924"]
 
 genai.configure(api_key=GEMINI_API_KEY_PREVIEW)
 

Tabs/Gemma_Chatbot.py

@@ -1,82 +0,0 @@
-import gradio as gr
-from huggingface_hub import InferenceClient
-import os
-from dotenv import load_dotenv
-
-load_dotenv()
-HF_TOKEN = os.getenv("HF_TOKEN")
-
-model_list = ["google/gemma-2-2b-it", "google/gemma-2-9b-it", "google/gemma-2-27b-it"]
-
-def respond(
-    message,
-    history: list[tuple[str, str]],
-    model_id,
-    system_message,
-    max_tokens,
-    temperature,
-    top_p,
-):
-    client = InferenceClient(
-        model_id,
-        token=HF_TOKEN,
-    )
-    messages = [{"role": "system", "content": system_message}]
-
-    for val in history:
-        if val[0]:
-            messages.append({"role": "user", "content": val[0]})
-        if val[1]:
-            messages.append({"role": "assistant", "content": val[1]})
-
-    messages.append({"role": "user", "content": message})
-
-    response = ""
-
-    for message in client.chat_completion(
-        messages,
-        max_tokens=max_tokens,
-        stream=True,
-        temperature=temperature,
-        top_p=top_p,
-    ):
-        token = message.choices[0].delta.content
-
-        response += token
-        yield response
-
-gemma_chatbot = gr.ChatInterface(
-    respond,
-    additional_inputs=[
-        gr.Dropdown(
-            choices=model_list,
-            label="Model",
-            value="google/gemma-2-27b-it",
-        ),
-        gr.Textbox(
-            value="You are a friendly Chatbot.",
-            label="System message"
-        ),
-        gr.Slider(
-            minimum=1,
-            maximum=4096,
-            value=512,
-            step=1,
-            label="Max new tokens"
-        ),
-        gr.Slider(
-            minimum=0.1,
-            maximum=4.0,
-            value=0.7,
-            step=0.1,
-            label="Temperature"
-        ),
-        gr.Slider(
-            minimum=0.1,
-            maximum=1.0,
-            value=0.95,
-            step=0.05,
-            label="Top-p (nucleus sampling)",
-        ),
-    ],
-)

app.py

@@ -1,7 +1,6 @@
 import gradio as gr
 from Tabs.Gemini_Chabot_Stable import gemini_chatbot, clear_chat_button, undo_chat_button, clear_chat_history, undo_chat, TITLE, NOTICE, ERRORS, FUTURE_IMPLEMENTATIONS, ABOUT
 from Tabs.Gemini_Chatbot_Preview import gemini_chatbot_preview, clear_chat_button_preview, undo_chat_button_preview, clear_chat_history_preview, undo_chat_preview
-from Tabs.Gemma_Chatbot import gemma_chatbot
 
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.HTML("""<h3 align="center">I strongly recommond duplicate this space for intensive uses!!!</h3>""")
@@ -23,16 +22,14 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     # ============================== Stable - END ==============================
     # ============================== Nightly - START ==============================
     with gr.Tab("Chat with Gemini 1.5 - Preview"):
-        gemini_chatbot_preview.render()
-        clear_chat_button_preview.click(
-            fn=clear_chat_history_preview
-        )
-        undo_chat_button_preview.click(
-            fn=undo_chat_preview
-        )
+        # gemini_chatbot_preview.render()
+        # clear_chat_button_preview.click(
+        #     fn=clear_chat_history_preview
+        # )
+        # undo_chat_button_preview.click(
+        #     fn=undo_chat_preview
+        # )
+        gr.HTML("<h1 align='center'>🚧 Work in progress 🚧</h1>")
     # ============================== Nightly - END ==============================
-    with gr.Tab("Chat with Gemma 2"):
-        # gemma_chatbot.render()
-        gr.HTML("""<h3 align="center">This feature is under development. Please check back later.</h3>""")
 
 demo.queue().launch(debug=True, show_error=True)