Skip to content

Commit 394adb8

Browse files
Merge branch 'master' into tgi-s3-model-loading
2 parents 2ef567c + 9ff3e5f commit 394adb8

36 files changed

Lines changed: 1377 additions & 195 deletions

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Changelog
22

3+
## v3.18.0 (2026-07-30)
4+
5+
### New Features
6+
7+
- feat(serve): make BenchmarkResult sweep-aware for concurrency search runs (#6098)
8+
- feat(feature-store): Add lineage registration to DatasetBuilder (#6014)
9+
10+
### Bug Fixes
11+
12+
- fix(sagemaker-core): remove dev-only endpoint override and fix client singleton pinning (#6120)
13+
- fix(sagemaker-core): use caller session for sagemaker control-plane client (#6107)
14+
- fix(sagemaker-core): drop tags before rebuilding TransformJob in transform() (#6110)
15+
- fix(train): assign SDK-managed channels to instance groups on heterogeneous clusters (#6116)
16+
- fix: infer logic of agent_run_time from the attached input trainer (#6115)
17+
- fix(serve): repack source_code for image_uri/ModelTrainer builds (#6112)
18+
- fix: Telemetry INFO logging to print only once per process (#6083)
19+
20+
321
## v3.17.0 (2026-07-24)
422

523
### New Features

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.17.0
1+
3.18.0

‎pyproject.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ classifiers = [
3232
"Programming Language :: Python :: 3.12",
3333
]
3434
dependencies = [
35-
"sagemaker-core>=2.17.0,<3.0.0",
36-
"sagemaker-train>=1.17.0,<2.0.0",
37-
"sagemaker-serve>=1.17.0,<2.0.0",
38-
"sagemaker-mlops>=1.17.0,<2.0.0",
35+
"sagemaker-core>=2.18.0,<3.0.0",
36+
"sagemaker-train>=1.18.0,<2.0.0",
37+
"sagemaker-serve>=1.18.0,<2.0.0",
38+
"sagemaker-mlops>=1.18.0,<2.0.0",
3939
]
4040

4141
[project.optional-dependencies]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
black==24.3.0
1+
black==26.3.1

‎sagemaker-core/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## v2.18.0 (2026-07-30)
4+
5+
### Bug Fixes
6+
7+
- fix(sagemaker-core): remove dev-only endpoint override and fix client singleton pinning (#6120)
8+
- fix(sagemaker-core): use caller session for sagemaker control-plane client (#6107)
9+
- fix(sagemaker-core): drop tags before rebuilding TransformJob in transform() (#6110)
10+
- fix: Telemetry INFO logging to print only once per process (#6083)
11+
12+
313
## v2.17.0 (2026-07-24)
414

515
### New Features

‎sagemaker-core/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.17.0
1+
2.18.0

‎sagemaker-core/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ authors = [
1212
readme = "README.rst"
1313
dependencies = [
1414
# Add your dependencies here (Include lower and upper bounds as applicable)
15-
"boto3>=1.42.2,<2.0.0",
15+
"boto3>=1.43.20,<2.0.0",
1616
"pydantic>=2.0.0,<3.0.0",
1717
"PyYAML>=6.0, <7.0",
1818
"jsonschema<5.0.0",

‎sagemaker-core/src/sagemaker/core/telemetry/telemetry_logging.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"For more information, refer to https://sagemaker.readthedocs.io/en/stable/overview.html"
6565
"#configuring-and-using-defaults-with-the-sagemaker-python-sdk."
6666
)
67+
_telemetry_msg_shown = False
6768

6869
FEATURE_TO_CODE = {
6970
str(Feature.SDK_DEFAULTS): 11,
@@ -284,8 +285,8 @@ def wrapper(*args, **kwargs):
284285
)
285286

286287
if sagemaker_session:
288+
global _telemetry_msg_shown
287289
logger.debug("sagemaker_session found, preparing to emit telemetry...")
288-
logger.info(TELEMETRY_OPT_OUT_MESSAGING)
289290
response = None
290291
caught_ex = None
291292
studio_app_type = process_studio_metadata_file()
@@ -299,6 +300,10 @@ def wrapper(*args, **kwargs):
299300
)
300301
logger.debug("TelemetryOptOut flag is set to: %s", telemetry_opt_out_flag)
301302

303+
if not telemetry_opt_out_flag and not _telemetry_msg_shown:
304+
logger.info(TELEMETRY_OPT_OUT_MESSAGING)
305+
_telemetry_msg_shown = True
306+
302307
# Construct the feature list to track feature combinations
303308
feature_list: List[int] = [FEATURE_TO_CODE[str(feature)]]
304309

‎sagemaker-core/src/sagemaker/core/utils/utils.py‎

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class SageMakerClient(metaclass=SingletonMeta):
340340

341341
@classmethod
342342
def reset(cls):
343-
"""Reset the singleton instance so the next call re-reads env vars."""
343+
"""Reset the singleton instance."""
344344
SingletonMeta._instances.pop(cls, None)
345345

346346
def __init__(
@@ -368,49 +368,12 @@ def __init__(
368368
self.config = Config(user_agent_extra=get_user_agent_extra_suffix())
369369
self.session = session
370370
self.region_name = region_name
371-
# Read region from environment variable, default to us-west-2
372-
import os
373-
env_region = os.environ.get('SAGEMAKER_REGION', region_name)
374-
env_stage = os.environ.get('SAGEMAKER_STAGE', 'prod') # default to gamma
375-
logger.info(f"Runs on sagemaker {env_stage}, region:{env_region}")
376-
377-
endpoint_url = os.environ.get('SAGEMAKER_ENDPOINT')
378-
runtime_endpoint_url = os.environ.get('SAGEMAKER_RUNTIME_ENDPOINT')
379-
380-
# TODO: Remove post-launch. This loads a custom botocore service model
381-
# (from the 'sample/' directory) that includes pre-GA Job APIs
382-
# (CreateJob, DescribeJob, ListJobs, etc.) not yet in the public
383-
# botocore release. Once these APIs ship in the official botocore
384-
# service-2.json, this custom loader is unnecessary and the standard
385-
# session.client("sagemaker", endpoint_url=...) path will work.
386-
import botocore.loaders
387-
import botocore.session as bc_session_mod
388-
import pathlib
389-
390-
# Look for bundled service model inside the package first,
391-
# fall back to source-tree layout (sample/ as sibling of src/)
392-
_bundled = pathlib.Path(__file__).resolve().parent.parent / "data" / "sample"
393-
_source_tree = pathlib.Path(__file__).resolve().parent.parent.parent.parent.parent / "sample"
394-
sample_model_dir = str(_bundled if _bundled.exists() else _source_tree)
395-
bc_session = bc_session_mod.get_session()
396-
loader = botocore.loaders.Loader(
397-
extra_search_paths=[sample_model_dir],
398-
include_default_search_paths=True,
399-
)
400-
bc_session.register_component('data_loader', loader)
401-
custom_session = Session(botocore_session=bc_session, region_name=env_region)
402-
403-
self.sagemaker_client = custom_session.client(
404-
"sagemaker",
405-
region_name=env_region,
406-
endpoint_url=endpoint_url,
407-
config=self.config,
408-
)
409371

372+
self.sagemaker_client = session.client(
373+
"sagemaker", region_name, config=self.config
374+
)
410375
self.sagemaker_runtime_client = session.client(
411-
"sagemaker-runtime", region_name,
412-
endpoint_url=runtime_endpoint_url,
413-
config=self.config,
376+
"sagemaker-runtime", region_name, config=self.config
414377
)
415378
self.sagemaker_featurestore_runtime_client = session.client(
416379
"sagemaker-featurestore-runtime", region_name, config=self.config

‎sagemaker-core/tests/unit/telemetry/test_telemetry_logging.py‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,3 +647,57 @@ def train(self):
647647
self.assertIn(15, feature_list) # MODEL_CUSTOMIZATION still present
648648
self.assertNotIn(19, feature_list) # No NOVA (detection failed gracefully)
649649
self.assertNotIn(20, feature_list) # No OSS
650+
651+
@patch("sagemaker.core.telemetry.telemetry_logging._send_telemetry_request")
652+
@patch("sagemaker.core.telemetry.telemetry_logging.resolve_value_from_config")
653+
def test_telemetry_opt_out_message_shown_only_once(
654+
self, mock_resolve_config, mock_send_telemetry_request
655+
):
656+
"""Test that the telemetry opt-out INFO message is logged only once per process."""
657+
import sagemaker.core.telemetry.telemetry_logging as telemetry_module
658+
659+
mock_resolve_config.return_value = False
660+
# Reset the flag to simulate a fresh process
661+
telemetry_module._telemetry_msg_shown = False
662+
663+
mock_local_client = LocalSagemakerClientMock()
664+
665+
with patch.object(telemetry_module.logger, "info") as mock_logger_info:
666+
mock_local_client.mock_create_model()
667+
mock_local_client.mock_create_model()
668+
mock_local_client.mock_create_model()
669+
670+
info_calls = [
671+
call for call in mock_logger_info.call_args_list
672+
if "telemetry" in str(call).lower() and "opt out" in str(call).lower()
673+
]
674+
self.assertEqual(len(info_calls), 1, "Telemetry opt-out message should be logged exactly once")
675+
676+
# Reset the flag for other tests
677+
telemetry_module._telemetry_msg_shown = False
678+
679+
@patch("sagemaker.core.telemetry.telemetry_logging._send_telemetry_request")
680+
@patch("sagemaker.core.telemetry.telemetry_logging.resolve_value_from_config")
681+
def test_telemetry_opt_out_message_not_shown_when_opted_out(
682+
self, mock_resolve_config, mock_send_telemetry_request
683+
):
684+
"""Test that the telemetry opt-out INFO message is not shown when user has opted out."""
685+
import sagemaker.core.telemetry.telemetry_logging as telemetry_module
686+
687+
mock_resolve_config.return_value = True # opted out
688+
# Reset the flag to simulate a fresh process
689+
telemetry_module._telemetry_msg_shown = False
690+
691+
mock_local_client = LocalSagemakerClientMock()
692+
693+
with patch.object(telemetry_module.logger, "info") as mock_logger_info:
694+
mock_local_client.mock_create_model()
695+
696+
info_calls = [
697+
call for call in mock_logger_info.call_args_list
698+
if "telemetry" in str(call).lower() and "opt out" in str(call).lower()
699+
]
700+
self.assertEqual(len(info_calls), 0, "Telemetry opt-out message should not appear when opted out")
701+
702+
# Reset the flag for other tests
703+
telemetry_module._telemetry_msg_shown = False

0 commit comments

Comments
 (0)