fix: Remove deprecated option.s3url in favor of option.model_id (#3935)

Author: siddvenk

src/sagemaker/djl_inference/model.py

@@ -739,10 +739,7 @@ def generate_serving_properties(self, serving_properties=None) -> Dict[str, str]
             serving_properties = {}
         serving_properties["engine"] = self.engine.value[0]  # pylint: disable=E1101
         serving_properties["option.entryPoint"] = self.engine.value[1]  # pylint: disable=E1101
-        if self.model_id.startswith("s3://"):
-            serving_properties["option.s3url"] = self.model_id
-        else:
-            serving_properties["option.model_id"] = self.model_id
+        serving_properties["option.model_id"] = self.model_id
         if self.number_of_partitions:
             serving_properties["option.tensor_parallel_degree"] = self.number_of_partitions
         if self.entry_point:

tests/unit/test_djl_inference.py

@@ -46,7 +46,7 @@
 ROLE = "dummy_role"
 REGION = "us-west-2"
 BUCKET = "mybucket"
-IMAGE_URI = "763104351884.dkr.ecr.us-west-2.amazon.com/djl-inference:0.20.0-deepspeed0.7.5-cu116"
+IMAGE_URI = "763104351884.dkr.ecr.us-west-2.amazon.com/djl-inference:0.22.1-deepspeed0.9.2-cu118"
 GPU_INSTANCE = "ml.g5.12xlarge"
 
 
@@ -111,7 +111,6 @@ def test_create_model_valid_hf_hub_model_id(
 
     serving_properties = model.generate_serving_properties()
     assert serving_properties["option.model_id"] == HF_MODEL_ID
-    assert "option.s3url" not in serving_properties
 
 
 @patch("json.load")
@@ -396,7 +395,7 @@ def test_generate_serving_properties_with_valid_configurations(
     expected_dict = {
         "engine": "Python",
         "option.entryPoint": ENTRY_POINT,
-        "option.s3url": VALID_UNCOMPRESSED_MODEL_DATA,
+        "option.model_id": VALID_UNCOMPRESSED_MODEL_DATA,
         "option.tensor_parallel_degree": 4,
         "option.task": "text-classification",
         "option.dtype": "fp16",
@@ -431,7 +430,7 @@ def test_generate_serving_properties_with_valid_configurations(
     expected_dict = {
         "engine": "DeepSpeed",
         "option.entryPoint": "djl_python.deepspeed",
-        "option.s3url": VALID_UNCOMPRESSED_MODEL_DATA,
+        "option.model_id": VALID_UNCOMPRESSED_MODEL_DATA,
         "option.tensor_parallel_degree": 1,
         "option.task": "text-generation",
         "option.dtype": "bf16",
@@ -459,7 +458,7 @@ def test_generate_serving_properties_with_valid_configurations(
     expected_dict = {
         "engine": "Python",
         "option.entryPoint": "djl_python.huggingface",
-        "option.s3url": VALID_UNCOMPRESSED_MODEL_DATA,
+        "option.model_id": VALID_UNCOMPRESSED_MODEL_DATA,
         "option.tensor_parallel_degree": 1,
         "option.dtype": "fp32",
         "option.device_id": 4,