Remove tracking and feedback consistency

.dockerignore

@@ -7,7 +7,6 @@
 .venv
 .vscode
 data
-init-mongo.js
 
 # files and directories in the whole project
 **/.gitignore

.env

@@ -12,9 +12,6 @@ LOAD_BALANCER_CONFIG_FILE_PATH=src/node_config.docker.yml
 
 # shared worker variables
 AUTHORIZATION_SECRET=YWVuaXF1YWRpNWNlaXJpNmFlbTZkb283dXphaVF1b29oM3J1MWNoYWlyNHRoZWUzb2huZ2FpM211bGVlM0VpcAo=
-DATABASE_HOST=database
-DATABASE_PORT=27017
-DATABASE_NAME=athene_db
 BALANCER_QUEUE_FREQUENCY=600
 BALANCER_GETTASK_URL=http://load-balancer:8000/getTask
 BALANCER_SENDRESULT_URL=http://load-balancer:8000/sendTaskResult
@@ -23,18 +20,4 @@ BALANCER_SENDRESULT_URL=http://load-balancer:8000/sendTaskResult
 
 # embedding variables
 EMBEDDING_CLOUD_CONFIG_PATH=./embedding/src/cloud/config.py
-EMBEDDING_DATABASE_USER=embedding
-EMBEDDING_DATABASE_PWD=embedding_password
 EMBEDDING_CHUNK_SIZE=50
-
-# clustering variables
-CLUSTERING_DATABASE_USER=embedding
-CLUSTERING_DATABASE_PWD=embedding_password
-
-# tracking variables
-TRACKING_DATABASE_USER=tracking
-TRACKING_DATABASE_PWD=tracking_password
-
-# database variables
-DATABASE_ROOT_USERNAME=root
-DATABASE_ROOT_PASSWORD=root_password

.github/workflows/dockerimage.yml

@@ -91,22 +91,3 @@ jobs:
       run: ./.github/workflows/scripts/dockerimage.sh "clustering"
     - name: Run unittests for clustering-component
       run: docker run -i --rm --entrypoint python ghcr.io/ls1intum/athena/clustering:${GITHUB_REF##*/} -m unittest discover -p test_*.py
-
-  athene-tracking:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${GITHUB_ACTOR}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USER }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-      if: github.ref == 'refs/heads/master'
-    - name: Build and Push the athene-tracking Docker image
-      run: ./.github/workflows/scripts/dockerimage.sh "tracking"

.github/workflows/scripts/dockerimage.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-COMPONENT=$1      # Parameter $1 (Component): either "load-balancer", "segmentation", "embedding", "clustering" or "tracking"
+COMPONENT=$1      # Parameter $1 (Component): either "load-balancer", "segmentation", "embedding" or "clustering"
 
 echo -e "INFO: Building ${COMPONENT}-component"
 

.local.env

@@ -11,28 +11,11 @@ LOAD_BALANCER_CONFIG_FILE_PATH=src/node_config.local.yml
 
 # shared worker variables
 AUTHORIZATION_SECRET=YWVuaXF1YWRpNWNlaXJpNmFlbTZkb283dXphaVF1b29oM3J1MWNoYWlyNHRoZWUzb2huZ2FpM211bGVlM0VpcAo=
-DATABASE_HOST=database
-DATABASE_PORT=27017
-DATABASE_NAME=athene_db
 BALANCER_QUEUE_FREQUENCY=600
 BALANCER_GETTASK_URL=http://localhost:8000/getTask
 BALANCER_SENDRESULT_URL=http://localhost:8000/sendTaskResult
 
 # segmentation variables
 
 # embedding variables
-EMBEDDING_DATABASE_USER=embedding
-EMBEDDING_DATABASE_PWD=embedding_password
 EMBEDDING_CHUNK_SIZE=50
-
-# clustering variables
-CLUSTERING_DATABASE_USER=embedding
-CLUSTERING_DATABASE_PWD=embedding_password
-
-# tracking variables
-TRACKING_DATABASE_USER=tracking
-TRACKING_DATABASE_PWD=tracking_password
-
-# database variables
-DATABASE_ROOT_USERNAME=root
-DATABASE_ROOT_PASSWORD=root_password

.run/All Services.run.xml

@@ -5,7 +5,6 @@
     <toRun name="embedding" type="PythonConfigurationType" />
     <toRun name="load-balancer" type="PythonConfigurationType" />
     <toRun name="segmentation" type="PythonConfigurationType" />
