switch name from farm_haystack to haystack

jamescalam · Nov 27, 2019 · 3367b46 · 3367b46
1 parent 3ecdc03
commit 3367b46
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 27 deletions.
diff --git 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
@@ -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
@@ -38,7 +38,7 @@ Installation
 There are two ways to install:
 
 * (recommended) from source, :code:`git clone <url>` 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 → haystack/__init__.py b/farm_haystack/__init__.py → 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 → haystack/api/inference.py b/farm_haystack/api/inference.py → haystack/api/inference.py
@@ -6,10 +6,10 @@
 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 → haystack/database/__init__.py b/farm_haystack/database/__init__.py → haystack/database/__init__.py
diff --git a/farm_haystack/database/orm.py → haystack/database/orm.py b/farm_haystack/database/orm.py → 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 → haystack/indexing/__init__.py b/farm_haystack/indexing/__init__.py → haystack/indexing/__init__.py
diff --git a/farm_haystack/indexing/cleaning.py → haystack/indexing/cleaning.py b/farm_haystack/indexing/cleaning.py → haystack/indexing/cleaning.py
diff --git a/farm_haystack/indexing/io.py → haystack/indexing/io.py b/farm_haystack/indexing/io.py → 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 → haystack/reader/farm.py b/farm_haystack/reader/farm.py → haystack/reader/farm.py
diff --git a/farm_haystack/retriever/tfidf.py → haystack/retriever/tfidf.py b/farm_haystack/retriever/tfidf.py → haystack/retriever/tfidf.py
@@ -4,8 +4,8 @@
 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 → haystack/utils.py b/farm_haystack/utils.py → haystack/utils.py
@@ -3,8 +3,8 @@
 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
@@ -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
-}
+}