Skip to content

Agent Zero AI framework

other things + Embedding Model selection

Alessandro61b5b8389a8a
diff --git a/initialize.py b/initialize.py
index 9c7103f00..ad7a1b016 100644
--- a/initialize.py
+++ b/initialize.py
@@ -33,7 +33,7 @@ def initialize():
chat_model = chat_llm,
utility_model = utility_llm,
embeddings_model = embedding_llm,
- prompts_subdir = "dianoia-xl",
+ prompts_subdir = "",
# memory_subdir = "",
knowledge_subdirs = ["default","custom"],
auto_memory_count = 0,
diff --git a/models.py b/models.py
index 8f773f94e..e521f6689 100644
--- a/models.py
+++ b/models.py
@@ -44,6 +44,13 @@ class ModelProvider(Enum):
OPENROUTER = "OpenRouter"
SAMBANOVA = "Sambanova"
+class EmbeddingProvider(Enum):
+ OPENAI = "OpenAI" # default
+ HUGGINGFACE = "HuggingFace"
+ OLLAMA = "Ollama"
+ LMSTUDIO = "LM Studio"
+ OPENROUTER = "OpenRouter"
+ AZURE = "OpenAI Azure"
# Utility function to get API keys from environment variables
def get_api_key(service):
@@ -53,10 +60,18 @@ def get_api_key(service):
def get_model(type: ModelType, provider: ModelProvider, name: str, **kwargs):
+ if type == ModelType.EMBEDDING:
+ # call function for embedding models
+ return get_embedding_model(provider, name, **kwargs)
+ # for other model types
fnc_name = f"get_{provider.name.lower()}_{type.name.lower()}" # function name of model getter
model = globals()[fnc_name](name, **kwargs) # call function by name
return model
+def get_embedding_model(provider: EmbeddingProvider, name: str, **kwargs):
+ fnc_name = f"get_{provider.name.lower()}_embedding" # function name for embedding models
+ model = globals()[fnc_name](name, **kwargs) # call function by name
+ return model
# Ollama models
def get_ollama_chat(
diff --git a/python/helpers/settings.py b/python/helpers/settings.py
index 045575573..688e68dc8 100644
--- a/python/helpers/settings.py
+++ b/python/helpers/settings.py
@@ -3,7 +3,7 @@ import os
import re
from typing import Any, Optional, TypedDict
from . import files
-from models import get_model, ModelProvider, ModelType
+from models import get_model, get_embedding_model, ModelProvider, EmbeddingProvider, ModelType
from langchain_core.language_models.chat_models import BaseChatModel
from langchain_core.embeddings import Embeddings
@@ -32,7 +32,6 @@ _settings: Settings | None = None
def convert_out(settings: Settings) -> dict[str, Any]:
-
# main model section
chat_model_fields = []
chat_model_fields.append(
@@ -78,13 +77,13 @@ def convert_out(settings: Settings) -> dict[str, Any]:
}
)
- chat_model_seciton = {
+ chat_model_section = {
"title": "Chat Model",
"description": "Selection and settings for main chat model used by Agent Zero",
"fields": chat_model_fields,
}
- # main model section
+ # utility model section
util_model_fields = []
util_model_fields.append(
{
@@ -129,13 +128,51 @@ def convert_out(settings: Settings) -> dict[str, Any]:
}
)
- util_model_seciton = {
- "title": "Utility model",
+ util_model_section = {
+ "title": "Utility Model",
"description": "Smaller, cheaper, faster model for handling utility tasks like organizing memory, preparing prompts, summarizing.",
"fields": util_model_fields,
}
- result = {"sections": [chat_model_seciton, util_model_seciton]}
+ # embedding model section
+ embed_model_fields = []
+ embed_model_fields.append(
+ {
+ "id": "embed_model_provider",
+ "title": "Embedding model provider",
+ "description": "Select provider for embedding model used by the framework",
+ "type": "select",
+ "value": settings["embed_model_provider"],
+ "options": [{"value": p.name, "label": p.value} for p in EmbeddingProvider],
+ }
+ )
+ embed_model_fields.append(
+ {
+ "id": "embed_model_name",
+ "title": "Embedding model name",
+ "description": "Exact name of model from selected provider",
+ "type": "input",
+ "value": settings["embed_model_name"],
+ }
+ )
+
+ embed_model_fields.append(
+ {
+ "id": "embed_model_kwargs",
+ "title": "Embedding model additional parameters",
+ "description": "Any other parameters supported by the model. Format is KEY=VALUE on individual lines, just like .env file.",
+ "type": "textarea",
+ "value": _dict_to_env(settings["embed_model_kwargs"]),
+ }
+ )
+
+ embed_model_section = {
+ "title": "Embedding Model",
+ "description": "Settings for the embedding model used by Agent Zero.",
+ "fields": embed_model_fields,
+ }
+
+ result = {"sections": [chat_model_section, util_model_section, embed_model_section]}
return result
def convert_in(settings: dict[str, Any]) -> Settings:
@@ -200,7 +237,7 @@ def get_embedding_model() -> Embeddings:
settings = get_settings()
return get_model(
type=ModelType.EMBEDDING,
- provider=ModelProvider[settings["embed_model_provider"]],
+ provider=EmbeddingProvider[settings["embed_model_provider"]],
name=settings["embed_model_name"],
**settings["embed_model_kwargs"],
)
@@ -228,7 +265,7 @@ def _get_default_settings() -> Settings:
util_model_name="gpt-4o-mini",
util_model_temperature=0,
util_model_kwargs={},
- embed_model_provider=ModelProvider.OPENAI.name,
+ embed_model_provider=EmbeddingProvider.OPENAI.name,
embed_model_name="text-embedding-3-small",
embed_model_kwargs={},
)
diff --git a/webui/settings.css b/webui/settings.css
index 201d03f7a..23faae7ff 100644
--- a/webui/settings.css
+++ b/webui/settings.css
@@ -1,3 +1,11 @@
+* {
+ transition: all var(--transition-speed) ease-in-out;
+}
+
+select {
+ transition: none;
+}
+
.modal-overlay {
position: fixed;
top: 0;
@@ -23,8 +31,8 @@
}
.modal-header {
- padding: 1.5rem 2rem;
- border-bottom: 1px solid #eee;
+ padding: 0.875rem 2rem;
+ border-bottom: 1px solid var(--color-border);
}
.modal-content {
@@ -34,6 +42,8 @@
background-clip: border-box;
border: 6px solid transparent;
transition: all 0.3s ease;
+ margin-bottom: 0;
+ padding-bottom: 0;
}
.modal-content::-webkit-scrollbar {
@@ -212,19 +222,29 @@ input[type="range"] {
.btn-ok {
background: #3270e2;
color: white;
+ transition: background 0.3s ease-in-out;
}
.btn-ok:hover{
- background: #274170;
+ background: #3265c0;
+}
+
+.btn-ok:active{
+ background: #345693;
}
.btn-cancel {
background: #ddd;
color: #333;
+ transition: background 0.3s ease-in-out;
}
.btn-cancel:hover {
- background: #222
+ background: #a6a6a6
+}
+
+.btn-cancel:active {
+ background: #808080
}
.btn-field {
@@ -247,6 +267,7 @@ select {
font-size: inherit;
cursor: pointer;
font-family: Rubik;
+ outline: none;
}
select:disabled {