ripping out old db code and clean up

app.py

@@ -18,11 +18,6 @@ from datetime import datetime
 #from dotenv import load_dotenv
 
 max_image_entries_to_show = 5
-'''
-load_dotenv()
-openai_key = os.getenv("OPENAI_KEY")
-elevenlabs_key = os.getenv("ELEVENLABS_KEY")
-'''
 import os
 
 openai_key = os.getenv('OPENAI_KEY')
@@ -40,62 +35,7 @@ voice=Voice(
 
 current_theme = "Household Objects"
 
-counter = 0
-
-class Photo:
-    def __init__(self, name, image, theme, time_stamp):
-        self.name = name
-        self.image = image
-        self.theme = theme
-        self.time_stamp = time_stamp    
-
-class PhotoWithResults:
-    def __init__(self, name, image, theme, time_stamp, audio_url, style_score, theme_score, total_score, evaluation):
-        self.name = name
-        self.image = image
-        self.theme = theme
-        self.time_stamp = time_stamp
-        self.audio_url = audio_url
-        self.style_score = style_score
-        self.theme_score = theme_score
-        self.total_score = total_score
-        self.evaluation = evaluation
-
 gallery_images = []
-#gallery_images.append((id, image, name, theme, theme_score, style_score, evaluation, audio_filepath))
-
-def playmusic_thread():
-    # Load MP3 file as bytes
-    with open('jeopardy.mp3', 'rb') as f:
-        audio_data = f.read()
-    play(audio_data)
-
-def speak_thread(text):
-    """Function to run in the thread."""
-    audio = client.generate(
-        voice=voice,
-        text=text,
-        model="eleven_turbo_v2"
-    )
-    play(audio)
-
-def speak_and_save_thread(text, guid):
-    """Function to run in the thread."""
-    audio = client.generate(
-        voice=voice,
-        text=text,
-        model="eleven_turbo_v2"
-    )
-    play(audio)
-    save(audio, "audio/" + guid + ".mp3")
-
-def speak_and_save(text, audio_guid):
-    thread = threading.Thread(target=speak_and_save_thread, args=(text,audio_guid,))
-    thread.start()
-
-def speak(text):
-    thread = threading.Thread(target=speak_thread, args=(text,))
-    thread.start()
 
 def play_audio(audio_url):
     play(audio_url)
@@ -105,21 +45,6 @@ def playmusic():
     thread = threading.Thread(target=playmusic_thread, args=())
     thread.start()
 
-def get_theme():
-    print ("GETTING THEME")
-    response = requests.get("http://127.0.0.1:5000/theme")
-    theme_info = response.json()
-    print ("current theme: ", theme_info['theme'])
-    return theme_info['theme']
-
-def set_theme(new_theme):
-    #response = requests.post("http://127.0.0.1:5000/theme", json={"theme": new_theme})
-    #theme_info = response.json()
-    print ("new theme: ", new_theme)
-    global current_theme
-    current_theme = new_theme
-    return new_theme
-
 def submit_photo(name, base64_image, time_stamp, theme):
     import requests
 
@@ -223,11 +148,10 @@ def generate_theme():
     try:
         theme = output_json['theme']
         dialog = output_json['dialog']
-        speak(dialog)
+        # to do - put this into a audio button
+        #speak(dialog)
         print(f"dialog: {dialog}")
         print(f"theme: {theme}")
-        # Update theme on the server
-        #set_theme(theme)
         current_theme = theme
         return theme
     except KeyError as e:
@@ -253,56 +177,6 @@ def create_image_with_text(image_data, text):
     image.save(buffered, format="JPEG")
     return base64.b64encode(buffered.getvalue()).decode('utf-8')
 
-def get_photos_gallery_DB():
-    import requests
-    url = "http://127.0.0.1:5000/photos_with_results"
-    response = requests.get(url)
-    data = response.json()
-    gallery_images = []
-    for item in data:
-        image_data = base64.b64decode(item['image'])
-        image = Image.open(io.BytesIO(image_data))
-        id = item['id']
-        '''
-        # Create a URL for the audio file
-        audio_url = f"http://127.0.0.1:5000/audio/{item['audio_url']}.mp3"
-        caption = f"{item['theme']} by {item['name']} | Style: {item['style_score']} | Theme: {item['theme_score']} | {audio_url}"'''
-        evaluation = item['evaluation']
-        #score = f"Style: {item['style_score']} | Theme: {item['theme_score']} | Total: {item['total_score']}"
-        if item['style_score'] == None:
-            item['style_score'] = 0
-        if item['theme_score'] == None:
-            item['theme_score'] = 0
-        score = {"Theme Score": item['theme_score'] / 5.0, "Style Score": item['style_score'] / 5.0}
-        name = item['name']
-        theme = item['theme']
-        gallery_images.append((id, image, name, theme, evaluation, score))
-    print ("GALLERY IMAGES: ", gallery_images)
-    return gallery_images
-
-def get_photos_db():
-    import requests
-    url = "http://127.0.0.1:5000/photos"
-    response = requests.get(url)
-    data = response.json()
-    formatted_data = []
-    for item in data:
-        image_with_text = create_image_with_text(item['image'], f"{item['name']}, {item['total_score']}")
-        row = [
-
-            item['name'],
-            f"<img src='data:image/jpeg;base64,{image_with_text}' style='width:100%; height:100%;'/>"
-            #item['evaluation'],
-        ]
-        formatted_data.append(row)
-    return formatted_data
-
-def clear_photos_db():
-    import requests
-    url = "http://127.0.0.1:5000/clear"
-    response = requests.post(url)
-    return response.json()
-
 def encode_image(image):
     if image.mode != 'RGB':
         image = image.convert('RGB')
@@ -310,38 +184,25 @@ def encode_image(image):
     image.save(buffered, format="JPEG")
     return base64.b64encode(buffered.getvalue()).decode('utf-8')
 
-def process_image(id, image, name, theme):
+def process_image(image, name):
     global gallery_images
-    print ("PROCESSING IMAGE", name, theme, image)
+    global current_theme
+
+    if name == "":
+        return "Please enter a name."
+    
+    if image is None:
+        return "Please upload an image."
+    
+    print ("PROCESSING IMAGE", name, current_theme, image)
     audio_guid = str(uuid.uuid4())
     print ("Image: ", image)
     #base64_image = encode_image(image)
-    evaluation, theme_score, style_score = describe_image(image, name, theme)  # Updated to unpack three values
-    total_score = theme_score + style_score  # Calculate total score
-    #submit_photo_with_results(name, base64_image, datetime.now().isoformat(), audio_guid, theme, style_score, theme_score, 
-    #total_score, evaluation)
-    #submit_updated_results(id, name, style_score, theme_score, total_score, evaluation)
+    evaluation, theme_score, style_score = describe_image(image, name, current_theme)  # Updated to unpack three values
     audio_filepath = gen_tts_and_save_to_path(evaluation, audio_guid)
-    #gallery_images.append((id, image, name, theme, theme_score, style_score, evaluation, audio_filepath))
     # put at top of list
-    gallery_images.insert(0, (id, image, name, theme, theme_score, style_score, evaluation, audio_filepath))
-    return evaluation
-
-def submit_updated_results_db(photo_id, name, style_score, theme_score, total_score, evaluation):
-    url = "http://127.0.0.1:5000/update_photo/" + str(photo_id)
-    response = requests.post(url, json={
-        "name": name,
-        "style_score": style_score,
-        "theme_score": theme_score,
-        "total_score": total_score,
-        "evaluation": evaluation
-    })
-    return response.json()
-
-def add_image_to_db(image, name, theme):
-    base64_image = encode_image(image)
-    theme = get_theme()
-    submit_photo(name, base64_image, datetime.now().isoformat(), theme)
+    gallery_images.insert(0, (image, name, current_theme, theme_score, style_score, evaluation, audio_filepath))
+    return "Your entry has been judged!  Learn how you scored in the Judging Panel."
 
 def describe_image(image_array, name, theme):
     base64_image = encode_image(image_array)
@@ -425,56 +286,36 @@ def clear_gallery():
     gallery_images = []
     return update_gallery()
 
-def update_gallery(initial=False):
+def update_gallery():
     global gallery_images
     gallery_items = []
     for i in range(max_image_entries_to_show):
-        # This assumes gallery_images is a list of tuples (image, audio_url)
-        #create_image_button(image, audio_url)
-        #print ("IMAGE: ", image)
-        #print ("AUDIO URL: ", audio_url)
-        #image_input = gr.Image(image, label="Photo", type="pil")
-        #name_input = gr.Textbox(label="Player Name", interactive=False)
-    
-        #gr.Audio(value=audio_url, label="Audio", type="filepath", show_label=False)
-        print ("GALLERY IMAGES: ", gallery_images)
         if (i < len(gallery_images)):
-            print ("GALLERY IMAGE: ", gallery_images[i])
-            (id, image, name, theme, theme_score, style_score, evaluation, audio_filepath ) = gallery_images[i]
-            print ("evaluation: ", evaluation)
-            print ("ID", id)
-            print ("audio_filepath: ", audio_filepath)
-            id_output = gr.Textbox(label="ID", interactive=False, value=id, visible=False)
+            print ("loading image: ", i)
+            (image, name, theme, theme_score, style_score, evaluation, audio_filepath ) = gallery_images[i]
             name_output = gr.Textbox(label="Player", interactive=False, value=name, visible=True)
             theme_output = gr.Textbox(label="Theme", interactive=False, value=theme, visible=True)
-            judge_button = gr.Button("Judge Image", visible=True)
             image_output = gr.Image(image, label="Photo", type="pil", visible=True)
             description_output = gr.Label(label="Image Description", value =evaluation, visible=True)
             audio_filepath = gr.Audio(audio_filepath, visible=True)
             score_output = gr.Label(label="Scores", value = theme_score + style_score, visible=True)
 
         else:
-            id_output = gr.Textbox(label="ID", interactive=False, value="", visible=False)
             name_output = gr.Textbox(label="Player", interactive=False, value="", visible=False)
             theme_output = gr.Textbox(label="Theme", interactive=False, value="", visible=False)
-            judge_button = gr.Button("Judge Image", visible=False)
             image_output = gr.Image(label="Photo", type="pil", visible=False)
             description_output = gr.Label(label="Image Description", visible=False)
             audio_filepath = gr.Audio(visible=False)
             score_output = gr.Label(label="Scores", visible=False)
 
         
-        gallery_items.append(id_output)
         gallery_items.append(name_output)
         gallery_items.append(theme_output)
         gallery_items.append(image_output)
-        gallery_items.append(judge_button)
         gallery_items.append(description_output)
         gallery_items.append(audio_filepath)
         gallery_items.append(score_output)
 
-        if (initial):
-            judge_button.click(fn=process_image, inputs=[id_output, image_output, name_output, theme_output], outputs=[description_output])
     return gallery_items
 
 def gen_tts_and_save_to_path(text, filename):
@@ -489,29 +330,11 @@ def gen_tts_and_save_to_path(text, filename):
 
     save(audio, full_path)
     return full_path
-
-def save_test_audio(text_box):
-    print ("SAVING TEST AUDIO: ", text_box)
-    audio = client.generate(
-        voice=voice,
-        text=text_box,
-        model="eleven_turbo_v2"
-    )
-    audio_path = "audio/" + text_box.replace(" ", "_") + ".mp3"
-    # make sure the audio directory exists
-    os.makedirs(os.path.dirname(audio_path), exist_ok=True)
-    save(audio, audio_path)
-    return audio_path
-
-def get_current_theme():
-    global current_theme
-    print ("GETTING CURRENT THEME: " + current_theme)
-    return current_theme
             
 def set_theme(input):
     global current_theme
     current_theme = input
-    print ("CURRENT THEME: ", current_theme)
+    print ("changed theme: ", current_theme)
     return current_theme
 
 def game_start():
@@ -519,44 +342,31 @@ def game_start():
     return current_theme
 
 with gr.Blocks() as demo:                
-    with gr.Tab("Gallery"):
+    with gr.Tab("Photo Submission"):
         with gr.Row():
-           
-            
-            print ("CURRENT THEME: ", get_current_theme())
-            current_theme_textbox = gr.Textbox(label="Current Theme", interactive=True, value=current_theme)
-            new_theme_input = gr.Textbox(label="New Theme")
-            update_theme_button = gr.Button("Update Theme")
-            refresh_theme_button = gr.Button("Refresh Theme")
+            name_input = gr.Textbox(label="Player Name")
+            theme_reminder = gr.Textbox(current_theme, label="Current Theme")
+        with gr.Row():
+            with gr.Column():
+                image_input = gr.Image(type="pil", label="Upload Image")
+                judge_button = gr.Button("Judge Image")
+                process_image_output = gr.Textbox(label="Judging Feedback", interactive=False)
+                #score_output = gr.Label(label="Scores")
+                judge_button.click(fn=process_image, inputs=[image_input, name_input], outputs=[process_image_output])
+          
+    with gr.Tab("Judging Panel"):
+        with gr.Row(): 
+            theme_textbox = gr.Textbox(label="Change Theme", interactive=True, value=current_theme)
             generate_theme_button = gr.Button("Generate Theme")
 
-            #when current theme is updated, update the theme on the server
-            #current_theme.update(set_theme, inputs=new_theme_input, outputs=current_theme)
-            current_theme_textbox.submit(set_theme, inputs=current_theme_textbox, outputs=current_theme_textbox)
-
             generate_theme_button.click(
                 fn=generate_theme,
                 inputs=None,
-                outputs=current_theme_textbox
+                outputs=theme_textbox
             )
-
-            update_theme_button.click(
-                fn=set_theme,
-                inputs=new_theme_input,
-                outputs=current_theme_textbox
-            )
-
-            '''
-            refresh_theme_button.click(
-                fn=get_theme,
-                inputs=[],
-                outputs=current_theme_textbox
-            )
-            '''
-
         
         refresh_button = gr.Button("Refresh Gallery")
-        gallery_items = update_gallery(initial=True)
+        gallery_items = update_gallery()
         
         # Use the function and connect outputs properly
         refresh_button.click(
@@ -565,29 +375,20 @@ with gr.Blocks() as demo:
             outputs=gallery_items
         )
 
-    with gr.Tab("Phone"):
-        with gr.Row():
-            name_input = gr.Textbox(label="Player Name")
-            id_input = gr.Textbox(label="ID", visible=True)
-        with gr.Row():
-            with gr.Column():
-                image_input = gr.Image(type="pil", label="Upload Image")
-                judge_button = gr.Button("Judge Image")
-                description_output = gr.Textbox(label="Image Description", interactive=False)
-                #score_output = gr.Label(label="Scores")
-                judge_button.click(fn=process_image, inputs=[id_input, image_input, name_input, current_theme_textbox], outputs=[description_output])
-                
+          
     with gr.Tab("Dev"):
         with gr.Column():
             clear_button = gr.Button("Clear Gallery")
-    with gr.Tab("Test"):
-        begin_game_button = gr.Button("Begin Game")
-        bg_music = gr.Audio(label="Background Music", autoplay=True)                
-        def playmusic():
-            return "jeopardy.mp3"
-        begin_game_button.click(playmusic, inputs=None, outputs=bg_music)
-        clear_button.click(clear_gallery, inputs=[], outputs=gallery_items)
-    demo.load(game_start, inputs=None, outputs=[current_theme_textbox])
+
+            begin_game_button = gr.Button("Begin Game")
+            bg_music = gr.Audio(label="Background Music", autoplay=True)                
+            def playmusic():
+                return "jeopardy.mp3"
+            begin_game_button.click(playmusic, inputs=None, outputs=bg_music)
+            
+    clear_button.click(clear_gallery, inputs=[], outputs=gallery_items)
+    theme_textbox.change(set_theme, inputs=theme_textbox, outputs=theme_reminder)
+    demo.load(game_start, inputs=None, outputs=[theme_textbox])
     demo.load(update_gallery,
             inputs=[],
             outputs=gallery_items