Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
943d636
feat: display mesh and pointcloud
Feb 9, 2023
e9acd12
chore: update poetry
Feb 9, 2023
c91ab6c
fix: mypy
Feb 9, 2023
e979c32
fix: add display from param to mesh and pc display
Feb 9, 2023
21fb8ab
fix: clean up
Feb 9, 2023
75b33d8
fix: mypy
Feb 9, 2023
7890194
fix: move display from url to mesh and pc url classes
Feb 10, 2023
0129c3a
chore: remove pyglet dependency
Feb 10, 2023
322a718
chore: update pyproject toml
Feb 10, 2023
05d8461
refactor: copy is notebook function from hubble sdk
Feb 10, 2023
0244816
fix: introduce vertices and faces doc
Feb 10, 2023
255795c
fix: introduce points and colors class for point cloud
Feb 10, 2023
db42712
fix: mypy and tests
Feb 10, 2023
dca04ce
docs: add display example to docs
Feb 10, 2023
788f834
fix: apply johannes suggestion from review
Feb 10, 2023
57fb1e1
fix: apply samis suggestion
Feb 10, 2023
3a8dc5e
docs: update docstring
Feb 14, 2023
38f771d
fix: only display in notebook
Feb 15, 2023
8c31318
docs: update docstring
Feb 15, 2023
bbef411
chore: get poetry lock file from feat rewrite v2
Feb 15, 2023
b376ddd
docs: update docstrings
Feb 15, 2023
016760d
feat: display image from img url and img tensor
Feb 10, 2023
f55d811
fix: display from image url and from image tensor
Feb 13, 2023
0a23b52
fix: use is notebook from utils instead o f hubble
Feb 13, 2023
084921b
feat: audio from url
Feb 14, 2023
a949033
feat: display video and add pydub to pyproject toml
Feb 15, 2023
62b58ee
wip: remove non notebook
Feb 15, 2023
442dd29
fix: all except video tensor
Feb 16, 2023
b486b96
fix: mypy check for ipython display
Feb 16, 2023
f77d216
fix: mypy check for ipython display
Feb 16, 2023
ca948f9
feat: add videobytes
Feb 16, 2023
0dc606c
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-displ…
Feb 16, 2023
f2c0cff
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-displ…
Feb 16, 2023
48a85ba
chore: poetry lock
Feb 16, 2023
9df9df5
fix: clean up
Feb 16, 2023
e783c14
Merge branch 'feat-rewrite-v2' into feat-display-img-audio-vid
Feb 17, 2023
fe9d3bf
fix: mypy check
Feb 17, 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
fix: mypy
Signed-off-by: anna-charlotte <[email protected]>
  • Loading branch information
anna-charlotte committed Feb 15, 2023
commit 75b33d8e340aa6f98748cb4e7f01263ffdd7a9fb
17 changes: 7 additions & 10 deletions docarray/documents/point_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,24 @@ def display(self, display_from: str = 'url', samples: int = 10000) -> None:
if display_from not in ['tensor', 'url']:
raise ValueError(f'Expected one of ["tensor", "url"], got "{display_from}"')

if getattr(self, display_from) is None:
raise ValueError(
f'Can not to display point cloud from {display_from} when the '
f'{display_from} is None.'
)

if display_from == 'url':
if self.url is None:
raise ValueError(
'Can\'t display point cloud from url when url is None.'
)
tensor = self.url.load(samples=samples)
colors = np.tile(
np.array([0, 0, 0]), (tensor.get_comp_backend().shape(tensor)[0], 1)
)
else:
if self.tensor is None:
raise ValueError('Can\'t display mesh from tensor when tensor is None.')
tensor = self.tensor
comp_be = self.tensor.get_comp_backend()
colors = (
self.color_tensor
if self.color_tensor
else np.tile(
np.array([0, 0, 0]),
(comp_be.shape(tensor)[0], 1),
)
else np.tile(np.array([0, 0, 0]), (comp_be.shape(tensor)[0], 1))
)

pc = trimesh.points.PointCloud(vertices=tensor, colors=colors)
Expand Down
5 changes: 2 additions & 3 deletions docarray/typing/tensor/tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
from docarray.typing.tensor.tensorflow_tensor import TensorFlowTensor # noqa: F401


AnyTensor = Union[NdArray]
if torch_available and tf_available:
AnyTensor = Union[NdArray, TorchTensor, TensorFlowTensor]
AnyTensor = Union[NdArray, TorchTensor, TensorFlowTensor] # type: ignore
elif torch_available:
AnyTensor = Union[NdArray, TorchTensor] # type: ignore
elif tf_available:
AnyTensor = Union[NdArray, TensorFlowTensor] # type: ignore
else:
AnyTensor = Union[NdArray] # type: ignore