jebin2 commited on
Commit
522e55a
·
1 Parent(s): 6e77baf

refactor: streamline log worksheet naming by removing `GSHEET_WORKSHEET_LOGS` configuration and adjusting name generation.

Browse files
.github/workflows/process_csv.yml CHANGED
@@ -29,9 +29,6 @@ on:
29
  AUDIO_LIBRARY_GSHEET_WORKSHEET:
30
  description: 'Audio Library Worksheet'
31
  required: false
32
- GSHEET_WORKSHEET_LOGS:
33
- description: 'Logs Worksheet'
34
- required: false
35
  CONTENT_STRATEGY_FILE:
36
  description: 'Content Strategy File'
37
  required: false
@@ -174,7 +171,6 @@ jobs:
174
  GSHEET_ID: ${{ github.event.inputs.GSHEET_ID || vars.GSHEET_ID }}
175
  VIDEO_LIBRARY_GSHEET_WORKSHEET: ${{ github.event.inputs.VIDEO_LIBRARY_GSHEET_WORKSHEET || vars.VIDEO_LIBRARY_GSHEET_WORKSHEET }}
176
  AUDIO_LIBRARY_GSHEET_WORKSHEET: ${{ github.event.inputs.AUDIO_LIBRARY_GSHEET_WORKSHEET || vars.AUDIO_LIBRARY_GSHEET_WORKSHEET }}
177
- GSHEET_WORKSHEET_LOGS: ${{ github.event.inputs.GSHEET_WORKSHEET_LOGS || vars.GSHEET_WORKSHEET_LOGS }}
178
  DRIVE_UPLOAD_FOLDER_ID: ${{ github.event.inputs.DRIVE_UPLOAD_FOLDER_ID || vars.DRIVE_UPLOAD_FOLDER_ID }}
179
 
180
  run: |
 
29
  AUDIO_LIBRARY_GSHEET_WORKSHEET:
30
  description: 'Audio Library Worksheet'
31
  required: false
 
 
 
32
  CONTENT_STRATEGY_FILE:
33
  description: 'Content Strategy File'
34
  required: false
 
171
  GSHEET_ID: ${{ github.event.inputs.GSHEET_ID || vars.GSHEET_ID }}
172
  VIDEO_LIBRARY_GSHEET_WORKSHEET: ${{ github.event.inputs.VIDEO_LIBRARY_GSHEET_WORKSHEET || vars.VIDEO_LIBRARY_GSHEET_WORKSHEET }}
173
  AUDIO_LIBRARY_GSHEET_WORKSHEET: ${{ github.event.inputs.AUDIO_LIBRARY_GSHEET_WORKSHEET || vars.AUDIO_LIBRARY_GSHEET_WORKSHEET }}
 
174
  DRIVE_UPLOAD_FOLDER_ID: ${{ github.event.inputs.DRIVE_UPLOAD_FOLDER_ID || vars.DRIVE_UPLOAD_FOLDER_ID }}
175
 
176
  run: |
github_workflow_app/index.html CHANGED
@@ -521,7 +521,6 @@
521
  'GSHEET_ID',
522
  'VIDEO_LIBRARY_GSHEET_WORKSHEET',
523
  'AUDIO_LIBRARY_GSHEET_WORKSHEET',
524
- 'GSHEET_WORKSHEET_LOGS',
525
  'CONTENT_STRATEGY_FILE',
526
  'IS_A2E_LIP_SYNC',
527
  'USE_VEO',
@@ -540,7 +539,6 @@
540
  'GSHEET_ID',
541
  'VIDEO_LIBRARY_GSHEET_WORKSHEET',
542
  'AUDIO_LIBRARY_GSHEET_WORKSHEET',
543
- 'GSHEET_WORKSHEET_LOGS',
544
  'GENERATION_COUNT',
545
  'DRIVE_UPLOAD_FOLDER_ID'
546
  ];
 
521
  'GSHEET_ID',
522
  'VIDEO_LIBRARY_GSHEET_WORKSHEET',
523
  'AUDIO_LIBRARY_GSHEET_WORKSHEET',
 
524
  'CONTENT_STRATEGY_FILE',
525
  'IS_A2E_LIP_SYNC',
526
  'USE_VEO',
 
539
  'GSHEET_ID',
540
  'VIDEO_LIBRARY_GSHEET_WORKSHEET',
541
  'AUDIO_LIBRARY_GSHEET_WORKSHEET',
 
542
  'GENERATION_COUNT',
543
  'DRIVE_UPLOAD_FOLDER_ID'
544
  ];
src/cleanup_manager.py CHANGED
@@ -32,9 +32,6 @@ async def process_delete_entries():
32
  Delete corresponding video files from GCS or Drive and then remove the row from the sheet.
33
  """
34
  gsheet_name = get_config_value("logs_worksheet")
35
- if not gsheet_name:
36
- logger.warning("GSHEET_WORKSHEET_LOGS not set, skipping delete entry check")
37
- return
38
 
39
  try:
40
  reader = GoogleSheetReader(worksheet_name=gsheet_name)
 
32
  Delete corresponding video files from GCS or Drive and then remove the row from the sheet.
33
  """
34
  gsheet_name = get_config_value("logs_worksheet")
 
 
 
35
 
36
  try:
37
  reader = GoogleSheetReader(worksheet_name=gsheet_name)
src/config.py CHANGED
@@ -83,7 +83,7 @@ def load_configuration(force_reload: bool = False) -> Dict[str, Any]:
83
  "gsheet_id": os.getenv("GSHEET_ID"),
84
  "video_library_worksheet": os.getenv("VIDEO_LIBRARY_GSHEET_WORKSHEET"),
85
  "audio_library_worksheet": os.getenv("AUDIO_LIBRARY_GSHEET_WORKSHEET"),
86
- "logs_worksheet": f'{os.getenv("GSHEET_NAME")} {os.getenv("SETUP_TYPE")} LOGS',
87
  "content_strategy_worksheet": os.getenv("CONTENT_STRATEGY_GSHEET_WORKSHEET"),
88
 
89
  # Pipeline settings
@@ -104,7 +104,7 @@ def load_configuration(force_reload: bool = False) -> Dict[str, Any]:
104
  "delete_all_a2e_videos": _env_bool("DELETE_ALL_A2E_VIDEOS"),
105
 
106
  # publisher settings
107
- "publisher_logs_worksheet": 'Publisher LOGS',
108
 
109
  # TikTok
110
  "tiktok_access_token": os.getenv("TIKTOK_ACCESS_TOKEN"),
 
83
  "gsheet_id": os.getenv("GSHEET_ID"),
84
  "video_library_worksheet": os.getenv("VIDEO_LIBRARY_GSHEET_WORKSHEET"),
85
  "audio_library_worksheet": os.getenv("AUDIO_LIBRARY_GSHEET_WORKSHEET"),
86
+ "logs_worksheet": f'{os.getenv("SETUP_TYPE")} LOGS',
87
  "content_strategy_worksheet": os.getenv("CONTENT_STRATEGY_GSHEET_WORKSHEET"),
88
 
89
  # Pipeline settings
 
104
  "delete_all_a2e_videos": _env_bool("DELETE_ALL_A2E_VIDEOS"),
105
 
106
  # publisher settings
107
+ "publisher_logs_worksheet": f'{os.getenv("GCS_BUCKET_NAME")} Publisher LOGS',
108
 
109
  # TikTok
110
  "tiktok_access_token": os.getenv("TIKTOK_ACCESS_TOKEN"),
src/execution_tracker.py CHANGED
@@ -12,11 +12,7 @@ def load_executed_from_gsheet(setup_type=None, job_index=None):
12
  job_index: Optional. If provided, only count rows for this specific job.
13
  """
14
  gsheet_name = get_config_value("logs_worksheet")
15
-
16
- if not gsheet_name:
17
- logger.warning("GSHEET_WORKSHEET_LOGS not set")
18
- return []
19
-
20
  try:
21
  reader = GoogleSheetReader(worksheet_name=gsheet_name)
22
  df = reader.get_dataframe()
@@ -49,9 +45,6 @@ def log_progress_to_gsheet(result: dict, job_index: int, commit=False):
49
  return
50
 
51
  gsheet_name = get_config_value("logs_worksheet")
52
- if not gsheet_name:
53
- logger.warning("GSHEET_WORKSHEET_LOGS not set, skipping gsheet logging")
54
- return
55
 
56
  try:
57
  reader = GoogleSheetReader(worksheet_name=gsheet_name)
 
12
  job_index: Optional. If provided, only count rows for this specific job.
13
  """
14
  gsheet_name = get_config_value("logs_worksheet")
15
+
 
 
 
 
16
  try:
17
  reader = GoogleSheetReader(worksheet_name=gsheet_name)
18
  df = reader.get_dataframe()
 
45
  return
46
 
47
  gsheet_name = get_config_value("logs_worksheet")
 
 
 
48
 
49
  try:
50
  reader = GoogleSheetReader(worksheet_name=gsheet_name)