Use separate tags for inference and training configs#4635

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

Merged
zhaoqizqwang merged 6 commits into from
Apr 30, 2024
Merged

Use separate tags for inference and training configs #4635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b85558e
Use separate tags for inference and training
haotiaa Apr 30, 2024
d51a701
Merge branch 'master-benchmark-feature' into config-tags
Captainia Apr 30, 2024
d6d2304
format
haotiaa Apr 30, 2024
dcad44b
format
haotiaa Apr 30, 2024
b533d66
format
haotiaa Apr 30, 2024
52153ff
format
haotiaa Apr 30, 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
4 changes: 3 additions & 1 deletion src/sagemaker/jumpstart/enums.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down
6 changes: 4 additions & 2 deletions src/sagemaker/jumpstart/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
config_name = None
if model_id is None:

model_id, model_version, config_name = get_model_info_from_training_job(
model_id, model_version, _, config_name = get_model_info_from_training_job(
training_job_name=training_job_name, sagemaker_session=sagemaker_session
)

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
Args:
config_name (str): The name of the config.
"""
self.__init__(**self.init_kwargs, config_name=config_name)
self.__init__(
model_id=self.model_id, model_version=self.model_version, config_name=config_name
)

def __str__(self) -> str:
"""Overriding str(*) method to make more human-readable."""
Expand Down
5 changes: 3 additions & 2 deletions src/sagemaker/jumpstart/factory/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
get_eula_message,
update_dict_if_key_not_present,
resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
).version

if kwargs.sagemaker_session.settings.include_jumpstart_tags:
kwargs.tags = add_jumpstart_model_id_version_tags(
kwargs.tags = add_jumpstart_model_info_tags(
kwargs.tags,
kwargs.model_id,
full_model_version,
config_name=kwargs.config_name,
scope=JumpStartScriptScope.TRAINING,
)
return kwargs

Expand Down
11 changes: 8 additions & 3 deletions src/sagemaker/jumpstart/factory/model.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
update_dict_if_key_not_present,
resolve_model_sagemaker_config_field,
verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
).version

if kwargs.sagemaker_session.settings.include_jumpstart_tags:
kwargs.tags = add_jumpstart_model_id_version_tags(
kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
kwargs.tags = add_jumpstart_model_info_tags(
kwargs.tags,
kwargs.model_id,
full_model_version,
kwargs.model_type,
config_name=kwargs.config_name,
scope=JumpStartScriptScope.INFERENCE,
)

return kwargs
Expand Down
58 changes: 39 additions & 19 deletions src/sagemaker/jumpstart/session_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
endpoint_name: str,
inference_component_name: Optional[str] = None,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
"""Optionally inference component names, return the model ID, version and config name.

Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
(
model_id,
model_version,
config_name,
inference_config_name,
training_config_name,
) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
inference_component_name, sagemaker_session
)
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
(
model_id,
model_version,
config_name,
inference_config_name,
training_config_name,
inference_component_name,
) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
endpoint_name, sagemaker_session
)

else:
model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
(
model_id,
model_version,
inference_config_name,
training_config_name,
) = _get_model_info_from_model_based_endpoint(
endpoint_name, inference_component_name, sagemaker_session
)
return model_id, model_version, inference_component_name, config_name
return (
model_id,
model_version,
inference_component_name,
inference_config_name,
training_config_name,
)


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
f"inference-component/{inference_component_name}"
)

model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
inference_component_arn, sagemaker_session
)
(
model_id,
model_version,
inference_config_name,
training_config_name,
) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

if not model_id:
raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
"when retrieving default predictor for this inference component."
)

return model_id, model_version, config_name
return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
endpoint_name: str,
inference_component_name: Optional[str],
sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
"""Returns the model ID, version and config name inferred from a model-based endpoint.

Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
endpoint_arn, sagemaker_session
)
(
model_id,
model_version,
inference_config_name,
training_config_name,
) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

if not model_id:
raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
"predictor for this endpoint."
)

return model_id, model_version, config_name
return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
training_job_name: str,
sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
"""Returns the model ID and version and config name inferred from a training job.

Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
(
model_id,
inferred_model_version,
config_name,
) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
inference_config_name,
trainig_config_name,
) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
"for this training job."
)

