Fix Dependency Issues

.gitignore

@@ -3,6 +3,7 @@
 __pycache__
 .pytest_cache/
 .DS_Store
+.idea/
 
 # Anserini index
 anserini/
@@ -22,3 +23,7 @@ variables/
 # client builds
 build/
 static/
+
+# virtual environments
+venv/
+env/

api/Dockerfile

@@ -0,0 +1,30 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository ppa:openjdk-r/ppa && \
+    apt-get update && \
+    apt-get install -y openjdk-11-jdk && \
+    apt-get install -y openjdk-11-jre
+
+RUN apt-get install -y --no-install-recommends  git
+
+WORKDIR /server
+COPY . /server/
+
+
+RUN apt update && apt install -y python3-pip
+RUN pip3 install --upgrade pip setuptools
+
+RUN pip3 install --pre torch torchvision torchaudio -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+RUN pip3 install faiss-cpu hnswlib
+RUN pip3 install hnswlib
+
+RUN pip3 install --upgrade pip && pip3 install -r requirements.txt
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+ENV DEVELOPMENT=True
+
+EXPOSE 8000
+
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

api/app/main.py

@@ -7,7 +7,7 @@
 from app.routers import related, search
 from app.services.highlighter import Highlighter
 from app.services.ranker import Ranker
-from app.services.related_searcher import RelatedSearcher
+# from app.services.related_searcher import RelatedSearcher
 from app.services.searcher import Searcher
 from app.settings import settings
 
@@ -21,8 +21,8 @@
     if settings.neural_ranking:
         app.state.ranker = Ranker()
 
-    if settings.related_search:
-        app.state.related_searcher = RelatedSearcher()
+    # if settings.related_search:
+    #     app.state.related_searcher = RelatedSearcher()
 
     app.state.searcher = Searcher()
 

api/environment.yml

@@ -0,0 +1,8 @@
+
+name: docker
+channels:
+  - conda-forge
+  - pytorch
+dependencies:
+  - pytorch-cpu
+  - torchvision-cpu

api/requirements.txt

@@ -3,8 +3,7 @@ fastapi[all]==0.52.0
 freezegun==0.3.15
 hnswlib==0.3.4
 httpx==0.12.1
-git+https://[email protected]/castorini/pygaggle.git@818a2487cb7af8ecdd63
+git+https://[email protected]/castorini/pygaggle.git@2bb2f0eb9cc34ac626ffb7648b73b4695468eba7
 python-dotenv==0.12.0
 pytest==5.4.1
-pytest-mock==3.1.0
-torch==1.8.1
+pytest-mock==3.1.0

api/schema/acl.json

@@ -4,12 +4,12 @@
     "default": "...",
     "fieldSize": "single"
   },
-  "abstract_html": {
+  "abstract": {
     "type": "str",
     "default": "None",
     "fieldSize": "single"
   },
-  "authors": {
+  "author": {
     "type": "List[str]",
     "default": "[]",
     "fieldSize": "multi"