add quota management (not complete)

Alexis Koralewski
1 parent a6ce0e13
Showing 3 changed files with 43 additions and 63 deletions Show diff stats
src/core/pyros_django/majordome/agent/Agent.py
src/core/pyros_django/scheduling/A_Scheduler.py
src/core/pyros_django/scp_mgmt/A_SCP_Manager.py
@@ -154,7 +154,7 @@ import config.old_config as config_old
 #from config import *
  
 from majordome.models import AgentSurvey, AgentCmd, AgentLogs
-from user_mgmt.models import Period
+from user_mgmt.models import Period, Quota
  
 from vendor.guitastro.src.guitastro import Ephemeris
 import pickle 
@@ -3593,7 +3593,17 @@ class Agent:
             val[0] = d_total
             val[-1] = d_total - val[-2]
             # --- update db TODO
-            
+            quota = Quota()
+            quota_attributes = {}
+            quota_attributes["id_period"] = operiod.id
+            quota_attributes["night_id"] = night
+            quota_attributes["d_previousq"] = d_prev
+            quota_attributes["d_currentq"] = d_cur
+            quota_attributes["d_totalq"] = d_total
+            quota_attributes["d_nextq"] = d_total - d_cur
+            quota.set_attributes_and_save(quota_attributes)
+            operiod.quota = quota
+            operiod.save()
         #log.info(f"Write {filename=}")
         #pickle.dump(night_info, open(filename, "wb"))
         return night_info
@@ -220,6 +220,12 @@ class A_Scheduler(Agent):
     # 'vote_referee2'
     """
  
+
+    def update_db_quota_sequence(sequence, quota_attributes, id_period, night_id, d_total=sequence_info['duration']):
+        sequence_quota = sequence.quota
+        sp_quota = sequence.scientific_program
+        institute_quota = 
+
     def _compute_schedule_1(self):
         """Simple scheduler based on selection-insertion one state algorithm.
  
@@ -17,7 +17,7 @@ for short_path in short_paths:
  
 # Project imports
 from majordome.agent.Agent import Agent, build_agent
-from user_mgmt.models import PyrosUser, SP_Period, Period, SP_Period, SP_Period_Guest, SP_PeriodWorkflow
+from user_mgmt.models import PyrosUser, Institute, SP_Period, Period, SP_Period, SP_Period_Guest, SP_PeriodWorkflow
 import vendor.guitastro.src.guitastro as guitastro 
  
 # Django imports
@@ -229,6 +229,9 @@ class A_SCP_Manager(Agent):
                 next_sp_to_be_notified = next_sp.filter(status=SP_Period.STATUSES_ACCEPTED,is_valid = True)
                 self.send_mail_to_observers_for_notification(next_sp_to_be_notified)
                 SP_PeriodWorkflow.objects.create(period=self.period,action=SP_PeriodWorkflow.NOTIFICATION)
+                self.update_sun_moon_ephems()
+                self.set_quota_for_institutes(self.period.id)
+                self.set_quota_for_sp(self.period.id)
  
     def routine_process_body(self):
         print("routine automatic period workflow")
@@ -243,66 +246,27 @@ class A_SCP_Manager(Agent):
         for n in range(int((end_date - start_date).days)):
             yield start_date + timedelta(n)
  
-    def do_generate_ephem_moon_and_sun_for_period(self, period_id:int):
-        # Obsolete TODO
-        period = Period.objects.get(id=period_id)
-        period_start_date = period.start_date
-        period_end_date = period.end_date
-
-        root_path = os.environ.get("PROJECT_ROOT_PATH") 
-        os.chdir(root_path)
-        
-        home = guitastro.Home(self._oc["config"].getHome())
-        self._fn.longitude(home.longitude)
-
-        ephem_data_night_folder = self._fn.rootdir
-        if os.path.exists(ephem_data_night_folder):
-            period_id = str(period.id)
-            # form correct period string
-            if len(str(period.id)) < 3:
-                while len(period_id) < 3:
-                    period_id = "0" + period_id
-            period_id = "P" + period_id
-            ephem_data_night_folder = os.path.join(ephem_data_night_folder,  period_id) 
-            if not os.path.exists(ephem_data_night_folder):
-                os.makedirs(ephem_data_night_folder, exist_ok=True)
-        for single_date in self.daterange(period_start_date, period_end_date):
-            current_date = single_date.strftime("%Y%m%d")
-
-            eph = guitastro.Ephemeris()
-            target_sun = "sun"
-            ephem_sun = eph.target2night(target_sun, current_date, None, None)
-
-            self._fn.fcontext_create("pyros_eph", "Ephemeris PyROS")
-            self._fn.fcontext = "pyros_eph"
-            self._fn.pathnaming("PyROS.eph.1")
-            self._fn.rootdir = "/tmp/eph"
-            self._fn.extension = ".f"
-            param = {}
-            param['period'] = period_id
-            param['date'] = current_date
-            param['unit'] = self.pconfig.unit_name
-            param['version'] = 1
-            param['target'] = "sun"
-            fname = self._fn.naming_set(param)
-            file_name_sun = self._fn.join(fname)
-
-            # moon parameters
-            param['target'] = "moon"
-            fname = self._fn.naming_set(param)
-            file_name_moon = self._fn.join(fname)
-            os.chdir(ephem_data_night_folder)
-            pickle.dump(ephem_sun, open(f"{file_name_sun}.f","wb"))
-            target_moon = "moon"
-            ephem_moon = eph.target2night(target_moon, current_date, None, None)
-            pickle.dump(ephem_moon, open(f"{file_name_moon}.f","wb"))
-
-
-
-
-        # lire tous les fichiers sun de la period et appliquer le sky_elev pour déterminer le quota total de période
-        # prendre le champ alt & 
-        # -> prendre tous les éléments en dessous de duskelev (cf l412 d'A_Sheduler, exemple 14 des éphémérides pour trier ces éléménts) et faire un sum
+    def set_quota_for_institutes(self, id_period):
+        for institute in Institute.objects.all():
+            f_quota = institute.f_quota
+            # the lowest id of quota table for this period should be the first night of the period
+            period_quota = Period.objects.get(id=id_period).quota
+            institute_quota = period_quota.convert_to_quota(f_quota)
+            new_quota = Quota()
+            new_quota.set_attributes_and_save(institute_quota)
+            institute.quota = new_quota
+            institute.save()
+    
+    def set_quota_for_SP(self, id_period):
+        period = Period.objects.get(id=id_period)
+        for sp_period in SP_Period.objects.filter(period=period)
+            sp = sp_period.scientific_program
+            institute = sp.institute
+            institute_quota = institute.quota
+            new_quota = Quota()
+            quota_attributes = institute_quota.convert_to_quota(sp.f_quota)
+            new_quota.set_attributes_and_save(quota_attributes)
+            
  
 if __name__ == "__main__":