mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-30 02:28:13 +00:00
Compare commits
7 Commits
devin/1744
...
devin/1744
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3894e768ba | ||
|
|
b42bf306ee | ||
|
|
e655412aca | ||
|
|
1d91ab5d1b | ||
|
|
37359a34f0 | ||
|
|
6eb4045339 | ||
|
|
aebbc75dea |
33
.github/workflows/notify-downstream.yml
vendored
Normal file
33
.github/workflows/notify-downstream.yml
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
name: Notify Downstream
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
notify-downstream:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Generate GitHub App token
|
||||
id: app-token
|
||||
uses: tibdex/github-app-token@v2
|
||||
with:
|
||||
app_id: ${{ secrets.OSS_SYNC_APP_ID }}
|
||||
private_key: ${{ secrets.OSS_SYNC_APP_PRIVATE_KEY }}
|
||||
|
||||
- name: Notify Repo B
|
||||
uses: peter-evans/repository-dispatch@v3
|
||||
with:
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
repository: ${{ secrets.OSS_SYNC_DOWNSTREAM_REPO }}
|
||||
event-type: upstream-commit
|
||||
client-payload: |
|
||||
{
|
||||
"commit_sha": "${{ github.sha }}"
|
||||
}
|
||||
|
||||
@@ -535,6 +535,7 @@ class Agent(BaseAgent):
|
||||
verbose=self.verbose,
|
||||
response_format=response_format,
|
||||
i18n=self.i18n,
|
||||
original_agent=self,
|
||||
)
|
||||
|
||||
return await lite_agent.kickoff_async(messages)
|
||||
|
||||
@@ -21,7 +21,7 @@ class SQLiteFlowPersistence(FlowPersistence):
|
||||
moderate performance requirements.
|
||||
"""
|
||||
|
||||
db_path: str # Type annotation for instance variable
|
||||
db_path: str
|
||||
|
||||
def __init__(self, db_path: Optional[str] = None):
|
||||
"""Initialize SQLite persistence.
|
||||
|
||||
@@ -24,7 +24,7 @@ class Mem0Storage(Storage):
|
||||
self.crew = crew
|
||||
self.config = config or {}
|
||||
# TODO: Memory config will be removed in the future the config will be passed as a parameter
|
||||
self.memory_config = self.config if config is not None else getattr(crew, "memory_config", {}) or {}
|
||||
self.memory_config = self.config or getattr(crew, "memory_config", {}) or {}
|
||||
|
||||
# User ID is required for user memory type "user" since it's used as a unique identifier for the user.
|
||||
user_id = self._get_user_id()
|
||||
|
||||
2
src/crewai/telemetry/constants.py
Normal file
2
src/crewai/telemetry/constants.py
Normal file
@@ -0,0 +1,2 @@
|
||||
CREWAI_TELEMETRY_BASE_URL: str = "https://telemetry.crewai.com:4319"
|
||||
CREWAI_TELEMETRY_SERVICE_NAME: str = "crewAI-telemetry"
|
||||
@@ -9,6 +9,11 @@ from contextlib import contextmanager
|
||||
from importlib.metadata import version
|
||||
from typing import TYPE_CHECKING, Any, Optional
|
||||
|
||||
from crewai.telemetry.constants import (
|
||||
CREWAI_TELEMETRY_BASE_URL,
|
||||
CREWAI_TELEMETRY_SERVICE_NAME,
|
||||
)
|
||||
|
||||
|
||||
@contextmanager
|
||||
def suppress_warnings():
|
||||
@@ -52,16 +57,15 @@ class Telemetry:
|
||||
return
|
||||
|
||||
try:
|
||||
telemetry_endpoint = "https://telemetry.crewai.com:4319"
|
||||
self.resource = Resource(
|
||||
attributes={SERVICE_NAME: "crewAI-telemetry"},
|
||||
attributes={SERVICE_NAME: CREWAI_TELEMETRY_SERVICE_NAME},
|
||||
)
|
||||
with suppress_warnings():
|
||||
self.provider = TracerProvider(resource=self.resource)
|
||||
|
||||
processor = BatchSpanProcessor(
|
||||
OTLPSpanExporter(
|
||||
endpoint=f"{telemetry_endpoint}/v1/traces",
|
||||
endpoint=f"{CREWAI_TELEMETRY_BASE_URL}/v1/traces",
|
||||
timeout=30,
|
||||
)
|
||||
)
|
||||
@@ -75,12 +79,12 @@ class Telemetry:
|
||||
):
|
||||
raise # Re-raise the exception to not interfere with system signals
|
||||
self.ready = False
|
||||
|
||||
|
||||
def _is_telemetry_disabled(self) -> bool:
|
||||
"""Check if telemetry should be disabled based on environment variables."""
|
||||
return (
|
||||
os.getenv("OTEL_SDK_DISABLED", "false").lower() == "true" or
|
||||
os.getenv("CREWAI_DISABLE_TELEMETRY", "false").lower() == "true"
|
||||
os.getenv("OTEL_SDK_DISABLED", "false").lower() == "true"
|
||||
or os.getenv("CREWAI_DISABLE_TELEMETRY", "false").lower() == "true"
|
||||
)
|
||||
|
||||
def set_tracer(self):
|
||||
|
||||
@@ -96,15 +96,15 @@ class ConsoleFormatter:
|
||||
return
|
||||
|
||||
if status == "completed":
|
||||
prefix, style = "✅ Crew:", "green"
|
||||
prefix, style = "[OK] Crew:", "green"
|
||||
title = "Crew Completion"
|
||||
content_title = "Crew Execution Completed"
|
||||
elif status == "failed":
|
||||
prefix, style = "❌ Crew:", "red"
|
||||
prefix, style = "[FAIL] Crew:", "red"
|
||||
title = "Crew Failure"
|
||||
content_title = "Crew Execution Failed"
|
||||
else:
|
||||
prefix, style = "🚀 Crew:", "cyan"
|
||||
prefix, style = "[LAUNCH] Crew:", "cyan"
|
||||
title = "Crew Execution"
|
||||
content_title = "Crew Execution Started"
|
||||
|
||||
@@ -130,7 +130,7 @@ class ConsoleFormatter:
|
||||
return None
|
||||
|
||||
tree = Tree(
|
||||
Text("🚀 Crew: ", style="cyan bold") + Text(crew_name, style="cyan")
|
||||
Text("[LAUNCH] Crew: ", style="cyan bold") + Text(crew_name, style="cyan")
|
||||
)
|
||||
|
||||
content = self.create_status_content(
|
||||
@@ -155,7 +155,7 @@ class ConsoleFormatter:
|
||||
return None
|
||||
|
||||
task_content = Text()
|
||||
task_content.append(f"📋 Task: {task_id}", style="yellow bold")
|
||||
task_content.append(f"[TASK] Task: {task_id}", style="yellow bold")
|
||||
task_content.append("\n Status: ", style="white")
|
||||
task_content.append("Executing Task...", style="yellow dim")
|
||||
|
||||
@@ -186,18 +186,18 @@ class ConsoleFormatter:
|
||||
|
||||
if status == "completed":
|
||||
style = "green"
|
||||
status_text = "✅ Completed"
|
||||
status_text = "[OK] Completed"
|
||||
panel_title = "Task Completion"
|
||||
else:
|
||||
style = "red"
|
||||
status_text = "❌ Failed"
|
||||
status_text = "[FAIL] Failed"
|
||||
panel_title = "Task Failure"
|
||||
|
||||
# Update tree label
|
||||
for branch in crew_tree.children:
|
||||
if str(task_id) in str(branch.label):
|
||||
task_content = Text()
|
||||
task_content.append(f"📋 Task: {task_id}", style=f"{style} bold")
|
||||
task_content.append(f"[TASK] Task: {task_id}", style=f"{style} bold")
|
||||
task_content.append("\n Assigned to: ", style="white")
|
||||
task_content.append(agent_role, style=style)
|
||||
task_content.append("\n Status: ", style="white")
|
||||
@@ -221,7 +221,7 @@ class ConsoleFormatter:
|
||||
|
||||
agent_branch = task_branch.add("")
|
||||
self.update_tree_label(
|
||||
agent_branch, "🤖 Agent:", agent_role, "green", "In Progress"
|
||||
agent_branch, "[AGENT] Agent:", agent_role, "green", "In Progress"
|
||||
)
|
||||
|
||||
self.print(crew_tree)
|
||||
@@ -245,10 +245,10 @@ class ConsoleFormatter:
|
||||
|
||||
self.update_tree_label(
|
||||
agent_branch,
|
||||
"🤖 Agent:",
|
||||
"[AGENT] Agent:",
|
||||
agent_role,
|
||||
"green",
|
||||
"✅ Completed" if status == "completed" else "❌ Failed",
|
||||
"[OK] Completed" if status == "completed" else "[FAIL] Failed",
|
||||
)
|
||||
|
||||
self.print(crew_tree)
|
||||
@@ -263,14 +263,14 @@ class ConsoleFormatter:
|
||||
|
||||
# Create initial tree with flow ID
|
||||
flow_label = Text()
|
||||
flow_label.append("🌊 Flow: ", style="blue bold")
|
||||
flow_label.append("[FLOW] Flow: ", style="blue bold")
|
||||
flow_label.append(flow_name, style="blue")
|
||||
flow_label.append("\n ID: ", style="white")
|
||||
flow_label.append(flow_id, style="blue")
|
||||
|
||||
flow_tree = Tree(flow_label)
|
||||
self.add_tree_node(flow_tree, "✨ Created", "blue")
|
||||
self.add_tree_node(flow_tree, "✅ Initialization Complete", "green")
|
||||
self.add_tree_node(flow_tree, "[NEW] Created", "blue")
|
||||
self.add_tree_node(flow_tree, "[OK] Initialization Complete", "green")
|
||||
|
||||
return flow_tree
|
||||
|
||||
@@ -278,13 +278,13 @@ class ConsoleFormatter:
|
||||
"""Initialize a flow execution tree."""
|
||||
flow_tree = Tree("")
|
||||
flow_label = Text()
|
||||
flow_label.append("🌊 Flow: ", style="blue bold")
|
||||
flow_label.append("[FLOW] Flow: ", style="blue bold")
|
||||
flow_label.append(flow_name, style="blue")
|
||||
flow_label.append("\n ID: ", style="white")
|
||||
flow_label.append(flow_id, style="blue")
|
||||
flow_tree.label = flow_label
|
||||
|
||||
self.add_tree_node(flow_tree, "🧠 Starting Flow...", "yellow")
|
||||
self.add_tree_node(flow_tree, "[THINKING] Starting Flow...", "yellow")
|
||||
|
||||
self.print(flow_tree)
|
||||
self.print()
|
||||
@@ -306,7 +306,7 @@ class ConsoleFormatter:
|
||||
# Update main flow label
|
||||
self.update_tree_label(
|
||||
flow_tree,
|
||||
"✅ Flow Finished:" if status == "completed" else "❌ Flow Failed:",
|
||||
"[OK] Flow Finished:" if status == "completed" else "[FAIL] Flow Failed:",
|
||||
flow_name,
|
||||
"green" if status == "completed" else "red",
|
||||
)
|
||||
@@ -316,9 +316,9 @@ class ConsoleFormatter:
|
||||
if "Starting Flow" in str(child.label):
|
||||
child.label = Text(
|
||||
(
|
||||
"✅ Flow Completed"
|
||||
"[OK] Flow Completed"
|
||||
if status == "completed"
|
||||
else "❌ Flow Failed"
|
||||
else "[FAIL] Flow Failed"
|
||||
),
|
||||
style="green" if status == "completed" else "red",
|
||||
)
|
||||
@@ -351,20 +351,20 @@ class ConsoleFormatter:
|
||||
return None
|
||||
|
||||
if status == "running":
|
||||
prefix, style = "🔄 Running:", "yellow"
|
||||
prefix, style = "[RUNNING] Running:", "yellow"
|
||||
elif status == "completed":
|
||||
prefix, style = "✅ Completed:", "green"
|
||||
prefix, style = "[OK] Completed:", "green"
|
||||
# Update initialization node when a method completes successfully
|
||||
for child in flow_tree.children:
|
||||
if "Starting Flow" in str(child.label):
|
||||
child.label = Text("Flow Method Step", style="white")
|
||||
break
|
||||
else:
|
||||
prefix, style = "❌ Failed:", "red"
|
||||
prefix, style = "[FAIL] Failed:", "red"
|
||||
# Update initialization node on failure
|
||||
for child in flow_tree.children:
|
||||
if "Starting Flow" in str(child.label):
|
||||
child.label = Text("❌ Flow Step Failed", style="red")
|
||||
child.label = Text("[FAIL] Flow Step Failed", style="red")
|
||||
break
|
||||
|
||||
if not method_branch:
|
||||
@@ -413,7 +413,7 @@ class ConsoleFormatter:
|
||||
# Update label with current count
|
||||
self.update_tree_label(
|
||||
tool_branch,
|
||||
"🔧",
|
||||
"[TOOL]",
|
||||
f"Using {tool_name} ({self.tool_usage_counts[tool_name]})",
|
||||
"yellow",
|
||||
)
|
||||
@@ -443,7 +443,7 @@ class ConsoleFormatter:
|
||||
# Update the existing tool node's label
|
||||
self.update_tree_label(
|
||||
tool_branch,
|
||||
"🔧",
|
||||
"[TOOL]",
|
||||
f"Used {tool_name} ({self.tool_usage_counts[tool_name]})",
|
||||
"green",
|
||||
)
|
||||
@@ -473,7 +473,7 @@ class ConsoleFormatter:
|
||||
if tool_branch:
|
||||
self.update_tree_label(
|
||||
tool_branch,
|
||||
"🔧 Failed",
|
||||
"[TOOL] Failed",
|
||||
f"{tool_name} ({self.tool_usage_counts[tool_name]})",
|
||||
"red",
|
||||
)
|
||||
@@ -506,7 +506,7 @@ class ConsoleFormatter:
|
||||
# Only add thinking status if we don't have a current tool branch
|
||||
if self.current_tool_branch is None:
|
||||
tool_branch = branch_to_use.add("")
|
||||
self.update_tree_label(tool_branch, "🧠", "Thinking...", "blue")
|
||||
self.update_tree_label(tool_branch, "[THINKING]", "Thinking...", "blue")
|
||||
self.current_tool_branch = tool_branch
|
||||
self.print(tree_to_use)
|
||||
self.print()
|
||||
@@ -554,14 +554,14 @@ class ConsoleFormatter:
|
||||
|
||||
# Update tool branch if it exists
|
||||
if tool_branch:
|
||||
tool_branch.label = Text("❌ LLM Failed", style="red bold")
|
||||
tool_branch.label = Text("[FAIL] LLM Failed", style="red bold")
|
||||
if tree_to_use:
|
||||
self.print(tree_to_use)
|
||||
self.print()
|
||||
|
||||
# Show error panel
|
||||
error_content = Text()
|
||||
error_content.append("❌ LLM Call Failed\n", style="red bold")
|
||||
error_content.append("[FAIL] LLM Call Failed\n", style="red bold")
|
||||
error_content.append("Error: ", style="white")
|
||||
error_content.append(str(error), style="red")
|
||||
|
||||
@@ -576,7 +576,7 @@ class ConsoleFormatter:
|
||||
|
||||
# Create initial panel
|
||||
content = Text()
|
||||
content.append("🧪 Starting Crew Test\n\n", style="blue bold")
|
||||
content.append("[TEST] Starting Crew Test\n\n", style="blue bold")
|
||||
content.append("Crew: ", style="white")
|
||||
content.append(f"{crew_name}\n", style="blue")
|
||||
content.append("ID: ", style="white")
|
||||
@@ -590,13 +590,13 @@ class ConsoleFormatter:
|
||||
|
||||
# Create and display the test tree
|
||||
test_label = Text()
|
||||
test_label.append("🧪 Test: ", style="blue bold")
|
||||
test_label.append("[TEST] Test: ", style="blue bold")
|
||||
test_label.append(crew_name or "Crew", style="blue")
|
||||
test_label.append("\n Status: ", style="white")
|
||||
test_label.append("In Progress", style="yellow")
|
||||
|
||||
test_tree = Tree(test_label)
|
||||
self.add_tree_node(test_tree, "🔄 Running tests...", "yellow")
|
||||
self.add_tree_node(test_tree, "[RUNNING] Running tests...", "yellow")
|
||||
|
||||
self.print(test_tree)
|
||||
self.print()
|
||||
@@ -612,7 +612,7 @@ class ConsoleFormatter:
|
||||
if flow_tree:
|
||||
# Update test tree label to show completion
|
||||
test_label = Text()
|
||||
test_label.append("✅ Test: ", style="green bold")
|
||||
test_label.append("[OK] Test: ", style="green bold")
|
||||
test_label.append(crew_name or "Crew", style="green")
|
||||
test_label.append("\n Status: ", style="white")
|
||||
test_label.append("Completed", style="green bold")
|
||||
@@ -621,7 +621,7 @@ class ConsoleFormatter:
|
||||
# Update the running tests node
|
||||
for child in flow_tree.children:
|
||||
if "Running tests" in str(child.label):
|
||||
child.label = Text("✅ Tests completed successfully", style="green")
|
||||
child.label = Text("[OK] Tests completed successfully", style="green")
|
||||
break
|
||||
|
||||
self.print(flow_tree)
|
||||
@@ -643,7 +643,7 @@ class ConsoleFormatter:
|
||||
return
|
||||
|
||||
content = Text()
|
||||
content.append("📋 Crew Training Started\n", style="blue bold")
|
||||
content.append("[TASK] Crew Training Started\n", style="blue bold")
|
||||
content.append("Crew: ", style="white")
|
||||
content.append(f"{crew_name}\n", style="blue")
|
||||
content.append("Time: ", style="white")
|
||||
@@ -658,7 +658,7 @@ class ConsoleFormatter:
|
||||
return
|
||||
|
||||
content = Text()
|
||||
content.append("✅ Crew Training Completed\n", style="green bold")
|
||||
content.append("[OK] Crew Training Completed\n", style="green bold")
|
||||
content.append("Crew: ", style="white")
|
||||
content.append(f"{crew_name}\n", style="green")
|
||||
content.append("Time: ", style="white")
|
||||
@@ -673,7 +673,7 @@ class ConsoleFormatter:
|
||||
return
|
||||
|
||||
failure_content = Text()
|
||||
failure_content.append("❌ Crew Training Failed\n", style="red bold")
|
||||
failure_content.append("[FAIL] Crew Training Failed\n", style="red bold")
|
||||
failure_content.append("Crew: ", style="white")
|
||||
failure_content.append(crew_name or "Crew", style="red")
|
||||
|
||||
@@ -686,7 +686,7 @@ class ConsoleFormatter:
|
||||
return
|
||||
|
||||
failure_content = Text()
|
||||
failure_content.append("❌ Crew Test Failed\n", style="red bold")
|
||||
failure_content.append("[FAIL] Crew Test Failed\n", style="red bold")
|
||||
failure_content.append("Crew: ", style="white")
|
||||
failure_content.append(crew_name or "Crew", style="red")
|
||||
|
||||
@@ -701,7 +701,7 @@ class ConsoleFormatter:
|
||||
# Create initial tree for LiteAgent if it doesn't exist
|
||||
if not self.current_lite_agent_branch:
|
||||
lite_agent_label = Text()
|
||||
lite_agent_label.append("🤖 LiteAgent: ", style="cyan bold")
|
||||
lite_agent_label.append("[AGENT] LiteAgent: ", style="cyan bold")
|
||||
lite_agent_label.append(lite_agent_role, style="cyan")
|
||||
lite_agent_label.append("\n Status: ", style="white")
|
||||
lite_agent_label.append("In Progress", style="yellow")
|
||||
@@ -726,15 +726,15 @@ class ConsoleFormatter:
|
||||
|
||||
# Determine style based on status
|
||||
if status == "completed":
|
||||
prefix, style = "✅ LiteAgent:", "green"
|
||||
prefix, style = "[OK] LiteAgent:", "green"
|
||||
status_text = "Completed"
|
||||
title = "LiteAgent Completion"
|
||||
elif status == "failed":
|
||||
prefix, style = "❌ LiteAgent:", "red"
|
||||
prefix, style = "[FAIL] LiteAgent:", "red"
|
||||
status_text = "Failed"
|
||||
title = "LiteAgent Error"
|
||||
else:
|
||||
prefix, style = "🤖 LiteAgent:", "yellow"
|
||||
prefix, style = "[AGENT] LiteAgent:", "yellow"
|
||||
status_text = "In Progress"
|
||||
title = "LiteAgent Status"
|
||||
|
||||
|
||||
42
tests/utilities/events/utils/test_console_formatter.py
Normal file
42
tests/utilities/events/utils/test_console_formatter.py
Normal file
@@ -0,0 +1,42 @@
|
||||
import pytest
|
||||
from rich.text import Text
|
||||
from rich.tree import Tree
|
||||
|
||||
from crewai.utilities.events.utils.console_formatter import ConsoleFormatter
|
||||
|
||||
|
||||
def test_console_formatter_gbk_encoding():
|
||||
"""Test that console formatter output can be encoded with GBK."""
|
||||
formatter = ConsoleFormatter(verbose=True)
|
||||
|
||||
tree = Tree("Test Tree")
|
||||
|
||||
formatter.update_tree_label(tree, "[OK] Test:", "Test Name", "green")
|
||||
label_text = str(tree.label)
|
||||
|
||||
node = formatter.add_tree_node(tree, "[OK] Test Node", "green")
|
||||
node_text = str(node.label)
|
||||
|
||||
try:
|
||||
label_text.encode("gbk")
|
||||
node_text.encode("gbk")
|
||||
assert True, "Text can be encoded with GBK"
|
||||
except UnicodeEncodeError as e:
|
||||
assert False, f"Failed to encode with GBK: {e}"
|
||||
|
||||
crew_tree = formatter.create_crew_tree("Test Crew", "crew-123")
|
||||
task_branch = formatter.create_task_branch(crew_tree, "1")
|
||||
agent_branch = formatter.create_agent_branch(task_branch, "Test Agent", crew_tree)
|
||||
|
||||
formatter.update_task_status(crew_tree, "1", "Test Agent", "completed")
|
||||
formatter.update_agent_status(agent_branch, "Test Agent", crew_tree, "completed")
|
||||
|
||||
flow_tree = formatter.create_flow_tree("Test Flow", "flow-123")
|
||||
formatter.update_flow_status(flow_tree, "Test Flow", "flow-123", "completed")
|
||||
|
||||
for tree_obj in [crew_tree, task_branch, agent_branch, flow_tree]:
|
||||
tree_text = str(tree_obj)
|
||||
try:
|
||||
tree_text.encode("gbk")
|
||||
except UnicodeEncodeError as e:
|
||||
assert False, f"Failed to encode tree with GBK: {e}"
|
||||
Reference in New Issue
Block a user