Skip to content

Devika is the first open-source implementation of an Agentic Software Engineer. Initially started as an open-source alternative to Devin.

Python

add: google search, logs and setting page | Fix:logs, apis and sockets

ARajgor0735247a12db
diff --git a/.gitignore b/.gitignore
index 629b2f4..98783a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,8 +161,4 @@ cython_debug/
.idea/
notes.md
-logs/
-db/
-screenshots/
-pdfs/
-projects/
+data/
diff --git a/README.md b/README.md
index a63b26e..ed2e6bc 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Read [**ARCHITECTURE.md**](https://github.com/stitionai/devika/blob/main/ARCHITE
The easiest way to run the project locally:
1. Install `uv` - Python Package manager (https://github.com/astral-sh/uv)
-2. Install `bun` - JavaScript runtime (https://bun.sh/)
+2. Install `bun` - JavaScript runtime (https://bun.sh/docs/installation)
3. Install and setup `Ollama` (https://ollama.com/)
For ollama you need to install the [models](https://ollama.com/models)
diff --git a/devika.py b/devika.py
index bcdd2c8..27fd5bd 100644
--- a/devika.py
+++ b/devika.py
@@ -1,16 +1,22 @@
+"""
+ DO NOT REARRANGE THE ORDER OF THE FUNCTION CALLS AND VARIABLE DECLARATIONS
+ AS IT MAY CAUSE IMPORT ERRORS AND OTHER ISSUES
+"""
import eventlet
eventlet.monkey_patch()
+from src.init import init_devika
+init_devika()
+
-from flask import Flask, request, jsonify, send_file, make_response
+from flask import Flask, request, jsonify, send_file
from flask_cors import CORS
-from flask_socketio import SocketIO, emit
+from src.socket_instance import socketio, emit_agent
import os
import logging
from threading import Thread
import tiktoken
from src.apis.project import project_bp
-from src.init import init_devika
from src.config import Config
from src.logger import Logger, route_logger
from src.project import ProjectManager
@@ -18,32 +24,34 @@ from src.state import AgentState
from src.agents import Agent
from src.llm import LLM
+
app = Flask(__name__)
CORS(app)
app.register_blueprint(project_bp)
-socketio = SocketIO(app, cors_allowed_origins="*", async_mode="eventlet")
+socketio.init_app(app)
+
log = logging.getLogger("werkzeug")
log.disabled = True
-logger = Logger()
-logger.mode = "off"
TIKTOKEN_ENC = tiktoken.get_encoding("cl100k_base")
os.environ["TOKENIZERS_PARALLELISM"] = "false"
-manager = ProjectManager(socketio=socketio)
-AgentState = AgentState(socketio=socketio)
+manager = ProjectManager()
+AgentState = AgentState()
+config = Config()
+logger = Logger()
-print("devika socketio", socketio)
+logger.mode = "on"
-# sockets
+# initial socket
@socketio.on('socket_connect')
def test_connect(data):
- print("Connected", data)
- emit('socket_response', {'data': 'Server Connected'})
+ print("Socket connected :: ", data)
+ emit_agent("socket_response", {"data": "Server Connected"})
@app.route("/api/data", methods=["GET"])
@@ -51,37 +59,16 @@ def test_connect(data):
def data():
project = manager.get_project_list()
models = LLM().list_models()
- search_engines = ["Bing", "Google", "DuckDuckGo"]
+ search_engines = ["Bing", "Google"]
return jsonify({"projects": project, "models": models, "search_engines": search_engines})
-#
-# @app.route("/api/get-messages", methods=["POST"])
-# def get_messages():
-# data = request.json
-# project_name = data.get("project_name")
-# messages = ProjectManager().get_messages(project_name)
-# return jsonify({"messages": messages})
-#
-#
-# @app.route("/api/send-message", methods=["POST"])
-# def send_message():
-# data = request.json
-# message = data.get("message")
-# project_name = data.get("project_name")
-# base_model = data.get("base_model")
-#
-# new_message = ProjectManager().new_message()
-# new_message["message"] = message
-# new_message["from_devika"] = False
-# ProjectManager().add_message_to_project(project_name, new_message)
-#
-# if AgentState().is_agent_completed(project_name):
-# thread = Thread(
-# target=lambda: Agent(base_model=base_model).subsequent_execute(message, project_name)
-# )
-# thread.start()
-#
-# return jsonify({"message": "Message sent"})
+
[email protected]("/api/messages", methods=["POST"])
+def get_messages():
+ data = request.json
+ project_name = data.get("project_name")
+ messages = manager.get_messages(project_name)
+ return jsonify({"messages": messages})
# Main socket
@@ -91,8 +78,9 @@ def handle_message(data):
message = data.get('message')
base_model = data.get('base_model')
project_name = data.get('project_name')
+ search_engine = data.get('search_engine')
- agent = Agent(base_model=base_model, manager=manager, agent_state = AgentState, socketio=socketio)
+ agent = Agent(base_model=base_model, search_engine=search_engine)
if action == 'continue':
new_message = manager.new_message()
@@ -102,36 +90,12 @@ def handle_message(data):
if AgentState.is_agent_completed(project_name):
agent.subsequent_execute(message, project_name)
- # thread = Thread(target=lambda: agent.subsequent_execute(message, project_name))
- # thread.start()
+ thread = Thread(target=lambda: agent.subsequent_execute(message, project_name))
+ thread.start()
if action == 'execute_agent':
- agent.execute(message, project_name)
- # Agent(base_model=base_model, manager=manager, socketio=socketio).execute(message, project_name)
- # thread = Thread(
- # target=lambda: Agent(base_model=base_model, manager=manager, socketio=socketio).execute(message, project_name)
- # )
- # thread.start()
-
-
-# Agent APIs
[email protected]("/api/execute-agent", methods=["POST"])
-@route_logger(logger)
-def execute_agent():
- data = request.json
- prompt = data.get("prompt")
- base_model = data.get("base_model")
- project_name = data.get("project_name")
-
- if not base_model:
- return jsonify({"error": "base_model is required"})
-
- thread = Thread(
- target=lambda: Agent(base_model=base_model).execute(prompt, project_name)
- )
- thread.start()
-
- return jsonify({"message": "Started Devika Agent"})
+ thread = Thread(target=lambda: agent.execute(message, project_name))
+ thread.start()
@app.route("/api/is-agent-active", methods=["POST"])
@@ -159,28 +123,6 @@ def browser_snapshot():
return send_file(snapshot_path, as_attachment=True)
[email protected]("/api/calculate-tokens", methods=["POST"])
-@route_logger(logger)
-def calculate_tokens():
- data = request.json
- prompt = data.get("prompt")
- tokens = len(TIKTOKEN_ENC.encode(prompt))
- return jsonify({"token_usage": tokens})
-
-
[email protected]("/api/token-usage", methods=["GET"])
-@route_logger(logger)
-def token_usage():
- from src.llm import TOKEN_USAGE
- return jsonify({"token_usage": TOKEN_USAGE})
-
-
[email protected]("/api/real-time-logs", methods=["GET"])
-def real_time_logs():
- log_file = Logger().read_log_file()
- return jsonify({"log_file": log_file})
-
-
@app.route("/api/get-browser-session", methods=["GET"])
@route_logger(logger)
def get_browser_session():
@@ -215,24 +157,44 @@ def run_code():
return jsonify({"message": "Code execution started"})
[email protected]("/api/set-settings", methods=["POST"])
[email protected]("/api/calculate-tokens", methods=["POST"])
+@route_logger(logger)
+def calculate_tokens():
+ data = request.json
+ prompt = data.get("prompt")
+ tokens = len(TIKTOKEN_ENC.encode(prompt))
+ return jsonify({"token_usage": tokens})
+
+
[email protected]("/api/token-usage", methods=["GET"])
+@route_logger(logger)
+def token_usage():
+ from src.llm import TOKEN_USAGE
+ return jsonify({"token_usage": TOKEN_USAGE})
+
+
[email protected]("/api/logs", methods=["GET"])
+def real_time_logs():
+ log_file = logger.read_log_file()
+ return jsonify({"logs": log_file})
+
+
[email protected]("/api/settings", methods=["POST"])
@route_logger(logger)
def set_settings():
data = request.json
- config = Config()
config.config.update(data)
config.save_config()
return jsonify({"message": "Settings updated"})
[email protected]("/api/get-settings", methods=["GET"])
[email protected]("/api/settings", methods=["GET"])
@route_logger(logger)
def get_settings():
- config = Config().get_config()
- return jsonify({"settings": config})
+ configs = config.get_config()
+ return jsonify({"settings": configs})
if __name__ == "__main__":
- logger.info("Booting up... This may take a few seconds")
- init_devika()
+ logger.info("Devika is up and running!")
socketio.run(app, debug=False, port=1337, host="0.0.0.0")
diff --git a/sample.config.toml b/sample.config.toml
index 79f4fb9..1810884 100644
--- a/sample.config.toml
+++ b/sample.config.toml
@@ -15,4 +15,4 @@ GEMINI = "<YOUR_GEMINI_API_KEY>"
MISTRAL = "<YOUR_MISTRAL_API_KEY>"
[API_ENDPOINTS]
-BING = "https://api.bing.micr osoft.com/v7.0/search"
\ No newline at end of file
+BING = "https://api.bing.microsoft.com/v7.0/search"
\ No newline at end of file
diff --git a/src/agents/agent.py b/src/agents/agent.py
index c7288a2..d999b3d 100644
--- a/src/agents/agent.py
+++ b/src/agents/agent.py
@@ -11,11 +11,14 @@ from .patcher import Patcher
from .reporter import Reporter
from .decision import Decision
+from src.project import ProjectManager
+from src.state import AgentState
+from src.socket_instance import emit_agent
from src.logger import Logger
from src.bert.sentence import SentenceBert
from src.memory import KnowledgeBase
-from src.browser.search import BingSearch
+from src.browser.search import BingSearch, GoogleSearch
from src.browser import Browser
from src.browser import start_interaction
from src.filesystem import ReadCode
@@ -29,7 +32,7 @@ import tiktoken
class Agent:
- def __init__(self, base_model: str, manager=None, agent_state=None, socketio=None):
+ def __init__(self, base_model: str, search_engine: str):
if not base_model:
raise ValueError("base_model is required")
@@ -56,51 +59,42 @@ class Agent:
self.reporter = Reporter(base_model=base_model)
self.decision = Decision(base_model=base_model)
- self.socketio = socketio
- self.project_manager = manager
- self.agent_state = agent_state
+ self.project_manager = ProjectManager()
+ self.agent_state = AgentState()
+ self.engine = search_engine
self.tokenizer = tiktoken.get_encoding("cl100k_base")
def search_queries(self, queries: list, project_name: str) -> dict:
results = {}
knowledge_base = KnowledgeBase()
- bing_search = BingSearch()
+ if self.engine == "Google":
+ engine = GoogleSearch()
+ else:
+ engine = BingSearch()
browser = Browser()
for query in queries:
query = query.strip().lower()
- """
- Check if the knowledge base already has the query learned
- """
+ """ Check if the knowledge base already has the query learned """
# knowledge = knowledge_base.get_knowledge(tag=query)
# if knowledge:
# results[query] = knowledge
# continue
- """
- Search for the query and get the first link
- """
- bing_search.search(query)
- link = bing_search.get_first_link()
-
- """
- Browse to the link and take a screenshot, then extract the text
- """
+ """ Search for the query and get the first link """
+ engine.search(query)
+ link = engine.get_first_link()
+ print("Link :: ", link)
+ """ Browse to the link and take a screenshot, then extract the text """
browser.go_to(link)
browser.screenshot(project_name)
- """
- Formatter Agent is invoked to format and learn from the contents
- """
- results[query] = self.formatter.execute(
- browser.extract_text()
- )
+ """ Formatter Agent is invoked to format and learn from the contents """
+ results[query] = self.formatter.execute(browser.extract_text())
- """
- Add the newly acquired data to the knowledge base
- """
+ """ Add the newly acquired data to the knowledge base """
# knowledge_base.add_knowledge(tag=query, contents=results[query])
return results
@@ -170,10 +164,13 @@ class Agent:
)
self.coder.save_code_to_project(code, project_name)
- def subsequent_execute(self, prompt: str, project_name: str) -> str:
+ def subsequent_execute(self, prompt: str, project_name: str):
"""
Subsequent flow of execution
"""
+
+ os_system = platform.platform()
+
self.agent_state.set_agent_active(project_name, True)
conversation = self.project_manager.get_all_messages_formatted(project_name)
@@ -194,7 +191,7 @@ class Agent:
)
self.project_manager.add_message_from_devika(project_name, response)
elif action == "run":
- os_system = platform.platform()
+
project_path = self.project_manager.get_project_path(project_name)
self.runner.execute(
@@ -257,7 +254,7 @@ class Agent:
self.agent_state.set_agent_active(project_name, False)
self.agent_state.set_agent_completed(project_name, True)
- def execute(self, prompt: str, project_name_from_user: str = None) -> str:
+ def execute(self, prompt: str, project_name_from_user: str = None):
"""
Agentic flow of execution
"""
@@ -285,6 +282,7 @@ class Agent:
self.agent_state.set_agent_active(project_name, True)
+ print("\n plans:: ", plans)
self.project_manager.add_message_from_devika(project_name, reply)
self.project_manager.add_message_from_devika(project_name, json.dumps(plans, indent=4))
# self.project_manager.add_message_from_devika(project_name, f"In summary: {summary}")
@@ -319,11 +317,9 @@ class Agent:
ask_user_prompt = "Nothing from the user."
- if ask_user != "":
+ if ask_user != "" and ask_user is not None:
self.project_manager.add_message_from_devika(project_name, ask_user)
- state = self.agent_state.set_agent_active(project_name, False)
- if state:
- self.socketio.emit("agent-state", state)
+ self.agent_state.set_agent_active(project_name, False)
got_user_query = False
while not got_user_query:
@@ -341,10 +337,13 @@ class Agent:
self.agent_state.set_agent_active(project_name, True)
- search_results = self.search_queries(queries, project_name)
-
- print(json.dumps(search_results, indent=4))
- print("=====" * 10)
+ if queries and len(queries) > 0:
+ search_results = self.search_queries(queries, project_name)
+ print("search_results :: ", search_results)
+ print(json.dumps(search_results, indent=4))
+ print("=====" * 10)
+ else:
+ search_results = {}
code = self.coder.execute(
step_by_step_plan=plan,
diff --git a/src/agents/feature/feature.py b/src/agents/feature/feature.py
index fa4a273..7769248 100644
--- a/src/agents/feature/feature.py
+++ b/src/agents/feature/feature.py
@@ -10,6 +10,7 @@ from src.state import AgentState
PROMPT = open("src/agents/feature/prompt.jinja2", "r").read().strip()
+
class Feature:
def __init__(self, base_model: str):
config = Config()
@@ -97,9 +98,9 @@ class Feature:
def execute(
self,
- conversation: str,
+ conversation: list,
code_markdown: str,
- system_os: dict,
+ system_os: str,
project_name: str
) -> str:
prompt = self.render(conversation, code_markdown, system_os)
diff --git a/src/apis/project.py b/src/apis/project.py
index 1fb3644..2f23683 100644
--- a/src/apis/project.py
+++ b/src/apis/project.py
@@ -2,6 +2,8 @@ from flask import blueprints, request, jsonify, send_file, make_response
from src.logger import Logger, route_logger
from src.config import Config
from src.project import ProjectManager
+from ..state import AgentState
+
import os
project_bp = blueprints.Blueprint("project", __name__)
@@ -26,6 +28,7 @@ def delete_project():
data = request.json
project_name = data.get("project_name")
manager.delete_project(project_name)
+ AgentState().delete_state(project_name)
return jsonify({"message": "Project deleted"})
diff --git a/src/browser/browser.py b/src/browser/browser.py
index 9885444..4d0e061 100644
--- a/src/browser/browser.py
+++ b/src/browser/browser.py
@@ -7,6 +7,7 @@ from pdfminer.high_level import extract_text
from src.config import Config
from src.state import AgentState
+
class Browser:
def __init__(self):
self.playwright = sync_playwright().start()
@@ -36,10 +37,10 @@ class Browser:
new_state["internal_monologue"] = "Browsing the web right now..."
new_state["browser_session"]["url"] = page_url
new_state["browser_session"]["screenshot"] = path_to_save
- AgentState().add_to_current_state(project_name, new_state)
+ AgentState().add_to_current_state(project_name, new_state)
return path_to_save
-
+
def get_html(self):
return self.page.content()
@@ -48,13 +49,13 @@ class Browser:
def get_pdf(self):
pdfs_save_path = Config().get_pdfs_dir()
-
+
page_metadata = self.page.evaluate("() => { return { url: document.location.href, title: document.title } }")
filename_to_save = f"{page_metadata['title']}.pdf"
save_path = os.path.join(pdfs_save_path, filename_to_save)
-
- self.page.pdf(path=save_path)
-
+
+ self.page.pdf(path=save_path)
+
return save_path
def pdf_to_text(self, pdf_path):
@@ -65,7 +66,7 @@ class Browser:
return self.pdf_to_text(pdf_path)
def extract_text(self):
- return self.page.evaluate("() => document.body.innerText")
+ return self.page.evaluate("() => document.body.innerText")
def close(self):
self.page.close()
diff --git a/src/browser/search.py b/src/browser/search.py
index ca39791..8c8aea8 100644
--- a/src/browser/search.py
+++ b/src/browser/search.py
@@ -24,3 +24,28 @@ class BingSearch:
def get_first_link(self):
return self.query_result["webPages"]["value"][0]["url"]
+
+class GoogleSearch:
+ def __init__(self):
+ self.config = Config()
+ self.google_api_key = self.config.get_google_api_key()
+ self.google_api_endpoint = self.config.get_google_api_endpoint()
+ self.google_cx = self.config.get_google_cx()
+ self.query_result = None
+
+ def search(self, query):
+ params = {
+ "key": self.google_api_key,
+ "cx": self.google_cx,
+ "q": query
+ }
+ try:
+ print("Searching in Google...")
+ response = requests.get(self.google_api_endpoint, params=params)
+ # response.raise_for_status()
+ self.query_result = response.json()
+ except Exception as error:
+ return error
+
+ def get_first_link(self):
+ return self.query_result["items"][0]["link"]
diff --git a/src/config.py b/src/config.py
index 90f8b5b..7e95af0 100644
--- a/src/config.py
+++ b/src/config.py
@@ -8,6 +8,15 @@ class Config:
def get_config(self):
return self.config
+ def get_google_api_endpoint(self):
+ return self.config["API_ENDPOINTS"]["GOOGLE"]
+
+ def get_google_api_key(self):
+ return self.config["API_KEYS"]["GOOGLE"]
+
+ def get_google_cx(self):
+ return self.config["API_KEYS"]["GOOGLE_CX"]
+
def get_bing_api_endpoint(self):
return self.config["API_ENDPOINTS"]["BING"]
diff --git a/src/init.py b/src/init.py
index c7609aa..856dd56 100644
--- a/src/init.py
+++ b/src/init.py
@@ -3,6 +3,7 @@ import os
from src.config import Config
from src.logger import Logger
+
def init_devika():
config = Config()
logger = Logger()
@@ -24,6 +25,6 @@ def init_devika():
from src.bert.sentence import SentenceBert
logger.info("Loading sentence-transformer BERT models...")
- prompt = "Light-weight keyword extraction excercise for BERT model loading.".strip()
+ prompt = "Light-weight keyword extraction exercise for BERT model loading.".strip()
SentenceBert(prompt).extract_keywords()
logger.info("BERT model loaded successfully.")
diff --git a/src/llm/llm.py b/src/llm/llm.py
index fd36035..cdd9e8c 100644
--- a/src/llm/llm.py
+++ b/src/llm/llm.py
@@ -1,6 +1,6 @@
-from enum import Enum
import tiktoken
+from src.socket_instance import emit_agent
from .ollama_client import Ollama
from .claude_client import Claude
from .openai_client import OpenAi
@@ -12,6 +12,7 @@ TIKTOKEN_ENC = tiktoken.get_encoding("cl100k_base")
ollama = Ollama()
+
class LLM:
def __init__(self, model_id: str = None):
self.model_id = model_id
@@ -38,7 +39,8 @@ class LLM:
"OLLAMA_MODELS": []
}
if ollama:
- self.models["OLLAMA_MODELS"] = [(model["name"].split(":")[0], model["name"]) for model in ollama.list_models()]
+ self.models["OLLAMA_MODELS"] = [(model["name"].split(":")[0], model["name"]) for model in
+ ollama.list_models()]
def list_models(self) -> dict:
return self.models
@@ -49,11 +51,12 @@ class LLM:
for model_name, model_id in models:
mapping[model_id] = enum_name
return mapping
-
+
@staticmethod
def update_global_token_usage(string: str):
global TOKEN_USAGE
TOKEN_USAGE += len(TIKTOKEN_ENC.encode(string))
+ emit_agent("tokens", {"token_usage": TOKEN_USAGE})
print(f"Token usage: {TOKEN_USAGE}")
def inference(self, prompt: str) -> str:
diff --git a/src/logger.py b/src/logger.py
index 9f5cc9f..76ec11d 100644
--- a/src/logger.py
+++ b/src/logger.py
@@ -57,10 +57,15 @@ def route_logger(logger: Logger):
# Call the actual route function
response = func(*args, **kwargs)
+ from werkzeug.wrappers import Response
+
# Log exit point, including response summary if possible
try:
- response_summary = response.get_data(as_text=True)
- logger.debug(f"{request.path} {request.method} - Response: {response_summary}")
+ if isinstance(response, Response) and response.direct_passthrough:
+ logger.debug(f"{request.path} {request.method} - Response: File response")
+ else:
+ response_summary = response.get_data(as_text=True)
+ logger.debug(f"{request.path} {request.method} - Response: {response_summary}")
except Exception as e:
logger.exception(f"{request.path} {request.method} - {e})")
diff --git a/src/project.py b/src/project.py
index c9decf9..b535c4e 100644
--- a/src/project.py
+++ b/src/project.py
@@ -3,7 +3,7 @@ import json
import zipfile
from datetime import datetime
from typing import Optional
-
+from src.socket_instance import emit_agent
from sqlmodel import Field, Session, SQLModel, create_engine
from src.config import Config
@@ -15,12 +15,11 @@ class Projects(SQLModel, table=True):
class ProjectManager:
- def __init__(self, socketio=None):
+ def __init__(self):
config = Config()
sqlite_path = config.get_sqlite_db()
self.project_path = config.get_projects_dir()
self.engine = create_engine(f"sqlite:///{sqlite_path}")
- self.socketio = socketio
SQLModel.metadata.create_all(self.engine)
def new_message(self):
@@ -62,14 +61,14 @@ class ProjectManager:
def add_message_from_devika(self, project: str, message: str):
new_message = self.new_message()
new_message["message"] = message
- self.socketio.emit("server-message", {"messages": new_message})
+ emit_agent("server-message", {"messages": new_message})
self.add_message_to_project(project, new_message)
def add_message_from_user(self, project: str, message: str):
new_message = self.new_message()
new_message["message"] = message
new_message["from_devika"] = False
- self.socketio.emit("server-message", {"messages": new_message})
+ emit_agent("server-message", {"messages": new_message})
self.add_message_to_project(project, new_message)
def get_messages(self, project: str):
diff --git a/src/socket_instance.py b/src/socket_instance.py
new file mode 100644
index 0000000..f10ece0
--- /dev/null
+++ b/src/socket_instance.py
@@ -0,0 +1,14 @@
+# socketio_instance.py
+from flask_socketio import SocketIO
+from src.logger import Logger
+socketio = SocketIO(cors_allowed_origins="*", async_mode="eventlet")
+
+logger = Logger()
+
+
+def emit_agent(channel, content):
+ try:
+ socketio.emit(channel, content)
+ logger.info(f"SOCKET {channel} MESSAGE: {content}")
+ except Exception as e:
+ logger.error(f"SOCKET {channel} ERROR: {str(e)}")
diff --git a/src/state.py b/src/state.py
index e61d8c8..60cb732 100644
--- a/src/state.py
+++ b/src/state.py
@@ -2,27 +2,28 @@ import json
from datetime import datetime
from typing import Optional
from sqlmodel import Field, Session, SQLModel, create_engine
-
+from src.socket_instance import emit_agent
from src.config import Config
+
class AgentStateModel(SQLModel, table=True):
__tablename__ = "agent_state"
-
+
id: Optional[int] = Field(default=None, primary_key=True)
project: str
state_stack_json: str
+
class AgentState:
- def __init__(self, socketio=None):
+ def __init__(self):
config = Config()
sqlite_path = config.get_sqlite_db()
self.engine = create_engine(f"sqlite:///{sqlite_path}")
SQLModel.metadata.create_all(self.engine)
- self.socketio = socketio
def new_state(self):
timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
+
return {
"internal_monologue": None,
"browser_session": {
@@ -69,7 +70,7 @@ class AgentState:
if agent_state:
return json.loads(agent_state.state_stack_json)
return None
-
+
def update_latest_state(self, project: str, state: dict):
with Session(self.engine) as session:
agent_state = session.query(AgentStateModel).filter(AgentStateModel.project == project).first()
@@ -105,7 +106,7 @@ class AgentState:
agent_state = AgentStateModel(project=project, state_stack_json=json.dumps(state_stack))
session.add(agent_state)
session.commit()
- self.socketio.emit("agent-state", state_stack)
+ emit_agent("agent-state", state_stack)
def is_agent_active(self, project: str):
with Session(self.engine) as session:
@@ -119,6 +120,7 @@ class AgentState:
agent_state = session.query(AgentStateModel).filter(AgentStateModel.project == project).first()
if agent_state:
state_stack = json.loads(agent_state.state_stack_json)
+ state_stack[-1]["internal_monologue"] = "Agent has completed the task."
state_stack[-1]["completed"] = is_completed
agent_state.state_stack_json = json.dumps(state_stack)
session.commit()
@@ -128,10 +130,12 @@ class AgentState:
agent_state = AgentStateModel(project=project, state_stack_json=json.dumps(state_stack))
session.add(agent_state)
session.commit()
-
+ emit_agent("agent-state", state_stack)
+
+
def is_agent_completed(self, project: str):
with Session(self.engine) as session:
agent_state = session.query(AgentStateModel).filter(AgentStateModel.project == project).first()
if agent_state:
return json.loads(agent_state.state_stack_json)[-1]["completed"]
- return None
\ No newline at end of file
+ return None
diff --git a/ui/src/lib/api.js b/ui/src/lib/api.js
index 7738608..511199d 100644
--- a/ui/src/lib/api.js
+++ b/ui/src/lib/api.js
@@ -43,7 +43,7 @@ export async function deleteProject(projectName) {
export async function fetchMessages() {
const projectName = localStorage.getItem("selectedProject");
- const response = await fetch(`${API_BASE_URL}/api/get-messages`, {
+ const response = await fetch(`${API_BASE_URL}/api/messages`, {
method: "POST",
headers: {
"Content-Type": "application/json",
@@ -54,29 +54,6 @@ export async function fetchMessages() {
messages.set(data.messages);
}
-export async function sendMessage(message) {
- const projectName = localStorage.getItem("selectedProject");
- const modelId = localStorage.getItem("selectedModel");
-
- if (!modelId) {
- alert("Please select the LLM model first.");
- return;
- }
-
- await fetch(`${API_BASE_URL}/api/send-message`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({
- message: message,
- project_name: projectName,
- base_model: modelId,
- }),
- });
- await fetchMessages();
-}
-
export async function fetchAgentState() {
const projectName = localStorage.getItem("selectedProject");
const response = await fetch(`${API_BASE_URL}/api/get-agent-state`, {
@@ -114,12 +91,6 @@ export async function executeAgent(prompt) {
await fetchMessages();
}
-export async function getTokenUsage() {
- const response = await fetch(`${API_BASE_URL}/api/token-usage`);
- const data = await response.json();
- return data.token_usage;
-}
-
export async function getBrowserSnapshot(snapshotPath) {
const response = await fetch(`${API_BASE_URL}/api/browser-snapshot`, {
method: "POST",
@@ -139,3 +110,25 @@ export async function checkInternetStatus() {
internet.set(false);
}
}
+
+export async function fetchSettings() {
+ const response = await fetch(`${API_BASE_URL}/api/settings`);
+ const data = await response.json();
+ return data.settings;
+}
+
+export async function updateSettings(settings) {
+ await fetch(`${API_BASE_URL}/api/settings`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify(settings),
+ });
+}
+
+export async function fetchLogs() {
+ const response = await fetch(`${API_BASE_URL}/api/logs`);
+ const data = await response.json();
+ return data.logs;
+}
diff --git a/ui/src/lib/components/ControlPanel.svelte b/ui/src/lib/components/ControlPanel.svelte
index 40a84c2..4d54661 100644
--- a/ui/src/lib/components/ControlPanel.svelte
+++ b/ui/src/lib/components/ControlPanel.svelte
@@ -1,13 +1,12 @@
<script>
import { onMount } from "svelte";
- import { projectList, modelList, internet, searchEngineList} from "$lib/store";
- import { createProject, fetchMessages, getTokenUsage, deleteProject} from "$lib/api";
+ import { projectList, modelList, internet, tokenUsage, agentState, searchEngineList} from "$lib/store";
+ import { createProject, fetchMessages, fetchInitialData, deleteProject} from "$lib/api";
import { get } from "svelte/store";
let selectedProject;
let selectedModel;
let selectedSearchEngine;
- let tokenUsage = 0;
const checkListAndSetItem = (list, itemKey, defaultItem) => {
if (get(list) && get(list).length > 0) {
@@ -25,7 +24,7 @@
function selectProject(project) {
selectedProject = project;
localStorage.setItem("selectedProject", project);
- // fetchMessages();
+ fetchMessages();
document.getElementById("project-dropdown").classList.add("hidden");
}
function selectModel(model) {
@@ -49,7 +48,8 @@
async function deleteproject(project) {
if (confirm(`Are you sure you want to delete ${project}?`)) {
await deleteProject(project);
- // await fetchMessages();
+ await fetchInitialData();
+ agentState.setItem(null);
selectProject("Select Project");
}
}
@@ -157,7 +157,7 @@
</div>
<div class="flex items-center space-x-2">
<span>Token Usage:</span>
- <span id="token-count" class="token-count-animation">{tokenUsage}</span>
+ <span id="token-count" class="token-count-animation">{$tokenUsage}</span>
</div>
<div class="relative inline-block text-left">
<div>
diff --git a/ui/src/lib/components/MessageInput.svelte b/ui/src/lib/components/MessageInput.svelte
index e3d75dd..7151958 100644
--- a/ui/src/lib/components/MessageInput.svelte
+++ b/ui/src/lib/components/MessageInput.svelte
@@ -1,5 +1,5 @@
<script>
- import { sendMessage, executeAgent, API_BASE_URL, socket } from "$lib/api";
+ import { API_BASE_URL, socket } from "$lib/api";
import { agentState, messages } from "$lib/store";
let isAgentActive = false;
@@ -13,6 +13,7 @@
async function handleSendMessage() {
const projectName = localStorage.getItem("selectedProject");
const selectedModel = localStorage.getItem("selectedModel");
+ const serachEngine = localStorage.getItem("selectedSearchEngine");
if (!projectName) {
alert("Please select a project first!");
@@ -30,9 +31,9 @@
action: "execute_agent",
message: messageInput,
base_model: selectedModel,
- project_name: projectName
+ project_name: projectName,
+ search_engine: serachEngine
});
- // await executeAgent(messageInput);
} else {
console.log("Sending message", messageInput);
@@ -40,9 +41,9 @@
action: "continue",
message: messageInput,
base_model: selectedModel,
- project_name: projectName
+ project_name: projectName,
+ search_engine: serachEngine
});
- // await sendMessage(messageInput);
}
messageInput = "";
}
diff --git a/ui/src/lib/components/Sidebar.svelte b/ui/src/lib/components/Sidebar.svelte
index cd48426..2d69ac8 100644
--- a/ui/src/lib/components/Sidebar.svelte
+++ b/ui/src/lib/components/Sidebar.svelte
@@ -1,13 +1,14 @@
<script>
let navItems = [
- { icon: "fa-home", tooltip: "Home" },
- { icon: "fa-cog", tooltip: "Settings" },
- { icon: "fa-history", tooltip: "Logs" },
+ { icon: "fa-home", tooltip: "Home", route: "/" },
+ { icon: "fa-cog", tooltip: "Settings", route: "/settings"},
+ { icon: "fa-history", tooltip: "Logs", route: "/logs"},
];
</script>
<div class="flex flex-col p-4 gap-4 items-center bg-gray-100">
{#each navItems as item (item.tooltip)}
+ <a href = {item.route}>
<div class="p-4 rounded nav-button relative">
<button
class="hover:text-gray-500 flex justify-center w-full hover:transition-colors"
@@ -16,6 +17,7 @@
</button>
<span class="tooltip">{item.tooltip}</span>
</div>
+ </a>
{/each}
</div>
diff --git a/ui/src/lib/store.js b/ui/src/lib/store.js
index f194b4f..c199ac3 100644
--- a/ui/src/lib/store.js
+++ b/ui/src/lib/store.js
@@ -5,4 +5,5 @@ export const projectList = writable([]);
export const modelList = writable({});
export const searchEngineList = writable([]);
export const agentState = writable(null);
-export const internet = writable(true);
\ No newline at end of file
+export const internet = writable(true);
+export const tokenUsage = writable(0);
\ No newline at end of file
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte
index 5014b8e..c3069c6 100644
--- a/ui/src/routes/+page.svelte
+++ b/ui/src/routes/+page.svelte
@@ -9,11 +9,10 @@
import {
fetchInitialData,
fetchAgentState,
- fetchMessages,
checkInternetStatus,
socket
} from "$lib/api";
- import { messages, agentState } from "$lib/store";
+ import { messages,tokenUsage, agentState } from "$lib/store";
onMount(() => {
// localStorage.clear();
@@ -36,18 +35,17 @@
});
socket.on('agent-state', function(state) {
- // state is an array of objects
const lastState = state[state.length - 1];
-
agentState.set(lastState);
console.log("server-state: ", lastState);
console.log("$agent-state: ", $agentState);
});
+
+ socket.on('tokens', function(tokens) {
+ console.log("tokens: ", tokens);
+ tokenUsage.set(tokens["token_usage"]);
+ });
- // const intervalId = setInterval(async () => {
- // load();
- // }, 3000);
- // return () => clearInterval(intervalId);
});
</script>
diff --git a/ui/src/routes/logs/+page.svelte b/ui/src/routes/logs/+page.svelte
new file mode 100644
index 0000000..32eb0cd
--- /dev/null
+++ b/ui/src/routes/logs/+page.svelte
@@ -0,0 +1,64 @@
+<script>
+ import { fetchLogs } from "$lib/api";
+ import { onMount } from "svelte";
+
+ let logs = [];
+ let socket_logs = [];
+
+ const logColors = {
+ 'ERROR': 'text-red-500',
+ 'EXCEPT': 'text-red-500',
+ 'WARNING': 'text-yellow-500',
+ 'INFO': 'text-blue-500',
+ 'DEBUG': 'text-gray-500'
+ };
+
+ function getTextColor(log) {
+ for (const key in logColors) {
+ if (log.includes(key)) {
+ return logColors[key];
+ }
+ }
+ return '';
+ }
+
+ onMount(async () => {
+ const log = await fetchLogs();
+ const last_100_logs = log.split("\n").slice(-100).reverse().filter(log => log !== "");
+
+ [logs, socket_logs] = last_100_logs.reduce(([logs, socket_logs], log) => {
+ if (log.includes("SOCKET")) {
+ socket_logs.push(log);
+ } else {
+ logs.push(log);
+ }
+ return [logs, socket_logs];
+ }, [[], []]);
+ });
+</script>
+
+<div class="p-4 h-full gap-8 flex flex-col overflow-x-clip">
+ <h1 class="text-3xl">Logs</h1>
+ <div class="flex gap-4 overflow-y-auto">
+ <div class="flex flex-col gap-4 w-1/2">
+ <h1 class="text-2xl">Request logs</h1>
+ <div class="flex flex-col gap-2">
+ {#each logs as log}
+ <p class="{getTextColor(log)}">
+ {@html log}
+ </p>
+ {/each}
+ </div>
+ </div>
+ <div class="flex flex-col gap-4 w-1/2">
+ <h1 class="text-2xl">Socket logs</h1>
+ <div class="flex flex-col gap-2">
+ {#each socket_logs as log}
+ <p class="{getTextColor(log)}">
+ {@html log}
+ </p>
+ {/each}
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/ui/src/routes/settings/+page.svelte b/ui/src/routes/settings/+page.svelte
new file mode 100644
index 0000000..a51e1d2
--- /dev/null
+++ b/ui/src/routes/settings/+page.svelte
@@ -0,0 +1,67 @@
+<script>
+ import { updateSettings, fetchSettings } from "$lib/api";
+ import { onMount } from "svelte";
+
+ let settings = {};
+ let editMode = false;
+
+ onMount(async () => {
+ settings = await fetchSettings();
+ });
+
+ const save = async () => {
+ await updateSettings({"API_KEYS": settings["API_KEYS"]});
+ editMode = !editMode;
+ };
+
+ const edit = () => {
+ editMode = !editMode;
+ };
+</script>
+
+<div class="p-4 h-full w-full gap-8 flex flex-col">
+ <h1 class="text-3xl">Settings</h1>
+ <div class="flex flex-col w-full">
+ {#if settings["API_KEYS"]}
+ <div class="flex flex-col gap-4">
+ <h2 class="text-xl">API Keys</h2>
+ <div class="flex flex-col gap-4">
+ {#each Object.entries(settings["API_KEYS"]) as [key, value]}
+ <div class="flex gap-3 items-center">
+ <p class="w-20">{key}</p>
+ <input
+ type="text"
+ bind:value={settings["API_KEYS"][key]}
+ name={key}
+ class="w-1/3 p-2 border-2 rounded-lg {editMode ? '' : 'bg-gray-100 text-gray-500'}"
+ readonly={!editMode}
+ />
+ </div>
+ {/each}
+ </div>
+ <!-- edit and save button -->
+ <div class="flex gap-4">
+ {#if !editMode}
+ <button
+ id="btn-edit"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-gray-200"
+ on:click={edit}
+ >
+ <i class="fas fa-edit"></i>
+ Edit
+ </button>
+ {:else}
+ <button
+ id="btn-save"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-gray-200"
+ on:click={save}
+ >
+ <i class="fas fa-save"></i>
+ Save
+ </button>
+ {/if}
+ </div>
+ </div>
+ {/if}
+ </div>
+</div>
\ No newline at end of file