bugfixes

cirKITers · Jul 26, 2024 · cfabe73 · cfabe73
1 parent 94491ad
commit cfabe73
Show file tree

Hide file tree

Showing 35 changed files with 17 additions and 18 deletions.
diff --git a/dockerfile/Webapp.Dockerfile b/dockerfile/Webapp.Dockerfile
@@ -50,7 +50,7 @@ ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1  
 
 # Copy the Django project and the quafel_simulators
-COPY quafel_simulators/ quafel_simulators/
+#+COPY quafel_simulators/ quafel_simulators/
 COPY quafelweb/ quafelweb/
 COPY .env_secret .env_secret
 

diff --git a/quafelweb/account_controller/views.py b/quafelweb/account_controller/views.py
@@ -5,7 +5,6 @@
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from quafelweb.settings import OPENID_CONF_URL, OPENID_SECRET, OPENID_CLIENT_ID, OPENID_CLIENT_IDENT
-
 from account_controller.models import AdminAccount
 
 OAUTH = OAuth()

diff --git a/quafelweb/hardware_controller/management/commands/populate_models.py b/quafelweb/hardware_controller/management/commands/populate_models.py
@@ -1,8 +1,11 @@
 import random
+
 from django.core.management.base import BaseCommand
+
 from hardware_controller.models import HardwareProfile  # Import your model
 from simulation_data.models import SimulationRun, SimulatorProfile
 
+
 class Command(BaseCommand):
     help = 'Populates the database with example model entries'
 

diff --git a/quafel_simulators/__init__.py → quafelweb/quafel_simulators/__init__.py b/quafel_simulators/__init__.py → quafelweb/quafel_simulators/__init__.py
diff --git a/quafel_simulators/base/__init__.py → quafelweb/quafel_simulators/base/__init__.py b/quafel_simulators/base/__init__.py → quafelweb/quafel_simulators/base/__init__.py
diff --git a/quafel_simulators/base/hardware.py → quafelweb/quafel_simulators/base/hardware.py b/quafel_simulators/base/hardware.py → quafelweb/quafel_simulators/base/hardware.py
diff --git a/quafel_simulators/base/simulation_request.py → ...fel_simulators/base/simulation_request.py b/quafel_simulators/base/simulation_request.py → ...fel_simulators/base/simulation_request.py
diff --git a/quafel_simulators/base/simulator.py → ...elweb/quafel_simulators/base/simulator.py b/quafel_simulators/base/simulator.py → ...elweb/quafel_simulators/base/simulator.py
diff --git a/quafel_simulators/output.py → quafelweb/quafel_simulators/output.py b/quafel_simulators/output.py → quafelweb/quafel_simulators/output.py
diff --git a/quafel_simulators/quafelsubmitter.py → ...lweb/quafel_simulators/quafelsubmitter.py b/quafel_simulators/quafelsubmitter.py → ...lweb/quafel_simulators/quafelsubmitter.py
diff --git a/quafel_simulators/simulators.py → quafelweb/quafel_simulators/simulators.py b/quafel_simulators/simulators.py → quafelweb/quafel_simulators/simulators.py
diff --git a/quafel_simulators/tests/.gitignore → quafelweb/quafel_simulators/tests/.gitignore b/quafel_simulators/tests/.gitignore → quafelweb/quafel_simulators/tests/.gitignore
diff --git a/quafel_simulators/tests/__init__.py → ...elweb/quafel_simulators/tests/__init__.py b/quafel_simulators/tests/__init__.py → ...elweb/quafel_simulators/tests/__init__.py
diff --git a/quafel_simulators/tests/connection_tests.py → ...afel_simulators/tests/connection_tests.py b/quafel_simulators/tests/connection_tests.py → ...afel_simulators/tests/connection_tests.py
diff --git a/...el_simulators/tests/json_handler_tests.py → ...el_simulators/tests/json_handler_tests.py b/...el_simulators/tests/json_handler_tests.py → ...el_simulators/tests/json_handler_tests.py
diff --git a/quafel_simulators/tests/output_tests.py → ...b/quafel_simulators/tests/output_tests.py b/quafel_simulators/tests/output_tests.py → ...b/quafel_simulators/tests/output_tests.py
diff --git a/...simulators/tests/quafelsubmitter_tests.py → ...simulators/tests/quafelsubmitter_tests.py b/...simulators/tests/quafelsubmitter_tests.py → ...simulators/tests/quafelsubmitter_tests.py
diff --git a/...mulators/tests/script/quafel_test_yml.yml → ...mulators/tests/script/quafel_test_yml.yml b/...mulators/tests/script/quafel_test_yml.yml → ...mulators/tests/script/quafel_test_yml.yml
diff --git a/...ulators/tests/script/test_script_run.bash → ...ulators/tests/script/test_script_run.bash b/...ulators/tests/script/test_script_run.bash → ...ulators/tests/script/test_script_run.bash
diff --git a/...ators/tests/script/test_script_setup.bash → ...ators/tests/script/test_script_setup.bash b/...ators/tests/script/test_script_setup.bash → ...ators/tests/script/test_script_setup.bash
diff --git a/..._simulators/tests/script_builder_tests.py → ..._simulators/tests/script_builder_tests.py b/..._simulators/tests/script_builder_tests.py → ..._simulators/tests/script_builder_tests.py
diff --git a/quafel_simulators/tests/simulators_tests.py → ...afel_simulators/tests/simulators_tests.py b/quafel_simulators/tests/simulators_tests.py → ...afel_simulators/tests/simulators_tests.py
diff --git a/quafel_simulators/tests/test_script_setup.sh → ...fel_simulators/tests/test_script_setup.sh b/quafel_simulators/tests/test_script_setup.sh → ...fel_simulators/tests/test_script_setup.sh
diff --git a/quafel_simulators/tests/util.py → quafelweb/quafel_simulators/tests/util.py b/quafel_simulators/tests/util.py → quafelweb/quafel_simulators/tests/util.py
diff --git a/quafel_simulators/util/__init__.py → quafelweb/quafel_simulators/util/__init__.py b/quafel_simulators/util/__init__.py → quafelweb/quafel_simulators/util/__init__.py
diff --git a/quafel_simulators/util/connection.py → ...lweb/quafel_simulators/util/connection.py b/quafel_simulators/util/connection.py → ...lweb/quafel_simulators/util/connection.py
diff --git a/quafel_simulators/util/json_handler.py → ...eb/quafel_simulators/util/json_handler.py b/quafel_simulators/util/json_handler.py → ...eb/quafel_simulators/util/json_handler.py
diff --git a/quafel_simulators/util/pull_output.bash → ...b/quafel_simulators/util/pull_output.bash b/quafel_simulators/util/pull_output.bash → ...b/quafel_simulators/util/pull_output.bash
diff --git a/quafel_simulators/util/script_builder.py → .../quafel_simulators/util/script_builder.py b/quafel_simulators/util/script_builder.py → .../quafel_simulators/util/script_builder.py
diff --git a/quafelweb/quafelweb/settings.py b/quafelweb/quafelweb/settings.py
@@ -28,10 +28,6 @@
 else:
     raise RuntimeError("The .env_secret file is not present, get the .env_secret file from an admin")
 
