Merge branch 'dev' of https://gitlab.irap.omp.eu/pyros-irap/pyros into dev

Alain Klotz
2 parents 950fd6a3 9db4ef71
Showing 5 changed files with 58 additions and 30 deletions Show diff stats
CHANGELOG
src/core/pyros_django/dashboard/config_pyros.py
src/core/pyros_django/majordome/agent/A_SST.py
src/core/pyros_django/misc/static/js/agent_detail/websocket_agent_detail.js
src/core/pyros_django/scp_mgmt/A_SCP_Manager.py
-21-07-2023 (AKo): V0.6.27.0
+28-07-2023 (AKo): V0.6.28.0
+	- Add command in A_SCP_Manager to generate ephemeris files of sun & moon for a period
+	- Fix AgentSST start one agent
+	- Fix config_pyros paths
+	- Fix JS of agent_detail 
+
+26-07-2023 (AKo): V0.6.27.0
+	- Remove private & privatedev folder
+
+24-07-2023 (AKo): V0.6.27.0
 	- install_observatory now copy default observatory if repository doesn't exists
 	- fix error on update due to package version for doc generation
 	- update dockerfile (can't copy outside build context)
@@ -4,8 +4,12 @@ import sys
 import time
 import pykwalify.core
 from pykwalify.errors import SchemaError
-sys.path.append("../../../")
+
+sys.path.append(os.environ.get("PROJECT_ROOT_PATH", "../../../../"))
+
 from vendor.guitastro.src.guitastro import FileNames
+
+
 class ConfigPyros:
  
     def check_and_return_config(self, yaml_file: str, schema_file: str) -> dict:
@@ -32,7 +36,7 @@ class ConfigPyros:
                     time.sleep(0.5)
  
             c = pykwalify.core.Core(source_file=yaml_file, schema_files=[
-                                    self.config_path+"/"+schema_file])
+                                    os.path.join(self.config_path, schema_file)])
             return c.validate(raise_exception=True)
         except SchemaError:
             for error in c.errors:
@@ -80,8 +84,8 @@ class ConfigPyros:
             return None
  
     def __init__(self, pyros_config_file):
-        self.config_path = os.path.abspath(os.path.join(
-            os.environ.get("DJANGO_PATH"), "../../../config/"))
+        self.config_path = os.path.join(
+            os.environ.get("PROJECT_ROOT_PATH", "../../../") , "config/")
         if pyros_config_file is None:
             pyros_config_file = "config_pyros_default.yml"
         self.pyros_config = self.read_and_check_config_file(pyros_config_file)
@@ -100,19 +104,20 @@ class ConfigPyros:
         self.fn = fn
 def main():
     os.environ["DJANGO_PATH"] = "../../src/core/pyros_django"
-    cp = ConfigPyros("config_pyros.yml")
+    os.environ["PROJECT_ROOT_PATH"] = "../../../../"
+    cp = ConfigPyros(os.path.join(os.environ["PROJECT_ROOT_PATH"], "config", "config_pyros_default.yml"))
     cp.fn.fcontext = "pyros_seq"
     print(cp.fn)
-    file_fullname = "../../data/sequences_pickle/P1/20230319/16.p"
-    param = cp.fn.naming_get(file_fullname)
-    print(param)
-    cp.fn.fname = cp.fn.naming_set(param)
-    print(cp.fn.fname)
-    #cp.fn.subdir = cp.fn.subdir_from_filename(file_fullname)
-    print(type(cp.fn.fname))
-    out_fullname = cp.fn.join()
-    print(os.getcwd())
-    print(out_fullname)
+    # file_fullname = "../../data/sequences_pickle/P1/20230319/16.p"
+    # param = cp.fn.naming_get(file_fullname)
+    # print(param)
+    # cp.fn.fname = cp.fn.naming_set(param)
+    # print(cp.fn.fname)
+    # #cp.fn.subdir = cp.fn.subdir_from_filename(file_fullname)
+    # print(type(cp.fn.fname))
+    # out_fullname = cp.fn.join()
+    # print(os.getcwd())
+    # print(out_fullname)
 if __name__ == "__main__":
  
     main()
 \ No newline at end of file
