github/gpt-pilot
1
1
Fork 0
mirror of https://github.com/Pythagora-io/gpt-pilot.git synced 2026-01-09 21:27:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74 from Pythagora-io/chat

Browse Source 
Chat
This commit is contained in:
LeonOstrez
2025-01-08 18:59:56 +00:00
committed by GitHub
parent 06f58a6da0 6b1e9a2c54
commit f77c2b9420
13 changed files with 95 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/agents/architect.py
View File

@@ -16,7 +16,6 @@ from core.templates.registry import (
PROJECT_TEMPLATES,
ProjectTemplateEnum,
)
from core.ui.base import ProjectStage
ARCHITECTURE_STEP_NAME = "Project architecture"
WARN_SYSTEM_DEPS = ["docker", "kubernetes", "microservices"]
@@ -97,8 +96,6 @@ class Architect(BaseAgent):
display_name = "Architect"
async def run(self) -> AgentResponse:
await self.ui.send_project_stage(ProjectStage.ARCHITECTURE)
spec = self.current_state.specification.clone()
if spec.example_project:

28
core/agents/bug_hunter.py
View File

@@ -5,14 +5,14 @@ from pydantic import BaseModel, Field
from core.agents.base import BaseAgent
from core.agents.convo import AgentConvo
from core.agents.mixins import TestSteps
from core.agents.mixins import ChatWithBreakdownMixin, TestSteps
from core.agents.response import AgentResponse
from core.config import CHECK_LOGS_AGENT_NAME, magic_words
from core.db.models.project_state import IterationStatus
from core.llm.parser import JSONParser
from core.log import get_logger
from core.telemetry import telemetry
from core.ui.base import pythagora_source
from core.ui.base import ProjectStage, pythagora_source
log = get_logger(__name__)
@@ -43,7 +43,7 @@ class ImportantLogsForDebugging(BaseModel):
logs: list[ImportantLog] = Field(description="Important logs that will help the human debug the current bug.")
class BugHunter(BaseAgent):
class BugHunter(ChatWithBreakdownMixin, BaseAgent):
agent_type = "bug-hunter"
display_name = "Bug Hunter"
@@ -93,22 +93,7 @@ class BugHunter(BaseAgent):
convo.assistant(human_readable_instructions)
while True:
chat = await self.ui.ask_question(
"Are you happy with the breakdown? Now is a good time to ask questions or suggest changes.",
buttons={"yes": "Yes, looks good!"},
default="yes",
verbose=False,
)
if chat.button == "yes":
break
if len(convo.messages) > 11:
convo.trim(3, 2)
convo.user(chat.text)
human_readable_instructions: str = await llm(convo)
convo.assistant(human_readable_instructions)
human_readable_instructions = await self.chat_with_breakdown(convo, human_readable_instructions)
convo = (
AgentConvo(self)
@@ -184,6 +169,11 @@ class BugHunter(BaseAgent):
"continue": "Continue without feedback", # DO NOT CHANGE THIS TEXT without changing it in the extension (it is hardcoded)
"start_pair_programming": "Start Pair Programming",
}
await self.ui.send_project_stage(
{
"stage": ProjectStage.ADDITIONAL_FEEDBACK,
}
)
user_feedback = await self.ask_question(
"Please add any additional feedback that could help Pythagora solve this bug",
buttons=buttons,

28
core/agents/developer.py
View File

@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
from core.agents.base import BaseAgent
from core.agents.convo import AgentConvo
from core.agents.mixins import RelevantFilesMixin
from core.agents.mixins import ChatWithBreakdownMixin, RelevantFilesMixin
from core.agents.response import AgentResponse
from core.config import PARSE_TASK_AGENT_NAME, TASK_BREAKDOWN_AGENT_NAME
from core.db.models.project_state import IterationStatus, TaskStatus
@@ -15,6 +15,7 @@ from core.db.models.specification import Complexity
from core.llm.parser import JSONParser
from core.log import get_logger
from core.telemetry import telemetry
from core.ui.base import ProjectStage
log = get_logger(__name__)
@@ -72,7 +73,7 @@ class TaskSteps(BaseModel):
steps: list[Step]
class Developer(RelevantFilesMixin, BaseAgent):
class Developer(ChatWithBreakdownMixin, RelevantFilesMixin, BaseAgent):
agent_type = "developer"
display_name = "Developer"
@@ -230,22 +231,7 @@ class Developer(RelevantFilesMixin, BaseAgent):
response: str = await llm(convo)
convo.assistant(response)
while True:
chat = await self.ask_question(
"Are you happy with the breakdown? Now is a good time to ask questions or suggest changes.",
buttons={"yes": "Yes, looks good!"},
default="yes",
verbose=False,
)
if chat.button == "yes":
break
if len(convo.messages) > 11:
convo.trim(3, 2)
convo.user(chat.text)
response: str = await llm(convo)
convo.assistant(response)
response = await self.chat_with_breakdown(convo, response)
self.next_state.tasks[current_task_index] = {
**current_task,
@@ -322,6 +308,12 @@ class Developer(RelevantFilesMixin, BaseAgent):
description = self.current_state.current_task["description"]
task_index = self.current_state.tasks.index(self.current_state.current_task) + 1
await self.ui.send_project_stage(
{
"stage": ProjectStage.STARTING_TASK,
"task_index": task_index,
}
)
await self.send_message(f"Starting task #{task_index} with the description:\n\n" + description)
if self.current_state.run_command:
await self.ui.send_run_command(self.current_state.run_command)

2
core/agents/frontend.py
View File

@@ -9,6 +9,7 @@ from core.llm.parser import DescriptiveCodeBlockParser
from core.log import get_logger
from core.telemetry import telemetry
from core.templates.registry import PROJECT_TEMPLATES
from core.ui.base import ProjectStage
log = get_logger(__name__)
@@ -106,6 +107,7 @@ class Frontend(FileDiffMixin, BaseAgent):
"""
Continues building the frontend of the app after the initial user input.
"""
await self.ui.send_project_stage({"stage": ProjectStage.FRONTEND})
await self.send_message("Continuing to build UI... This may take a couple of minutes")
llm = self.get_llm(FRONTEND_AGENT_NAME)

48
core/agents/mixins.py
View File

@@ -6,9 +6,10 @@ from pydantic import BaseModel, Field
from core.agents.convo import AgentConvo
from core.agents.response import AgentResponse
from core.config import GET_RELEVANT_FILES_AGENT_NAME, TROUBLESHOOTER_BUG_REPORT
from core.config import GET_RELEVANT_FILES_AGENT_NAME, TASK_BREAKDOWN_AGENT_NAME, TROUBLESHOOTER_BUG_REPORT
from core.llm.parser import JSONParser
from core.log import get_logger
from core.ui.base import ProjectStage
log = get_logger(__name__)
@@ -49,6 +50,48 @@ class TestSteps(BaseModel):
steps: List[Test]
class ChatWithBreakdownMixin:
"""
Provides a method to chat with the user and provide a breakdown of the conversation.
"""
async def chat_with_breakdown(self, convo: AgentConvo, breakdown: str) -> AgentConvo:
"""
Chat with the user and provide a breakdown of the conversation.
:param convo: The conversation object.
:param breakdown: The breakdown of the conversation.
:return: The breakdown.
"""
llm = self.get_llm(TASK_BREAKDOWN_AGENT_NAME, stream_output=True)
while True:
await self.ui.send_project_stage(
{
"stage": ProjectStage.BREAKDOWN_CHAT,
"agent": self.agent_type,
}
)
chat = await self.ask_question(
"Are you happy with the breakdown? Now is a good time to ask questions or suggest changes.",
buttons={"yes": "Yes, looks good!"},
default="yes",
verbose=False,
)
if chat.button == "yes":
break
if len(convo.messages) > 11:
convo.trim(3, 2)
convo.user(chat.text)
breakdown: str = await llm(convo)
convo.assistant(breakdown)
return breakdown
class IterationPromptMixin:
"""
Provides a method to find a solution to a problem based on user feedback.
@@ -83,6 +126,9 @@ class IterationPromptMixin:
test_instructions=json.loads(self.current_state.current_task.get("test_instructions") or "[]"),
)
llm_solution: str = await llm(convo)
llm_solution = await self.chat_with_breakdown(convo, llm_solution)
return llm_solution

7
core/agents/orchestrator.py
View File

@@ -24,7 +24,6 @@ from core.agents.troubleshooter import Troubleshooter
from core.db.models.project_state import IterationStatus, TaskStatus
from core.log import get_logger
from core.telemetry import telemetry
from core.ui.base import ProjectStage
log = get_logger(__name__)
@@ -363,16 +362,10 @@ class Orchestrator(BaseAgent, GitMixin):
await self.ui.loading_finished()
if self.current_state.epics:
await self.ui.send_project_stage(ProjectStage.CODING)
if len(self.current_state.epics) > 3:
# We only want to send previous features, ie. exclude current one and the initial project (first epic)
await self.ui.send_features_list([e["description"] for e in self.current_state.epics[2:-1]])
elif self.current_state.specification.description:
await self.ui.send_project_stage(ProjectStage.ARCHITECTURE)
else:
await self.ui.send_project_stage(ProjectStage.DESCRIPTION)
if self.current_state.specification.description:
await self.ui.send_project_description(self.current_state.specification.description)

3
core/agents/tech_lead.py
View File

@@ -55,8 +55,6 @@ class TechLead(RelevantFilesMixin, BaseAgent):
self.create_initial_project_epic()
return AgentResponse.done(self)
await self.ui.send_project_stage(ProjectStage.CODING)
# if self.current_state.specification.templates and len(self.current_state.files) < 2:
# await self.apply_project_templates()
# self.next_state.action = "Apply project templates"
@@ -260,6 +258,7 @@ class TechLead(RelevantFilesMixin, BaseAgent):
self.next_state.tasks,
)
await self.ui.send_project_stage({"stage": ProjectStage.OPEN_PLAN})
response = await self.ask_question(
"Open and edit your development plan in the Progress tab",
buttons={"done_editing": "I'm done editing, the plan looks good"},

9
core/agents/troubleshooter.py
View File

@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field
from core.agents.base import BaseAgent
from core.agents.convo import AgentConvo
from core.agents.mixins import IterationPromptMixin, RelevantFilesMixin, TestSteps
from core.agents.mixins import ChatWithBreakdownMixin, IterationPromptMixin, RelevantFilesMixin, TestSteps
from core.agents.response import AgentResponse
from core.config import TROUBLESHOOTER_GET_RUN_COMMAND
from core.db.models.file import File
@@ -14,7 +14,7 @@ from core.db.models.project_state import IterationStatus, TaskStatus
from core.llm.parser import JSONParser, OptionalCodeBlockParser
from core.log import get_logger
from core.telemetry import telemetry
from core.ui.base import pythagora_source
from core.ui.base import ProjectStage, pythagora_source
log = get_logger(__name__)
@@ -31,7 +31,7 @@ class RouteFilePaths(BaseModel):
files: list[str] = Field(description="List of paths for files that contain routes")
class Troubleshooter(IterationPromptMixin, RelevantFilesMixin, BaseAgent):
class Troubleshooter(ChatWithBreakdownMixin, IterationPromptMixin, RelevantFilesMixin, BaseAgent):
agent_type = "troubleshooter"
display_name = "Troubleshooter"
@@ -74,6 +74,7 @@ class Troubleshooter(IterationPromptMixin, RelevantFilesMixin, BaseAgent):
self.next_state.flag_tasks_as_modified()
return AgentResponse.done(self)
else:
await self.ui.send_project_stage({"stage": ProjectStage.TEST_APP})
await self.ui.send_message("Test the app by following these steps:", source=pythagora_source)
await self.send_message("")
@@ -277,6 +278,7 @@ class Troubleshooter(IterationPromptMixin, RelevantFilesMixin, BaseAgent):
break
elif user_response.button == "change":
await self.ui.send_project_stage({"stage": ProjectStage.DESCRIBE_CHANGE})
user_description = await self.ask_question(
"Please describe the change you want to make to the project specification (one at a time)",
buttons={"back": "Back"},
@@ -288,6 +290,7 @@ class Troubleshooter(IterationPromptMixin, RelevantFilesMixin, BaseAgent):
break
elif user_response.button == "bug":
await self.ui.send_project_stage({"stage": ProjectStage.DESCRIBE_ISSUE})
user_description = await self.ask_question(
"Please describe the issue you found (one at a time) and share any relevant server logs",
extra_info="collect_logs",

3
core/cli/main.py
View File

@@ -15,7 +15,7 @@ from core.llm.base import APIError, BaseLLMClient
from core.log import get_logger
from core.state.state_manager import StateManager
from core.telemetry import telemetry
from core.ui.base import UIBase, UIClosedError, UserInput, pythagora_source
from core.ui.base import ProjectStage, UIBase, UIClosedError, UserInput, pythagora_source
log = get_logger(__name__)
@@ -188,6 +188,7 @@ async def start_new_project(sm: StateManager, ui: UIBase) -> bool:
while True:
try:
await ui.send_project_stage({"stage": ProjectStage.PROJECT_NAME})
user_input = await ui.ask_question(
"What is the project name?",
allow_empty=False,

16
core/ui/base.py
View File

@@ -5,9 +5,15 @@ from pydantic import BaseModel
class ProjectStage(str, Enum):
DESCRIPTION = "project_description"
ARCHITECTURE = "architecture"
CODING = "coding"
PROJECT_NAME = "project_name"
FRONTEND = "frontend"
OPEN_PLAN = "open_plan"
STARTING_TASK = "starting_task"
BREAKDOWN_CHAT = "breakdown_chat"
TEST_APP = "test_app"
ADDITIONAL_FEEDBACK = "additional_feedback"
DESCRIBE_CHANGE = "describe_change"
DESCRIBE_ISSUE = "describe_issue"
class UIClosedError(Exception):
@@ -206,11 +212,11 @@ class UIBase:
"""
raise NotImplementedError()
async def send_project_stage(self, stage: ProjectStage):
async def send_project_stage(self, data: dict):
"""
Send a project stage to the UI.
:param stage: Project stage.
:param data: Project stage data.
"""
raise NotImplementedError()

4
core/ui/console.py
View File

@@ -3,7 +3,7 @@ from typing import Optional
from prompt_toolkit.shortcuts import PromptSession
from core.log import get_logger
from core.ui.base import ProjectStage, UIBase, UIClosedError, UISource, UserInput
from core.ui.base import UIBase, UIClosedError, UISource, UserInput
log = get_logger(__name__)
@@ -108,7 +108,7 @@ class PlainConsoleUI(UIBase):
return UserInput(button=None, text=choice)
print("Please provide a valid input")
async def send_project_stage(self, stage: ProjectStage):
async def send_project_stage(self, data: dict):
pass
async def send_epics_and_tasks(

6
core/ui/ipc_client.py
View File

@@ -8,7 +8,7 @@ from pydantic import BaseModel, ValidationError
from core.config import LocalIPCConfig
from core.log import get_logger
from core.ui.base import ProjectStage, UIBase, UIClosedError, UISource, UserInput
from core.ui.base import UIBase, UIClosedError, UISource, UserInput
VSCODE_EXTENSION_HOST = "localhost"
VSCODE_EXTENSION_PORT = 8125
@@ -356,8 +356,8 @@ class IPCClientUI(UIBase):
# Empty answer which we don't allow, treat as user cancelled the input
return UserInput(cancelled=True)
async def send_project_stage(self, stage: ProjectStage):
await self._send(MessageType.INFO, content=json.dumps({"project_stage": stage.value}))
async def send_project_stage(self, data: dict):
await self._send(MessageType.INFO, content=json.dumps(data))
async def send_epics_and_tasks(
self,

4
core/ui/virtual.py
View File

@@ -1,7 +1,7 @@
from typing import Optional
from core.log import get_logger
from core.ui.base import ProjectStage, UIBase, UISource, UserInput
from core.ui.base import UIBase, UISource, UserInput
log = get_logger(__name__)
@@ -101,7 +101,7 @@ class VirtualUI(UIBase):
else:
return UserInput(text="")
async def send_project_stage(self, stage: ProjectStage):
async def send_project_stage(self, data: dict):
pass
async def send_epics_and_tasks(