fix: Different fixes for AutoACMG in REEV (#806)

bihealth · Sep 23, 2024 · 016be2a · 016be2a
1 parent 20969f4
commit 016be2a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/backend/app/api/internal/endpoints/proxy.py b/backend/app/api/internal/endpoints/proxy.py
@@ -52,9 +52,9 @@ async def reverse_proxy(request: Request) -> Response:
         backend_url = settings.BACKEND_PREFIX_CADA_PRIO + url.path.replace(
             "/internal/proxy/cada-prio", ""
         )
-    elif url.path.startswith(f"{settings.INTERNAL_STR}/proxy/autoacmg"):
+    elif url.path.startswith(f"{settings.INTERNAL_STR}/proxy/auto-acmg"):
         backend_url = settings.BACKEND_PREFIX_AUTOACMG + url.path.replace(
-            "/internal/proxy/autoacmg", ""
+            "/internal/proxy/auto-acmg", ""
         )
 
     if backend_url:

diff --git a/backend/app/core/config.py b/backend/app/core/config.py
@@ -123,7 +123,7 @@ def assemble_cors_origins(cls, v: str | list[str]) -> list[str] | str:  # pragma
     #: Prefix for the backend of cada-prio service.
     BACKEND_PREFIX_CADA_PRIO: str = "http://cada-prio:8080"
     #: Prefix for the backend of autoacmg service.
-    BACKEND_PREFIX_AUTOACMG: str = "http://autoacmg:8000"
+    BACKEND_PREFIX_AUTOACMG: str = "http://auto-acmg:8080"
 
     #: URL to Redis service.
     REDIS_URL: str = "redis://redis:6379"

diff --git a/frontend/src/api/autoacmg/client.spec.ts b/frontend/src/api/autoacmg/client.spec.ts
@@ -33,7 +33,7 @@ describe('AutoACMGClient', () => {
     expect(result).toEqual(AUTOACMG_SEQVAR_RESULT['prediction'])
     expect(fetchMocker).toHaveBeenCalledTimes(1)
     expect(fetchMocker).toHaveBeenCalledWith(
-      '/internal/proxy/autoacmg/api/v1/predict/seqvar?variant_name=chr17:41215920:G:T&genome_release=grch37',
+      '/internal/proxy/auto-acmg/api/v1/predict/seqvar?variant_name=chr17:41215920:G:T&genome_release=grch37',
       expect.objectContaining({
         method: 'GET',
         headers: {

diff --git a/frontend/src/api/autoacmg/client.ts b/frontend/src/api/autoacmg/client.ts
@@ -1,11 +1,11 @@
 import { ConfigError } from '@bihealth/reev-frontend-lib/api/common'
 import { Seqvar } from '@bihealth/reev-frontend-lib/lib/genomicVars'
 
-import { API_INTERNAL_BASE_PREFIX } from '../common'
+import { API_INTERNAL_BASE_PREFIX_AUTO_ACMG } from '../common'
 import { AutoACMGSeqVarResult } from './types'
 
 //: URL to the AutoACMG API
-const API_BASE_URL = `${API_INTERNAL_BASE_PREFIX}proxy/autoacmg/api/v1`
+const API_BASE_URL = `${API_INTERNAL_BASE_PREFIX_AUTO_ACMG}/api/v1`
 
 export class AutoACMGClient {
   private apiBaseUrl: string
@@ -36,6 +36,7 @@ export class AutoACMGClient {
   async classifySequenceVariant(seqvar: Seqvar): Promise<AutoACMGSeqVarResult> {
     const seqvarName = `chr${seqvar.chrom}:${seqvar.pos}:${seqvar.del}:${seqvar.ins}`
 
+    console.log('REQUESTING', this.apiBaseUrl)
     const url =
       `${this.apiBaseUrl}/predict/seqvar?variant_name=${seqvarName}` +
       `&genome_release=${seqvar.genomeBuild}`

diff --git a/frontend/src/api/common/api.ts b/frontend/src/api/common/api.ts
@@ -5,4 +5,5 @@ export const API_INTERNAL_BASE_PREFIX_VIGUNO = '/internal/proxy/viguno'
 export const API_INTERNAL_BASE_PREFIX_NGINX = '/internal/proxy/nginx'
 export const API_INTERNAL_BASE_PREFIX_DOTTY = '/internal/proxy/dotty'
 export const API_INTERNAL_BASE_PREFIX_CADA_PRIO = '/internal/proxy/cada-prio'
+export const API_INTERNAL_BASE_PREFIX_AUTO_ACMG = '/internal/proxy/auto-acmg'
 export const API_V1_BASE_PREFIX = '/api/v1/'
diff --git a/frontend/src/stores/seqvarAcmgRating/store.ts b/frontend/src/stores/seqvarAcmgRating/store.ts
@@ -8,8 +8,7 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
 import { AcmgSeqVarClient } from '@/api/acmgSeqvar'
-import { AutoACMGClient } from '@/api/autoacmg'
-import { AutoACMGPrediction, AutoACMGStrength } from '@/api/autoacmg/types'
+import { AutoACMGClient, AutoACMGPrediction, AutoACMGStrength } from '@/api/autoacmg'
 import { InterVarClient } from '@/api/intervar'
 import {
   ALL_ACMG_CRITERIA,