Update app.py

app.py

@@ -153,24 +153,16 @@ def load_daily_data(date_key=None):
     try:
         if file_path.exists():
             try:
-                with open(file_path, 'r') as f:
-                    data = json.load(f)
-                try:
-                    # Validate and update existing data
-                    data = validate_data_structure(data)
-                    
-                    # Only save if the file already existed and needed updates
-                    save_daily_data(data, date_key)
-                    
-                    return data
-                except Exception as e:
-                    print(f"Error validating data: {e}")
-                    return create_empty_daily_data()
-            except json.JSONDecodeError as e:
-                print(f"Error loading data: {e}")
-                # Try to clean up the corrupted file
-                data = clean_daily_data_file(date_key)
+                # Try to load and clean the file
+                data = clean_json_file(file_path)
+                
+                # Validate and update the data structure
+                data = validate_data_structure(data)
+                save_daily_data(data, date_key)
                 return data
+            except Exception as e:
+                print(f"Error loading data: {e}")
+                return create_empty_daily_data()
         else:
             # Only create new file if it's today's date
             if date_key == get_date_key():
@@ -178,16 +170,7 @@ def load_daily_data(date_key=None):
                 save_daily_data(data, date_key)
                 return data
             else:
-                # Return empty metrics for historical dates that don't exist
-                return {
-                    "tracking_metrics": {
-                        "productivity": 0,
-                        "energy": 0,
-                        "mood": 0,
-                        "sleep_quality": 0,
-                        "exercise_intensity": 0
-                    }
-                }
+                return create_empty_daily_data()
     except Exception as e:
         print(f"Error loading data: {e}")
         return create_empty_daily_data()
@@ -219,14 +202,18 @@ def create_empty_daily_data():
         "habits": {habit: [False] * 7 for habit in current_habits},
         "focus": {
             "priorities": [
-                [],
-                [],
-                []
+                ["", ""],  # Empty task and status
+                ["", ""],
+                ["", ""],
+                ["", ""],
+                ["", ""]
             ],
             "later": [
-                [],
-                [],
-                []
+                ["", ""],  # Empty task and status
+                ["", ""],
+                ["", ""],
+                ["", ""],
+                ["", ""]
             ],
             "priority_reward": "",
             "later_reward": ""
@@ -247,7 +234,7 @@ def create_empty_daily_data():
         }
     }
     
-    # Add journal section
+    # Add journal section with empty entries
     data["journal"] = {
         question: "" for question in JOURNAL_QUESTIONS
     }
@@ -347,10 +334,20 @@ def get_default_habits():
     """Get the default habits list if no custom list exists"""
     return [
         # Morning Routine (Essential)
+        "Morning Exercise/Yoga",
+        "Meditation (20min)",
+
         
         # After Work Activities
+        "Evening Stretch (20min)",
+        "Active Learning (20min)",
+        "Journal",
+
         
         # Flexible Throughout Day
+        "Reading (20min)",
+        "Take a photo",
+        "Future Planning"
     ]
 
 def load_habits():
@@ -360,10 +357,24 @@ def load_habits():
         try:
             with open(config_path, 'r') as f:
                 data = json.load(f)
-                return data.get("habits", get_default_habits())
+                if "habits" in data and isinstance(data["habits"], list):
+                    return data["habits"]
+                else:
+                    # If the file exists but is invalid, create a new one with defaults
+                    default_habits = get_default_habits()
+                    save_habits(default_habits)
+                    return default_habits
         except Exception as e:
             print(f"Error loading habits: {e}")
-    return get_default_habits()
+            # If there's an error reading the file, create a new one with defaults
+            default_habits = get_default_habits()
+            save_habits(default_habits)
+            return default_habits
+    else:
+        # If the file doesn't exist, create it with defaults
+        default_habits = get_default_habits()
+        save_habits(default_habits)
+        return default_habits
 
 def save_habits(habits_list):
     """Save the current habits list to configuration"""
@@ -393,7 +404,7 @@ def save_habits(habits_list):
 
 # Remove redundant constants
 DEFAULT_SELF_CARE_ITEMS = [
-"Yoga (AM)", "Vitamins", "Outside",
+ "Yoga (AM)", "Vitamins", "Outside",
     "Stretch (PM)", "Reading", "Learning", "Journal",
     "Tapping", "Meditate", "Brain Train"
 ]
@@ -859,6 +870,43 @@ def load_user_config():
     
     return default_config
 
+def add_new_habit(habit_name, duration, category):
+    """Add a new habit to the tracking system"""
+    try:
+        if not habit_name.strip():
+            return "⚠️ Please enter a habit name", None, None, None
+        
+        # Format the habit name with duration if provided
+        formatted_habit = habit_name.strip()
+        if duration:
+            formatted_habit = f"{formatted_habit} ({duration})"
+        
+        # Add category prefix for sorting
+        if category == "Morning":
+            formatted_habit = f"Morning {formatted_habit}"
+        elif category == "Evening":
+            formatted_habit = f"Evening {formatted_habit}"
+        
+        # Load current habits
+        current_habits = load_habits()
+        
+        # Check if habit already exists
+        if formatted_habit in current_habits:
+            return "⚠️ This habit already exists", None, None, None
+        
+        # Add new habit to list
+        current_habits.append(formatted_habit)
+        
+        # Save updated habits list
+        save_habits(current_habits)
+        
+        # Return success message and clear inputs
+        return "✅ Habit added successfully!", "", "", ""
+        
+    except Exception as e:
+        print(f"Error adding habit: {e}")
+        return f"❌ Error adding habit: {str(e)}", None, None, None
+
 def create_habit_section():
     """Create the habit tracking section with better layout"""
     # Load current habits
@@ -878,6 +926,9 @@ def create_habit_section():
             summary_text = gr.Markdown()
             refresh_btn = gr.Button("🔄 Refresh")
         
+        # Add status message component
+        status_message = gr.Markdown(visible=False)
+        
         # Connect refresh button to update summary
         refresh_btn.click(
             fn=update_summary,
@@ -900,21 +951,21 @@ def create_habit_section():
         # Morning Section
         with gr.Group():
             gr.Markdown("#### 🌅 Morning Routine")
-            create_habit_group(morning_habits, summary_text)  # Pass summary_text as parameter
+            create_habit_group(morning_habits, summary_text)
         
         gr.Markdown("---")
         
         # Evening Section
         with gr.Group():
             gr.Markdown("#### 🌙 Evening Activities")
-            create_habit_group(evening_habits, summary_text)  # Pass summary_text as parameter
+            create_habit_group(evening_habits, summary_text)
             
         gr.Markdown("---")
         
         # Flexible Section
         with gr.Group():
             gr.Markdown("#### ⭐ Flexible Activities")
-            create_habit_group(flexible_habits, summary_text)  # Pass summary_text as parameter
+            create_habit_group(flexible_habits, summary_text)
         
         gr.Markdown("---")
         
@@ -923,8 +974,15 @@ def create_habit_section():
             new_habit = gr.Textbox(
                 label="New Habit/Task",
                 placeholder="Enter a new habit or task to track",
-                scale=4,
-                min_width=250
+                scale=3,
+                min_width=200
+            )
+            category = gr.Dropdown(
+                choices=["Morning", "Evening", "Flexible"],
+                label="Category",
+                value="Flexible",
+                scale=2,
+                min_width=100
             )
             duration = gr.Dropdown(
                 choices=["", "15min", "20min", "30min", "45min", "60min"],
@@ -933,6 +991,95 @@ def create_habit_section():
                 min_width=100
             )
             add_btn = gr.Button("Add Habit", scale=1, min_width=100)
+        
+        # Add status message component
+        status_message = gr.Markdown(visible=False)
+        
+        def add_and_refresh(habit_name, category, duration):
+            message, _, _, _ = add_new_habit(habit_name, duration, category)
+            
+            # Reload habits and recreate sections
+            current_habits = load_habits()
+            morning_habits = [h for h in current_habits if any(x in h.lower() for x in ["wake", "morning", "meditation", "brain", "walk"])]
+            evening_habits = [h for h in current_habits if any(x in h.lower() for x in ["evening", "massage", "learning", "journal", "guitar"])]
+            flexible_habits = [h for h in current_habits if h not in morning_habits + evening_habits]
+            
+            # Update summary
+            summary = update_summary()
+            
+            # Create updated habit groups
+            create_habit_group(morning_habits, summary_text)
+            create_habit_group(evening_habits, summary_text)
+            create_habit_group(flexible_habits, summary_text)
+            
+            return [
+                message,                    # Status message
+                "",                        # Clear habit input
+                category,                  # Keep category selection
+                "",                        # Clear duration input
+                gr.update(visible=True),   # Show status message
+                gr.update(value=summary)   # Update summary text
+            ]
+        
+        # Connect the add button event
+        add_btn.click(
+            fn=add_and_refresh,
+            inputs=[new_habit, category, duration],
+            outputs=[
+                status_message,
+                new_habit,
+                category,
+                duration,
+                status_message,
+                summary_text
+            ]
+        )
+        
+        # Create a refresh button that will be clicked programmatically
+        refresh_habits_btn = gr.Button("Refresh", visible=False)
+        
+        def add_and_refresh(habit_name, duration):
+            message, _, _ = add_new_habit(habit_name, duration)
+            return [
+                message,                    # Status message
+                "",                        # Clear habit input
+                "",                        # Clear duration input
+                gr.update(visible=True),    # Show status message
+                True                        # Trigger refresh button
+            ]
+        
+        # Connect the add button event
+        add_btn.click(
+            fn=add_and_refresh,
+            inputs=[new_habit, duration],
+            outputs=[
+                status_message,
+                new_habit,
+                duration,
+                status_message,
+                refresh_habits_btn
+            ]
+        )
+        
+        # Connect refresh button to reload habits
+        def reload_habits():
+            current_habits = load_habits()
+            morning_habits = [h for h in current_habits if any(x in h.lower() for x in ["wake", "morning", "meditation", "brain", "walk"])]
+            evening_habits = [h for h in current_habits if any(x in h.lower() for x in ["evening", "massage", "learning", "journal", "guitar"])]
+            flexible_habits = [h for h in current_habits if h not in morning_habits + evening_habits]
+            
+            return [
+                gr.update(value=update_summary()),  # Update summary
+                gr.update(visible=False)            # Hide status message
+            ]
+        
+        refresh_habits_btn.click(
+            fn=reload_habits,
+            outputs=[
+                summary_text,
+                status_message
+            ]
+        )
 
 def create_habit_group(habits, summary_text):
     """Create a group of habit tracking rows with better scaling"""
@@ -1010,28 +1157,52 @@ def create_habit_group(habits, summary_text):
             def delete_habit_fn(habit_name=habit):
                 """Delete a habit and update the UI"""
                 try:
-                    # 1. Update current daily data
+                    # 1. Delete from habits_config.json first
+                    config_path = Path("habits_config.json")
+                    if config_path.exists():
+                        with open(config_path, 'r') as f:
+                            config_data = json.load(f)
+                        if "habits" in config_data:
+                            if habit_name in config_data["habits"]:
+                                config_data["habits"].remove(habit_name)
+                                with open(config_path, 'w') as f:
+                                    json.dump(config_data, f, indent=2)
+                                print(f"Removed {habit_name} from habits_config.json")
+
+                    # 2. Update current daily data
                     current_data = load_daily_data()
-                    if habit_name in current_data["habits"]:
+                    if "habits" in current_data and habit_name in current_data["habits"]:
                         del current_data["habits"][habit_name]
                         save_daily_data(current_data)
+                        print(f"Removed {habit_name} from current daily data")
+
+                    # 3. Clean up historical data
+                    json_files = list(DATA_DIR.glob("*.json"))
+                    for file_path in json_files:
+                        try:
+                            with open(file_path, 'r') as f:
+                                day_data = json.load(f)
+                            if "habits" in day_data and habit_name in day_data["habits"]:
+                                del day_data["habits"][habit_name]
+                                with open(file_path, 'w') as f:
+                                    json.dump(day_data, f, indent=2)
+                                print(f"Removed {habit_name} from {file_path}")
+                        except Exception as e:
+                            print(f"Error updating file {file_path}: {e}")
+
+                    # Show success notification
+                    gr.Info(f"Deleted: {habit_name}")
                     
-                    # 2. Update habits configuration
-                    current_habits = load_habits()
-                    if habit_name in current_habits:
-                        current_habits.remove(habit_name)
-                        save_habits(current_habits)
-                    
-                        # 3. Update all existing daily data files to remove this habit
-                        update_all_daily_files(habit_to_remove=habit_name)
+                    # Force reload habits from config
+                    load_habits()  # Reload habits to ensure sync
                     
-                    # Show notification
-                    gr.Info(f"Deleted: {habit_name}")
+                    # Hide the row in UI
                     return gr.update(visible=False)
+                
                 except Exception as e:
                     print(f"Error deleting habit: {e}")
                     gr.Warning(f"Failed to delete {habit_name}")
-                return gr.update()
+                    return gr.update()
             
             # Connect delete button with proper output
             delete_btn.click(
@@ -1320,7 +1491,43 @@ def manual_save():
         print(f"Error saving data: {e}")
         return "❌ Error saving data"
 
-with gr.Blocks(theme='Nymbo/Nymbo_Theme') as demo:
+def clean_json_file(file_path):
+    """Clean up potentially corrupted JSON file"""
+    try:
+        with open(file_path, 'r') as f:
+            content = f.read().strip()
+            
+        # Try to find the last valid JSON structure
+        try:
+            # First try to parse as-is
+            data = json.loads(content)
+            return data
+        except json.JSONDecodeError:
+            # If that fails, try to clean up the content
+            # Find the last closing brace
+            last_brace = content.rfind('}')
+            if last_brace != -1:
+                content = content[:last_brace + 1]
+                try:
+                    data = json.loads(content)
+                    # Save the cleaned data back to file
+                    with open(file_path, 'w') as f:
+                        json.dump(data, f, indent=2)
+                    return data
+                except json.JSONDecodeError:
+                    pass
+            
+            # If all cleanup attempts fail, create new data
+            data = create_empty_daily_data()
+            with open(file_path, 'w') as f:
+                json.dump(data, f, indent=2)
+            return data
+            
+    except Exception as e:
+        print(f"Error cleaning JSON file {file_path}: {e}")
+        return create_empty_daily_data()
+
+with gr.Blocks() as demo:
     # Load initial data
     current_data = load_daily_data()
     current_data = check_and_refresh_day(current_data)
@@ -1331,7 +1538,7 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme') as demo:
         with gr.Column(scale=2):
             pass  # Empty column for spacing
         with gr.Column(scale=1):
-            gr.Image("./logo.png", show_label=False, container=False, width=250, show_download_button=False)
+            gr.Image("./logo.png", show_label=False, container=False, width=250, show_download_button=False, )
         with gr.Column(scale=2):
             pass  # Empty column for spacing