Update app.py

app.py

@@ -179,6 +179,7 @@ def generate_xml(sequence_name, segments, source_name, fps=25, start_offset=0.0)
     lines.append('\t\t\t</format>')
     lines.append('\t\t\t<track>')
 
+    file_defined = False
     timeline_head_frames = 0
     for i, seg in enumerate(segments, 1):
         src_start_val = float(seg.get('src_start', seg.get('start', 0.0)))
@@ -195,8 +196,8 @@ def generate_xml(sequence_name, segments, source_name, fps=25, start_offset=0.0)
         clip_note = (raw_note[:75] + '..') if len(raw_note) > 75 else raw_note
 
         lines.append(f'\t\t\t\t<clipitem id="clipitem-v-{i}">')
-        lines.append(f'\t\t\t\t\t<name>{clip_note}</name>')
-        lines.append(f'\t\t\t\t\t<duration>{duration_frames + src_in_frames}</duration>')
+        lines.append(f'\t\t\t\t\t<name>{source_name}</name>')
+        lines.append(f'\t\t\t\t\t<duration>8640000</duration>')
         lines.append(f'\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
         lines.append(f'\t\t\t\t\t<start>{tl_start}</start>')
         lines.append(f'\t\t\t\t\t<end>{tl_end}</end>')
@@ -205,22 +206,33 @@ def generate_xml(sequence_name, segments, source_name, fps=25, start_offset=0.0)
         lines.append(f'\t\t\t\t\t<masterclipid>{master_id}</masterclipid>')
         
         # --- ROBUST FILE DEFINITION ---
-        lines.append(f'\t\t\t\t\t<file id="{master_id}">')
-        lines.append(f'\t\t\t\t\t\t<name>{source_name}</name>')
-        lines.append(f'\t\t\t\t\t\t<pathurl>{path_url}</pathurl>') 
-        lines.append(f'\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
-        lines.append(f'\t\t\t\t\t\t<duration>8640000</duration>') 
-        lines.append(f'\t\t\t\t\t\t<timecode>')
-        lines.append(f'\t\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
-        lines.append(f'\t\t\t\t\t\t\t<string>{start_tc_string}</string>') 
-        lines.append(f'\t\t\t\t\t\t\t<frame>{start_offset_frames}</frame>')
-        lines.append(f'\t\t\t\t\t\t\t<displayformat>NDF</displayformat>')
-        lines.append(f'\t\t\t\t\t\t</timecode>')
-        lines.append('\t\t\t\t\t\t<media>')
-        lines.append('\t\t\t\t\t\t\t<video><samplecharacteristics><width>1920</width><height>1080</height></samplecharacteristics></video>')
-        lines.append('\t\t\t\t\t\t\t<audio><samplecharacteristics><depth>16</depth><samplerate>48000</samplerate></samplecharacteristics><channelcount>2</channelcount></audio>')
-        lines.append('\t\t\t\t\t\t</media>')
-        lines.append('\t\t\t\t\t</file>')
+        if not file_defined:
+            lines.append(f'\t\t\t\t\t<file id="{master_id}">')
+            lines.append(f'\t\t\t\t\t\t<name>{source_name}</name>')
+            lines.append(f'\t\t\t\t\t\t<pathurl>{path_url}</pathurl>') 
+            lines.append(f'\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
+            lines.append(f'\t\t\t\t\t\t<duration>8640000</duration>') 
+            lines.append(f'\t\t\t\t\t\t<timecode>')
+            lines.append(f'\t\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
+            lines.append(f'\t\t\t\t\t\t\t<string>{start_tc_string}</string>') 
+            lines.append(f'\t\t\t\t\t\t\t<frame>{start_offset_frames}</frame>')
+            lines.append(f'\t\t\t\t\t\t\t<displayformat>NDF</displayformat>')
+            lines.append(f'\t\t\t\t\t\t</timecode>')
+            lines.append('\t\t\t\t\t\t<media>')
+            lines.append('\t\t\t\t\t\t\t<video><samplecharacteristics><width>1920</width><height>1080</height></samplecharacteristics></video>')
+            lines.append('\t\t\t\t\t\t\t<audio><samplecharacteristics><depth>16</depth><samplerate>48000</samplerate></samplecharacteristics><channelcount>2</channelcount></audio>')
+            lines.append('\t\t\t\t\t\t</media>')
+            lines.append('\t\t\t\t\t</file>')
+            file_defined = True
+        else:
+            lines.append(f'\t\t\t\t\t<file id="{master_id}"/>')
+            
+        lines.append('\t\t\t\t\t<marker>')
+        lines.append(f'\t\t\t\t\t\t<name>{clip_note}</name>')
+        lines.append(f'\t\t\t\t\t\t<in>{src_in_frames}</in>')
+        lines.append(f'\t\t\t\t\t\t<out>{src_in_frames}</out>')
+        lines.append('\t\t\t\t\t</marker>')
+
         lines.append('\t\t\t\t</clipitem>')
         
         gap_frames = seconds_to_frames(float(seg.get('gap', 0.0)), fps)
@@ -245,12 +257,15 @@ def generate_xml(sequence_name, segments, source_name, fps=25, start_offset=0.0)
         tl_end = tl_start + duration_frames
 
         lines.append(f'\t\t\t\t<clipitem id="clipitem-a-{i}">')
+        lines.append(f'\t\t\t\t\t<name>{source_name}</name>')
         lines.append(f'\t\t\t\t\t<masterclipid>{master_id}</masterclipid>')
+        lines.append(f'\t\t\t\t\t<duration>8640000</duration>')
         lines.append(f'\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
         lines.append(f'\t\t\t\t\t<start>{tl_start}</start>')
         lines.append(f'\t\t\t\t\t<end>{tl_end}</end>')
         lines.append(f'\t\t\t\t\t<in>{src_in_frames}</in>')
         lines.append(f'\t\t\t\t\t<out>{src_out_frames}</out>')
+        lines.append(f'\t\t\t\t\t<file id="{master_id}"/>')
         lines.append('\t\t\t\t\t<sourcetrack><mediatype>audio</mediatype><trackindex>1</trackindex></sourcetrack>')
         lines.append('\t\t\t\t</clipitem>')
         timeline_head_frames = tl_end + seconds_to_frames(float(seg.get('gap', 0.0)), fps)
@@ -311,8 +326,8 @@ def call_gemini_for_edl(transcript_data, story_prompt, api_key):
         "gemini-2.5-pro"
     ]
     
-    # Try the final/stable endpoint first, fallback to beta if features aren't promoted yet
-    endpoints_to_try = ["v1", "v1beta"]
+    # Try the v1beta endpoint first as it natively supports systemInstruction and responseMimeType in REST
+    endpoints_to_try = ["v1beta", "v1"]
     last_error = ""
     
     for model_name in models_to_try:
@@ -327,13 +342,13 @@ def call_gemini_for_edl(transcript_data, story_prompt, api_key):
                     result_json = res.json()
                     raw_text = result_json['candidates'][0]['content']['parts'][0]['text']
                     cleaned_text = clean_json_response(raw_text)
-                    return json.loads(cleaned_text)
+                    return json.loads(cleaned_text), model_name, api_version
                     
                 # Handle High Demand (503) or Rate Limits (429)
                 elif res.status_code in [503, 429]:
                     last_error = f"Model {model_name} busy ({res.status_code}) on {api_version}."
                     st.warning(f"Debug: {last_error} Skipping to next model...")
-                    break # Break inner loop: No point trying v1beta if v1 is rate limited. Move to next model.
+                    break # Break inner loop: No point trying another endpoint if rate limited. Move to next model.
                     
                 # Handle endpoints that don't exist (404) or API rejections (400)
                 else:
@@ -343,7 +358,7 @@ def call_gemini_for_edl(transcript_data, story_prompt, api_key):
                         error_details = res.text
                     last_error = f"Model {model_name} rejected request ({res.status_code}) on {api_version}: {error_details}"
                     st.warning(f"Debug: {last_error} Trying fallback endpoint/model...")
-                    continue # Try v1beta, or the next model
+                    continue # Try v1, or the next model
                     
             except json.JSONDecodeError:
                 last_error = f"Model {model_name} returned invalid JSON on {api_version}."
@@ -360,7 +375,7 @@ def call_gemini_for_edl(transcript_data, story_prompt, api_key):
 
     # If the loop finishes without returning, all models failed
     st.error(f"All Gemini models failed or are currently experiencing high demand. Last error: {last_error}")
-    return None
+    return None, None, None
 
 # --- Streamlit UI ---
 st.set_page_config(page_title="Junior Editor", layout="wide")
@@ -525,21 +540,28 @@ if uploaded_file:
                     # Parse the offset from sidebar input
                     offset_sec = timecode_to_seconds(source_start_tc, fps)
                     
-                    edl_segments = call_gemini_for_edl(st.session_state.transcript, brief, ACTIVE_GEMINI_KEY)
+                    edl_segments, used_model, used_endpoint = call_gemini_for_edl(st.session_state.transcript, brief, ACTIVE_GEMINI_KEY)
+                    
                     if edl_segments:
+                        # Create a safe filename without special characters
+                        safe_filename = "".join([c for c in final_source_name if c.isalnum() or c in (' ', '_', '-')]).strip()
+                        safe_filename = safe_filename.replace(' ', '_')
+                        if not safe_filename:
+                            safe_filename = "junior_editor_cut"
+                            
                         if export_format == "EDL":
-                            final_output = generate_cmx_edl("Junior_Editor_Cut", edl_segments, final_source_name, fps, offset_sec)
+                            final_output = generate_cmx_edl(final_source_name, edl_segments, final_source_name, fps, offset_sec)
                             ext = "edl"
                         else:
-                            final_output = generate_xml("Junior_Editor_Cut", edl_segments, final_source_name, fps, offset_sec)
+                            final_output = generate_xml(final_source_name, edl_segments, final_source_name, fps, offset_sec)
                             ext = "xml"
                             
                         st.subheader("Ready for Import")
+                        st.success(f"✅ Edit generated successfully using **{used_model}** (via {used_endpoint}).")
+                        
                         with st.expander("Show XML/EDL Code", expanded=False):
                             st.code(final_output, language="xml" if ext == "xml" else "text")
                         
-                        st.download_button(f"Download .{ext.upper()}", data=final_output, file_name=f"junior_editor_cut.{ext}")
-
-
+                        st.download_button(f"Download .{ext.upper()}", data=final_output, file_name=f"{safe_filename}.{ext}")