-# Build path for the source outside the django-project
-EXTERNAL_DIR = os.path.join(BASE_DIR, '..', '..')
-if EXTERNAL_DIR not in sys.path:
-    sys.path.append(EXTERNAL_DIR)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
@@ -53,8 +49,11 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
 
+    'quafelweb',
+
     # libs
     'authlib',
+    'quafel_simulators',
 
     # apps
     'account_controller',

diff --git a/quafelweb/quafelweb/urls.py b/quafelweb/quafelweb/urls.py
@@ -15,7 +15,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.urls import path, include
-from django.views.generic.base import RedirectView
+
 urlpatterns = [
     path('', include('simulation_view.urls'), name='index'),
     path('account/', include('account_controller.urls')),

diff --git a/quafelweb/simulation_controller/util/simulation_request.py b/quafelweb/simulation_controller/util/simulation_request.py
@@ -1,7 +1,8 @@
 from hardware_controller.models import HardwareProfile
 from quafel_simulators.base.hardware import QuafelHardwareBase
-from quafel_simulators.base.simulation_request import QuafelSimulationRequest, IncrementType
+from quafel_simulators.base.simulation_request import IncrementType
 from quafel_simulators.base.simulator import QuafelSimulatorBase
+from quafel_simulators.quafelsubmitter import QuafelSimulationRequest
 from simulation_controller.util.scripted_hardware_connection import HardwareWithScript
 from simulation_data.models import SimulationRun, SimulatorProfile
 

diff --git a/quafelweb/simulation_controller/views.py b/quafelweb/simulation_controller/views.py
@@ -1,17 +1,14 @@
-import functools
 import itertools
 import json
 import math
-from operator import mul
 import random
-from typing import TypedDict
+
 from django.http import HttpResponse, JsonResponse
-from django.shortcuts import redirect, render
+from django.shortcuts import render
+
 from account_controller.views import AccountView
 from hardware_controller.models import HardwareProfile
 from simulation_data.models import SimulatorProfile, SimulationRun
-from simulation_data.simulation import SimulationEnv
-
 
 
 class SimulationRequestView:

diff --git a/quafelweb/simulation_data/models.py b/quafelweb/simulation_data/models.py
@@ -1,6 +1,7 @@
 """
 Defines the models used to store SimulationRuns in an database
 """
+
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 

diff --git a/quafelweb/simulation_view/views.py b/quafelweb/simulation_view/views.py
@@ -1,10 +1,9 @@
-from django.shortcuts import render
-
-from simulation_data.simulation import SimulationEnv, HardwareProfile
-from simulation_data.models import SimulatorProfile, SimulationRun
 import itertools
 
+from django.shortcuts import render
 
+from simulation_data.models import SimulatorProfile, SimulationRun
+from simulation_data.simulation import SimulationEnv, HardwareProfile
 
 
 class SimulationView: