Refactor Proto Assist accordion to absorb mess

app.py

@@ -237,7 +237,7 @@ def create_story(timeline):
             story.append(f"The player interacted with {entry[2]}.")
     return " ".join(story)
 
-def generate_story_and_timeline(no_ui_timeline_points=10): # , no_media_timeline_points=5, include_media=True):
+def generate_story_and_timeline(no_ui_timeline_points=10, num_lists=1, items_per_list=1, include_existing_games=False, include_multiplayer=False): # , no_media_timeline_points=5, include_media=True):
     # Pick 10 random UI items
     random_ui_items = pick_random_items(player_engagement_items, no_ui_timeline_points)
 
@@ -271,9 +271,12 @@ def generate_story_and_timeline(no_ui_timeline_points=10): # , no_media_timeline
     formatted_timeline = "\n".join([f"{entry[0]}: {entry[1]} - {entry[2]}" for entry in merged_timeline])
     # no_media_formatted_timeline = "\n".join([f"{entry[0]}: {entry[1]} - {entry[2]}" for entry in no_media_merged_timeline])
 
-    game_structure_with_media = generate_game_structures(formatted_timeline) #, game_structure_without_media = generate_game_structures(formatted_timeline, no_media_formatted_timeline)
+    # game_structure_with_media = generate_game_structures(formatted_timeline) #, game_structure_without_media = generate_game_structures(formatted_timeline, no_media_formatted_timeline)
+    game_structure_with_media =  convert_timeline_to_game_structure(formatted_timeline)
 
-    return formatted_timeline, story, json.dumps(game_structure_with_media, indent=2) #no_media_formatted_timeline, json.dumps(game_structure_without_media, indent=2) #, game_structure_with_media
+    suggestions, selected_list_names = timeline_get_random_suggestions(num_lists, items_per_list, include_existing_games, include_multiplayer)
+
+    return formatted_timeline, story, json.dumps(game_structure_with_media, indent=2), suggestions, selected_list_names #no_media_formatted_timeline, json.dumps(game_structure_without_media, indent=2) #, game_structure_with_media
 
 media_file_types = ["image", "video", "audio"]
 
@@ -450,13 +453,55 @@ def convert_timeline_to_game_structure(timeline):
     
     return wrapped_structure
     
-def generate_game_structures(timeline_with_media): #, timeline_without_media):
+# def generate_game_structures(timeline_with_media): #, timeline_without_media):
     
-    game_structure_with_media = convert_timeline_to_game_structure(timeline_with_media)
-    #game_structure_without_media = convert_timeline_to_game_structure(timeline_without_media)
+#     game_structure_with_media = convert_timeline_to_game_structure(timeline_with_media)
+#     #game_structure_without_media = convert_timeline_to_game_structure(timeline_without_media)
     
-    return game_structure_with_media #, game_structure_without_media
+#     return game_structure_with_media #, game_structure_without_media
+
 
+# def timeline_get_random_suggestions(num_lists, items_per_list):
+#     """
+#     Generate random suggestions from a specified number of lists.
+    
+#     :param num_lists: Number of lists to consider
+#     :param items_per_list: Number of items to select from each list
+#     :return: A list of randomly selected suggestions
+#     """
+#     selected_lists = random.sample(all_idea_lists, min(num_lists, len(all_idea_lists)))
+#     suggestions = []
+    
+#     for lst in selected_lists:
+#         suggestions.extend(random.sample(lst, min(items_per_list, len(lst))))
+    
+#     return suggestions
+
+def timeline_get_random_suggestions(num_lists, items_per_list, include_existing_games, include_multiplayer):
+    """
+    Generate random suggestions from a specified number of lists.
+    
+    :param num_lists: Number of lists to consider
+    :param items_per_list: Number of items to select from each list
+    :param include_existing_games: Whether to include existing game inspiration lists
+    :param include_multiplayer: Whether to include multiplayer features list
+    :return: A tuple containing the list of randomly selected suggestions and the names of selected lists
+    """
+    available_lists = all_idea_lists.copy()
+    if not include_existing_games:
+        available_lists = [lst for lst in available_lists if lst not in existing_game_inspirations]
+    if not include_multiplayer:
+        available_lists = [lst for lst in available_lists if lst != multiplayer_features]
+    
+    selected_lists = random.sample(available_lists, min(num_lists, len(available_lists)))
+    suggestions = []
+    selected_list_names = []
+    
+    for lst in selected_lists:
+        suggestions.extend(random.sample(lst, min(items_per_list, len(lst))))
+        selected_list_names.append(list_names[all_idea_lists.index(lst)])
+    
+    return suggestions, selected_list_names
 
 #-----------------------------------------------------------------------------------------------------------------------------------
 
