Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Cleanup; Add Smol template [WIP]; Choose agent implementation based on config template

Tomas Valenta1f52af6bb8a0
diff --git a/api-service/agent/basic_agent.py b/api-service/agent/basic_agent.py
index 4ad8c650c..9a5aa4abc 100644
--- a/api-service/agent/basic_agent.py
+++ b/api-service/agent/basic_agent.py
@@ -1,12 +1,11 @@
import asyncio
-import math
import uuid
import chevron
# Monkey patch chevron to not escape html
chevron.render.__globals__["_html_escape"] = lambda string: string
-from typing import Any, Dict, List, Literal, Tuple, cast
+from typing import Any, Dict, List, Literal, cast
from langchain.agents.tools import InvalidTool
from langchain.callbacks.base import AsyncCallbackManager
from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
@@ -144,11 +143,10 @@ class BasicAgent(AgentBase):
] = [
SystemMessage(content=system_template),
HumanMessage(content=human_template),
- AIMessagePromptTemplate.from_template("{repo_context}"),
AIMessagePromptTemplate.from_template("{agent_scratchpad}"),
]
return ChatPromptTemplate(
- input_variables=["agent_scratchpad", "repo_context"],
+ input_variables=["agent_scratchpad"],
messages=messages,
)
@@ -166,8 +164,6 @@ class BasicAgent(AgentBase):
# Create playground for code tools
playground = NodeJSPlayground(get_envs=self.get_envs)
- await playground.checkout_repo(instructions["RepoURL"], "/repo")
-
tools = list(create_tools(playground=playground))
self.tool_names = [tool.name for tool in tools]
tool_map = {tool.name: tool for tool in tools}
@@ -186,38 +182,6 @@ class BasicAgent(AgentBase):
verbose=True,
)
- repo_files: List[Tuple[str, str]] = []
- async for file in playground.get_files(
- "/repo",
- [
- "node_modules",
- ".git",
- "package-lock.json",
- ".next",
- "tsconfig.json",
- "yarn.lock",
- "package.json",
- ],
- ):
- repo_files.append(file)
-
- vectordb = await get_memory(self.config, repo_files)
-
- async def get_repo_context(prompt: str):
- docs = await vectordb.asimilarity_search(
- prompt,
- k=min(3, len(repo_files)),
- )
-
- print("getting docs >>>", [doc.metadata["path"] for doc in docs])
-
- return "Relevant files in the initial codebase:\n\n" + "\n".join(
- [
- f"{doc.metadata['path']}\n```\n({doc.page_content})\n```\n"
- for doc in docs
- ]
- )
-
# -----
# Create log handlers
# Used for sending logs to db/frontend without blocking
@@ -270,17 +234,10 @@ class BasicAgent(AgentBase):
await self._check_interrupt()
# Query the LLM in background
scratchpad = get_agent_scratchpad()
- repo_context = await get_repo_context(
- prompt=prompt.format_prompt(
- agent_scratchpad=scratchpad, repo_context=""
- ).to_string(),
- )
-
self.llm_generation = asyncio.create_task(
llm_chain.agenerate(
[
{
- "repo_context": repo_context,
"agent_scratchpad": scratchpad,
"stop": "Observation:",
}
@@ -325,7 +282,7 @@ class BasicAgent(AgentBase):
except RewriteStepsException:
print("REWRITING")
continue
- await playground.push_repo()
+
except:
raise
finally:
diff --git a/api-service/agent/from_template.py b/api-service/agent/from_template.py
new file mode 100644
index 000000000..0e9f0bd9f
--- /dev/null
+++ b/api-service/agent/from_template.py
@@ -0,0 +1,13 @@
+from agent.basic_agent import BasicAgent
+from agent.stripe_agent import StripeAgent
+from agent.smol_agent import SmolAgent
+
+
+def get_agent_factory_from_template(template_id: str):
+ match template_id:
+ case "smol":
+ return SmolAgent.create
+ case "stripe":
+ return StripeAgent.create
+ case _:
+ return BasicAgent.create
diff --git a/api-service/agent/smol_agent.py b/api-service/agent/smol_agent.py
new file mode 100644
index 000000000..5e82caea4
--- /dev/null
+++ b/api-service/agent/smol_agent.py
@@ -0,0 +1,418 @@
+import asyncio
+import math
+import uuid
+import chevron
+
+# Monkey patch chevron to not escape html
+chevron.render.__globals__["_html_escape"] = lambda string: string
+
+from typing import Any, Dict, List, Literal, Tuple, cast
+from langchain.agents.tools import InvalidTool
+from langchain.callbacks.base import AsyncCallbackManager
+from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
+from langchain.chains.llm import LLMChain
+from langchain.schema import BaseMessage, SystemMessage, HumanMessage
+from langchain.tools import BaseTool
+from langchain.prompts.chat import (
+ AIMessagePromptTemplate,
+ BaseMessagePromptTemplate,
+ ChatPromptTemplate,
+)
+
+from .memory import get_memory
+from agent.base import (
+ AgentInteraction,
+ OnLogs,
+ OnInteractionRequest,
+)
+from agent.output.parse_output import ToolLog
+from agent.output.output_stream_parser import OutputStreamParser, Step
+from agent.output.token_callback_handler import TokenCallbackHandler
+from agent.output.work_queue import WorkQueue
+from agent.tools.base import create_tools
+from models.base import ModelConfig, PromptPart, get_model
+from agent.base import AgentBase, AgentInteractionRequest, GetEnvs
+from session import NodeJSPlayground
+
+
+class RewriteStepsException(Exception):
+ pass
+
+
+class SmolAgent(AgentBase):
+ max_run_time = 60 * 60 * 24 # in seconds
+
+ def __init__(
+ self,
+ config: Any,
+ get_envs: GetEnvs,
+ on_logs: OnLogs,
+ on_interaction_request: OnInteractionRequest,
+ ):
+ super().__init__()
+ self._start_loop: asyncio.Task | None = None
+ self.get_envs = get_envs
+ self.config = ModelConfig(**config)
+ self.on_interaction_request = on_interaction_request
+ self.on_logs = on_logs
+ self.should_pause = False
+ self.canceled = False
+ self.rewriting_steps = False
+ self.llm_generation = None
+ self.can_resume = asyncio.Event()
+
+ @classmethod
+ async def create(
+ cls,
+ config: Any,
+ get_envs: GetEnvs,
+ on_logs: OnLogs,
+ on_interaction_request: OnInteractionRequest,
+ ):
+ return cls(
+ config,
+ get_envs,
+ on_logs,
+ on_interaction_request,
+ )
+
+ @staticmethod
+ async def _run_tool(
+ tool_log: ToolLog,
+ name_to_tool_map: Dict[str, BaseTool],
+ ) -> str:
+ # Otherwise we lookup the tool
+ if tool_log["tool_name"] in name_to_tool_map:
+ tool = name_to_tool_map[tool_log["tool_name"]]
+ # We then call the tool on the tool input to get an observation
+ observation = await tool.arun(
+ tool_log["tool_input"],
+ verbose=True,
+ )
+ else:
+ observation = await InvalidTool().arun( # type: ignore
+ tool_name=tool_log["tool_name"],
+ tool_input=tool_log["tool_input"],
+ verbose=True,
+ )
+ return observation
+
+ @staticmethod
+ def _get_prompt_part(
+ prompts: List[PromptPart],
+ role: Literal["user", "system"],
+ type: str,
+ ):
+ return (
+ next(
+ prompt
+ for prompt in prompts
+ if prompt.role == role and prompt.type == type
+ )
+ # Double the parenthesses to escape them because the string will be prompt templated.
+ .content
+ )
+
+ @staticmethod
+ def _create_prompt(
+ config: ModelConfig,
+ tools: List[BaseTool],
+ instructions: Any,
+ ):
+ system_template = chevron.render(
+ "\n\n".join(
+ [
+ SmolAgent._get_prompt_part(config.prompt, "system", "prefix"),
+ "\n".join([f"{tool.name}: {tool.description}" for tool in tools]),
+ SmolAgent._get_prompt_part(config.prompt, "system", "suffix"),
+ ]
+ ),
+ instructions,
+ )
+
+ human_template = chevron.render(
+ "\n\n".join(
+ [
+ SmolAgent._get_prompt_part(config.prompt, "user", "prefix"),
+ ]
+ ),
+ instructions,
+ )
+
+ messages: List[
+ BaseMessage | BaseMessagePromptTemplate | SystemMessage | HumanMessage
+ ] = [
+ SystemMessage(content=system_template),
+ HumanMessage(content=human_template),
+ AIMessagePromptTemplate.from_template("{repo_context}"),
+ AIMessagePromptTemplate.from_template("{agent_scratchpad}"),
+ ]
+ return ChatPromptTemplate(
+ input_variables=["agent_scratchpad", "repo_context"],
+ messages=messages,
+ )
+
+ async def _run(self, instructions: Any):
+ playground = None
+ try:
+ # -----
+ # Initialize callback manager and handler for controlling token stream
+ callback_manager = AsyncCallbackManager([StreamingStdOutCallbackHandler()])
+ self.token_handler = TokenCallbackHandler()
+ callback_manager.add_handler(self.token_handler)
+
+ # -----
+ # Create tools
+ # Create playground for code tools
+ playground = NodeJSPlayground(get_envs=self.get_envs)
+
+ await playground.checkout_repo(instructions["RepoURL"], "/repo")
+
+ tools = list(create_tools(playground=playground))
+ self.tool_names = [tool.name for tool in tools]
+ tool_map = {tool.name: tool for tool in tools}
+
+ # Assign callback manager to tools
+ for tool in tools:
+ tool.callback_manager = callback_manager
+
+ # -----
+ # Create LLM from specified models
+ prompt = self._create_prompt(self.config, tools, instructions)
+ llm_chain = LLMChain(
+ llm=get_model(self.config, callback_manager),
+ prompt=prompt,
+ callback_manager=callback_manager,
+ verbose=True,
+ )
+
+ repo_files: List[Tuple[str, str]] = []
+ async for file in playground.get_files(
+ "/repo",
+ [
+ "node_modules",
+ ".git",
+ "package-lock.json",
+ ".next",
+ "tsconfig.json",
+ "yarn.lock",
+ "package.json",
+ ],
+ ):
+ repo_files.append(file)
+
+ vectordb = await get_memory(self.config, repo_files)
+
+ async def get_repo_context(prompt: str):
+ docs = await vectordb.asimilarity_search(
+ prompt,
+ k=min(3, len(repo_files)),
+ )
+
+ print("getting docs >>>", [doc.metadata["path"] for doc in docs])
+
+ return "Relevant files in the initial codebase:\n\n" + "\n".join(
+ [
+ f"{doc.metadata['path']}\n```\n({doc.page_content})\n```\n"
+ for doc in docs
+ ]
+ )
+
+ # -----
+ # Create log handlers
+ # Used for sending logs to db/frontend without blocking
+ steps_streamer = WorkQueue[List[Step]](
+ on_workload=lambda steps: self.on_logs(steps),
+ )
+
+ def stream_steps(steps: List[Step]):
+ steps_streamer.schedule(steps)
+
+ # Used for parsing token stream into logs+actions
+ self._output_parser = OutputStreamParser(tool_names=self.tool_names)
+
+ # This function is used to inject information from previous steps to the current prompt
+ # TODO: Improve the scratchpad handling and prompts for templates
+ def get_agent_scratchpad():
+ steps = self._output_parser.get_steps()
+
+ if (
+ len(steps) == 0
+ or len(steps) == 1
+ and not self._output_parser._token_buffer
+ ):
+ return ""
+
+ agent_scratchpad = ""
+ for step in steps:
+ agent_scratchpad += step["output"]
+
+ tool_logs = (
+ cast(ToolLog, action)
+ for action in step["logs"]
+ if action["type"] == "tool"
+ )
+
+ tool_outputs = "\n".join(
+ log.get("tool_output", "")
+ for log in tool_logs
+ if log.get("tool_output")
+ )
+
+ if tool_outputs:
+ agent_scratchpad += f"\nObservation: {tool_outputs}\nThought:"
+
+ return f"This is my previous work (I will continue where I left off):\n{agent_scratchpad}"
+
+ print("Generating...", flush=True)
+ while True:
+ try:
+ await self._check_interrupt()
+ # Query the LLM in background
+ scratchpad = get_agent_scratchpad()
+ repo_context = await get_repo_context(
+ prompt=prompt.format_prompt(
+ agent_scratchpad=scratchpad, repo_context=""
+ ).to_string(),
+ )
+
+ self.llm_generation = asyncio.create_task(
+ llm_chain.agenerate(
+ [
+ {
+ "repo_context": repo_context,
+ "agent_scratchpad": scratchpad,
+ "stop": "Observation:",
+ }
+ ]
+ )
+ )
+ while True:
+ await self._check_interrupt()
+ # Consume the tokens from LLM
+ token = await self.token_handler.retrieve_token()
+
+ if token is None:
+ break
+
+ await self._check_interrupt()
+ self._output_parser.ingest_token(token)
+ stream_steps(self._output_parser.get_steps())
+
+ current_step = self._output_parser.get_current_step()
+
+ # Check if the run is finished
+ if any(
+ keyword in current_step["output"]
+ for keyword in ("Final Answer", "FinalAnswer", "Finished")
+ ):
+ break
+
+ for tool in (
+ cast(ToolLog, action)
+ for action in current_step["logs"]
+ if action["type"] == "tool"
+ ):
+ await self._check_interrupt()
+ tool_output = await self._run_tool(
+ tool,
+ name_to_tool_map=tool_map,
+ )
+ await self._check_interrupt()
+ self._output_parser.ingest_tool_output(tool_output)
+ stream_steps(self._output_parser.get_steps())
+
+ except RewriteStepsException:
+ print("REWRITING")
+ continue
+ await playground.push_repo()
+ except:
+ raise
+ finally:
+ if playground is not None:
+ playground.close()
+ await self.on_interaction_request(
+ AgentInteractionRequest(
+ interaction_id=str(uuid.uuid4()),
+ type="done",
+ )
+ )
+
+ async def _check_interrupt(self):
+ if self.canceled:
+ raise Exception("Canceled")
+
+ if self.should_pause:
+ await self.can_resume.wait()
+ self.can_resume.clear()
+
+ if self.rewriting_steps:
+ self.rewriting_steps = False
+ raise RewriteStepsException()
+
+ async def _start(self, instructions: Any):
+ print("Start agent run")
+
+ async def start_with_timeout():
+ try:
+ self._start_loop = asyncio.create_task(
+ self._run(instructions=instructions),
+ )
+
+ await asyncio.wait_for(
+ self._start_loop,
+ timeout=self.max_run_time,
+ )
+ except asyncio.TimeoutError:
+ await self.stop()
+ print("Timeout")
+
+ asyncio.create_task(
+ start_with_timeout(),
+ )
+
+ async def _pause(self):
+ print("Pause agent run")
+ self.should_pause = True
+
+ async def _resume(self):
+ print("Resume agent run")
+ self.should_pause = False
+ self.can_resume.set()
+
+ async def _rewrite_steps(self, steps: List[Step]):
+ print("Rewrite agent run steps")
+ await self._pause()
+ self.rewriting_steps = True
+ if self.llm_generation:
+ self.llm_generation.cancel()
+ # TODO: Communicate the rewriting in model prompt - inform about what was rewritten.
+ # TODO: Handle token that is generated after a rewrite - if the current step seems "finished" the model still outputs string (usually something like . or :).
+ self._output_parser = OutputStreamParser(
+ tool_names=self.tool_names,
+ steps=steps[:-1],
+ buffered_step=steps[-1],
+ )
+ await self._resume()
+
+ async def interaction(self, interaction: AgentInteraction):
+ print("Agent interaction")
+ match interaction.type:
+ case "pause":
+ await self._pause()
+ case "resume":
+ await self._resume()
+ case "start":
+ await self._start(interaction.data["instructions"])
+ case "rewrite_steps":
+ await self._rewrite_steps(interaction.data["steps"])
+ case _:
+ raise Exception(f"Unknown interaction action: {interaction.type}")
+
+ async def stop(self):
+ print("Cancel agent run")
+ self.canceled = True
+ if self.llm_generation:
+ self.llm_generation.cancel()
+ if self._start_loop:
+ self._start_loop.cancel()
diff --git a/api-service/agent/stripe_agent.py b/api-service/agent/stripe_agent.py
new file mode 100644
index 000000000..76cdae63f
--- /dev/null
+++ b/api-service/agent/stripe_agent.py
@@ -0,0 +1,418 @@
+import asyncio
+import math
+import uuid
+import chevron
+
+# Monkey patch chevron to not escape html
+chevron.render.__globals__["_html_escape"] = lambda string: string
+
+from typing import Any, Dict, List, Literal, Tuple, cast
+from langchain.agents.tools import InvalidTool
+from langchain.callbacks.base import AsyncCallbackManager
+from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
+from langchain.chains.llm import LLMChain
+from langchain.schema import BaseMessage, SystemMessage, HumanMessage
+from langchain.tools import BaseTool
+from langchain.prompts.chat import (
+ AIMessagePromptTemplate,
+ BaseMessagePromptTemplate,
+ ChatPromptTemplate,
+)
+
+from .memory import get_memory
+from agent.base import (
+ AgentInteraction,
+ OnLogs,
+ OnInteractionRequest,
+)
+from agent.output.parse_output import ToolLog
+from agent.output.output_stream_parser import OutputStreamParser, Step
+from agent.output.token_callback_handler import TokenCallbackHandler
+from agent.output.work_queue import WorkQueue
+from agent.tools.base import create_tools
+from models.base import ModelConfig, PromptPart, get_model
+from agent.base import AgentBase, AgentInteractionRequest, GetEnvs
+from session import NodeJSPlayground
+
+
+class RewriteStepsException(Exception):
+ pass
+
+
+class StripeAgent(AgentBase):
+ max_run_time = 60 * 60 * 24 # in seconds
+
+ def __init__(
+ self,
+ config: Any,
+ get_envs: GetEnvs,
+ on_logs: OnLogs,
+ on_interaction_request: OnInteractionRequest,
+ ):
+ super().__init__()
+ self._start_loop: asyncio.Task | None = None
+ self.get_envs = get_envs
+ self.config = ModelConfig(**config)
+ self.on_interaction_request = on_interaction_request
+ self.on_logs = on_logs
+ self.should_pause = False
+ self.canceled = False
+ self.rewriting_steps = False
+ self.llm_generation = None
+ self.can_resume = asyncio.Event()
+
+ @classmethod
+ async def create(
+ cls,
+ config: Any,
+ get_envs: GetEnvs,
+ on_logs: OnLogs,
+ on_interaction_request: OnInteractionRequest,
+ ):
+ return cls(
+ config,
+ get_envs,
+ on_logs,
+ on_interaction_request,
+ )
+
+ @staticmethod
+ async def _run_tool(
+ tool_log: ToolLog,
+ name_to_tool_map: Dict[str, BaseTool],
+ ) -> str:
+ # Otherwise we lookup the tool
+ if tool_log["tool_name"] in name_to_tool_map:
+ tool = name_to_tool_map[tool_log["tool_name"]]
+ # We then call the tool on the tool input to get an observation
+ observation = await tool.arun(
+ tool_log["tool_input"],
+ verbose=True,
+ )
+ else:
+ observation = await InvalidTool().arun( # type: ignore
+ tool_name=tool_log["tool_name"],
+ tool_input=tool_log["tool_input"],
+ verbose=True,
+ )
+ return observation
+
+ @staticmethod
+ def _get_prompt_part(
+ prompts: List[PromptPart],
+ role: Literal["user", "system"],
+ type: str,
+ ):
+ return (
+ next(
+ prompt
+ for prompt in prompts
+ if prompt.role == role and prompt.type == type
+ )
+ # Double the parenthesses to escape them because the string will be prompt templated.
+ .content
+ )
+
+ @staticmethod
+ def _create_prompt(
+ config: ModelConfig,
+ tools: List[BaseTool],
+ instructions: Any,
+ ):
+ system_template = chevron.render(
+ "\n\n".join(
+ [
+ StripeAgent._get_prompt_part(config.prompt, "system", "prefix"),
+ "\n".join([f"{tool.name}: {tool.description}" for tool in tools]),
+ StripeAgent._get_prompt_part(config.prompt, "system", "suffix"),
+ ]
+ ),
+ instructions,
+ )
+
+ human_template = chevron.render(
+ "\n\n".join(
+ [
+ StripeAgent._get_prompt_part(config.prompt, "user", "prefix"),
+ ]
+ ),
+ instructions,
+ )
+
+ messages: List[
+ BaseMessage | BaseMessagePromptTemplate | SystemMessage | HumanMessage
+ ] = [
+ SystemMessage(content=system_template),
+ HumanMessage(content=human_template),
+ AIMessagePromptTemplate.from_template("{repo_context}"),
+ AIMessagePromptTemplate.from_template("{agent_scratchpad}"),
+ ]
+ return ChatPromptTemplate(
+ input_variables=["agent_scratchpad", "repo_context"],
+ messages=messages,
+ )
+
+ async def _run(self, instructions: Any):
+ playground = None
+ try:
+ # -----
+ # Initialize callback manager and handler for controlling token stream
+ callback_manager = AsyncCallbackManager([StreamingStdOutCallbackHandler()])
+ self.token_handler = TokenCallbackHandler()
+ callback_manager.add_handler(self.token_handler)
+
+ # -----
+ # Create tools
+ # Create playground for code tools
+ playground = NodeJSPlayground(get_envs=self.get_envs)
+
+ await playground.checkout_repo(instructions["RepoURL"], "/repo")
+
+ tools = list(create_tools(playground=playground))
+ self.tool_names = [tool.name for tool in tools]
+ tool_map = {tool.name: tool for tool in tools}
+
+ # Assign callback manager to tools
+ for tool in tools:
+ tool.callback_manager = callback_manager
+
+ # -----
+ # Create LLM from specified models
+ prompt = self._create_prompt(self.config, tools, instructions)
+ llm_chain = LLMChain(
+ llm=get_model(self.config, callback_manager),
+ prompt=prompt,
+ callback_manager=callback_manager,
+ verbose=True,
+ )
+
+ repo_files: List[Tuple[str, str]] = []
+ async for file in playground.get_files(
+ "/repo",
+ [
+ "node_modules",
+ ".git",
+ "package-lock.json",
+ ".next",
+ "tsconfig.json",
+ "yarn.lock",
+ "package.json",
+ ],
+ ):
+ repo_files.append(file)
+
+ vectordb = await get_memory(self.config, repo_files)
+
+ async def get_repo_context(prompt: str):
+ docs = await vectordb.asimilarity_search(
+ prompt,
+ k=min(3, len(repo_files)),
+ )
+
+ print("getting docs >>>", [doc.metadata["path"] for doc in docs])
+
+ return "Relevant files in the initial codebase:\n\n" + "\n".join(
+ [
+ f"{doc.metadata['path']}\n```\n({doc.page_content})\n```\n"
+ for doc in docs
+ ]
+ )
+
+ # -----
+ # Create log handlers
+ # Used for sending logs to db/frontend without blocking
+ steps_streamer = WorkQueue[List[Step]](
+ on_workload=lambda steps: self.on_logs(steps),
+ )
+
+ def stream_steps(steps: List[Step]):
+ steps_streamer.schedule(steps)
+
+ # Used for parsing token stream into logs+actions
+ self._output_parser = OutputStreamParser(tool_names=self.tool_names)
+
+ # This function is used to inject information from previous steps to the current prompt
+ # TODO: Improve the scratchpad handling and prompts for templates
+ def get_agent_scratchpad():
+ steps = self._output_parser.get_steps()
+
+ if (
+ len(steps) == 0
+ or len(steps) == 1
+ and not self._output_parser._token_buffer
+ ):
+ return ""
+
+ agent_scratchpad = ""
+ for step in steps:
+ agent_scratchpad += step["output"]
+
+ tool_logs = (
+ cast(ToolLog, action)
+ for action in step["logs"]
+ if action["type"] == "tool"
+ )
+
+ tool_outputs = "\n".join(
+ log.get("tool_output", "")
+ for log in tool_logs
+ if log.get("tool_output")
+ )
+
+ if tool_outputs:
+ agent_scratchpad += f"\nObservation: {tool_outputs}\nThought:"
+
+ return f"This is my previous work (I will continue where I left off):\n{agent_scratchpad}"
+
+ print("Generating...", flush=True)
+ while True:
+ try:
+ await self._check_interrupt()
+ # Query the LLM in background
+ scratchpad = get_agent_scratchpad()
+ repo_context = await get_repo_context(
+ prompt=prompt.format_prompt(
+ agent_scratchpad=scratchpad, repo_context=""
+ ).to_string(),
+ )
+
+ self.llm_generation = asyncio.create_task(
+ llm_chain.agenerate(
+ [
+ {
+ "repo_context": repo_context,
+ "agent_scratchpad": scratchpad,
+ "stop": "Observation:",
+ }
+ ]
+ )
+ )
+ while True:
+ await self._check_interrupt()
+ # Consume the tokens from LLM
+ token = await self.token_handler.retrieve_token()
+
+ if token is None:
+ break
+
+ await self._check_interrupt()
+ self._output_parser.ingest_token(token)
+ stream_steps(self._output_parser.get_steps())
+
+ current_step = self._output_parser.get_current_step()
+
+ # Check if the run is finished
+ if any(
+ keyword in current_step["output"]
+ for keyword in ("Final Answer", "FinalAnswer", "Finished")
+ ):
+ break
+
+ for tool in (
+ cast(ToolLog, action)
+ for action in current_step["logs"]
+ if action["type"] == "tool"
+ ):
+ await self._check_interrupt()
+ tool_output = await self._run_tool(
+ tool,
+ name_to_tool_map=tool_map,
+ )
+ await self._check_interrupt()
+ self._output_parser.ingest_tool_output(tool_output)
+ stream_steps(self._output_parser.get_steps())
+
+ except RewriteStepsException:
+ print("REWRITING")
+ continue
+ await playground.push_repo()
+ except:
+ raise
+ finally:
+ if playground is not None:
+ playground.close()
+ await self.on_interaction_request(
+ AgentInteractionRequest(
+ interaction_id=str(uuid.uuid4()),
+ type="done",
+ )
+ )
+
+ async def _check_interrupt(self):
+ if self.canceled:
+ raise Exception("Canceled")
+
+ if self.should_pause:
+ await self.can_resume.wait()
+ self.can_resume.clear()
+
+ if self.rewriting_steps:
+ self.rewriting_steps = False
+ raise RewriteStepsException()
+
+ async def _start(self, instructions: Any):
+ print("Start agent run")
+
+ async def start_with_timeout():
+ try:
+ self._start_loop = asyncio.create_task(
+ self._run(instructions=instructions),
+ )
+
+ await asyncio.wait_for(
+ self._start_loop,
+ timeout=self.max_run_time,
+ )
+ except asyncio.TimeoutError:
+ await self.stop()
+ print("Timeout")
+
+ asyncio.create_task(
+ start_with_timeout(),
+ )
+
+ async def _pause(self):
+ print("Pause agent run")
+ self.should_pause = True
+
+ async def _resume(self):
+ print("Resume agent run")
+ self.should_pause = False
+ self.can_resume.set()
+
+ async def _rewrite_steps(self, steps: List[Step]):
+ print("Rewrite agent run steps")
+ await self._pause()
+ self.rewriting_steps = True
+ if self.llm_generation:
+ self.llm_generation.cancel()
+ # TODO: Communicate the rewriting in model prompt - inform about what was rewritten.
+ # TODO: Handle token that is generated after a rewrite - if the current step seems "finished" the model still outputs string (usually something like . or :).
+ self._output_parser = OutputStreamParser(
+ tool_names=self.tool_names,
+ steps=steps[:-1],
+ buffered_step=steps[-1],
+ )
+ await self._resume()
+
+ async def interaction(self, interaction: AgentInteraction):
+ print("Agent interaction")
+ match interaction.type:
+ case "pause":
+ await self._pause()
+ case "resume":
+ await self._resume()
+ case "start":
+ await self._start(interaction.data["instructions"])
+ case "rewrite_steps":
+ await self._rewrite_steps(interaction.data["steps"])
+ case _:
+ raise Exception(f"Unknown interaction action: {interaction.type}")
+
+ async def stop(self):
+ print("Cancel agent run")
+ self.canceled = True
+ if self.llm_generation:
+ self.llm_generation.cancel()
+ if self._start_loop:
+ self._start_loop.cancel()
diff --git a/api-service/app.py b/api-service/app.py
index baaf43458..ad683faeb 100644
--- a/api-service/app.py
+++ b/api-service/app.py
@@ -1,18 +1,20 @@
import uuid
from typing import Any
+
from fastapi import FastAPI, WebSocket
from fastapi.middleware.cors import CORSMiddleware
from contextlib import asynccontextmanager
from pydantic import BaseModel
+from agent.from_template import get_agent_factory_from_template
from agent.base import AgentInteraction
from deployment.in_memory import InMemoryDeploymentManager
from json_rpc import JsonRpcAgentConnection
from agent.basic_agent import BasicAgent
from database.base import db
-deployment_manager = InMemoryDeploymentManager(agent_factory=BasicAgent.create)
+deployment_manager = InMemoryDeploymentManager()
@asynccontextmanager
@@ -42,13 +44,12 @@ app.add_middleware(
@app.websocket("/dev/agent")
-async def ws_agent_run(websocket: WebSocket, project_id: str):
+async def ws_agent_run(websocket: WebSocket, project_id: str, template_id: str):
await websocket.accept()
connection = JsonRpcAgentConnection(
project_id=project_id,
iter_json=websocket.iter_json,
send_json=websocket.send_json,
- agent_factory=BasicAgent.create,
)
try:
await connection.handle()
@@ -60,6 +61,7 @@ async def ws_agent_run(websocket: WebSocket, project_id: str):
class CreateDeploymentBody(BaseModel):
config: Any
+ template_id: str
@app.get("/deployments")
@@ -70,7 +72,6 @@ async def list_deployments():
@app.put("/deployments")
async def create_agent_deployment(body: CreateDeploymentBody, project_id: str):
- print("pr", project_id)
db_deployment = await db.get_deployment(project_id)
if db_deployment:
diff --git a/api-service/deployment/in_memory.py b/api-service/deployment/in_memory.py
index 56991c3d1..9ffe2777e 100644
--- a/api-service/deployment/in_memory.py
+++ b/api-service/deployment/in_memory.py
@@ -1,14 +1,15 @@
+from re import template
from typing import Any, Dict
from database.base import db
-from deployment.manager import AgentDeploymentManager, AgentDeployment, AgentFactory
+from deployment.manager import AgentDeploymentManager, AgentDeployment
+from agent.from_template import get_agent_factory_from_template
# TODO: Interemediate step between implementing the FC agent deployment
# can be improving the in-memory deployment manager to use the processes instead of threads.
class InMemoryDeploymentManager(AgentDeploymentManager):
- def __init__(self, agent_factory: AgentFactory):
- self._agent_factory = agent_factory
+ def __init__(self):
self._deployments: Dict[str, AgentDeployment] = {}
async def create_deployment(
@@ -19,7 +20,7 @@ class InMemoryDeploymentManager(AgentDeploymentManager):
):
deployment = await AgentDeployment.from_factory(
id,
- self._agent_factory,
+ get_agent_factory_from_template(config["templateID"]),
project_id,
config,
)
@@ -43,7 +44,11 @@ class InMemoryDeploymentManager(AgentDeploymentManager):
except:
print("Failed to remove deployment", id)
pass
- return await self.create_deployment(id, project_id, config)
+ return await self.create_deployment(
+ id,
+ project_id,
+ config,
+ )
async def remove_deployment(self, id: str):
deployment = await self.get_deployment(id)
diff --git a/api-service/json_rpc.py b/api-service/json_rpc.py
index 11f251b25..fa1e5a839 100644
--- a/api-service/json_rpc.py
+++ b/api-service/json_rpc.py
@@ -2,9 +2,10 @@ import asyncio
from typing import Any, AsyncIterator, Callable, Coroutine, Dict, List
-from agent.base import AgentInteraction, AgentBase, AgentInteractionRequest
-from deployment.manager import AgentFactory
-from database.base import db
+from agent.base import AgentBase
+from agent.from_template import get_agent_factory_from_template
+from database import db
+from agent.base import AgentInteraction, AgentInteractionRequest
class JsonRpcAgentConnection:
@@ -14,12 +15,10 @@ class JsonRpcAgentConnection:
self,
send_json: Callable[[Any], Coroutine[Any, Any, None]],
iter_json: Callable[[], AsyncIterator[Any]],
- agent_factory: AgentFactory,
project_id: str,
) -> None:
self._project_id = project_id
self._agent: AgentBase | None = None
- self._agent_factory = agent_factory
self._send_json = send_json
self._iter_json = iter_json
@@ -38,7 +37,10 @@ class JsonRpcAgentConnection:
print(f"Calling {method} via JSONRPC")
match method:
case "start":
- self._agent = await self._agent_factory(
+ agent_factory = get_agent_factory_from_template(
+ params["config"]["templateID"]
+ )
+ self._agent = await agent_factory(
params["config"],
lambda: db.get_env_vars(self._project_id),
self._handle_logs,
diff --git a/components/Editor/SidebarMenu.tsx b/components/Editor/SidebarMenu.tsx
index a24aaa0c3..ff40c3196 100644
--- a/components/Editor/SidebarMenu.tsx
+++ b/components/Editor/SidebarMenu.tsx
@@ -1,11 +1,11 @@
import clsx from 'clsx'
-import { Code, Lock, Cpu, WholeWord, Server, Brain } from 'lucide-react'
+import { Code, Lock, Cpu, WholeWord, Server, } from 'lucide-react'
export enum MenuSection {
Run = 'Run',
Model = 'Model',
Prompt = 'Prompt',
- Memory = 'Memory',
+ // Memory = 'Memory',
Envs = 'Envs',
Deploy = 'Deploy',
}
@@ -18,8 +18,8 @@ function getMenuSelectionIcon(selection: MenuSection) {
return <Code size={menuIconSize} />
case MenuSection.Prompt:
return <WholeWord size={menuIconSize} />
- case MenuSection.Memory:
- return <Brain size={menuIconSize} />
+ // case MenuSection.Memory:
+ // return <Brain size={menuIconSize} />
case MenuSection.Model:
return <Cpu size={menuIconSize} />
case MenuSection.Envs:
diff --git a/components/Editor/Template/SmolDeveloperTemplate/Instructions.tsx b/components/Editor/Template/SmolDeveloperTemplate/Instructions.tsx
new file mode 100644
index 000000000..59e5f4d90
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/Instructions.tsx
@@ -0,0 +1,37 @@
+import useReferences from 'hooks/useReferences'
+
+import InstructionsEditor from './InstructionsEditor'
+
+export interface Props {
+ description: string
+ setDescription: (description: string) => void
+}
+
+function Instructions({ description, setDescription }: Props) {
+ const [referenceSearch] = useReferences()
+
+ return (
+ <div className="
+ py-8
+ px-4
+ flex
+ flex-1
+ bg-white
+ justify-center
+ overflow-auto
+ scroller
+ w-full
+ h-full
+ ">
+ <InstructionsEditor
+ referenceSearch={referenceSearch}
+ title="Specify what should the Stripe dev do:"
+ placeholder=""
+ content={description}
+ onChange={setDescription}
+ />
+ </div>
+ )
+}
+
+export default Instructions
diff --git a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/HighlightedText.tsx b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/HighlightedText.tsx
new file mode 100644
index 000000000..7273f29bd
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/HighlightedText.tsx
@@ -0,0 +1,31 @@
+import React from 'react'
+import Fuse from 'fuse.js'
+
+export interface Props {
+ text: string
+ ranges?: ReadonlyArray<Fuse.RangeTuple>
+}
+
+function HighlightedText({ text, ranges }: Props) {
+ const indices = ranges?.reduce<number[]>((acc, [start, end]) => {
+ for (let i = start; i <= end; i++) {
+ acc.push(i)
+ }
+ return acc
+ }, [])
+
+ return (
+ <div>
+ {text.split('').map((char, index) => (
+ <span
+ key={index}
+ className={indices?.includes(index) ? 'match' : ''}
+ >
+ {char}
+ </span>
+ ))}
+ </div>
+ )
+}
+
+export default HighlightedText
diff --git a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/Item.tsx b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/Item.tsx
new file mode 100644
index 000000000..ebd7f2ab4
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/Item.tsx
@@ -0,0 +1,72 @@
+import { useLayoutEffect } from 'react'
+import cn from 'clsx'
+import { Package } from 'lucide-react'
+
+import useElement from 'hooks/useElement'
+import { Reference, ResultType, ReferenceType } from 'editor/referenceType'
+import HighlightedText from './HighlightedText'
+
+export interface Props {
+ selectItem: () => void
+ isSelected: boolean
+ result: ResultType
+}
+
+function getReferenceIcon(reference: Reference) {
+ switch (reference.type) {
+ case ReferenceType.NPMPackage:
+ return <Package size="16px" />
+ default:
+ return null
+ }
+}
+
+function Item({
+ selectItem,
+ isSelected,
+ result,
+}: Props) {
+ const [scrollEl, setScrollRef] = useElement<HTMLDivElement>()
+
+ useLayoutEffect(function scrollToItem() {
+ if (scrollEl && isSelected) {
+ scrollEl.scrollIntoView({
+ block: 'nearest',
+ })
+ }
+ }, [isSelected, scrollEl])
+
+ return (
+ <div
+ ref={setScrollRef}
+ className={cn(
+ 'px-2',
+ 'py-1',
+ 'space-x-2',
+ 'shrink-0',
+ 'flex',
+ 'text-sm',
+ 'font-mono',
+ 'items-center',
+ 'group',
+ 'hover:bg-indigo-100',
+ 'overflow-ellipsis',
+ 'overflow-hidden',
+ 'text-slate-600',
+ 'cursor-pointer',
+ {
+ 'bg-indigo-100': isSelected,
+ },
+ )}
+ onMouseDown={selectItem}
+ >
+ {getReferenceIcon(result.item)}
+ <HighlightedText
+ text={result.item.value}
+ ranges={result.matches?.flatMap(i => i.indices)}
+ />
+ </div >
+ )
+}
+
+export default Item
diff --git a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/ListWrapper.tsx b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/ListWrapper.tsx
new file mode 100644
index 000000000..f449dcbe3
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/ListWrapper.tsx
@@ -0,0 +1,42 @@
+import {
+ createRef,
+ ForwardRefExoticComponent,
+ Component,
+ createElement,
+ RefAttributes,
+ RefObject,
+} from 'react'
+
+import {
+ SuggestionProps,
+ SuggestionKeyDownProps,
+} from 'editor/extensions/autocomplete/suggestion'
+import { ResultType } from 'editor/referenceType'
+
+type AutocompleteListRef = Partial<HTMLDivElement> & { onKeyDown: (props: SuggestionKeyDownProps) => boolean }
+export interface AutocompleteListProps extends SuggestionProps<ResultType> { }
+
+export type AutocompleteList = ForwardRefExoticComponent<AutocompleteListProps & RefAttributes<AutocompleteListRef>>
+
+export interface AutocompleteListWrapperProps extends SuggestionProps<ResultType> {
+ list: AutocompleteList
+}
+
+class AutocompleteListWrapper extends Component<AutocompleteListWrapperProps, {}, {}> {
+ childRef: RefObject<AutocompleteListRef>
+
+ constructor(public props: AutocompleteListWrapperProps) {
+ super(props)
+ this.childRef = createRef<AutocompleteListRef>()
+ }
+
+ onKeyDown(props: SuggestionKeyDownProps) {
+ return this.childRef.current?.onKeyDown(props)
+ }
+
+ render() {
+ return createElement(this.props.list, { ...this.props, ref: this.childRef, }, null)
+ }
+}
+
+export default AutocompleteListWrapper
diff --git a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/index.tsx b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/index.tsx
new file mode 100644
index 000000000..b7fe0e40b
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/Autocomplete/index.tsx
@@ -0,0 +1,92 @@
+import {
+ useImperativeHandle,
+ useState,
+ forwardRef,
+ useCallback,
+} from 'react'
+import Item from './Item'
+import { AutocompleteList } from './ListWrapper'
+
+const Autocomplete: AutocompleteList = forwardRef(({
+ items,
+ command,
+}, ref) => {
+ const [selectedIndex, setSelectedIndex] = useState(0)
+
+ const selectItem = useCallback((index: number) => {
+ if (items.length > index) {
+ command(items[index])
+ return true
+ }
+ return false
+ }, [
+ command,
+ items,
+ ])
+
+ useImperativeHandle(ref, () => ({
+ onKeyDown({ event }) {
+ if (event.key === 'ArrowUp') {
+ if (items.length > 0) {
+ setSelectedIndex(i => ((i + items.length) - 1) % items.length)
+ return true
+ }
+ return false
+ }
+ if (event.key === 'ArrowDown') {
+ if (items.length > 0) {
+ setSelectedIndex(i => (i + 1) % items.length)
+ return true
+ }
+ return false
+ }
+ if (event.key === 'Enter') {
+ return selectItem(selectedIndex)
+ }
+ return false
+ },
+ }), [
+ selectedIndex,
+ selectItem,
+ items.length,
+ ])
+
+ if (items.length === 0) {
+ return null
+ }
+
+ return (
+ <div
+ className="
+ w-56
+ max-h-56
+
+ flex
+ flex-col
+ shrink-0
+
+ overflow-y-auto
+ overscroll-none
+ rounded
+ border-slate-200
+ border
+ bg-slate-50
+ shadow-md
+ no-scroller
+ "
+ >
+ {items.map((item, index) => (
+ <Item
+ key={item.refIndex}
+ result={item}
+ isSelected={index === selectedIndex}
+ selectItem={() => selectItem(index)}
+ />
+ ))}
+ </div>
+ )
+})
+
+Autocomplete.displayName = 'Autocomplete'
+
+export default Autocomplete
diff --git a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx
new file mode 100644
index 000000000..7ce4e9430
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx
@@ -0,0 +1,56 @@
+import { EditorContent } from '@tiptap/react'
+import Fuse from 'fuse.js'
+
+import Text from 'components/Text'
+import useDocEditor from 'hooks/useDocEditor'
+import { Reference } from 'editor/referenceType'
+
+export interface Props {
+ title?: string
+ placeholder?: string
+ onChange: (value: string) => void
+ content: string
+ referenceSearch?: Fuse<Reference>
+}
+
+function InstructionsEditor({
+ title,
+ onChange,
+ content,
+ placeholder,
+ referenceSearch,
+}: Props) {
+ const editor = useDocEditor({
+ initialContent: content,
+ onContentChange: onChange,
+ placeholder,
+ referenceSearch,
+ })
+
+ return (
+ <div className="
+ flex
+ flex-col
+ space-y-2
+ self-stretch
+ pb-6
+ h-full
+ flex-1
+ border-b
+ border-slate-200
+ ">
+ {title &&
+ <Text
+ className="font-bold text-slate-400"
+ size={Text.size.S2}
+ text={title}
+ />
+ }
+ <EditorContent
+ editor={editor}
+ />
+ </div>
+ )
+}
+
+export default InstructionsEditor
diff --git a/components/Editor/Template/SmolDeveloperTemplate/Repo.tsx b/components/Editor/Template/SmolDeveloperTemplate/Repo.tsx
new file mode 100644
index 000000000..b2fcd1cf8
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/Repo.tsx
@@ -0,0 +1,43 @@
+import Text from 'components/Text'
+import Input from 'components/Input'
+
+export interface Props {
+ repoUrl: string
+ setRepoUrl: (url: string) => void
+}
+
+function Repo({
+ repoUrl,
+ setRepoUrl,
+}: Props) {
+ return (
+ <div>
+ <div
+ className="
+ flex
+ border-b
+ space-x-4
+ items-center
+ px-4
+ "
+ >
+ <Text
+ text="Repository URL"
+ className="
+ font-semibold
+ py-3.5
+ uppercase
+ text-slate-400
+ "
+ size={Text.size.S2}
+ />
+ <Input
+ onChange={setRepoUrl}
+ value={repoUrl}
+ />
+ </div>
+ </div>
+ )
+}
+
+export default Repo
diff --git a/components/Editor/Template/SmolDeveloperTemplate/index.tsx b/components/Editor/Template/SmolDeveloperTemplate/index.tsx
new file mode 100644
index 000000000..6ef4c2d81
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/index.tsx
@@ -0,0 +1,27 @@
+import Instructions from './Instructions'
+import useInstructions from './useInstructions'
+import Repo from './Repo'
+
+function SmolDeveloperTemplate() {
+ const {
+ Description,
+ RepoURL,
+ setDescription,
+ setRepoURL
+ } = useInstructions()
+
+ return (
+ <>
+ <Repo
+ repoUrl={RepoURL}
+ setRepoUrl={setRepoURL}
+ />
+ <Instructions
+ description={Description}
+ setDescription={setDescription}
+ />
+ </>
+ )
+}
+
+export default SmolDeveloperTemplate
diff --git a/components/Editor/Template/SmolDeveloperTemplate/useInstructions.ts b/components/Editor/Template/SmolDeveloperTemplate/useInstructions.ts
new file mode 100644
index 000000000..6092298bd
--- /dev/null
+++ b/components/Editor/Template/SmolDeveloperTemplate/useInstructions.ts
@@ -0,0 +1,57 @@
+import { useCallback, useEffect } from 'react'
+
+import { useStateStore } from 'state/StoreProvider'
+
+export interface InstructionsInfo {
+ Description: string
+ RepoURL: string
+}
+
+/**
+ * This hook is specific for the template.
+ *
+ * Because the structure of instructions (the text/prompt that user specifies before generating the code with "Run")
+ * in each template could be completely different (sometimes you need array of routes, othertime you just need few fields)
+ * we let the template specific hooks handle this and expose just an `any` object from `instructions`.
+ */
+function useInstructions(): {
+ RepoURL: string,
+ Description: string,
+ setRepoURL: (url: string) => void,
+ setDescription: (description: string) => void,
+} {
+ const [selectors] = useStateStore()
+ const setInstructions = selectors.use.setInstructions()
+ const setInstructionTransform = selectors.use.setInstructionTransform()
+ const instructions = selectors.use.instructions()
+
+ const RepoURL = instructions?.['RepoURL'] as string | undefined
+ const Description = instructions?.['Description'] as string | undefined
+
+ // Define which fields saved in instructions are in XML format and need to be transfomed before constructing prompt
+ // Use format from https://github.com/JSONPath-Plus/JSONPath#syntax-through-examples
+ useEffect(function setInstructionsTransform() {
+ setInstructionTransform('$.[Instructions]', { type: 'xml' })
+ }, [setInstructionTransform])
+
+ const setRepoURL = useCallback((url: string) => {
+ setInstructions<InstructionsInfo>(i => {
+ i['RepoURL'] = url
+ })
+ }, [setInstructions])
+
+ const setDescription = useCallback((description: string) => {
+ setInstructions<InstructionsInfo>(i => {
+ i['Description'] = description
+ })
+ }, [setInstructions])
+
+ return {
+ RepoURL: RepoURL || '',
+ Description: Description || '',
+ setRepoURL,
+ setDescription,
+ }
+}
+
+export default useInstructions
diff --git a/components/Editor/index.tsx b/components/Editor/index.tsx
index b01cd1ecc..f601772bc 100644
--- a/components/Editor/index.tsx
+++ b/components/Editor/index.tsx
@@ -2,81 +2,81 @@ import { useCallback, useRef, useState } from 'react'
import { projects } from '@prisma/client'
import Splitter, { GutterTheme } from '@devbookhq/splitter'
import { useLocalStorage } from 'usehooks-ts'
-import { CodeEditor } from '@devbookhq/code-editor'
-import { EditorView } from '@codemirror/view'
-import { oneDark } from '@codemirror/theme-one-dark'
+// import { CodeEditor } from '@devbookhq/code-editor'
+// import { EditorView } from '@codemirror/view'
+// import { oneDark } from '@codemirror/theme-one-dark'
import Sidebar from './Sidebar'
import SidebarMenu, { MenuSection } from './SidebarMenu'
import Template from './Template'
-import { supportedLanguages } from './languages'
-import codeEditorContentStripe from './code-editor-content-stripe-agent.json'
-import codeEditorContentBase from './code-editor-content-base-agent.json'
-import Button from 'components/Button'
-
-const gutterHighlightRadius = '8px'
-
-export const transition = {
- transitionProperty: 'background, opacity, color, font-size',
- transitionTimingFunction: 'cubic-bezier(0.64, 0, 0.78, 0)',
- transitionDuration: '320ms',
-}
-
-
-const customTheme = EditorView.theme({
- '&': {
- height: '100%',
- fontSize: '13px',
- },
- '.cm-lineNumbers .cm-gutterElement': {
- paddingRight: '12px',
- paddingLeft: '22px',
- ...transition,
- },
- '.cm-scroller': {
- overflow: 'auto',
- scrollBehavior: 'smooth',
- },
- // Gutter styling
- '.cm-gutters': {
- paddingLeft: '4px',
- },
- '.cm-highlight-gutter-line': {
- color: '#e9edf2',
- background: 'rgb(148 163 184 / 0.55)',
- cursor: 'pointer',
- },
- '.cm-indicate-gutter-line': {
- background: '#384352',
- cursor: 'pointer',
- },
- '.cm-dim-gutter-line': {
- opacity: '0.4;',
- },
- '.cm-lineNumbers .cm-last-gutter-line': {
- borderBottomRightRadius: gutterHighlightRadius,
- borderBottomLeftRadius: gutterHighlightRadius,
- },
- '.cm-lineNumbers .cm-first-gutter-line': {
- borderTopRightRadius: gutterHighlightRadius,
- borderTopLeftRadius: gutterHighlightRadius,
- },
- // Line styling
- '.cm-line': {
- ...transition,
- transitionProperty: 'opacity, color, font-size'
- },
- '.cm-highlight-line': {
- fontSize: '13.25px;',
- cursor: 'pointer',
- },
- '.cm-dim-line': {
- opacity: '0.4',
- },
-})
-
-const theme = [oneDark, customTheme]
+// import { supportedLanguages } from './languages'
+// import codeEditorContentStripe from './code-editor-content-stripe-agent.json'
+// import codeEditorContentBase from './code-editor-content-base-agent.json'
+// import Button from 'components/Button'
+
+// const gutterHighlightRadius = '8px'
+
+// export const transition = {
+// transitionProperty: 'background, opacity, color, font-size',
+// transitionTimingFunction: 'cubic-bezier(0.64, 0, 0.78, 0)',
+// transitionDuration: '320ms',
+// }
+
+
+// const customTheme = EditorView.theme({
+// '&': {
+// height: '100%',
+// fontSize: '13px',
+// },
+// '.cm-lineNumbers .cm-gutterElement': {
+// paddingRight: '12px',
+// paddingLeft: '22px',
+// ...transition,
+// },
+// '.cm-scroller': {
+// overflow: 'auto',
+// scrollBehavior: 'smooth',
+// },
+// // Gutter styling
+// '.cm-gutters': {
+// paddingLeft: '4px',
+// },
+// '.cm-highlight-gutter-line': {
+// color: '#e9edf2',
+// background: 'rgb(148 163 184 / 0.55)',
+// cursor: 'pointer',
+// },
+// '.cm-indicate-gutter-line': {
+// background: '#384352',
+// cursor: 'pointer',
+// },
+// '.cm-dim-gutter-line': {
+// opacity: '0.4;',
+// },
+// '.cm-lineNumbers .cm-last-gutter-line': {
+// borderBottomRightRadius: gutterHighlightRadius,
+// borderBottomLeftRadius: gutterHighlightRadius,
+// },
+// '.cm-lineNumbers .cm-first-gutter-line': {
+// borderTopRightRadius: gutterHighlightRadius,
+// borderTopLeftRadius: gutterHighlightRadius,
+// },
+// // Line styling
+// '.cm-line': {
+// ...transition,
+// transitionProperty: 'opacity, color, font-size'
+// },
+// '.cm-highlight-line': {
+// fontSize: '13.25px;',
+// cursor: 'pointer',
+// },
+// '.cm-dim-line': {
+// opacity: '0.4',
+// },
+// })
+
+// const theme = [oneDark, customTheme]
export interface Props {
@@ -84,16 +84,15 @@ export interface Props {
}
function Editor({ project }: Props) {
- console.log('project', project)
const ref = useRef<HTMLDivElement | null>(null)
// const editorContent = (project.data as any)?.state.templateID === 'StripeCheckout' ? codeEditorContentStripe.content : codeEditorContentBase.content
- const [editorContent, setEditorContent] = useState(codeEditorContentBase.content)
+ // const [editorContent, setEditorContent] = useState(codeEditorContentBase.content)
const [selectedMenuSection, setSelectedMenuSection] = useState(
MenuSection.Run,
)
- const [sizes, setSizes] = useLocalStorage('project-board-splitter-sizes', [100 / 3, 100 / 3, 100 / 3])
+ const [sizes, setSizes] = useLocalStorage('project-board-splitter-sizes', [50, 50])
const handleResize = useCallback((_: number, newSizes: number[]) => {
setSizes(newSizes)
if (ref.current) {
@@ -109,23 +108,22 @@ function Editor({ project }: Props) {
return (
<div className="
- w-full
flex
flex-row
overflow-hidden
flex-1
">
<Splitter
- minWidths={[260, 260, 260]}
+ minWidths={[400, 380]}
gutterTheme={GutterTheme.Light}
initialSizes={sizes}
- classes={['flex', 'flex', 'flex']}
+ classes={['flex', 'flex']}
onResizeFinished={handleResize}
onResizeStarted={onResizeStart}
gutterClassName='bg-slate-200'
draggerClassName='bg-slate-400'
>
- <div className="
+ {/* <div className="
flex-1
flex
flex-col
@@ -165,7 +163,7 @@ function Editor({ project }: Props) {
supportedLanguages={supportedLanguages}
/>
</div>
- </div>
+ </div> */}
<Template />
<Sidebar
activeMenuSection={selectedMenuSection as MenuSection}
diff --git a/components/NewProjectTemplateForm.tsx b/components/NewProjectTemplateForm.tsx
index a13bb18d1..0a0c491ab 100644
--- a/components/NewProjectTemplateForm.tsx
+++ b/components/NewProjectTemplateForm.tsx
@@ -54,7 +54,7 @@ function NewProjectTemplateForm({
rounded
border-2
border-slate-200
- py-4
+ py-3.5
flex
">
<Text
diff --git a/components/TemplateButton.tsx b/components/TemplateButton.tsx
index 07ca81a6a..2d66f81df 100644
--- a/components/TemplateButton.tsx
+++ b/components/TemplateButton.tsx
@@ -41,7 +41,7 @@ function TemplateButton({
flex
flex-col
items-start
- space-y-0.5
+ justify-center
">
<Text
className="
diff --git a/state/template.tsx b/state/template.tsx
index 2137ab478..e7c7d0d71 100644
--- a/state/template.tsx
+++ b/state/template.tsx
@@ -5,10 +5,12 @@ import NodeJSExpressTemplate from 'components/Editor/Template/NodeJSExpressTempl
import { PromptFragment } from './prompt'
import StripeCheckoutTemplate from 'components/Editor/Template/StripeCheckoutTemplate'
+import SmolDeveloperTemplate from 'components/Editor/Template/SmolDeveloperTemplate'
export enum TemplateID {
NodeJSExpress = 'NodeJSExpress',
StripeCheckout = 'StripeCheckout',
+ SmolDeveloper = 'SmolDeveloper',
}
export interface Template {
@@ -68,6 +70,29 @@ export const templates: {
},
],
},
+ [TemplateID.SmolDeveloper]: {
+ description: 'Smol developer',
+ stackDescription: '',
+ component: <SmolDeveloperTemplate />,
+ icon: <NodeJSIcon />,
+ prompt: [
+ {
+ role: 'system',
+ type: 'prefix',
+ content: '<p>You are an AI developer assistant that knows TypeScript.</p><p>You know how to add Stripe to Next.js TypeScript project.</p><p>The codebase you should use is in the <code>/repo</code> directory.</p><p>Packages in the <code>package.json</code> have already been installed.</p><p>Follow the user\'s instructions carefully.</p><p>After finishing output "Final Answer - DONE".</p><p>Don\'t show the relevant file changes in the final answer.</p><p></p><p>You have access to the following tools:\n</p>',
+ },
+ {
+ role: 'system',
+ type: 'suffix',
+ content: '<p>The way you use the tools is by specifying a XML snippet.</p><p>The XML snippet MUST have a <code>&lt;action tool="$TOOL_NAME"&gt;$INPUT&lt;/action&gt;</code> element with the name of the tool in the <code>tool</code> attribute and input for the tool inside the XML tag.</p><p></p><p>Here is an example of a valid XML snippet:</p><p>&lt;action tool="$TOOL_NAME"&gt;</p><p>$INPUT</p><p>&lt;/action&gt;</p><p></p><p>ALWAYS use the following format:</p><p>Thought: you should always think about what to do</p><p>Action:</p><p>&lt;action tool="$TOOL_NAME"&gt;</p><p>$INPUT</p><p>&lt;/action&gt;</p><p>Observation: the result of the action</p><p>... (this Thought/Action/Observation can repeat N times)</p><p>Thought: I now know the final server code and can show it.</p><p>Final Answer - DONE</p>',
+ },
+ {
+ role: 'user',
+ type: 'prefix',
+ content: '<p>To test the user instructions you can run the <code>next lint</code>.</p><p></p><p>User instructions:</p><p>{{Description}}</p><p></p><p>Thought: Here is the plan of how I will go about solving this:</p>',
+ },
+ ],
+ },
}
export const defaultTemplateID = TemplateID.NodeJSExpress