Merge game and edit interfaces

app.py

@@ -713,19 +713,17 @@ with gr.Blocks() as demo:
                         def update(text):
                             return show_elements(text)
                     with gr.Accordion("Proto Config Assist"):
-                        gr.Markdown("Editing placeholder")
                         with gr.Accordion("Can copy in the Test Example State Machine tab - only linear path for now", open=False):
                             gr.Markdown("# Story and Timeline Generator")
                             gr.Markdown("Click the button to generate a random timeline and story based on UI elements and story events. <br>Ask an LLM to use this to write a story around")
-                            with gr.Accordion("JSON with no edits"):
-                                with gr.Row():
-                                    timeline_output_with_assets = gr.Textbox(label="Timeline with Assets Considered", lines=20)
-                                    timeline_output = gr.Textbox(label="Timeline (Order might be different for now)", lines=20)
-                                    story_output = gr.Textbox(label="Generated Story (Order might be different for now)", lines=20)
-                                with gr.Row():
+                            with gr.Row():
                                     game_structure_output_text_with_media = gr.Code(language="json")
                                     game_structure_output_text = gr.Code(language="json")
-
+                        with gr.Accordion("JSON with no edits"):
+                            with gr.Row():
+                                timeline_output_with_assets = gr.Textbox(label="Timeline with Assets Considered", lines=20)
+                                timeline_output = gr.Textbox(label="Timeline (Order might be different for now)", lines=20)
+                                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")
@@ -876,18 +874,17 @@ with gr.Blocks() as demo:
                     #     def update(text):
                     #         return show_elements(text)
                     with gr.Accordion("Proto Config Assist"):
-                        gr.Markdown("Editing placeholder")
                         with gr.Accordion("Can copy in the Test Example State Machine tab - only linear path for now", open=False):
                             gr.Markdown("# Story and Timeline Generator")
                             gr.Markdown("Click the button to generate a random timeline and story based on UI elements and story events. <br>Ask an LLM to use this to write a story around")
-                            with gr.Accordion("JSON with no edits"):
-                                with gr.Row():
-                                    ewptimeline_output_with_assets = gr.Textbox(label="Timeline with Assets Considered", lines=20)
-                                    ewptimeline_output = gr.Textbox(label="Timeline (Order might be different for now)", lines=20)
-                                    ewpstory_output = gr.Textbox(label="Generated Story (Order might be different for now)", lines=20)
-                                with gr.Row():
-                                    ewpgame_structure_output_text_with_media = gr.Code(language="json")
-                                    ewpgame_structure_output_text = gr.Code(language="json")
+                            with gr.Row():
+                                ewpgame_structure_output_text_with_media = gr.Code(language="json")
+                                ewpgame_structure_output_text = gr.Code(language="json")
+                        with gr.Accordion("JSON with no edits"):
+                            with gr.Row():
+                                ewptimeline_output_with_assets = gr.Textbox(label="Timeline with Assets Considered", lines=20)
+                                ewptimeline_output = gr.Textbox(label="Timeline (Order might be different for now)", lines=20)
+                                ewpstory_output = gr.Textbox(label="Generated Story (Order might be different for now)", lines=20)
 
                         with gr.Row():
                             ewpgenerate_no_ui_timeline_points = gr.Slider(minimum=1, value=10, step=1, maximum=30, label="Choose the amount of ui timeline points")
@@ -895,11 +892,11 @@ with gr.Blocks() as demo:
                             ewpgenerate_with_media_check = gr.Checkbox(label="Generate with media", value=True)
                         ewpgenerate_button = gr.Button("Generate Story and Timeline")
 
-                        @gr.render(inputs=ewpgame_structure_output_text_with_media)
-                        def update(ewpgame_structure_output_text_with_media):
-                            return show_elements_json_input(ewpgame_structure_output_text_with_media)
+                        @gr.render(inputs=ewpwacustom_config) #ewpgame_structure_output_text_with_media
+                        def update(ewpwacustom_config):
+                            return show_elements_json_input(ewpwacustom_config)
                         
-                        ewpgenerate_button.click(generate_story_and_timeline, inputs=[ewpgenerate_no_ui_timeline_points, ewpgenerate_no_media_timeline_points, ewpgenerate_with_media_check], outputs=[ewptimeline_output_with_assets, ewptimeline_output, ewpstory_output, ewpgame_structure_output_text_with_media, ewpgame_structure_output_text])
+                        ewpgenerate_button.click(generate_story_and_timeline, inputs=[ewpgenerate_no_ui_timeline_points, ewpgenerate_no_media_timeline_points, ewpgenerate_with_media_check], outputs=[ewptimeline_output_with_assets, ewptimeline_output, ewpstory_output, ewpwacustom_config, ewpgame_structure_output_text]) #ewpgame_structure_output_text_with_media, ewpgame_structure_output_text])
 
     with gr.Tab("Custom JS Config Creator"):
         gr.HTML("-- Incomplete -- Companion Space for zerogpu / client api workflow planning for a way to send a zip to the Basic Game Engine at the bottom of https://huggingface.co/spaces/KwabsHug/TestSvelteStatic (Also to test how much can be done majority on cpu)")