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

Alain Klotz
2 parents f1d7a80d 627f618c
Showing 11 changed files with 718 additions and 429 deletions Show diff stats
CHANGELOG
VERSION
privatedev/plugin/agent/AgentBasic.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentBasic.py
src/core/pyros_django/agent/AgentSST.py
src/core/pyros_django/common/admin.py
src/core/pyros_django/common/models.py
src/core/pyros_django/dashboard/templates/dashboard/agent_detail.html
src/core/pyros_django/dashboard/views.py
src/core/pyros_django/devices/models.py
+25-11-2022 (AKo): v0.6.13.1
+	- Add debug mode to agentSST
+	- UI changes on agent_detail 
+	- Enable log file of agent with the right name
+	
 25-11-2022 (AKo): v0.6.13.0
 	- Add is_active field for agents in tnc obsconfig 
 	- Add new colors in agents_cmds and agent_detail for cmd status
-0.6.13.0
 \ No newline at end of file
+0.6.13.1
 \ No newline at end of file
@@ -394,6 +394,8 @@ class AgentBasic(Agent):
         print(res)
         self.sleep(nbsec)
  
+        #raise Exception("exception bidon")
+        
         res = f"3 - now sleeping {nbsec} sec"
         self.CC.set_result(res, True)
         #self.CC.get_updated_result()
@@ -42,7 +42,7 @@ and execute them on reception at each iteration :
 # For cmd parsing
 from array import array
 from datetime import datetime
-from typing import Dict, List, Tuple, Union, Any, Optional, Literal
+from typing import Final, Sequence, Iterable, Mapping, MutableMapping, Dict, List, Tuple, Union, Any, Optional, Literal
 import ast
 from inspect import signature
  
@@ -384,7 +384,9 @@ class Agent:
     #
     #_TEST_COMMANDS_LIST: List[ Tuple[ bool, str, int, Union[str,None], Union[int,None] ] ] = [
     ##_TEST_COMMANDS_LIST: List[ Tuple[ bool, str, int, Optional[str], AgentCmd.CMD_STATUS_CODES ] ] = [
