Skip to content
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

Fix missing resource path when FileNotFoundErrors are raised (#378) #379

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix missing resource path when FileNotFoundErrors are raised (#378) #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c4865a
Fix missing resource path when FileNotFoundErrors are raised (#378)
cccs-eric Dec 13, 2022
fb80c13
Fix missing resource path when FileNotFoundErrors are raised (#378)
cccs-eric Dec 13, 2022
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
47 changes: 32 additions & 15 deletions adlfs/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from __future__ import absolute_import, division, print_function

import asyncio
import errno
import io
import logging
import os
Expand Down Expand Up @@ -549,7 +550,7 @@ async def _info(self, path, refresh=False, **kwargs):
if out:
return out[0]
else:
raise FileNotFoundError
raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), path)

def glob(self, path, **kwargs):
return sync(self.loop, self._glob, path)
Expand Down Expand Up @@ -711,8 +712,10 @@ async def _ls_blobs(
outblobs.append(blob_)
else:
pass
except ResourceNotFoundError:
raise FileNotFoundError
except ResourceNotFoundError as e:
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), target_path
) from e
finalblobs = await self._details(
outblobs,
target_path=target_path,
Expand All @@ -726,7 +729,9 @@ async def _ls_blobs(
)
if not finalblobs:
if not await self._exists(target_path):
raise FileNotFoundError
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), target_path
)
return []
if not self.version_aware or finalblobs[0].get("is_current_version"):
self.dircache[target_path] = finalblobs
Expand Down Expand Up @@ -1372,25 +1377,29 @@ async def _pipe_file(self, path, value, overwrite=True, **kwargs):
pipe_file = sync_wrapper(_pipe_file)

async def _cat_file(self, path, start=None, end=None, **kwargs):
path = self._strip_protocol(path)
no_protocol_path = self._strip_protocol(path)
if end is not None:
start = start or 0 # download_blob requires start if length is provided.
length = end - start
else:
length = None
container_name, path, version_id = self.split_path(path)
container_name, no_protocol_path, version_id = self.split_path(no_protocol_path)
async with self.service_client.get_blob_client(
container=container_name, blob=path
container=container_name, blob=no_protocol_path
) as bc:
try:
stream = await bc.download_blob(
offset=start, length=length, version_id=version_id
)
except ResourceNotFoundError as e:
raise FileNotFoundError from e
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), path
) from e
except HttpResponseError as e:
if version_id is not None:
raise FileNotFoundError from e
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), path
) from e
raise
result = await stream.readall()
return result
Expand Down Expand Up @@ -1517,7 +1526,7 @@ async def _expand_path(
out.add(fullpath)

if not out:
raise FileNotFoundError
raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), path)
return list(sorted(out))

async def _put_file(
Expand Down Expand Up @@ -1553,9 +1562,11 @@ async def _put_file(
self.invalidate_cache()
except ResourceExistsError:
raise FileExistsError("File already exists!")
except ResourceNotFoundError:
except ResourceNotFoundError as e:
if not await self._exists(container_name):
raise FileNotFoundError("Container does not exist.")
raise FileNotFoundError(
errno.ENOENT, "Container does not exist.", container_name
) from e
await self._put_file(lpath, rpath, delimiter, overwrite)
self.invalidate_cache()

Expand All @@ -1581,7 +1592,9 @@ async def _cp_file(self, path1, path2, **kwargs):
try:
await blobclient2.start_copy_from_url(url)
except ResourceNotFoundError as e:
raise FileNotFoundError from e
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), path1
) from e
self.invalidate_cache(container1)
self.invalidate_cache(container2)

Expand Down Expand Up @@ -1615,7 +1628,9 @@ async def _get_file(
)
await stream.readinto(my_blob)
except ResourceNotFoundError as exception:
raise FileNotFoundError from exception
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), rpath
) from exception

get_file = sync_wrapper(_get_file)

Expand All @@ -1630,7 +1645,9 @@ async def _setxattrs(self, rpath, **kwargs):
await bc.set_blob_metadata(metadata=kwargs)
self.invalidate_cache(self._parent(rpath))
except Exception as e:
raise FileNotFoundError(f"File not found for {e}")
raise FileNotFoundError(
errno.ENOENT, os.strerror(errno.ENOENT), rpath
) from e

setxattrs = sync_wrapper(_setxattrs)

Expand Down
21 changes: 14 additions & 7 deletions adlfs/tests/test_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,17 @@ def test_ls(storage):
)

# if not direct match is found throws error
with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
fs.ls("not-a-container")
assert "not-a-container" in str(e.value)

with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
fs.ls("data/not-a-directory/")
assert "data/not-a-directory" in str(e.value)

with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
fs.ls("data/root/not-a-file.txt")
assert "data/root/not-a-file.txt" in str(e.value)


def test_ls_no_listings_cache(storage):
Expand Down Expand Up @@ -1400,11 +1403,13 @@ def test_cat_file_missing(storage):
account_name=storage.account_name, connection_string=CONN_STR
)
fs.mkdir("catdir")
with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
fs.cat_file("catdir/not/exist")
assert "catdir/not/exist" in str(e.value)

with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
fs.cat_file("does/not/exist")
assert "does/not/exist" in str(e.value)


async def test_cat_file_versioned(storage, mocker):
Expand All @@ -1426,8 +1431,9 @@ async def test_cat_file_versioned(storage, mocker):

download_blob.reset_mock()
download_blob.side_effect = HttpResponseError
with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
await fs._cat_file("data/root/a/file.txt?versionid=invalid_version")
assert "data/root/a/file.txt?versionid=invalid_version" in str(e.value)


@pytest.mark.skip(
Expand Down Expand Up @@ -1685,5 +1691,6 @@ async def test_get_file_versioned(storage, mocker):

download_blob.reset_mock()
download_blob.side_effect = ResourceNotFoundError
with pytest.raises(FileNotFoundError):
with pytest.raises(FileNotFoundError) as e:
await fs._get_file("data/root/a/file.txt?versionid=invalid_version", "file.txt")
assert "data/root/a/file.txt?versionid=invalid_version" in str(e.value)