Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.
Fix llms (#2003)
Brandon Hancock (bhancock_ai)477cce321fe3
diff --git a/src/crewai/llm.py b/src/crewai/llm.pyindex 98b0bc855..ef8746fd5 100644--- a/src/crewai/llm.py+++ b/src/crewai/llm.py@@ -133,6 +133,7 @@ class LLM:logprobs: Optional[int] = None,top_logprobs: Optional[int] = None,base_url: Optional[str] = None,+ api_base: Optional[str] = None,api_version: Optional[str] = None,api_key: Optional[str] = None,callbacks: List[Any] = [],@@ -152,6 +153,7 @@ class LLM:self.logprobs = logprobsself.top_logprobs = top_logprobsself.base_url = base_url+ self.api_base = api_baseself.api_version = api_versionself.api_key = api_keyself.callbacks = callbacks@@ -232,7 +234,8 @@ class LLM:"seed": self.seed,"logprobs": self.logprobs,"top_logprobs": self.top_logprobs,- "api_base": self.base_url,+ "api_base": self.api_base,+ "base_url": self.base_url,"api_version": self.api_version,"api_key": self.api_key,"stream": False,diff --git a/src/crewai/utilities/llm_utils.py b/src/crewai/utilities/llm_utils.pyindex 13230edf6..c774a71fb 100644--- a/src/crewai/utilities/llm_utils.py+++ b/src/crewai/utilities/llm_utils.py@@ -53,6 +53,7 @@ def create_llm(timeout: Optional[float] = getattr(llm_value, "timeout", None)api_key: Optional[str] = getattr(llm_value, "api_key", None)base_url: Optional[str] = getattr(llm_value, "base_url", None)+ api_base: Optional[str] = getattr(llm_value, "api_base", None)created_llm = LLM(model=model,@@ -62,6 +63,7 @@ def create_llm(timeout=timeout,api_key=api_key,base_url=base_url,+ api_base=api_base,)return created_llmexcept Exception as e:@@ -101,8 +103,18 @@ def _llm_via_environment_or_fallback() -> Optional[LLM]:callbacks: List[Any] = []# Optional base URL from env- api_base = os.environ.get("OPENAI_API_BASE") or os.environ.get("OPENAI_BASE_URL")- if api_base:+ base_url = (+ os.environ.get("BASE_URL")+ or os.environ.get("OPENAI_API_BASE")+ or os.environ.get("OPENAI_BASE_URL")+ )++ api_base = os.environ.get("API_BASE") or os.environ.get("AZURE_API_BASE")++ # Synchronize base_url and api_base if one is populated and the other is not+ if base_url and not api_base:+ api_base = base_url+ elif api_base and not base_url:base_url = api_base# Initialize llm_params dictionary@@ -115,6 +127,7 @@ def _llm_via_environment_or_fallback() -> Optional[LLM]:"timeout": timeout,"api_key": api_key,"base_url": base_url,+ "api_base": api_base,"api_version": api_version,"presence_penalty": presence_penalty,"frequency_penalty": frequency_penalty,