Add components file (RoofControler, PLC)

Alexis Koralewski
1 parent b586f117
Showing 5 changed files with 116 additions and 6 deletions Show diff stats
CHANGELOG
config/components/PLC.yml
config/components/RoofControler.yml
privatedev/config/tnc/device_Raspberry_TAROT_sn002.yml
src/core/pyros_django/obsconfig/obsconfig_class.py
+06-02-2023 (AKo): v0.6.17.O
+	- Add components file (RoofControler, PLC)
+
 02-02-2023 (AKo): v0.6.17.O
 	- Add computer config for astroguita
-	
+
 01-02-2023 (AKo): v0.6.17.0
 	- Add parse arg function to Agent
  
@@ -0,0 +1,17 @@
+- attribute:
+    key: manufacturer
+    is_container: False
+    value: unknown
+    is_editable: False
+    unit: ""
+    label: manufacturer
+    description: ""
+
+- attribute:
+    key: model
+    is_container: False
+    value: unknown
+    unit: ""
+    is_editable: False
+    label: "model"
+    description: ""
@@ -0,0 +1,17 @@
+- attribute:
+    key: manufacturer
+    is_container: False
+    value: unknown
+    is_editable: False
+    unit: ""
+    label: manufacturer
+    description: ""
+
+- attribute:
+    key: model
+    is_container: False
+    value: unknown
+    unit: ""
+    is_editable: False
+    label: "model"
+    description: ""
@@ -301,11 +301,23 @@ DEVICE:
                     unit: degC
                     description: From CV7 anemometer sensor
  
-A CHANGER...
+        - CAPABILITY:
                 # ---------
                 # PLC/DHT22
                 # ---------
+            component: WeatherStation
  
+            attributes:
+            
+                - attribute:
+                    key: manufacturer
+                    value: unknown
+                    
+                - attribute:
+                    key: model
+                    value: DHT22
+
+            output_data:
                 - data:
                     key: /entities/devices/DHT22/Error_code
                     category: electricity
@@ -348,7 +360,20 @@ A CHANGER...
                 # ---------
                 # PLC/RG11
                 # ---------
+        - CAPABILITY:
+            component: WeatherStation
+
+            attributes:
+            
+                - attribute:
+                    key: manufacturer
+                    value: unknown
+                    
+                - attribute:
+                    key: model
+                    value: RG11
  
+            output_data:
                 - data:
                     key: /entities/devices/RG11/Error_code
                     category: electricity
@@ -378,7 +403,20 @@ A CHANGER...
                 # ------------
                 # PLC/MLX90614
                 # ------------
+        - CAPABILITY:
+            component: WeatherStation
+
+            attributes:
+            
+                - attribute:
+                    key: manufacturer
+                    value: unknown
+                    
+                - attribute:
+                    key: model
+                    value: MLX90614
  
+            output_data:
                 - data:
                     key: /entities/devices/MLX90614/Error_code
                     category: electricity
@@ -105,6 +105,7 @@ class OBSConfig:
                                 open(self.CONFIG_PATH+self.pickle_file, "rb"))
                             can_pickle_file_be_read = True
                         else:
+                            print(f"{self.CONFIG_PATH+self.pickle_file} can't be accessed, waiting for availability")
                             time.sleep(0.5)
                 except IOError:
                     print("Error when reading the pickle file")
@@ -165,7 +166,7 @@ class OBSConfig:
             dict: dictionary of the config file (with values)
         """
         # disable pykwalify error to clean the output
-        # logging.disable(logging.ERROR)
+        logging.disable(logging.ERROR)
         try:
             can_yaml_file_be_read = False
             while can_yaml_file_be_read != True:
@@ -311,7 +312,13 @@ class OBSConfig:
             attribute = attribute["attribute"]
  
             attributes[attribute.pop("key")] = attribute
+        output_data =  {}
+        if capability.get("output_data"):
  
+            for data in capability['output_data']:
+                cap_data = data["data"]
+                name = cap_data.pop("key")
+                output_data[name] = cap_data
         # for each attributes of generic component attributes
         for attribute_name in attributes.keys():
             # merge attributes of general component with specified component in device config file
@@ -329,6 +336,7 @@ class OBSConfig:
  
         # return inherited and overwritten attributes of capability
         capability["attributes"] = component_attributes
+        capability["output_data"] = output_data
         return capability
  
     def get_devices_names_and_file(self) -> dict:
@@ -1278,6 +1286,30 @@ class OBSConfig:
         return dependencies_return
  
  
+    def get_output_data_device(self,device):
+        device = self.get_device_capabilities(device)
+        result = {}
+        for component in device:
+            if component.get("output_data"):
+                output_data = component.get("output_data")
+                for data in output_data:
+                    data = data["data"]
+                    key = data.pop("key")
+                    result[key] = data
+        return result
+
+    def get_output_data_device_sort_monitoring_name(self,device):
+        output_data = self.get_output_data_device(device)
+        monitoring_names = {}
+        if len(output_data) > 0:
+            for data in output_data:
+                key = data 
+                data_dict = output_data[data]
+                monitoring_name = data_dict.pop("monitoring_name")
+                data_dict["key"] = key
+                monitoring_names[monitoring_name] = data_dict
+        return monitoring_names
+
 class MissingMandatoryAgentException(Exception):
     """
     Exception raised when an mandatory Pyros Agent is missing in the observatory configuration.
@@ -1300,15 +1332,18 @@ def main():
     # print(config.getEditableAttributesOfChannel(unit_name,"OpticalChannel_up"))
     config = OBSConfig("../../../../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.getEditableAttributesOfMount(unit_name))
-
+    #print(config.getEditableAttributesOfMount(unit_name))
+    config.get_devices()
+    #print(config.get_output_data_device("TAROT_meteo"))
+    print(config.get_output_data_device_sort_monitoring_name("TAROT_meteo").keys())
+    #print(config.get_device_capabilities("TAROT_meteo"))
     # 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"])