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

refactor: update package strategy in ui #3396

Merged
merged 14 commits into from
Oct 20, 2022
Merged

refactor: update package strategy in ui #3396

merged 14 commits into from
Oct 20, 2022

Conversation

anakin87
Copy link
Member

Related Issues

Proposed Changes:

Similarly to #3148, I'm trying to update package strategy in ui

How did you test it?

  • pip install /path/to/haystack-repo/ui
  • I have verified that Quick Demo can properly run via Docker Compose
  • CI..

Notes for the reviewer

It's just a first try. @masci @ZanSara feel free to guide me...

Checklist

@anakin87 anakin87 requested review from a team as code owners October 15, 2022 11:50
@anakin87 anakin87 requested review from bogdankostic and removed request for a team October 15, 2022 11:50
@anakin87 anakin87 marked this pull request as draft October 15, 2022 12:02
@anakin87 anakin87 marked this pull request as ready for review October 16, 2022 10:46
@anakin87
Copy link
Member Author

  • After moving some directories, there were issues with rest/UI tests.
    I used matrix.folder to run them separately and now these tests are correctly running.

  • There are problems with pipeline-yaml test.
    My PR doesn't change the schema, so it is identical to the schema of the main branch.
    But the test fails, as if the schema generated for the test is different from the schema of the main branch.
    @ZanSara any ideas?

@anakin87 anakin87 marked this pull request as draft October 17, 2022 23:20
@anakin87 anakin87 marked this pull request as ready for review October 17, 2022 23:20
@anakin87 anakin87 marked this pull request as draft October 18, 2022 07:14
@anakin87 anakin87 marked this pull request as ready for review October 18, 2022 07:14
ZanSara
ZanSara suggested changes Oct 18, 2022
View reviewed changes
Copy link
Contributor

@ZanSara ZanSara left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good! Only one issue to address.

PS: I've seen the schema check passes now. Sorry for the hassle with it, I hope it will be more stable now 😅

.github/workflows/tests.yml Outdated Show resolved Hide resolved
ui/Dockerfile
Comment on lines -6 to -13
RUN mkdir ui/
COPY . /opt/ui
COPY . /ui

# install as a package
RUN pip install --upgrade pip && \
pip install /opt/ui/
pip install /ui/

WORKDIR /opt
Copy link
Contributor

Choose a reason for hiding this comment

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

Just curious here, there was a specific reason to move /ui out of /opt?

Copy link
Member Author

Choose a reason for hiding this comment

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

No particular reason.
I tried to clean and simplify the Dockerfile.
If it's not desirable, I can easily revert this change!

Copy link
Contributor

Choose a reason for hiding this comment

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

No no, that's all right 👍 I'll tag @masci just in case but I don't see an issue here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Not a big deal, /opt is just a convention (albeit a very widespread one 😅)

@ZanSara ZanSara added type:refactor Not necessarily visible to the users topic:ui labels Oct 18, 2022
@ZanSara ZanSara removed the request for review from bogdankostic October 18, 2022 08:17
@anakin87 anakin87 requested a review from ZanSara October 18, 2022 18:51
@anakin87 anakin87 marked this pull request as draft October 20, 2022 08:46
@anakin87 anakin87 marked this pull request as ready for review October 20, 2022 08:47
ZanSara
ZanSara approved these changes Oct 20, 2022
View reviewed changes
Copy link
Contributor

@ZanSara ZanSara left a comment

Choose a reason for hiding this comment

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

Glad this new version is working! Thank you for all the work 😊

@ZanSara ZanSara merged commit 8c1a344 into deepset-ai:main Oct 20, 2022
@anakin87 anakin87 deleted the update_package_ui branch October 20, 2022 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@masci masci masci left review comments

@ZanSara ZanSara ZanSara approved these changes

Assignees
No one assigned
Labels
type:refactor Not necessarily visible to the users
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@anakin87 @masci @ZanSara