yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2025-12-03 10:26:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make api_key param optional in LLMEvaluator (#8340)

Browse Source
This commit is contained in:
Sriniketh J 2024-09-20 14:17:13 +05:30 committed by GitHub
parent b6cde2414b
commit 066e2e3ec5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
haystack/components/evaluators/llm_evaluator.py
View File

@ -57,7 +57,7 @@ class LLMEvaluator:
*,
raise_on_failure: bool = True,
api: str = "openai",
api_key: Secret = Secret.from_env_var("OPENAI_API_KEY"),
api_key: Optional[Secret] = None,
api_params: Optional[Dict[str, Any]] = None,
):
"""
@ -84,7 +84,7 @@ class LLMEvaluator:
The API to use for calling an LLM through a Generator.
Supported APIs: "openai".
:param api_key:
The API key.
The API key to be passed to a LLM provider. It may not be necessary when using a locally hosted model.
:param api_params:
Parameters for an OpenAI API compatible completions call.
@ -106,7 +106,10 @@ class LLMEvaluator:
self.api_params["generation_kwargs"] = merged_generation_kwargs
if api == "openai":
self.generator = OpenAIGenerator(api_key=api_key, **self.api_params)
generator_kwargs = {**self.api_params}
if api_key:
generator_kwargs["api_key"] = api_key
self.generator = OpenAIGenerator(**generator_kwargs)
else:
raise ValueError(f"Unsupported API: {api}")
@ -288,7 +291,7 @@ class LLMEvaluator:
outputs=self.outputs,
examples=self.examples,
api=self.api,
api_key=self.api_key.to_dict(),
api_key=self.api_key and self.api_key.to_dict(),
api_params=self.api_params,
progress_bar=self.progress_bar,
)

1
test/components/evaluators/test_llm_evaluator.py
View File

@ -197,6 +197,7 @@ class TestLLMEvaluator:
component = LLMEvaluator(
instructions="test-instruction",
inputs=[("predicted_answers", List[str])],
api_key=Secret.from_env_var("OPENAI_API_KEY"),
outputs=["score"],
examples=[
{"inputs": {"predicted_answers": "Football is the most popular sport."}, "outputs": {"score": 0}}