return model_id, model_version, config_name
return model_id, model_version, inference_config_name, trainig_config_name
39 changes: 28 additions & 11 deletions src/sagemaker/jumpstart/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
)
if is_uri
else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
tags: Optional[List[TagsDict]],
model_id: str,
model_version: str,
model_type: Optional[enums.JumpStartModelType] = None,
config_name: Optional[str] = None,
scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
"""Add custom model ID and version tags to JumpStart related resources."""
if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
tags,
is_uri=False,
)
if config_name:
if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
tags = add_single_jumpstart_tag(
config_name,
enums.JumpStartTag.MODEL_CONFIG_NAME,
enums.JumpStartTag.INFERENCE_CONFIG_NAME,
tags,
is_uri=False,
)
if config_name and scope == enums.JumpStartScriptScope.TRAINING:
tags = add_single_jumpstart_tag(
config_name,
enums.JumpStartTag.TRAINING_CONFIG_NAME,
tags,
is_uri=False,
)
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
resource_arn: str,
sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
"""Returns the JumpStart model ID, version and config name if in resource tags.

Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

model_id: Optional[str] = _extract_value_from_list_of_tags(
tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
resource_arn=resource_arn,
)

config_name: Optional[str] = _extract_value_from_list_of_tags(
tag_keys=model_config_name_keys,
inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
tag_keys=inference_config_name_keys,
list_tags_result=list_tags_result,
resource_name="inference config name",
resource_arn=resource_arn,
)

training_config_name: Optional[str] = _extract_value_from_list_of_tags(
tag_keys=training_config_name_keys,
list_tags_result=list_tags_result,
resource_name="model config name",
resource_name="training config name",
resource_arn=resource_arn,
)

return model_id, model_version, config_name
return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down
1 change: 1 addition & 0 deletions src/sagemaker/predictor.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
inferred_model_version,
inferred_inference_component_name,
inferred_config_name,
_,
) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

if not inferred_model_id:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Use separate tags for inference and training configs#4635

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

 Merged

zhaoqizqwang
merged 6 commits into

from

Apr 30, 2024
 Merged


Use separate tags for inference and training configs
#4635
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b85558e

Use separate tags for inference and training


haotiaa Apr 30, 2024
d51a701

Merge branch 'master-benchmark-feature' into config-tags


Captainia Apr 30, 2024
d6d2304

format


haotiaa Apr 30, 2024
dcad44b

format


haotiaa Apr 30, 2024
b533d66

format


haotiaa Apr 30, 2024
52153ff

format


haotiaa Apr 30, 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


4 changes: 3 additions & 1 deletion
src/sagemaker/jumpstart/enums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,9 @@ class JumpStartTag(str, Enum):
 MODEL_ID = "sagemaker-sdk:jumpstart-model-id"
 MODEL_VERSION = "sagemaker-sdk:jumpstart-model-version"
 MODEL_TYPE = "sagemaker-sdk:jumpstart-model-type"
 MODEL_CONFIG_NAME = "sagemaker-sdk:jumpstart-model-config-name"

 INFERENCE_CONFIG_NAME = "sagemaker-sdk:jumpstart-inference-config-name"
 TRAINING_CONFIG_NAME = "sagemaker-sdk:jumpstart-training-config-name"


class SerializerType(str, Enum):
Expand Down

6 changes: 4 additions & 2 deletions
src/sagemaker/jumpstart/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -733,7 +733,7 @@ def attach(
 config_name = None
 if model_id is None:

 model_id, model_version, config_name = get_model_info_from_training_job(
 model_id, model_version, _, config_name = get_model_info_from_training_job(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )

Expand DownExpand Up@@ -1139,7 +1139,9 @@ def set_training_config(self, config_name: str) -> None:
 Args:
 config_name (str): The name of the config.
 """
 self.__init__(**self.init_kwargs, config_name=config_name)
 self.__init__(
 model_id=self.model_id, model_version=self.model_version, config_name=config_name
 )

 def __str__(self) -> str:
 """Overriding str(*) method to make more human-readable."""
Expand Down

5 changes: 3 additions & 2 deletions
src/sagemaker/jumpstart/factory/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
 JumpStartModelInitKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 get_eula_message,
 update_dict_if_key_not_present,
 resolve_estimator_sagemaker_config_field,
Expand DownExpand Up@@ -477,11 +477,12 @@ def _add_tags_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstima
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.TRAINING,
 )
 return kwargs

Expand Down

