Devika is the first open-source implementation of an Agentic Software Engineer. Initially started as an open-source alternative to Devin.
Python
Merge branch 'main' into dev
ARajgor1d03d1bdd264
diff --cc devika.pyindex 27fd5bd,1beab9e..32b4ea4--- a/devika.py+++ b/devika.py@@@ -157,29 -205,7 +157,30 @@@ 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})++ project_name = request.args.get("project_name")++ token_count = AgentState().get_latest_token_usage(project_name)++ return jsonify({"token_usage": token_count})++[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.jsondiff --cc requirements.txtindex 005fe59,65823cd..ea85502--- a/requirements.txt+++ b/requirements.txt@@@ -22,6 -21,4 +22,7 @@@ GitPythonetlify-pyMarkdownxhtml2pdf-groq+mistralai+Flask-SocketIO+eventlet++groqdiff --cc sample.config.tomlindex 0af42ca,6ed3682..b059a3c--- a/sample.config.toml+++ b/sample.config.toml@@@ -1,21 -1,22 +1,27 @@@[STORAGE]-SQLITE_DB = "db/devika.db"-SCREENSHOTS_DIR = "screenshots"-PDFS_DIR = "pdfs"-PROJECTS_DIR = "projects"-LOGS_DIR = "logs"-REPOS_DIR = "repos"+SQLITE_DB = "data/db/devika.db"+SCREENSHOTS_DIR = "data/screenshots"+PDFS_DIR = "data/pdfs"+PROJECTS_DIR = "data/projects"+LOGS_DIR = "data/logs"+REPOS_DIR = "data/repos"[API_KEYS]++NETLIFY = "<YOUR_NETLIFY_API_KEY>"BING = "<YOUR_BING_API_KEY>"+GOOGLE = "<YOUR_GOOGLE_API_KEY>"+GOOGLE_CX = "<YOUR_GOOGLE_CUSTOM_SEARCH_ENGINE_ID>"CLAUDE = "<YOUR_CLAUDE_API_KEY>"--NETLIFY = "<YOUR_NETLIFY_API_KEY>"OPENAI = "<YOUR_OPENAI_API_KEY>"+GEMINI = "<YOUR_GEMINI_API_KEY>"+MISTRAL = "<YOUR_MISTRAL_API_KEY>"+ GROQ = "<YOUR_GROQ_API_KEY>"[API_ENDPOINTS]BING = "https://api.bing.microsoft.com/v7.0/search"+GOOGLE = "https://www.googleapis.com/customsearch/v1"+ OLLAMA = "http://127.0.0.1:11434"++ [LOGGING]+ LOG_REST_API = "true"-LOG_PROMPTS = "false"++LOG_PROMPTS = "false"diff --cc src/agents/agent.pyindex b53b77d,165bf23..bc97996--- a/src/agents/agent.py+++ b/src/agents/agent.py@@@ -109,12 -115,12 +116,9 @@@ class Agentreturn self.collected_context_keywords- """- Decision making Agent- """def make_decision(self, prompt: str, project_name: str) -> str:- """- Decision making Agent- """- decision = self.decision.execute(prompt)-+ decision = self.decision.execute(prompt, project_name)+for item in decision:function = item["function"]args = item["args"]@@@ -129,19 -135,18 +133,19 @@@elif function == "generate_pdf_document":user_prompt = args["user_prompt"]# Call the reporter agent to generate the PDF document- markdown = self.reporter.execute([user_prompt], "")+ markdown = self.reporter.execute([user_prompt], "", project_name)_out_pdf_file = PDF().markdown_to_pdf(markdown, project_name)-+project_name_space_url = project_name.replace(" ", "%20")- pdf_download_url = "http://127.0.0.1:1337/api/download-project-pdf?project_name={}".format(project_name_space_url)+ pdf_download_url = "http://127.0.0.1:1337/api/download-project-pdf?project_name={}".format(+ project_name_space_url)response = f"I have generated the PDF document. You can download it from here: {pdf_download_url}"-+Browser().go_to(pdf_download_url)Browser().screenshot(project_name)-- ProjectManager().add_message_from_devika(project_name, response)-++ self.project_manager.add_message_from_devika(project_name, response)+elif function == "browser_interaction":user_prompt = args["user_prompt"]# Call the interaction agent to interact with the browser@@@ -150,12 -155,12 +154,12 @@@elif function == "coding_project":user_prompt = args["user_prompt"]# Call the planner, researcher, coder agents in sequence- plan = self.planner.execute(user_prompt)+ plan = self.planner.execute(user_prompt, project_name)planner_response = self.planner.parse_response(plan)-- research = self.researcher.execute(plan, self.collected_context_keywords)++ research = self.researcher.execute(plan, self.collected_context_keywords, project_name)search_results = self.search_queries(research["queries"], project_name)-+code = self.coder.execute(step_by_step_plan=plan,user_context=research["ask_user"],@@@ -164,22 -169,19 +168,22 @@@)self.coder.save_code_to_project(code, project_name)- """- Subsequent flow of execution- """- def subsequent_execute(self, prompt: str, project_name: str) -> str:- AgentState().set_agent_active(project_name, True)-- conversation = ProjectManager().get_all_messages_formatted(project_name)+ 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)code_markdown = ReadCode(project_name).code_set_to_markdown()- response, action = self.action.execute(conversation)+ response, action = self.action.execute(conversation, project_name)-- ProjectManager().add_message_from_devika(project_name, response)-++ self.project_manager.add_message_from_devika(project_name, response)+print("=====" * 10)print(action)print("=====" * 10)@@@ -187,12 -189,13 +191,13 @@@if action == "answer":response = self.answer.execute(conversation=conversation,- code_markdown=code_markdown+ code_markdown=code_markdown,+ project_name=project_name)- ProjectManager().add_message_from_devika(project_name, response)+ self.project_manager.add_message_from_devika(project_name, response)elif action == "run":- os_system = platform.platform()- project_path = ProjectManager().get_project_path(project_name)++ project_path = self.project_manager.get_project_path(project_name)self.runner.execute(conversation=conversation,@@@ -249,21 -251,20 +254,21 @@@Browser().go_to(pdf_download_url)Browser().screenshot(project_name)- ProjectManager().add_message_from_devika(project_name, response)+ self.project_manager.add_message_from_devika(project_name, response)++ 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):+ """+ Agentic flow of execution+ """- AgentState().set_agent_active(project_name, False)- AgentState().set_agent_completed(project_name, True)-- """- Agentic flow of execution- """- def execute(self, prompt: str, project_name_from_user: str = None) -> str:if project_name_from_user:- ProjectManager().add_message_from_user(project_name_from_user, prompt)-+ self.project_manager.add_message_from_user(project_name_from_user, prompt)+- plan = self.planner.execute(prompt)+ plan = self.planner.execute(prompt, project_name_from_user)- print(plan)+ print("\nplan :: ", plan)print("=====" * 10)planner_response = self.planner.parse_response(plan)@@@ -277,29 -278,28 +282,29 @@@project_name = project_name_from_userelse:project_name = planner_response["project"]- ProjectManager().create_project(project_name)- ProjectManager().add_message_from_user(project_name, prompt)+ self.project_manager.create_project(project_name)+ self.project_manager.add_message_from_user(project_name, prompt)++ self.agent_state.set_agent_active(project_name, True)- AgentState().set_agent_active(project_name, True)-- ProjectManager().add_message_from_devika(project_name, reply)- ProjectManager().add_message_from_devika(project_name, json.dumps(plans, indent=4))- # ProjectManager().add_message_from_devika(project_name, f"In summary: {summary}")+ print("\nplans:: ", 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}")self.update_contextual_keywords(focus)- print(self.collected_context_keywords)-+ print("\ncontext_keywords :: ", self.collected_context_keywords)+- internal_monologue = self.internal_monologue.execute(current_prompt=plan)+ internal_monologue = self.internal_monologue.execute(current_prompt=plan, project_name=project_name)- print(internal_monologue)+ print("\ninternal_monologue :: ", internal_monologue)print("=====" * 10)- new_state = AgentState().new_state()+ new_state = self.agent_state.new_state()new_state["internal_monologue"] = internal_monologue- AgentState().add_to_current_state(project_name, new_state)+ self.agent_state.add_to_current_state(project_name, new_state)- research = self.researcher.execute(plan, self.collected_context_keywords)- research = self.researcher.execute(plan, self.collected_context_keywords, project_name)- print(research)++ research = self.researcher.execute(plan, self.collected_context_keywords, project_name=project_name)+ print("\nresearch :: ", research)print("=====" * 10)queries = research["queries"]diff --cc src/agents/researcher/researcher.pyindex 40ff7bb,a7de964..d4f7a10--- a/src/agents/researcher/researcher.py+++ b/src/agents/researcher/researcher.py@@@ -22,11 -21,12 +22,11 @@@ class Researchercontextual_keywords=contextual_keywords)- def validate_response(self, response: str) -> dict or bool:- def validate_response(self, response: str):++ def validate_response(self, response: str) -> dict | bool:response = response.strip().replace("```json", "```")-+if response.startswith("```") and response.endswith("```"):response = response[3:-3].strip()-try:response = json.loads(response)except Exception as _:@@@ -42,16 -42,16 +42,16 @@@"ask_user": response["ask_user"]}- def execute(self, step_by_step_plan: str, contextual_keywords: List[str]) -> dict or bool:- contextual_keywords = ", ".join(map(lambda k: k.capitalize(), contextual_keywords))- step_by_step_plan = self.render(step_by_step_plan, contextual_keywords)-- response = self.llm.inference(step_by_step_plan)-- def execute(self, step_by_step_plan: str, contextual_keywords: List[str], project_name: str) -> str:++ def execute(self, step_by_step_plan: str, contextual_keywords: List[str], project_name: str) -> dict | bool:+ contextual_keywords_str = ", ".join(map(lambda k: k.capitalize(), contextual_keywords))+ prompt = self.render(step_by_step_plan, contextual_keywords_str)++ response = self.llm.inference(prompt, project_name)+valid_response = self.validate_response(response)while not valid_response:print("Invalid response from the model, trying again...")- return self.execute(step_by_step_plan, contextual_keywords)+ return self.execute(step_by_step_plan, contextual_keywords, project_name)- return valid_response+ return valid_responsediff --cc src/config.pyindex 7e95af0,063ae8b..6c66073--- a/src/config.py+++ b/src/config.py@@@ -2,60 -3,67 +3,74 @@@ from os import enviroclass Config:- def __init__(self):- self.config = toml.load("config.toml")+ _instance = None++ def __new__(cls):+ if cls._instance is None:+ cls._instance = super().__new__(cls)+ cls._instance.config = toml.load("config.toml")+ return cls._instance- def __init__(self):- self.config = toml.load("config.toml")-def get_config(self):return self.config- def get_bing_api_key(self):- return environ.get("BING_API_KEY", self.config["API_KEYS"]["BING"])+ 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 environ.get("BING_API_ENDPOINT", self.config["API_ENDPOINTS"]["BING"])+ return self.config["API_ENDPOINTS"]["BING"]++ def get_bing_api_key(self):+ return self.config["API_KEYS"]["BING"]+ def get_ollama_api_endpoint(self):- return environ.get(- "OLLAMA_API_ENDPOINT", self.config["API_ENDPOINTS"]["OLLAMA"]- )++ return self.config["API_ENDPOINTS"]["OLLAMA"]+def get_claude_api_key(self):- return environ.get("CLAUDE_API_KEY", self.config["API_KEYS"]["CLAUDE"])+ return self.config["API_KEYS"]["CLAUDE"]def get_openai_api_key(self):- return environ.get("OPENAI_API_KEY", self.config["API_KEYS"]["OPENAI"])+ return self.config["API_KEYS"]["OPENAI"]++ def get_gemini_api_key(self):+ return self.config["API_KEYS"]["GEMINI"]++ def get_mistral_api_key(self):+ return self.config["API_KEYS"]["MISTRAL"]def get_netlify_api_key(self):- return environ.get("NETLIFY_API_KEY", self.config["API_KEYS"]["NETLIFY"])-- def get_groq_api_key(self):- return environ.get("GROQ_API_KEY", self.config["API_KEYS"]["GROQ"])-+ return self.config["API_KEYS"]["NETLIFY"]+def get_sqlite_db(self):- return environ.get("SQLITE_DB_PATH", self.config["STORAGE"]["SQLITE_DB"])+ return self.config["STORAGE"]["SQLITE_DB"]def get_screenshots_dir(self):- return environ.get("SCREENSHOTS_DIR", self.config["STORAGE"]["SCREENSHOTS_DIR"])+ return self.config["STORAGE"]["SCREENSHOTS_DIR"]def get_pdfs_dir(self):- return environ.get("PDFS_DIR", self.config["STORAGE"]["PDFS_DIR"])+ return self.config["STORAGE"]["PDFS_DIR"]def get_projects_dir(self):- return environ.get("PROJECTS_DIR", self.config["STORAGE"]["PROJECTS_DIR"])+ return self.config["STORAGE"]["PROJECTS_DIR"]def get_logs_dir(self):- return environ.get("LOGS_DIR", self.config["STORAGE"]["LOGS_DIR"])+ return self.config["STORAGE"]["LOGS_DIR"]def get_repos_dir(self):- return environ.get("REPOS_DIR", self.config["STORAGE"]["REPOS_DIR"])+ return self.config["STORAGE"]["REPOS_DIR"]+ def get_logging_rest_api(self):+ return self.config["LOGGING"]["LOG_REST_API"] == "true"++ def get_logging_prompts(self):+ return self.config["LOGGING"]["LOG_PROMPTS"] == "true"+def set_bing_api_key(self, key):self.config["API_KEYS"]["BING"] = keyself.save_config()diff --cc src/llm/groq_client.pyindex 0000000,e504751..cd2ea5emode 000000,100644..100644--- a/src/llm/groq_client.py+++ b/src/llm/groq_client.py@@@ -1,0 -1,25 +1,23 @@@+ from groq import Groq as _Groq++ from src.config import Config+++ class Groq:+ def __init__(self):+ config = Config()+ api_key = config.get_groq_api_key()- self.client = _Groq(- api_key=api_key,- )++ self.client = _Groq(api_key=api_key)++ def inference(self, model_id: str, prompt: str) -> str:+ chat_completion = self.client.chat.completions.create(+ messages=[+ {+ "role": "user",+ "content": prompt.strip(),+ }+ ],+ model=model_id,+ )++ return chat_completion.choices[0].message.contentdiff --cc src/llm/llm.pyindex cdd9e8c,c35b146..ef8534e--- a/src/llm/llm.py+++ b/src/llm/llm.py@@@ -1,85 -1,85 +1,101 @@@-from enum import Enum+import tiktoken+ from typing import List, Tuple+from src.socket_instance import emit_agentfrom .ollama_client import Ollamafrom .claude_client import Claude-from .openai_client import OpenAI+from .openai_client import OpenAi+from .gemini_client import Gemini+from .mistral_client import MistralAi+ from .groq_client import Groq++ from src.state import AgentState+-import tiktoken--from ..config import Config-from ..logger import Logger++from src.config import Config++from src.logger import Logger--TOKEN_USAGE = 0TIKTOKEN_ENC = tiktoken.get_encoding("cl100k_base")-class Model(Enum):- CLAUDE_3_OPUS = ("Claude 3 Opus", "claude-3-opus-20240229")- CLAUDE_3_SONNET = ("Claude 3 Sonnet", "claude-3-sonnet-20240229")- CLAUDE_3_HAIKU = ("Claude 3 Haiku", "claude-3-haiku-20240307")- GPT_4_TURBO = ("GPT-4 Turbo", "gpt-4-0125-preview")- GPT_3_5 = ("GPT-3.5", "gpt-3.5-turbo-0125")- OLLAMA_MODELS = [- (- model["name"].split(":")[0],- model["name"],- )- for model in Ollama.list_models()- ]- GROQ_MIXTRAL_8X7B_32768 = ("GROQ Mixtral", "mixtral-8x7b-32768")- GROQ_LLAMA2_70B_4096 = ("GROQ LLAMA2-70B", "llama2-70b-4096")- GROQ_GEMMA_7B_IT = ("GROQ GEMMA-7B-IT", "gemma-7b-it")---logger = Logger(filename="devika_prompts.log")+ollama = Ollama()++logger = Logger()+class LLM:def __init__(self, model_id: str = None):self.model_id = model_id+ self.log_prompts = Config().get_logging_prompts()-- def list_models(self) -> List[Tuple[str, str]]:- return [model.value for model in Model if model.name != "OLLAMA_MODELS"] + list(- Model.OLLAMA_MODELS.value- )-- def model_id_to_enum_mapping(self):- models = {model.value[1]: model for model in Model if model.name != "OLLAMA_MODELS"}- ollama_models = {model[1]: "OLLAMA_MODELS" for model in Model.OLLAMA_MODELS.value}- models.update(ollama_models)- return models-- def update_global_token_usage(self, string: str, project_name: str):+ self.models = {+ "CLAUDE": [+ ("Claude 3 Opus", "claude-3-opus-20240229"),+ ("Claude 3 Sonnet", "claude-3-sonnet-20240229"),+ ("Claude 3 Haiku", "claude-3-haiku-20240307"),+ ],+ "OPENAI": [+ ("GPT-4 Turbo", "gpt-4-0125-preview"),+ ("GPT-3.5", "gpt-3.5-turbo-0125"),+ ],+ "GOOGLE": [+ ("Gemini 1.0 Pro", "gemini-pro"),+ ],+ "MISTRAL": [+ ("Mistral 7b", "open-mistral-7b"),+ ("Mistral 8x7b", "open-mixtral-8x7b"),+ ("Mistral Medium", "mistral-medium-latest"),+ ("Mistral Small", "mistral-small-latest"),+ ("Mistral Large", "mistral-large-latest"),+ ],++ "GROQ": [++ ("GROQ Mixtral", "mixtral-8x7b-32768"),++ ("GROQ LLAMA2-70B", "llama2-70b-4096"),++ ("GROQ GEMMA-7B-IT", "gemma-7b-it"),++ ],+ "OLLAMA_MODELS": []+ }+ if ollama:+ self.models["OLLAMA_MODELS"] = [(model["name"].split(":")[0], model["name"]) for model in+ ollama.list_models()]++ def list_models(self) -> dict:+ return self.models++ def model_id_to_enum_mapping(self) -> dict:+ mapping = {}+ for enum_name, models in self.models.items():+ 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 update_global_token_usage(string: str, project_name: str):+ token_usage = len(TIKTOKEN_ENC.encode(string))++ emit_agent("tokens", {"token_usage": token_usage})+ AgentState().update_token_usage(project_name, token_usage)- def inference(self, prompt: str) -> str:- self.update_global_token_usage(prompt)- def inference(- self, prompt: str, project_name: str- ) -> str:++ def inference(self, prompt: str, project_name: str) -> str:+ self.update_global_token_usage(prompt, project_name)-- model = self.model_id_to_enum_mapping()[self.model_id]- if self.log_prompts:- logger.debug(f"Prompt ({model}): --> {prompt}")-- if model == "OLLAMA_MODELS":- response = Ollama().inference(self.model_id, prompt).strip()- elif "CLAUDE" in str(model):- response = Claude().inference(self.model_id, prompt).strip()- elif "GPT" in str(model):- response = OpenAI().inference(self.model_id, prompt).strip()- elif "GROQ" in str(model):- response = Groq().inference(self.model_id, prompt).strip()- else:- raise ValueError(f"Model {model} not supported")+ model_enum = self.model_id_to_enum_mapping().get(self.model_id)+ if model_enum is None:+ raise ValueError(f"Model {self.model_id} not supported")++ model_mapping = {+ "OLLAMA_MODELS": ollama,+ "CLAUDE": Claude(),+ "OPENAI": OpenAi(),+ "GOOGLE": Gemini(),- "MISTRAL": MistralAi()++ "MISTRAL": MistralAi(),++ "GROQ": Groq()+ }++ try:+ model = model_mapping[model_enum]+ response = model.inference(self.model_id, prompt).strip()+ except KeyError:+ raise ValueError(f"Model {model_enum} not supported")- self.update_global_token_usage(response)+ if self.log_prompts:+ logger.debug(f"Response ({model}): --> {response}")++ self.update_global_token_usage(response, project_name)-+return responsediff --cc src/llm/ollama_client.pyindex 80d9ed3,0977dc1..963eb4c--- a/src/llm/ollama_client.py+++ b/src/llm/ollama_client.py@@@ -1,26 -1,29 +1,27 @@@-import httpx-from ollama import Client-from src.config import Config-+import ollamafrom src.logger import Logger++from src.config import Config-logger = Logger()--client = Client(host=Config().get_ollama_api_endpoint())+log = Logger()class Ollama:- @staticmethod- def list_models():+ def __init__(self):try:- self.client = ollama.Client()- return client.list()["models"]- except httpx.ConnectError:- logger.warning("Ollama server not running, please start the server to use models from Ollama.")- except Exception as e:- logger.error(f"Failed to list Ollama models: {e}")- return []++ self.client = ollama.Client(host=Config().get_ollama_api_endpoint())+ log.info("Ollama available")+ except:+ self.client = None+ log.warning("Ollama not available")+ log.warning("run ollama server to use ollama models otherwise use other models")++ def list_models(self) -> list[dict]:+ models = self.client.list()["models"]+ return modelsdef inference(self, model_id: str, prompt: str) -> str:- try:- response = ollama.generate(model=model_id, prompt=prompt.strip())- return response['response']- except Exception as e:- logger.error(f"Error during model inference: {e}")- return ""+ response = self.client.generate(+ model=model_id,+ prompt=prompt.strip()+ )+ return response['response']diff --cc src/logger.pyindex 76ec11d,94ae2b0..6ff7660--- a/src/logger.py+++ b/src/logger.py@@@ -5,13 -5,11 +5,12 @@@ from flask import requesfrom src.config import Config+class Logger:- def __init__(self):+ def __init__(self, filename="devika_agent.log"):config = Config()logs_dir = config.get_logs_dir()- self.logger = LogInit(pathName=logs_dir + "/devika_agent.log", console=True, colors=True)- self.mode = "on"+ self.logger = LogInit(pathName=logs_dir + "/" + filename, console=True, colors=True)def read_log_file(self) -> str:with open(self.logger.pathName, "r") as file:@@@ -49,23 -50,18 +51,25 @@@ def route_logger(logger: Logger)@wraps(func)def wrapper(*args, **kwargs):+ if logger.mode == "off":+ return func(*args, **kwargs)# Log entry point- logger.info(f"{request.path} {request.method}")+ if log_enabled:+ logger.info(f"{request.path} {request.method}")# Call the actual route functionresponse = func(*args, **kwargs)+ from werkzeug.wrappers import Response+# Log exit point, including response summary if possibletry:- 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}")+ if log_enabled:- 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 --cc src/state.pyindex 60cb732,412b7ad..6ead64f--- a/src/state.py+++ b/src/state.py@@@ -139,3 -133,26 +139,26 @@@ class AgentStateif agent_state:return json.loads(agent_state.state_stack_json)[-1]["completed"]return None++ def update_token_usage(self, project: str, token_usage: int):+ with Session(self.engine) as session:+ agent_state = session.query(AgentStateModel).filter(AgentStateModel.project == project).first()+ print(agent_state)+ if agent_state:+ state_stack = json.loads(agent_state.state_stack_json)+ state_stack[-1]["token_usage"] += token_usage+ agent_state.state_stack_json = json.dumps(state_stack)+ session.commit()+ else:+ state_stack = [self.new_state()]+ state_stack[-1]["token_usage"] = token_usage+ agent_state = AgentStateModel(project=project, state_stack_json=json.dumps(state_stack))+ session.add(agent_state)+ session.commit()++ def get_latest_token_usage(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]["token_usage"]- return 0++ return 0diff --cc ui/package.jsonindex 9cea2f3,7171132..60388c0--- a/ui/package.json+++ b/ui/package.json@@@ -20,7 -20,7 +20,8 @@@},"type": "module","dependencies": {+ "socket.io-client": "^4.7.5",+ "clsx": "^2.1.0","xterm": "^5.3.0","xterm-addon-fit": "^0.8.0"}diff --cc ui/src/lib/api.jsindex 511199d,45ce3f5..1541bba--- a/ui/src/lib/api.js+++ b/ui/src/lib/api.js@@@ -1,23 -1,33 +1,37 @@@import {- messages,- projectList,- modelList,agentState,internet,- messages,- modelList,- projectList,+ searchEngineList,} from "./store";+import { io } from "socket.io-client";+- export const API_BASE_URL = "http://127.0.0.1:1337";+export const socket = io(API_BASE_URL);+ const getApiBaseUrl = () => {+ if (typeof window !== 'undefined') {+ // Client-side code+ const host = window.location.hostname;+ if (host === 'localhost' || host === '127.0.0.1') {+ return 'http://127.0.0.1:1337';+ } else {+ return `http://${host}:1337`;+ }+ } else {+ // Server-side code (Node.js)+ return 'http://127.0.0.1:1337';+ }+ };++ export const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || getApiBaseUrl();++-export async function fetchProjectList() {- const response = await fetch(`${API_BASE_URL}/api/project-list`);+export async function fetchInitialData() {+ const response = await fetch(`${API_BASE_URL}/api/data`);const data = await response.json();projectList.set(data.projects);+ modelList.set(data.models);+ searchEngineList.set(data.search_engines);+ localStorage.setItem("defaultData", JSON.stringify(data));}export async function createProject(projectName) {diff --cc ui/src/lib/components/ControlPanel.svelteindex 4d54661,ef5cf6d..88be66a--- a/ui/src/lib/components/ControlPanel.svelte+++ b/ui/src/lib/components/ControlPanel.svelte@@@ -39,108 -11,34 +39,107 @@@}async function createNewProject() {- const projectName = prompt("Enter the project name:");+ const projectName = prompt('Enter the project name:');if (projectName) {await createProject(projectName);- await fetchProjectList();-- selectedProject.set(projectName);+ selectProject(projectName);}}+ async function deleteproject(project) {+ if (confirm(`Are you sure you want to delete ${project}?`)) {+ await deleteProject(project);+ await fetchInitialData();+ agentState.setItem(null);+ selectProject("Select Project");+ }+ }++ const dropdowns = [+ { dropdown: "project-dropdown", button: "project-button" },+ { dropdown: "model-dropdown", button: "model-button" },+ { dropdown: "search-engine-dropdown", button: "search-engine-button" },+ ];+ function closeDropdowns(event) {+ dropdowns.forEach(({ dropdown, button }) => {+ const dropdownElement = document.getElementById(dropdown);+ const buttonElement = document.getElementById(button);++ if (+ !dropdownElement.contains(event.target) &&+ !buttonElement.contains(event.target)+ ) {+ dropdownElement.classList.add("hidden");+ }+ });+ }- onMount(() => {- setInterval(updateTokenUsage, 1000);+ onMount(async () => {+ dropdowns.forEach(({ dropdown, button }) => {+ document.getElementById(button).addEventListener("click", function () {+ const dropdownElement = document.getElementById(dropdown);+ dropdownElement.classList.toggle("hidden");+ });+ });+ document.addEventListener("click", closeDropdowns);+ return () => {+ document.removeEventListener("click", closeDropdowns);+ };});+</script>-<div class="control-panel bg-slate-900 border border-indigo-700 rounded">- <Dropdown options={Object.fromEntries($projectList.map((x) => [x, x]))} label="Select Project" bind:selection={$selectedProject}>- <div slot="prefix-entries" let:closeDropdown={close}>- <button- class="text-white block px-4 py-2 text-sm hover:bg-slate-700 w-full text-left overflow-clip"- on:click|preventDefault={() => {- createNewProject();- close();- }}- >- + Create New Project- </button>+<div class="control-panel">+ <div class="dropdown-menu relative inline-block">+ <button+ type="button"+ class="inline-flex items-center justify-center w-full gap-2 rounded-md px-3 py-2 text-sm font-semibold border-2 border-gray-300"+ id="project-button"+ aria-expanded="true"+ aria-haspopup="true"+ >+ <span id="selected-project">{selectedProject}</span>+ <i class="fas fa-angle-down"></i>+ </button>+ <div+ id="project-dropdown"+ class="absolute left-0 z-10 mt-2 w-40 origin-top-left rounded-md bg-gray-100 shadow-lg max-h-96 overflow-y-auto hidden"+ role="menu"+ aria-orientation="vertical"+ aria-labelledby="project-button"+ tabindex="-1"+ >+ <div role="none" class="flex flex-col divide-y-2 w-full">+ <button+ class="flex gap-2 items-center text-sm px-4 py-3 w-full"+ on:click|preventDefault={createNewProject}+ >+ <i class="fas fa-plus"></i>+ new project+ </button>+ {#if $projectList !== null}+ {#each $projectList as project}+ <div+ class="flex items-center px-4 hover:bg-gray-300 transition-colors+ {selectedProject === project ? 'bg-gray-300' : ''}"+ >+ <button+ href="#"+ class="flex gap-2 items-center text-sm py-3 w-full text-clip"+ on:click|preventDefault={() => selectProject(project)}+ >+ {project}+ </button>+ <button+ class="fa-regular fa-trash-can hover:text-red-600"+ on:click={() => deleteproject(project)}+ aria-label="Delete project"+ ></button>+ </div>+ {/each}+ {/if}+ </div></div>- </Dropdown>+ </div>-<divclass="right-controls"style="display: flex; align-items: center; gap: 20px"diff --cc ui/src/lib/components/TerminalWidget.svelteindex 0a0a519,868c64e..68e4530--- a/ui/src/lib/components/TerminalWidget.svelte+++ b/ui/src/lib/components/TerminalWidget.svelte@@@ -15,14 -16,9 +16,14 @@@cursorBlink: true,convertEol: true,rows: 1,+ theme: {+ background: "#d3d3d3",+ foreground: "#000000",+ innerText: "#000000",+ cursor: "#000000",+ },});- fitAddon = new FitAddon();-+ fitAddon = new xtermAddonFit.FitAddon();terminal.loadAddon(fitAddon);terminal.open(terminalElement);fitAddon.fit();diff --cc ui/src/lib/store.jsindex c199ac3,ba51f2a..09576f6--- a/ui/src/lib/store.js+++ b/ui/src/lib/store.js@@@ -1,9 -1,39 +1,42 @@@import { writable } from 'svelte/store';+ const getInitialSelectedProject = () => {+ if (typeof window !== 'undefined' && window.localStorage) {+ return localStorage.getItem('selectedProject') || '';+ }+ return '';+ };++ const getInitialSelectedModel = () => {+ if (typeof window !== 'undefined' && window.localStorage) {+ return localStorage.getItem('selectedModel') || '';+ }+ return '';+ };+export const messages = writable([]);++ export const selectedProject = writable(getInitialSelectedProject());-export const projectList = writable([]);-+ export const selectedModel = writable(getInitialSelectedModel());-export const modelList = writable([]);+++export const projectList = writable([]);+export const modelList = writable({});+export const searchEngineList = writable([]);+export const agentState = writable(null);+export const internet = writable(true);- export const tokenUsage = writable(0);++export const tokenUsage = writable(0);++++ selectedProject.subscribe((value) => {+ if (typeof window !== 'undefined' && window.localStorage) {+ localStorage.setItem('selectedProject', value);+ }+ });++ selectedModel.subscribe((value) => {+ if (typeof window !== 'undefined' && window.localStorage) {+ localStorage.setItem('selectedModel', value);+ }-});++});diff --cc ui/src/routes/+layout.svelteindex e00c774,b9b1d21..7325aa6--- a/ui/src/routes/+layout.svelte+++ b/ui/src/routes/+layout.svelte@@@ -1,9 -1,9 +1,9 @@@<script>- import "../app.pcss"- import Sidebar from '$lib/components/Sidebar.svelte'+ import Sidebar from "$lib/components/Sidebar.svelte";+ import "../app.pcss";</script>-<main class="h-dvh ml-20">- <Sidebar />- <slot />+<main class="flex h-dvh w-full">+ <Sidebar />+ <slot />- </main>+ </main>diff --cc ui/src/routes/settings/+page.svelteindex a51e1d2,d028452..f56e2f3--- a/ui/src/routes/settings/+page.svelte+++ b/ui/src/routes/settings/+page.svelte@@@ -1,67 -1,5 +1,67 @@@-<script lang="ts">- import Settings from "./Settings/Settings.svelte";+<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><Settings /></div>+<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>++</div>