Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
bebc9d4
feat: add audio url class
Dec 14, 2022
6025c2f
fix: typos
Dec 14, 2022
9a599e5
test: add tests for audio and audio url
Dec 15, 2022
04abdae
feat: add audio url and audio predefined class
Dec 15, 2022
f8d700d
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-add-a…
Dec 21, 2022
d58f804
chore: add types-request
Dec 22, 2022
bdf8e88
feat: add audio tensors torch and ndarray
Dec 22, 2022
6572df8
fix: mypy type hints
Dec 22, 2022
9cd4baa
test: empty test file
Dec 22, 2022
b3c1948
test: add more unit and integration tests
Dec 28, 2022
7774181
fix: update audio tensors and audio url
Dec 28, 2022
af840d4
fix: remove print statements
Dec 28, 2022
797f488
docs: add documentation
Dec 28, 2022
8b48a77
refactor: rename test audio py to test audio tensor py
Dec 28, 2022
e135438
fix: typo in torch tensor py
Dec 28, 2022
14fcf6b
feat: add proto stuff to audio tensors
Dec 28, 2022
c623a13
test: add tests for proto and set tensors
Dec 28, 2022
1be8e3f
fix: set tensor to tensor int, since no inplace change
Dec 28, 2022
17786eb
refactor: rename to save to wav file
Dec 28, 2022
97355f7
docs: fix typo
Dec 28, 2022
20e2344
docs: fix docs for save tensor to wav file
Dec 28, 2022
7fc06e1
Merge branch 'feat-rewrite-v2' into feat-add-audio-v2
Dec 28, 2022
b34d783
fix: apply suggestions from code review
Dec 28, 2022
130d8ab
fix: apply suggestions from code review
Dec 29, 2022
2954351
test: fix assertions
Dec 29, 2022
61cb103
fix: move max int multiplication to abstract class
Dec 29, 2022
5943c0f
feat: add ndim method to abstract tensor class and concrete classes
Dec 29, 2022
131c5ff
fix: ndim
Dec 29, 2022
83ef649
fix: revert ndim in abstract tensor and torch tensor and ndarray
Dec 29, 2022
eecca41
fix: mypy checks
Dec 29, 2022
4762c3c
docs: add docstring to n dim
Dec 29, 2022
6948122
refactor: move n dim to abstract tensor and subclasses
Dec 29, 2022
d174087
refactor: make to protobuf abstract, change node to protobuf signature
Dec 29, 2022
3a52303
fix: remove not needed methods
Dec 29, 2022
a0be12e
fix: change remote audio file to file from github
Dec 30, 2022
9623d29
fix: raw content from remote file
Dec 30, 2022
6efdcf2
fix: path to github remote file
Dec 30, 2022
5026543
refactor: tensor field name to proto field name
Jan 2, 2023
703de43
test: remove redundant test in test audio tensor
Jan 2, 2023
83ece31
fix: load audio url to audio ndarray instead of np ndarray
Jan 2, 2023
de079e2
refactor: move n dim to computational backend
Jan 2, 2023
2ef1350
docs: update docstrings for audio tensors
Jan 3, 2023
d51d38e
feat: make dtype in audiourl load optional
Jan 3, 2023
3901cfa
Merge branch 'feat-rewrite-v2' into feat-add-audio-v2
Jan 3, 2023
a571898
test: fix document refactor and ndarray import
Jan 3, 2023
71af630
fix: fix mypy check
Jan 3, 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
docs: add documentation
Signed-off-by: anna-charlotte <[email protected]>
  • Loading branch information
anna-charlotte committed Dec 28, 2022
commit 797f488e30113f7122353e8817700a64eff2c611
51 changes: 42 additions & 9 deletions docarray/typing/tensor/audio/audio_ndarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,48 @@


