Update UPLOAD_PHOTO_FOR_DETECTION_ROUTE api route

docker-compose.yml

@@ -10,7 +10,7 @@ services:
         - CACERT_LOCATION
       context: ./backend
       target: ${BUILD_TARGET:-dev}
-    command: uvicorn src.main:app --reload --host 0.0.0.0 --port 5000 --no-server-header
+    command: uvicorn src.main:app --reload --host 0.0.0.0 --port 8000 --no-server-header
     container_name: basegun-backend
     environment:
       - S3_URL_ENDPOINT=http://minio:9000
@@ -23,7 +23,7 @@ services:
       - WORKSPACE=dev
       - REQUESTS_CA_BUNDLE=$CACERT_LOCATION
     ports:
-      - 5000:5000
+      - 8000:8000
     volumes:
       - $PWD/backend/src:/app/src
       - $PWD/backend/tests:/app/tests

frontend/.env.development

@@ -1 +1 @@
-VITE_API_HOST=http://localhost:5000
+VITE_API_HOST=http://localhost:8000

frontend/src/api/api-routes.ts

@@ -1,5 +1,5 @@
-export const UPLOAD_PHOTO_FOR_DETECTION_ROUTE = '/upload'
+export const UPLOAD_PHOTO_FOR_DETECTION_ROUTE = '/analyses/'
 export const TUTORIAL_FEEDBACK_ROUTE = '/tutorial-feedback'
 export const IDENTIFICATION_FEEDBACK_ROUTE = '/identification-feedback'
 export const IDENTIFICATION_DUMMY_ROUTE = '/identification-dummy'
-export const ASK_FOR_OPINION_ROUTE = 'http://localhost:8000/api/requests/'
+export const ASK_FOR_OPINION_ROUTE = '/requests/'

frontend/src/main.ts

@@ -19,7 +19,9 @@ register()
 const pinia = createPinia()
 
 // the FastAPI backend
-axios.defaults.baseURL = '/api/'
+const apiHost = import.meta.env.VITE_API_HOST || 'http://basegun-backend:5000'
+
+axios.defaults.baseURL = apiHost + '/api/'
 
 // Register all icons
 addIcons(...Object.values(icons))

frontend/src/views/InstructionsPage.vue

@@ -18,14 +18,10 @@ const router = useRouter()
 const handledImageTypes = 'image/jpeg, image/png, image/tiff, image/webp, image/bmp, image/gif'
 
 async function uploadImage (base64: string, fileName: string) {
-  const file = await srcToFile(base64, fileName, 'image/jpeg')
-
-  const fd = new FormData()
-  fd.append('image', file, file.name)
-  fd.append('date', '' + (Date.now() / 1000)) // date.now gives in milliseconds, convert to seconds
-
   try {
-    const { data } = await axios.post('/upload', fd)
+    const { data } = await axios.post('/analyses/', {
+      "picture": base64
+    })
     resultStore.$patch({
       typology: data.label,
       confidence: data.confidence,
@@ -81,12 +77,6 @@ function resizeImage (uploadedFile: File) {
   })
 }
 
-async function srcToFile (src: string, fileName: string, mimeType: string) {
-  const res = await fetch(src)
-  const buf = await res.arrayBuffer()
-  return new File([buf], fileName, { type: mimeType })
-}
-
 function onFileSelected (event: InputEvent & { target: InputEvent['target'] & { files: File[] } }) {
   loading.value = true
   const uploadedFile = event.target?.files[0]

frontend/vite.config.ts

@@ -11,8 +11,6 @@ import {
   vueDsfrComponentResolver,
 } from '@gouvminint/vue-dsfr'
 
-const apiHost = process.env.API_HOST || 'http://basegun-backend:5000'
-
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
@@ -100,12 +98,6 @@ export default defineConfig({
     },
   },
   server: {
-    host: true,
-    proxy: {
-      '^/api': {
-        target: `${apiHost}`,
-        changeOrigin: true,
-      },
-    },
+    host: true
   },
 })