Merge branch 'main' into refactor-upgrade

allenai · Jan 4, 2024 · 55fd134 · 55fd134
2 parents fa52425 + 1d287fe
commit 55fd134
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 546 deletions.
diff --git a/.github/workflows/build_and_push_docker_images.yml b/.github/workflows/build_and_push_docker_images.yml
@@ -4,8 +4,8 @@ on:
   push:
 
 env:
-  GHCR: ghcr.io
-  GHCR_IMAGE_NAME: ${{ github.repository }}
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push-image:

diff --git a/Dockerfile b/Dockerfile
@@ -27,9 +27,8 @@ COPY requirements.txt /home/vessel_detection/requirements.txt
 RUN pip install --no-cache-dir -r /home/vessel_detection/requirements.txt
 
 # Set Working Directory and Prepare App
-WORKDIR /home/vessel_detection/
+WORKDIR /home/vessel_detection/src
 COPY src /home/vessel_detection/src
-COPY main.py /home/vessel_detection/main.py
 COPY tests /home/vessel_detection/src/
 RUN mkdir -p /root/.cache/torch/hub/checkpoints/
 COPY torch_weights/swin_v2_s-637d8ceb.pth /root/.cache/torch/hub/checkpoints/swin_v2_s-637d8ceb.pth

diff --git a/data/reports/dataset_report.ipynb b/data/reports/dataset_report.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -9,6 +9,7 @@ pandas==1.4.3
 prometheus-client==0.11.0
 pyfaktory==0.2.1
 pyproj==3.4.0
+pytest==7.4.0
 python-dateutil==2.8.2
 rasterio==1.3.8
 requests==2.27.0

diff --git a/src/main.py b/src/main.py
@@ -16,8 +16,8 @@
 from fastapi import FastAPI, Response
 from pydantic import BaseModel
 
-from src.data.image import prepare_scenes
-from src.inference.pipeline import detect_vessels
+from data.image import prepare_scenes
+from inference.pipeline import detect_vessels
 
 app = FastAPI()