feat: support config_name in all JumpStart interfaces#4583

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
liujiaorr merged 12 commits into from
Apr 22, 2024
Merged

feat: support config_name in all JumpStart interfaces #4583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a576415
add-config-name
haotiaa Apr 16, 2024
e8e4a0b
address comments
haotiaa Apr 17, 2024
b49576b
updates for set config
haotiaa Apr 17, 2024
111a85e
Merge branch 'master' into config-name-support
Captainia Apr 17, 2024
974ab06
docstyle
haotiaa Apr 17, 2024
825c1d2
updates
haotiaa Apr 18, 2024
34890f1
Merge branch 'master' into config-name-support
Captainia Apr 18, 2024
8cedbdc
fix
haotiaa Apr 19, 2024
b71946f
Merge branch 'master' into config-name-support
Captainia Apr 19, 2024
eef6819
format
haotiaa Apr 19, 2024
d8462a5
format
haotiaa Apr 19, 2024
d5e50b8
remove tests
haotiaa Apr 21, 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
3 changes: 3 additions & 0 deletions src/sagemaker/accept_types.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
config_name: Optional[str] = None,

@evakravievakraviApr 17, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.

) -> str:
"""Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

@evakravievakraviApr 20, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this

Returns:
str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
model_type=model_type,
config_name=config_name,
)
3 changes: 3 additions & 0 deletions src/sagemaker/content_types.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
config_name: Optional[str] = None,
) -> str:
"""Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
model_type=model_type,
config_name=config_name,
)


Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/deserializers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
config_name: Optional[str] = None,
) -> BaseDeserializer:
"""Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
model_type=model_type,
config_name=config_name,
)
3 changes: 3 additions & 0 deletions src/sagemaker/environment_variables.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
config_name: Optional[str] = None,
) -> Dict[str, str]:
"""Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
variables specific for the instance type.
script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
variables.
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
sagemaker_session=sagemaker_session,
instance_type=instance_type,
script=script,
config_name=config_name,
)
3 changes: 3 additions & 0 deletions src/sagemaker/hyperparameters.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
config_name: Optional[str] = None,
) -> Dict[str, str]:
"""Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)


Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/image_uris.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
inference_tool=None,
serverless_inference_config=None,
sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
config_name=None,
) -> str:
"""Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

Returns:
str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
tolerate_vulnerable_model,
tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/instance_types.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
training_instance_type: Optional[str] = None,
model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
config_name: Optional[str] = None,
) -> str:
"""Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
Optionally supply this to get a inference instance type conditioned
on the training instance, to ensure compatability of training artifact to inference
instance. (Default: None).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
sagemaker_session=sagemaker_session,
training_instance_type=training_instance_type,
model_type=model_type,
config_name=config_name,
)


Expand Down
7 changes: 7 additions & 0 deletions src/sagemaker/jumpstart/artifacts/environment_variables.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
config_name: Optional[str] = None,
) -> Dict[str, str]:
"""Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
environment variables specific for the instance type.
script (JumpStartScriptScope): The JumpStart script for which to retrieve
environment variables.
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
dict: the inference environment variables to use for the model.
"""
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
instance_type=instance_type,
config_name=config_name,
)
)

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
config_name: Optional[str] = None,
) -> Optional[str]:
"""Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get
environment variables specific for the instance type.
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

Returns:
Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

s3_key: Optional[str] = (
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/artifacts/hyperparameters.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
instance_type: Optional[str] = None,
config_name: Optional[str] = None,
):
"""Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
instance_type (str): An instance type to optionally supply in order to get hyperparameters
specific for the instance type.
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
dict: the hyperparameters to use for the model.
"""
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

