Skip to content

fix: ws scheme #211

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
hanxiao merged 2 commits into from
Mar 16, 2022
Merged

fix: ws scheme #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cff5ea7
fix: ws scheme
hanxiao Mar 16, 2022
338b03b
fix: ws scheme
hanxiao Mar 16, 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
16 changes: 13 additions & 3 deletions docarray/array/mixins/post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ def post(
)
batch_size = batch_size or len(self)

if r.scheme.startswith('jinahub'):
_scheme = r.scheme
_tls = False

if _scheme in ('grpcs', 'https', 'wss'):
_scheme = _scheme[:-2]
_tls = True

if _scheme == 'ws':
_scheme = 'websocket' # temp fix for the core

if _scheme.startswith('jinahub'):
from jina import Flow

f = Flow(quiet=True, prefetch=1).add(uses=standardized_host)
Expand All @@ -57,13 +67,13 @@ def post(
request_size=batch_size,
parameters=parameters,
)
elif r.scheme in ('grpc', 'http', 'ws'):
elif _scheme in ('grpc', 'http', 'ws', 'websocket'):
if _port is None:
raise ValueError(f'can not determine port from {host}')

from jina import Client

c = Client(host=r.hostname, port=_port, protocol=r.scheme)
c = Client(host=r.hostname, port=_port, protocol=_scheme, https=_tls)
return c.post(
_on,
inputs=self,
Expand Down