Load game supports media now?

app.py

@@ -518,68 +518,129 @@ def make_choice(choice, game_session): #Calls the nested make choice function in
 
     return result[0], gr.update(choices=result[1]), result[2], game_session
 
+# def load_game(custom_config=None, with_media=False):
+#     global all_states
+#     if custom_config:
+#         try:
+#             new_config = json.loads(custom_config)
+
+#             all_states = new_config
+
+#             # Determine the starting location and state
+#             starting_location = next(iter(all_states.keys()))
+#             starting_state = next(iter(all_states[starting_location].keys()))
+#             print(starting_location, starting_state)
+
+#             game_session = GameSession(starting_location, starting_state)
+#             description, choices, game_log = game_session.get_current_state_info()
+#             new_path_errors = validate_transitions(all_states)
+#             media = None
+#             output_media = None
+
+#             print(all_states[starting_location][starting_state][media])
+#             print(with_media)
+#             print("everything fine till here")
+#             if with_media:
+#                 print("everything fine till here 5")
+#                 if all_states[starting_location][starting_state][media] != []:
+#                     print(f"everything fine till here 4 - {all_states[starting_location][starting_state][media]}")
+#                     media = all_states[starting_location][starting_state][media]
+#                     print("everything fine till here 2")
+#                     for media_path in media:
+#                         media_component = create_media_component(media_path)
+#                         output_media.append(media_component)
+#                         print("everything fine till here 3")
+#                     return gr.update(value=f"Custom configuration loaded successfully! \n{new_path_errors}"), game_log, description, gr.update(choices=choices), game_session, gr.update(value=custom_config), output_media
+                
+#             return gr.update(value=f"Custom configuration loaded successfully! \n{new_path_errors}"), game_log, description, gr.update(choices=choices), game_session, gr.update(value=custom_config)
+#         except json.JSONDecodeError as e:
+#             # Get the line number and column of the error
+#             lineno, colno = e.lineno, e.colno
+
+#             # Get the problematic line
+#             lines = custom_config.split('\n')
+#             error_line = lines[lineno - 1] if lineno <= len(lines) else ""
+
+#             # Create a pointer to the error location
+#             pointer = ' ' * (colno - 1) + '^'
+
+#             error_message = f"Invalid JSON format in custom configuration:\n"
+#             error_message += f"Error at line {lineno}, column {colno}:\n"
+#             error_message += f"{error_line}\n"
+#             error_message += f"{pointer}\n"
+#             error_message += f"Error details: {str(e)}"
+
+#             return gr.update(value=error_message), gr.update(), gr.update(), None, gr.update(value=custom_config), game_session, gr.update(value=custom_config)
+#         except Exception as e:
+#             return gr.update(value=f"Error loading custom configuration: {str(e)}"), gr.update(), gr.update(), None, gr.update(value=custom_config), game_session, gr.update(value=custom_config)
+
+#     # If no custom config, start with the default configuration
+#     starting_location = next(iter(all_states.keys()))
+#     starting_state = next(iter(all_states[starting_location].keys()))
+#     game_session = GameSession(starting_location, starting_state)
+#     description, choices, game_log = game_session.get_current_state_info()
+#     return description, gr.update(choices=choices), game_log, game_session, gr.update()
+
 def load_game(custom_config=None, with_media=False):
     global all_states
