Merge pull request #40 from juliushaag/folder-restructure

Restructuring of the folders according to "Entwurfsheft"

quafelweb/account_controller/authenticate.py

@@ -23,6 +23,7 @@ def get_identifier(self, request):
   def is_logged_in(self, request):
     raise NotImplementedError()
 
+
   def RegisterInstance(name : str, auth : "BaseAuthenticator"):
     BaseAuthenticator._AUTHENTICATORS[name] = auth
 

quafelweb/account_controller/manager.py

@@ -5,7 +5,7 @@
 
 import account_controller.kitopenid # This needs to be here
 from account_controller import authenticate
-from account_controller.models import QuafelAdmin
+from account_controller.models import AdminAccount
 # Create your views here.
 
 class AccountManager():
@@ -20,7 +20,7 @@ def _deco(req):
       if not AccountManager._AUTH.is_logged_in(req):
         return AccountManager._AUTH.authenticate(req, req.build_absolute_uri(reverse('auth')))
       ident = AccountManager._AUTH.get_identifier(req)
-      if QuafelAdmin.objects.contains(QuafelAdmin(ident)):
+      if AdminAccount.objects.contains(AdminAccount(ident)):
         return redirect('denied')
       return fn(req)
 

quafelweb/account_controller/views.py

@@ -1,13 +1,27 @@
 
 
+from django.http import HttpResponse
+
+
 class AccountView:
 
-  # /
-  def index(request):
+  def manage_accounts(request) -> HttpResponse:
     ...
 
-  def add_admin(request):
+  def add_admin(request) -> HttpResponse:
+    ...
+
+  def remove_admin(request) -> HttpResponse:
+    ...
+
+  def authenticate(request) -> HttpResponse:
+    ...
+
+  def authenticate_callback(requests) -> HttpResponse:
+    ...
+
+  def get_identifier(request) -> str:
     ...
 
-  def remove_admin(request):
+  def is_logged_in(request) -> bool:
     ...

quafelweb/hardware_controller/views.py

@@ -5,7 +5,7 @@
 class HardwareView:
 
   # /hardware
-  def index(request):
+  def manage_controllers(request):
     ...
 
   # /hardware/add with post
@@ -20,8 +20,5 @@ def remove_profile(request):
   def archive_profile(request):
     ...
 
-  # return List of HardwareProfile Ids connected with the request (persistent Links)
-  def getConst(request):
-    ...
 
 

quafelweb/quafel_simulators/backend/gpu-cluster.py

@@ -0,0 +1 @@
+from quafel_simulators.simulator import 

quafelweb/quafel_simulators/simulator.py

@@ -1,11 +1,11 @@
 from abc import ABC
-from simulation_data.simulation import SimulationGroup
+from simulation_data.simulation import SimulationGroup, HardwareProfile
 
 
 class Simulator(ABC):
 
-  def simulate(self, group : SimulationGroup):
+  def simulate(self, ip : str, port : int , simulators : list[str], qbits : set[int], ...):
     ...
 
   def collect(self) -> dict:
-    ...
+    ...

quafelweb/simulation_controller/views.py

@@ -11,3 +11,5 @@ def select_environments(request):
   def submit_request(request):
     ...
 
+  def claim_results(request):
+    ...

quafelweb/simulation_view/views.py

@@ -27,9 +27,3 @@ def render_view(request, sim_envs : list[SimulationEnv], sim_confs : dict[str, l
     context = { 'environments' : sim_envs }
 
     return render(request, 'index.html', context)
-
-
-  # return Integers of Simulation Data already in database
-  def getRunnedData(request):
-    ...
-