Skip to content
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

Jump to bottom

feat: Flow compatible with docarray v2 #5861

Merged
merged 46 commits into from
May 29, 2023
Merged

feat: Flow compatible with docarray v2 #5861

merged 46 commits into from
May 29, 2023

Conversation

JoanFM
Copy link
Member

@JoanFM JoanFM commented May 10, 2023 •
edited
Loading

  • Make sure that logic of sending to the GatewayStreamer and get back is good and works with the right type of Docs.
  • Design the logic that given a Flow topology creates the maps between endpoints and its inputs and outputs schemas.
  • Test
  • Documentation
  • Pay attention to story about CustomGateway and thus, streamer API
  • Think about wildcard endpoints
  • Handle model creation when anyOf for embeddings specially and other Unions
  • Do hack to fix DocList in schema
  • Test floating

Waiting for docarray/docarray#1571 to be merged so that tests pass

@github-actions github-actions bot added size/M area/core This issue/PR affects the core codebase labels May 10, 2023
@codecov
Copy link

codecov bot commented May 10, 2023 •
edited
Loading

Codecov Report

Merging #5861 (8fea7d2) into master (7901404) will decrease coverage by 1.81%.
The diff coverage is 36.51%.

@@            Coverage Diff             @@
##           master    #5861      +/-   ##
==========================================
- Coverage   80.72%   78.91%   -1.81%     
==========================================
  Files         142      143       +1     
  Lines       12148    12584     +436     
==========================================
+ Hits         9806     9931     +125     
- Misses       2342     2653     +311
Flag Coverage Δ
jina 78.91% <36.51%> (-1.81%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
jina/clients/request/helper.py 89.58% <0.00%> (+0.45%) ⬆️
...ve/runtimes/gateway/http_fastapi_app_docarrayv2.py 0.00% <0.00%> (ø)
jina/serve/runtimes/head/request_handling.py 69.56% <0.00%> (+3.96%) ⬆️
jina/serve/runtimes/helper.py 27.10% <3.75%> (-69.33%) ⬇️
jina/serve/stream/__init__.py 94.36% <14.28%> (-4.16%) ⬇️
jina/serve/runtimes/servers/grpc.py 91.56% <33.33%> (-4.54%) ⬇️
jina/serve/runtimes/servers/websocket.py 91.22% <33.33%> (-6.82%) ⬇️
jina/serve/runtimes/gateway/streamer.py 65.93% <34.40%> (-33.18%) ⬇️
...ina/serve/runtimes/gateway/graph/topology_graph.py 74.37% <40.90%> (-25.12%) ⬇️
jina/serve/runtimes/servers/http.py 92.47% <42.85%> (-4.08%) ⬇️
... and 11 more

... and 8 files with indirect coverage changes

@JoanFM JoanFM closed this May 10, 2023
@JoanFM JoanFM reopened this May 10, 2023
@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions github-actions bot added size/XL area/testing This issue/PR affects testing labels May 15, 2023
@JoanFM
feat: get properly all input and output
2b0ab6a 
Signed-off-by: Joan Fontanals Martinez <joan.martinez@jina.ai>
@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions github-actions bot added the area/docs This issue/PR affects the docs label May 26, 2023
@JoanFM JoanFM marked this pull request as ready for review May 26, 2023 09:22
@JoanFM JoanFM requested a review from alexcg1 May 26, 2023 09:22
@JoanFM JoanFM linked an issue May 26, 2023 that may be closed by this pull request
DocArray v2 Compatibility #5700
Closed
8 tasks
@JoanFM JoanFM removed a link to an issue May 26, 2023
DocArray v2 Compatibility #5700
Closed
8 tasks
This was linked to issues May 26, 2023
Implement Flow with HTTP #5833
Closed
Implement Flow with Websocket #5834
Closed
Implement and test Flow with filter #5835
Closed
Implement and test Flow with bifurcation #5836
Closed
alexcg1
alexcg1 requested changes May 26, 2023
View reviewed changes
docs/docarray-v2.md Outdated Show resolved Hide resolved
docs/docarray-v2.md Outdated Show resolved Hide resolved
docs/docarray-v2.md Outdated Show resolved Hide resolved
docs/docarray-v2.md Outdated Show resolved Hide resolved
docs/docarray-v2.md Outdated Show resolved Hide resolved
docs/docarray-v2.md Outdated Show resolved Hide resolved
@JoanFM @alexcg1
docs. apply suggestions from code review
b5510f5 
Co-authored-by: Alex Cureton-Griffiths <alexcg1@users.noreply.github.com>
@JoanFM JoanFM requested a review from alexcg1 May 26, 2023 10:36
@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

alexcg1
alexcg1 requested changes May 26, 2023
View reviewed changes
Copy link
Member

@alexcg1 alexcg1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found one more thing

docs/docarray-v2.md Outdated Show resolved Hide resolved
@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@JoanFM @alexcg1
docs: update docs/docarray-v2.md
fc1fe4d 
Co-authored-by: Alex Cureton-Griffiths <alexcg1@users.noreply.github.com>
Signed-off-by: Joan Fontanals Martinez <joan.martinez@jina.ai>
@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@JoanFM JoanFM closed this May 27, 2023
@JoanFM JoanFM reopened this May 27, 2023
@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions
Copy link

📝 Docs are deployed on https://flow-docarray-v2-http--jina-docs.netlify.app 🎉

@JoanFM JoanFM merged commit 18fb903 into master May 29, 2023
@JoanFM JoanFM deleted the flow-docarray-v2-http branch May 29, 2023 11:05
@JoanFM JoanFM mentioned this pull request Jun 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexcg1 alexcg1 alexcg1 requested changes

Assignees
No one assigned
Labels
area/cicd This issue/PR affects the cicd pipeline area/core This issue/PR affects the core codebase area/docs This issue/PR affects the docs area/housekeeping This issue/PR is housekeeping area/testing This issue/PR affects testing component/client size/L size/M size/XL
Projects
None yet
Milestone
No milestone
3 participants
@JoanFM @alexcg1 @jina-bot