Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: missing key name when running with ollama provider #1638

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+8 −13
Open

fix: missing key name when running with ollama provider #1638

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62b0e04
fix key name
bowenliang123 Nov 21, 2024
8bbdafd
nit
bowenliang123 Nov 21, 2024
6b08cbe
more elegance
bowenliang123 Nov 21, 2024
6686baa
simplification
bowenliang123 Nov 21, 2024
520a9c2
update
bowenliang123 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/crewai/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,28 +158,23 @@ def post_init_setup(self):
for provider, env_vars in ENV_VARS.items():
if provider == set_provider:
for env_var in env_vars:
if env_var["key_name"] in unnacepted_attributes:
continue
# Check if the environment variable is set
if "key_name" in env_var:
env_value = os.environ.get(env_var["key_name"])
key_name = env_var.get("key_name")
if key_name and key_name not in unnacepted_attributes:
env_value = os.environ.get(key_name)
if env_value:
# Map key names containing "API_KEY" to "api_key"
key_name = (
"api_key"
if "API_KEY" in env_var["key_name"]
else env_var["key_name"]
"api_key" if "API_KEY" in key_name else key_name
)
# Map key names containing "API_BASE" to "api_base"
key_name = (
"api_base"
if "API_BASE" in env_var["key_name"]
else key_name
"api_base" if "API_BASE" in key_name else key_name
)
# Map key names containing "API_VERSION" to "api_version"
key_name = (
"api_version"
if "API_VERSION" in env_var["key_name"]
if "API_VERSION" in key_name
else key_name
)
llm_params[key_name] = env_value
Expand Down Expand Up @@ -277,8 +272,8 @@ def execute_task(
if self.crew and self.crew.knowledge:
knowledge_snippets = self.crew.knowledge.query([task.prompt()])
valid_snippets = [
result["context"]
for result in knowledge_snippets
result["context"]
for result in knowledge_snippets
if result and result.get("context")
]
if valid_snippets:
Expand Down