Merge pull request #60 from SCAI-BIO/configure-api-prod-url

Add docker configurable production url to Dockerfile.prod

.github/workflows/docker-publish.yml

@@ -24,7 +24,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: ./api
-        file: ./api/Dockerfile
+        file: ./api/Dockerfile.prod
         push: true
         tags: |
           ghcr.io/scai-bio/index/api:latest

api/Dockerfile.prod

@@ -0,0 +1,15 @@
+# Define the base image
+FROM python:3.9
+
+ENV WEAVIATE_URL=http://ww8.index.k8s.bio.scai.fraunhofer.de
+
+COPY routes.py .
+
+# Install API requirements
+COPY requirements.txt /tmp/
+RUN pip install --requirement /tmp/requirements.txt
+
+EXPOSE 80
+
+# API entry point
+CMD ["uvicorn", "routes:app", "--host", "0.0.0.0", "--port", "80"]

api/routes.py

@@ -4,19 +4,17 @@
 import time
 
 import uvicorn
-from datastew import DataDictionarySource, BaseRepository
+from datastew import DataDictionarySource
+from datastew.embedding import MPNetAdapter
 from datastew.process.ols import OLSTerminologyImportTask
 from datastew.repository import WeaviateRepository
-
+from datastew.repository.model import Terminology, Concept, Mapping
+from datastew.visualisation import get_plot_for_current_database_state
 from fastapi import FastAPI, HTTPException, File, UploadFile
 from starlette.background import BackgroundTasks
 from starlette.middleware.cors import CORSMiddleware
 from starlette.responses import RedirectResponse, HTMLResponse
 
-from datastew.repository.model import Terminology, Concept, Mapping
-from datastew.embedding import MPNetAdapter
-from datastew.visualisation import get_plot_for_current_database_state
-
 app = FastAPI(
     title="INDEX",
     description="<div id=info-text><h1>Introduction</h1>"
@@ -50,10 +48,11 @@
 
 
 def connect_to_remote_weaviate_repository():
+    weaviate_url = os.getenv("WEAVIATE_URL", "http://weaviate:8080")
     retries = 5
     for i in range(retries):
         try:
-            return WeaviateRepository(mode="remote", path="http://weaviate:8080")
+            return WeaviateRepository(mode="remote", path=weaviate_url)
         except Exception as e:
             logger.info(f"Attempt {i + 1} failed: {e}")
             time.sleep(5)

docker-compose.local.yaml

@@ -15,7 +15,7 @@ services:
     image: index-api
     build:
       context: ./api
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.dev
     ports:
       - "5000:80"
     depends_on: