Skip to content

Commit cd35a5e

Browse files
committed
updates
1 parent 6535da1 commit cd35a5e

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

Programming/ingestvideo.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,9 @@ def process_video(file_path, settings):
686686
"--chapter-copy",
687687
"--key-on-chapter",
688688
"--sub-copy",
689+
"--bframes","4",
690+
"--tf-level","4",
691+
"--split-enc","auto_forced",
689692
# "--tier", "1",
690693
"--profile", "high",
691694
"--multipass", "2pass-full",

Programming/ytseo.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777

7878
# 4. Output file extension for SEO results - NOT USED ANYMORE
7979
# OUTPUT_FILE_EXTENSION = ".txt"
80-
RAW_OUTPUT_FILE_EXTENSION = "_raw_response.txt" # Extension for raw API response files
80+
RAW_OUTPUT_FILE_EXTENSION = "_raw_response.txt" # Default extension for raw API response files
81+
DEFAULT_RAW_OUTPUT_SUFFIX = "_raw_response" # Default suffix for raw API response files - NEW
8182

8283
# 5. Default Google Gemini Models - Customizable list
8384
DEFAULT_GEMINI_MODELS = ["gemini-2.0-pro-exp-02-05","gemini-2.0-flash-thinking-exp-01-21","gemini-2.0-flash-exp", "gemini-2.0-flash", "gemini-2.0-flash-lite-preview-02-05"]
@@ -298,8 +299,8 @@ def format_output(seo_data, timestamps):
298299
"""
299300
return formatted_output
300301

301-
def save_raw_api_response(api_response_text, srt_filepath, output_folder):
302-
"""Saves the raw API response to a text file."""
302+
def save_raw_api_response(api_response_text, srt_filepath, output_folder, output_suffix=DEFAULT_RAW_OUTPUT_SUFFIX): # Added output_suffix
303+
"""Saves the raw API response to a text file with customizable suffix."""
303304
if not api_response_text:
304305
print("Debug: save_raw_api_response - No API response text to save.")
305306
return
@@ -308,7 +309,7 @@ def save_raw_api_response(api_response_text, srt_filepath, output_folder):
308309
os.makedirs(raw_output_folder_path, exist_ok=True)
309310

310311
output_filename_base = os.path.splitext(os.path.basename(srt_filepath))[0]
311-
output_filename = output_filename_base + RAW_OUTPUT_FILE_EXTENSION
312+
output_filename = output_filename_base + output_suffix + RAW_OUTPUT_FILE_EXTENSION # Use output_suffix
312313
output_filepath = os.path.join(raw_output_folder_path, output_filename)
313314

314315
try:
@@ -320,16 +321,16 @@ def save_raw_api_response(api_response_text, srt_filepath, output_folder):
320321
print(f"Error details: {e}")
321322

322323

323-
def process_srt_and_get_seo(srt_filepath, api_key, user_prompt_template, model_name=DEFAULT_GEMINI_MODEL, stream_output=False, language_code=DEFAULT_TARGET_LANGUAGE): # Added language_code to function signature
324-
"""Processes a single SRT file and returns the formatted SEO output, now with language name in prompt."""
324+
def process_srt_and_get_seo(srt_filepath, api_key, user_prompt_template, model_name=DEFAULT_GEMINI_MODEL, stream_output=False, language_code=DEFAULT_TARGET_LANGUAGE, output_suffix=DEFAULT_RAW_OUTPUT_SUFFIX): # Added output_suffix
325+
"""Processes a single SRT file and returns the formatted SEO output, now with language name in prompt and output suffix."""
325326
raw_srt_content = read_raw_srt_content(srt_filepath)
326327
if raw_srt_content is None:
327328
return None
328329

329330
prompt = construct_prompt(raw_srt_content, None, user_prompt_template, language_code=language_code) # Pass language_code to construct_prompt
330331
api_response_text = call_generative_ai_api(prompt, api_key, model_name=model_name, stream_output=stream_output)
331332

332-
save_raw_api_response(api_response_text, srt_filepath, RAW_OUTPUT_SUBFOLDER_NAME) # Save raw response here
333+
save_raw_api_response(api_response_text, srt_filepath, RAW_OUTPUT_SUBFOLDER_NAME, output_suffix=output_suffix) # Save raw response here, pass output_suffix
333334

334335
seo_data = parse_api_response(api_response_text)
335336
if seo_data:
@@ -351,7 +352,7 @@ def use_gui(command_line_files=None, args=None):
351352
model_var = tk.StringVar(value=args.model if args and args.model else DEFAULT_GEMINI_MODEL)
352353
prompt_var = tk.StringVar(value=args.prompt_key if args and args.prompt_key else DEFAULT_PROMPT_KEY)
353354
output_dir_var = tk.StringVar(value=args.output if args and args.output else RAW_OUTPUT_SUBFOLDER_NAME) # Changed default to RAW_OUTPUT_SUBFOLDER_NAME
354-
suffix_var = tk.StringVar(value=args.suffix if args and args.suffix else PROMPT_SUFFIX_MAP.get(DEFAULT_PROMPT_KEY, "")) # Suffix not really used, set default to empty string
355+
suffix_var = tk.StringVar(value=args.suffix if args and args.suffix else DEFAULT_RAW_OUTPUT_SUFFIX) # Suffix now populated with default suffix
355356
stream_output_var = tk.BooleanVar(value=args.stream if args and args.stream else False)
356357
language_var = tk.StringVar(value=args.language if args and args.language else DEFAULT_TARGET_LANGUAGE) # NEW: Language var
357358

@@ -390,8 +391,8 @@ def use_gui(command_line_files=None, args=None):
390391
tk.Button(output_frame, text="Browse Dir", command=lambda: output_dir_var.set(filedialog.askdirectory())).grid(row=0, column=2, sticky=tk.W)
391392

392393
suffix_frame = ttk.Frame(window, padding="10 10 10 10"); suffix_frame.grid(row=7, column=0, sticky=(tk.W, tk.E, tk.N, tk.S)) # Shifted down
393-
tk.Label(suffix_frame, text="Suffix (Not Used):").grid(row=0, column=0, sticky=tk.W) # Indicate suffix is not used
394-
suffix_entry = ttk.Entry(suffix_frame, textvariable=suffix_var, width=20, state='disabled'); suffix_entry.grid(row=0, column=1, sticky=(tk.W, tk.E)) # Disabled suffix entry
394+
tk.Label(suffix_frame, text="Raw Response Suffix:").grid(row=0, column=0, sticky=tk.W) # Updated label for suffix
395+
suffix_entry = ttk.Entry(suffix_frame, textvariable=suffix_var, width=20, state='enabled'); suffix_entry.grid(row=0, column=1, sticky=(tk.W, tk.E)) # Enabled suffix entry
395396

396397
stream_frame = ttk.Frame(window, padding="10 10 10 10"); stream_frame.grid(row=8, column=0, sticky=(tk.W, tk.E, tk.N, tk.S)) # Shifted down
397398
stream_check = ttk.Checkbutton(stream_frame, text="Stream Output", variable=stream_output_var); stream_check.grid(row=0, column=0, sticky=tk.W)
@@ -403,7 +404,7 @@ def process_from_gui():
403404
settings['model'] = model_var.get()
404405
settings['prompt_key'] = prompt_var.get()
405406
settings['output_dir'] = output_dir_var.get()
406-
settings['suffix'] = suffix_var.get() # Still get suffix value, even if not used
407+
settings['suffix'] = suffix_var.get() # Get suffix from GUI
407408
settings['stream_output'] = stream_output_var.get()
408409
settings['language_code'] = language_var.get() # NEW: Get language code from GUI
409410
window.destroy()
@@ -434,7 +435,7 @@ def main():
434435
parser.add_argument("files", nargs="*", help="Path(s) to SRT file(s)")
435436
parser.add_argument("-p", "--prompt", dest="prompt_key", default=DEFAULT_PROMPT_KEY, choices=list(PROMPTS.keys()), help=f"Prompt to use. Default: '{DEFAULT_PROMPT_KEY}'.")
436437
parser.add_argument("-o", "--output", dest="output", default=RAW_OUTPUT_SUBFOLDER_NAME, help=f"Output directory for raw responses. Default: '{RAW_OUTPUT_SUBFOLDER_NAME}'.") # Updated description
437-
parser.add_argument("-s", "--suffix", dest="suffix", default="", help="Suffix for output files (not used in this version). Default: '' (empty string).") # Updated description
438+
parser.add_argument("-s", "--suffix", dest="suffix", default=DEFAULT_RAW_OUTPUT_SUFFIX, help=f"Suffix for raw output files. Default: '{DEFAULT_RAW_OUTPUT_SUFFIX}'.") # Updated description, default to DEFAULT_RAW_OUTPUT_SUFFIX
438439
parser.add_argument("--stream", action='store_true', default=False, help="Enable streaming output.")
439440
parser.add_argument("-e", "--engine", dest="engine", default=DEFAULT_ENGINE, choices=['google', 'ollama'], help=f"AI engine to use: google or ollama.") # Engine command line argument
440441
parser.add_argument("-m", "--model", "--model", dest="model", default=DEFAULT_GEMINI_MODEL, help=f"Model to use (engine specific). Default Google Gemini model: '{DEFAULT_GEMINI_MODEL}'.") # Model arg
@@ -457,7 +458,7 @@ def main():
457458
srt_file_patterns = gui_settings.get('files', [])
458459
prompt_key = gui_settings.get('prompt_key', args.prompt_key) # GUI setting or CLI arg
459460
output_folder_base = gui_settings.get('output_dir', args.output) # GUI setting or CLI arg
460-
suffix = gui_settings.get('suffix', args.suffix) # GUI setting or CLI arg - not used
461+
suffix = gui_settings.get('suffix', args.suffix) # Get suffix from GUI setting or CLI arg
461462
stream_output = gui_settings.get('stream_output', args.stream) # GUI setting or CLI arg
462463
engine = gui_settings.get('engine', args.engine) # Get engine from GUI or CLI
463464
model_name = gui_settings.get('model', args.model) # Get model from GUI or CLI
@@ -475,12 +476,8 @@ def main():
475476
for srt_filepath in glob.glob(pattern):
476477
language_name = get_language_name_from_code(language_code) or language_code # Get name or fallback to code
477478
print(f"Processing SRT file: {srt_filepath}, Language: {language_name} ({language_code})") # NEW: Print language name
478-
seo_output = process_srt_and_get_seo(srt_filepath, api_key, PROMPTS.get(prompt_key, USER_PROMPT_TEMPLATE), model_name=model_name, stream_output=stream_output, language_code=language_code) # Pass language_code
479+
seo_output = process_srt_and_get_seo(srt_filepath, api_key, PROMPTS.get(prompt_key, USER_PROMPT_TEMPLATE), model_name=model_name, stream_output=stream_output, language_code=language_code, output_suffix=suffix) # Pass suffix to process_srt_and_get_seo
479480
if seo_output:
480-
# --- DEBUG: SEO Output (Printed to Console - NOT Saved to File) --- # REMOVED
481-
# print("--- DEBUG: SEO Output (Printed to Console - NOT Saved to File) ---") # Indicate that SEO output is not being saved
482-
# print(seo_output) # Still print the SEO output to console for inspection
483-
# print("--- DEBUG: End of SEO Output ---") # REMOVED
484481
processed_files += 1 # Still count as processed (even if not saved)
485482
else:
486483
print(f"Failed to process SRT file: {srt_filepath}")

0 commit comments

Comments
 (0)