@@ -703,48 +748,6 @@ def refresh_file_explorer():
 
 #-----------------------------------------------------------------------------------------------------------------------------------
 
-# def timeline_get_random_suggestions(num_lists, items_per_list):
-#     """
-#     Generate random suggestions from a specified number of lists.
-    
-#     :param num_lists: Number of lists to consider
-#     :param items_per_list: Number of items to select from each list
-#     :return: A list of randomly selected suggestions
-#     """
-#     selected_lists = random.sample(all_idea_lists, min(num_lists, len(all_idea_lists)))
-#     suggestions = []
-    
-#     for lst in selected_lists:
-#         suggestions.extend(random.sample(lst, min(items_per_list, len(lst))))
-    
-#     return suggestions
-
-def timeline_get_random_suggestions(num_lists, items_per_list, include_existing_games, include_multiplayer):
-    """
-    Generate random suggestions from a specified number of lists.
-    
-    :param num_lists: Number of lists to consider
-    :param items_per_list: Number of items to select from each list
-    :param include_existing_games: Whether to include existing game inspiration lists
-    :param include_multiplayer: Whether to include multiplayer features list
-    :return: A tuple containing the list of randomly selected suggestions and the names of selected lists
-    """
-    available_lists = all_idea_lists.copy()
-    if not include_existing_games:
-        available_lists = [lst for lst in available_lists if lst not in existing_game_inspirations]
-    if not include_multiplayer:
-        available_lists = [lst for lst in available_lists if lst != multiplayer_features]
-    
-    selected_lists = random.sample(available_lists, min(num_lists, len(available_lists)))
-    suggestions = []
-    selected_list_names = []
-    
-    for lst in selected_lists:
-        suggestions.extend(random.sample(lst, min(items_per_list, len(lst))))
-        selected_list_names.append(list_names[all_idea_lists.index(lst)])
-    
-    return suggestions, selected_list_names
-
 #-----------------------------------------------------------------------------------------------------------------------------------
 
 with gr.Blocks() as demo:
@@ -774,28 +777,27 @@ with gr.Blocks() as demo:
                         timeline_output_text = gr.Textbox(label="Random Suggestions", lines=10)
                         timeline_selected_lists_text = gr.Textbox(label="Selected Lists", lines=2)
                     story_output = gr.Textbox(label="Generated Story (Order might be different for now)", lines=20)
