andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-09 08:08:32 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix llms (#2003)

Browse Source 
* iwp

* add in api_base

---------

Co-authored-by: Lorenze Jay <63378463+lorenzejay@users.noreply.github.com>
This commit is contained in:
Brandon Hancock (bhancock_ai)
2025-01-29 19:41:09 -05:00
committed by GitHub
parent 7bed63a693
commit 477cce321f
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/crewai/llm.py
View File

@@ -133,6 +133,7 @@ class LLM:
logprobs: Optional[int] = None, logprobs: Optional[int] = None,
top_logprobs: Optional[int] = None, top_logprobs: Optional[int] = None,
base_url: Optional[str] = None, base_url: Optional[str] = None,
api_base: Optional[str] = None,
api_version: Optional[str] = None, api_version: Optional[str] = None,
api_key: Optional[str] = None, api_key: Optional[str] = None,
callbacks: List[Any] = [], callbacks: List[Any] = [],
@@ -152,6 +153,7 @@ class LLM:
self.logprobs = logprobs self.logprobs = logprobs
self.top_logprobs = top_logprobs self.top_logprobs = top_logprobs
self.base_url = base_url self.base_url = base_url
self.api_base = api_base
self.api_version = api_version self.api_version = api_version
self.api_key = api_key self.api_key = api_key
self.callbacks = callbacks self.callbacks = callbacks
@@ -232,7 +234,8 @@ class LLM:
"seed": self.seed, "seed": self.seed,
"logprobs": self.logprobs, "logprobs": self.logprobs,
"top_logprobs": self.top_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_version": self.api_version,
"api_key": self.api_key, "api_key": self.api_key,
"stream": False, "stream": False,

17
src/crewai/utilities/llm_utils.py
View File

@@ -53,6 +53,7 @@ def create_llm(
timeout: Optional[float] = getattr(llm_value, "timeout", None) timeout: Optional[float] = getattr(llm_value, "timeout", None)
api_key: Optional[str] = getattr(llm_value, "api_key", None) api_key: Optional[str] = getattr(llm_value, "api_key", None)
base_url: Optional[str] = getattr(llm_value, "base_url", None) base_url: Optional[str] = getattr(llm_value, "base_url", None)
api_base: Optional[str] = getattr(llm_value, "api_base", None)
created_llm = LLM( created_llm = LLM(
model=model, model=model,
@@ -62,6 +63,7 @@ def create_llm(
timeout=timeout, timeout=timeout,
api_key=api_key, api_key=api_key,
base_url=base_url, base_url=base_url,
api_base=api_base,
) )
return created_llm return created_llm
except Exception as e: except Exception as e:
@@ -101,8 +103,18 @@ def _llm_via_environment_or_fallback() -> Optional[LLM]:
callbacks: List[Any] = [] callbacks: List[Any] = []
# Optional base URL from env # Optional base URL from env
api_base = os.environ.get("OPENAI_API_BASE") or os.environ.get("OPENAI_BASE_URL") base_url = (
if api_base: 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 base_url = api_base
# Initialize llm_params dictionary # Initialize llm_params dictionary
@@ -115,6 +127,7 @@ def _llm_via_environment_or_fallback() -> Optional[LLM]:
"timeout": timeout, "timeout": timeout,
"api_key": api_key, "api_key": api_key,
"base_url": base_url, "base_url": base_url,
"api_base": api_base,
"api_version": api_version, "api_version": api_version,
"presence_penalty": presence_penalty, "presence_penalty": presence_penalty,
"frequency_penalty": frequency_penalty, "frequency_penalty": frequency_penalty,