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.

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

chore: merge canals into Haystack codebase #6422

Merged
merged 418 commits into from Nov 27, 2023
Merged

chore: merge canals into Haystack codebase #6422

merged 418 commits into from Nov 27, 2023

Conversation

masci
Copy link
Member

@masci masci commented Nov 27, 2023

Related Issues

  • Part of the process to release 2.0

Proposed Changes:

Import Canals keeping the commit history

Notes for the reviewer

This is step 1 of 3:

  • Import the code preserving history
  • Adjust code layout
  • Update import paths and run the tests in CI

Checklist

silvanocerza and others added 30 commits June 19, 2023 10:06
Rework how component I/O is defined
Change InputSocket taken_by field to sender
Co-authored-by: ZanSara <sara.zanzottera@deepset.ai>
ZanSara and others added 18 commits October 25, 2023 15:37
* add Pipeline.describe_input()

* add tests

* split dict and str outputs and add to error messages

* tests

* accepts/expects

* move methods

* fix tests

* fix module name

* tests

* review feedback
* fix sample components

* make sum variadic

* separate queue and buffer

* all works but loops & variadics together

* fix some tests

* fix some tests

* all tests green

* clean up code a bit

* refactor code

* fix tests

* fix self loops

* fix reused sockets bug

* add distinct loops

* add distinct loops test

* break out some code from run()

* docstring

* improve variadics drawing

* black

* document the deepcopy

* re-arrange connection dataclass and add tests

* consumer -> receiver

* fix typing

* move Connection-related code under component package

* clean up connect()

* cosmetics and typing

* fix linter, make Connection a dataclass again

* fix typing

* add test case for #105

---------

Co-authored-by: Massimiliano Pippi <mpippi@gmail.com>
* Add component inputs/outputs methods

* Different impl approach

* Black fixes

* Rename functions to match naming in pipeline inputs/ouputs
Co-authored-by: ZanSara <sara.zanzottera@deepset.ai>
Update version to 0.10.0
* Read defaults from run signature

* simplify setting of sockets

* fix test

* Update sample_components/fstring.py

Co-authored-by: Massimiliano Pippi <mpippi@gmail.com>

* Update canals/component/component.py

Co-authored-by: Massimiliano Pippi <mpippi@gmail.com>

* dostring

---------

Co-authored-by: Massimiliano Pippi <mpippi@gmail.com>
* Use full import path as 'type' in serialization. Try to import the path when deserializing

* fix test data

* add from_dict test

* remove leftover

* Update canals/pipeline/pipeline.py

Co-authored-by: ZanSara <sara.zanzottera@deepset.ai>

* add error message to PipelineError

---------

Co-authored-by: ZanSara <sara.zanzottera@deepset.ai>
* copy input values before passing them down pipeline.run

* Update test_mutable_inputs.py
…4e72b'

git-subtree-dir: haystack/core
git-subtree-mainline: 892625a
git-subtree-split: f534a4c
@masci masci requested a review from a team as a code owner November 27, 2023 12:33
@masci masci requested review from silvanocerza and removed request for a team November 27, 2023 12:33
@github-actions github-actions bot added the type:documentation Improvements on the docs label Nov 27, 2023
@masci masci merged commit 011e32e into main Nov 27, 2023
8 checks passed
@masci masci deleted the merge-canals branch November 27, 2023 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic:CI type:documentation Improvements on the docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants