Add new version of weather config view

Alexis Koralewski
1 parent 0a236660
Showing 4 changed files with 90 additions and 23 deletions Show diff stats
config/schemas/schema_observatory-2.0.yml
privatedev/config/tnc/observatory_tnc.yml
src/core/pyros_django/monitoring/views.py
src/core/pyros_django/obsconfig/obsconfig_class.py
@@ -323,6 +323,10 @@ schema;schema_UNIT:
             - type: seq
               sequence:
               - type: number
+    MONITORING_DEVICES: 
+      type: seq
+      sequence: 
+        - type: str
     DATABASE:
       include: schema_DATABASE
     AGENTS:
@@ -199,7 +199,10 @@ OBSERVATORY:
                             install: 
                                 shell: /bin/sh
                                 script: "guitastro/install/install.sh"
-            
+                                
+            MONITORING_DEVICES:
+                - TAROT_meteo
+
             AGENTS:
  
                 # ============================================
@@ -368,6 +371,14 @@ OBSERVATORY:
                     protocol: private/plugin/agent/AgentTriton.py
                     path: private/plugin/agent/triton
  
+                - AGENT_DEVICE:
+                    name: AgentDevicePLC_ako
+                    computer: AKoralewskiPersoComputer
+                    path: private/plugin/agent_devices
+                    device: TAROT_meteo
+                    protocol: private/plugin/agent_devices/AgentDevicePLC.py
+                    is_real: false
+#
                 - AGENT:
                     name: AgentTriton_akz
                     computer: AKlotzPersoComputer
@@ -437,6 +448,28 @@ OBSERVATORY:
                     computer: IRAP_SERVER
                     protocol: private/plugin/agent/AgentBasic.py
                     is_active: True
+
+                # Agents for astroguita
+
+                - AGENT:
+                    name: AgentTriton
+                    computer: astroguitaComputer
+                    protocol: private/plugin/agent/AgentTriton.py
+                    path: private/plugin/agent/triton
+                
+                - AGENT:
+                    name: AgentEnvMonitor
+                    computer: astroguitaComputer
+                    protocol: private/plugin/agent/AgentEnvMonitor.py
+
+                - AGENT_DEVICE:
+                    name: AgentDevicePLC
+                    computer: astroguitaComputer
+                    path: private/plugin/agent_devices
+                    device: TAROT_meteo
+                    protocol: private/plugin/agent_devices/AgentDevicePLC.py
+                    is_real: false
+
  
             TOPOLOGY:
  
 from datetime import datetime
 from django.http import HttpResponse
 from django.shortcuts import render
-from common.models import AgentCmd, WeatherWatchHistory
+from common.models import AgentCmd, WeatherWatchHistory, SiteWatch
 from django.http import Http404
 import json, csv
+import os
 from django.db.models import Q
 from django.views.decorators.csrf import csrf_exempt
 from django.core import serializers
-
+from src.core.pyros_django.obsconfig.obsconfig_class import OBSConfig
 # Create your views here.
  
  
@@ -50,19 +51,24 @@ def weather_config(request):
         http://127.0.0.1:8000/dashboard/weather/config
         Moved to monitoring
     """
-    try:
-        # Import PLC status sensor parser
-        from monitoring.plc_checker import PlcChecker
-        # Parse PLC status in colibri-new-fixed-2.json
-        #colibri_json = open("../simulators/plc/colibri-new-fixed-2.json")
-        #colibri_struct = json.load(colibri_json)
-        #plc_status = colibri_struct["statuses"][1]["entities"][0]
-        plc_checker = PlcChecker()
-        _struct = {"origin":plc_checker.origin, "sensors_table":plc_checker.sensors_table, "monitoring_names":list(plc_checker.monitoring_names.keys())}
-        # Return template with sensors list
-        return render(request, 'dashboard/config_weather.html', {'weather_config' : _struct, 'base_template' : "base.html"})
-    except Config.DoesNotExist:
-        return render(request, 'dashboard/config_weather.html', {'weather_info' : None})
+    # Import PLC status sensor parser
+    from monitoring.plc_checker import PlcChecker
+    # Parse PLC status in colibri-new-fixed-2.json
+    #colibri_json = open("../simulators/plc/colibri-new-fixed-2.json")
+    #colibri_struct = json.load(colibri_json)
+    #plc_status = colibri_struct["statuses"][1]["entities"][0]
+    plc_checker = PlcChecker()
+    _struct = {"origin":plc_checker.origin, "sensors_table":plc_checker.sensors_table, "monitoring_names":list(plc_checker.monitoring_names.keys())}
+    config = OBSConfig(
+    os.environ["PATH_TO_OBSCONF_FILE"], os.environ["unit_name"])
+    monitoring_devices = config.get_monitoring_devices()
+    devices = config.get_devices()
+    devices_config = []
+    for device in monitoring_devices:
+        device_config = devices[device]
+        devices_config.append(device_config)
+    # Return template with sensors list
+    return render(request, 'dashboard/config_weather.html', {'weather_config' : _struct, 'base_template' : "base.html","devices_config":devices_config})
  
  
 def weather_config_update(request):
@@ -106,3 +112,18 @@ def export_weather_data(request):
                 return response
             except WeatherWatchHistory.DoesNotExist:
                 raise Http404("No WeatherWatchHistory matches the given query.")
+
+
+def internal_monitoring(request):
+
+    current_internal_state, created = SiteWatch.objects.get_or_create(id=1)
+    if not created:
+        current_internal_state.setAttribute("InsideHumidity",0)
+        current_internal_state.setAttribute("Pressure",1)
+        current_internal_state.setAttribute("InsideTemp",19)
+        current_internal_state.setAttribute("Roof_state","closed")
+        current_internal_state.setAttribute("Power_input",1)
+        current_internal_state.save()
+        current_internal_state.setGlobalStatus()
+
+    return render(request, "monitoring/internal_state.html", locals())
 \ No newline at end of file
@@ -318,7 +318,11 @@ class OBSConfig:
             for data in capability['output_data']:
                 cap_data = data["data"]
                 name = cap_data.pop("key")
-                output_data[name] = cap_data
+                model_name = attributes.get("model").get("value")
+                if output_data.get(model_name) is None:
+                    output_data[model_name] = {}
+
+                output_data[model_name][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
@@ -1292,10 +1296,8 @@ class OBSConfig:
         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
+                for key in output_data:
+                    result[key] = output_data[key]
         return result
  
     def get_output_data_device_sort_monitoring_name(self,device):
@@ -1310,6 +1312,10 @@ class OBSConfig:
                 monitoring_names[monitoring_name] = data_dict
         return monitoring_names
  
+    def get_monitoring_devices(self):
+        unit = self.get_unit_by_name(self.unit_name)
+        monitoring_devices = unit.get("MONITORING_DEVICES")
+        return monitoring_devices
 class MissingMandatoryAgentException(Exception):
     """
     Exception raised when an mandatory Pyros Agent is missing in the observatory configuration.
@@ -1341,8 +1347,11 @@ def main():
     # print(config.getEditableAttributesOfChannel(unit_name,"OpticalChannel_down2"))
     #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_output_data_device("TAROT_meteo").get("CV7"))
+    print(config.get_device_for_agent(config.unit_name, "AgentDevicePLC_ako").get("device_config").get("CAPABILITIES")[0].get("output_data"))
+    print(config.get_monitoring_devices())
+    #.get("/entities/devices/CV7/Error_code").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"])