aaaaa

Dockerfile

@@ -13,8 +13,10 @@ FROM python:3.9 AS setup
 COPY --from=install /root/.local /root/.local
 
 WORKDIR /app
-COPY ./core .
-RUN python ./run.py
+COPY ./core ./core
+COPY ./init.py .
+
+RUN python ./init.py
 
 ##################################################################
 FROM python:3.9
@@ -28,10 +30,9 @@ COPY --from=install --chown=user /root/.local /home/user/.local
 
 WORKDIR $HOME/app
 
-COPY --chown=user ./core ./core
-COPY --chown=user ./api ./api
+COPY --chown=user . .
 
 COPY --from=setup --chown=user /app/engine.pickle ./engine.pickle
 
 EXPOSE 7860
-ENTRYPOINT ["python", "api/run.py"]
+ENTRYPOINT ["python", "run_api.py"]

api/service_manager.py

@@ -1,6 +1,6 @@
 import uvicorn
 
-from web_server import app
+from api.web_server import app
 
 
 def run():

api/web_server.py

@@ -1,19 +1,7 @@
-import os
-import sys
-import inspect
 import dill
 from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel
-
-
-current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parent_dir = os.path.dirname(current_dir)
-prev_dir = sys.path
-sys.path.insert(0, parent_dir+"/core")
-
-import search_engine
-
-sys.path = prev_dir
+from core.search_engine import PromptSearchEngine
 
 
 class Query(BaseModel):

core/initialization.py

@@ -1,7 +1,7 @@
 import dill
 
-from data.dataset import PromptDataset
-from search_engine import PromptSearchEngine
+from core.data.dataset import PromptDataset
+from core.search_engine import PromptSearchEngine
 
 
 def run():

core/search_engine.py

@@ -3,7 +3,7 @@ from typing import List, Sequence, Tuple
 import faiss
 import numpy as np
 
-from vectorizer import Vectorizer
+from core.vectorizer import Vectorizer
 
 
 class PromptSearchEngine:

init.py

@@ -0,0 +1,3 @@
+import core.initialization as init
+
+init.run()

run_api.py

@@ -0,0 +1,3 @@
+import api.service_manager as srv
+
+srv.run()