made minor edits

Project.py

@@ -165,177 +165,171 @@ class Project:
             }
         )
 
-## Functions that interact with the steps button handler ##
-# Generate Scope & Components
-def v4_generate_prd_and_components(progress=gr.Progress()):
-    """Generate PRD and components from project details"""
-    progress(0, desc="Progress 1: Generating PRD from Q&A...")
-    generated_prd = state.quotation_project.execute_prompt(
-        "generate_prd",
-        {
-            "project_detail": state.quotation_project.get_project_detail()
-        }
-    )
-    
-    # Step 2: Generate Components
-    progress(0.4, desc="Progress 2: Generating Planning & Testing Component...")
-    plan_test_component_list = state.quotation_project.execute_prompt(
-        "generate_plan_test_components",
-        {
-            "generated_prd": state.quotation_project.generated_prd
-        }
-    )
-
-    progress(0.7, desc="Progress 3: Generating Development Components...")
-    dev_component_list = state.quotation_project.execute_prompt(
-        "generate_dev_components",
-        {
-            "generated_prd": state.quotation_project.generated_prd
-        }
-    )
-
-    progress(1.0, desc="Complete!")
-    return [
-        generated_prd,
-        generated_prd,
-        plan_test_component_list,
-        plan_test_component_list,
-        dev_component_list,
-        dev_component_list,
-        "Generated PRD and Component List! Click Generate Final Quotation To Generate Quotation"
-    ]
-
-# Generate Plan & Test Mandays + Quotation based on components 
-def v4_generate_mandays_and_quotation(plan_test_component, dev_component, progress=gr.Progress()):
-    state.quotation_project.generated_plan_test_components = plan_test_component
-    state.quotation_project.generated_dev_components = dev_component
-
-    # Generate Plan & Test Mandays 
-    progress(0.5, desc="Progress 1: Generating Mandays for Plan & Test Components...")
-    plan_test_mandays = state.quotation_project.execute_prompt(
-        "generate_plan_test_mandays",
-        {
-            "generated_plan_test_components": plan_test_component
-        }
-    )
-
-    # Generate Dev Mandays 
-    progress(0.7, desc="Progress 2: Generating Mandays for Dev Components...")
-    dev_mandays = state.quotation_project.execute_prompt(
-        "generate_dev_mandays",
-        {
-            "generated_dev_components": dev_component
-        }
-    )
-    
-    print(f"Dev Mandays Result: {dev_mandays}") 
-
-    # Convert the results into dataframe
-    try:
-        plan_test_df = pd.read_csv(StringIO(plan_test_mandays), on_bad_lines='skip')
-        dev_df = pd.read_csv(StringIO(dev_mandays), on_bad_lines='skip')
-
-        # Standardize column names to lowercase
-        plan_test_df.columns = plan_test_df.columns.str.lower()
-        dev_df.columns = dev_df.columns.str.lower()
+    def generate_prd_and_components(self, progress=gr.Progress()):
+        """Generate PRD and components from project details"""
+        progress(0, desc="Progress 1: Generating PRD from Q&A...")
+        generated_prd = self.execute_prompt(
+            "generate_prd",
+            {
+                "project_detail": self.get_project_detail()
+            }
+        )
         
-        # Validate and standardize column names
-        required_plan_test_columns = ['component', 'mandays', 'description']
-        required_dev_columns = ['component', 'subcomponent', 'mandays', 'description']
+        # Step 2: Generate Components
+        progress(0.4, desc="Progress 2: Generating Planning & Testing Component...")
+        plan_test_component_list = self.execute_prompt(
+            "generate_plan_test_components",
+            {
+                "generated_prd": self.generated_prd
+            }
+        )
 
