Merge pull request #4 from WSE-research/addChanges

Bugfixes
WSE-research · Jun 18, 2024 · c1acbd4 · c1acbd4
2 parents dd075be + cda2f13
commit c1acbd4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -10,7 +10,6 @@ jobs:
       MONGO_USER: ${{ secrets.USER_MONGO }}
       MONGO_PASSWORD: ${{ secrets.PASSWORD_MONGO }}
       MONGO_AUTHSOURCE: ${{ secrets.AUTHSOURCE_MONGO }}
-      GITHUB_WORKSPACE: ${{github.workspace}}
 
     steps:
     - uses: actions/checkout@v4

diff --git a/explanation_frontend.py b/explanation_frontend.py
@@ -30,6 +30,9 @@
 QANARY_PIPELINE_COMPONENTS = config('QANARY_PIPELINE_COMPONENTS')
 GITHUB_REPO = config('GITHUB_REPO')
 FEEDBACK_URL = config('FEEDBACK_URL')
+MONGO_USER = config('MONGO_USER')
+MONGO_PASSWORD = config('MONGO_PASSWORD')
+MONGO_AUTHSOURCE = config('MONGO_AUTHSOURCE')
 
 ### Pre-defined configurations
 explanation_configurations_dict = {
@@ -132,10 +135,10 @@
 if "showPreconfigured" not in st.session_state:
     st.session_state.showPreconfigured = True;
 
-mongo_client = pymongo.MongoClient(config('FEEDBACK_URL'),
-    username=config('MONGO_USER'),
-    password=config('MONGO_PASSWORD'),
-    authSource=config('MONGO_AUTHSOURCE'),
+mongo_client = pymongo.MongoClient(FEEDBACK_URL,
+    username=MONGO_USER,
+    password=MONGO_PASSWORD,
+    authSource=MONGO_AUTHSOURCE,
 )
 explanationsDb = mongo_client["explanations"]
 explanationsCol = explanationsDb["explanation"]

diff --git a/service_config/files/.env b/service_config/files/.env
@@ -2,7 +2,7 @@ QANARY_PIPELINE_URL=http://demos.swe.htwk-leipzig.de:40111
 QANARY_EXPLANATION_SERVICE_URL=http://demos.swe.htwk-leipzig.de:40190
 QANARY_PIPELINE_COMPONENTS=http://demos.swe.htwk-leipzig.de:40111/components
 GITHUB_REPO=https://github.com/WSE-research/qanary-explanainability-frontend
-FEEDBACK_URL=placeholder
-USER_MONGO=placeholder
-PASSWORD_MONGO=placeholder
-AUTHSOURCE_MONGO=placeholder
+FEEDBACK_URL=FEEDBACK_URL
+MONGO_USER=MONGO_USER
+MONGO_PASSWORD=MONGO_PASSWORD
+MONGO_AUTHSOURCE=MONGO_AUTHSOURCE