Skip to content

Commit 0af3d65

Browse files
rsareddy0329Roja Reddy Sareddy
andauthored
fix infer logic of agent_run_time from the attached input trainer (#6115)
* Fix gpu integ test failure due to outdated MPG * Fix: fix agent_run_time inference from the attached input trainer --------- Co-authored-by: Roja Reddy Sareddy <rsareddy@amazon.com>
1 parent ed30053 commit 0af3d65

3 files changed

Lines changed: 144 additions & 2 deletions

File tree

‎sagemaker-train/src/sagemaker/train/evaluate/multi_turn_rl_evaluator.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,16 @@ def _resolve_trainer_defaults(self) -> None:
253253
or getattr(trainer, "_agent_config", None)
254254
or getattr(trainer, "agent_env", None)
255255
)
256-
# AgentRFTJob.agent_config returns a dict like {"AgentRuntimeArn": "..."}
256+
# AgentRFTJob.agent_config returns a nested dict like
257+
# {"BedrockAgentCoreConfig": {"AgentRuntimeArn": "arn:..."}} or
258+
# {"CustomAgentLambdaConfig": {"LambdaArn": "arn:..."}}
257259
if isinstance(resolved_agent, dict):
260+
bedrock_cfg = resolved_agent.get("BedrockAgentCoreConfig", {})
261+
lambda_cfg = resolved_agent.get("CustomAgentLambdaConfig", {})
258262
self.agent_config = (
259-
resolved_agent.get("AgentRuntimeArn")
263+
bedrock_cfg.get("AgentRuntimeArn")
264+
or lambda_cfg.get("LambdaArn")
265+
or resolved_agent.get("AgentRuntimeArn")
260266
or resolved_agent.get("AgentLambdaArn")
261267
or resolved_agent.get("LambdaArn")
262268
)

‎sagemaker-train/tests/integ/train/test_mtrl_evaluator.py‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,47 @@ def test_evaluator_construction_with_base_model(self, test_config):
301301
assert evaluator is not None
302302
assert evaluator.model == test_config["base_model"]
303303

