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

Align REST API and Haystack versions #2164

Merged
merged 6 commits into from
Feb 11, 2022
Merged

Conversation

ZanSara
Copy link
Contributor

@ZanSara ZanSara commented Feb 10, 2022

The version for the REST API FastAPI application was hardcoded to 1.0.0. Here The version number is now aligned with Haystack's.

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

Copy link
Member

@julian-risch julian-risch left a comment

Choose a reason for hiding this comment

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

Just a small change you should please do before merging: the tutorial 6 changes from #2148 made it in here. We shouldn't do that. Could you please remove them?

{
Copy link
Member

Choose a reason for hiding this comment

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

Just as a warning. Watch out when merging this PR with your other changes of openapi.json in other open PRs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll manually check if anybody has merge conflicts, hopefully there won't be many

"info": {
"title": "Haystack REST API",
"version": "1.1.0"
Copy link
Member

Choose a reason for hiding this comment

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

Would be nice to automate updating this when we make a new release. For now a left a comment in Notion about manually updating it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's actually automated! 😁 Check line 21 of rest_api/application.py

@@ -116,13 +116,13 @@ See [their docs](https://milvus.io/docs/v1.0.0/milvus_docker-cpu.md) for more de


```python
!pip install git+https://github.com/deepset-ai/haystack.git#egg=farm-haystack[milvus]
Copy link
Member

Choose a reason for hiding this comment

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

The tutorial 6 changes from #2148 made it in here. We shouldn't do that. Could you please remove them?

@@ -384,11 +384,11 @@
"source": [
"# !pip install git+https://github.com/deepset-ai/haystack.git#egg=farm-haystack[milvus]\n",
"\n",
"#from haystack.utils import launch_milvus\n",
"#from haystack.document_stores import MilvusDocumentStore\n",
"# from haystack.utils import launch_milvus\n",
Copy link
Member

Choose a reason for hiding this comment

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

The tutorial 6 changes from #2148 made it in here. We shouldn't do that. Could you please remove them?

@ZanSara ZanSara merged commit fdc3629 into master Feb 11, 2022
@ZanSara ZanSara deleted the rest_api_version_alignment branch February 11, 2022 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic:rest_api type:refactor Not necessarily visible to the users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants