Bug fix: Improve scheduler logic

- Auto-sync with SimpleFIN every 6 hours.
- Snapshot daily balance every night.
- Set up monthly budget on the 1st of each month.

Author: CodeWithCJ

SparkyBudget/SparkyBudget.py

@@ -1,18 +1,15 @@
-#app.py
+#SparkyBudget.py
 
-import locale,os, sqlite3, re, secrets
-from datetime import datetime, timedelta, timezone
+import locale,os, secrets
+from datetime import timedelta
 from threading import Lock
-from flask import Flask, jsonify, redirect, render_template, request, session, url_for, Blueprint
-from flask_login import LoginManager, current_user, login_required
+from flask import Flask, jsonify
+from flask_login import LoginManager, login_required
 
 #py_utils
-from py_utils.auth import load_user, login, logout, before_request, unauthorized, User
-from py_utils.currency_utils import format_money, format_money_whole, format_currency
+from py_utils.auth import load_user, login, logout, before_request, unauthorized
 from py_utils.currency_utils import app as currency_app
-from py_utils.daily_balance_history import daily_balance_history_insert
 from py_utils.manage_categories import manage_categories_bp
-from py_utils.monthly_budget_insert import month_budget_update_using_template
 from py_utils.scheduler import start_scheduler
 from py_utils.SimpleFinToDB import process_accounts_data
 from py_utils.subcategory_update import subcategory_update_bp
@@ -89,7 +86,8 @@ def download_data():
 
 
     scheduler_thread = start_scheduler()
+    print(f"Scheduler thread alive: {scheduler_thread.is_alive()}")
 
     # Run the Flask app with the SSL context
-    app.run(host="0.0.0.0", port=5000, ssl_context=ssl_context, debug=True)
+    app.run(host="0.0.0.0", port=5000, ssl_context=ssl_context, debug=False)
 

SparkyBudget/py_utils/scheduler.py

@@ -1,36 +1,34 @@
-#py_utils/scheduler.py
-
 import schedule
 import time
 import threading
 from datetime import datetime
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 
-# Import the functions that need to be scheduled
 from py_utils.monthly_budget_insert import month_budget_update_using_template
 from py_utils.daily_balance_history import daily_balance_history_insert
 from py_utils.SimpleFinToDB import process_accounts_data
 
-# Schedule the tasks
 def setup_scheduler():
-    # Schedule monthly budget update
-    schedule.every().day.at("01:00").do(month_budget_update_using_template)
-    
-    # Schedule daily balance history insert
-    schedule.every().day.at("23:55").do(daily_balance_history_insert)
-    
-    # Schedule account data processing
-    schedule.every(4).hours.do(process_accounts_data)
+    logger.info(f"Setting up scheduler at {datetime.now()}")
+    schedule.every().day.at("01:00").do(lambda: logger.info(f"Running monthly budget update at {datetime.now()}") or month_budget_update_using_template())
+    schedule.every().day.at("23:55").do(lambda: logger.info(f"Running daily balance history at {datetime.now()}") or daily_balance_history_insert())
+    schedule.every(4).hours.do(lambda: logger.info(f"Running account data processing at {datetime.now()}") or process_accounts_data())
+    #schedule.every(1).minutes.do(lambda: logger.info(f"Running account data processing at {datetime.now()}") or process_accounts_data())
 
-# Run the scheduler in a background thread
 def run_scheduler():
     setup_scheduler()
     while True:
+        next_run = schedule.next_run()
+        #logger.info(f"Next scheduled task: {next_run}")
         schedule.run_pending()
         time.sleep(10)
 
-# Function to start the scheduler in a separate thread
 def start_scheduler():
     scheduler_thread = threading.Thread(target=run_scheduler)
-    scheduler_thread.daemon = True  # Set as daemon so it will exit when the main program exits
+    scheduler_thread.daemon = True
     scheduler_thread.start()
+    logger.info("Scheduler thread started")
     return scheduler_thread