default_hyperparameters: Dict[str, str] = {}
Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/artifacts/image_uris.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
config_name: Optional[str] = None,
):
"""Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
distribution=distribution,
base_framework_version=base_framework_version_override or base_framework_version,
training_compiler_config=training_compiler_config,
config_name=config_name,
)
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/artifacts/incremental_training.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
tolerate_vulnerable_model: bool = False,
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
config_name: Optional[str] = None,
) -> bool:
"""Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
object, used for SageMaker interactions. If not
specified, one is created using the default AWS configuration
chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
bool: the support status for incremental training.
"""
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

return model_specs.supports_incremental_training()
6 changes: 6 additions & 0 deletions src/sagemaker/jumpstart/artifacts/instance_types.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
training_instance_type: Optional[str] = None,
model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
config_name: Optional[str] = None,
) -> str:
"""Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
Optionally supply this to get a inference instance type conditioned
on the training instance, to ensure compatability of training artifact to inference
instance. (Default: None).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
tolerate_deprecated_model=tolerate_deprecated_model,
model_type=model_type,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
tolerate_deprecated_model: bool = False,
sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
training_instance_type: Optional[str] = None,
config_name: Optional[str] = None,
) -> List[str]:
"""Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
Optionally supply this to get a inference instance type conditioned
on the training instance, to ensure compatability of training artifact to inference
instance. (Default: None).
config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
Returns:
list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
tolerate_vulnerable_model=tolerate_vulnerable_model,
tolerate_deprecated_model=tolerate_deprecated_model,
sagemaker_session=sagemaker_session,
config_name=config_name,
)

if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
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
feat: support config_name in all JumpStart interfaces#4583

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

liujiaorr
merged 12 commits into

from

Apr 22, 2024
 Merged


feat: support config_name in all JumpStart interfaces
#4583
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a576415

add-config-name


haotiaa Apr 16, 2024
e8e4a0b

address comments


haotiaa Apr 17, 2024
b49576b

updates for set config


haotiaa Apr 17, 2024
111a85e

Merge branch 'master' into config-name-support


Captainia Apr 17, 2024
974ab06

docstyle


haotiaa Apr 17, 2024
825c1d2

updates


haotiaa Apr 18, 2024
34890f1

Merge branch 'master' into config-name-support


Captainia Apr 18, 2024
8cedbdc

fix


haotiaa Apr 19, 2024
b71946f

Merge branch 'master' into config-name-support


Captainia Apr 19, 2024
eef6819

format


haotiaa Apr 19, 2024
d8462a5

format


haotiaa Apr 19, 2024
d5e50b8

remove tests


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


3 changes: 3 additions & 0 deletions
src/sagemaker/accept_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
@evakravievakraviApr 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should think of a way to consolidate all these JS related fields perhaps into a dataclass or kwargs, so we don't need to update all these function prototypes whenever a new feature is added.
) -> str:
 """Retrieves the default accept type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
@evakravievakraviApr 20, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with @judyheflin about how to describe this
 Returns:
 str: The default accept type to use for the model.

Expand All@@ -117,4 +119,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/content_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default content type for the model matching the given arguments.

Expand All@@ -98,6 +99,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default content type to use for the model.

