corrected agent working

.gitignore

@@ -17,4 +17,8 @@ data/
 docker-compose.override.yml
 .vscode/
 app/__pycache__/
-pnlbs/__pycache__/
+pnlbs/__pycache__/
+AGENT_GUIDE.md
+docker-compose.dev.yml
+agents/financial_agents.py
+agents/financial_tools.py

agents/simple_agent.py

@@ -26,28 +26,6 @@ class FinancialStatementAgent:
             llm=self.llm
         )
     
-    async def generate_all_statements(self, file_path: str, note_numbers: str) -> Dict[str, Any]:
-        """Generate all financial statements from trial balance file"""
-        try:
-            prompt = f"""
-            Generate all financial statements from the trial balance file: {file_path}
-            Note numbers to include: {note_numbers}
-            
-            Please generate in this order:
-            1. Financial notes for note numbers: {note_numbers}
-            2. Balance sheet
-            3. P&L statement  
-            4. Cash flow statement
-            
-            Use the available tools to generate each statement and provide a summary of what was created.
-            """
-            
-            result = await self.agent_executor.ainvoke({"input": prompt})
-            return {"status": "success", "result": result["output"]}
-            
-        except Exception as e:
-            logger.error(f"Error generating statements: {e}")
-            return {"status": "error", "error": str(e)}
     
     async def generate_specific_statement(self, file_path: str, statement_type: str, note_numbers: str) -> Dict[str, Any]:
         """Generate a specific financial statement"""

agents/simple_tools.py

@@ -14,86 +14,66 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-
 @tool
-def generate_notes_from_trial_balance(file_path: str, note_numbers: str = "") -> Dict[str, Any]:
+def generate_notes_full_pipeline_from_path(file_path: str, note_numbers: str = "") -> dict:
     """
-    Generate financial notes from trial balance file
+    Implements the full notes generation pipeline as in /hardcoded route, but as a tool.
     Args:
-        file_path: Path to the trial balance Excel file
-        note_numbers: Optional comma-separated note numbers (e.g., "2,3,4,5"). If empty, generates all notes.
+        file_path: Path to the uploaded Excel file
+        note_numbers: Optional comma-separated note numbers
+    Returns:
+        dict with status, output_xlsx_path, and error if any
     """
-    execution_id = str(uuid.uuid4())[:8]
-    start_time = time.time()
-    tool_name = "generate_notes_from_trial_balance"
-
+    import logging
+    from notes.data_extraction import extract_trial_balance_data, analyze_and_save_results
+    from notes.notes_generator import process_json
+    from notes.json_to_excel import json_to_xlsx
+    logger = logging.getLogger(__name__)
     try:
-        
-    # Copy file to input directory
-        input_dir = "data/input"
-        os.makedirs(input_dir, exist_ok=True)
-        input_file = os.path.join(input_dir, "trial_balance.xlsx")
-        shutil.copy2(file_path, input_file)
-        
-        file_size = os.path.getsize(input_file)
-        
-        
-        # Run notes generation using existing endpoint logic
-        env = os.environ.copy()
-        
-       
-        # Use existing notes generation modules
-        from notes.data_extraction import extract_trial_balance_data
-        from notes.llm_notes_generator import FlexibleFinancialNoteGenerator
-        from notes.json_to_excel import json_to_xlsx
-        
-       
-        # Extract trial balance data
-        trial_balance_data = extract_trial_balance_data(file_path)
-        
-      
-       
-        # Generate notes
-        note_generator = FlexibleFinancialNoteGenerator()
-        
-        if note_numbers.strip():
-            # Generate specific notes
-            note_list = [int(n.strip()) for n in note_numbers.split(',')]
-            generated_notes = {}
-            for i, note_num in enumerate(note_list, 1):
-                note_content = note_generator.generate_note(note_num, trial_balance_data)
-                generated_notes[f"note_{note_num}"] = note_content
-            message = f"Notes generated for: {note_numbers}"
+        os.makedirs("data/input", exist_ok=True)
+        # Copy file to input dir with original name
+        file_location = f"data/input/{os.path.basename(file_path)}"
+        if os.path.abspath(file_path) != os.path.abspath(file_location):
+            shutil.copyfile(file_path, file_location)
+        os.makedirs("data/output1", exist_ok=True)
+        structured_data = extract_trial_balance_data(file_location)
+        output1_json = "data/output1/parsed_trial_balance.json"
+        analyze_and_save_results(structured_data, output1_json)
+        os.makedirs("data/output2", exist_ok=True)
+        process_json(output1_json)
+        notes_json = "data/output2/notes_output.json"
+        with open(notes_json, "r", encoding="utf-8") as f:
+            notes_data = json.load(f)
+        if isinstance(notes_data, dict):
+            for key in ["notes", "trial_balance"]:
+                if key in notes_data:
+                    notes_data = notes_data[key]
+                    break
+        def wrap_notes(notes):
+            return {"notes": notes}
+        if note_numbers:
+            numbers = [n.strip() for n in note_numbers.split(",")]
+            notes_data = [
+                note for note in notes_data
+                if str(note.get('note_number', '')).strip() in numbers
+            ]
+            filtered_json = "data/output2/notes_output_filtered.json"
+            with open(filtered_json, "w", encoding="utf-8") as f2:
+                json.dump(wrap_notes(notes_data), f2, ensure_ascii=False, indent=2)
+            json_input_for_excel = filtered_json
         else:
-            # Generate all notes
-            generated_notes = note_generator.generate_all_notes(trial_balance_data)
-            message = "All notes generated successfully"    
-        # Save notes
-        output_path = "data/generated_notes/notes.json"
-        os.makedirs(os.path.dirname(output_path), exist_ok=True)
-        with open(output_path, 'w') as f:
-            json.dump(generated_notes, f, indent=2)
-        
-        execution_time = round(time.time() - start_time, 2)
-        output_file_size = os.path.getsize(output_path)
-    
-        return {
-            "status": "success",
-            "message": message,
-            "output_path": output_path,
-            "execution_id": execution_id,
-            "execution_time": execution_time
-        }
-            
+            temp_json = "data/output2/notes_output_wrapped.json"
+            with open(temp_json, "w", encoding="utf-8") as f2:
+                json.dump(wrap_notes(notes_data), f2, ensure_ascii=False, indent=2)
+            json_input_for_excel = temp_json
+        os.makedirs("data/output3", exist_ok=True)
+        output3_xlsx = "data/output3/final_output.xlsx"
+        json_to_xlsx(json_input_for_excel, output3_xlsx)
+        return {"status": "success", "output_xlsx_path": output3_xlsx}
     except Exception as e:
-        execution_time = round(time.time() - start_time, 2)
-       
-        return {
-            "status": "error", 
-            "error": str(e), 
-            "execution_id": execution_id,
-            "execution_time": execution_time
-        }
+        logger.error(f"notes_full_pipeline failed: {e}")
+        return {"status": "error", "error": str(e)}
+    
 
 @tool
 def generate_balance_sheet(file_path: str) -> Dict[str, Any]:
