Skip to content

feat: validate file formats in url (#1606) #1669

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

Merged
JoanFM merged 24 commits into from
Jun 27, 2023
Merged

feat: validate file formats in url (#1606) #1669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
49fd592
feat: validate file formats in url (#1606)
makram93 Jun 26, 2023
5680e0d
test: reverting some changes
jupyterjazz Jun 26, 2023
0ce7e54
chore: add prints
jupyterjazz Jun 26, 2023
c1e1528
style: run black
jupyterjazz Jun 26, 2023
5591d3e
chore: print values
jupyterjazz Jun 26, 2023
d4a289f
feat: initialize mime types
jupyterjazz Jun 26, 2023
a69c197
refactor: file name
jupyterjazz Jun 26, 2023
fa0dbb2
refactor: rename again
jupyterjazz Jun 26, 2023
d438dc6
refactor: remove special cases
jupyterjazz Jun 26, 2023
d0948fc
test: resolve some tests
jupyterjazz Jun 26, 2023
5222026
refactor: remove custom mimetypes
jupyterjazz Jun 26, 2023
08c8b3b
test: add a valid link
jupyterjazz Jun 26, 2023
262190f
refactor: just want to make ci green am i asking too much?
jupyterjazz Jun 26, 2023
c661282
refactor: validate approach, should fail
jupyterjazz Jun 26, 2023
7644d6d
refactor: text link
jupyterjazz Jun 26, 2023
fbe7d7c
test: resolve tests
jupyterjazz Jun 26, 2023
4ee48f3
refactor: polish up the code
jupyterjazz Jun 26, 2023
1a69277
style: run black
jupyterjazz Jun 26, 2023
02c15c6
refactor: add constants, update 3d mimetype
jupyterjazz Jun 26, 2023
32cc3ab
test: resolve tests
jupyterjazz Jun 26, 2023
730f21b
refactor: remove prints
jupyterjazz Jun 27, 2023
9464fb7
feat: pass validation for urls with not ext
jupyterjazz Jun 27, 2023
ee29f6a
refactor: get ext
jupyterjazz Jun 27, 2023
70d4970
test: resolve unit tests
jupyterjazz Jun 27, 2023
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
Prev Previous commit
Next Next commit
refactor: add constants, update 3d mimetype 
Signed-off-by: jupyterjazz <[email protected]>
  • Loading branch information
@jupyterjazz
jupyterjazz committed Jun 26, 2023
commit 02c15c6a4842997c39b0acf9a7fb174b2a980f89
3 changes: 2 additions & 1 deletion docarray/typing/url/audio_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from docarray.typing.bytes.audio_bytes import AudioBytes
from docarray.typing.proto_register import _register_proto
from docarray.typing.url.any_url import AnyUrl
from docarray.typing.url.mimetypes import AUDIO_MIMETYPE
from docarray.utils._internal.misc import is_notebook

T = TypeVar('T', bound='AudioUrl')
Expand All @@ -19,7 +20,7 @@ class AudioUrl(AnyUrl):

@classmethod
def mime_type(cls) -> str:
return 'audio'
return AUDIO_MIMETYPE

@classmethod
def extra_extensions(cls) -> List[str]:
Expand Down
3 changes: 2 additions & 1 deletion docarray/typing/url/image_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from docarray.typing.proto_register import _register_proto
from docarray.typing.tensor.image import ImageNdArray
from docarray.typing.url.any_url import AnyUrl
from docarray.typing.url.mimetypes import IMAGE_MIMETYPE
from docarray.utils._internal.misc import is_notebook

if TYPE_CHECKING:
Expand All @@ -22,7 +23,7 @@ class ImageUrl(AnyUrl):

@classmethod
def mime_type(cls) -> str:
return 'image'
return IMAGE_MIMETYPE

@classmethod
def extra_extensions(cls) -> List[str]:
Expand Down
6 changes: 6 additions & 0 deletions docarray/typing/url/extra_extensions.py → docarray/typing/url/mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
TEXT_MIMETYPE = 'text'
AUDIO_MIMETYPE = 'audio'
IMAGE_MIMETYPE = 'image'
OBJ_MIMETYPE = 'application/x-tgif'
VIDEO_MIMETYPE = 'video'

MESH_EXTRA_EXTENSIONS = [
'3ds',
'3mf',
Expand Down
4 changes: 2 additions & 2 deletions docarray/typing/url/text_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from docarray.typing.proto_register import _register_proto
from docarray.typing.url.any_url import AnyUrl
from docarray.typing.url.extra_extensions import TEXT_EXTRA_EXTENSIONS
from docarray.typing.url.mimetypes import TEXT_EXTRA_EXTENSIONS, TEXT_MIMETYPE

T = TypeVar('T', bound='TextUrl')

Expand All @@ -16,7 +16,7 @@ class TextUrl(AnyUrl):

@classmethod
def mime_type(cls) -> str:
return 'text'
return TEXT_MIMETYPE

@classmethod
def extra_extensions(cls) -> List[str]:
Expand Down
2 changes: 1 addition & 1 deletion docarray/typing/url/url_3d/mesh_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from docarray.typing.proto_register import _register_proto
from docarray.typing.tensor.ndarray import NdArray
from docarray.typing.url.extra_extensions import MESH_EXTRA_EXTENSIONS
from docarray.typing.url.mimetypes import MESH_EXTRA_EXTENSIONS
from docarray.typing.url.url_3d.url_3d import Url3D

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion docarray/typing/url/url_3d/point_cloud_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from docarray.typing.proto_register import _register_proto
from docarray.typing.tensor.ndarray import NdArray
from docarray.typing.url.extra_extensions import POINT_CLOUD_EXTRA_EXTENSIONS
from docarray.typing.url.mimetypes import POINT_CLOUD_EXTRA_EXTENSIONS
from docarray.typing.url.url_3d.url_3d import Url3D

if TYPE_CHECKING:
Expand Down
3 changes: 2 additions & 1 deletion docarray/typing/url/url_3d/url_3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from docarray.typing.proto_register import _register_proto
from docarray.typing.url.any_url import AnyUrl
from docarray.typing.url.mimetypes import OBJ_MIMETYPE
from docarray.utils._internal.misc import import_library

if TYPE_CHECKING:
Expand All @@ -20,7 +21,7 @@ class Url3D(AnyUrl, ABC):

@classmethod
def mime_type(cls) -> str:
return 'application'
return OBJ_MIMETYPE

def _load_trimesh_instance(
self: T,
Expand Down
3 changes: 2 additions & 1 deletion docarray/typing/url/video_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from docarray.typing.bytes.video_bytes import VideoBytes, VideoLoadResult
from docarray.typing.proto_register import _register_proto
from docarray.typing.url.any_url import AnyUrl
from docarray.typing.url.mimetypes import VIDEO_MIMETYPE
from docarray.utils._internal.misc import is_notebook

T = TypeVar('T', bound='VideoUrl')
Expand All @@ -18,7 +19,7 @@ class VideoUrl(AnyUrl):

@classmethod
def mime_type(cls) -> str:
return 'video'
return VIDEO_MIMETYPE

@classmethod
def extra_extensions(cls) -> List[str]:
Expand Down