adding new attributes to obsconfig, devices config

Alexis Koralewski
1 parent 68d2b8cc
Showing 11 changed files with 116 additions and 53 deletions Show diff stats
config/components/MountPointing.yml
config/devices/device_Astromecca_TM350_generic.yml
config/schemas/schema_device-2.0.yml
config/schemas/schema_observatory-2.0.yml
privatedev/config/default/observatory_default.yml
privatedev/config/guitalens/observatory_guitalens.yml
privatedev/config/tnc/observatory_tnc.yml
src/core/pyros_django/obsconfig/configpyros.py
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml
@@ -42,3 +42,21 @@
     is_editable: False
     label: "Real mount"
     description: ""
+
+- attribute:
+    key: target
+    is_container: False
+    value: False
+    unit: ""
+    is_editable: False
+    label: "Target"
+    description: ""
+
+- attribute:
+    key: conformation
+    is_enum: True
+    value: ["None","WIDE", "NARROW"]
+    unit: ""
+    is_editable: False
+    label: "Conformation"
+    description: ""
 \ No newline at end of file
@@ -35,6 +35,7 @@ DEVICE:
                 - attribute:
                     key: manufacturer
                     value: AstroMecCA
+                    is_editable: False
                 - attribute:
                     key: model
@@ -51,3 +52,14 @@ DEVICE:
                 - attribute:
                     key: connect_real_mount
                     value: False
+
+                - attribute:
+                    key: target
+                    placeholder: "RADEC 0H10M -15D"
+                    is_editable: True
+                    value: "RADEC 0H10M -15D"
+
+                - attribute:
+                    key: conformation
+                    value: ["WIDE","NARROW"]
+                    is_editable: True
@@ -29,6 +29,8 @@ schema;schema_component_attributes:
           type: any
         description:
           type: any
+        placeholder:
+          type: str
 schema;schema_capability:
   type: map
@@ -54,6 +54,9 @@ schema;schema_GROUP:
       mapping:
         logic: 
           type: str
+        name:
+          type: str
+          required: True
         channels:
           type: seq
           required: True
@@ -66,6 +69,7 @@ schema;schema_CHANNEL_GROUPS:
   mapping:
     logic:
       type: str
+
     GROUPS:
       type: seq
       sequence:
@@ -130,6 +130,7 @@ OBSERVATORY:
                     GROUPS:
                         - GROUP:
                             logic: 'and' # opt
+                            name: MainChannel
                             channels:
                                 - OpticalChannel
@@ -107,7 +107,7 @@ OBSERVATORY:
                 - AGENT_DEVICE:
                     name: mount
                     computer: EtienneComputer
-                    comm_access: "//./COM3" # parameters of the comm: support of the device
+                    comm_access: "//./COM3" # parameters of the comm: support of the device, here only for serial comm
                     path: private/plugin/agent_devices
                     device: AstroMecCA_TM350
                     protocol: private/plugin/agent_devices/mount_protocol.py
@@ -162,5 +162,6 @@ OBSERVATORY:
                     GROUPS:
                         - GROUP:
                             logic: 'and' # opt
+                            name: MainChannel
                             channels:
                                 - OpticalChannel_up
@@ -296,10 +296,11 @@ OBSERVATORY:
                 CHANNEL_GROUPS:
-                    logic: 'or' # opt
+                    logic: 'or' # opt, for groups: or = xor + tous 
                     GROUPS:
                         - GROUP:
-                            logic: 'and' # opt
+                            logic: 'and' # opt, within groups: and -> plan defined on all channels
+                            name: "MainChannel"
                             channels:
                                 - OpticalChannel_up1
                                 - OpticalChannel_up2
@@ -66,56 +66,59 @@ class ConfigPyros:
                     return True
         return False