@@ -388,7 +368,7 @@ def generate_cash_flow_statement(file_path: str) -> Dict[str, Any]:
 
 # Simplified tool list - only financial statement generation
 FINANCIAL_TOOLS = [
-    generate_notes_from_trial_balance,
+    generate_notes_full_pipeline_from_path,
     generate_balance_sheet,
     generate_pnl_statement,
     generate_cash_flow_statement

app.py

@@ -317,37 +317,85 @@ async def cf_from_notes(file: UploadFile = File(...)):
 async def agent_generate_statements(
     file: UploadFile = File(...),
     note_numbers: str = Form(""),
-    statement_type: str = Form("all")  # all, notes, balance_sheet, pnl, cash_flow
+    statement_type: str = Form("notes")  # notes, balance_sheet, pnl, cash_flow only
 ):
-    """
-    Use AI agent to generate financial statements (Notes/BS/P&L/CF)
+    """Unified intelligent generation endpoint.
+
+    Behaviors:
+    - balance_sheet / pnl / cash_flow: run respective tool directly and return the Excel file
     """
     try:
-        # Save uploaded file
+        # Validate statement_type
+        valid_types = {"balance_sheet", "pnl", "cash_flow", "notes"}
+        if statement_type not in valid_types:
+            raise HTTPException(status_code=400, detail=f"Invalid statement_type: {statement_type}. Allowed: balance_sheet, pnl, cash_flow, notes")
+
+        # Persist uploaded file
         upload_dir = "data/input"
         os.makedirs(upload_dir, exist_ok=True)
         file_path = os.path.join(upload_dir, file.filename)
-        
         with open(file_path, "wb") as buffer:
             shutil.copyfileobj(file.file, buffer)
+
+        # Direct tool imports (lazy to avoid import cost if not needed)
+        from agents.simple_tools import (
+            generate_notes_full_pipeline_from_path,
+            generate_balance_sheet,
+            generate_pnl_statement,
+            generate_cash_flow_statement,
+        )
+
+        # Single statement short‑circuit (return actual file)
+        if statement_type in {"balance_sheet", "pnl", "cash_flow", "notes"}:
+            if statement_type == "notes":
+                output = generate_notes_full_pipeline_from_path(file_path, note_numbers)
+                if output["status"] != "success":
+                    logger.error(f"Notes generation pipeline failed: {output.get('error')}")
+                    raise HTTPException(status_code=500, detail=f"Notes generation pipeline failed: {output.get('error')}")
+                output3_xlsx = output["output_xlsx_path"]
+                return FileResponse(
+                    output3_xlsx,
+                    filename=os.path.basename(output3_xlsx),
+                    media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                )
+
+            if statement_type == "balance_sheet":
+                bs_result = generate_balance_sheet.run({"file_path": file_path}) if hasattr(generate_balance_sheet, "run") else generate_balance_sheet(file_path)
+                if bs_result.get("status") != "success":
+                    raise HTTPException(status_code=500, detail=f"Balance sheet generation failed: {bs_result.get('error')}")
+                # Expect directory with XLSX files
+                output_dir = bs_result.get("output_path", "data/output/")
+                # Choose first xlsx file
+                if os.path.isdir(output_dir):
+                    xlsx_files = [f for f in os.listdir(output_dir) if f.endswith('.xlsx')]
+                    if not xlsx_files:
+                        raise HTTPException(status_code=500, detail="No balance sheet Excel file produced")
+                    output_file = os.path.join(output_dir, xlsx_files[0])
+                else:
+                    output_file = output_dir
+                return FileResponse(output_file, filename=os.path.basename(output_file), media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
+            if statement_type == "pnl":
+                pnl_result = generate_pnl_statement.run({"file_path": file_path}) if hasattr(generate_pnl_statement, "run") else generate_pnl_statement(file_path)
+                if pnl_result.get("status") != "success":
+                    raise HTTPException(status_code=500, detail=f"P&L generation failed: {pnl_result.get('error')}")
+                output_path = pnl_result.get("output_path", "data/pnl_statement.xlsx")
+                if not os.path.exists(output_path):
+                    raise HTTPException(status_code=500, detail="P&L Excel file not found")
+                return FileResponse(output_path, filename=os.path.basename(output_path), media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
+            if statement_type == "cash_flow":
+                cf_result = generate_cash_flow_statement.run({"file_path": file_path}) if hasattr(generate_cash_flow_statement, "run") else generate_cash_flow_statement(file_path)
+                if cf_result.get("status") != "success":
+                    raise HTTPException(status_code=500, detail=f"Cash flow generation failed: {cf_result.get('error')}")
+                output_path = cf_result.get("output_path", "data/cash_flow_statements.xlsx")
+                if not os.path.exists(output_path):
+                    raise HTTPException(status_code=500, detail="Cash flow Excel file not found")
+                return FileResponse(output_path, filename=os.path.basename(output_path), media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
         
-        # Initialize financial statement agent
-        agent = FinancialStatementAgent()
-        
-        # Generate requested statements
-        if statement_type == "all":
-            result = await agent.generate_all_statements(file_path, note_numbers)
-        else:
-            result = await agent.generate_specific_statement(file_path, statement_type, note_numbers)
-        
-        return JSONResponse(content={
-            "message": f"Financial statement generation completed: {statement_type}",
-            "file_processed": file.filename,
-            "note_numbers": note_numbers,
-            "statement_type": statement_type,
-            "result": result
-        })
-        
+    except HTTPException:
+        raise
     except Exception as e:
         logger.error(f"Error in agent statement generation: {e}")
         raise HTTPException(status_code=500, detail=f"Agent generation failed: {str(e)}")

docker-compose.yml

@@ -1,16 +1,13 @@
-version: '3.8'
 
 services:
   finryver:
     build: .
-    container_name: finryver-app
+    container_name: finryver
     ports:
       - "8000:8000"
     volumes:
-      # Mount data directory for persistent storage
-      - ./data:/app/data
-      # Mount config directory for business rules
-      - ./config:/app/config
+      # Bind mount entire project for live code edits (includes data & config)
+      - .:/app
     environment:
       - PYTHONUNBUFFERED=1
       - PORT=8000
@@ -28,10 +25,3 @@ services:
       retries: 3
       start_period: 40s
 
-  # Optional: Add Redis for caching (future enhancement)
-  # redis:
-  #   image: redis:7-alpine
-  #   container_name: finryver-redis
-  #   ports:
-  #     - "6379:6379"
-  #   restart: unless-stopped