fix: Adding more fields

Author: chrstfu

src/sagemaker/jumpstart/factory/model.py

@@ -489,7 +489,7 @@ def _add_tags_to_kwargs(kwargs: JumpStartModelDeployKwargs) -> Dict[str, Any]:
             )
         kwargs.tags = add_hub_content_arn_tags(kwargs.tags, hub_content_arn=hub_content_arn)
 
-    if hasattr(kwargs.specs, "capabilities"):
+    if kwargs.specs.capabilities is not None:
       if HubContentCapability.BEDROCK_CONSOLE in kwargs.specs.capabilities:
         kwargs.tags = add_bedrock_store_tags(kwargs.tags, compatibility="compatible")
 

src/sagemaker/jumpstart/hub/interfaces.py

@@ -551,17 +551,17 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
             json_obj (Dict[str, Any]): Dictionary representation of hub model document.
         """
         self.url: str = json_obj["Url"]
-        self.min_sdk_version: str = json_obj["MinSdkVersion"]
-        self.hosting_ecr_uri: Optional[str] = json_obj["HostingEcrUri"]
-        self.hosting_artifact_uri = json_obj["HostingArtifactUri"]
-        self.hosting_script_uri = json_obj["HostingScriptUri"]
-        self.inference_dependencies: List[str] = json_obj["InferenceDependencies"]
+        self.min_sdk_version: str = json_obj.get("MinSdkVersion")
+        self.hosting_ecr_uri: Optional[str] = json_obj.get("HostingEcrUri")
+        self.hosting_artifact_uri = json_obj.get("HostingArtifactUri")
+        self.hosting_script_uri = json_obj.get("HostingScriptUri")
+        self.inference_dependencies: List[str] = json_obj.get("InferenceDependencies")
         self.inference_environment_variables: List[JumpStartEnvironmentVariable] = [
             JumpStartEnvironmentVariable(env_variable, is_hub_content=True)
-            for env_variable in json_obj["InferenceEnvironmentVariables"]
+            for env_variable in json_obj.get("InferenceEnvironmentVariables", [])
         ]
-        self.training_supported: bool = bool(json_obj["TrainingSupported"])
-        self.incremental_training_supported: bool = bool(json_obj["IncrementalTrainingSupported"])
+        self.training_supported: bool = bool(json_obj.get("TrainingSupported"))
+        self.incremental_training_supported: bool = bool(json_obj.get("IncrementalTrainingSupported"))
         self.dynamic_container_deployment_supported: Optional[bool] = (
             bool(json_obj.get("DynamicContainerDeploymentSupported"))
             if json_obj.get("DynamicContainerDeploymentSupported")

src/sagemaker/jumpstart/hub/parser_utils.py

@@ -20,11 +20,7 @@
 
 def camel_to_snake(camel_case_string: str) -> str:
     """Converts camelCaseString or UpperCamelCaseString to snake_case_string."""
-    snake_case_string = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", camel_case_string)
-    if "-" in snake_case_string:
-        # remove any hyphen from the string for accurate conversion.
-        snake_case_string = snake_case_string.replace("-", "")
-    return re.sub("([a-z0-9])([A-Z])", r"\1_\2", snake_case_string).lower()
+    return re.sub(r'(?<!^)(?=[A-Z])', '_', camel_case_string).lower()
 
 
 def snake_to_upper_camel(snake_case_string: str) -> str:

src/sagemaker/jumpstart/hub/parsers.py

@@ -146,15 +146,19 @@ def make_model_specs_from_describe_hub_content_response(
     specs["inference_config_components"] = hub_model_document.inference_config_components
     specs["inference_config_rankings"] = hub_model_document.inference_config_rankings
 
-    hosting_artifact_bucket, hosting_artifact_key = parse_s3_url(  # pylint: disable=unused-variable
-        hub_model_document.hosting_artifact_uri
-    )
-    specs["hosting_artifact_key"] = hosting_artifact_key
-    specs["hosting_artifact_uri"] = hub_model_document.hosting_artifact_uri
-    hosting_script_bucket, hosting_script_key = parse_s3_url(  # pylint: disable=unused-variable
-        hub_model_document.hosting_script_uri
-    )
-    specs["hosting_script_key"] = hosting_script_key
+    if hub_model_document.hosting_artifact_uri:
+      _, hosting_artifact_key = parse_s3_url(  # pylint: disable=unused-variable
+          hub_model_document.hosting_artifact_uri
+      )
+      specs["hosting_artifact_key"] = hosting_artifact_key
+      specs["hosting_artifact_uri"] = hub_model_document.hosting_artifact_uri
+
+    if hub_model_document.hosting_script_uri:
+      _, hosting_script_key = parse_s3_url(  # pylint: disable=unused-variable
+          hub_model_document.hosting_script_uri
+      )
+      specs["hosting_script_key"] = hosting_script_key
+    
     specs["inference_environment_variables"] = hub_model_document.inference_environment_variables
     specs["inference_vulnerable"] = False
     specs["inference_dependencies"] = hub_model_document.inference_dependencies

src/sagemaker/jumpstart/hub/utils.py

@@ -117,8 +117,8 @@ def generate_hub_arn_for_init_kwargs(
 
     hub_arn = None
     if hub_name:
-        if hub_name == constants.JUMPSTART_MODEL_HUB_NAME:
-            return None
+        # if hub_name == constants.JUMPSTART_MODEL_HUB_NAME:
+        #     return None
         match = re.match(constants.HUB_ARN_REGEX, hub_name)
         if match:
             hub_arn = hub_name