Expand All@@ -117,6 +119,7 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/deserializers.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,6 +97,7 @@ def retrieve_default(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> BaseDeserializer:
 """Retrieves the default deserializer for the model matching the given arguments.

Expand All@@ -118,6 +119,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 BaseDeserializer: The default deserializer to use for the model.

Expand All@@ -138,4 +140,5 @@ def retrieve_default(
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 model_type=model_type,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default container environment variables for the model matching the arguments.

Expand DownExpand Up@@ -65,6 +66,7 @@ def retrieve_default(
 variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve environment
 variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The variables to use for the model.

Expand All@@ -87,4 +89,5 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 script=script,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the default training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def retrieve_default(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: The hyperparameters to use for the model.

Expand All@@ -86,6 +88,7 @@ def retrieve_default(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )


Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ def retrieve(
 inference_tool=None,
 serverless_inference_config=None,
 sagemaker_session=DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name=None,
) -> str:
 """Retrieves the ECR URI for the Docker image matching the given arguments.

Expand DownExpand Up@@ -121,6 +122,7 @@ def retrieve(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 str: The ECR URI for the corresponding SageMaker Docker image.
Expand DownExpand Up@@ -160,6 +162,7 @@ def retrieve(
 tolerate_vulnerable_model,
 tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if training_compiler_config and (framework in [HUGGING_FACE_FRAMEWORK, "pytorch"]):
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def retrieve_default(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model matching the given arguments.

Expand DownExpand Up@@ -64,6 +65,7 @@ def retrieve_default(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: The default instance type to use for the model.

Expand All@@ -88,6 +90,7 @@ def retrieve_default(
 sagemaker_session=sagemaker_session,
 training_instance_type=training_instance_type,
 model_type=model_type,
 config_name=config_name,
 )


Expand Down

7 changes: 7 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/environment_variables.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ def _retrieve_default_environment_variables(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 script: JumpStartScriptScope = JumpStartScriptScope.INFERENCE,
 config_name: Optional[str] = None,
) -> Dict[str, str]:
 """Retrieves the inference environment variables for the model matching the given arguments.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_environment_variables(
 environment variables specific for the instance type.
 script (JumpStartScriptScope): The JumpStart script for which to retrieve
 environment variables.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the inference environment variables to use for the model.
 """
Expand All@@ -84,6 +86,7 @@ def _retrieve_default_environment_variables(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_environment_variables: Dict[str, str] = {}
Expand DownExpand Up@@ -121,6 +124,7 @@ def _retrieve_default_environment_variables(
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 instance_type=instance_type,
 config_name=config_name,
 )
 )

Expand DownExpand Up@@ -167,6 +171,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> Optional[str]:
 """Retrieves the gated model env var URI matching the given arguments.

Expand All@@ -190,6 +195,7 @@ def _retrieve_gated_model_uri_env_var_value(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get
 environment variables specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).

 Returns:
 Optional[str]: the s3 URI to use for the environment variable, or None if the model does not
Expand All@@ -211,6 +217,7 @@ def _retrieve_gated_model_uri_env_var_value(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 s3_key: Optional[str] = (
Expand Down

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/hyperparameters.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ def _retrieve_default_hyperparameters(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
):
 """Retrieves the training hyperparameters for the model matching the given arguments.

Expand DownExpand Up@@ -66,6 +67,7 @@ def _retrieve_default_hyperparameters(
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 instance_type (str): An instance type to optionally supply in order to get hyperparameters
 specific for the instance type.
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 dict: the hyperparameters to use for the model.
 """
Expand All@@ -82,6 +84,7 @@ def _retrieve_default_hyperparameters(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 default_hyperparameters: Dict[str, str] = {}
Expand Down

4 changes: 4 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
):
 """Retrieves the container image URI for JumpStart models.

Expand DownExpand Up@@ -95,6 +96,7 @@ def _retrieve_image_uri(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the ECR URI for the corresponding SageMaker Docker image.

Expand All@@ -116,6 +118,7 @@ def _retrieve_image_uri(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if image_scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -200,4 +203,5 @@ def _retrieve_image_uri(
 distribution=distribution,
 base_framework_version=base_framework_version_override or base_framework_version,
 training_compiler_config=training_compiler_config,
 config_name=config_name,
 )

3 changes: 3 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/incremental_training.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model: bool = False,
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 config_name: Optional[str] = None,
) -> bool:
 """Returns True if the model supports incremental training.

Expand All@@ -54,6 +55,7 @@ def _model_supports_incremental_training(
 object, used for SageMaker interactions. If not
 specified, one is created using the default AWS configuration
 chain. (Default: sagemaker.jumpstart.constants.DEFAULT_JUMPSTART_SAGEMAKER_SESSION).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 bool: the support status for incremental training.
 """
Expand All@@ -70,6 +72,7 @@ def _model_supports_incremental_training(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 return model_specs.supports_incremental_training()

6 changes: 6 additions & 0 deletions
src/sagemaker/jumpstart/artifacts/instance_types.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ def _retrieve_default_instance_type(
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 model_type: JumpStartModelType = JumpStartModelType.OPEN_WEIGHTS,
 config_name: Optional[str] = None,
) -> str:
 """Retrieves the default instance type for the model.

Expand DownExpand Up@@ -68,6 +69,7 @@ def _retrieve_default_instance_type(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 str: the default instance type to use for the model or None.

Expand All@@ -89,6 +91,7 @@ def _retrieve_default_instance_type(
 tolerate_deprecated_model=tolerate_deprecated_model,
 model_type=model_type,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand DownExpand Up@@ -128,6 +131,7 @@ def _retrieve_instance_types(
 tolerate_deprecated_model: bool = False,
 sagemaker_session: Session = DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
 training_instance_type: Optional[str] = None,
 config_name: Optional[str] = None,
) -> List[str]:
 """Retrieves the supported instance types for the model.

Expand DownExpand Up@@ -156,6 +160,7 @@ def _retrieve_instance_types(
 Optionally supply this to get a inference instance type conditioned
 on the training instance, to ensure compatability of training artifact to inference
 instance. (Default: None).
 config_name (Optional[str]): Name of the JumpStart Model config to apply. (Default: None).
 Returns:
 list: the supported instance types to use for the model or None.

Expand All@@ -176,6 +181,7 @@ def _retrieve_instance_types(
 tolerate_vulnerable_model=tolerate_vulnerable_model,
 tolerate_deprecated_model=tolerate_deprecated_model,
 sagemaker_session=sagemaker_session,
 config_name=config_name,
 )

 if scope == JumpStartScriptScope.INFERENCE:
Expand Down
Loading