-    if custom_config:
-        try:
-            new_config = json.loads(custom_config)
-
-            all_states = new_config
-
-            # Determine the starting location and state
-            starting_location = next(iter(all_states.keys()))
-            starting_state = next(iter(all_states[starting_location].keys()))
-            print(starting_location, starting_state)
-
-            game_session = GameSession(starting_location, starting_state)
-            description, choices, game_log = game_session.get_current_state_info()
-            new_path_errors = validate_transitions(all_states)
-            media = None
-            output_media = None
-
-            print(all_states[starting_location][starting_state][media])
-            print(with_media)
-            print("everything fine till here")
-            if with_media:
-                print("everything fine till here 5")
-                if all_states[starting_location][starting_state][media] != []:
-                    print(f"everything fine till here 4 - {all_states[starting_location][starting_state][media]}")
-                    media = all_states[starting_location][starting_state][media]
-                    print("everything fine till here 2")
-                    for media_path in media:
-                        media_component = create_media_component(media_path)
-                        output_media.append(media_component)
-                        print("everything fine till here 3")
-                    return gr.update(value=f"Custom configuration loaded successfully! \n{new_path_errors}"), game_log, description, gr.update(choices=choices), game_session, gr.update(value=custom_config), output_media
-                
-            return gr.update(value=f"Custom configuration loaded successfully! \n{new_path_errors}"), game_log, description, gr.update(choices=choices), game_session, gr.update(value=custom_config)
-        except json.JSONDecodeError as e:
-            # Get the line number and column of the error
-            lineno, colno = e.lineno, e.colno
-
-            # Get the problematic line
-            lines = custom_config.split('\n')
-            error_line = lines[lineno - 1] if lineno <= len(lines) else ""
-
-            # Create a pointer to the error location
-            pointer = ' ' * (colno - 1) + '^'
-
-            error_message = f"Invalid JSON format in custom configuration:\n"
-            error_message += f"Error at line {lineno}, column {colno}:\n"
-            error_message += f"{error_line}\n"
-            error_message += f"{pointer}\n"
-            error_message += f"Error details: {str(e)}"
-
-            return gr.update(value=error_message), gr.update(), gr.update(), None, gr.update(value=custom_config), game_session, gr.update(value=custom_config)
-        except Exception as e:
-            return gr.update(value=f"Error loading custom configuration: {str(e)}"), gr.update(), gr.update(), None, gr.update(value=custom_config), game_session, gr.update(value=custom_config)
-
-    # If no custom config, start with the default configuration
-    starting_location = next(iter(all_states.keys()))
-    starting_state = next(iter(all_states[starting_location].keys()))
-    game_session = GameSession(starting_location, starting_state)
-    description, choices, game_log = game_session.get_current_state_info()
-    return description, gr.update(choices=choices), game_log, game_session, gr.update()
+    if not custom_config:
+        return gr.update(value="No custom configuration provided."), None, None, None, None, None, None
+
+    try:
+        new_config = json.loads(custom_config)
+        all_states = new_config
+
+        # Determine the starting location and state
+        starting_location = next(iter(all_states.keys()))
+        starting_state = next(iter(all_states[starting_location].keys()))
+        print(f"Starting location: {starting_location}, Starting state: {starting_state}")
+
+        game_session = GameSession(starting_location, starting_state)
+        description, choices, game_log = game_session.get_current_state_info()
+        new_path_errors = validate_transitions(all_states)
+        
+        output_media = []
+
+        if with_media:
+            media_list = all_states[starting_location][starting_state].get('media', [])
+            print(f"Media list: {media_list}")
+            
+            if media_list:
+                for media_path in media_list:
+                    media_component = create_media_component(media_path)
+                    output_media.append(media_component)
+                print(f"Created {len(output_media)} media components")
+
+        success_message = f"Custom configuration loaded successfully!\n{new_path_errors}"
+        return (
+            gr.update(value=success_message),
+            game_log,
+            description,
+            gr.update(choices=choices),
+            game_session,
+            gr.update(value=custom_config),
+            output_media if with_media else None
+        )
+
+    except json.JSONDecodeError as e:
+        error_message = format_json_error(custom_config, e)
+        return gr.update(value=error_message), None, None, None, None, gr.update(value=custom_config), None
+
+    except Exception as e:
+        error_message = f"Error loading custom configuration: {str(e)}"
+        return gr.update(value=error_message), None, None, None, None, gr.update(value=custom_config), None
+
+def format_json_error(config, error):
+    lineno, colno = error.lineno, error.colno
+    lines = config.split('\n')
+    error_line = lines[lineno - 1] if lineno <= len(lines) else ""
+    pointer = ' ' * (colno - 1) + '^'
+
+    return f"""Invalid JSON format in custom configuration:
+Error at line {lineno}, column {colno}:
+{error_line}
+{pointer}
+Error details: {str(error)}"""
 
 initgameinfo = start_game()