11 changes: 8 additions & 3 deletions
src/sagemaker/jumpstart/factory/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
 JumpStartModelRegisterKwargs,
)
from sagemaker.jumpstart.utils import (
add_jumpstart_model_id_version_tags,
add_jumpstart_model_info_tags,
 update_dict_if_key_not_present,
 resolve_model_sagemaker_config_field,
 verify_model_region_and_return_specs,
Expand DownExpand Up@@ -495,8 +495,13 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
 ).version

 if kwargs.sagemaker_session.settings.include_jumpstart_tags:
 kwargs.tags = add_jumpstart_model_id_version_tags(
 kwargs.tags, kwargs.model_id, full_model_version, kwargs.model_type, kwargs.config_name
 kwargs.tags = add_jumpstart_model_info_tags(
 kwargs.tags,
 kwargs.model_id,
 full_model_version,
 kwargs.model_type,
 config_name=kwargs.config_name,
 scope=JumpStartScriptScope.INFERENCE,
 )

 return kwargs
Expand Down

58 changes: 39 additions & 19 deletions
src/sagemaker/jumpstart/session_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
from typing import Optional, Tuple
from sagemaker.jumpstart.constants import DEFAULT_JUMPSTART_SAGEMAKER_SESSION

from sagemaker.jumpstart.utils import get_jumpstart_model_id_version_from_resource_arn
from sagemaker.jumpstart.utils import get_jumpstart_model_info_from_resource_arn
from sagemaker.session import Session
from sagemaker.utils import aws_partition

Expand All@@ -26,7 +26,7 @@ def get_model_info_from_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str] = None,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str], Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str], Optional[str]]:
 """Optionally inference component names, return the model ID, version and config name.

 Infers the model ID and version based on the resource tags. Returns a tuple of the model ID
Expand All@@ -46,7 +46,8 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_inference_component_endpoint_with_inference_component_name( # noqa E501 # pylint: disable=c0301
 inference_component_name, sagemaker_session
 )
Expand All@@ -55,17 +56,29 @@ def get_model_info_from_endpoint(
 (
 model_id,
 model_version,
 config_name,
 inference_config_name,
 training_config_name,
 inference_component_name,
 ) = _get_model_info_from_inference_component_endpoint_without_inference_component_name( # noqa E501 # pylint: disable=c0301
 endpoint_name, sagemaker_session
 )

 else:
 model_id, model_version, config_name = _get_model_info_from_model_based_endpoint(
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = _get_model_info_from_model_based_endpoint(
 endpoint_name, inference_component_name, sagemaker_session
 )
 return model_id, model_version, inference_component_name, config_name
 return (
 model_id,
 model_version,
 inference_component_name,
 inference_config_name,
 training_config_name,
 )


def _get_model_info_from_inference_component_endpoint_without_inference_component_name(
Expand DownExpand Up@@ -125,9 +138,12 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 f"inference-component/{inference_component_name}"
 )

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 inference_component_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(inference_component_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -136,14 +152,14 @@ def _get_model_info_from_inference_component_endpoint_with_inference_component_n
 "when retrieving default predictor for this inference component."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def _get_model_info_from_model_based_endpoint(
 endpoint_name: str,
 inference_component_name: Optional[str],
 sagemaker_session: Session,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID, version and config name inferred from a model-based endpoint.

 Raises:
Expand All@@ -163,9 +179,12 @@ def _get_model_info_from_model_based_endpoint(

 endpoint_arn = f"arn:{partition}:sagemaker:{region}:{account_id}:endpoint/{endpoint_name}"

 model_id, model_version, config_name = get_jumpstart_model_id_version_from_resource_arn(
 endpoint_arn, sagemaker_session
 )
 (
 model_id,
 model_version,
 inference_config_name,
 training_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(endpoint_arn, sagemaker_session)

 if not model_id:
 raise ValueError(
Expand All@@ -174,13 +193,13 @@ def _get_model_info_from_model_based_endpoint(
 "predictor for this endpoint."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_model_info_from_training_job(
 training_job_name: str,
 sagemaker_session: Optional[Session] = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[str, str, Optional[str]]:
) -> Tuple[str, str, Optional[str], Optional[str]]:
 """Returns the model ID and version and config name inferred from a training job.

 Raises:
