Correction bug dans ConfigPyro. L'agentX fonctionne !

Alain Klotz
1 parent 1ad759ec
Showing 3 changed files with 34 additions and 22 deletions Show diff stats
config/config_unit_simulunit1.xml
config/configpyros.py
src/agent/Agent.py
@@ -10,16 +10,23 @@ section, key, value, type, unit, access, comment, label, reference, timestamp
 * Mandatory
 section : Category of the keyword
 key : Key of the keyword
-value : Useful value of the keyword
+value : Useful value of the keyword (=default value when defining a HTML form)
  
 * Optional
 type : Python type to interpret the value
 unit : Physical value to allow conversions
 access : 0brwrwrw (rw for PI-Mount, rw for Maintenance, rw for Astronomers)
 comment : Comment to be added as a popup in the web page
-label : Text to describe the value in a web page (e.g. forms)
+label : Text to describe the value
 reference : Refere to the source of the value
 timestamp : Date when the value has been last updated
+default_value : Default value (useful for web forms)
+
+* Optional to describe a HTML form <form>
+label : HTML Text to describe the value in a web page (for forms)
+element : HTML form element tag (input, select, etc.)
+element_attribute : HTML form element attributes
+options : HTML tag <option> contents in case of HTML element <select>
  
 =============================================================================
 -->
@@ -125,12 +132,12 @@ timestamp : Date when the value has been last updated
     <param section="horizon" key="amer_list" value="(0, 10), (50, 15), (60,10)" type="tuple" unit="Angle"/>
     <!-- Plan description of this channel for the web form and observations -->
     <plan>
-      <param section="form" key="filter" label="Filter" default_value="" element="input" element_attribute=''/>
-      <param section="form" key="binning" label="Binning" default_value="" element="select" element_attribute="" options="param detector binnings"/>
-      <param section="form" key="exptime" label="Exposure time (s)" default_value="1" element="range" element_attribute='min="0.1" max="100"'/>
-      <param section="form" key="nb_images" label="Number image" default_value="1" element="range" element_attribute='min="1" max="10000"'/>
-      <param section="form" key="shutter" label="Shutter mode" default_value="1" element="select" element_attribute="" options="param detector shutter_mode"/>
-      <param section="form" key="delay" label="Delay start (s)" default_value="0" element="range" element_attribute='min="0" max="100"'/>
+      <param section="form" key="shutter"   label="Shutter mode" value="1"      element_tag="select" element_attributes='required' options="param DetectorShutter mode"/>
+      <param section="form" key="filter"    label="Filter" value=""             element_tag="select" element_attributes='required' options="param FilterSelector symbols"/>
+      <param section="form" key="binning"   label="Binning" value=""            element_tag="select" element_attributes='required' options="param DetectorSensor binnings"/>
+      <param section="form" key="exptime"   label="Exposure time (s)" value="1" element_tag="input"  element_attributes='type="number" step="any" min="0.1" max="100"'/>
+      <param section="form" key="nb_images" label="Number images" value="1"     element_tag="input"  element_attributes='type="number" step="1" min="1" max="10000"'/>
+      <param section="form" key="delay"     label="Delay start (s)" value="0"   element_tag="input"  element_attributes='type="number" step="any" min="0" max="100"'/>
     </plan>
   </channel>
  
@@ -117,7 +117,7 @@ class ConfigPyros:
                 print("============== Aliases of <" + tag + ">")
  
             attrib_key_to_get = 'alias'
-            aliases = config.get_attribute_level0(xpath,attrib_key_to_get)
+            aliases = self.get_attribute_level0(xpath,attrib_key_to_get)
             if (verbose==True):
                 print("<{} {}> = {}".format(xpath, attrib_key_to_get, aliases))
             if aliases == [None]:
@@ -134,7 +134,7 @@ class ConfigPyros:
         tag_to_get = "param"
         tag_attrib_to_select = {'section': 'assembly', 'key': 'alias'}
         tag_attrib_key_to_get = 'value'
-        assembled_aliases =  config.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
+        assembled_aliases =  self.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
         if (verbose==True):
             print("{} <{} {}> = {}".format(attrib_to_select, tag_to_get, tag_attrib_to_select, assembled_aliases))
  