class AudioNdArray(NdArray):
""" """
"""
Subclass of NdArray, to represent an audio tensor.
Additionally, this allows storing such a tensor as a .wav audio file.


EXAMPLE USAGE

.. code-block:: python

from typing import Optional

from pydantic import parse_obj_as

from docarray import Document
from docarray.typing import AudioNdArray, AudioUrl
import numpy as np


class MyAudioDoc(Document):
title: str
audio_tensor: Optional[AudioNdArray]
url: Optional[AudioUrl]


# from tensor
doc_1 = MyAudioDoc(
title='my_first_audio_doc',
audio_tensor=np.random.rand(1000, 2),
)

doc_1.audio_tensor.save_audio_tensor_to_file(file_path='path/to/file_1.wav')

# from url
doc_2 = MyAudioDoc(
title='my_second_audio_doc',
url='https://www.kozco.com/tech/piano2.wav',
)

doc_2.audio_tensor = parse_obj_as(AudioNdArray, doc_2.url.load())
doc_2.audio_tensor.save_audio_tensor_to_file(file_path='path/to/file_2.wav')

"""

def _to_node_protobuf(self: T, field: str = 'ndarray') -> 'NodeProto':
"""Convert itself into a NodeProto protobuf message. This function should
Expand All @@ -30,14 +71,6 @@ def save_audio_tensor_to_file(
sample_rate: int = 44100,
sample_width: int = 2,
) -> None:
"""
Save :attr:`.tensor` into a .wav file. Mono/stereo is preserved.

:param file_path: if file is a string, open the file by that name, otherwise
treat it as a file-like object.
:param sample_rate: sampling frequency
:param sample_width: sample width in bytes
"""

max_int16 = 2**15
tensor = (self * max_int16).astype('<h')
Expand Down
53 changes: 43 additions & 10 deletions docarray/typing/tensor/audio/audio_torch_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,59 @@


class AudioTorchTensor(TorchTensor, metaclass=metaTorchAndNode):
""" """
"""
Subclass of TorchTensor, to represent an audio tensor.
Additionally, this allows storing such a tensor as a .wav audio file.


EXAMPLE USAGE

.. code-block:: python

from typing import Optional

import torch
from pydantic import parse_obj_as

from docarray import Document
from docarray.typing import AudioTorchTensor, AudioUrl


class MyAudioDoc(Document):
title: str
audio_tensor: Optional[AudioTorchTensor]
url: Optional[AudioUrl]


doc_1 = MyAudioDoc(
title='my_first_audio_doc',
audio_tensor=torch.randn(size=(1000, 2)),
)

doc_1.audio_tensor.save_audio_tensor_to_file(file_path='path/to/file_1.wav')


doc_2 = MyAudioDoc(
title='my_second_audio_doc',
url='https://www.kozco.com/tech/piano2.wav',
)

doc_2.audio_tensor = parse_obj_as(AudioTorchTensor, doc_2.url.load())
doc_2.audio_tensor.save_audio_tensor_to_file(file_path='path/to/file_2.wav')

"""

def save_audio_tensor_to_file(
self: 'T',
file_path: Union[str, BinaryIO],
sample_rate: int = 44100,
sample_width: int = 2,
) -> None:
"""
Save :attr:`.tensor` into a .wav file. Mono/stereo is preserved.

:param file_path: if file is a string, open the file by that name, otherwise
treat it as a file-like object.
:param sample_rate: sampling frequency
:param sample_width: sample width in bytes
"""
import torch

max_int16 = 2**15
tensor = torch.tensor(self * max_int16, dtype=torch.int16)
tensor = self * max_int16
tensor.to(dtype=torch.int16)
n_channels = 2 if self.ndim > 1 else 1

with wave.open(file_path, 'w') as f:
Expand Down
16 changes: 5 additions & 11 deletions docarray/typing/url/audio_url.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,15 @@ class MyDoc(Document):

# Normalise float32 array so that values are between -1.0 and +1.0
max_int16 = 2**15
audio_normalised = audio_as_np_float32 / max_int16
audio_norm = audio_as_np_float32 / max_int16

channels = ifile.getnchannels()
if channels == 2:
# 1 for mono, 2 for stereo
audio_stereo = np.empty(
(int(len(audio_normalised) / channels), channels)
)
audio_stereo[:, 0] = audio_normalised[
range(0, len(audio_normalised), 2)
]
audio_stereo[:, 1] = audio_normalised[
range(1, len(audio_normalised), 2)
]
audio_stereo = np.empty((int(len(audio_norm) / channels), channels))
audio_stereo[:, 0] = audio_norm[range(0, len(audio_norm), 2)]
audio_stereo[:, 1] = audio_norm[range(1, len(audio_norm), 2)]

return audio_stereo
else:
return audio_normalised
return audio_norm