fix: copy dependencies into new folder when repacking model (#1021)

Author: laurenyu

src/sagemaker/utils.py

@@ -468,10 +468,12 @@ def _create_or_update_code_dir(
         shutil.copy2(inference_script, code_dir)
 
     for dependency in dependencies:
+        lib_dir = os.path.join(code_dir, "lib")
         if os.path.isdir(dependency):
-            shutil.copytree(dependency, code_dir)
+            shutil.copytree(dependency, os.path.join(lib_dir, os.path.basename(dependency)))
         else:
-            shutil.copy2(dependency, code_dir)
+            os.mkdir(lib_dir)
+            shutil.copy2(dependency, lib_dir)
 
 
 def _extract_model(model_uri, sagemaker_session, tmp):

tests/unit/test_utils.py

@@ -344,7 +344,7 @@ def test_repack_model_without_source_dir(tmp, fake_s3):
         [
             "model-dir/model",
             "dependencies/a",
-            "dependencies/b",
+            "dependencies/some/dir/b",
             "source-dir/inference.py",
             "source-dir/this-file-should-not-be-included.py",
         ],
@@ -355,16 +355,19 @@ def test_repack_model_without_source_dir(tmp, fake_s3):
     sagemaker.utils.repack_model(
         inference_script=os.path.join(tmp, "source-dir/inference.py"),
         source_directory=None,
-        dependencies=[os.path.join(tmp, "dependencies/a"), os.path.join(tmp, "dependencies/b")],
+        dependencies=[
+            os.path.join(tmp, "dependencies/a"),
+            os.path.join(tmp, "dependencies/some/dir"),
+        ],
         model_uri="s3://fake/location",
         repacked_model_uri="s3://destination-bucket/model.tar.gz",
         sagemaker_session=fake_s3.sagemaker_session,
     )
 
     assert list_tar_files(fake_s3.fake_upload_path, tmp) == {
         "/model",
-        "/code/a",
-        "/code/b",
+        "/code/lib/a",
+        "/code/lib/dir/b",
         "/code/inference.py",
     }
 
@@ -449,7 +452,7 @@ def test_repack_model_from_file_to_file(tmp):
         sagemaker_session,
     )
 
-    assert list_tar_files(destination_path, tmp) == {"/code/a", "/code/inference.py", "/model"}
+    assert list_tar_files(destination_path, tmp) == {"/code/lib/a", "/code/inference.py", "/model"}
 
 
 def test_repack_model_with_inference_code_should_replace_the_code(tmp, fake_s3):