From 67cf7eaad676a221d1452877e58686610780ceb6 Mon Sep 17 00:00:00 2001 From: Julius Haag Date: Wed, 26 Jun 2024 13:18:36 +0200 Subject: [PATCH] Restructuring of the folders according to "Entwurfsheft" --- quafelweb/account_controller/authenticate.py | 1 + quafelweb/account_controller/kitopenid.py | 17 -------------- quafelweb/account_controller/manager.py | 4 ++-- quafelweb/account_controller/views.py | 22 +++++++++++++++---- quafelweb/hardware_controller/views.py | 5 +---- .../quafel_simulators/backend/gpu-cluster.py | 1 + quafelweb/quafel_simulators/simulator.py | 6 ++--- quafelweb/simulation_controller/views.py | 2 ++ quafelweb/simulation_view/views.py | 6 ----- 9 files changed, 28 insertions(+), 36 deletions(-) create mode 100644 quafelweb/quafel_simulators/backend/gpu-cluster.py diff --git a/quafelweb/account_controller/authenticate.py b/quafelweb/account_controller/authenticate.py index 0c75392..6041c9e 100644 --- a/quafelweb/account_controller/authenticate.py +++ b/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 diff --git a/quafelweb/account_controller/kitopenid.py b/quafelweb/account_controller/kitopenid.py index 6932dd1..26265bd 100644 --- a/quafelweb/account_controller/kitopenid.py +++ b/quafelweb/account_controller/kitopenid.py @@ -34,22 +34,5 @@ def get_identifier(self, request): def is_logged_in(self, request): return 'user_info' in request.session - - - @receiver(token_update) - def on_token_update(self, sender, name, token, refresh_token=None, access_token=None, **kwargs): - if refresh_token: - item = self.oauth.find(name=name, refresh_token=refresh_token) - elif access_token: - item = self.oauth.find(name=name, access_token=access_token) - else: - return - - # update old token - item.access_token = token['access_token'] - item.refresh_token = token.get('refresh_token') - item.expires_at = token['expires_at'] - item.save() - authenticate.BaseAuthenticator.RegisterInstance("kitopenid", KITOpenIDAuth()) diff --git a/quafelweb/account_controller/manager.py b/quafelweb/account_controller/manager.py index 486ac79..f2571f5 100644 --- a/quafelweb/account_controller/manager.py +++ b/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) diff --git a/quafelweb/account_controller/views.py b/quafelweb/account_controller/views.py index dfe6023..d05acd9 100644 --- a/quafelweb/account_controller/views.py +++ b/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: ... \ No newline at end of file diff --git a/quafelweb/hardware_controller/views.py b/quafelweb/hardware_controller/views.py index 5227108..b8a0ff2 100644 --- a/quafelweb/hardware_controller/views.py +++ b/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): - ... diff --git a/quafelweb/quafel_simulators/backend/gpu-cluster.py b/quafelweb/quafel_simulators/backend/gpu-cluster.py new file mode 100644 index 0000000..481d887 --- /dev/null +++ b/quafelweb/quafel_simulators/backend/gpu-cluster.py @@ -0,0 +1 @@ +from quafel_simulators.simulator import \ No newline at end of file diff --git a/quafelweb/quafel_simulators/simulator.py b/quafelweb/quafel_simulators/simulator.py index 58c4bf4..8f56a6f 100644 --- a/quafelweb/quafel_simulators/simulator.py +++ b/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: - ... \ No newline at end of file + ... diff --git a/quafelweb/simulation_controller/views.py b/quafelweb/simulation_controller/views.py index abc3113..a5c776c 100644 --- a/quafelweb/simulation_controller/views.py +++ b/quafelweb/simulation_controller/views.py @@ -11,3 +11,5 @@ def select_environments(request): def submit_request(request): ... + def claim_results(request): + ... diff --git a/quafelweb/simulation_view/views.py b/quafelweb/simulation_view/views.py index a4425d3..9ebb757 100644 --- a/quafelweb/simulation_view/views.py +++ b/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): - ... -