@@ -135,7 +135,6 @@ class A_SST(Agent):
         obs_config = self.get_config()
         test_mode = " -t"
  
-
         if agent_name:
             agent = agent_name
             protocol_script_name = ""
@@ -156,7 +155,8 @@ class A_SST(Agent):
                 else:
                     # general agent of PyROS
                     for general_agent in self._general_agents:
-                        if agent in general_agent:
+                        general_agent_name = os.path.splitext(os.path.basename(general_agent))
+                        if general_agent_name[0] in agent:
                             protocol_folder_abs_path = os.path.abspath(os.path.dirname(general_agent))
                             protocol_script_name = os.path.basename(general_agent)
                             break
@@ -208,6 +208,7 @@ class A_SST(Agent):
                     # general agent of PyROS
                     for general_agent in self._general_agents:
                         general_agent_name = os.path.splitext(os.path.basename(general_agent))
+                        print("GENERAL AGENT NAME , AGENT : ",general_agent_name[0], agent)
                         if general_agent_name[0] in agent:
                             protocol = os.path.join(os.getcwd(),general_agent)
                             protocol_script_name = os.path.basename(general_agent)
@@ -117,7 +117,7 @@ var app = new Vue({
     }
 });
 */
-var app = Vue.createApp({
+var app_agent_cmds = Vue.createApp({
     data(){
         return {
             commands: [],
@@ -16,10 +16,9 @@ for short_path in short_paths:
         sys.path.insert(0, path)
  
 # Project imports
-from src.core.pyros_django.user_mgmt.models import PyrosUser
-from seq_submit.models import  Period, SP_Period, SP_Period_Guest, SP_PeriodWorkflow, ScientificProgram,SP_Period_User, ScienceTheme
-from src.core.pyros_django.majordome.agent.Agent import Agent, build_agent
-from vendor.guitastro.src.guitastro import guitastro
+from majordome.agent.Agent import Agent, build_agent
+from user_mgmt.models import PyrosUser, SP_Period, Period, SP_Period, SP_Period_Guest, SP_PeriodWorkflow
+import vendor.guitastro.src.guitastro as guitastro 
  
 # Django imports
 from django.shortcuts import reverse
@@ -47,7 +46,7 @@ class A_SCP_Manager(Agent):
     _AGENT_SPECIFIC_COMMANDS = {
             # Format : “cmd_name” : (timeout, exec_mode, tooltip)
  
-            "generate_ephem_moon_and_sun_for_period": (3, Agent.EXEC_MODE.SEQUENTIAL, 'generate ephem of moon & sun for a period'),
+            "do_generate_ephem_moon_and_sun_for_period": (3, Agent.EXEC_MODE.SEQUENTIAL, 'generate ephem of moon & sun for a period'),
     }
  
     # new init with obsconfig
@@ -59,6 +58,10 @@ class A_SCP_Manager(Agent):
         super().__init__()
         next_period = Period.objects.next_period()
         period = next_period
+        self.pconfig = self._oc['pyros_config']
+        self._fn = self.pconfig.fn
+        self.config = self._oc['config']
+        self._fn.pathnaming("PyROS.seq.1")
  
     # @override
     def _init(self):
@@ -240,19 +243,26 @@ class A_SCP_Manager(Agent):
         for n in range(int((end_date - start_date).days)):
             yield start_date + timedelta(n)
  
-    def generate_ephem_moon_and_sun_for_period(self,period):
+    def do_generate_ephem_moon_and_sun_for_period(self, period_id:int):
+        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)
-        ephem_data_night_folder = os.path.join(root_path, "data") 
+        
+        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
-            ephem_data_night_folder = os.path.join(root_path, "data", 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):
@@ -261,15 +271,18 @@ class A_SCP_Manager(Agent):
             eph = guitastro.Ephemeris()
             target_sun = "sun"
             ephem_sun = eph.target2night(target_sun, current_date, None, None)
-            file_name_sun = f"ephem_sun_{current_date}.p"
-            file_name_moon = f"ephem_moon_{current_date}.p"
+            file_name_sun = f"ephem_sun_{current_date}"
+            file_name_moon = f"ephem_moon_{current_date}"
             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
+
 if __name__ == "__main__":
  
     # with thread