-    _TEST_COMMANDS_LIST: List[ Tuple[ bool, str, Optional[int], Optional[str], Optional[int]] ] = [
+    TestCommand = Tuple[ bool, str, Optional[int], Optional[str], Optional[int]]
+    #_TEST_COMMANDS_LIST: List[ Tuple[ bool, str, Optional[int], Optional[str], Optional[int]] ] = [
+    _TEST_COMMANDS_LIST: List[ TestCommand ] = [
         # Format : (DO_IT, "self cmd_name cmd_args", validity, "expected_result", expected_status),
  
         #("self do_stop now", 200, '15.5', None),
@@ -602,24 +604,25 @@ class Agent:
     ##def __init__(self, RUN_IN_THREAD=True):
     def __init__(self,simulated_computer=None):
  
-        # Declaration of Instance attributes, default values
+        # Instance attributes declaration (with default values, or None)
+        self.__UP_SINCE : Final = datetime.now(tz=timezone.utc)
         #self.UP_SINCE = datetime.utcnow()
-        self.__UP_SINCE = datetime.now(tz=timezone.utc)
         self.__ROUTINE_ITER_START_IS_RUNNING:bool = False
         self.__ROUTINE_ITER_END_IS_RUNNING:bool = False
         self.__test_cmd_received_num:int = 0  # only for tests
         # Current Command running
-        self.__CC :Optional[AgentCmd] = None
-        self.__CC_thread :Union[StoppableThreadEvenWhenSleeping, multiprocessing.Process] = None
+        self.__CC :Optional[AgentCmd] #= None
+        self.__CC_thread :Union[StoppableThreadEvenWhenSleeping, multiprocessing.Process] #= None
         # Previous Command running
         ##self.__CC_prev :Optional[AgentCmd] = None
         # Current Command exception (if occurs)
-        self.__CCE :Optional[Exception] = None
+        self.__CCE :Optional[Exception] #= None
         self.name = "Generic Agent"
-        self.__status :str = None
-        self.__mode :str = None
-        self.unit = None
-        self.TEST_COMMANDS = None
+        self.__status :str #= None
+        self.__mode :str #= None
+        self.unit :str #= None
+        #self.TEST_COMMANDS :List #= None
+        self.TEST_COMMANDS :Iterable[Agent.TestCommand] #= None
         self.__iter_num :int = 0
         #print(AgentSurvey.MODE_CHOICES.IDLE)
         #sys.exit()
@@ -628,23 +631,24 @@ class Agent:
         #self.__mode = self.MODE_ATTENTIVE
         self.set_mode_attentive()
         #self._set_mode(MODES.)
-
-        log.addHandler(handler_filebyagent(logging.INFO, self.__class__.__name__))
-        #log.addHandler(handler_filebyagent(logging.INFO, self.name))
-        log.debug("start Agent init")
         obs_config_file_path = os.environ["PATH_TO_OBSCONF_FILE"]
         path_to_obs_config_folder = os.environ["PATH_TO_OBSCONF_FOLDER"]
         unit = os.environ["unit_name"]
         oc = OBSConfig(obs_config_file_path,unit)
         self.set_config(oc, obs_config_file_path, path_to_obs_config_folder, unit)
+        agent_name_from_config = self.get_config().get_agent_name_from_config(self.__class__.__name__,simulated_computer)
+        if agent_name_from_config:
+            self.name = agent_name_from_config
+        else:
+            self.name = self.__class__.__name__
+
+        log.addHandler(handler_filebyagent(logging.INFO, self.name))
+        #log.addHandler(handler_filebyagent(logging.INFO, self.name))
+        log.debug("start Agent init")
  
-        self.name = self.__class__.__name__
         # set real unit name (the current unit used)
         if unit == "":
             unit = oc.unit_name
-        agent_name_from_config = self.get_config().get_agent_name_from_config(self.__class__.__name__,simulated_computer)
-        if agent_name_from_config:
-            self.name = agent_name_from_config
         self.unit = unit
         print(f"Agent name : {self.name}")
         print(f"Unit name : {self.unit}")
@@ -3044,7 +3048,7 @@ class Agent:
         #cmd_full_name, validity, res_expected, after_status = next(self.TEST_COMMANDS, (None,None,None,None))
         DO_IT = False
         while not DO_IT:
-            cmd_params = next(self.TEST_COMMANDS, (False,None,None,None,None))
+            cmd_params:Agent.TestCommand = next(self.TEST_COMMANDS, (False,None,None,None,None))
             #print(cmd_params)
             DO_IT, cmd_full_name, validity, expected_res, expected_status = cmd_params
             ###DO_IT, cmd_full_name, validity, expected_res, expected_status = next(self.TEST_COMMANDS, (False,None,None,None,None))
@@ -394,6 +394,8 @@ class AgentBasic(Agent):
         print(res)
         self.sleep(nbsec)
  
+        #raise Exception("exception bidon")
+        
         res = f"3 - now sleeping {nbsec} sec"
         self.CC.set_result(res, True)
         #self.CC.get_updated_result()
@@ -147,6 +147,8 @@ class AgentSST(Agent):
                             cmd += test_mode
                         if self.simulated_computer:
                             cmd += f" --computer {self.simulated_computer}"
+                        if self.DEBUG_MODE:
+                            cmd += " -d"
                         process = subprocess.Popen(f"{cmd}",shell=True)
                         process.poll()
                         if agent not in self.subprocess_dict:
@@ -187,6 +189,8 @@ class AgentSST(Agent):
                             cmd += test_mode
                         if self.simulated_computer:
                             cmd += f" --computer {self.simulated_computer}"
+                        if self.DEBUG_MODE:
+                            cmd += " -d"
                         # process = subprocess.Popen(f"{cmd}", shell=True, stdout=subprocess.DEVNULL,stderr=subprocess.STDOUT)
                         process = subprocess.Popen(f"{cmd}", shell=True)
                         self.subprocess_dict[agent] = {}
@@ -256,7 +260,6 @@ class AgentSST(Agent):
     def _do_things_before_exit(self,abort_cmd_sender):
         kill_agent_commands = {}
         for agent in self.subprocess_dict.keys():
-            print(agent)
             if AgentSurvey.objects.get(name=agent).status != "EXITING":
                 self.do_stop_agent(agent)
                 cmd = AgentCmd.objects.filter(full_name="do_stop asap",recipient=agent).latest("s_deposit_time")
@@ -358,6 +361,7 @@ if __name__ == &quot;__main__&quot;:
     parser.add_argument("--computer",dest="computer",help='Launch agent with simulated computer hostname',action="store")
     parser.add_argument("--agent",dest="agent",help='Launch an specific agent ',action="store")
     parser.add_argument("-t", action="store_true" )
+    parser.add_argument("-d", action="store_true" )
     args = vars(parser.parse_args())
     agent = build_agent(AgentSST,param_constr=args)
     # agent = build_agent(AgentSST)
@@ -7,6 +7,9 @@ from django.conf import settings
  
 from common.models import *
  
+# Necessary since new device/models.py file
+from devices.models import Detector, Filter, AgentDeviceStatus, FilterWheel, Telescope, PlcDevice, PlcDeviceStatus
+
  
 # EP added
 class ReadOnlyModelAdmin(admin.ModelAdmin):
@@ -4,9 +4,7 @@
 from __future__ import annotations
  
 # Stdlib imports
-from numpy import False_
 from src.device_controller.abstract_component.device_controller import DeviceCmd
-from enum import Enum
 from datetime import datetime, timedelta, date
 from dateutil.relativedelta import relativedelta
 import os
@@ -31,17 +29,7 @@ from django.utils import timezone
 # DeviceCommand is used by class Command
 sys.path.append("../../..")
  
-''' 
-NOT USED - to be removed
-class PyrosState(Enum):
-    START = 'Starting'
-    PA = 'Passive'
-    INI = "INIT"
-    STAND = "Standby"
-    SCHED_START = 'Scheduler startup'
-    SCHED = 'Scheduler'
-    SCHED_CLOSE = 'Scheduler closing'
-'''
+
  
  
 """
@@ -176,43 +164,28 @@ class Company(models.Model):
 """
  
  
-def printd(*args, **kwargs):
-    if os.environ.get('PYROS_DEBUG', '0') == '1':
-        print('(MODEL)', *args, **kwargs)
-
 # ---
 # --- Utility functions
 # ---
  
+def printd(*args, **kwargs):
+    if os.environ.get('PYROS_DEBUG', '0') == '1':
+        print('(MODEL)', *args, **kwargs)
  
 def get_or_create_unique_row_from_model(model: models.Model):
     # return model.objects.get(id=1) if model.objects.exists() else model.objects.create(id=1)
     return model.objects.first() if model.objects.exists() else model.objects.create(id=1)
  
  
+
+
+
 """
 ------------------------
    BASE MODEL CLASSES
 ------------------------
 """
  
-
-class Device(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    is_online = models.BooleanField(default=False)
-    status = models.CharField(max_length=11, blank=True, null=True)
-    maintenance_date = models.DateTimeField(blank=True, null=True)
-
-    class Meta:
-        abstract = True
-
-    def __str__(self):
-        return (str(self.name))
-
-
 class Request(models.Model):
     pyros_user = models.ForeignKey(
         'PyrosUser', on_delete=models.DO_NOTHING, related_name="requests")
@@ -245,64 +218,51 @@ class Request(models.Model):
 ------------------------
 """
  
-# TODO: A VIRER car remplacé par AgentDeviceStatus
  
  
-class AgentDeviceTelescopeStatus(models.Model):
-    #created = models.DateTimeField('status date', blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(
-        'status date', blank=True, null=True, auto_now=True)
-    radec = models.CharField('agent mode', max_length=30, blank=True)
+# TODO: A mettre dans device/models.py ?
+class Image(models.Model):
+    plan = models.ForeignKey(
+        'Plan', on_delete=models.CASCADE, related_name="images")
+    nrtanalysis = models.ForeignKey(
+        'NrtAnalysis', models.DO_NOTHING, blank=True, null=True, related_name="images")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    date_from_gps = models.CharField(max_length=45, blank=True, null=True)
+    level = models.IntegerField(blank=True, null=True)
+    type = models.CharField(max_length=5, blank=True, null=True)
+    quality = models.CharField(max_length=45, blank=True, null=True)
+    flaggps = models.CharField(max_length=45, blank=True, null=True)
+    exposure = models.CharField(max_length=45, blank=True, null=True)
+    tempext = models.CharField(max_length=45, blank=True, null=True)
+    pressure = models.CharField(max_length=45, blank=True, null=True)
+    humidext = models.CharField(max_length=45, blank=True, null=True)
+    wind = models.CharField(max_length=45, blank=True, null=True)
+    wind_dir = models.CharField(max_length=45, blank=True, null=True)
+    dwnimg = models.CharField(max_length=45, blank=True, null=True)
+    dwncata = models.CharField(max_length=45, blank=True, null=True)
+    dwn = models.CharField(max_length=45, blank=True, null=True)
+    level0_fits_name = models.CharField(max_length=45, blank=True, null=True)
+    level1a_fits_name = models.CharField(max_length=45, blank=True, null=True)
+    level1b_fits_name = models.CharField(max_length=45, blank=True, null=True)
  
     class Meta:
         managed = True
-        db_table = 'agent_device_telescope_status'
-        #verbose_name = "agent survey"
-        #verbose_name_plural = "agents survey"
+        db_table = 'image'
  
-    """
     def __str__(self):
-        return (f"Agent {self.name} at {self.updated} in mode {self.mode} and status {self.status}")
-    """
+        return (str(self.name))
+
+
  
  
-class AgentDeviceStatus(models.Model):
-    """Table storing various status parameters for EACH Device.
  
-    Attributes:
-        attr1 (str): Description of `attr1`.
-        attr2 (:obj:`int`, optional): Description of `attr2`.
  
-    """
-    #created = models.DateTimeField('status date', blank=True, null=True, auto_now_add=True)
-    agent = models.CharField(
-        'Name of the agent that saved this parameter', max_length=45, blank=True, null=True)
-    #radec = models.CharField('agent mode', max_length=30, blank=True)
-    status = models.CharField(
-        'status parameters json dictionnary (ex: {radec:..., speed:...})', max_length=300, blank=True, null=True)
-    date_updated = models.DateTimeField(
-        'status parameter date', blank=True, null=True, auto_now=True)
  
-    class Meta:
-        managed = True
-        db_table = 'agent_device_status'
-        verbose_name = "agent device status"
-        verbose_name_plural = "agent devices status"
  
-    def __str__(self):
-        return (f"Agent {self.agent} last status is ({self.status}) (saved at {self.date_updated})")
  
-    @classmethod
-    def getStatusForAgent(cls, agent: str) -> str:
-        return cls.objects.filter(agent=agent)[0] if cls.objects.filter(agent=agent).exists() else cls.objects.create(agent=agent)
-        '''
-        return cls.objects.filter(agent=agent)[0].status if cls.objects.filter(agent=agent).exists() else cls.objects.create(agent=agent).status
-        agent_status = cls.objects.filter(agent=agent)
-        if agent_status.exists(): 
-            return agent_status[0].status
-        else:
-            return cls.objects.create(agent=agent)
-        '''
  
  
 class AgentLogs(models.Model):
@@ -1379,130 +1339,6 @@ class Country(models.Model):
         return (str(self.name))
  
  
-class Detector(Device):
-    VIS = "Visible camera"
-    NIR = "Cagire"
-
-    telescope = models.ForeignKey(
-        'Telescope', models.DO_NOTHING, related_name="detectors")
-    nb_photo_x = models.IntegerField(blank=True, null=True)
-    nb_photo_y = models.IntegerField(blank=True, null=True)
-    photo_size_x = models.IntegerField(blank=True, null=True)
-    photo_size_y = models.IntegerField(blank=True, null=True)
-    has_shutter = models.BooleanField(default=False)
-    equivalent_foc_len = models.CharField(max_length=45, blank=True, null=True)
-    acq_start = models.DateTimeField(blank=True, null=True)
-    acq_stop = models.DateTimeField(blank=True, null=True)
-    check_temp = models.FloatField(blank=True, null=True)
-    gain = models.FloatField(blank=True, null=True)
-    readout_noise = models.FloatField(blank=True, null=True)
-    readout_time = models.FloatField(blank=True, null=True)
-    idcam_readout_mode = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'detector'
-
-    def __str__(self):
-        return str(self.name)
-
-    def device_name(self):
-        return self.__str__()
-    device_name.short_description = "Name"
-
-
-class Dome(Device):
-    DOME = "Dome"
-
-    open = models.BooleanField(default=False, blank=True)
-
-    class Meta:
-        managed = True
-        db_table = 'dome'
-
-    def __str__(self):
-        return str(self.name)
-
-    def device_name(self):
-        return self.__str__()
-    device_name.short_description = "Name"
-
-
-class Filter(Device):
-    VIS_FILTER_1 = "First visible filter"
-    VIS_FILTER_2 = "Second visible filter"
-    NIR_FILTER_1 = "First infrared filter"
-    NIR_FILTER_2 = "Second infrared filter"
-
-    filter_wheel = models.ForeignKey(
-        "FilterWheel", models.DO_NOTHING, related_name="filters", blank=True, null=True)
-    category = models.CharField(max_length=1, blank=True, null=True)
-    transmission_curve_doc = models.CharField(
-        max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'filter'
-
-    def __str__(self):
-        return (str(self.name))
-
-    def device_name(self):
-        return self.__str__()
-    device_name.short_description = "Name"
-
-
-class FilterWheel(Device):
-    detector = models.OneToOneField(Detector, on_delete=models.CASCADE,
-                                    related_name="filter_wheel", blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'filter_wheel'
-
-    def __str__(self):
-        return (str(self.name))
-
-    def device_name(self):
-        return self.__str__()
-    device_name.short_description = "Name"
-
-
-class Image(models.Model):
-    plan = models.ForeignKey(
-        'Plan', on_delete=models.CASCADE, related_name="images")
-    nrtanalysis = models.ForeignKey(
-        'NrtAnalysis', models.DO_NOTHING, blank=True, null=True, related_name="images")
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    date_from_gps = models.CharField(max_length=45, blank=True, null=True)
-    level = models.IntegerField(blank=True, null=True)
-    type = models.CharField(max_length=5, blank=True, null=True)
-    quality = models.CharField(max_length=45, blank=True, null=True)
-    flaggps = models.CharField(max_length=45, blank=True, null=True)
-    exposure = models.CharField(max_length=45, blank=True, null=True)
-    tempext = models.CharField(max_length=45, blank=True, null=True)
-    pressure = models.CharField(max_length=45, blank=True, null=True)
-    humidext = models.CharField(max_length=45, blank=True, null=True)
-    wind = models.CharField(max_length=45, blank=True, null=True)
-    wind_dir = models.CharField(max_length=45, blank=True, null=True)
-    dwnimg = models.CharField(max_length=45, blank=True, null=True)
-    dwncata = models.CharField(max_length=45, blank=True, null=True)
-    dwn = models.CharField(max_length=45, blank=True, null=True)
-    level0_fits_name = models.CharField(max_length=45, blank=True, null=True)
-    level1a_fits_name = models.CharField(max_length=45, blank=True, null=True)
-    level1b_fits_name = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'image'
-
-    def __str__(self):
-        return (str(self.name))
-
-
 class Log(models.Model):
     agent = models.CharField(max_length=45, blank=True, null=True)
     created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
@@ -1573,156 +1409,6 @@ class Plan(models.Model):
     def __str__(self) -> str:
         return f"Plan of Album {self.album.name} has {self.nb_images} image(s)"
  
-class PlcDeviceStatus(models.Model):
-    device = models.ForeignKey(
-        'PlcDevice', on_delete=models.CASCADE, related_name='current_status')
-    created = models.DateTimeField(
-        auto_now_add=True, editable=False, blank=True)
-    outside_temp = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    outside_temp_unit = models.CharField(max_length=45, blank=True, null=True)
-    outside_humidity = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    outside_humidity_unit = models.CharField(
-        max_length=45, blank=True, null=True)
-    pressure = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    pressure_unit = models.CharField(max_length=45, blank=True, null=True)
-    rain_rate = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    rain_rate_unit = models.CharField(max_length=45, blank=True, null=True)
-    wind_speed = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    wind_speed_unit = models.CharField(max_length=45, blank=True, null=True)
-    wind_dir = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    wind_dir_unit = models.CharField(max_length=45, blank=True, null=True)
-    dew_point = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    dew_point_unit = models.CharField(max_length=45, blank=True, null=True)
-    analog = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    analog_unit = models.CharField(max_length=45, blank=True, null=True)
-    digital = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    digital_unit = models.CharField(max_length=45, blank=True, null=True)
-    inside_temp = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    inside_temp_unit = models.CharField(max_length=45, blank=True, null=True)
-    inside_humidity = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    inside_humidity_unit = models.CharField(
-        max_length=45, blank=True, null=True)
-    wind_dir_cardinal = models.CharField(max_length=45, blank=True, null=True)
-    wind_dir_cardinal_unit = models.CharField(
-        max_length=45, blank=True, null=True)
-    sensor_temperature = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    sensor_temperature_unit = models.CharField(
-        max_length=45, blank=True, null=True)
-    sky_temperature = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    sky_temperature_unit = models.CharField(
-        max_length=45,  blank=True, null=True)
-    status = models.CharField(max_length=45, blank=True, null=True)
-    current = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    current_unit = models.CharField(max_length=45, blank=True, null=True)
-    is_safe = models.BooleanField(default=True)
-    plc_mode = models.CharField(max_length=4, null=True)
-    lights = models.CharField(max_length=3, null=True)
-    shutters = models.CharField(max_length=5, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'plc_devices_status'
-
-    def __str__(self):
-        return (str(self.__dict__))
-
-    '''
-        TODO : This function is Ugly,
-        we should change this with a function pointer array
-        and setters getters for each attribute
-    '''
-
-    def setValue(self, key, value, unit=""):
-        if key == "Temperature_outside":
-            self.outside_temp = value
-            self.outside_temp_unit = unit
-        elif key == "Humidity_outside":
-            self.outside_humidity = value
-            self.outside_humidity_unit = unit
-        elif key == "_Pressure":
-            self.pressure = value
-            self.pressure_unit = unit
-        elif key == "Rain_boolean":  # RainRate
-            self.rain_rate = value
-            self.rain_rate_unit = 'boulean'
-        elif key == "Wind_speed":
-            self.wind_speed = value
-            self.wind_speed_unit = unit
-        elif key == "Wind_dir":
-            self.wind_dir = value
-            self.wind_dir_unit = unit
-        elif key == "_DewPoint":
-            self.dew_point = value
-            self.dew_point_unit = unit
-        elif key == "_analog":
-            self.analog = value
-            self.analog_unit = unit
-        elif key == "_digital":
-            self.digital = value
-            self.digital_unit = unit
-        elif key == "_InsideTemp":
-            self.inside_temp = value
-            self.inside_temp_unit = unit
-        elif key == "_InsideHumidity":
-            self.inside_humidity = value
-            self.inside_humidity_unit = unit
-        elif key == "_WindDirCardinal":
-            self.wind_dir_cardinal = value
-            self.wind_dir_cardinal_unit = unit
-        elif key == "_SensorTemperature":
-            self.sensor_temperature = value
-            self.sensor_temperature_unit = unit
-        elif key == "_SkyTemperature":
-            self.sky_temperature = value
-            self.sky_temperature_unit = unit
-        # PM 20190222 try patch
-        elif key == "Error_code":
-            self.status = value
-        elif key == "current":
-            self.current = value
-            self.current_unit = unit
-        elif key == "mode":
-            self.plc_mode = value
-        elif key == "is_safe":
-            self.is_safe = value
-        elif key == "LIGHTS":
-            self.lights = value
-        elif key == "SHUTTERS":
-            self.shutters = value
-        else:
-            # PM 20190222 ignore unrecognized
-            #raise KeyError("Key " + str(key) + " unrecognized")
-            pass
-
-
-class PlcDevice(Device):
-    #device = models.ForeignKey('Plc', on_delete=models.CASCADE, related_name='plc_devices')
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-
-    class Meta:
-        managed = True
-        db_table = 'plc_devices'
-
-    def __str__(self):
-        return str(self.name)
-
  
 # class Plc(Device):
  #   last_update_status = models.DateTimeField(blank=True, null=True)
@@ -2474,50 +2160,6 @@ class TaskId(models.Model):
         return (str(self.task) + " - " + str(self.task_id))
  
  
-class Telescope(Device):
-    TELESCOPE = "Telescope"
-
-    mount_type = models.CharField(max_length=9, blank=True, null=True)
-    diameter = models.FloatField(blank=True, null=True)
-    latitude = models.FloatField(blank=True, null=True)
-    longitude = models.FloatField(blank=True, null=True)
-    sens = models.CharField(max_length=1, blank=True, null=True)
-    altitude = models.FloatField(blank=True, null=True)
-    readout_time = models.IntegerField(blank=True, null=True)
-    slew_time = models.IntegerField(blank=True, null=True)
-    slew_dead = models.IntegerField(blank=True, null=True)
-    slew_rate_max = models.FloatField(blank=True, null=True)
-    horizon_type = models.CharField(max_length=45, blank=True, null=True)
-    horizon_def = models.FloatField(blank=True, null=True)
-    lim_dec_max = models.FloatField(blank=True, null=True)
-    lim_dec_min = models.FloatField(blank=True, null=True)
-    lim_ha_rise = models.FloatField(blank=True, null=True)
-    lim_ha_set = models.FloatField(blank=True, null=True)
-    address = models.CharField(max_length=45, blank=True, null=True)
-    night_elev_sun = models.FloatField(blank=True, null=True)
-    mpc_code = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'telescope'
-
-    def __str__(self):
-        return (self.name)
-
-
-class TelescopeCommand(models.Model):
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    answered = models.DateTimeField(blank=True, null=True)
-    request = models.CharField(blank=False, null=False, max_length=255)
-    answer = models.TextField(null=True, blank=True)
-
-    class Meta:
-        managed = True
-        db_table = "telescopecommand"
-
-    def __str__(self):
-        return str(self.request) + str(self.created)
-
  
 class UserLevel(models.Model):
     name = models.CharField(max_length=45, blank=True, null=True)
@@ -2678,6 +2320,9 @@ class Majordome(models.Model):
         default = DAY_MODE,
         max_length=15
     )
+    class Meta:
+        managed = True
+        db_table = 'majordome'
  
     @classmethod
     def object(cls):
@@ -2710,4 +2355,9 @@ class Tickets:
         (LEVEL_FOUR,"Known issue without immediate solution"),
         (LEVEL_FIVE,"Issue not categorized until it happened")
     )
-    security_level =  models.TextField(choices=SECURITY_LEVEL_CHOICES, default=LEVEL_ONE)
 \ No newline at end of file
+    security_level =  models.TextField(choices=SECURITY_LEVEL_CHOICES, default=LEVEL_ONE)
+
+    class Meta:
+        managed = True
+        db_table = 'tickets'
+        verbose_name_plural = "tickets"
 \ No newline at end of file
@@ -33,7 +33,10 @@
     .violet{
         color : violet;
     }
-    .table{
+    #agentsst_table{
+        max-width: fit-content;
+    }
+    #cmd_table{
        /*max-width: 90vw;*/
        table-layout: fixed;
     }
@@ -46,12 +49,17 @@
         overflow:hidden;
         word-wrap: break-word;
     }
+    .date_td{
+        max-width: fit-content;
+        word-wrap: none;
+        overflow: none;
+    }
     #td_result{
         max-width:20vw;
     }
     .theader{
         text-align: center;
-        min-width: 7vw;
+        //min-width:7vw;
         max-width: 12vw;
         vertical-align:top;
     }
@@ -119,13 +127,13 @@
         {% endcomment %}
  
         <h2 id="cmd_unimplemented_message" style="color:red;"></h2>
-        <h2 id="cmdform_exiting" style="color:red;display:none" > {{ agent_name }} is not available.</h2>
+        <h2 id="cmdform_exiting" style="color:red;display:none" > {{ agent_name }} is OFF.</h2>
  
     {% endif %}
     {% if managed_agents != None %}
         <div>
             <h2> Managed agents </h2>
-            <table
+            <table id="agentsst_table"
                 class="table table-sm table-bordered tablesorter">
                 <thead>
                     <tr>
@@ -202,10 +210,10 @@
                     <th class="theader align-top">Status </th>
                     <th class="theader align-top small-cln">Validity<br> (s)</th>
                     <th class="theader align-top small-cln">Timeout<br> (s)</th>
-                    <th class="theader align-top">Deposit<br> (UTC)</th>
-                    <th class="theader align-top">Read<br> (UTC)</th>
-                    <th class="theader align-top">Exec start <br>(UTC)</th>
-                    <th class="theader align-top">Exec end <br>(UTC)</th>
+                    <th class="theader align-top date_td">Deposit<br> (UTC)</th>
+                    <th class="theader align-top date_td">Read<br> (UTC)</th>
+                    <th class="theader align-top date_td">Exec start <br>(UTC)</th>
+                    <th class="theader align-top date_td">Exec end <br>(UTC)</th>
                     <th class="theader align-top small-cln">Exec time <br>(s)</th>
                     <th class="theader align-top">Result</th>
                 </tr>
@@ -9,7 +9,11 @@ from django.contrib.auth.decorators import login_required
 import datetime
 from datetime import timezone
 from django.core.paginator import Paginator
-from common.models import Log, SP_Period_Guest, WeatherWatch, SiteWatch, ScientificProgram, Config, PyrosUser, PlcDeviceStatus, Telescope, TelescopeCommand, UserLevel, WeatherWatchHistory, Majordome, AgentSurvey, AgentCmd
+
+#from common.models import Log, SP_Period_Guest, WeatherWatch, SiteWatch, ScientificProgram, Config, PyrosUser, PlcDeviceStatus, Telescope, TelescopeCommand, UserLevel, WeatherWatchHistory, Majordome, AgentSurvey, AgentCmd
+from common.models import Log, SP_Period_Guest, WeatherWatch, SiteWatch, ScientificProgram, Config, PyrosUser, UserLevel, WeatherWatchHistory, Majordome, AgentSurvey, AgentCmd
+from devices.models import PlcDeviceStatus, Telescope, TelescopeCommand
+
 from django.core import serializers
 import utils.Logger as l
 from django.forms import modelformset_factory
-from django.db import models
+#from django.db import models
  
 # Create your models here.
+
+##from __future__ import unicode_literals
+
+# (EP 21/9/22) To allow autoreferencing (ex: AgentCmd.create() returns a AgentCmd)
+from __future__ import annotations
+
+# Stdlib imports
+from numpy import False_
+from src.device_controller.abstract_component.device_controller import DeviceCmd
+from enum import Enum
+from datetime import datetime, timedelta, date
+from dateutil.relativedelta import relativedelta
+import os
+import sys
+from typing import Any, List, Tuple, Optional
+import re
+
+# Django imports
+from django.core.validators import MaxValueValidator, MinValueValidator
+
+# DJANGO imports
+from django.contrib.auth.models import AbstractUser, UserManager
+from django.db import models
+from django.db.models import Q, Max
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db.models.deletion import DO_NOTHING
+from django.db.models.expressions import F
+from django.db.models.query import QuerySet
+from model_utils import Choices
+from django.utils import timezone
+# Project imports
+# DeviceCommand is used by class Command
+sys.path.append("../../..")
+
+''' 
+NOT USED - to be removed
+class PyrosState(Enum):
+    START = 'Starting'
+    PA = 'Passive'
+    INI = "INIT"
+    STAND = "Standby"
+    SCHED_START = 'Scheduler startup'
+    SCHED = 'Scheduler'
+    SCHED_CLOSE = 'Scheduler closing'
+'''
+
+
+"""
+STYLE RULES
+===========
+https://simpleisbetterthancomplex.com/tips/2018/02/10/django-tip-22-designing-better-models.html
+https://steelkiwi.com/blog/best-practices-working-django-models-python/
+
+- Model name => singular
+    Call it Company instead of Companies. 
+    A model definition is the representation of a single object (the object in this example is a company), 
+    and not a collection of companies
+    The model definition is a class, so always use CapWords convention (no underscores)
+    E.g. User, Permission, ContentType, etc.
+
+- For the model’s attributes use snake_case.
+    E.g. first_name, last_name, etc
+
+- Blank and Null Fields (https://simpleisbetterthancomplex.com/tips/2016/07/25/django-tip-8-blank-or-null.html)
+    - Null: It is database-related. Defines if a given database column will accept null values or not.
+    - Blank: It is validation-related. It will be used during forms validation, when calling form.is_valid().
+    Do not use null=True for text-based fields that are optional.
+    Otherwise, you will end up having two possible values for “no data”, that is: None and an empty string.
+    Having two possible values for “no data” is redundant.
+    The Django convention is to use the empty string, not NULL.
+    Example:
+        # The default values of `null` and `blank` are `False`.
+        class Person(models.Model):
+            name = models.CharField(max_length=255)  # Mandatory
+            bio = models.TextField(max_length=500, blank=True)  # Optional (don't put null=True)
+            birth_date = models.DateField(null=True, blank=True) # Optional (here you may add null=True)
+    The default values of null and blank are False.
+    Special case, when you need to accept NULL values for a BooleanField, use NullBooleanField instead.
+
+- Choices : you can use Choices from the model_utils library. Take model Article, for instance:
+    from model_utils import Choices
+    class Article(models.Model):
+        STATUSES = Choices(
+            (0, 'draft', _('draft')),
+            (1, 'published', _('published'))   )
+        status = models.IntegerField(choices=STATUSES, default=STATUSES.draft)
+
+- Reverse Relationships
+
+    - related_name :
+    Rule of thumb: if you are not sure what would be the related_name, 
+    use the plural of the model holding the ForeignKey.
+    ex:
+        class Company:
+            name = models.CharField(max_length=30)
+        class Employee:
+            first_name = models.CharField(max_length=30)
+            last_name = models.CharField(max_length=30)
+            company = models.ForeignKey(Company, on_delete=models.CASCADE, related_name='employees')
+    usage:
+        google = Company.objects.get(name='Google')
+        google.employees.all()
+        You can also use the reverse relationship to modify the company field on the Employee instances:
+        vitor = Employee.objects.get(first_name='Vitor')
+        google = Company.objects.get(name='Google')
+        google.employees.add(vitor)
+
+    - related_query_name :
+        This kind of relationship also applies to query filters. 
+        For example, if I wanted to list all companies that employs people named ‘Vitor’, I could do the following:
+        companies = Company.objects.filter(employee__first_name='Vitor')
+        If you want to customize the name of this relationship, here is how we do it:
+            class Employee:
+                first_name = models.CharField(max_length=30)
+                last_name = models.CharField(max_length=30)
+                company = models.ForeignKey(
+                    Company,
+                    on_delete=models.CASCADE,
+                    related_name='employees',
+                    related_query_name='person'
+                )
+        Then the usage would be:
+        companies = Company.objects.filter(person__first_name='Vitor')
+
+    To use it consistently, related_name goes as plural and related_query_name goes as singular.
+
+
+GENERAL EXAMPLE
+=======
+
+from django.db import models
+from django.urls import reverse
+
+class Company(models.Model):
+    # CHOICES
+    PUBLIC_LIMITED_COMPANY = 'PLC'
+    PRIVATE_COMPANY_LIMITED = 'LTD'
+    LIMITED_LIABILITY_PARTNERSHIP = 'LLP'
+    COMPANY_TYPE_CHOICES = (
+        (PUBLIC_LIMITED_COMPANY, 'Public limited company'),
+        (PRIVATE_COMPANY_LIMITED, 'Private company limited by shares'),
+        (LIMITED_LIABILITY_PARTNERSHIP, 'Limited liability partnership'),
+    )
+
+    # DATABASE FIELDS
+    name = models.CharField('name', max_length=30)
+    vat_identification_number = models.CharField('VAT', max_length=20)
+    company_type = models.CharField('type', max_length=3, choices=COMPANY_TYPE_CHOICES)
+
+    # MANAGERS
+    objects = models.Manager()
+    limited_companies = LimitedCompanyManager()
+
+    # META CLASS
+    class Meta:
+        verbose_name = 'company'
+        verbose_name_plural = 'companies'
+
+    # TO STRING METHOD
+    def __str__(self):
+        return self.name
+
+    # SAVE METHOD
+    def save(self, *args, **kwargs):
+        do_something()
+        super().save(*args, **kwargs)  # Call the "real" save() method.
+        do_something_else()
+
+    # ABSOLUTE URL METHOD
+    def get_absolute_url(self):
+        return reverse('company_details', kwargs={'pk': self.id})
+
+    # OTHER METHODS
+    def process_invoices(self):
+        do_something()
+
+"""
+
+
+'''
+# ---
+# --- Utility functions
+# ---
+
+def printd(*args, **kwargs):
+    if os.environ.get('PYROS_DEBUG', '0') == '1':
+        print('(MODEL)', *args, **kwargs)
+
+def get_or_create_unique_row_from_model(model: models.Model):
+    # return model.objects.get(id=1) if model.objects.exists() else model.objects.create(id=1)
+    return model.objects.first() if model.objects.exists() else model.objects.create(id=1)
+'''
+
+
+"""
+------------------------
+   BASE MODEL CLASSES
+------------------------
+"""
+
+
+class Device(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    is_online = models.BooleanField(default=False)
+    status = models.CharField(max_length=11, blank=True, null=True)
+    maintenance_date = models.DateTimeField(blank=True, null=True)
+
+    class Meta:
+        abstract = True
+
+    def __str__(self):
+        return (str(self.name))
+
+
+'''
+class Image(models.Model):
+    plan = models.ForeignKey(
+        'Plan', on_delete=models.CASCADE, related_name="images")
+    nrtanalysis = models.ForeignKey(
+        'NrtAnalysis', models.DO_NOTHING, blank=True, null=True, related_name="images")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    date_from_gps = models.CharField(max_length=45, blank=True, null=True)
+    level = models.IntegerField(blank=True, null=True)
+    type = models.CharField(max_length=5, blank=True, null=True)
+    quality = models.CharField(max_length=45, blank=True, null=True)
+    flaggps = models.CharField(max_length=45, blank=True, null=True)
+    exposure = models.CharField(max_length=45, blank=True, null=True)
+    tempext = models.CharField(max_length=45, blank=True, null=True)
+    pressure = models.CharField(max_length=45, blank=True, null=True)
+    humidext = models.CharField(max_length=45, blank=True, null=True)
+    wind = models.CharField(max_length=45, blank=True, null=True)
+    wind_dir = models.CharField(max_length=45, blank=True, null=True)
+    dwnimg = models.CharField(max_length=45, blank=True, null=True)
+    dwncata = models.CharField(max_length=45, blank=True, null=True)
+    dwn = models.CharField(max_length=45, blank=True, null=True)
+    level0_fits_name = models.CharField(max_length=45, blank=True, null=True)
+    level1a_fits_name = models.CharField(max_length=45, blank=True, null=True)
+    level1b_fits_name = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'image'
+
+    def __str__(self):
+        return (str(self.name))
+'''
+
+
+"""
+------------------------
+   OTHER MODEL CLASSES
+------------------------
+"""
+
+# TODO: A VIRER car remplacé par AgentDeviceStatus
+
+
+class AgentDeviceTelescopeStatus(models.Model):
+    #created = models.DateTimeField('status date', blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(
+        'status date', blank=True, null=True, auto_now=True)
+    radec = models.CharField('agent mode', max_length=30, blank=True)
+
+    class Meta:
+        managed = True
+        db_table = 'agent_device_telescope_status'
+        #verbose_name = "agent survey"
+        #verbose_name_plural = "agents survey"
+
+    """
+    def __str__(self):
+        return (f"Agent {self.name} at {self.updated} in mode {self.mode} and status {self.status}")
+    """
+
+
+class AgentDeviceStatus(models.Model):
+    """Table storing various status parameters for EACH Device.
+
+    Attributes:
+        attr1 (str): Description of `attr1`.
+        attr2 (:obj:`int`, optional): Description of `attr2`.
+
+    """
+    #created = models.DateTimeField('status date', blank=True, null=True, auto_now_add=True)
+    agent = models.CharField(
+        'Name of the agent that saved this parameter', max_length=45, blank=True, null=True)
+    #radec = models.CharField('agent mode', max_length=30, blank=True)
+    status = models.CharField(
+        'status parameters json dictionnary (ex: {radec:..., speed:...})', max_length=300, blank=True, null=True)
+    date_updated = models.DateTimeField(
+        'status parameter date', blank=True, null=True, auto_now=True)
+
+    class Meta:
+        managed = True
+        db_table = 'agent_device_status'
+        verbose_name = "agent device status"
+        verbose_name_plural = "agent devices status"
+
+    def __str__(self):
+        return (f"Agent {self.agent} last status is ({self.status}) (saved at {self.date_updated})")
+
+    @classmethod
+    def getStatusForAgent(cls, agent: str) -> str:
+        return cls.objects.filter(agent=agent)[0] if cls.objects.filter(agent=agent).exists() else cls.objects.create(agent=agent)
+        '''
+        return cls.objects.filter(agent=agent)[0].status if cls.objects.filter(agent=agent).exists() else cls.objects.create(agent=agent).status
+        agent_status = cls.objects.filter(agent=agent)
+        if agent_status.exists(): 
+            return agent_status[0].status
+        else:
+            return cls.objects.create(agent=agent)
+        '''
+
+
+
+class PlcDeviceStatus(models.Model):
+    device = models.ForeignKey(
+        'PlcDevice', on_delete=models.CASCADE, related_name='current_status')
+    created = models.DateTimeField(
+        auto_now_add=True, editable=False, blank=True)
+    outside_temp = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    outside_temp_unit = models.CharField(max_length=45, blank=True, null=True)
+    outside_humidity = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    outside_humidity_unit = models.CharField(
+        max_length=45, blank=True, null=True)
+    pressure = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    pressure_unit = models.CharField(max_length=45, blank=True, null=True)
+    rain_rate = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    rain_rate_unit = models.CharField(max_length=45, blank=True, null=True)
+    wind_speed = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    wind_speed_unit = models.CharField(max_length=45, blank=True, null=True)
+    wind_dir = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    wind_dir_unit = models.CharField(max_length=45, blank=True, null=True)
+    dew_point = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    dew_point_unit = models.CharField(max_length=45, blank=True, null=True)
+    analog = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    analog_unit = models.CharField(max_length=45, blank=True, null=True)
+    digital = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    digital_unit = models.CharField(max_length=45, blank=True, null=True)
+    inside_temp = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    inside_temp_unit = models.CharField(max_length=45, blank=True, null=True)
+    inside_humidity = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    inside_humidity_unit = models.CharField(
+        max_length=45, blank=True, null=True)
+    wind_dir_cardinal = models.CharField(max_length=45, blank=True, null=True)
+    wind_dir_cardinal_unit = models.CharField(
+        max_length=45, blank=True, null=True)
+    sensor_temperature = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    sensor_temperature_unit = models.CharField(
+        max_length=45, blank=True, null=True)
+    sky_temperature = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    sky_temperature_unit = models.CharField(
+        max_length=45,  blank=True, null=True)
+    status = models.CharField(max_length=45, blank=True, null=True)
+    current = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    current_unit = models.CharField(max_length=45, blank=True, null=True)
+    is_safe = models.BooleanField(default=True)
+    plc_mode = models.CharField(max_length=4, null=True)
+    lights = models.CharField(max_length=3, null=True)
+    shutters = models.CharField(max_length=5, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'plc_devices_status'
+
+    def __str__(self):
+        return (str(self.__dict__))
+
+    """
+        TODO : This function is Ugly,
+        we should change this with a function pointer array
+        and setters getters for each attribute
+    """
+    def setValue(self, key, value, unit=""):
+        if key == "Temperature_outside":
+            self.outside_temp = value
+            self.outside_temp_unit = unit
+        elif key == "Humidity_outside":
+            self.outside_humidity = value
+            self.outside_humidity_unit = unit
+        elif key == "_Pressure":
+            self.pressure = value
+            self.pressure_unit = unit
+        elif key == "Rain_boolean":  # RainRate
+            self.rain_rate = value
+            self.rain_rate_unit = 'boulean'
+        elif key == "Wind_speed":
+            self.wind_speed = value
+            self.wind_speed_unit = unit
+        elif key == "Wind_dir":
+            self.wind_dir = value
+            self.wind_dir_unit = unit
+        elif key == "_DewPoint":
+            self.dew_point = value
+            self.dew_point_unit = unit
+        elif key == "_analog":
+            self.analog = value
+            self.analog_unit = unit
+        elif key == "_digital":
+            self.digital = value
+            self.digital_unit = unit
+        elif key == "_InsideTemp":
+            self.inside_temp = value
+            self.inside_temp_unit = unit
+        elif key == "_InsideHumidity":
+            self.inside_humidity = value
+            self.inside_humidity_unit = unit
+        elif key == "_WindDirCardinal":
+            self.wind_dir_cardinal = value
+            self.wind_dir_cardinal_unit = unit
+        elif key == "_SensorTemperature":
+            self.sensor_temperature = value
+            self.sensor_temperature_unit = unit
+        elif key == "_SkyTemperature":
+            self.sky_temperature = value
+            self.sky_temperature_unit = unit
+        # PM 20190222 try patch
+        elif key == "Error_code":
+            self.status = value
+        elif key == "current":
+            self.current = value
+            self.current_unit = unit
+        elif key == "mode":
+            self.plc_mode = value
+        elif key == "is_safe":
+            self.is_safe = value
+        elif key == "LIGHTS":
+            self.lights = value
+        elif key == "SHUTTERS":
+            self.shutters = value
+        else:
+            # PM 20190222 ignore unrecognized
+            #raise KeyError("Key " + str(key) + " unrecognized")
+            pass
+
+
+class PlcDevice(Device):
+    #device = models.ForeignKey('Plc', on_delete=models.CASCADE, related_name='plc_devices')
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+
+    class Meta:
+        managed = True
+        db_table = 'plc_devices'
+
+    def __str__(self):
+        return str(self.name)
+
+
+
+
+
+class Detector(Device):
+    VIS = "Visible camera"
+    NIR = "Cagire"
+
+    telescope = models.ForeignKey(
+        'Telescope', models.DO_NOTHING, related_name="detectors")
+    nb_photo_x = models.IntegerField(blank=True, null=True)
+    nb_photo_y = models.IntegerField(blank=True, null=True)
+    photo_size_x = models.IntegerField(blank=True, null=True)
+    photo_size_y = models.IntegerField(blank=True, null=True)
+    has_shutter = models.BooleanField(default=False)
+    equivalent_foc_len = models.CharField(max_length=45, blank=True, null=True)
+    acq_start = models.DateTimeField(blank=True, null=True)
+    acq_stop = models.DateTimeField(blank=True, null=True)
+    check_temp = models.FloatField(blank=True, null=True)
+    gain = models.FloatField(blank=True, null=True)
+    readout_noise = models.FloatField(blank=True, null=True)
+    readout_time = models.FloatField(blank=True, null=True)
+    idcam_readout_mode = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'detector'
+
+    def __str__(self):
+        return str(self.name)
+
+    def device_name(self):
+        return self.__str__()
+    device_name.short_description = "Name"
+
+
+class Dome(Device):
+    DOME = "Dome"
+
+    open = models.BooleanField(default=False, blank=True)
+
+    class Meta:
+        managed = True
+        db_table = 'dome'
+
+    def __str__(self):
+        return str(self.name)
+
+    def device_name(self):
+        return self.__str__()
+    device_name.short_description = "Name"
+
+
+class Filter(Device):
+    VIS_FILTER_1 = "First visible filter"
+    VIS_FILTER_2 = "Second visible filter"
+    NIR_FILTER_1 = "First infrared filter"
+    NIR_FILTER_2 = "Second infrared filter"
+
+    filter_wheel = models.ForeignKey(
+        "FilterWheel", models.DO_NOTHING, related_name="filters", blank=True, null=True)
+    category = models.CharField(max_length=1, blank=True, null=True)
+    transmission_curve_doc = models.CharField(
+        max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'filter'
+
+    def __str__(self):
+        return (str(self.name))
+
+    def device_name(self):
+        return self.__str__()
+    device_name.short_description = "Name"
+
+
+class FilterWheel(Device):
+    detector = models.OneToOneField(Detector, on_delete=models.CASCADE,
+                                    related_name="filter_wheel", blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'filter_wheel'
+
+    def __str__(self):
+        return (str(self.name))
+
+    def device_name(self):
+        return self.__str__()
+    device_name.short_description = "Name"
+
+
+class Telescope(Device):
+    TELESCOPE = "Telescope"
+
+    mount_type = models.CharField(max_length=9, blank=True, null=True)
+    diameter = models.FloatField(blank=True, null=True)
+    latitude = models.FloatField(blank=True, null=True)
+    longitude = models.FloatField(blank=True, null=True)
+    sens = models.CharField(max_length=1, blank=True, null=True)
+    altitude = models.FloatField(blank=True, null=True)
+    readout_time = models.IntegerField(blank=True, null=True)
+    slew_time = models.IntegerField(blank=True, null=True)
+    slew_dead = models.IntegerField(blank=True, null=True)
+    slew_rate_max = models.FloatField(blank=True, null=True)
+    horizon_type = models.CharField(max_length=45, blank=True, null=True)
+    horizon_def = models.FloatField(blank=True, null=True)
+    lim_dec_max = models.FloatField(blank=True, null=True)
+    lim_dec_min = models.FloatField(blank=True, null=True)
+    lim_ha_rise = models.FloatField(blank=True, null=True)
+    lim_ha_set = models.FloatField(blank=True, null=True)
+    address = models.CharField(max_length=45, blank=True, null=True)
+    night_elev_sun = models.FloatField(blank=True, null=True)
+    mpc_code = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'telescope'
+
+    def __str__(self):
+        return (self.name)
+
+
+class TelescopeCommand(models.Model):
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    answered = models.DateTimeField(blank=True, null=True)
+    request = models.CharField(blank=False, null=False, max_length=255)
+    answer = models.TextField(null=True, blank=True)
+
+    class Meta:
+        managed = True
+        db_table = "telescopecommand"
+
+    def __str__(self):
+        return str(self.request) + str(self.created)
+    
 \ No newline at end of file