-        # Check and fix plan_test columns
-        if not all(col in plan_test_df.columns for col in required_plan_test_columns):
-            raise ValueError(f"Plan & Test CSV missing required columns. Expected: {required_plan_test_columns}")
+        progress(0.7, desc="Progress 3: Generating Development Components...")
+        dev_component_list = self.execute_prompt(
+            "generate_dev_components",
+            {
+                "generated_prd": self.generated_prd
+            }
+        )
 
-        # Check and fix dev columns
-        if not all(col in dev_df.columns for col in required_dev_columns):
-            raise ValueError(f"Dev CSV missing required columns. Expected: {required_dev_columns}")
+        progress(1.0, desc="Complete!")
+        return [
+            generated_prd,
+            generated_prd,
+            plan_test_component_list,
+            plan_test_component_list,
+            dev_component_list,
+            dev_component_list,
+            "Generated PRD and Component List! Click Generate Final Quotation To Generate Quotation"
+        ]
+
+    def generate_mandays_and_quotation(self, plan_test_component, dev_component, progress=gr.Progress()):
+        self.generated_plan_test_components = plan_test_component
+        self.generated_dev_components = dev_component
+
+        # Generate Plan & Test Mandays 
+        progress(0.5, desc="Progress 1: Generating Mandays for Plan & Test Components...")
+        plan_test_mandays = self.execute_prompt(
+            "generate_plan_test_mandays",
+            {
+                "generated_plan_test_components": plan_test_component
+            }
+        )
 
