Skip to content

fix: fix push pull #1384

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
samsja merged 3 commits into from
Apr 17, 2023
Merged

fix: fix push pull #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2aaaab
fix: fix push pull
samsja Apr 17, 2023
4fb282b
fix: fix test
samsja Apr 17, 2023
a2bcfb3
fix: skip broken test
samsja Apr 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
4 changes: 2 additions & 2 deletions docarray/array/doc_list/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def _write_bytes(
elif protocol in SINGLE_PROTOCOLS:
f.write(
b''.join(
self.to_binary_stream(
self._to_binary_stream(
protocol=protocol,
compress=compress,
show_progress=show_progress,
Expand All @@ -195,7 +195,7 @@ def _write_bytes(
f'protocol={protocol} is not supported. Can be only {ALLOWED_PROTOCOLS}.'
)

def to_binary_stream(
def _to_binary_stream(
self,
protocol: str = 'protobuf',
compress: Optional[str] = None,
Expand Down
6 changes: 3 additions & 3 deletions docarray/store/jac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def list(namespace: str = '', show_table: bool = False) -> List[str]:
from rich.table import Table

resp = HubbleClient(jsonify=True).list_artifacts(
filter={'type': 'DocumentArray'}, sort={'createdAt': 1}
filter={'type': 'documentArray'}, sort={'createdAt': 1}
)

table = Table(
Expand Down Expand Up @@ -186,7 +186,7 @@ def push(
delimiter,
),
'name': name,
'type': 'DocumentArray',
'type': 'documentArray',
'public': public,
'metaData': json.dumps(
{
Expand All @@ -211,7 +211,7 @@ def push(

def gen():
yield _head
binary_stream = docs.to_binary_stream(
binary_stream = docs._to_binary_stream(
protocol='protobuf', compress='gzip', show_progress=show_progress
)
while True:
Expand Down
7 changes: 4 additions & 3 deletions tests/integrations/store/test_jac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
TOLERANCE_RATIO = 0.5 # Percentage of difference allowed in stream vs non-stream test
RANDOM: str = uuid.uuid4().hex[:8]

pytestmark = [pytest.mark.skip]


@pytest.fixture(scope='session', autouse=True)
def testing_namespace_cleanup():
Expand Down Expand Up @@ -68,6 +66,7 @@ def test_pushpull_correct(capsys):
assert len(captured.err) == 0, 'No error should be printed when show_progress=False'


@pytest.mark.skip(reason='time out')
@pytest.mark.slow
@pytest.mark.internet
def test_pushpull_stream_correct(capsys):
Expand Down Expand Up @@ -99,6 +98,7 @@ def test_pushpull_stream_correct(capsys):
assert len(captured.err) == 0, 'No error should be printed when show_progress=False'


@pytest.mark.skip(reason='time out')
@pytest.mark.slow
@pytest.mark.internet
def test_pull_stream_vs_pull_full():
Expand Down Expand Up @@ -155,9 +155,9 @@ def get_total_full(url: str):
), 'Full pull memory usage should be dependent on the size of the data'


@pytest.mark.skip(reason='The CI account might be broken')
@pytest.mark.slow
@pytest.mark.internet
@pytest.mark.skip(reason='The CI account might be broken')
def test_list_and_delete():
DA_NAME_0 = f'test{RANDOM}-list-and-delete-da0'
DA_NAME_1 = f'test{RANDOM}-list-and-delete-da1'
Expand Down Expand Up @@ -212,6 +212,7 @@ def test_list_and_delete():
), 'Deleting a non-existent DA should return False'


@pytest.mark.skip(reason='time out')
@pytest.mark.slow
@pytest.mark.internet
def test_concurrent_push_pull():
Expand Down