Update app.py

app.py

@@ -5,17 +5,19 @@ import subprocess
 import shutil
 import requests
 import re
+import time
 
 # --- CONFIGURATION ---
 API_ENDPOINT = "https://gen.pollinations.ai/v1/chat/completions"
 API_KEY = "sk_qDYtDvntvqzjmp23XKVzr9lBXYwYndaR"
 AI_MODEL = "claude"
+MAX_RETRIES = 10  # AI 10 baar koshish karega haar manne se pehle
 
-st.set_page_config(page_title="God Mode AI Builder", layout="centered")
-st.title("⚡ God Mode AI Android Builder")
-st.markdown("Ye system haar nahi maanega. Engine Upgrade + Full AI Surgery enabled.")
+st.set_page_config(page_title="AI Terminator Builder", layout="centered")
+st.title("🤖 AI Terminator Builder")
+st.markdown("This AI will **Hunt & Fix** errors recursively until the APK is built.")
 
-# --- HELPER: AI API (Robust) ---
+# --- HELPER: AI API ---
 def ask_claude(system_prompt, user_message):
     headers = {
         "Content-Type": "application/json",
@@ -27,10 +29,10 @@ def ask_claude(system_prompt, user_message):
             {"role": "system", "content": system_prompt},
             {"role": "user", "content": user_message}
         ],
-        "temperature": 0.1
+        "temperature": 0.1 # High precision
     }
     try:
-        response = requests.post(API_ENDPOINT, json=payload, headers=headers, timeout=120)
+        response = requests.post(API_ENDPOINT, json=payload, headers=headers, timeout=60)
         if response.status_code == 200:
             return True, response.json()['choices'][0]['message']['content']
         return False, f"API Error: {response.text}"
@@ -49,22 +51,14 @@ def generate_keystore():
         ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     return keystore_path
 
-# --- 🛠️ STEP 1: FORCE ENGINE UPGRADE ---
-def force_modernize_engine(project_root, status_box):
-    status_box.write("🔧 Force-Updating Gradle Engine to 8.0...")
+# --- STEP 1: FORCE UPGRADE (Base Setup) ---
+def initial_modernization(project_root, status_box):
+    status_box.write("🛠️ AI is modernizing project engine first...")
     
-    # 1. Wrapper Update
-    wrapper_props = None
-    for root, dirs, files in os.walk(project_root):
-        if "gradle-wrapper.properties" in files:
-            wrapper_props = os.path.join(root, "gradle-wrapper.properties")
-            break
+    # 1. Gradle Wrapper Upgrade to 8.0
+    wrapper_props = os.path.join(project_root, "gradle", "wrapper", "gradle-wrapper.properties")
+    os.makedirs(os.path.dirname(wrapper_props), exist_ok=True)
     
-    # Agar wrapper nahi bhi mila, tab bhi naya banao
-    if not wrapper_props:
-        os.makedirs(os.path.join(project_root, "gradle", "wrapper"), exist_ok=True)
-        wrapper_props = os.path.join(project_root, "gradle", "wrapper", "gradle-wrapper.properties")
-
     new_props = """distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
@@ -72,57 +66,100 @@ zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 """
     with open(wrapper_props, "w") as f: f.write(new_props)
-
-    # 2. Permissions Fix
-    subprocess.run(["chmod", "+x", os.path.join(project_root, "gradlew")])
-
-# --- 🧠 STEP 2: AI SURGERY (Build.gradle Fixer) ---
-def ai_fix_build_gradle(project_root, error_log, status_box):
-    status_box.write("🧠 AI is performing surgery on build.gradle...")
     
-    # Find root build.gradle and app build.gradle
-    root_gradle = os.path.join(project_root, "build.gradle")
-    app_gradle = None
+    # 2. Root Build.gradle Fix
+    root_gradle = None
     for root, dirs, files in os.walk(project_root):
-        if "build.gradle" in files and "app" in root:
-            app_gradle = os.path.join(root, "build.gradle")
+        if "build.gradle" in files and "app" not in root:
+            root_gradle = os.path.join(root, "build.gradle")
             break
+            
+    if root_gradle:
+        with open(root_gradle, 'r') as f: content = f.read()
+        # AI se kaho dependencies update kare
+        p = "Update 'classpath' dependencies to be compatible with Gradle 8. Use 'com.android.tools.build:gradle:8.0.0'. Output full code."
+        ok, fix = ask_claude(p, content)
+        if ok:
+            clean = fix.replace("```gradle","").replace("```","").strip()
+            with open(root_gradle, 'w') as f: f.write(clean)
+            status_box.write("✅ AI updated root build.gradle configuration.")
+
+# --- STEP 2: THE FIXER LOOP ---
+def analyze_and_fix_errors(project_root, error_log, status_box):
+    # Regex to find file paths in error logs (Java, Kotlin, XML, Gradle)
+    # Pattern looks for: /path/to/file.ext:line_number: error
+    match = re.search(r'(/[\w/-]+\.(java|kt|xml|gradle))', error_log)
+    
+    target_file = None
+    
+    if match:
+        extracted_path = match.group(1)
+        # Verify path exists (Handle relative/absolute mismatch)
+        if os.path.exists(extracted_path):
+            target_file = extracted_path
+        else:
+            # Try to find by filename
+            filename = os.path.basename(extracted_path)
+            for root, dirs, files in os.walk(project_root):
+                if filename in files:
+                    target_file = os.path.join(root, filename)
+                    break
     
