Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/kaggle/api/kaggle_api_extended.py
Original file line number Diff line number Diff line change
Expand Up @@ -7546,7 +7546,11 @@ def kernels_pull(self, kernel, path, metadata=False, quiet=True):
file_name = existing_metadata["code_file"]
elif os.path.isfile(metadata_path):
with open(metadata_path) as f:
file_name = json.load(f)["code_file"]
local_metadata = json.load(f)
# Reuse code_file only if the folder holds this same kernel; another kernel's file would be overwritten.
local_id = str(local_metadata.get("id", "")).lower().split("/")[:2]
if local_id == [owner_slug.lower(), kernel_slug.lower()]:
file_name = local_metadata["code_file"]

if not file_name or file_name == "INSERT_CODE_FILE_PATH_HERE":
extension = None
Expand Down
25 changes: 25 additions & 0 deletions tests/unit/test_kernels_pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,31 @@ def test_kernels_pull_cli_honors_kernel_opt(self, mock_pull):

mock_pull.assert_called_once_with("owner/my-slug", path=None, metadata=False, quiet=False)

@patch.object(KaggleApi, "build_kaggle_client")
def test_kernels_pull_code_file_only_reused_for_same_kernel(self, mock_client):
import tempfile

mock_kaggle = MagicMock()
blob = mock_kaggle.kernels.kernels_api_client.get_kernel.return_value.blob
blob.language, blob.kernel_type, blob.slug, blob.source = "python", "script", "kernel-b", "B"
mock_client.return_value.__enter__ = MagicMock(return_value=mock_kaggle)
mock_client.return_value.__exit__ = MagicMock(return_value=False)

for local_id, expected_file in [("owner/kernel-a", "kernel-b.py"), ("Owner/Kernel-B", "mine.py")]:
with self.subTest(local_id=local_id), tempfile.TemporaryDirectory() as d:
with open(os.path.join(d, "kernel-metadata.json"), "w") as f:
json.dump({"id": local_id, "code_file": "mine.py"}, f)
with open(os.path.join(d, "mine.py"), "w") as f:
f.write("local work")

self.api.kernels_pull("owner/kernel-b", path=d)

with open(os.path.join(d, expected_file)) as f:
self.assertEqual(f.read(), "B")
if expected_file != "mine.py":
with open(os.path.join(d, "mine.py")) as f:
self.assertEqual(f.read(), "local work")


if __name__ == "__main__":
unittest.main()
Loading