mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-10 00:28:31 +00:00
Incorporate feedback from crewai reviewer
This commit is contained in:
@@ -8,7 +8,7 @@ from pydantic import Field, InstanceOf, PrivateAttr, model_validator
|
|||||||
from crewai.agents import CacheHandler
|
from crewai.agents import CacheHandler
|
||||||
from crewai.agents.agent_builder.base_agent import BaseAgent
|
from crewai.agents.agent_builder.base_agent import BaseAgent
|
||||||
from crewai.agents.crew_agent_executor import CrewAgentExecutor
|
from crewai.agents.crew_agent_executor import CrewAgentExecutor
|
||||||
from crewai.cli.constants import ENV_VARS
|
from crewai.cli.constants import ENV_VARS, LITELLM_PARAMS
|
||||||
from crewai.knowledge.knowledge import Knowledge
|
from crewai.knowledge.knowledge import Knowledge
|
||||||
from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
|
from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
|
||||||
from crewai.knowledge.utils.knowledge_utils import extract_knowledge_context
|
from crewai.knowledge.utils.knowledge_utils import extract_knowledge_context
|
||||||
@@ -181,17 +181,12 @@ class Agent(BaseAgent):
|
|||||||
if key_name and key_name not in unaccepted_attributes:
|
if key_name and key_name not in unaccepted_attributes:
|
||||||
env_value = os.environ.get(key_name)
|
env_value = os.environ.get(key_name)
|
||||||
if env_value:
|
if env_value:
|
||||||
param_name = key_name.lower()
|
key_name = key_name.lower()
|
||||||
# Map key names containing "API_KEY" to "api_key"
|
for pattern in LITELLM_PARAMS:
|
||||||
if "api_key" in param_name:
|
if pattern in key_name:
|
||||||
param_name = "api_key"
|
key_name = pattern
|
||||||
# Map key names containing "API_BASE" to "api_base"
|
break
|
||||||
elif "api_base" in param_name:
|
llm_params[key_name] = env_value
|
||||||
param_name = "api_base"
|
|
||||||
# Map key names containing "API_VERSION" to "api_version"
|
|
||||||
elif "api_version" in param_name:
|
|
||||||
param_name = "api_version"
|
|
||||||
llm_params[param_name] = env_value
|
|
||||||
# Check for default values if the environment variable is not set
|
# Check for default values if the environment variable is not set
|
||||||
elif env_var.get("default", False):
|
elif env_var.get("default", False):
|
||||||
for key, value in env_var.items():
|
for key, value in env_var.items():
|
||||||
|
|||||||
@@ -159,3 +159,6 @@ MODELS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
JSON_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"
|
JSON_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"
|
||||||
|
|
||||||
|
|
||||||
|
LITELLM_PARAMS = ["api_key", "api_base", "api_version"]
|
||||||
|
|||||||
Reference in New Issue
Block a user