feat: Finishing touches

Author: mathhulk

Diff for: docker-compose.yaml

@@ -0,0 +1,38 @@
+services:
+  nginx:
+    build:
+      context: ./packages/nginx
+      dockerfile: Dockerfile
+    depends_on:
+      - api
+      - client
+    networks:
+      - semantic-search
+    ports:
+      - 8080:8080
+
+  client:
+    build:
+      context: ./packages/client
+      dockerfile: Dockerfile
+    ports:
+      - 5173:5173
+    networks:
+      - semantic-search
+    volumes:
+      - ./packages/client/src:/client/src
+
+  api:
+    build:
+      context: ./packages/api
+      dockerfile: Dockerfile
+    ports:
+      - 8000:8000
+    networks:
+      - semantic-search
+    volumes:
+      - ./packages/api/semantic_search:/api/semantic_search
+      - ./packages/api/.env:/api/.env
+
+networks:
+  semantic-search:

Diff for: packages/api/docker-compose.yml

@@ -1,25 +1,17 @@
-# Use an official Python runtime as a base image
 FROM python:3.12
 
-# Set environment variables
-ENV POETRY_VERSION=1.6.1 \
-    POETRY_VIRTUALENVS_CREATE=false \
-    POETRY_NO_INTERACTION=1
+ENV POETRY_VIRTUALENVS_CREATE=false \
+  POETRY_NO_INTERACTION=1
 
-# Install Poetry
-RUN pip install "poetry==$POETRY_VERSION"
+RUN pip install poetry
 
-# Set working directory
-WORKDIR /app
+WORKDIR /api
 
-# Copy your project files to the container
-COPY . .
+COPY pyproject.toml .
+COPY poetry.lock .
 
-# Install dependencies
-RUN poetry install --no-root
+RUN poetry install
 
-# Expose port if your app runs on a specific port (e.g., 8000)
-EXPOSE 8000
+COPY . .
 
-# Run the development server
 CMD ["poetry", "run", "dev"]

Diff for: packages/api/dockerfile

@@ -45,12 +45,12 @@ def get_model_results(models, query, topK=5):
 
 
 # Routes
-@app.route("/models", methods=["GET"])
+@app.route("/api/models", methods=["GET"])
 def get_models():
     return jsonify(list(loaded_models.keys()))
 
 
-@app.route("/sample", methods=["GET"])
+@app.route("/api/sample", methods=["GET"])
 def pick_models():
     query = request.args.get("query", type=str)
 
@@ -83,7 +83,7 @@ def pick_models():
 }
 
 
-@app.route("/outcome", methods=["GET"])
+@app.route("/api/outcome", methods=["GET"])
 def compare_models():
     query = request.args.get("query", type=str)
     model1 = request.args.get("firstModel", type=str)
@@ -148,7 +148,7 @@ def compare_models():
     )
 
 
-@app.route("/courses", methods=["GET"])
+@app.route("/api/courses", methods=["GET"])
 def get_items():
     query = request.args.get("query", type=str)
     input_models = request.args.get("model", type=str)
@@ -175,8 +175,8 @@ def get_items():
 
 
 def dev():
-    app.run(port=8000, debug=True)
+    app.run(host="0.0.0.0", port=8000, debug=True)
 
 
 def prod():
-    serve(app, listen="*:8080")
+    serve(app, listen="*:8000")

Diff for: packages/api/semantic_search/__init__.py

@@ -82,5 +82,29 @@
     "model1": "glove",
     "model2": "baseline",
     "choice": 2
+  },
+  {
+    "query": "easy english classes",
+    "model1": "glove",
+    "model2": "jacky_model",
+    "choice": 2
+  },
+  {
+    "query": "us history",
+    "model1": "jacky_model",
+    "model2": "baseline",
+    "choice": 1
+  },
+  {
+    "query": "business classes",
+    "model1": "raymond-model",
+    "model2": "baseline",
+    "choice": 2
+  },
+  {
+    "query": "test",
+    "model1": "atharv-model",
+    "model2": "glove",
+    "choice": 2
   }
 ]

Diff for: packages/api/semantic_search/log.json

@@ -1,17 +1,20 @@
 {
   "glove": {
-    "elo": 4.810010025493046
+    "elo": 5.898074758019437
   },
   "atharv-model": {
-    "elo": 32.567502041144834
+    "elo": 14.519483945230657
   },
   "subhash-model": {
     "elo": -31.260741118372025
   },
   "jacky_model": {
-    "elo": -16.06017828065074
+    "elo": 16.211434034653482
   },
   "baseline": {
-    "elo": -14.05659266761512
+    "elo": -12.01900561598686
+  },
+  "raymond-model": {
+    "elo": -17.349246003544696
   }
 }

Diff for: packages/api/semantic_search/models/jacky_model.py.archive renamed to packages/api/semantic_search/models/jacky_model.py

@@ -0,0 +1,12 @@
+FROM node:alpine
+
+WORKDIR /client
+
+COPY package.json .
+
+RUN npm install
+
+COPY . .
+
+CMD ["npm", "run", "dev"]
+