Alexis Koralewski · Alexis Koralewski · Alexis Koralewski
Showing 8 changed files Show diff stats
src/core/pyros_django/majordome/agent/Agent.py
src/core/pyros_django/misc/fixtures/initial_fixture_dev_TZ.json
src/core/pyros_django/scheduling/A_Scheduler.py
src/core/pyros_django/scp_mgmt/A_SCP_Manager.py
src/core/pyros_django/scp_mgmt/forms.py
src/core/pyros_django/scp_mgmt/models.py
src/core/pyros_django/seq_submit/models.py
src/core/pyros_django/user_mgmt/models.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 
@@ -3592,7 +3592,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
@@ -287,8 +287,7 @@
         "fields": {
             "name": "Admin",
             "desc": "",
-            "priority": 8,
-            "quota": 9999.0
+            "priority": 8
         }
     },
     {
@@ -297,8 +296,7 @@
         "fields": {
             "name": "Observer",
             "desc": "",
-            "priority": 2,
-            "quota": 9999.0
+            "priority": 2
         }
     },
     {
@@ -307,8 +305,7 @@
         "fields": {
             "name": "TAC",
             "desc": "",
-            "priority": 1,
-            "quota": 9999.0
+            "priority": 1
         }
     },
     {
@@ -317,8 +314,7 @@
         "fields": {
             "name": "Management board member",
             "desc": "",
-            "priority": 3,
-            "quota": 9999.0
+            "priority": 3
         }
     },
     {
@@ -327,8 +323,7 @@
         "fields": {
             "name": "Operator",
             "desc": "",
-            "priority": 4,
-            "quota": 9999.0
+            "priority": 4
         }
     },
     {
@@ -337,8 +332,7 @@
         "fields": {
             "name": "Unit-PI",
             "desc": "",
-            "priority": 7,
-            "quota": 9999.0
+            "priority": 7
         }
     },
     {
@@ -347,8 +341,7 @@
         "fields": {
             "name": "Unit-board",
             "desc": "",
-            "priority": 6,
-            "quota": 9999.0
+            "priority": 6
         }
     },
     {
@@ -357,8 +350,7 @@
         "fields": {
             "name": "Visitor",
             "desc": "Account without any privilege",
-            "priority": 0,
-            "quota": 0.0
+            "priority": 0
         }
     },
     {
@@ -366,7 +358,7 @@
         "pk": 2,
         "fields": {
             "name": "CNRS",
-            "quota": 20
+            "f_quota": 0.2
         }
     },
     {
@@ -374,7 +366,7 @@
         "pk": 1,
         "fields": {
             "name": "CNES",
-            "quota": 80
+            "f_quota": 0.8
         }
     },
     {
@@ -222,6 +222,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__":
  
@@ -39,13 +39,13 @@ class SP_PeriodForm(forms.ModelForm):
         fields = (
             #"period",
             "public_visibility",
-            "quota_minimal",
-            "quota_nominal",
-            "quota_allocated",
-            "over_quota_duration",
-            "over_quota_duration_allocated",
-            "token",
-            "token_allocated",
+            # "quota_minimal",
+            # "quota_nominal",
+            # "quota_allocated",
+            # "over_quota_duration",
+            # "over_quota_duration_allocated",
+            # "token",
+            # "token_allocated",
             "vote_referee1",
             "reason_referee1",
             "vote_referee2",
-#from django.db import models
+from django.db import models
+
+
+class Quota(models.Model):
+    id_period = models.BigIntegerField(blank=True, null=True)
+    night_id = models.CharField(max_length=8, null=True, blank=True, db_index=True)
+    d_totalq = models.BigIntegerField(default=0, blank=True, null=True)
+    d_totalx = models.BigIntegerField(default=0, blank=True, null=True)
+
+    d_previousq = models.BigIntegerField(default=0, blank=True, null=True)
+    d_previousx = models.BigIntegerField(default=0, blank=True, null=True)
+
+    d_currentq = models.BigIntegerField(default=0, blank=True, null=True)
+    d_currentx = models.BigIntegerField(default=0, blank=True, null=True)
+
+    d_passedq = models.BigIntegerField(default=0, blank=True, null=True)
+    d_passedx = models.BigIntegerField(default=0, blank=True, null=True)
+
+    d_scheduleq = models.BigIntegerField(default=0, blank=True, null=True)
+    d_schedulex = models.BigIntegerField(default=0, blank=True, null=True)
+
+    d_nextq = models.BigIntegerField(default=0, blank=True, null=True)
+    d_nextx = models.BigIntegerField(default=0, blank=True, null=True)
+
+    @property
+    def d_total(self):
+        return self.d_totalq + self.d_totalx
+
+    @property
+    def d_previous(self):
+        return self.d_previousq + self.d_previousx
+
+    @property
+    def d_current(self):
+        return self.d_currentq + self.d_currentx
+
+    @property
+    def d_passed(self):
+        return self.d_passedq + self.d_passedx
+
+    @property
+    def d_schedule(self):
+        return self.d_scheduleq + self.d_schedulex
+
+    @property
+    def d_next(self):
+        return self.d_nextq + self.d_nextx
+
+    def set_attributes_and_save(self, quota_attributes:dict):
+
+        if quota_attributes.get("id_period") != None:
+            self.id_period = quota_attributes["id_period"]
+        if quota_attributes.get("night_id") != None:
+            self.night_id = quota_attributes["night_id"]
+        if quota_attributes.get("d_totalq") != None:
+            self.d_totalq = quota_attributes["d_totalq"]
+        if quota_attributes.get("d_totalx") != None:
+            self.d_totalx = quota_attributes["d_totalx"]
+        if quota_attributes.get("d_previousq") != None:
+            self.d_previousq = quota_attributes["d_previousq"]
+        if quota_attributes.get("d_previousx") != None:
+            self.d_previousx = quota_attributes["d_previousx"]
+        if quota_attributes.get("d_currentq") != None:
+            self.d_currentq = quota_attributes["d_currentq"]
+        if quota_attributes.get("d_currentx") != None:
+            self.d_currentx = quota_attributes["d_currentx"]
+        if quota_attributes.get("d_scheduleq") != None:
+            self.d_scheduleq = quota_attributes["d_scheduleq"]
+        if quota_attributes.get("d_schedulex") != None:
+            self.d_schedule = quota_attributes["d_schedulex"]
+        if quota_attributes.get("d_nextq") != None:
+            self.d_nextq = quota_attributes["d_nextq"]
+        if quota_attributes.get("d_nextx") != None:
+            self.d_nextx = quota_attributes["d_nextx"]
+        self.save()
+
+    def convert_to_quota(self, f_quota):
+        quota_institute = {}
+
+        quota_institute["d_totalq"] = self.d_totalq * f_quota
+        quota_institute["d_totalx"] = self.d_totalx * f_quota
+        quota_institute["d_previousq"] = self.d_previousq * f_quota
+        quota_institute["d_previousx"] = self.d_previousx * f_quota
+        quota_institute["d_currentq"] = self.d_currentq * f_quota
+        quota_institute["d_currentx"] = self.d_currentx * f_quota
+        quota_institute["d_passedq"] = self.d_passedq * f_quota
+        quota_institute["d_passedx"] = self.d_passedx * f_quota
+        quota_institute["d_scheduleq"] = self.d_scheduleq * f_quota
+        quota_institute["d_schedulex"] = self.d_schedulex * f_quota
+        quota_institute["d_nextq"] = self.d_nextq * f_quota
+        quota_institute["d_nextx"] = self.d_nextx * f_quota
+
+        return quota_institute
@@ -34,6 +34,7 @@ from django.db.models import Q
  
 # Project imports
 from user_mgmt.models import PyrosUser, ScientificProgram, Period
+from scp_mgmt.models import Quota
 # DeviceCommand is used by class Command
 sys.path.append("../../..")
 from vendor.guitastro.src.guitastro import FileNames, Ima
@@ -349,8 +350,9 @@ class Sequence(models.Model):
     obsolete = models.BooleanField(default=False)
     processing = models.BooleanField(default=False)
     flag = models.CharField(max_length=45, blank=True, null=True)
-    period = models.ForeignKey(Period, on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    period = models.ForeignKey(Period, on_delete=models.DO_NOTHING, related_name="sequence_period", blank=True, null=True)
     #period = models.ForeignKey("Period", on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    quota = models.ForeignKey(Quota, on_delete=models.DO_NOTHING,related_name="sequence_quotas", blank=True, null=True)
  
     start_date = models.DateTimeField(
         blank=True, null=True, default=timezone.now, editable=True)
@@ -37,6 +37,11 @@ from django.db.models.query import QuerySet
 from django.utils import timezone
  
  
+# Pyros import
+
+from scp_mgmt.models import Quota
+
+
  
  
 # Project imports
@@ -52,7 +57,6 @@ class UserLevel(models.Model):
     name = models.CharField(max_length=45, blank=True, null=True)
     desc = models.TextField(blank=True, null=True)
     priority = models.IntegerField(blank=True, null=True)
-    quota = models.FloatField(blank=True, null=True)
  
     class Meta:
         managed = True
@@ -79,9 +83,11 @@ class Country(models.Model):
 class Institute(models.Model):
     name = models.CharField(max_length=100, blank=False,
                             null=False, unique=True)
-    # quota %                            
-    quota = models.IntegerField(
-        validators=[MinValueValidator(0), MaxValueValidator(100)])
+    # fraction quota
+    f_quota = models.FloatField(
+        validators=[MinValueValidator(0), MaxValueValidator(1)], blank=True, null=True)
+    
+    quota = models.ForeignKey(Quota, on_delete=models.DO_NOTHING,related_name="institute_quotas", blank=True, null=True)
     #representative_user = models.ForeignKey("PyrosUser", on_delete=models.DO_NOTHING,related_name="institutes",default=1)
  
     def __str__(self) -> str:
@@ -90,6 +96,8 @@ class Institute(models.Model):
     class Meta:
         db_table = "institute"
  
+
+
 class ScienceTheme(models.Model):
     name = models.CharField(max_length=120, blank=False, null=False, default="", unique=True)
     def __str__(self) -> str:
@@ -367,6 +375,8 @@ class Period(models.Model):
     data_accessibility_duration = models.PositiveIntegerField(
         blank=True, null=True, default=365*10, editable=True)
  
+    quota = models.ForeignKey(Quota, on_delete=models.DO_NOTHING,related_name="period_quotas", blank=True, null=True)
+
     @property
     def end_date(self):
         return self.start_date + relativedelta(days=self.exploitation_duration)
@@ -461,11 +471,11 @@ class ScientificProgram(models.Model):
     description_short = models.TextField(default="", max_length=320)
     description_long = models.TextField(default="")
     institute = models.ForeignKey('Institute', on_delete=models.DO_NOTHING, related_name="scientific_programs")
-    sp_pi = models.ForeignKey('PyrosUser', on_delete=models.DO_NOTHING, related_name="Scientific_Program_Users")
+    sp_pi = models.ForeignKey('PyrosUser', on_delete=models.DO_NOTHING, related_name="scientific_Program_Users")
     science_theme = models.ForeignKey(ScienceTheme, on_delete=models.DO_NOTHING, related_name="scientific_program_theme", default=1)
     is_auto_validated = models.BooleanField(default=False)
     objects = ScientificProgramManager()
-
+    quota = models.ForeignKey(Quota, on_delete=models.DO_NOTHING,related_name="scientific_program_quotas", blank=True, null=True)
     class Meta:
         managed = True
         db_table = 'scientific_program'
@@ -525,14 +535,6 @@ class SP_Period(models.Model):
     is_valid = models.TextField(
         choices=IS_VALID, default=IS_VALID_REJECTED, blank=True)
     status = models.TextField(choices=STATUSES, default=STATUSES_DRAFT)
-    quota_minimal = models.PositiveIntegerField(default=0)
-    quota_nominal = models.PositiveIntegerField(default=0)
-    quota_allocated = models.PositiveIntegerField(default=0, blank=True)
-    quota_remaining = models.PositiveIntegerField(default=0, blank=True)
-    over_quota_duration = models.PositiveIntegerField(default=0)
-    over_quota_duration_allocated = models.PositiveIntegerField(
-        default=0, blank=True)
-    over_quota_duration_remaining = models.PositiveIntegerField(default=0)
     token = models.PositiveIntegerField(default=0)
     token_allocated = models.PositiveIntegerField(default=0, blank=True)
     token_remaining = models.PositiveIntegerField(default=0, blank=True)