304+
def test_evaluator_infers_agent_config_from_trainer(self, mtrl_trainer, test_config):
305+
"""Test that agent_config is inferred from trainer's nested dict (no explicit agent_config)."""
306+
# Simulate AgentRFTJob.agent_config returning a nested dict
307+
mtrl_trainer.agent_config = {
308+
"BedrockAgentCoreConfig": {"AgentRuntimeArn": test_config["agent_arn"]}
309+
}
310+
311+
evaluator = MultiTurnRLEvaluator(
312+
model=mtrl_trainer,
313+
dataset=test_config["dataset"],
314+
s3_output_path=f'{test_config["s3_output_path"]}integ-infer-agent/',
315+
mlflow_resource_arn=test_config["mlflow_resource_arn"],
316+
region=test_config["region"],
317+
)
318+
319+
evaluator._resolve_trainer_defaults()
320+
assert evaluator.agent_config == test_config["agent_arn"]
321+
322+
# Clean up: remove the attribute so other tests using this fixture aren't affected
323+
del mtrl_trainer.agent_config
324+
325+
def test_evaluator_infers_lambda_agent_config_from_trainer(self, mtrl_trainer, test_config):
326+
"""Test that agent_config is inferred from trainer's nested CustomAgentLambdaConfig dict."""
327+
lambda_arn = "arn:aws:lambda:us-west-2:123456789012:function:my-agent"
328+
mtrl_trainer.agent_config = {
329+
"CustomAgentLambdaConfig": {"LambdaArn": lambda_arn}
330+
}
331+
332+
evaluator = MultiTurnRLEvaluator(
333+
model=mtrl_trainer,
334+
dataset=test_config["dataset"],
335+
s3_output_path=f'{test_config["s3_output_path"]}integ-infer-lambda/',
336+
mlflow_resource_arn=test_config["mlflow_resource_arn"],
337+
region=test_config["region"],
338+
)
339+
340+
evaluator._resolve_trainer_defaults()
341+
assert evaluator.agent_config == lambda_arn
342+
343+
del mtrl_trainer.agent_config
344+
304345
def test_get_all_mtrl_evaluations(self, test_config):
305346
"""Test listing all MTRL evaluation executions."""
306347
all_execs = MultiTurnRLEvaluator.get_all(region=test_config["region"])
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License"). You
4+
# may not use this file except in compliance with the License. A copy of
5+
# the License is located at
6+
#
7+
# http://aws.amazon.com/apache2.0/
8+
#
9+
# or in the "license" file accompanying this file. This file is
10+
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11+
# ANY KIND, either express or implied. See the License for the specific
12+
# language governing permissions and limitations under the License.
13+
"""Unit tests for _resolve_trainer_defaults agent_config dict parsing."""
14+
from __future__ import absolute_import
15+
16+
import pytest
17+
from unittest.mock import MagicMock
18+
19+
from sagemaker.train.evaluate.multi_turn_rl_evaluator import MultiTurnRLEvaluator
20+
21+
22+
AGENT_ARN = "arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/test-agent-aBcDeFgHiJ"
23+
LAMBDA_ARN = "arn:aws:lambda:us-west-2:123456789012:function:my-agent"
24+
SOURCE_MP_ARN = "arn:aws:sagemaker:us-west-2:123456789012:model-package/test-mpg/1"
25+
BASE_MODEL = "huggingface-reasoning-qwen3-32b"
26+
27+
28+
def _make_evaluator_with_trainer(agent_config_dict):
29+
"""Create a mock evaluator + trainer to test _resolve_trainer_defaults directly."""
30+
trainer = MagicMock()
31+
type(trainer).__name__ = "MultiTurnRLTrainer"
32+
trainer.output_model_package_arn = SOURCE_MP_ARN
33+
trainer.model_package_arn = SOURCE_MP_ARN
34+
trainer.base_model_arn = "arn:aws:sagemaker:us-west-2:aws:hub-content/test"
35+
trainer.base_model_name = BASE_MODEL
36+
trainer.agent_config = agent_config_dict
37+
trainer._agent_config = None
38+
trainer.agent_env = None
39+
trainer.agent_qualifier = None
40+
trainer._agent_qualifier = None
41+
42+
evaluator = MagicMock()
43+
evaluator.model = trainer
44+
evaluator.agent_config = None
45+
evaluator.agent_qualifier = None
46+
evaluator._source_model_package_arn_cache = None
47+
evaluator._base_model_arn_cache = None
48+
evaluator._base_model_name_cache = None
49+
return evaluator
50+
51+
52+
class TestResolveTrainerAgentConfig:
53+
"""Tests for _resolve_trainer_defaults agent_config dict parsing."""
54+
55+
def test_nested_bedrock_agent_core_config(self):
56+
"""Test that nested BedrockAgentCoreConfig dict is correctly parsed."""
57+
evaluator = _make_evaluator_with_trainer(
58+
{"BedrockAgentCoreConfig": {"AgentRuntimeArn": AGENT_ARN}}
59+
)
60+
MultiTurnRLEvaluator._resolve_trainer_defaults(evaluator)
61+
assert evaluator.agent_config == AGENT_ARN
62+
63+
def test_nested_custom_agent_lambda_config(self):
64+
"""Test that nested CustomAgentLambdaConfig dict is correctly parsed."""
65+
evaluator = _make_evaluator_with_trainer(
66+
{"CustomAgentLambdaConfig": {"LambdaArn": LAMBDA_ARN}}
67+
)
68+
MultiTurnRLEvaluator._resolve_trainer_defaults(evaluator)
69+
assert evaluator.agent_config == LAMBDA_ARN
70+
71+
def test_flat_dict_fallback_agent_runtime_arn(self):
72+
"""Test that flat AgentRuntimeArn key still works as a fallback."""
73+
evaluator = _make_evaluator_with_trainer(
74+
{"AgentRuntimeArn": AGENT_ARN}
75+
)
76+
MultiTurnRLEvaluator._resolve_trainer_defaults(evaluator)
77+
assert evaluator.agent_config == AGENT_ARN
78+
79+
def test_flat_dict_fallback_lambda_arn(self):
80+
"""Test that flat LambdaArn key still works as a fallback."""
81+
evaluator = _make_evaluator_with_trainer(
82+
{"LambdaArn": LAMBDA_ARN}
83+
)
84+
MultiTurnRLEvaluator._resolve_trainer_defaults(evaluator)
85+
assert evaluator.agent_config == LAMBDA_ARN
86+
87+
def test_customer_provided_agent_config_not_overwritten(self):
88+
"""Test that customer-provided agent_config is not overwritten by trainer."""
89+
customer_arn = "arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/customer-agent"
90+
evaluator = _make_evaluator_with_trainer(
91+
{"BedrockAgentCoreConfig": {"AgentRuntimeArn": AGENT_ARN}}
92+
)
93+
evaluator.agent_config = customer_arn
94+
MultiTurnRLEvaluator._resolve_trainer_defaults(evaluator)
95+
assert evaluator.agent_config == customer_arn

0 commit comments

Comments
 (0)