From 3367b463484e8a75d84e58a4048d1d71747f8b8e Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Wed, 27 Nov 2019 13:56:03 +0100 Subject: [PATCH] switch name from farm_haystack to haystack --- .gitignore | 2 +- Dockerfile | 4 ++-- README.rst | 2 +- {farm_haystack => haystack}/__init__.py | 6 +++--- {farm_haystack => haystack}/api/inference.py | 8 ++++---- .../database/__init__.py | 0 {farm_haystack => haystack}/database/orm.py | 2 +- .../indexing/__init__.py | 0 .../indexing/cleaning.py | 0 {farm_haystack => haystack}/indexing/io.py | 2 +- {farm_haystack => haystack}/reader/farm.py | 0 .../retriever/tfidf.py | 4 ++-- {farm_haystack => haystack}/utils.py | 4 ++-- tutorials/Tutorial1_Basic_QA_Pipeline.ipynb | 20 +++++++++---------- 14 files changed, 27 insertions(+), 27 deletions(-) rename {farm_haystack => haystack}/__init__.py (96%) rename {farm_haystack => haystack}/api/inference.py (91%) rename {farm_haystack => haystack}/database/__init__.py (100%) rename {farm_haystack => haystack}/database/orm.py (95%) rename {farm_haystack => haystack}/indexing/__init__.py (100%) rename {farm_haystack => haystack}/indexing/cleaning.py (100%) rename {farm_haystack => haystack}/indexing/io.py (97%) rename {farm_haystack => haystack}/reader/farm.py (100%) rename {farm_haystack => haystack}/retriever/tfidf.py (96%) rename {farm_haystack => haystack}/utils.py (96%) diff --git a/.gitignore b/.gitignore index 0cece31b1..5452f579a 100644 --- a/.gitignore +++ b/.gitignore @@ -129,4 +129,4 @@ dmypy.json .pyre/ # haystack files -farm_haystack/database/qa.db +haystack/database/qa.db diff --git a/Dockerfile b/Dockerfile index bf3336a3b..8b14ffc5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,10 +8,10 @@ RUN pip install -r requirements.txt RUN pip install -e . # copy code -COPY farm_haystack /home/user/farm_haystack +COPY haystack /home/user/haystack # copy saved FARM models COPY saved_models /home/user/saved_models # cmd for running the API -CMD FLASK_APP=farm_haystack.api.inference flask run --host 0.0.0.0 +CMD FLASK_APP=haystack.api.inference flask run --host 0.0.0.0 diff --git a/README.rst b/README.rst index 262d1d183..347f19f26 100644 --- a/README.rst +++ b/README.rst @@ -38,7 +38,7 @@ Installation There are two ways to install: * (recommended) from source, :code:`git clone ` and run :code:`pip install [--editable] .` from the root of the repositry. -* from PyPI, do a :code:`pip install farm_haystack` +* from PyPI, do a :code:`pip install farm-haystack` Usage ----- diff --git a/farm_haystack/__init__.py b/haystack/__init__.py similarity index 96% rename from farm_haystack/__init__.py rename to haystack/__init__.py index db1f779fd..156a1264b 100644 --- a/farm_haystack/__init__.py +++ b/haystack/__init__.py @@ -1,6 +1,6 @@ -from farm_haystack.retriever.tfidf import TfidfRetriever -from farm_haystack.reader.farm import FARMReader -from farm_haystack.database import db +from haystack.retriever.tfidf import TfidfRetriever +from haystack.reader.farm import FARMReader +from haystack.database import db import logging import farm diff --git a/farm_haystack/api/inference.py b/haystack/api/inference.py similarity index 91% rename from farm_haystack/api/inference.py rename to haystack/api/inference.py index 0a42af0de..e343e7815 100644 --- a/farm_haystack/api/inference.py +++ b/haystack/api/inference.py @@ -6,10 +6,10 @@ from flask import request, make_response from flask_cors import CORS from flask_restplus import Api, Resource -from farm_haystack import Finder -from farm_haystack.database import app -from farm_haystack.reader.farm import FARMReader -from farm_haystack.retriever.tfidf import TfidfRetriever +from haystack import Finder +from haystack.database import app +from haystack.reader.farm import FARMReader +from haystack.retriever.tfidf import TfidfRetriever CORS(app) api = Api( diff --git a/farm_haystack/database/__init__.py b/haystack/database/__init__.py similarity index 100% rename from farm_haystack/database/__init__.py rename to haystack/database/__init__.py diff --git a/farm_haystack/database/orm.py b/haystack/database/orm.py similarity index 95% rename from farm_haystack/database/orm.py rename to haystack/database/orm.py index 514827747..35a37ef40 100644 --- a/farm_haystack/database/orm.py +++ b/haystack/database/orm.py @@ -1,6 +1,6 @@ from sqlalchemy.orm import relationship -from farm_haystack.database import db +from haystack.database import db class ORMBase(db.Model): diff --git a/farm_haystack/indexing/__init__.py b/haystack/indexing/__init__.py similarity index 100% rename from farm_haystack/indexing/__init__.py rename to haystack/indexing/__init__.py diff --git a/farm_haystack/indexing/cleaning.py b/haystack/indexing/cleaning.py similarity index 100% rename from farm_haystack/indexing/cleaning.py rename to haystack/indexing/cleaning.py diff --git a/farm_haystack/indexing/io.py b/haystack/indexing/io.py similarity index 97% rename from farm_haystack/indexing/io.py rename to haystack/indexing/io.py index a9dd70c56..2080c0c11 100644 --- a/farm_haystack/indexing/io.py +++ b/haystack/indexing/io.py @@ -1,4 +1,4 @@ -from farm_haystack.database.orm import Document, db +from haystack.database.orm import Document, db from pathlib import Path import logging from farm.data_handler.utils import http_get diff --git a/farm_haystack/reader/farm.py b/haystack/reader/farm.py similarity index 100% rename from farm_haystack/reader/farm.py rename to haystack/reader/farm.py diff --git a/farm_haystack/retriever/tfidf.py b/haystack/retriever/tfidf.py similarity index 96% rename from farm_haystack/retriever/tfidf.py rename to haystack/retriever/tfidf.py index 47f7bb86c..9c6c4a920 100644 --- a/farm_haystack/retriever/tfidf.py +++ b/haystack/retriever/tfidf.py @@ -4,8 +4,8 @@ import logging import pandas as pd from sklearn.feature_extraction.text import TfidfVectorizer -from farm_haystack.database import db -from farm_haystack.database.orm import Document +from haystack.database import db +from haystack.database.orm import Document logger = logging.getLogger(__name__) diff --git a/farm_haystack/utils.py b/haystack/utils.py similarity index 96% rename from farm_haystack/utils.py rename to haystack/utils.py index 026754d3d..0bb191b3a 100644 --- a/farm_haystack/utils.py +++ b/haystack/utils.py @@ -3,8 +3,8 @@ from collections import defaultdict import logging import pprint -from farm_haystack.database.orm import Document -from farm_haystack.database.orm import db +from haystack.database.orm import Document +from haystack.database.orm import db logger = logging.getLogger(__name__) diff --git a/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb b/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb index 025090aac..f88a000f5 100644 --- a/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb +++ b/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb @@ -57,12 +57,12 @@ } ], "source": [ - "from farm_haystack.reader.farm import FARMReader\n", - "from farm_haystack.retriever.tfidf import TfidfRetriever\n", - "from farm_haystack import Finder\n", - "from farm_haystack.indexing.io import write_documents_to_db, fetch_archive_from_http\n", - "from farm_haystack.indexing.cleaning import clean_wiki_text\n", - "from farm_haystack.utils import print_answers" + "from haystack.reader.farm import FARMReader\n", + "from haystack.retriever.tfidf import TfidfRetriever\n", + "from haystack import Finder\n", + "from haystack.indexing.io import write_documents_to_db, fetch_archive_from_http\n", + "from haystack.indexing.cleaning import clean_wiki_text\n", + "from haystack.utils import print_answers" ] }, { @@ -93,7 +93,7 @@ ], "source": [ "# Init a database (default: sqllite)\n", - "from farm_haystack.database import db\n", + "from haystack.database import db\n", "db.create_all()\n", "\n", "# Let's first get some documents that we want to query\n", @@ -296,13 +296,13 @@ "pycharm": { "stem_cell": { "cell_type": "raw", + "source": [], "metadata": { "collapsed": false - }, - "source": [] + } } } }, "nbformat": 4, "nbformat_minor": 2 -} +} \ No newline at end of file