Refactor section configuration to load from final_arrangement.json and update finalise function to map section names to keys

app.py

@@ -391,15 +391,8 @@ def setup_section_event_handlers(section_name, section_ui):
 
 
 # Load section configuration from a JSON file or string
-section_config_json = """
-{
-    "intro": {"bpm": 120, "bars": 8, "p": 0.3},
-    "buildup": {"bpm": 120, "bars": 16, "p": 0.4},
-    "breakdown": {"bpm": 120, "bars": 16, "p": 0.6},
-    "drop": {"bpm": 120, "bars": 16, "p": 0.7},
-    "outro": {"bpm": 120, "bars": 8, "p": 0.3}
-}
-"""
+with open("final_arrangement.json", "r") as f:
+    section_config_json = f.read()
 
 sections = json.loads(section_config_json)
 

final_arrangement.json

@@ -0,0 +1,47 @@
+{
+  "intro": {
+    "bpm": 120,
+    "bars": 8,
+    "p": 0.3
+  },
+  "verse1": {
+    "bpm": 40,
+    "bars": 32,
+    "p": 0.5
+  },
+  "pre_chorus": {
+    "bpm": 60,
+    "bars": 16,
+    "p": 0.5
+  },
+  "drop": {
+    "bpm": 120,
+    "bars": 16,
+    "p": 0.7
+  },
+  "breakdown": {
+    "bpm": 120,
+    "bars": 16,
+    "p": 0.6
+  },
+  "bridge": {
+    "bpm": 60,
+    "bars": 32,
+    "p": 0.5
+  },
+  "buildup": {
+    "bpm": 120,
+    "bars": 16,
+    "p": 0.4
+  },
+  "drop2": {
+    "bpm": 100,
+    "bars": 64,
+    "p": 0.5
+  },
+  "outro": {
+    "bpm": 120,
+    "bars": 8,
+    "p": 0.3
+  }
+}

temp_choose.py

@@ -100,9 +100,38 @@ def load_variation(variation_name):
 
 
 def finalise():
+    # Map from display names to keys
+    section_key_map = {
+        "Intro": "intro",
+        "Build-Up": "buildup",
+        "Breakdown": "breakdown",
+        "Drop 1": "drop",
+        "Drop 2": "drop2",
+        "Outro": "outro",
+        "Outro/Fade": "outro",
+        "Verse 1": "verse1",
+        "Pre-Chorus": "pre_chorus",
+        "Bridge": "bridge",
+        # Add more mappings as needed
+    }
+    # Example default values for bpm, bars, p (customize as needed)
+    default_section_params = {
+        "intro": {"bpm": 120, "bars": 8, "p": 0.3},
+        "buildup": {"bpm": 120, "bars": 16, "p": 0.4},
+        "breakdown": {"bpm": 120, "bars": 16, "p": 0.6},
+        "drop": {"bpm": 120, "bars": 16, "p": 0.7},
+        "outro": {"bpm": 120, "bars": 8, "p": 0.3},
+        # Add more as needed
+    }
+    result = {}
+    for bar, tempo, name, length, curve in arrangement:
+        key = section_key_map.get(name, name.lower().replace(' ', '_'))
+        # You can customize how you set bpm, bars, p here
+        params = default_section_params.get(key, {"bpm": tempo, "bars": length, "p": 0.5})
+        result[key] = params
     with open("final_arrangement.json", "w") as f:
-        json.dump(arrangement, f, indent=2)
-    return json.dumps(arrangement, indent=2)
+        json.dump(result, f, indent=2)
+    return json.dumps(result, indent=2)
 
 
 # with gr.Blocks() as iface: