Update app.py

app.py

@@ -1,42 +1,463 @@
-import os
 import streamlit as st
-from google import genai
-from google.genai import types
 from PIL import Image
 from io import BytesIO
+from google import genai
+from google.genai import types
+import re
+import time
+import os
+
+# Add this line to disable Streamlit analytics which often causes PermissionError in containerized environments
+os.environ["STREAMLIT_ANALYTICS_ENABLED"] = "false"
+
+# ─────────────────────────────────────────────────────────────────────────────
+
+# ─── 1. CONFIGURATION ─────────────────────────────────────────────────────────
+
+# 1.1  Load your Google API key from environment or Streamlit secrets
+
+try:
+    API_KEY = st.secrets["GOOGLE_API_KEY"]
+except:
+    API_KEY = os.environ.get("GOOGLE_API_KEY")
+
+if not API_KEY:
+    st.error("Please set GOOGLE_API_KEY in your environment variables or Streamlit secrets")
+    st.stop()
+
+# 1.2  Initialize the GenAI client
+
+client = genai.Client(api_key=API_KEY)
+
+# 1.3  Constants
+
+CATEGORY_MODEL   = "gemini-2.0-flash-exp"
+GENERATION_MODEL = "gemini-2.0-flash-exp"
+
+# 1.4  Helper to parse numbered steps out of Gemini text
+
+def parse_numbered_steps(text):
+    """
+    Expect Gemini to return something like:
+    1. First step description...
+    2. Second step description...
+    ...
+    Returns a list of (step_number, step_text).
+    """
+    # Split on patterns like "1.", "2." at line starts
+    raw_steps = re.split(r"\n\s*\d+\.\s+", text.strip())
+    # The first split entry might be empty if text starts with "1. "
+    if raw_steps and raw_steps[0].strip() == "":
+        raw_steps.pop(0)
+    steps = []
+    for idx, chunk in enumerate(raw_steps, start=1):
+        # Remove any trailing whitespace/newlines
+        steps.append((idx, chunk.strip()))
+    return steps
+
+# ─────────────────────────────────────────────────────────────────────────────
+
+# ─── 2. SESSION STATE SETUP ───────────────────────────────────────────────────
+
+if "steps" not in st.session_state:
+    st.session_state.steps = []          # List[(int, str)] of parsed steps
+if "images" not in st.session_state:
+    st.session_state.images = {}         # Dict[int, PIL.Image] for inline graphics
+if "tools_list" not in st.session_state:
+    st.session_state.tools_list = []     # List[str] of required tools/materials
+if "current_step" not in st.session_state:
+    st.session_state.current_step = 1
+if "done_flags" not in st.session_state:
+    st.session_state.done_flags = {}     # Dict[int, bool] for checkboxes
+if "notes" not in st.session_state:
+    st.session_state.notes = {}          # Dict[int, str]
+if "timers" not in st.session_state:
+    st.session_state.timers = {}         # Dict[int, int] storing seconds left for any timer
+if "category" not in st.session_state:
+    st.session_state.category = None
+if "prompt_sent" not in st.session_state:
+    st.session_state.prompt_sent = False
+if "timer_running" not in st.session_state:
+    st.session_state.timer_running = {}
+if "last_tick" not in st.session_state:
+    st.session_state.last_tick = {}
 
+# ─────────────────────────────────────────────────────────────────────────────
 
-# Function to generate image from prompt
-def generate_image(prompt):
-    api_key = os.getenv("GEMINI_API_KEY")
-    if not api_key:
-        st.error("GEMINI_API_KEY environment variable not set.")
-        return None
-    client = genai.Client(api_key=api_key)
+# ─── 3. LAYOUT & FUNCTIONS ───────────────────────────────────────────────────
+
+def reset_state():
+    """ Clear out all session state so user can start fresh. """
+    st.session_state.steps = []
+    st.session_state.images = {}
+    st.session_state.tools_list = []
+    st.session_state.current_step = 1
+    st.session_state.done_flags = {}
+    st.session_state.notes = {}
+    st.session_state.timers = {}
+    st.session_state.category = None
+    st.session_state.prompt_sent = False
+    st.session_state.timer_running = {}
+    st.session_state.last_tick = {}
+
+def convert_pil_to_genai_format(pil_image):
+    """Convert PIL Image to format expected by Google GenAI"""
+    # Convert to RGB if necessary
+    if pil_image.mode != 'RGB':
+        pil_image = pil_image.convert('RGB')
+
+    # Save to bytes
+    img_byte_arr = BytesIO()
+    pil_image.save(img_byte_arr, format='JPEG')
+    img_byte_arr = img_byte_arr.getvalue()
+
+    return {
+        'mime_type': 'image/jpeg',
+        'data': img_byte_arr
+    }
+
+def detect_category_and_generate(uploaded_file, context_text):
+    """
+    1) Call Gemini to identify the category (appliance, automotive, gardening, upcycling).
+    2) Then call Gemini to get:
+    - a "tools & materials" list
+    - numbered step-by-step instructions
+    3) Parse everything into session_state.
+    """
     try:
-        response = client.models.generate_content(
-            model="models/gemini-2.0-flash-exp",
-            contents=[prompt],
-            config=types.GenerateContentConfig(response_modalities=['Text', 'Image'])
+        # Load and process the uploaded image
+        image = Image.open(uploaded_file)
+        image_data = convert_pil_to_genai_format(image)
+
+        # 3.1 IDENTIFY CATEGORY
+        category_prompt = (
+            "You are an expert DIY assistant. "
+            "Here is a single user-uploaded image. "
+            "Determine if it belongs to one of these categories (exactly): "
+            "home appliance repair, automotive maintenance, gardening & urban farming, or upcycling & sustainable crafts. "
+            "Reply back with exactly one category name."
+        )
+
+        cat_resp = client.models.generate_content(
+            model=CATEGORY_MODEL,
+            contents=[
+                category_prompt,
+                image_data
+            ]
+        )
+        cat_text = cat_resp.text.strip()
+        st.session_state.category = cat_text
+
+        # 3.2 REQUEST TOOLS + NUMBERED STEPS
+        detailed_prompt = (
+            f"Category: {cat_text}\n"
+            f"Context: {context_text}\n\n"
+            "Provide a detailed repair/maintenance guide with the following format:\n\n"
+            "TOOLS AND MATERIALS:\n"
+            "- Tool A\n"
+            "- Material B\n"
+            "- Part C\n\n"
+            "STEPS:\n"
+            "1. First step instructions (be specific and detailed)...\n"
+            "2. Second step instructions...\n"
+            "3. Continue with all necessary steps...\n\n"
+            "Keep each numbered step clear and actionable (2-3 sentences max). "
+            "Include safety warnings where appropriate."
         )
-        for part in response.candidates[0].content.parts:
-            if part.inline_data is not None:
-                image = Image.open(BytesIO(part.inline_data.data))
-                return image
+
+        full_resp = client.models.generate_content(
+            model=GENERATION_MODEL,
+            contents=[
+                detailed_prompt,
+                image_data
+            ]
+        )
+
+        # 3.3 PARSE out tools + numbered steps
+        response_text = full_resp.text
+
+        # Split into tools and steps sections
+        tools_section = ""
+        steps_section = ""
+
+        if "TOOLS AND MATERIALS:" in response_text:
+            parts = response_text.split("TOOLS AND MATERIALS:")
+            if len(parts) > 1:
+                remaining = parts[1]
+                if "STEPS:" in remaining:
+                    tools_part, steps_part = remaining.split("STEPS:", 1)
+                    tools_section = tools_part.strip()
+                    steps_section = steps_part.strip()
+                else:
+                    tools_section = remaining.strip()
+        elif "STEPS:" in response_text:
+            parts = response_text.split("STEPS:")
+            if len(parts) > 1:
+                steps_section = parts[1].strip()
+        else:
+            # Fallback: try to parse the whole response
+            lines = response_text.split('\n')
+            tools_lines = []
+            steps_lines = []
+            current_section = "unknown"
+
+            for line in lines:
+                line = line.strip()
+                if line.startswith('-') and current_section != "steps":
+                    current_section = "tools"
+                    tools_lines.append(line)
+                elif re.match(r'^\d+\.', line):
+                    current_section = "steps"
+                    steps_lines.append(line)
+                elif current_section == "steps" and line:
+                    steps_lines.append(line)
+
+            tools_section = '\n'.join(tools_lines)
+            steps_section = '\n'.join(steps_lines)
+
+        # Parse tools
+        tools = []
+        for line in tools_section.split('\n'):
+            line = line.strip()
+            if line.startswith('-'):
+                tools.append(line.lstrip('- ').strip())
+
+        # Parse steps
+        parsed_steps = parse_numbered_steps(steps_section)
+
+        # Store in session_state
+        st.session_state.tools_list = tools
+        st.session_state.steps = parsed_steps
+
+        # Initialize done flags / timers / notes
+        for idx, step_text in parsed_steps:
+            st.session_state.done_flags[idx] = False
+            st.session_state.notes[idx] = ""
+            # If the step text mentions "wait X minutes" or "wait X seconds", extract and set up a timer
+            timer_match = re.search(r'wait\s+(\d+)\s*(seconds?|minutes?)', step_text.lower())
+            if timer_match:
+                val = int(timer_match.group(1))
+                unit = timer_match.group(2)
+                seconds_left = val * (60 if "minute" in unit else 1)
+                st.session_state.timers[idx] = seconds_left
+            else:
+                st.session_state.timers[idx] = 0
+
+        st.session_state.prompt_sent = True
+
     except Exception as e:
-        st.error(f"Error generating image: {e}")
-        return None
-
-# Streamlit app
-st.title('Gemini Image Generator')
-prompt = st.text_input('Enter a prompt for image generation:')
-if st.button('Generate Image'):
-    if prompt:
-        with st.spinner('Generating image...'):
-            image = generate_image(prompt)
-            if image:
-                st.image(image, caption='Generated Image')
+        st.error(f"Error processing request: {str(e)}")
+        st.error("Please check your API key and try again.")
+
+def render_sidebar_navigation():
+    """
+    A sidebar listing each step by number + a checkbox (miniaturized)
+    so users can click to jump directly to any step.
+    Also show overall progress.
+    """
+    st.sidebar.markdown("## Steps Navigation")
+    total_steps = len(st.session_state.steps)
+    if total_steps > 0:
+        completed = sum(1 for done in st.session_state.done_flags.values() if done)
+        st.sidebar.progress(completed / total_steps)
+        st.sidebar.write(f"Progress: {completed}/{total_steps} steps")
+
+    for (idx, text) in st.session_state.steps:
+        is_done = st.session_state.done_flags.get(idx, False)
+        # We show "✓" if done, else "·"
+        label = f"{'✓' if is_done else '·'} Step {idx}"
+        if st.sidebar.button(label, key=f"nav_{idx}"):
+            st.session_state.current_step = idx
+            st.rerun()
+
+def render_tools_list():
+    """ Show the Tools/Materials list in an expander. """
+    if st.session_state.tools_list:
+        with st.expander("🔧 Required Tools & Materials", expanded=False):
+            for item in st.session_state.tools_list:
+                st.write(f"- {item}")
+
+def render_step(idx, text):
+    """
+    Render a single step "slide":
+    - Show step number in header
+    - Show the instruction text
+    - If there is a timer, show a countdown widget
+    - Provide a checkbox to mark as "Done"
+    - Provide a text area for personal notes & optional photo upload
+    - "Prev" / "Next" buttons
+    """
+    total = len(st.session_state.steps)
+    st.markdown(f"### Step {idx} of {total}")
+
+    # Show the step instruction
+    st.write(text)
+
+    # Timer functionality
+    seconds_left = st.session_state.timers.get(idx, 0)
+    if seconds_left > 0:
+        if idx not in st.session_state.timer_running:
+            st.session_state.timer_running[idx] = False
+
+        if not st.session_state.timer_running[idx]:
+            mins = seconds_left // 60
+            secs = seconds_left % 60
+            if st.button(f"⏱️ Start timer ({mins}m {secs}s)", key=f"start_{idx}"):
+                st.session_state.timer_running[idx] = True
+                st.session_state.last_tick[idx] = time.time()
+                st.rerun()
+        else:
+            # Show countdown
+            if idx in st.session_state.last_tick:
+                now = time.time()
+                elapsed = int(now - st.session_state.last_tick[idx])
+                if elapsed >= 1:
+                    st.session_state.timers[idx] = max(0, st.session_state.timers[idx] - elapsed)
+                    st.session_state.last_tick[idx] = now
+
+            remaining = st.session_state.timers[idx]
+            if remaining > 0:
+                mins = remaining // 60
+                secs = remaining % 60
+                st.metric("⏲️ Timer", f"{mins:02d}:{secs:02d}")
+                time.sleep(1)
+                st.rerun()
             else:
-                st.error("Failed to generate image.")
+                st.success("⏰ Timer completed!")
+                st.session_state.timer_running[idx] = False
+
+    # Done checkbox
+    done = st.checkbox("✅ Mark this step as completed",
+                      value=st.session_state.done_flags.get(idx, False),
+                      key=f"done_{idx}")
+    st.session_state.done_flags[idx] = done
+
+    # Notes section
+    notes = st.text_area("📝 Your notes for this step:",
+                        value=st.session_state.notes.get(idx, ""),
+                        height=100,
+                        key=f"notes_{idx}")
+    st.session_state.notes[idx] = notes
+
+    # Photo upload
+    photo = st.file_uploader("📷 Upload a progress photo (optional)",
+                           type=["jpg", "jpeg", "png"],
+                           key=f"photo_{idx}")
+    if photo:
+        st.image(Image.open(photo), caption=f"Progress photo for step {idx}", use_container_width=True)
+
+    # Navigation buttons
+    st.markdown("---")
+    col1, col2, col3 = st.columns([1, 2, 1])
+
+    with col1:
+        if idx > 1 and st.button("⬅️ Previous", key=f"prev_{idx}"):
+            st.session_state.current_step = idx - 1
+            st.rerun()
+
+    with col3:
+        if idx < total and st.button("Next ➡️", key=f"next_{idx}"):
+            st.session_state.current_step = idx + 1
+            st.rerun()
+
+# ─────────────────────────────────────────────────────────────────────────────
+
+# ─── 4. APP LAYOUT ─────────────────────────────────────────────────────────────
+
+st.set_page_config(page_title="NeoFix DIY Assistant", page_icon="🛠️", layout="wide")
+
+st.title("🛠️ NeoFix AI-Powered DIY Assistant")
+
+with st.expander("ℹ️ How it works", expanded=False):
+    st.write(
+        """
+        1. **Upload a photo** of the item you want to fix or build (appliance, car part, plant, craft project).
+        2. **Add context** (optional) - describe what’s wrong or what you want to achieve.
+        3. **Get AI guidance** - The AI will detect the category and provide step-by-step instructions.
+        4. **Follow the steps** - Each step includes:
+        - Clear instructions
+        - Progress tracking with checkboxes
+        - Timer functionality for waiting periods
+        - Note-taking area
+        - Photo upload for progress tracking
+        5. **Navigate easily** - Use the sidebar to jump between steps and track overall progress.
+        """
+    )
+
+# Main upload section
+
+st.markdown("---")
+col1, col2 = st.columns([3, 1])
+
+with col1:
+    uploaded_image = st.file_uploader("📷 Upload a photo of your project",
+                                      type=["jpg", "jpeg", "png"],
+                                      help="Supported formats: JPG, JPEG, PNG")
+    context_text = st.text_area("✏️ Describe the issue or your goal (optional)",
+                                height=80,
+                                placeholder="e.g., 'My toaster won’t turn on' or 'I want to turn this into a planter'")
+
+with col2:
+    st.markdown("### Actions")
+    if st.button("🚀 Get AI Guidance", type="primary", use_container_width=True):
+        if not uploaded_image:
+            st.warning("⚠️ Please upload an image first!")
+        else:
+            with st.spinner("🤖 Analyzing your image and generating instructions..."):
+                detect_category_and_generate(uploaded_image, context_text)
+
+    if st.button("🔄 Start Over", use_container_width=True):
+        reset_state()
+        st.success("✅ Reset complete!")
+        st.rerun()
+
+# Show the tutorial interface if we have generated steps
+
+if st.session_state.prompt_sent:
+    # Sidebar navigation
+    render_sidebar_navigation()
+
+    # Main content area
+    st.markdown("---")
+
+    # Show detected category
+    if st.session_state.category:
+        st.markdown(f"### 🔍 Detected Category: **{st.session_state.category}**")
+
+    # Show tools list
+    render_tools_list()
+
+    st.markdown("---")
+
+    # Show current step
+    if st.session_state.steps:
+        # Ensure current_step is valid
+        max_step = len(st.session_state.steps)
+        if st.session_state.current_step > max_step:
+            st.session_state.current_step = max_step
+        elif st.session_state.current_step < 1:
+            st.session_state.current_step = 1
+
+        step_tuple = st.session_state.steps[st.session_state.current_step - 1]
+        step_num, step_text = step_tuple
+        render_step(step_num, step_text)
+
+        # Overall progress at bottom
+        st.markdown("---")
+        total_steps = len(st.session_state.steps)
+        done_count = sum(1 for d in st.session_state.done_flags.values() if d)
+        progress = done_count / total_steps if total_steps > 0 else 0
+
+        st.progress(progress)
+        st.markdown(f"**Overall Progress:** {done_count} of {total_steps} steps completed ({progress:.0%})")
+
+        if done_count == total_steps:
+            st.balloons()
+            st.success("🎉 Congratulations! You've completed all steps!")
     else:
-        st.warning('Please enter a prompt.')
+        st.error("No steps generated. Please try uploading a different image.")
+
+# Footer
+
+st.markdown("---")
+st.markdown("*Powered by Google Gemini AI - Your intelligent DIY companion*")