-            with gr.Row():
-                generate_no_ui_timeline_points = gr.Slider(minimum=1, value=10, step=1, maximum=30, label="Choose the amount of ui timeline points")
-                generate_no_media_timeline_points = gr.Slider(minimum=1, value=5, step=1, maximum=30, label="Choose the amount of media timeline points")
-                generate_with_media_check = gr.Checkbox(label="Generate with media", value=True)
-            with gr.Row():
-                timeline_num_lists_slider = gr.Slider(minimum=1, maximum=len(all_idea_lists), step=1, label="Number of Lists to Consider", value=3)
-                timeline_items_per_list_slider = gr.Slider(minimum=1, maximum=10, step=1, label="Items per List", value=3)
-                timeline_include_existing_games = gr.Checkbox(label="Include Existing Game Inspirations", value=True)
-                timeline_include_multiplayer = gr.Checkbox(label="Include Multiplayer Features", value=True)
-            generate_button = gr.Button("Generate Story and Timeline (Click to get UI that will assist with JSON formatting)")
-
-            @gr.render(inputs=game_structure_output_text_with_media)
-            def update(game_structure_output_text_with_media):
-                return show_elements_json_input(game_structure_output_text_with_media)
-            
-            generate_button.click(generate_story_and_timeline, inputs=[generate_no_ui_timeline_points], outputs=[timeline_output_with_assets, story_output, game_structure_output_text_with_media]) #, generate_no_media_timeline_points, generate_with_media_check], outputs=[timeline_output_with_assets, timeline_output, story_output, game_structure_output_text_with_media, game_structure_output_text])
-        
-            timeline_generate_button = gr.Button("Generate Random Suggestions").click(
-                timeline_get_random_suggestions,
-                inputs=[timeline_num_lists_slider, timeline_items_per_list_slider, timeline_include_existing_games, timeline_include_multiplayer],
-                outputs=[timeline_output_text, timeline_selected_lists_text]
-            )
+                with gr.Row():
+                    generate_no_ui_timeline_points = gr.Slider(minimum=1, value=10, step=1, maximum=30, label="Choose the amount of ui timeline points")
+                    #generate_no_media_timeline_points = gr.Slider(minimum=1, value=5, step=1, maximum=30, label="Choose the amount of media timeline points")
+                    #generate_with_media_check = gr.Checkbox(label="Generate with media", value=True)
+                with gr.Row():
+                    timeline_num_lists_slider = gr.Slider(minimum=1, maximum=len(all_idea_lists), step=1, label="Number of Lists to Consider", value=3)
+                    timeline_items_per_list_slider = gr.Slider(minimum=1, maximum=10, step=1, label="Items per List", value=3)
+                    timeline_include_existing_games = gr.Checkbox(label="Include Existing Game Inspirations", value=True)
+                    timeline_include_multiplayer = gr.Checkbox(label="Include Multiplayer Features", value=True)
+                timeline_generate_button = gr.Button("Generate Random Suggestions").click(
+                    timeline_get_random_suggestions,
+                    inputs=[timeline_num_lists_slider, timeline_items_per_list_slider, timeline_include_existing_games, timeline_include_multiplayer],
+                    outputs=[timeline_output_text, timeline_selected_lists_text]
+                )
+                generate_button = gr.Button("Generate Story and Timeline (Click to get UI that will assist with JSON formatting)")
+
+                @gr.render(inputs=game_structure_output_text_with_media)
+                def update(game_structure_output_text_with_media):
+                    return show_elements_json_input(game_structure_output_text_with_media)
+                
+                generate_button.click(generate_story_and_timeline, inputs=[generate_no_ui_timeline_points, timeline_num_lists_slider, timeline_items_per_list_slider, timeline_include_existing_games, timeline_include_multiplayer], outputs=[timeline_output_with_assets, story_output, game_structure_output_text_with_media, timeline_output_text, timeline_selected_lists_text]) #, generate_no_media_timeline_points, generate_with_media_check], outputs=[timeline_output_with_assets, timeline_output, story_output, game_structure_output_text_with_media, game_structure_output_text])
 
         with gr.Accordion("Prompt Engineering as basis for ideation process", open=False):
             gr.HTML("Current Assited workflow idea - Story timeline events suggestions (LLM / Premade List) | Merging events with premade mermaid structures (LLM + Story Text + Mermaid Text) | Edit mermaid till satisfied (LLM + Story Text) | Ask LLM to convert to config (LLM + JSON Text) | Edit config (LLM / User with format assistance or not) | Playtest and go back to mermaaid or config if there are problems")