-        # Convert mandays to numeric, replacing empty values with 0
-        plan_test_df['mandays'] = pd.to_numeric(plan_test_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
-        dev_df['mandays'] = pd.to_numeric(dev_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
+        # Generate Dev Mandays 
+        progress(0.7, desc="Progress 2: Generating Mandays for Dev Components...")
+        dev_mandays = self.execute_prompt(
+            "generate_dev_mandays",
+            {
+                "generated_dev_components": dev_component
+            }
+        )
+        
+        print(f"Dev Mandays Result: {dev_mandays}") 
 
-        total_mandays, total_cost, estimated_months = calculate_mandays_and_costs(plan_test_df, dev_df)
+        # Convert the results into dataframe
+        try:
+            plan_test_df = pd.read_csv(StringIO(plan_test_mandays), on_bad_lines='skip')
+            dev_df = pd.read_csv(StringIO(dev_mandays), on_bad_lines='skip')
 
-        progress(1.0, desc="Complete!")
-        cost_summary = f"""
-            Total Mandays: {total_mandays:.2f} 
-            Total Cost: ${total_cost:,.2f}
-            ({estimated_months:.2}months)
-            """
-        return [plan_test_df, dev_df, "Generated Quotation!", cost_summary]
-    
-    except Exception as e:
-        error_message = f"Error processing CSV data: {str(e)}"
-        return [None, None, error_message, "Error calculating costs"]
-
-# Generate BD & Tech SOW
-def v4_generate_sow(generated_prd, plan_test_component, dev_component, cost, progress=gr.Progress()):
-    state.quotation_project.generated_plan_test_components = plan_test_component
-    state.quotation_project.generated_dev_components = dev_component
-    state.quotation_project.quotation_cost = cost
-
-    # Generate general SOW
-    progress(0.4, desc="Progress 1: Drafting SOW")
-    general_sow = state.quotation_project.execute_prompt(
-        "generate_BD_SOW",
-        {
-            "generated_prd": generated_prd,
-            "generated_plan_test_components": plan_test_component,
-            "generated_dev_components": dev_component,
-            "quotation_cost": cost
-        }
-    )
-
-    # Generate Technical SOW
-    progress(0.8, desc="Progress 2: Drafting Technical SOW")
-    detailed_sow_json = state.quotation_project.execute_prompt(
-        "generate_Tech_SOW",
-        {
-            "generated_plan_test_components": plan_test_component,
-            "generated_dev_components": dev_component
-        }
-    )
+            # Standardize column names to lowercase
+            plan_test_df.columns = plan_test_df.columns.str.lower()
+            dev_df.columns = dev_df.columns.str.lower()
+            
+            # Validate and standardize column names
+            required_plan_test_columns = ['component', 'mandays', 'description']
+            required_dev_columns = ['component', 'subcomponent', 'mandays', 'description']
+
+            # Check and fix plan_test columns
+            if not all(col in plan_test_df.columns for col in required_plan_test_columns):
+                raise ValueError(f"Plan & Test CSV missing required columns. Expected: {required_plan_test_columns}")
+
+            # Check and fix dev columns
+            if not all(col in dev_df.columns for col in required_dev_columns):
+                raise ValueError(f"Dev CSV missing required columns. Expected: {required_dev_columns}")
+
+            # Convert mandays to numeric, replacing empty values with 0
+            plan_test_df['mandays'] = pd.to_numeric(plan_test_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
+            dev_df['mandays'] = pd.to_numeric(dev_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
+
+            total_mandays, total_cost, estimated_months = calculate_mandays_and_costs(plan_test_df, dev_df)
+
+            progress(1.0, desc="Complete!")
+            cost_summary = f"""
+                Total Mandays: {total_mandays:.2f} 
+                Total Cost: ${total_cost:,.2f}
+                ({estimated_months:.2}months)
+                """
+            return [plan_test_df, dev_df, "Generated Quotation!", cost_summary]
+        
+        except Exception as e:
+            error_message = f"Error processing CSV data: {str(e)}"
+            return [None, None, error_message, "Error calculating costs"]
+
+    def generate_sow(self, generated_prd, plan_test_component, dev_component, cost, progress=gr.Progress()):
+        self.generated_plan_test_components = plan_test_component
+        self.generated_dev_components = dev_component
+        self.quotation_cost = cost
+
+        # Generate general SOW
+        progress(0.4, desc="Progress 1: Drafting SOW")
+        general_sow = self.execute_prompt(
+            "generate_BD_SOW",
+            {
+                "generated_prd": generated_prd,
+                "generated_plan_test_components": plan_test_component,
+                "generated_dev_components": dev_component,
+                "quotation_cost": cost
+            }
+        )
 
-    try:
-        # Parse detailed_sow into a JSON object
-        detailed_sow_json = json.loads(detailed_sow_json)
+        # Generate Technical SOW
+        progress(0.8, desc="Progress 2: Drafting Technical SOW")
+        detailed_sow_json = self.execute_prompt(
+            "generate_Tech_SOW",
+            {
+                "generated_plan_test_components": plan_test_component,
+                "generated_dev_components": dev_component
+            }
+        )
 
-        # Extract required fields
-        scope_summary = detailed_sow_json.get("scope_summary", "")
-        modules_and_functional_requirements = detailed_sow_json.get("modules_and_functional_requirements", "")
-        out_of_scope = detailed_sow_json.get("out_of_scope", "")
-        system_flow = detailed_sow_json.get("system_flow", "")
+        try:
+            # Parse detailed_sow into a JSON object
+            detailed_sow_json = json.loads(detailed_sow_json)
 
-        # Combine all fields into detailed_sow
-        detailed_sow = f"{scope_summary}\n\n{modules_and_functional_requirements}\n\n{out_of_scope}\n\n{system_flow}"
+            # Extract required fields
+            scope_summary = detailed_sow_json.get("scope_summary", "")
+            modules_and_functional_requirements = detailed_sow_json.get("modules_and_functional_requirements", "")
+            out_of_scope = detailed_sow_json.get("out_of_scope", "")
+            system_flow = detailed_sow_json.get("system_flow", "")
 
-        # Create final SOW
-        final_general_sow = f"**Hi , some sections of this SOW is generated seprately from the main draft. youll have to move this to the right spot manually ;)\n **Project Quotation:**\n{cost}\n{modules_and_functional_requirements}\n\n {general_sow}\nEOF"
-        return [final_general_sow,final_general_sow, detailed_sow,  detailed_sow, "Generated SOW!"]
-    except Exception as e:
-        return ["Error generating SOW", "Error: " + str(e), "Failed to generate SOW"]
+            # Combine all fields into detailed_sow
+            detailed_sow = f"{scope_summary}\n\n{modules_and_functional_requirements}\n\n{out_of_scope}\n\n{system_flow}"
 
-# Recalculate costs based on modified dataframe values
-def v4_recalculate_cost(plan_test_df, dev_df):
-    """Recalculate costs based on modified dataframe values"""
-    try:
-        # Convert mandays columns to numeric, replacing empty values with 0
-        plan_test_df['mandays'] = pd.to_numeric(plan_test_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
-        dev_df['mandays'] = pd.to_numeric(dev_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
-    
-        # Calculate totals
-        total_mandays, total_cost, estimated_months = calculate_mandays_and_costs(plan_test_df, dev_df)
+            # Create final SOW
+            final_general_sow = f"**Hi , some sections of this SOW is generated seprately from the main draft. youll have to move this to the right spot manually ;)\n **Project Quotation:**\n{cost}\n{modules_and_functional_requirements}\n\n {general_sow}\nEOF"
+            return [final_general_sow, final_general_sow, detailed_sow, detailed_sow, "Generated SOW!"]
+        except Exception as e:
+            return ["Error generating SOW", "Error: " + str(e), "Failed to generate SOW"]
 
-        cost_summary = f"""
-        Total Mandays: {total_mandays:.2f}
-        Total Cost: ${total_cost:,.2f}
-        ({estimated_months:.2}months)
-        """
-        return f"Successfully Updated Quotation. SessionID:{state.quotation_project.session_id}", cost_summary
-    except Exception as e:
-        return f"Error recalculating costs: {str(e)}", f"Error recalculating costs: {str(e)}"
+    def recalculate_cost(self, plan_test_df, dev_df):
+        """Recalculate costs based on modified dataframe values"""
+        try:
+            # Convert mandays columns to numeric, replacing empty values with 0
+            plan_test_df['mandays'] = pd.to_numeric(plan_test_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
+            dev_df['mandays'] = pd.to_numeric(dev_df['mandays'].replace('', '0'), errors='coerce').fillna(0)
+        
+            # Calculate totals
+            total_mandays, total_cost, estimated_months = calculate_mandays_and_costs(plan_test_df, dev_df)
 
+            cost_summary = f"""
+            Total Mandays: {total_mandays:.2f}
+            Total Cost: ${total_cost:,.2f}
+            ({estimated_months:.2}months)
+            """
+            return f"Successfully Updated Quotation. SessionID:{self.session_id}", cost_summary
+        except Exception as e:
+            return f"Error recalculating costs: {str(e)}", f"Error recalculating costs: {str(e)}"
 
 def update_display_mode(mode, content):
     if mode == "Textbox":

app.py

@@ -301,7 +301,7 @@ with gr.Blocks(title="v3 Page Quotation Chatbot (with SOW)", css=custom_css) as
         setup_all_handlers(step_buttons, all_components, page_progress_update, quotation_cost)
         
         page_recalc_btn.click(
-            fn=v4_recalculate_cost,
+            fn=state.quotation_project.recalculate_cost,
             inputs=[
                 all_components['generate_plan_test_mandays']['generated_plan_test_mandays_dataframe'],
                 all_components['generate_dev_mandays']['generated_dev_mandays_dataframe'],

code_modifier.py

@@ -93,7 +93,17 @@ def clean_ai_response(response: str) -> str:
 def analyze_config_structure(config_content: str, project_content: str, current_handlers: str) -> Dict:
     """First AI: Analyzes the current config structure and determines required changes"""
     analysis_prompt = f"""
-    You are an expert software analyzer. Your task is to analyze and focus on the configuration structure and validate the relationships between components.
+    You are an expert software engineer performing a comprehensive analysis.You must analyze the current state of the code WITHOUT relying on any previous context or memory.
+    
+    IMPORTANT RULES:
+    1. ONLY analyze the code provided in this prompt
+    2. DO NOT reference or recall any previous analyses
+    3. DO NOT suggest changes based on previous versions
+    4. ONLY compare against the current files provided
+    5. IGNORE any remembered patterns or previous suggestions
+    
+    Your task is to analyze and focus on the configuration structure and validate the relationships between components.
+    
 
     1. OUTPUT AND INPUT VALIDATION RULES:
        - Not all outputs/inputs require UI component mappings
@@ -121,8 +131,8 @@ def analyze_config_structure(config_content: str, project_content: str, current_
 
     4. NAMING CONVENTION (Source of Truth: Config File)
        MUST CHECK:
-       - Prompt names (e.g., "generate_dev_components")
-       - Component names (e.g., "generated_Tech_SOW_text")
+       - Prompt names (e.g., "generate_dev_components" --> "generate_development_components")
+       - Component names (e.g., "generated_Tech_SOW_text" --> "generated_technical_sow_text")
        - Input/Output references
        
        WHERE TO CHECK:
@@ -139,7 +149,7 @@ def analyze_config_structure(config_content: str, project_content: str, current_
 
     Context Files:
     1. Current Config:
-    {config_content}y
+    {config_content}
 
     2. Project.py:
     {project_content}
@@ -147,7 +157,7 @@ def analyze_config_structure(config_content: str, project_content: str, current_
     3. step_handlers.py:
     {current_handlers}
 
-    Return a JSON analysis with this EXACT structure:
+    Return a JSON analysis with this EXACT structure as shown as an example below:
     {{
         "component_mappings": {{
             "outputs": [
@@ -234,39 +244,40 @@ def generate_code_updates(analysis_result: Dict) -> Dict:
     Analysis Result:
     {json.dumps(analysis_result, indent=2)}
 
-    Generate a JSON response with this EXACT structure:
+    Generate a JSON response with this EXACT structure as shown as an example below:
     {{
         "Project.py": {{
-            "updates": [
-                {{
-                    "location": "exact_location",
-                    "explanation": "detailed_explanation",
-                    "old_code": "existing_code",
-                    "new_code": "updated_code"
-                }}
-            ]
+            "updates": []
         }},
         "step_handlers.py": {{
             "updates": [
                 {{
-                    "location": "exact_location",
-                    "explanation": "detailed_explanation",
-                    "old_code": "existing_code",
-                    "new_code": "updated_code"
+                    "type": "output",  # Must be one of: component, input, output
+                    "location": "step_handlers.py - Step 3 Output Mapping",
+                    "explanation": "Mismatch in prompt name; 'generate_Tech_SOW' should be 'generate_Technical_SOW'",
+                    "old_code": "output_name = 'generate_Tech_SOW'",
+                    "new_code": "output_name = 'generate_Technical_SOW'"
+                }},
+                {{
+                    "type": "component",
+                    "location": "step_handlers.py - Step 3 Component Names",
+                    "explanation": "Component names should reflect the correct prompt name",
+                    "old_code": "generated_Tech_SOW_text, generated_Tech_SOW_markdown",
+                    "new_code": "generated_Technical_SOW_text, generated_Technical_SOW_markdown"
                 }}
             ]
         }}
     }}
 
     Requirements:
-    1. Maintain exact function signatures
-    2. Preserve existing code structure
-    3. Only generate the specific changes needed
-    4. Include clear comments explaining changes
-    5. Each file must have an 'updates' array, even if empty
+    1. Each update MUST include 'type' field with one of: component, input, output
+    2. Maintain exact function signatures
+    3. Preserve existing code structure
+    4. Only generate the specific changes needed
+    5. Include clear comments explaining changes
+    6. Each file must have an 'updates' array, even if empty
 
     IMPORTANT: Return ONLY the JSON object, without any markdown formatting or explanation.
-    Do not include ```json or ``` markers.
     """
     
     try:
@@ -280,12 +291,14 @@ def generate_code_updates(analysis_result: Dict) -> Dict:
         if "step_handlers.py" not in parsed_result:
             parsed_result["step_handlers.py"] = {"updates": []}
             
-        # Ensure updates array exists
-        if "updates" not in parsed_result["Project.py"]:
-            parsed_result["Project.py"]["updates"] = []
-        if "updates" not in parsed_result["step_handlers.py"]:
-            parsed_result["step_handlers.py"]["updates"] = []
-            
+        # Ensure updates array exists and has required fields
+        for file_updates in parsed_result.values():
+            if "updates" not in file_updates:
+                file_updates["updates"] = []
+            for update in file_updates["updates"]:
+                if "type" not in update:
+                    update["type"] = "component"  # Default type if missing
+                    
         return parsed_result
         
     except Exception as e:
@@ -335,6 +348,10 @@ def apply_handler_updates(updates: List[Dict]) -> bool:
             content = f.read()
             
         for update in updates:
+            if not update.get('type') or not update.get('old_code') or not update.get('new_code'):
+                print(f"Skipping invalid update: {update}")
+                continue
+                
             if update['type'] == 'component':
                 # Update component references
                 content = content.replace(update['old_code'], update['new_code'])
@@ -345,9 +362,9 @@ def apply_handler_updates(updates: List[Dict]) -> bool:
                 content = re.sub(pattern, replacement, content)
             elif update['type'] == 'output':
                 # Update output parameters
-                pattern = rf"outputs=\[([^\]]*)\]"
-                replacement = f"outputs=[{update['new_code']}]"
-                content = re.sub(pattern, replacement, content)
+                old_code = update['old_code'].strip()
+                new_code = update['new_code'].strip()
+                content = content.replace(old_code, new_code)
                     
         with open('step_handlers.py', 'w') as f:
             f.write(content)

page_prompts_config.py

@@ -595,7 +595,7 @@ PROMPTS = {
         - Use one of the following:
           - Visual Representation: Diagram illustrating workflows or data flows between modules.
           - Textual Description: Detailed explanation of the processes and transitions 
-        - Use bullet point, ensure simplicity and avoid overly technical langua
+        - Use bullet point, ensure simplicity and avoid overly technical language
         #### **5. Modules and Functional Requirements Breakdown**
         - LEAVE THIS BLANK
         #### **6. Acceptance Criteria**

step_handlers.py

@@ -3,7 +3,7 @@ from Project import *
 def setup_all_handlers(step_buttons, all_components, page_progress_update, quotation_cost):
     """Set up all step handlers with the provided UI components"""
     step_buttons['Step 1 : Scope & Components'].click(
-        fn=v4_generate_prd_and_components,
+        fn=state.quotation_project.generate_prd_and_components,
         inputs=[],
         outputs=[
             all_components['generate_prd']['generated_prd_text'],
@@ -17,7 +17,7 @@ def setup_all_handlers(step_buttons, all_components, page_progress_update, quota
     )
 
     step_buttons['Step 2 : Planning & Testing Mandays'].click(
-        fn=v4_generate_mandays_and_quotation,
+        fn=state.quotation_project.generate_mandays_and_quotation,
         inputs=[
             all_components['generate_plan_test_components']['generated_plan_test_components_text'],
             all_components['generate_dev_components']['generated_dev_components_text']
@@ -31,7 +31,7 @@ def setup_all_handlers(step_buttons, all_components, page_progress_update, quota
     )
 
     step_buttons['Step 3 : SOW Doc'].click(
-    fn=v4_generate_sow,
+    fn=state.quotation_project.generate_sow,
     inputs=[
         all_components['generate_prd']['generated_prd_text'],
         all_components['generate_plan_test_components']['generated_plan_test_components_text'],