@@ -198,7 +198,7 @@ class ConfigPyros:
         tag_attrib_key_to_get = 'value'
         for alias in aliases:
             attrib_to_select = {'alias': alias}            
-            hname =  config.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
+            hname =  self.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
             if hname[0] == hostname:
                 this_computer_alias = alias
  
@@ -505,7 +505,7 @@ class ConfigPyros:
         tag_attrib_to_select = ""
         tag_attrib_key_to_get = ""
         #print("get_params alias={} subtag={} xpath={}".format(alias,subtag,xpath))
-        value =  config.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
+        value =  self.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
         #print("{} <{} {}> = {}".format(attrib_to_select, tag_to_get, tag_attrib_to_select, value))
         if (len(value)>0):
             return value
@@ -524,7 +524,7 @@ class ConfigPyros:
         tag_attrib_to_select = {'section': section, 'key': key}
         tag_attrib_key_to_get = ""
         #print("get_param alias={} subtag={} xpath={}".format(alias,subtag,xpath))
-        value =  config.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
+        value =  self.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
         #print("{} <{} {}> = {}".format(attrib_to_select, tag_to_get, tag_attrib_to_select, value))
         if (len(value)>0):
             return value[0]
@@ -543,7 +543,7 @@ class ConfigPyros:
         tag_attrib_to_select = {'section': section, 'key': key}
         tag_attrib_key_to_get = 'value'
         #print("get_paramvalue alias={} subtag={} xpath={}".format(alias,subtag,xpath))
-        value =  config.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
+        value =  self.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
         #print("{} <{} {}> = {}".format(attrib_to_select, tag_to_get, tag_attrib_to_select, value))
         if (len(value)>0):
             return value[0]
@@ -564,7 +564,7 @@ class ConfigPyros:
         tag_attrib_to_select = ""
         tag_attrib_key_to_get = ""
         #print("get_plan alias={} subtag={} xpath={}".format(alias,subtag,xpath))
-        value =  config.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
+        value =  self.get_attribute_level1(xpath,attrib_to_select,tag_to_get,tag_attrib_to_select,tag_attrib_key_to_get)
         #print("{} <{} {}> = {}".format(attrib_to_select, tag_to_get, tag_attrib_to_select, value))
         if (len(value)>0):
             return value
@@ -615,7 +615,7 @@ if __name__ == &quot;__main__&quot;:
     else:     
  
         # --- Load the configuration file if needed only (i.e. modified)
-        config.load()
+        config.load(False)
  
         if config.get_last_errno() != config.NO_ERROR:
  
@@ -107,9 +107,10 @@ class Agent:
         #print("this file path :", __file__)
         #print("config file path is", config_filename)
         # Instantiate an object for configuration
+        #print("config file path is ", config_abs_filename)
         self.config = ConfigPyros(config_abs_filename)
         if self.config.get_last_errno() != self.config.NO_ERROR:
-            raise Exception(f"Bad config file name '{config_abs_filename}', error code {str(self.config.get_last_errno())}")
+            raise Exception(f"Bad config file name '{config_abs_filename}', error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
  
  
     def __str__(self):
@@ -260,12 +261,16 @@ class Agent:
         #config_filename = 'c:/srv/develop/pyros/config/config_unit_simulunit1.xml'
         #config.set_configfile(config_filename)
         self.config.load()
-        # --- get the parameter value of <mount1/localization/home>
-        instantiation = 'mount1'
-        section = 'localization'
+        if self.config.get_last_errno() != self.config.NO_ERROR:
+            raise Exception(f"error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
+        # --- Get the home of the mount[0]
+        assembly_component = 'mount'
+        assembly_index = 0
+        section = 'MountPointing'
         key = 'home'
-        paramvalue = self.config.get_paramvalue(instantiation, section, key)
-        print("paramvalue <{}/{}/{}> = {}".format(instantiation, section, key,paramvalue))
+        mount_alias = self.config.get_aliases(assembly_component)[assembly_index]
+        paramvalue = self.config.get_paramvalue(mount_alias,section, key)
+        print("paramvalue <{}/{}/{}> = {}".format(assembly_component, section, key, paramvalue))
  
         """
         # self.config = Config.objects.get(pk=1)