-    <toRun name="tracking" type="PythonConfigurationType" />
     <method v="2" />
   </configuration>
 </component>

.run/Traefik and DB.run.xml → .run/Traefik.run.xml

@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="docker-compose-traefik-db.yml: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+  <configuration default="false" name="docker-compose-traefik.yml: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
         <option name="envFilePath" value="$PROJECT_DIR$/.local.env" />
-        <option name="sourceFilePath" value="docker-compose-traefik-db.yml" />
+        <option name="sourceFilePath" value="docker-compose-traefik.yml" />
       </settings>
     </deployment>
     <method v="2" />

Makefile

@@ -4,7 +4,7 @@ export
 
 all: | setup start
 
-setup: .venv setup-protobuf setup-clustering setup-embedding setup-load-balancer setup-segmentation setup-tracking
+setup: .venv setup-protobuf setup-clustering setup-embedding setup-load-balancer setup-segmentation
 
 .venv:
 	python -m venv .venv
@@ -29,10 +29,6 @@ setup-segmentation:
 	$(info Building segmentation)
 	cd segmentation && $(MAKE)
 
-setup-tracking:
-	$(info Building tracking)
-	cd tracking && $(MAKE)
-
 start-clustering: setup-clustering
 	$(info Starting clustering)
 	$(MAKE) -C clustering start
@@ -49,17 +45,13 @@ start-segmentation: setup-segmentation
 	$(info Starting segmentation)
 	$(MAKE) -C segmentation start
 
-start-tracking: setup-tracking
-	$(info Starting tracking)
-	$(MAKE) -C tracking start
-
-start-traefik-db:
-	$(info Starting traefik and db)
-	docker-compose -f docker-compose-traefik-db.yml up
+start-traefik:
+	$(info Starting traefik)
+	docker-compose -f docker-compose-traefik.yml up
 
 start:
 	$(info Starting all services)
-	$(MAKE) -j6 start-clustering start-embedding start-load-balancer start-segmentation start-tracking start-traefik-db
+	$(MAKE) -j6 start-clustering start-embedding start-load-balancer start-segmentation start-traefik
 
 clean:
 	rm -rf .venv
@@ -68,6 +60,5 @@ clean:
 	cd embedding && $(MAKE) clean
 	cd load-balancer && $(MAKE) clean
 	cd segmentation && $(MAKE) clean
-	cd tracking && $(MAKE) clean
 
-.PHONY: all setup setup-protobuf setup-clustering setup-embedding setup-load-balancer setup-segmentation setup-tracking start-clustering start-embedding start-load-balancer start-segmentation start-tracking start-traefik-db start clean
+.PHONY: all setup setup-protobuf setup-clustering setup-embedding setup-load-balancer setup-segmentation start-clustering start-embedding start-load-balancer start-segmentation start-traefik start clean

README.md

@@ -67,7 +67,7 @@ which initializes virtual environments,
 installs dependencies and downloads required models.
 After that the services will be started automatically.
 
-There is one special target in the `Makefile` that will start traefik and the MongoDB database in a docker container
+There is one special target in the `Makefile` that will start traefik in a docker container
 to redirect to the services running on your local machine.
 
 You can always just directly use `make` and it will automatically detect changed dependencies.
@@ -87,7 +87,6 @@ If you are using PyCharm, you can configure the project as follows:
     \- `embedding`
     \- `load-balancer`
     \- `segmentation`
-    \- `tracking`
 
 5.  Configure the virtual environment Python interpreters for the different modules: For each of the modules in the list above, go to `File -> Settings -> Project: Athena -> Project Interpreter` and select the virtual environment in the `.venv` directory of the respective module.
 
@@ -115,8 +114,6 @@ The following API-routes are available after start:
 *   <http://localhost/getTask> - For the computation components to query tasks from the load balancer
 *   <http://localhost/sendTaskResult> - For the computation components to send back results to the load balancer
 *   <http://localhost/upload> - For Artemis to upload course material
-*   <http://localhost/tracking> - For Artemis to access tracking functionality
-*   <http://localhost/feedback_consistency> - For Artemis to access feedback\_consistency functionality
 
 Traefik provides a dashboard to monitor the status of underlying components.
 This dashboard is available on <http://localhost:9081/dashboard> by default.