-    def load(self,observatory_config_file):
-        does_pickle_needs_to_be_updated = self.verify_if_pickle_needs_to_be_updated(observatory_config_file)
-        if os.path.isfile(self.CONFIG_PATH+self.pickle_file) and does_pickle_needs_to_be_updated == False:
-            print("Reading pickle file")
-            try:
-                can_pickle_file_be_read = False
-                while can_pickle_file_be_read != True:
-                    if os.access(self.CONFIG_PATH+self.pickle_file, os.R_OK):
-                        pickle_dict = pickle.load(open(self.CONFIG_PATH+self.pickle_file,"rb"))
-                        can_pickle_file_be_read = True
-                    else:
-                        time.sleep(0.5)
-            except IOError:
-                print("Error when reading the pickle file")
-            try:
-                self.obs_config = pickle_dict["obs_config"]
-                self.computers = pickle_dict["computers"]
-                self.devices = pickle_dict["devices"]
-                self.devices_links = pickle_dict["devices_links"]
-                self.obs_config_file_content = pickle_dict["obs_config_file_content"]
-                self.raw_config =  pickle_dict["raw_config"] 
-            except:
-                # we rewrite the pickle file, the content will be the same otherwise we would be in the else case
-                print("Rewritting the pickle file (an error occured while reading it, the content will be the same as it was")
+    def load(self, observatory_config_file):
+        pickle_needs_to_be_updated = self.verify_if_pickle_needs_to_be_updated(observatory_config_file)
+        if pickle_needs_to_be_updated == False and self.obs_config != None:
+            return None
+        else:
+            if os.path.isfile(self.CONFIG_PATH+self.pickle_file) and pickle_needs_to_be_updated == False:
+                print("Reading pickle file")
+                try:
+                    can_pickle_file_be_read = False
+                    while can_pickle_file_be_read != True:
+                        if os.access(self.CONFIG_PATH+self.pickle_file, os.R_OK):
+                            pickle_dict = pickle.load(open(self.CONFIG_PATH+self.pickle_file,"rb"))
+                            can_pickle_file_be_read = True
+                        else:
+                            time.sleep(0.5)
+                except IOError:
+                    print("Error when reading the pickle file")
+                try:
+                    self.obs_config = pickle_dict["obs_config"]
+                    self.computers = pickle_dict["computers"]
+                    self.devices = pickle_dict["devices"]
+                    self.devices_links = pickle_dict["devices_links"]
+                    self.obs_config_file_content = pickle_dict["obs_config_file_content"]
+                    self.raw_config =  pickle_dict["raw_config"] 
+                except:
+                    # we rewrite the pickle file, the content will be the same otherwise we would be in the else case
+                    print("Rewritting the pickle file (an error occured while reading it, the content will be the same as it was")
+                    pickle_dict = {}
+                    
+                    self.obs_config = self.read_and_check_config_file(observatory_config_file) 
+                    obs_file = open(observatory_config_file,"r")
+                    pickle_dict["raw_config"] = obs_file.read()
+                    obs_file.close()
+                    self.raw_config =  pickle_dict["raw_config"] 
+                    pickle_dict["obs_config"] = self.obs_config
+                    pickle_dict["devices"] = self.get_devices()
+                    pickle_dict["computers"] = self.get_computers()
+                    pickle_dict["devices_links"] = self.devices_links
+                    pickle_dict["obs_config_file_content"] = self.read_and_check_config_file(observatory_config_file) 
+                    print("Writing pickle file")
+                    pickle.dump(pickle_dict,open(self.CONFIG_PATH+self.pickle_file,"wb"))    
+            else:
+                print("Pickle file needs to be created or updated")
                 pickle_dict = {}
                 self.obs_config = self.read_and_check_config_file(observatory_config_file) 
-                obs_file = open(observatory_config_file,"r")
-                pickle_dict["raw_config"] = obs_file.read()
-                obs_file.close()
-                self.raw_config =  pickle_dict["raw_config"] 
                 pickle_dict["obs_config"] = self.obs_config
                 pickle_dict["devices"] = self.get_devices()
                 pickle_dict["computers"] = self.get_computers()
                 pickle_dict["devices_links"] = self.devices_links
                 pickle_dict["obs_config_file_content"] = self.read_and_check_config_file(observatory_config_file) 
                 print("Writing pickle file")
