req updated

Dockerfile

@@ -24,6 +24,7 @@ RUN apt-get update && apt-get install -y \
 COPY requirements.txt ./
 COPY src/ ./src/
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY frontend/app/dist/ /app/src/static/
 
 RUN python3 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"

frontend/app/src/App.jsx

@@ -348,10 +348,11 @@ function WSListener() {
         });
         setShowDiffForFile(data.filename || selectedFile?.name);
       }
-      console.log(data)
-      if (data.kind === "agent_message") {
-        pushChat({ role: "agent", text: `${data.output}`});
-      }
+    });
+
+    socket.on("log", (data) => {
+      console.log("WS message:", data);
+      pushChat({ role: "agent", text: `${data.msg}`});
     });
 
     socket.on("disconnect", () => {

src/app.py

@@ -14,7 +14,11 @@ from flask_socketio import SocketIO, emit
 
 event_queue = queue.Queue()
 
-app = Flask(__name__, static_folder='../frontend/app/dist', static_url_path='/')
+if "SPACE_ID" in os.environ:
+    app = Flask(__name__, static_folder='static', static_url_path='/')
+else:
+    app = Flask(__name__, static_folder='../frontend/app/dist', static_url_path='/')
+
 socketio = SocketIO(app, cors_allowed_origins="*")
 
 __all__ = ["app", "socketio"]

src/codeagent/src/codeagent/crews/SqlCrew/sqlcrew.py

@@ -5,16 +5,13 @@ from crewai.agents.agent_builder.base_agent import BaseAgent
 import sys
 import os
 
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../..")))
-from app import socketio
-
 from codeagent.src.codeagent.tools.custom_tools import execute_sql_file, get_files_and_schema, propose_code_changes, get_recent_query_result
 
 llm = LLM(model="ollama/llama3.1:8b-instruct-q4_0", base_url="http://localhost:11434")
 
 
-def send_chat_message(output: str) -> None:
-    socketio.emit("event", {'kind':'agent_message', 'output': output})
+# def send_chat_message(output: str) -> None:
+#     socketio.emit("event", {'kind':'agent_message', 'output': output})
 
 @CrewBase
 class SqlCrew:

src/codeagent/src/codeagent/main.py

@@ -5,11 +5,31 @@ from crewai.flow import Flow, listen, start
 from crewai import Agent, LLM
 
 from typing import Literal
+import sys
+import os
 
 
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../..")))
+from app import socketio
+
 # from codeagent.src.codeagent.crews.git_crew.git_crew import GitCrew
 from codeagent.src.codeagent.crews.SqlCrew.sqlcrew import SqlCrew
 
+from io import TextIOWrapper
+
+class SocketWriter(TextIOWrapper):
+    def __init__(self, emit_func):
+        self.emit = emit_func
+        super().__init__(None, write_through=True)
+
+    def write(self, text):
+        if text.strip():
+            self.emit('log', {'msg': text.strip()})
+        super().write(text)
+
+old_stdout = sys.stdout
+sys.stdout = SocketWriter(lambda event, data: socketio.emit(event, data))
+
 class FlowState(BaseModel):
     user_input: str = ""
     decision: str = ""
@@ -59,13 +79,13 @@ class CodeAgentFlow(Flow[FlowState]):
         elif self.state.decision == "SqlCrew":
             result = SqlCrew().crew().kickoff(inputs={"task": self.state.user_input})
             self.state.result = result.raw
+            sys.stdout = old_stdout
         else:
             self.state.result = f"Invalid decision from router: {self.state.decision}"
 
 
     @listen(decide_crew)
     def save_result(self):
-        print("Saving result...")
         with open("crew_result.txt", "w") as f:
             f.write(self.state.result)
 
@@ -81,6 +101,3 @@ def plot():
     code_agent_flow.plot()
 
 
-if __name__ == "__main__":
-    # Example kickoff
-    kickoff("please push my changes to git repository")