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 and Fix: response parser, invalid response and others (#522)

ayush rajgorcdfb782b0e63
diff --git a/app.dockerfile b/app.dockerfile
deleted file mode 100644
index 693addb..0000000
--- a/app.dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM debian:12
-
-# setting up build variable
-ARG VITE_API_BASE_URL
-ENV VITE_API_BASE_URL=${VITE_API_BASE_URL}
-
-# setting up os env
-USER root
-WORKDIR /home/nonroot/client
-RUN groupadd -r nonroot && useradd -r -g nonroot -d /home/nonroot/client -s /bin/bash nonroot
-
-# install node js
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y build-essential software-properties-common curl sudo wget git
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-RUN apt-get install nodejs
-
-# copying devika app client only
-COPY ui /home/nonroot/client/ui
-COPY src /home/nonroot/client/src
-COPY config.toml /home/nonroot/client/
-
-RUN cd ui && npm install && npm install -g npm && npm install -g bun
-RUN chown -R nonroot:nonroot /home/nonroot/client
-
-USER nonroot
-WORKDIR /home/nonroot/client/ui
-
-ENTRYPOINT [ "npx", "bun", "run", "dev", "--", "--host" ]
\ No newline at end of file
diff --git a/devika.py b/devika.py
index eef5542..324c2e3 100644
--- a/devika.py
+++ b/devika.py
@@ -186,9 +186,7 @@ def real_time_logs():
@route_logger(logger)
def set_settings():
data = request.json
- print("Data: ", data)
- config.config.update(data)
- config.save_config()
+ config.update_config(data)
return jsonify({"message": "Settings updated"})
diff --git a/sample.config.toml b/sample.config.toml
index 81b50da..cd79613 100644
--- a/sample.config.toml
+++ b/sample.config.toml
@@ -26,3 +26,6 @@ OPENAI = "https://api.openai.com/v1"
[LOGGING]
LOG_REST_API = "true"
LOG_PROMPTS = "false"
+
+[TIMEOUT]
+INFERENCE = 60
\ No newline at end of file
diff --git a/src/agents/action/action.py b/src/agents/action/action.py
index ec1bd60..f7563ec 100644
--- a/src/agents/action/action.py
+++ b/src/agents/action/action.py
@@ -2,7 +2,7 @@ import json
from jinja2 import Environment, BaseLoader
-from src.services.utils import retry_wrapper
+from src.services.utils import retry_wrapper, validate_responses
from src.config import Config
from src.llm import LLM
@@ -24,17 +24,8 @@ class Action:
conversation=conversation
)
+ @validate_responses
def validate_response(self, response: str):
- response = response.strip().replace("```json", "```")
-
- if response.startswith("```") and response.endswith("```"):
- response = response[3:-3].strip()
-
- try:
- response = json.loads(response)
- except Exception as _:
- return False
-
if "response" not in response and "action" not in response:
return False
else:
diff --git a/src/agents/answer/answer.py b/src/agents/answer/answer.py
index 6e9186a..c6bcbed 100644
--- a/src/agents/answer/answer.py
+++ b/src/agents/answer/answer.py
@@ -2,7 +2,7 @@ import json
from jinja2 import Environment, BaseLoader
-from src.services.utils import retry_wrapper
+from src.services.utils import retry_wrapper, validate_responses
from src.config import Config
from src.llm import LLM
@@ -25,17 +25,8 @@ class Answer:
code_markdown=code_markdown
)
+ @validate_responses
def validate_response(self, response: str):
- response = response.strip().replace("```json", "```")
-
- if response.startswith("```") and response.endswith("```"):
- response = response[3:-3].strip()
-
- try:
- response = json.loads(response)
- except Exception as _:
- return False
-
if "response" not in response:
return False
else:
diff --git a/src/agents/decision/decision.py b/src/agents/decision/decision.py
index 923c93d..304d2ff 100644
--- a/src/agents/decision/decision.py
+++ b/src/agents/decision/decision.py
@@ -2,7 +2,7 @@ import json
from jinja2 import Environment, BaseLoader
-from src.services.utils import retry_wrapper
+from src.services.utils import retry_wrapper, validate_responses
from src.llm import LLM
PROMPT = open("src/agents/decision/prompt.jinja2").read().strip()
@@ -16,17 +16,8 @@ class Decision:
template = env.from_string(PROMPT)
return template.render(prompt=prompt)
+ @validate_responses
def validate_response(self, response: str):
- response = response.strip().replace("```json", "```")
-
- if response.startswith("```") and response.endswith("```"):
- response = response[3:-3].strip()
-
- try:
- response = json.loads(response)
- except Exception as _:
- return False
-
for item in response:
if "function" not in item or "args" not in item or "reply" not in item:
return False
diff --git a/src/agents/internal_monologue/internal_monologue.py b/src/agents/internal_monologue/internal_monologue.py
index e1d9503..5faf1ad 100644
--- a/src/agents/internal_monologue/internal_monologue.py
+++ b/src/agents/internal_monologue/internal_monologue.py
@@ -3,7 +3,7 @@ import json
from jinja2 import Environment, BaseLoader
from src.llm import LLM
-from src.services.utils import retry_wrapper
+from src.services.utils import retry_wrapper, validate_responses
PROMPT = open("src/agents/internal_monologue/prompt.jinja2").read().strip()
@@ -16,19 +16,10 @@ class InternalMonologue:
template = env.from_string(PROMPT)
return template.render(current_prompt=current_prompt)
+ @validate_responses
def validate_response(self, response: str):
- response = response.strip().replace("```json", "```")
-
- if response.startswith("```") and response.endswith("```"):
- response = response[3:-3].strip()
-
- try:
- response = json.loads(response)
- except Exception as _:
- return False
-
- response = {k.replace("\\", ""): v for k, v in response.items()}
-
+ print('-------------------> ', response)
+ print("####", type(response))
if "internal_monologue" not in response:
return False
else:
diff --git a/src/agents/researcher/prompt.jinja2 b/src/agents/researcher/prompt.jinja2
index 19ff718..7da77c0 100644
--- a/src/agents/researcher/prompt.jinja2
+++ b/src/agents/researcher/prompt.jinja2
@@ -11,18 +11,20 @@ Only respond in the following JSON format:
```
{
- "queries": [
- "<QUERY 1>",
- "<QUERY 2>"
- ],
- "ask_user": "<ASK INPUT FROM USER>"
+ "queries": ["<QUERY 1>", "<QUERY 2>", "<QUERY 3>", ... ],
+ "ask_user": "<ASK INPUT FROM USER IF REQUIRED, OTHERWISE LEAVE EMPTY STRING>"
+}
+```
+Example =>
+```
+{
+ "queries": ["How to do Bing Search via API in Python", "Claude API Documentation Python"],
+ "ask_user": "Can you please provide API Keys for Claude, OpenAI, and Firebase?"
}
```
Keywords for Search Query: {{ contextual_keywords }}
-Example "queries": ["How to do Bing Search via API in Python", "Claude API Documentation Python"]
-Example "ask_user": "Can you please provide API Keys for Claude, OpenAI, and Firebase?"
Rules:
- Only search for a maximum of 3 queries.
@@ -33,13 +35,6 @@ Rules:
- Do not search for basic queries, only search for advanced and specific queries. You are allowed to leave the "queries" field empty if no search queries are needed for the step.
- DO NOT EVER SEARCH FOR BASIC QUERIES. ONLY SEARCH FOR ADVANCED QUERIES.
- YOU ARE ALLOWED TO LEAVE THE "queries" FIELD EMPTY IF NO SEARCH QUERIES ARE NEEDED FOR THE STEP.
-
-Remember to only make search queries for resources that might require external information (like Documentation or a Blog or an Article). If the information is already known to you or commonly known, there is no need to search for it.
-
-The `queries` key and the `ask_user` key can be empty list and string respectively if no search queries or user input are needed for the step. Try to keep the number of search queries to a minimum to save context window. One query per subject.
-
-Only search for documentation or articles that are relevant to the task at hand. Do not search for general information.
-
-Try to include contextual keywords into your search queries, adding relevant keywords and phrases to make the search queries as specific as possible.
+- you only have to return one JSON object with the queries and ask_user fields. You can't return multiple JSON objects.
Only the provided JSON response format is accepted. Any other response format will be rejected.
\ No newline at end of file
diff --git a/src/agents/researcher/researcher.py b/src/agents/researcher/researcher.py
index 529b01e..cec2b2f 100644
--- a/src/agents/researcher/researcher.py
+++ b/src/agents/researcher/researcher.py
@@ -4,7 +4,7 @@ from typing import List
from jinja2 import Environment, BaseLoader
from src.llm import LLM
-from src.services.utils import retry_wrapper
+from src.services.utils import retry_wrapper, validate_responses
from src.browser.search import BingSearch
PROMPT = open("src/agents/researcher/prompt.jinja2").read().strip()
@@ -23,17 +23,8 @@ class Researcher:
contextual_keywords=contextual_keywords
)
+ @validate_responses
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 _:
- return False
-
- response = {k.replace("\\", ""): v for k, v in response.items()}
if "queries" not in response and "ask_user" not in response:
return False
diff --git a/src/agents/runner/runner.py b/src/agents/runner/runner.py
index 291ea60..9a594eb 100644
--- a/src/agents/runner/runner.py
+++ b/src/agents/runner/runner.py
@@ -10,7 +10,7 @@ from src.agents.patcher import Patcher
from src.llm import LLM
from src.state import AgentState
from src.project import ProjectManager
-from src.services.utils import retry_wrapper
+from src.services.utils import retry_wrapper, validate_responses
PROMPT = open("src/agents/runner/prompt.jinja2", "r").read().strip()
RERUNNER_PROMPT = open("src/agents/runner/rerunner.jinja2", "r").read().strip()
@@ -52,37 +52,15 @@ class Runner:
error=error
)
+ @validate_responses
def validate_response(self, response: str):
- response = response.strip().replace("```json", "```")
-
- if response.startswith("```") and response.endswith("```"):
- response = response[3:-3].strip()
-
- try:
- response = json.loads(response)
- except Exception as _:
- return False
-
if "commands" not in response:
return False
else:
return response["commands"]
-
+
+ @validate_responses
def validate_rerunner_response(self, response: str):
- response = response.strip().replace("```json", "```")
-
- if response.startswith("```") and response.endswith("```"):
- response = response[3:-3].strip()
-
- print(response)
-
- try:
- response = json.loads(response)
- except Exception as _:
- return False
-
- print(response)
-
if "action" not in response and "response" not in response:
return False
else:
diff --git a/src/config.py b/src/config.py
index f37c5e4..0e6c224 100644
--- a/src/config.py
+++ b/src/config.py
@@ -104,6 +104,9 @@ class Config:
def get_logging_prompts(self):
return self.config["LOGGING"]["LOG_PROMPTS"] == "true"
+
+ def get_timeout_inference(self):
+ return self.config["TIMEOUT"]["INFERENCE"]
def set_bing_api_key(self, key):
self.config["API_KEYS"]["BING"] = key
@@ -157,30 +160,6 @@ class Config:
self.config["API_KEYS"]["NETLIFY"] = key
self.save_config()
- def set_sqlite_db(self, db):
- self.config["STORAGE"]["SQLITE_DB"] = db
- self.save_config()
-
- def set_screenshots_dir(self, dir):
- self.config["STORAGE"]["SCREENSHOTS_DIR"] = dir
- self.save_config()
-
- def set_pdfs_dir(self, dir):
- self.config["STORAGE"]["PDFS_DIR"] = dir
- self.save_config()
-
- def set_projects_dir(self, dir):
- self.config["STORAGE"]["PROJECTS_DIR"] = dir
- self.save_config()
-
- def set_logs_dir(self, dir):
- self.config["STORAGE"]["LOGS_DIR"] = dir
- self.save_config()
-
- def set_repos_dir(self, dir):
- self.config["STORAGE"]["REPOS_DIR"] = dir
- self.save_config()
-
def set_logging_rest_api(self, value):
self.config["LOGGING"]["LOG_REST_API"] = "true" if value else "false"
self.save_config()
@@ -189,6 +168,21 @@ class Config:
self.config["LOGGING"]["LOG_PROMPTS"] = "true" if value else "false"
self.save_config()
+ def set_timeout_inference(self, value):
+ self.config["TIMEOUT"]["INFERENCE"] = value
+ self.save_config()
+
def save_config(self):
with open("config.toml", "w") as f:
toml.dump(self.config, f)
+
+ def update_config(self, data):
+ for key, value in data.items():
+ if key in self.config:
+ with open("config.toml", "r+") as f:
+ config = toml.load(f)
+ for sub_key, sub_value in value.items():
+ self.config[key][sub_key] = sub_value
+ config[key][sub_key] = sub_value
+ f.seek(0)
+ toml.dump(config, f)
diff --git a/src/llm/claude_client.py b/src/llm/claude_client.py
index 61bdd98..68fa6eb 100644
--- a/src/llm/claude_client.py
+++ b/src/llm/claude_client.py
@@ -20,6 +20,7 @@ class Claude:
}
],
model=model_id,
+ temperature=0
)
return message.content[0].text
diff --git a/src/llm/gemini_client.py b/src/llm/gemini_client.py
index dd2b220..0d56667 100644
--- a/src/llm/gemini_client.py
+++ b/src/llm/gemini_client.py
@@ -10,7 +10,8 @@ class Gemini:
genai.configure(api_key=api_key)
def inference(self, model_id: str, prompt: str) -> str:
- model = genai.GenerativeModel(model_id)
+ config = genai.GenerationConfig(temperature=0)
+ model = genai.GenerativeModel(model_id, generation_config=config)
# Set safety settings for the request
safety_settings = {
HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_NONE,
diff --git a/src/llm/groq_client.py b/src/llm/groq_client.py
index cd2ea5e..828c9cc 100644
--- a/src/llm/groq_client.py
+++ b/src/llm/groq_client.py
@@ -18,6 +18,7 @@ class Groq:
}
],
model=model_id,
+ temperature=0
)
return chat_completion.choices[0].message.content
diff --git a/src/llm/llm.py b/src/llm/llm.py
index 06b7ac9..833618c 100644
--- a/src/llm/llm.py
+++ b/src/llm/llm.py
@@ -21,12 +21,14 @@ TIKTOKEN_ENC = tiktoken.get_encoding("cl100k_base")
ollama = Ollama()
logger = Logger()
agentState = AgentState()
+config = Config()
class LLM:
def __init__(self, model_id: str = None):
self.model_id = model_id
- self.log_prompts = Config().get_logging_prompts()
+ self.log_prompts = config.get_logging_prompts()
+ self.timeout_inference = config.get_timeout_inference()
self.models = {
"CLAUDE": [
("Claude 3 Opus", "claude-3-opus-20240229"),
@@ -106,22 +108,24 @@ class LLM:
with concurrent.futures.ThreadPoolExecutor() as executor:
future = executor.submit(model.inference, model_name, prompt)
try:
- while future.running():
+ while True:
elapsed_time = time.time() - start_time
- emit_agent("inference", {"type": "time", "elapsed_time": format(elapsed_time, ".2f")})
- if int(elapsed_time) == 30:
+ elapsed_seconds = format(elapsed_time, ".2f")
+ emit_agent("inference", {"type": "time", "elapsed_time": elapsed_seconds})
+ if int(elapsed_time) == 5:
emit_agent("inference", {"type": "warning", "message": "Inference is taking longer than expected"})
- if elapsed_time > 60:
+ if elapsed_time > self.timeout_inference:
raise concurrent.futures.TimeoutError
- time.sleep(1)
-
- response = future.result(timeout=60).strip()
+ if future.done():
+ break
+ time.sleep(0.5)
+
+ response = future.result(timeout=self.timeout_inference).strip()
except concurrent.futures.TimeoutError:
- logger.error(f"Inference took too long. Model: {model_enum}, Model ID: {self.model_id}")
+ logger.error(f"Inference failed. took too long. Model: {model_enum}, Model ID: {self.model_id}")
emit_agent("inference", {"type": "error", "message": "Inference took too long. Please try again."})
response = False
- logger.warning("Inference failed")
sys.exit()
except Exception as e:
diff --git a/src/llm/mistral_client.py b/src/llm/mistral_client.py
index 8ccbdf0..ee019c4 100644
--- a/src/llm/mistral_client.py
+++ b/src/llm/mistral_client.py
@@ -16,6 +16,7 @@ class MistralAi:
model=model_id,
messages=[
ChatMessage(role="user", content=prompt.strip())
- ]
+ ],
+ temperature=0
)
return chat_completion.choices[0].message.content
diff --git a/src/llm/ollama_client.py b/src/llm/ollama_client.py
index 9560203..95b1e36 100644
--- a/src/llm/ollama_client.py
+++ b/src/llm/ollama_client.py
@@ -19,6 +19,7 @@ class Ollama:
def inference(self, model_id: str, prompt: str) -> str:
response = self.client.generate(
model=model_id,
- prompt=prompt.strip()
+ prompt=prompt.strip(),
+ options={"temperature": 0}
)
return response['response']
diff --git a/src/llm/openai_client.py b/src/llm/openai_client.py
index b6cfe20..17344c0 100644
--- a/src/llm/openai_client.py
+++ b/src/llm/openai_client.py
@@ -19,5 +19,6 @@ class OpenAi:
}
],
model=model_id,
+ temperature=0
)
return chat_completion.choices[0].message.content
diff --git a/src/services/utils.py b/src/services/utils.py
index 6a85c82..6678168 100644
--- a/src/services/utils.py
+++ b/src/services/utils.py
@@ -1,6 +1,9 @@
# create wrapper function that will has retry logic of 5 times
import sys
import time
+from functools import wraps
+import json
+
from src.socket_instance import emit_agent
def retry_wrapper(func):
@@ -21,3 +24,67 @@ def retry_wrapper(func):
return False
return wrapper
+
+
+class InvalidResponseError(Exception):
+ pass
+
+def validate_responses(func):
+ @wraps(func)
+ def wrapper(*args, **kwargs):
+ args = list(args)
+ response = args[1]
+ response = response.strip()
+
+ try:
+ response = json.loads(response)
+ print("first", type(response))
+ args[1] = response
+ return func(*args, **kwargs)
+
+ except json.JSONDecodeError:
+ pass
+
+ try:
+ response = response.split("```")[1]
+ if response:
+ response = json.loads(response.strip())
+ print("second", type(response))
+ args[1] = response
+ return func(*args, **kwargs)
+
+ except (IndexError, json.JSONDecodeError):
+ pass
+
+ try:
+ start_index = response.find('{')
+ end_index = response.rfind('}')
+ if start_index != -1 and end_index != -1:
+ json_str = response[start_index:end_index+1]
+ try:
+ response = json.loads(json_str)
+ print("third", type(response))
+ args[1] = response
+ return func(*args, **kwargs)
+
+ except json.JSONDecodeError:
+ pass
+ except json.JSONDecodeError:
+ pass
+
+ for line in response.splitlines():
+ try:
+ response = json.loads(line)
+ print("fourth", type(response))
+ args[1] = response
+ return func(*args, **kwargs)
+
+ except json.JSONDecodeError:
+ pass
+
+ # If all else fails, raise an exception
+ emit_agent("info", {"type": "error", "message": "Failed to parse response as JSON"})
+ # raise InvalidResponseError("Failed to parse response as JSON")
+ return False
+
+ return wrapper
\ No newline at end of file
diff --git a/ui/src/lib/components/ControlPanel.svelte b/ui/src/lib/components/ControlPanel.svelte
index 529e597..375f663 100644
--- a/ui/src/lib/components/ControlPanel.svelte
+++ b/ui/src/lib/components/ControlPanel.svelte
@@ -7,7 +7,7 @@
function selectProject(project) {
$selectedProject = project;
fetchMessages();
- // fetchAgentState();
+ fetchAgentState();
document.getElementById("project-dropdown").classList.add("hidden");
}
function selectModel(model) {
@@ -25,6 +25,10 @@
await createProject(projectName);
selectProject(projectName);
tokenUsage.set(0);
+ messages.set([]);
+ agentState.set(null);
+ isSending.set(false);
+
}
}
async function deleteproject(project) {
@@ -34,7 +38,6 @@
messages.set([]);
agentState.set(null);
tokenUsage.set(0);
- agentState.set(null);
isSending.set(false);
$selectedProject = "Select Project";
localStorage.setItem("selectedProject", "");
diff --git a/ui/src/lib/components/MessageInput.svelte b/ui/src/lib/components/MessageInput.svelte
index 64d2a98..6eab3ed 100644
--- a/ui/src/lib/components/MessageInput.svelte
+++ b/ui/src/lib/components/MessageInput.svelte
@@ -11,6 +11,9 @@
if (value !== null && value.agent_is_active == false) {
isSending.set(false);
}
+ if (value == null){
+ inference_time = 0;
+ }
});
let messageInput = "";
diff --git a/ui/src/routes/settings/+page.svelte b/ui/src/routes/settings/+page.svelte
index 45faa62..dfed6dc 100644
--- a/ui/src/routes/settings/+page.svelte
+++ b/ui/src/routes/settings/+page.svelte
@@ -60,10 +60,16 @@
const save = async () => {
let updated = {};
for (let key in settings) {
- if (settings[key] !== original[key]) {
- updated[key] = settings[key];
+ for (let subkey in settings[key]) {
+ if (settings[key][subkey] !== original[key][subkey]) {
+ if (!updated[key]) {
+ updated[key] = {};
+ }
+ updated[key][subkey] = settings[key][subkey];
+ }
}
}
+
await updateSettings(updated);
editMode = !editMode;
@@ -84,9 +90,12 @@
<Tabs.List class="ps-0">
<Tabs.Trigger value="apikeys">API Keys</Tabs.Trigger>
<Tabs.Trigger value="endpoints">API Endpoints</Tabs.Trigger>
+ <Tabs.Trigger value="config">Config</Tabs.Trigger>
<Tabs.Trigger value="appearance">Appearance</Tabs.Trigger>
</Tabs.List>
+
<Seperator direction="vertical"/>
+
<Tabs.Content value="apikeys" class="mt-4">
{#if settings["API_KEYS"]}
<div class="flex gap-4 w-full">
@@ -96,8 +105,9 @@
<div class="flex gap-1 items-center">
<p class="w-48">{key.toLowerCase()}</p>
<input
- type="text"
- bind:value={settings["API_KEYS"][key]}
+ type={editMode ? "text" : "password"}
+ value={settings["API_KEYS"][key]}
+ on:input={(e) => settings["API_KEYS"][key] = e.target.value}
name={key}
class="p-2 border-2 w-1/2 rounded-lg {editMode
? ''
@@ -114,7 +124,7 @@
{#if !editMode}
<button
id="btn-edit"
- class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-gray-200"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-secondary"
on:click={edit}
>
<i class="fas fa-edit"></i>
@@ -123,7 +133,7 @@
{:else}
<button
id="btn-save"
- class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-gray-200"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-secondary"
on:click={save}
>
<i class="fas fa-save"></i>
@@ -133,7 +143,7 @@
</div>
</Tabs.Content>
<Tabs.Content value="endpoints" class="mt-4">
- {#if settings["API_KEYS"]}
+ {#if settings["API_ENDPOINTS"]}
<div class="flex gap-4 w-full">
<div class="flex flex-col w-full gap-4">
{#each Object.entries(settings["API_ENDPOINTS"]) as [key, value]}
@@ -141,7 +151,8 @@
<p class="w-28">{key.toLowerCase()}</p>
<input
type="text"
- bind:value={settings["API_ENDPOINTS"][key]}
+ value={settings["API_ENDPOINTS"][key]}
+ on:input={(e) => settings["API_ENDPOINTS"][key] = e.target.value}
name={key}
class="p-2 border-2 w-1/2 rounded-lg {editMode
? ''
@@ -157,7 +168,84 @@
{#if !editMode}
<button
id="btn-edit"
- class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-gray-200"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-secondary"
+ 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-secondary"
+ on:click={save}
+ >
+ <i class="fas fa-save"></i>
+ Save
+ </button>
+ {/if}
+ </div>
+ </Tabs.Content>
+ <Tabs.Content value="config" class="mt-4">
+ {#if settings["TIMEOUT"]}
+ <div class="flex flex-col gap-8 w-full">
+
+ <div class="flex flex-col gap-4">
+ <div class="text-xl font-semibold">
+ Timouts
+ </div>
+ <div class="flex flex-col w-64 gap-4">
+ {#each Object.entries(settings["TIMEOUT"]) as [key, value]}
+ <div class="flex gap-3 items-center">
+ <p class="w-28">{key.toLowerCase()}</p>
+ <input
+ type="number"
+ bind:value={settings["TIMEOUT"][key]}
+ name={key}
+ placeholder="in seconds"
+ class="p-2 border-2 w-1/2 rounded-lg {editMode
+ ? ''
+ : 'text-gray-500'}"
+ readonly={!editMode}
+ />
+ </div>
+ {/each}
+ </div>
+ </div>
+
+ <div class="flex flex-col gap-4">
+ <div class="text-xl font-semibold">
+ Logging
+ </div>
+ <div class="flex flex-col w-64 gap-4">
+ {#each Object.entries(settings["LOGGING"]) as [key, value]}
+ <div class="flex gap-10 items-center">
+ <p class="w-28">{key.toLowerCase()}</p>
+ <Select.Root onSelectedChange={(v)=>{settings["LOGGING"][key] = v.value}}
+ disabled={!editMode}>
+ <Select.Trigger class="w-[180px]" >
+ <Select.Value placeholder={settings["LOGGING"][key]} />
+ </Select.Trigger>
+ <Select.Content>
+ <Select.Group>
+ <Select.Item value={"true"} label={"True"}>true</Select.Item>
+ <Select.Item value={"false"} label={"False"}>false</Select.Item>
+ </Select.Group>
+ </Select.Content>
+ <Select.Input name={key} />
+ </Select.Root>
+ </div>
+ {/each}
+ </div>
+ </div>
+
+ </div>
+ {/if}
+ <div class="flex gap-4 mt-5">
+ {#if !editMode}
+ <button
+ id="btn-edit"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-secondary"
on:click={edit}
>
<i class="fas fa-edit"></i>
@@ -166,7 +254,7 @@
{:else}
<button
id="btn-save"
- class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-gray-200"
+ class="p-2 border-2 rounded-lg flex gap-3 items-center hover:bg-secondary"
on:click={save}
>
<i class="fas fa-save"></i>
@@ -175,7 +263,7 @@
{/if}
</div>
</Tabs.Content>
- <Tabs.Content value="appearance" class="w-fit">
+ <Tabs.Content value="appearance" class="mt-4 w-fit">
<div class="flex w-full justify-between items-center my-2 gap-8">
<div>
Select a theme