-                pickle.dump(pickle_dict,open(self.CONFIG_PATH+self.pickle_file,"wb"))    
-        else:
-            print("Pickle file needs to be created or updated")
-            pickle_dict = {}
-            
-            self.obs_config = self.read_and_check_config_file(observatory_config_file) 
-            pickle_dict["obs_config"] = self.obs_config
-            pickle_dict["devices"] = self.get_devices()
-            pickle_dict["computers"] = self.get_computers()
-            pickle_dict["devices_links"] = self.devices_links
-            pickle_dict["obs_config_file_content"] = self.read_and_check_config_file(observatory_config_file) 
-            print("Writing pickle file")
-            pickle.dump(pickle_dict,open(self.CONFIG_PATH+self.pickle_file,"wb"))
+                pickle.dump(pickle_dict,open(self.CONFIG_PATH+self.pickle_file,"wb"))
     def check_and_return_config(self,yaml_file:str,schema_file:str)->dict:
         """
@@ -581,7 +584,7 @@ class ConfigPyros:
         info["groups"] = {}
         for group_id in range(len(unit["TOPOLOGY"]["CHANNEL_GROUPS"]["GROUPS"])):
             group = unit["TOPOLOGY"]["CHANNEL_GROUPS"]["GROUPS"][group_id]["GROUP"]
-            info["groups"][group_id] = group
+            info["groups"][group["name"]] = group
         return info
     def get_channel_information(self, unit_name: str, channel_name: str) -> dict:
@@ -970,11 +973,28 @@ class ConfigPyros:
             if len(attributes.keys()) > 0:
                 merged_result.append(attributes)
         return merged_result
+
+    def getLogicOfChannelGroups(self,unit_name):
+        return self.get_channel_groups(unit_name)["global_group_logic"]
+
+    
+    def getGroupOfChannelByName(self, unit_name:str, name_of_channel_group):
+        return self.get_channel_groups(unit_name)["groups"][name_of_channel_group]
+
+
+    def getEditableAttributesOfMount(self,unit_name):
+        capabilities = self.get_device_capabilities(self.get_device_for_agent(unit_name,"mount")["name"])
+        merged_result = []
+        for capability in capabilities:
+            attributes = self.getEditableAttributesOfCapability(capability)
+            if len(attributes.keys()) > 0:
+                merged_result.append(attributes)
+        return merged_result
 def main():
-    config = ConfigPyros("../../../../privatedev/config/guitalens/observatory_guitalens.yml")
-    unit_name = config.get_units_name()[0]
-    dc = config.getDeviceControllerNameForAgent(unit_name,"mount")[0]
+    # config = ConfigPyros("../../../../privatedev/config/guitalens/observatory_guitalens.yml")
+    # unit_name = config.get_units_name()[0]
+    # dc = config.getDeviceControllerNameForAgent(unit_name,"mount")[0]
     #print(config.getDeviceConfigForDeviceController(dc))
     #print(config.getCommParamsForAgentDevice(unit_name,"mount"))
     # print(config.getChannelCapabilities(unit_name,"OpticalChannel_up"))
@@ -983,13 +1003,14 @@ def main():
     # print(config.getEditableAttributesOfChannel(unit_name,"OpticalChannel_up"))
     config = ConfigPyros("../../../../privatedev/config/tnc/observatory_tnc.yml")
     unit_name = config.get_units_name()[0]
-    dc = config.getDeviceControllerNameForAgent(unit_name,"mount")[0]
+    #dc = config.getDeviceControllerNameForAgent(unit_name,"mount")[0]
     #print(config.getDeviceConfigForDeviceController(dc))
     #print(config.getCommParamsForAgentDevice(unit_name,"mount"))
-    print(config.getChannelCapabilities(unit_name,"OpticalChannel_down2"))
-    print(config.get_channel_groups(unit_name))
-    print(config.getEditableAttributesOfCapability(config.getChannelCapabilities(unit_name,"OpticalChannel_down2")[0]))
-    print(config.getEditableAttributesOfChannel(unit_name,"OpticalChannel_down2"))
+    # print(config.getChannelCapabilities(unit_name,"OpticalChannel_down2"))
+    # print(config.get_channel_groups(unit_name))
+    # print(config.getEditableAttributesOfCapability(config.getChannelCapabilities(unit_name,"OpticalChannel_down2")[0]))
+    # print(config.getEditableAttributesOfChannel(unit_name,"OpticalChannel_down2"))
+    print(config.getEditableAttributesOfMount(unit_name))
     #print(config.get_devices()["FLI-Kepler4040"]["device_config"])
     #print(config.get_devices()["FLI-Kepler4040"]["device_config"]["CAPABILITIES"][1]["attributes"]["manufacturer"])
     #print(config.get_devices()["FLI-Kepler4040"]["device_config"]["CAPABILITIES"])
@@ -130,5 +130,6 @@ OBSERVATORY:
                     GROUPS:
                         - GROUP:
                             logic: 'and' # opt
+                            name: test
                             channels:
                                 - OpticalChannel
@@ -131,5 +131,6 @@ OBSERVATORY:
                     GROUPS:
                         - GROUP:
                             logic: 'and' # opt
+                            name: MainChannel
                             channels:
                                 - OpticalChannel
@@ -127,5 +127,6 @@ OBSERVATORY:
                     GROUPS:
                         - GROUP:
                             logic: 'and' # opt
+                            name: MainChannel
                             channels:
                                 - OpticalChannel