Skip to content

Commit b868f2d

Browse files
committed
Implement Pass-Through Mechanism for Model Sampling Parameters
1 parent 9f69f37 commit b868f2d

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

ads/aqua/evaluation/entities.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class ModelParams(DataClassSerializable):
102102
presence_penalty: Optional[float] = 0.0
103103
frequency_penalty: Optional[float] = 0.0
104104
stop: Optional[Union[str, List[str]]] = field(default_factory=list)
105+
model: Optional[str] = "odsc-llm"
105106

106107

107108
@dataclass(repr=False)

ads/aqua/evaluation/evaluation.py

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
upload_local_to_os,
4747
)
4848
from ads.aqua.config.config import evaluation_service_config
49+
from ads.aqua.config.evaluation.evaluation_service_config import EvaluationServiceConfig
4950
from ads.aqua.constants import (
5051
CONSOLE_LINK_RESOURCE_TYPE_MAPPING,
5152
EVALUATION_REPORT,
@@ -171,8 +172,19 @@ def create(
171172
f"Invalid evaluation source {create_aqua_evaluation_details.evaluation_source_id}. "
172173
"Specify either a model or model deployment id."
173174
)
175+
176+
# The model to evaluate
174177
evaluation_source = None
178+
# The evaluation service config
179+
evaluation_config: EvaluationServiceConfig = evaluation_service_config()
180+
# The evaluation inference configuration. The inference configuration will be extracted
181+
# based on the inferencing container family.
175182
eval_inference_configuration: Dict = {}
183+
# The evaluation inference model sampling params. The system parameters that will not be
184+
# visible for user, but will be applied implicitly for evaluation. The service model params
185+
# will be extracted based on the container family and version.
186+
eval_inference_service_model_params: Dict = {}
187+
176188
if (
177189
DataScienceResource.MODEL_DEPLOYMENT
178190
in create_aqua_evaluation_details.evaluation_source_id
@@ -200,9 +212,15 @@ def create(
200212
== runtime.image[: runtime.image.rfind(":")]
201213
):
202214
eval_inference_configuration = (
203-
evaluation_service_config()
204-
.get_merged_inference_params(inference_container_family)
205-
.to_dict()
215+
evaluation_config.get_merged_inference_params(
216+
inference_container_family
217+
).to_dict()
218+
)
219+
eval_inference_service_model_params = (
220+
evaluation_config.get_merged_inference_model_params(
221+
inference_container_family,
222+
inference_container_info.version,
223+
)
206224
)
207225

208226
except Exception:
@@ -424,7 +442,10 @@ def create(
424442
container_image=container_image,
425443
dataset_path=evaluation_dataset_path,
426444
report_path=create_aqua_evaluation_details.report_path,
427-
model_parameters=create_aqua_evaluation_details.model_parameters,
445+
model_parameters={
446+
**eval_inference_service_model_params,
447+
**create_aqua_evaluation_details.model_parameters,
448+
},
428449
metrics=create_aqua_evaluation_details.metrics,
429450
inference_configuration=eval_inference_configuration or {},
430451
)

0 commit comments

Comments
 (0)