andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-26 16:48:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

apply agent ops changes and resolve merge conflicts

Browse Source
This commit is contained in:
Brandon Hancock
2024-12-12 10:23:11 -05:00
parent ec89e003c8
commit cd5e4ff574
4 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/crewai/agent.py
View File

@@ -23,27 +23,19 @@ from crewai.utilities.converter import generate_model_description
from crewai.utilities.token_counter_callback import TokenCalcHandler from crewai.utilities.token_counter_callback import TokenCalcHandler
from crewai.utilities.training_handler import CrewTrainingHandler from crewai.utilities.training_handler import CrewTrainingHandler
agentops = None
def mock_agent_ops_provider(): try:
def track_agent(*args, **kwargs): import agentops # type: ignore # Name "agentops" is already defined
from agentops import track_agent # type: ignore
except ImportError:
def track_agent():
def noop(f): def noop(f):
return f return f
return noop return noop
return track_agent
agentops = None
if os.environ.get("AGENTOPS_API_KEY"):
try:
from agentops import track_agent
except ImportError:
track_agent = mock_agent_ops_provider()
else:
track_agent = mock_agent_ops_provider()
@track_agent() @track_agent()
class Agent(BaseAgent): class Agent(BaseAgent):

11
src/crewai/crew.py
View File

@@ -1,6 +1,5 @@
import asyncio import asyncio
import json import json
import os
import uuid import uuid
import warnings import warnings
from concurrent.futures import Future from concurrent.futures import Future
@@ -49,12 +48,10 @@ from crewai.utilities.planning_handler import CrewPlanner
from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
from crewai.utilities.training_handler import CrewTrainingHandler from crewai.utilities.training_handler import CrewTrainingHandler
agentops = None try:
if os.environ.get("AGENTOPS_API_KEY"): import agentops # type: ignore
try: except ImportError:
import agentops # type: ignore agentops = None
except ImportError:
pass
warnings.filterwarnings("ignore", category=SyntaxWarning, module="pysbd") warnings.filterwarnings("ignore", category=SyntaxWarning, module="pysbd")

11
src/crewai/tools/tool_usage.py
View File

@@ -1,6 +1,5 @@
import ast import ast
import datetime import datetime
import os
import time import time
from difflib import SequenceMatcher from difflib import SequenceMatcher
from textwrap import dedent from textwrap import dedent
@@ -15,12 +14,10 @@ from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
from crewai.tools.tool_usage_events import ToolUsageError, ToolUsageFinished from crewai.tools.tool_usage_events import ToolUsageError, ToolUsageFinished
from crewai.utilities import I18N, Converter, ConverterError, Printer from crewai.utilities import I18N, Converter, ConverterError, Printer
agentops = None try:
if os.environ.get("AGENTOPS_API_KEY"): import agentops # type: ignore
try: except ImportError:
import agentops # type: ignore agentops = None
except ImportError:
pass
OPENAI_BIGGER_MODELS = ["gpt-4", "gpt-4o", "o1-preview", "o1-mini"] OPENAI_BIGGER_MODELS = ["gpt-4", "gpt-4o", "o1-preview", "o1-mini"]

21
src/crewai/utilities/evaluators/task_evaluator.py
View File

@@ -1,4 +1,3 @@
import os
from typing import List from typing import List
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
@@ -6,27 +5,17 @@ from pydantic import BaseModel, Field
from crewai.utilities import Converter from crewai.utilities import Converter
from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser
agentops = None
try:
from agentops import track_agent # type: ignore
except ImportError:
def mock_agent_ops_provider(): def track_agent(name):
def track_agent(*args, **kwargs):
def noop(f): def noop(f):
return f return f
return noop return noop
return track_agent
agentops = None
if os.environ.get("AGENTOPS_API_KEY"):
try:
from agentops import track_agent
except ImportError:
track_agent = mock_agent_ops_provider()
else:
track_agent = mock_agent_ops_provider()
class Entity(BaseModel): class Entity(BaseModel):
name: str = Field(description="The name of the entity.") name: str = Field(description="The name of the entity.")