Expand All@@ -199,8 +218,9 @@ def get_model_info_from_training_job(
 (
 model_id,
 inferred_model_version,
 config_name,
 ) = get_jumpstart_model_id_version_from_resource_arn(training_job_arn, sagemaker_session)
 inference_config_name,
 trainig_config_name,
 ) = get_jumpstart_model_info_from_resource_arn(training_job_arn, sagemaker_session)

 model_version = inferred_model_version or None

Expand All@@ -211,4 +231,4 @@ def get_model_info_from_training_job(
 "for this training job."
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, trainig_config_name

39 changes: 28 additions & 11 deletions
src/sagemaker/jumpstart/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,7 +320,8 @@ def add_single_jumpstart_tag(
 tag_key_in_array(enums.JumpStartTag.MODEL_ID, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_VERSION, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_TYPE, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.MODEL_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.INFERENCE_CONFIG_NAME, curr_tags)
 or tag_key_in_array(enums.JumpStartTag.TRAINING_CONFIG_NAME, curr_tags)
 )
 if is_uri
 else False
Expand DownExpand Up@@ -351,12 +352,13 @@ def get_jumpstart_base_name_if_jumpstart_model(
 return None


def add_jumpstart_model_id_version_tags(
def add_jumpstart_model_info_tags(
 tags: Optional[List[TagsDict]],
 model_id: str,
 model_version: str,
 model_type: Optional[enums.JumpStartModelType] = None,
 config_name: Optional[str] = None,
 scope: enums.JumpStartScriptScope = None,
) -> List[TagsDict]:
 """Add custom model ID and version tags to JumpStart related resources."""
 if model_id is None or model_version is None:
Expand All@@ -380,10 +382,17 @@ def add_jumpstart_model_id_version_tags(
 tags,
 is_uri=False,
 )
 if config_name:
 if config_name and scope == enums.JumpStartScriptScope.INFERENCE:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.MODEL_CONFIG_NAME,
 enums.JumpStartTag.INFERENCE_CONFIG_NAME,
 tags,
 is_uri=False,
 )
 if config_name and scope == enums.JumpStartScriptScope.TRAINING:
 tags = add_single_jumpstart_tag(
 config_name,
 enums.JumpStartTag.TRAINING_CONFIG_NAME,
 tags,
 is_uri=False,
 )
Expand DownExpand Up@@ -840,10 +849,10 @@ def _extract_value_from_list_of_tags(
 return resolved_value


def get_jumpstart_model_id_version_from_resource_arn(
def get_jumpstart_model_info_from_resource_arn(
 resource_arn: str,
 sagemaker_session: Session = constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
 """Returns the JumpStart model ID, version and config name if in resource tags.

 Returns 'None' if model ID or version or config name cannot be inferred from tags.
Expand All@@ -853,7 +862,8 @@ def get_jumpstart_model_id_version_from_resource_arn(

 model_id_keys = [enums.JumpStartTag.MODEL_ID, *constants.EXTRA_MODEL_ID_TAGS]
 model_version_keys = [enums.JumpStartTag.MODEL_VERSION, *constants.EXTRA_MODEL_VERSION_TAGS]
 model_config_name_keys = [enums.JumpStartTag.MODEL_CONFIG_NAME]
 inference_config_name_keys = [enums.JumpStartTag.INFERENCE_CONFIG_NAME]
 training_config_name_keys = [enums.JumpStartTag.TRAINING_CONFIG_NAME]

 model_id: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_id_keys,
Expand All@@ -869,14 +879,21 @@ def get_jumpstart_model_id_version_from_resource_arn(
 resource_arn=resource_arn,
 )

 config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=model_config_name_keys,
 inference_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=inference_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="inference config name",
 resource_arn=resource_arn,
 )

 training_config_name: Optional[str] = _extract_value_from_list_of_tags(
 tag_keys=training_config_name_keys,
 list_tags_result=list_tags_result,
 resource_name="model config name",
 resource_name="training config name",
 resource_arn=resource_arn,
 )

 return model_id, model_version, config_name
 return model_id, model_version, inference_config_name, training_config_name


def get_region_fallback(
Expand Down

1 change: 1 addition & 0 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ def retrieve_default(
 inferred_model_version,
 inferred_inference_component_name,
 inferred_config_name,
 _,
 ) = get_model_info_from_endpoint(endpoint_name, inference_component_name, sagemaker_session)

 if not inferred_model_id:
Expand Down
Loading