Merge pull request #89 from tanii1125/feature/new-feature

Resolved errors

Author: PrakharDoneria

.gitignore

@@ -24,6 +24,7 @@ contributors_cache.json
 
 # Virtual environments
 venv/
+.venv/
 
 # Token and key files
 token.enc

main.py

@@ -54,4 +54,4 @@ def on_closing():
         root.mainloop()
 
     # Run the UI
-    start_ui()
+    start_ui()

requirements.txt

@@ -5,4 +5,4 @@ PyGithub
 GitPython
 meta-ai-api
 tkhtmlview
-pytest
+tkcode

settings.json

@@ -3,8 +3,8 @@
     "model_source": "",
     "layout": {
         "prompt_view_visible": true,
-        "editor_view_visible": false,
-        "sash_position": null
+        "editor_view_visible": true,
+        "sash_position": 914
     },
     "font_family": "Verdana",
     "font_size": 12,

tests/integration/test_app_flow.py

@@ -0,0 +1,4 @@
+# tests/test_dummy.py
+
+def test_dummy():
+    assert True

tests/integration/test_prompt_to_preview.py

@@ -4,6 +4,7 @@
 import webbrowser
 import tempfile
 import os
+# from code_editor_ui import update_preview
 from core.ai_engine import generate_code_from_prompt, ai_status
 from exporters.exporter import export_code
 from core import prompt_history
@@ -703,19 +704,26 @@ def start_update(self, prompt):
         def update_in_background():
             try:
                 api_key = self.get_api_key()
-                model_source = self.get_model_source()
-                code = generate_code_from_prompt(prompt, api_key, model_source)
+                code = generate_code_from_prompt(prompt, api_key)
                 prompt_history.push_code(code)
                 prompt_history.push_prompt(
-                    "Describe what you'd like to change...\n\nExample: Make the header purple, add a contact form, or change the font to something more modern")
+                    "Describe what you'd like to change...\n\nExample: Make the header purple, add a contact form, or change the font to something more modern"
+                )
                 prompt_history.push_code(code)
-                self.set_code(code)
+
+                # This must be done in the main thread
+                self.after(0, lambda: self.set_code(code))
+                
+                from code_editor_ui import update_preview
                 update_preview(code)
 
-                self.after(0, lambda: self.update_complete())
+                self.after(0, self.update_complete)
 
+            # except Exception as e:
+            #     self.after(0, lambda: self.update_error(str(e)))
             except Exception as e:
-                self.after(0, lambda exc=e: self.update_error(str(exc)))
+                error_message = str(e)
+                self.after(0, lambda: self.update_error(error_message))
 
         threading.Thread(target=update_in_background, daemon=True).start()
 
@@ -727,7 +735,6 @@ def update_complete(self):
             state='normal',
             bg='#1f6feb'
         )
-
         self.update_status("Changes applied successfully!", "✅")
         self.preview_status.configure(text="● Live", fg='#3fb950')
 
@@ -757,12 +764,13 @@ def update_error(self, error_msg):
             state='normal',
             bg='#1f6feb'
         )
-
         self.update_status("Update failed", "❌")
         self.preview_status.configure(text="● Error", fg='#f85149')
-
+        
         status = ai_status.get("state", "unknown")
         message = ai_status.get("message", "")
+        # print(f"status is :{status}, msg: {message}")
+        
         if status == "offline":
             self.show_error(
                 "AI service is currently unavailable. Please check your internet connection or try again later.")

tests/test_dummy.py

@@ -5,12 +5,11 @@
 import os
 import re
 from pathlib import Path
-from utils.preview import update_preview
+
 from ui_items.prompt_view import PromptView
 from ui_items.editor_view import EditorView, open_html_in_browser
 from ui_items.token_manager_view import TokenManagerView
 from contributors_page import ContributorsPage
-from utils.preview import update_preview
 
 from core.ai_engine import ai_status, generate_code_from_prompt
 from exporters.exporter import export_code, export_to_github
@@ -363,9 +362,6 @@ def handle_prompt_generated(self, prompt_text, code):
         self.layout_preview_focus()
 
     # Update embedded preview if available
-    # --- For integration test ---
-        update_preview(code)
-
         try:
             if hasattr(self.editor_view, 'embedded_browser'):
                 formatted_html = self.editor_view.format_html_for_preview(code)
@@ -429,11 +425,12 @@ def toggle_prompt_view(self):
 
 
     def toggle_editor_view(self):
-        is_present = self.editor_view in self.paned_window.panes()
+        #self.editor_view shouls be checked as str
+        is_present = str(self.editor_view) in self.paned_window.panes()
+
         if self.editor_view_visible.get():
             if not is_present:
                 self.paned_window.add(self.editor_view, weight=1)
-
         else:
             if is_present:
                 self.paned_window.forget(self.editor_view)

ui_items/editor_view.py

@@ -2,7 +2,6 @@
 from tkinter import ttk, messagebox
 import threading
 from core.ai_engine import generate_code_from_prompt
-from utils.preview import update_preview
 import core.prompt_history as prompt_history
 from core.ai_engine import ai_status
 from core.ai_engine import optimize_prompt
@@ -359,12 +358,13 @@ def start_generation(self, prompt):
         self.show_progress()
         def generate_in_background():
             try:
+                # Get value from UI BEFORE entering thread
                 api_key = self.get_api_key_callback()
                 model_source = self.get_model_source_callback()
                 final_prompt = prompt
-                if self.enhance_ui_var.get():
+                if self.enhance_ui_var:
                     final_prompt = optimize_prompt(prompt, api_key)
-                code = generate_code_from_prompt(final_prompt, api_key, model_source)
+                code = generate_code_from_prompt(final_prompt, api_key)
                 try:
                     from ui_items.editor_view import HTML_AVAILABLE
                     if HTML_AVAILABLE:
@@ -381,7 +381,7 @@ def generate_in_background():
             except Exception as e:
                 self.after(0, lambda exc=e: self.generation_error(str(exc)))
         threading.Thread(target=generate_in_background, daemon=True).start()
-
+        
     def show_progress(self):
         progress_texts = [
             "🔄 Analyzing your idea...",
@@ -398,7 +398,7 @@ def update_progress():
                 self.after(1500, update_progress)
         update_progress()
 
-    def generation_complete(self, code):
+    def generation_complete(self, code, prompt_text=None):
         self.is_generating = False
         self.generate_btn.configure(
             text="🚀 Generate My Website",
@@ -417,7 +417,7 @@ def generation_complete(self, code):
                 self.show_error(f"Website could not be generated due to an AI service issue")
             return
         self.show_success("Website generated successfully! 🎉")
-        self.on_generate(code)
+        self.on_generate(prompt_text,code)
 
     def generation_error(self, error_msg):
         self.is_generating = False