-    files_to_fix = []
-    if os.path.exists(root_gradle): files_to_fix.append(root_gradle)
-    if app_gradle: files_to_fix.append(app_gradle)
+    # Agar Logs se file nahi mili, to fallback 'build.gradle' (App Level) par jao
+    if not target_file:
+        for root, dirs, files in os.walk(project_root):
+            if "build.gradle" in files and "app" in root:
+                target_file = os.path.join(root, "build.gradle")
+                break
     
-    for gradle_file in files_to_fix:
-        with open(gradle_file, 'r', errors='ignore') as f: content = f.read()
+    if target_file:
+        file_name = os.path.basename(target_file)
+        status_box.write(f"🧐 AI identified issue in: **{file_name}**")
         
-        prompt = """
-        You are an Android Build Expert. The build failed on Java 17 + Gradle 8.
-        Fix the 'build.gradle' file content.
+        with open(target_file, 'r', errors='ignore') as f: current_code = f.read()
         
-        RULES:
-        1. If it's Root gradle: Use 'classpath "com.android.tools.build:gradle:8.0.0"'
-        2. If it's App gradle: Ensure 'namespace' is present (if missing, use package name from manifest logic or generic 'com.example.app').
-        3. Remove deprecated 'jcenter()', use 'mavenCentral()' and 'google()'.
-        4. Output ONLY the code.
+        system_prompt = """
+        You are an elite Android debugger. 
+        Analyze the Error Log and the File Content.
+        Fix the code to resolve the build error.
+        Ensure Java 17 / Gradle 8 compatibility.
+        RETURN ONLY THE CORRECTED CODE. NO EXPLANATION.
         """
         
-        user_msg = f"Error Logs:\n{error_log[-1000:]}\n\nFile Content:\n{content}"
+        user_message = f"""
+        ERROR LOG:
+        {error_log[-2000:]}
+        
+        FILE CONTENT ({file_name}):
+        {current_code}
+        """
         
-        success, new_code = ask_claude(prompt, user_msg)
+        success, ai_fix = ask_claude(system_prompt, user_message)
         
         if success:
-            clean_code = new_code.replace("```gradle", "").replace("```groovy", "").replace("```", "").strip()
-            with open(gradle_file, 'w') as f: f.write(clean_code)
-            status_box.write(f"✅ AI Rewrote {os.path.basename(gradle_file)}")
+            # Clean response
+            cleaned_code = ai_fix.replace("```java", "").replace("```kotlin", "").replace("```xml", "").replace("```gradle", "").replace("```", "").strip()
+            
+            with open(target_file, 'w', encoding='utf-8') as f:
+                f.write(cleaned_code)
+            
+            status_box.write(f"🤖 **AI Message:** I have corrected `{file_name}` to fix the reported error.")
+            return True
+        else:
+            status_box.error("AI API Failed to respond.")
+            return False
+    else:
+        status_box.warning("Could not identify specific broken file from logs. Trying generic fix...")
+        return False
 
-# --- MAIN LOGIC ---
+# --- MAIN UI ---
 uploaded_file = st.file_uploader("Project ZIP Upload", type=["zip"])
 
 if uploaded_file:
-    if st.button("🚀 Start God Mode Build"):
-        status_box = st.status("Initializing God Mode...", expanded=True)
+    if st.button("🚀 Start Terminator Build"):
+        status_box = st.status("Initializing System...", expanded=True)
         
-        # EXTRACT
+        # 1. EXTRACT
         if os.path.exists("project_extract"): shutil.rmtree("project_extract")
         os.makedirs("project_extract", exist_ok=True)
         with open("uploaded.zip", "wb") as f: f.write(uploaded_file.getbuffer())
@@ -137,62 +174,42 @@ if uploaded_file:
         if not project_root:
             st.error("Gradlew not found.")
             st.stop()
-
+            
         subprocess.run(["chmod", "+x", os.path.join(project_root, "gradlew")])
         
-        # === ATTEMPT 1: RAW BUILD ===
-        status_box.write("🔨 Attempt 1: Initial Build...")
-        cmd = ["./gradlew", "clean", "assembleRelease", "--no-daemon", "--stacktrace"]
-        result = subprocess.run(cmd, cwd=project_root, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        # 2. PRE-BUILD MODERNIZATION
+        initial_modernization(project_root, status_box)
         
-        final_success = False
+        # 3. THE LOOP (MAX RETRIES)
+        build_success = False
+        cmd = ["./gradlew", "assembleRelease", "--no-daemon", "--stacktrace"]
         
-        if result.returncode == 0:
-            final_success = True
-        else:
-            # === ATTEMPT 2: FORCE ENGINE UPGRADE ===
-            status_box.write("❌ Attempt 1 Failed. Force-Upgrading Engine...")
-            force_modernize_engine(project_root, status_box)
+        for attempt in range(1, MAX_RETRIES + 1):
+            status_box.write(f"🔄 **Build Attempt {attempt}/{MAX_RETRIES}** is running...")
             
-            status_box.write("🔄 Attempt 2: Rebuilding with Gradle 8...")
             result = subprocess.run(cmd, cwd=project_root, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
             
             if result.returncode == 0:
-                final_success = True
+                build_success = True
+                break # Loop khatam, kaam ho gaya
             else:
-                # === ATTEMPT 3: AI SURGERY (NO IF/ELSE CHECK - ALWAYS RUN) ===
-                status_box.write("❌ Attempt 2 Failed. Activating Claude AI Surgery...")
-                ai_fix_build_gradle(project_root, result.stderr, status_box)
+                status_box.write(f"❌ Build Failed (Attempt {attempt}). AI is analyzing logs...")
                 
-                status_box.write("🔄 Attempt 3: Final Rebuild after AI Fix...")
-                result = subprocess.run(cmd, cwd=project_root, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+                # AI FIXING LOGIC
+                fixed = analyze_and_fix_errors(project_root, result.stderr, status_box)
                 
-                if result.returncode == 0:
-                    final_success = True
-                else:
-                    # === LAST RESORT: Try to find code error ===
-                    logs = result.stderr
-                    match = re.search(r'(/[\w/-]+\.(java|kt|xml)):(\d+):', logs)
-                    if match:
-                        broken_file = match.group(1)
-                        if not os.path.exists(broken_file):
-                             for r, d, f in os.walk(project_root):
-                                if os.path.basename(broken_file) in f:
-                                    broken_file = os.path.join(r, os.path.basename(broken_file))
-                                    break
-                        
-                        if os.path.exists(broken_file):
-                            status_box.write(f"🚑 Emergency Fix on: {os.path.basename(broken_file)}")
-                            with open(broken_file, 'r') as f: c = f.read()
-                            ok, fix = ask_claude("Fix code error. Return ONLY code.", f"Error: {logs[-500:]}\nCode: {c}")
-                            if ok:
-                                with open(broken_file, 'w') as f: f.write(fix.replace("```java","").replace("```","").strip())
-                                result = subprocess.run(cmd, cwd=project_root, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-                                if result.returncode == 0: final_success = True
+                if not fixed:
+                    # Agar AI file nahi dhoond paya, to shayad "clean" ki zaroorat hai
+                    subprocess.run(["./gradlew", "clean"], cwd=project_root)
+                    status_box.write("🧹 AI cleaned the project cache.")
+                
+                # Thora saans lene do system ko
+                time.sleep(1)
 
-        # === FINISH ===
-        if final_success:
-            status_box.update(label="✅ Build Successful! Signing...", state="complete")
+        # 4. FINAL OUTCOME
+        if build_success:
+            status_box.update(label="✅ Build Successful! Signing APK...", state="complete")
+            
             target_apk = None
             for root, dirs, files in os.walk(project_root):
                 for file in files:
@@ -202,15 +219,15 @@ if uploaded_file:
             
             if target_apk:
                 keystore = generate_keystore()
-                signed = "GodMode_App.apk"
+                signed = "AI_Terminator_App.apk"
                 subprocess.run(["zipalign", "-v", "-p", "4", target_apk, "aligned.apk"], stdout=subprocess.DEVNULL)
                 subprocess.run(["apksigner", "sign", "--ks", keystore, "--ks-pass", "pass:android", "--out", signed, "aligned.apk"])
                 
                 with open(signed, "rb") as f:
-                    st.download_button("⬇️ Download APK", f, file_name=signed)
+                    st.download_button("⬇️ Download Final APK", f, file_name=signed)
         else:
             status_box.update(label="❌ Mission Failed", state="error")
-            st.error("Even God Mode couldn't fix this project.")
-            st.text_area("Final Logs", result.stderr[-2000:], height=300)
+            st.error(f"AI tried {MAX_RETRIES} times but could not fix all errors.")
+            st.text_area("Last Error Log", result.stderr[-2000:], height=300)
 
         if os.path.exists("uploaded.zip"): os.remove("uploaded.zip")