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

Improve: error handling and toast, project managment

[email protected]29548ad1bfce
diff --git a/devika.py b/devika.py
index b65f0d2..eef5542 100644
--- a/devika.py
+++ b/devika.py
@@ -72,7 +72,7 @@ def get_messages():
# Main socket
@socketio.on('user-message')
def handle_message(data):
- action = data.get('action')
+ logger.info(f"User message: {data}")
message = data.get('message')
base_model = data.get('base_model')
project_name = data.get('project_name')
@@ -85,21 +85,15 @@ def handle_message(data):
thread = Thread(target=lambda: agent.execute(message, project_name))
thread.start()
else:
- new_message = manager.new_message()
- new_message['message'] = message
- new_message['from_devika'] = False
- manager.add_message_from_user(project_name, new_message['message'])
-
if AgentState.is_agent_completed(project_name):
thread = Thread(target=lambda: agent.subsequent_execute(message, project_name))
thread.start()
else:
- emit_agent("info", {"type": "warning", "message": "previous agent is not completed it's task."})
+ emit_agent("info", {"type": "warning", "message": "previous agent doesn't completed it's task."})
last_state = AgentState.get_latest_state(project_name)
if last_state["agent_is_active"] or not last_state["completed"]:
- manager.add_message_from_devika(project_name, "previous agent is not completed it's task.")
- emit_agent("info", {"type": "info", "message": "I'm trying to complete the previous task again."})
- message = manager.get_latest_message_from_user(project_name)
+ # emit_agent("info", {"type": "info", "message": "I'm trying to complete the previous task again."})
+ # message = manager.get_latest_message_from_user(project_name)
thread = Thread(target=lambda: agent.execute(message, project_name))
thread.start()
else:
diff --git a/src/agents/agent.py b/src/agents/agent.py
index 3eed1cb..2018337 100644
--- a/src/agents/agent.py
+++ b/src/agents/agent.py
@@ -180,6 +180,10 @@ class Agent:
"""
Subsequent flow of execution
"""
+ new_message = self.project_manager.new_message()
+ new_message['message'] = prompt
+ new_message['from_devika'] = False
+ self.project_manager.add_message_from_user(project_name, new_message['message'])
os_system = platform.platform()
diff --git a/src/llm/llm.py b/src/llm/llm.py
index 5f83a6f..06b7ac9 100644
--- a/src/llm/llm.py
+++ b/src/llm/llm.py
@@ -57,18 +57,18 @@ class LLM:
"OLLAMA": []
}
if ollama.client:
- self.models["OLLAMA"] = [(model["name"].split(":")[0], model["name"]) for model in
- ollama.models]
+ self.models["OLLAMA"] = [(model["name"].split(":")[0], model["name"]) for model in ollama.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
+ def model_enum(self, model_name: str) -> Tuple[str, str]:
+ model_dict = {
+ model[0]: (model_enum, model[1])
+ for model_enum, models in self.models.items()
+ for model in models
+ }
+ return model_dict.get(model_name, (None, None))
@staticmethod
def update_global_token_usage(string: str, project_name: str):
@@ -81,7 +81,8 @@ class LLM:
def inference(self, prompt: str, project_name: str) -> str:
self.update_global_token_usage(prompt, project_name)
- model_enum = self.model_id_to_enum_mapping().get(self.model_id)
+ model_enum, model_name = self.model_enum(self.model_id)
+
print(f"Model: {self.model_id}, Enum: {model_enum}")
if model_enum is None:
raise ValueError(f"Model {self.model_id} not supported")
@@ -103,7 +104,7 @@ class LLM:
model = model_mapping[model_enum]
with concurrent.futures.ThreadPoolExecutor() as executor:
- future = executor.submit(model.inference, self.model_id, prompt)
+ future = executor.submit(model.inference, model_name, prompt)
try:
while future.running():
elapsed_time = time.time() - start_time
@@ -122,6 +123,13 @@ class LLM:
response = False
logger.warning("Inference failed")
sys.exit()
+
+ except Exception as e:
+ logger.error(str(e))
+ response = False
+ emit_agent("inference", {"type": "error", "message": str(e)})
+ sys.exit()
+
except KeyError:
raise ValueError(f"Model {model_enum} not supported")
diff --git a/src/state.py b/src/state.py
index 7dcf14d..e870893 100644
--- a/src/state.py
+++ b/src/state.py
@@ -55,7 +55,7 @@ class AgentState:
def delete_state(self, project: str):
with Session(self.engine) as session:
- agent_state = session.query(AgentStateModel).filter(AgentStateModel.project == project).first()
+ agent_state = session.query(AgentStateModel).filter(AgentStateModel.project == project).all()
if agent_state:
session.delete(agent_state)
session.commit()
diff --git a/ui/bun.lockb b/ui/bun.lockb
index 182022c..38bfc46 100755
Binary files a/ui/bun.lockb and b/ui/bun.lockb differ
diff --git a/ui/src/lib/components/ControlPanel.svelte b/ui/src/lib/components/ControlPanel.svelte
index 88620b5..529e597 100644
--- a/ui/src/lib/components/ControlPanel.svelte
+++ b/ui/src/lib/components/ControlPanel.svelte
@@ -1,39 +1,21 @@
<script>
import { onMount } from "svelte";
- import { projectList, modelList, internet, tokenUsage, agentState, messages, searchEngineList, serverStatus, isSending} from "$lib/store";
+ import { projectList, modelList, internet, tokenUsage, agentState, messages, searchEngineList, serverStatus, isSending, selectedProject, selectedModel, selectedSearchEngine} from "$lib/store";
import { createProject, fetchMessages, fetchInitialData, deleteProject, fetchAgentState} from "$lib/api";
- import { get } from "svelte/store";
import Seperator from "./ui/Seperator.svelte";
- let selectedProject;
- let selectedModel;
- let selectedSearchEngine;
-
- const checkListAndSetItem = (list, itemKey, defaultItem) => {
- if (get(list)) {
- const item = localStorage.getItem(itemKey);
- return item ? item : defaultItem;
- } else {
- localStorage.setItem(itemKey, "");
- return defaultItem;
- }
- };
-
function selectProject(project) {
- selectedProject = project;
- localStorage.setItem("selectedProject", project);
+ $selectedProject = project;
fetchMessages();
- fetchAgentState();
+ // fetchAgentState();
document.getElementById("project-dropdown").classList.add("hidden");
}
function selectModel(model) {
- selectedModel = `${model[0]}`;
- localStorage.setItem("selectedModel", model[0]);
+ $selectedModel = model;
document.getElementById("model-dropdown").classList.add("hidden");
}
function selectSearchEngine(searchEngine) {
- selectedSearchEngine = searchEngine;
- localStorage.setItem("selectedSearchEngine", searchEngine);
+ $selectedSearchEngine = searchEngine;
document.getElementById("search-engine-dropdown").classList.add("hidden");
}
@@ -54,7 +36,7 @@
tokenUsage.set(0);
agentState.set(null);
isSending.set(false);
- selectedProject = "Select Project";
+ $selectedProject = "Select Project";
localStorage.setItem("selectedProject", "");
}
}
@@ -87,9 +69,6 @@
}
})();
- selectedProject = "Select Project";
- selectedModel = checkListAndSetItem( modelList, "selectedModel", "Select Model");
- selectedSearchEngine = checkListAndSetItem( searchEngineList, "selectedSearchEngine", "Select Search Engine");
dropdowns.forEach(({ dropdown, button }) => {
document.getElementById(button).addEventListener("click", function () {
const dropdownElement = document.getElementById(dropdown);
@@ -113,7 +92,7 @@
aria-expanded="true"
aria-haspopup="true"
>
- <span id="selected-project">{selectedProject}</span>
+ <span id="selected-project">{$selectedProject}</span>
<i class="fas fa-angle-down text-tertiary"></i>
</button>
<div
@@ -179,7 +158,7 @@
aria-expanded="true"
aria-haspopup="true"
>
- <span id="selected-search-engine">{selectedSearchEngine}</span>
+ <span id="selected-search-engine">{$selectedSearchEngine}</span>
<i class="fas fa-angle-down text-tertiary"></i>
</button>
</div>
@@ -220,7 +199,7 @@
aria-expanded="true"
aria-haspopup="true"
>
- <span id="selected-model">{selectedModel}</span>
+ <span id="selected-model">{$selectedModel}</span>
<i class="fas fa-angle-down text-tertiary"></i>
</button>
</div>
@@ -243,13 +222,9 @@
<div class="flex flex-col gap-[1px] px-6 w-full">
{#each modelItems as models}
<button
- class="relative nav-button flex text-start text-sm text-clip hover:bg-black/20 px-2 py-1.5 rounded-md
- transition-colors {selectedModel ==
- `${models[0]} (${models[1]})` ||
- selectedModel == models[1]
- ? 'bg-gray-300'
- : ''}"
- on:click|preventDefault={() => selectModel(models)}
+ class="relative nav-button flex text-start text-sm text-clip hover:bg-black/20 px-2 py-1.5 rounded-md transition-colors
+ {selectedModel == models[0] ? 'bg-gray-300': ''}"
+ on:click|preventDefault={() => selectModel(models[0])}
>
{models[0]}
<span class="tooltip text-[10px] px-2 text-gray-500"
diff --git a/ui/src/lib/components/MessageInput.svelte b/ui/src/lib/components/MessageInput.svelte
index 45bab34..d3839d6 100644
--- a/ui/src/lib/components/MessageInput.svelte
+++ b/ui/src/lib/components/MessageInput.svelte
@@ -1,5 +1,5 @@
<script>
- import { socket } from "$lib/api";
+ import { emitMessage, socketListener } from "$lib/sockets";
import { agentState, messages, isSending } from "$lib/store";
import { calculateTokens } from "$lib/token";
import { onMount } from "svelte";
@@ -26,22 +26,26 @@
return;
}
- if (messageInput.trim() !== "" && !isAgentActive) {
+ if (messageInput.trim() !== "" && isSending) {
$isSending = true;
- if ($messages.length === 0) {
- socket.emit("user-message", {
- message: messageInput,
- base_model: selectedModel,
- project_name: projectName,
- search_engine: serachEngine,
- });
- }
+ emitMessage("user-message", {
+ message: messageInput,
+ base_model: selectedModel,
+ project_name: projectName,
+ search_engine: serachEngine,
+ });
+ console.log({
+ message: messageInput,
+ base_model: selectedModel,
+ project_name: projectName,
+ search_engine: serachEngine,
+ });
messageInput = "";
}
}
onMount(() => {
- socket.on("inference", function (data) {
+ socketListener("inference", function (data) {
if(data['type'] == 'time') {
inference_time = data["elapsed_time"];
}
diff --git a/ui/src/lib/components/ui/sonner/sonner.svelte b/ui/src/lib/components/ui/sonner/sonner.svelte
index b07664a..e117e66 100644
--- a/ui/src/lib/components/ui/sonner/sonner.svelte
+++ b/ui/src/lib/components/ui/sonner/sonner.svelte
@@ -5,7 +5,9 @@
<Sonner
richColors
+ expand={true}
theme={$mode}
+ duration={5000}
position="bottom-left"
class="toaster group"
toastOptions={{
diff --git a/ui/src/lib/sockets.js b/ui/src/lib/sockets.js
index 32e0672..9fc401f 100644
--- a/ui/src/lib/sockets.js
+++ b/ui/src/lib/sockets.js
@@ -6,6 +6,7 @@ import { get } from "svelte/store";
let prevMonologue = null;
export function initializeSockets() {
+
socket.connect();
let state = get(agentState);
@@ -17,7 +18,7 @@ export function initializeSockets() {
});
socket.on("server-message", function (data) {
- console.log("server-message: ", data);
+ console.log(data)
messages.update((msgs) => [...msgs, data["messages"]]);
});
@@ -36,6 +37,7 @@ export function initializeSockets() {
socket.on("inference", function (error) {
if (error["type"] == "error") {
toast.error(error["message"]);
+ isSending.set(false);
} else if (error["type"] == "warning") {
toast.warning(error["message"]);
}
@@ -44,6 +46,7 @@ export function initializeSockets() {
socket.on("info", function (info) {
if (info["type"] == "error") {
toast.error(info["message"]);
+ isSending.set(false);
} else if (info["type"] == "warning") {
toast.warning(info["message"]);
} else if (info["type"] == "info") {
@@ -75,5 +78,15 @@ export function destroySockets() {
socket.off("server-message");
socket.off("agent-state");
socket.off("tokens");
+ socket.off("inference");
+ socket.off("info");
}
}
+
+export function emitMessage(channel, message) {
+ socket.emit(channel, message);
+}
+
+export function socketListener(channel, callback) {
+ socket.on(channel, callback);
+}
diff --git a/ui/src/lib/store.js b/ui/src/lib/store.js
index 3828a5e..ded66c1 100644
--- a/ui/src/lib/store.js
+++ b/ui/src/lib/store.js
@@ -1,18 +1,47 @@
import { writable } from 'svelte/store';
+// Helper function to get item from localStorage
+function getItemFromLocalStorage(key, defaultValue) {
+ const storedValue = localStorage.getItem(key);
+ if (storedValue) {
+ return storedValue;
+ }
+ localStorage.setItem(key, defaultValue);
+ return defaultValue;
+}
+
+// Helper function to handle subscription and local storage setting
+function subscribeAndStore(store, key, defaultValue) {
+ store.set(getItemFromLocalStorage(key, defaultValue));
+ store.subscribe(value => {
+ localStorage.setItem(key, value);
+ });
+}
+
+// Server related stores
export const serverStatus = writable(false);
+export const internet = writable(true);
+// Message related stores
export const messages = writable([]);
+// Selection related stores
export const selectedProject = writable('');
export const selectedModel = writable('');
+export const selectedSearchEngine = writable('');
+subscribeAndStore(selectedProject, 'selectedProject', 'select project');
+subscribeAndStore(selectedModel, 'selectedModel', 'select model');
+subscribeAndStore(selectedSearchEngine, 'selectedSearchEngine', 'select search engine');
+
+// List related stores
export const projectList = writable([]);
export const modelList = writable({});
export const searchEngineList = writable([]);
+// Agent related stores
export const agentState = writable(null);
export const isSending = writable(false);
-export const internet = writable(true);
-export const tokenUsage = writable(0);
+// Token usage store
+export const tokenUsage = writable(0);
\ No newline at end of file