Skip to content

Agent Zero AI framework

csrf + inor fixes

frdelf51766778b28
diff --git a/models.py b/models.py
index 2307884bf..8220373d1 100644
--- a/models.py
+++ b/models.py
@@ -32,10 +32,16 @@ from langchain_core.messages import (
SystemMessage,
)
from langchain.embeddings.base import Embeddings
+from sentence_transformers import SentenceTransformer
+# disable extra logging
+def turn_off_logging():
+ os.environ['LITELLM_LOG'] = "ERROR" # only errors
+ litellm.suppress_debug_info = True
+
+# init
load_dotenv()
-os.environ['LITELLM_LOG'] = "ERROR" # only errors
-litellm.suppress_debug_info = True
+turn_off_logging()
class ModelType(Enum):
@@ -125,16 +131,6 @@ def get_rate_limiter(
return limiter
-def parse_chunk(chunk: Any):
- if isinstance(chunk, str):
- content = chunk
- elif hasattr(chunk, "content"):
- content = str(chunk.content)
- else:
- content = str(chunk)
- return content
-
-
def _parse_chunk(chunk: Any) -> ChatChunk:
delta = chunk["choices"][0].get("delta", {})
message = chunk["choices"][0].get("model_extra", {}).get("message", {})
@@ -339,6 +335,9 @@ class BrowserCompatibleChatWrapper(LiteLLMChatWrapper):
A wrapper for browser agent that can filter/sanitize messages
before sending them to the LLM.
"""
+ def __init__(self, *args, **kwargs):
+ turn_off_logging()
+ super().__init__(*args, **kwargs)
def _call(
self,
@@ -347,7 +346,7 @@ class BrowserCompatibleChatWrapper(LiteLLMChatWrapper):
run_manager: Optional[CallbackManagerForLLMRun] = None,
**kwargs: Any,
) -> str:
- # In the future, message filtering logic can be added here.
+ turn_off_logging()
result = super()._call(messages, stop, run_manager, **kwargs)
return result
@@ -358,7 +357,7 @@ class BrowserCompatibleChatWrapper(LiteLLMChatWrapper):
run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
**kwargs: Any,
) -> AsyncIterator[ChatGenerationChunk]:
- # In the future, message filtering logic can be added here.
+ turn_off_logging()
async for chunk in super()._astream(messages, stop, run_manager, **kwargs):
yield chunk
@@ -374,27 +373,20 @@ class LiteLLMEmbeddingWrapper(Embeddings):
def embed_documents(self, texts: List[str]) -> List[List[float]]:
resp = embedding(model=self.model_name, input=texts, **self.kwargs)
return [
- item.get("embedding") if isinstance(item, dict) else item.embedding
- for item in resp.data
+ item.get("embedding") if isinstance(item, dict) else item.embedding # type: ignore
+ for item in resp.data # type: ignore
]
def embed_query(self, text: str) -> List[float]:
resp = embedding(model=self.model_name, input=[text], **self.kwargs)
- item = resp.data[0]
- return item.get("embedding") if isinstance(item, dict) else item.embedding
+ item = resp.data[0] # type: ignore
+ return item.get("embedding") if isinstance(item, dict) else item.embedding # type: ignore
class LocalSentenceTransformerWrapper(Embeddings):
"""Local wrapper for sentence-transformers models to avoid HuggingFace API calls"""
def __init__(self, model_name: str, **kwargs: Any):
- try:
- from sentence_transformers import SentenceTransformer
- except ImportError:
- raise ImportError(
- "sentence-transformers library is required for local embeddings. Install with: pip install sentence-transformers"
- )
-
# Remove the "sentence-transformers/" prefix if present
if model_name.startswith("sentence-transformers/"):
model_name = model_name[len("sentence-transformers/") :]
@@ -403,15 +395,15 @@ class LocalSentenceTransformerWrapper(Embeddings):
self.model_name = model_name
def embed_documents(self, texts: List[str]) -> List[List[float]]:
- embeddings = self.model.encode(texts, convert_to_tensor=False)
- return embeddings.tolist() if hasattr(embeddings, "tolist") else embeddings
+ embeddings = self.model.encode(texts, convert_to_tensor=False) # type: ignore
+ return embeddings.tolist() if hasattr(embeddings, "tolist") else embeddings # type: ignore
def embed_query(self, text: str) -> List[float]:
- embedding = self.model.encode([text], convert_to_tensor=False)
+ embedding = self.model.encode([text], convert_to_tensor=False) # type: ignore
result = (
embedding[0].tolist() if hasattr(embedding[0], "tolist") else embedding[0]
)
- return result
+ return result # type: ignore
def _get_litellm_chat(
@@ -518,4 +510,4 @@ def _normalize_chat_kwargs(kwargs: Any) -> Any:
def _normalize_embedding_kwargs(kwargs: Any) -> Any:
- return kwargs
+ return kwargs
\ No newline at end of file
diff --git a/prompts/agent0/agent.system.tool.response.md b/prompts/agent0/agent.system.tool.response.md
index 3519cfd7e..86bcb257e 100644
--- a/prompts/agent0/agent.system.tool.response.md
+++ b/prompts/agent0/agent.system.tool.response.md
@@ -16,6 +16,7 @@ usage:
"thoughts": [
"...",
],
+ "headline": "Explaining why...",
"tool_name": "response",
"tool_args": {
"text": "Answer to the user",
diff --git a/python/api/csrf_token.py b/python/api/csrf_token.py
index bc6a29a50..bd8615546 100644
--- a/python/api/csrf_token.py
+++ b/python/api/csrf_token.py
@@ -1,6 +1,13 @@
import secrets
-from python.helpers.api import ApiHandler, Input, Output, Request, Response, session
-
+from python.helpers.api import (
+ ApiHandler,
+ Input,
+ Output,
+ Request,
+ Response,
+ session,
+)
+from python.helpers import runtime
class GetCsrfToken(ApiHandler):
@@ -15,4 +22,4 @@ class GetCsrfToken(ApiHandler):
async def process(self, input: Input, request: Request) -> Output:
if "csrf_token" not in session:
session["csrf_token"] = secrets.token_urlsafe(32)
- return {"token": session["csrf_token"]}
+ return {"token": session["csrf_token"], "runtime_id": runtime.get_runtime_id()}
diff --git a/python/extensions/response_stream/_10_log_from_stream.py b/python/extensions/response_stream/_10_log_from_stream.py
index b88488b25..ace6baf54 100644
--- a/python/extensions/response_stream/_10_log_from_stream.py
+++ b/python/extensions/response_stream/_10_log_from_stream.py
@@ -21,15 +21,14 @@ class LogFromStream(Extension):
heading = build_default_heading(self.agent)
if "headline" in parsed:
heading = build_heading(self.agent, parsed['headline'])
+ elif "tool_name" in parsed:
+ heading = build_heading(self.agent, f"Using tool {parsed['tool_name']}") # if the llm skipped headline
elif "thoughts" in parsed:
# thought length indicator
thoughts = "\n".join(parsed["thoughts"])
pipes = "|" * math.ceil(math.sqrt(len(thoughts)))
heading = build_heading(self.agent, f"Thinking... {pipes}")
-
- # if "tool_name" in parsed:
- # heading += f" ({parsed['tool_name']})"
-
+
# create log message and store it in loop data temporary params
if "log_item_generating" not in loop_data.params_temporary:
loop_data.params_temporary["log_item_generating"] = (
diff --git a/python/helpers/runtime.py b/python/helpers/runtime.py
index ec774af5c..78ad218ad 100644
--- a/python/helpers/runtime.py
+++ b/python/helpers/runtime.py
@@ -1,5 +1,6 @@
import argparse
import inspect
+import secrets
from typing import TypeVar, Callable, Awaitable, Union, overload, cast
from python.helpers import dotenv, rfc, settings
import asyncio
@@ -12,6 +13,7 @@ R = TypeVar('R')
parser = argparse.ArgumentParser()
args = {}
dockerman = None
+runtime_id = None
def initialize():
@@ -38,7 +40,6 @@ def initialize():
key = key.lstrip("-")
args[key] = value
-
def get_arg(name: str):
global args
return args.get(name, None)
@@ -58,6 +59,12 @@ def get_local_url():
return "host.docker.internal"
return "127.0.0.1"
+def get_runtime_id() -> str:
+ global runtime_id
+ if not runtime_id:
+ runtime_id = secrets.token_hex(8)
+ return runtime_id
+
@overload
async def call_development_function(func: Callable[..., Awaitable[T]], *args, **kwargs) -> T: ...
diff --git a/python/tools/webpage_content_tool._py b/python/tools/webpage_content_tool._py
deleted file mode 100644
index 25c138388..000000000
--- a/python/tools/webpage_content_tool._py
+++ /dev/null
@@ -1,42 +0,0 @@
-import requests
-from bs4 import BeautifulSoup
-from urllib.parse import urlparse
-from newspaper import Article
-from python.helpers.tool import Tool, Response
-from python.helpers.errors import handle_error
-
-
-class WebpageContentTool(Tool):
- async def execute(self, url="", **kwargs):
- if not url:
- return Response(message="Error: No URL provided.", break_loop=False)
-
- try:
- # Validate URL
- parsed_url = urlparse(url)
- if not all([parsed_url.scheme, parsed_url.netloc]):
- return Response(message="Error: Invalid URL format.", break_loop=False)
-
- # Fetch webpage content
- response = requests.get(url, timeout=10)
- response.raise_for_status()
-
- # Use newspaper3k for article extraction
- article = Article(url)
- article.download()
- article.parse()
-
- # If it's not an article, fall back to BeautifulSoup
- if not article.text:
- soup = BeautifulSoup(response.content, 'html.parser')
- text_content = ' '.join(soup.stripped_strings)
- else:
- text_content = article.text
-
- return Response(message=f"Webpage content:\n\n{text_content}", break_loop=False)
-
- except requests.RequestException as e:
- return Response(message=f"Error fetching webpage: {str(e)}", break_loop=False)
- except Exception as e:
- handle_error(e)
- return Response(message=f"An error occurred: {str(e)}", break_loop=False)
\ No newline at end of file
diff --git a/run_ui.py b/run_ui.py
index 030de1318..d5636de50 100644
--- a/run_ui.py
+++ b/run_ui.py
@@ -30,10 +30,10 @@ webapp = Flask("app", static_folder=get_abs_path("./webui"), static_url_path="/"
webapp.secret_key = os.getenv("FLASK_SECRET_KEY") or secrets.token_hex(32)
webapp.config.update(
JSON_SORT_KEYS=False,
- SESSION_COOKIE_NAME="session_" + secrets.token_hex(8), # randomize the session cookie name to prevent session collision on same host
+ SESSION_COOKIE_NAME="session_" + runtime.get_runtime_id(), # bind the session cookie name to runtime id to prevent session collision on same host
SESSION_COOKIE_SAMESITE="Strict",
SESSION_PERMANENT=True,
- PERMANENT_SESSION_LIFETIME=timedelta(days=7)
+ PERMANENT_SESSION_LIFETIME=timedelta(days=1)
)
@@ -135,7 +135,7 @@ def csrf_protect(f):
async def decorated(*args, **kwargs):
token = session.get("csrf_token")
header = request.headers.get("X-CSRF-Token")
- cookie = request.cookies.get("csrf_token")
+ cookie = request.cookies.get("csrf_token_" + runtime.get_runtime_id())
sent = header or cookie
if not token or not sent or token != sent:
return Response("CSRF token missing or invalid", 403)
diff --git a/webui/js/api.js b/webui/js/api.js
index deb71cb1c..c9cb7901e 100644
--- a/webui/js/api.js
+++ b/webui/js/api.js
@@ -79,6 +79,6 @@ async function getCsrfToken() {
credentials: "same-origin",
}).then((r) => r.json());
csrfToken = response.token;
- document.cookie = "csrf_token=" + csrfToken + "; SameSite=Strict; Path=/";
+ document.cookie = `csrf_token_${response.runtime_id}=${csrfToken}; SameSite=Strict; Path=/`;
return csrfToken;
-}
\ No newline at end of file
+}