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

Dont know

Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev
Dont know
Patrick Maeght
2 parents f4465c28 fa988689
Showing 12 changed files with 48 additions and 351 deletions Show diff stats
devices_channel/src_device/client/client_channel_serial.py
doc/PyROS software.docx
doc/PyROS software.pdf
doc/PyROS_software.docx
doc/PyROS_software.odt
doc/PyROS_software.pdf
src/majordome/start_agent_majordome_from_test.py
src/pyros/test_settings_NOTUSED.py
src/utils/celme/dates.py
src/utils/plc/guitalens_observatory/maintenance_guide.odp
src/utils/report/doc/user_guide_module_report.odt
src/utils/report/status_json.py
@@ -21,7 +21,7 @@ class ClientChannelSerial(ClientChannel):
     buf = 1024
-    def __init__(self, server_host:str="localhost", server_port:int=11110, buffer_size=1024, DEBUG=False):
+    def __init__(self, server_host:str="localhost", server_port:int=11110, buffer_size=1024, DEBUG:bool=False):
         '''
         :param server_host: server IP or hostname
         :param server_port: server port
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-# DJANGO setup
-#sys.path.append('/PROJECTS/GFT/SOFT/PYROS_SOFT/PYROS201802')
-sys.path.append('..')
-#print("file is", __file__)
-mypath = os.getcwd()
-
-# Go into src/
-##os.chdir('..')
-#print("Current directory : " + str(os.getcwd()))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.pyros.settings")
-#os.environ['SECRET_KEY'] = 'abc'
-#os.environ['ENVIRONMENT'] = 'production'
-import django
-django.setup()
-
-# MONITORING AGENT setup
-agent="majordome"
-
-if agent=="majordome":
-    from majordome.tasks import Majordome
-    Majordome().run()
@@ -1,290 +0,0 @@
-""" OBSOLETE FILE """
-"""
-Django settings for pyros project.
-
-Generated by 'django-admin startproject' using Django 1.9.4.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.9/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.9/ref/settings/
-"""
-
-# Dictionary containing all the versions for the different modules
-# IMPORTANT : I must be updated at every commit !
-
-MODULES_VERSIONS = {
-    "Alert Manager" : "0.2.4",
-    "Analyzer" : "0.1.2",
-    "Dashboard" : "0.1.1",
-    "Majordome" : "0.1.4",
-    "Monitoring" : "0.1.3",
-    "Observation Manager" : "0.1.3",
-    "Routine Manager" : "0.1.2",
-    "Scheduler" : "0.1.2",
-    "User Manager" : "0.1.1",
-    "Device" : "0.1.1"
-}
-
-# Set MYSQL to False if you want to use SQLITE
-# This line MUST NOT be changed at all except from changing True/False
-# (or install_requirements script will become invalid)
-MYSQL = True
-
-# YOU MUST CHANGE THIS VALUE IN PYROSRUN.SH TOO
-TEST_PORT = 8001
-# YOU MUST CHANGE THIS VALUE IN PYROSRUN.SH TOO
-
-
-import os
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '0*@w)$rq4x1c2w!c#gn58*$*u$w=s8uw2zpr_c3nj*u%qlxc23'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = ['localhost']
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-
-    # for using "./manage.py graph_models" with graphviz:
-    # (https://projects.irap.omp.eu/projects/pyros/wiki/Project_Development#django-extensions-and-graphviz-useful-for-generating-an-image-of-all-the-models-and-their-relationships)
-    'django_extensions',
-    'test_without_migrations',
-    'bootstrap3',
-    'dashboard',
-    'scheduler',
-    'common',
-    'alert_manager',
-    'analyzer',
-    'majordome',
-    'monitoring',
-    'observation_manager',
-    'routine_manager',
-    'user_manager',
-    'devices'
-]
-
-MIDDLEWARE_CLASSES = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-ROOT_URLCONF = 'pyros.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ['misc/templates'],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'pyros.wsgi.application'
-
-FIXTURE_DIRS = (
-    'misc/fixtures/',
-)
-
-LOGIN_URL = "/"
-
-# Database
-# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
-
-# EP modif
-
-CELERY_TEST = False
-
-if not CELERY_TEST:
-    if not MYSQL:
-        DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.sqlite3',
-                'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-            }
-        }
-    else:
-        DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.mysql',
-                'NAME': 'test_pyros',
-                'USER': 'pyros',
-                'PASSWORD': 'DjangoPyros',
-            }
-        }
-else:
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': os.path.join(BASE_DIR, 'testdb.sqlite3'),
-            'TEST': {
-                'NAME': os.path.join(BASE_DIR, 'testdb.sqlite3'),
-            },
-        }
-    }
-
-
-# Password validation
-# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.9/topics/i18n/
-
-#LANGUAGE_CODE = 'en-us'
-LANGUAGE_CODE = 'fr-FR'
-
-#TIME_ZONE = 'UTC'
-TIME_ZONE = 'Europe/Paris'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# To find the media files {{ MEDIA_URL }}
-MEDIA_URL = '/public/static/media/'
-
-
-# To find the static files in the app/static/ap/... folders
-STATIC_URL = '/public/static/'
-
-# To find the static files in src/static/. Any local directory can be added to this list.
-STATICFILES_DIRS = (
-                    os.path.join(BASE_DIR, "misc", "static"),
-                    )
-
-# Used for deployment (DEBUG = False). Need to run "python manage.py collectstatic" to fill it.
-STATIC_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'public', 'static')
-
-
-# EP added
-if not DEBUG:
-    '''
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-            'LOCATION': '127.0.0.1:11211',
-        }
-    }
-    '''
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'LOCATION': '/var/tmp/django_cache',
-        }
-    }
-
-else:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-        }
-    }
-
-# from django.core.cache import cache
-# cache.clear()
-
-# CELERY CONFIG
-
-# CELERY_RESULT_BACKEND = 'rpc://'
-CELERY_RESULT_BACKEND = 'amqp'
-
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
-
-CELERY_IMPORTS = (
-    "alert_manager.tasks",
-    "analyzer.tasks",
-    "majordome.tasks",
-    "monitoring.tasks",
-    "observation_manager.tasks",
-    "scheduler.tasks",
-)
-
-# This config allows only 1 process / queue. We replace it by the -c option at celery workers creation.
-# CELERYD_CONCURRENCY = 1
-
-''' Following config is needed for manual purge '''
-CELERY_ACKS_LATE = False
-CELERYD_PREFETCH_MULTIPLIER = 1
-
-CELERY_QUEUES = {
-    "alert_listener_q": {"exchange": "alert_listener_q", "routing_key": "alert_listener_q"},
-    "analysis_q": {"exchange": "analysis_q", "routing_key": "analysis_q"},
-    "system_status_q": {"exchange": "system_status_q", "routing_key": "system_status_q"},
-    "change_obs_conditions_q": {"exchange": "change_obs_conditions_q", "routing_key": "change_obs_conditions_q"},
-    "monitoring_q": {"exchange": "monitoring_q", "routing_key": "monitoring_q"},
-    "scheduling_q": {"exchange": "scheduling_q", "routing_key": "scheduling_q"},
-    "execute_sequence_q": {"exchange": "execute_sequence_q", "routing_key": "execute_sequence_q"},
-    "execute_plan_vis_q": {"exchange": "execute_plan_vis_q", "routing_key": "execute_plan_vis_q"},
-    "execute_plan_nir_q": {"exchange": "execute_plan_nir_q", "routing_key": "execute_plan_nir_q"},
-    "create_calibrations_q": {"exchange": "create_calibrations_q", "routing_key": "create_calibrations_q"},
-}
-
-CELERY_ROUTES = {
-    "alert_manager.tasks.alert_listener": {"queue": "alert_listener_q"},
-    "analyzer.tasks.analysis": {"queue": "analysis_q"},
-    "majordome.tasks.execute_sequence": {"queue": "execute_sequence_q"},
-    "majordome.tasks.system_pause": {"queue": "system_status_q"},
-    "majordome.tasks.system_restart": {"queue": "system_status_q"},
-    "majordome.tasks.change_obs_conditions": {"queue": "change_obs_conditions_q"},
-    "monitoring.tasks.monitoring": {"queue": "monitoring_q"},
-    "observation_manager.tasks.execute_plan_vis": {"queue": "execute_plan_vis_q"},
-    "observation_manager.tasks.execute_plan_nir": {"queue": "execute_plan_nir_q"},
-    "observation_manager.tasks.create_calibrations": {"queue": "create_calibrations_q"},
-    "scheduler.tasks.scheduling": {"queue": "scheduling_q"},
-}
-
-''' Removes pickle warning '''
-CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
@@ -2,6 +2,7 @@ import datetime
 import math
 import doctest
 import typing 
+from typing import Union
 try:
     from .durations import Duration
 except:
@@ -73,7 +74,7 @@ class Date:
 # === internal methods
 # ========================================================
-    def _init(self,date="") -> None:
+    def _init(self,date: Union[str, float] = "") -> None:
         """ Initialize internal attributes.
         :param date: date is a date in any supported format (cf. help(Date))
@@ -1053,7 +1054,7 @@ class Date:
         """
         return self + duration
-    def __sub__(self, object_or_duration):
+    def __sub__(self, object_or_duration: Union["Date", float]) -> "Date":
         """ Subtract a duration to a date (returns an object date) or Compute the duration between two date objects.
         Inputs:
@@ -11,6 +11,9 @@ if (py_pwd not in py_path):
 py_pwd = os.getcwd() + "/.."
 if (py_pwd not in py_path):
     (os.sys.path).append(py_pwd)
+py_pwd = os.getcwd() + "/../.."
+if (py_pwd not in py_path):
+    (os.sys.path).append(py_pwd)
 import utils.celme as celme
@@ -25,16 +28,16 @@ class Status_json:
 Example a a very wimple Json file report contents:
 {
-  "frame_model": "1.1",
-  "name_creator": "PLC",
-  "version_creator": "20180909",
+  "frame_model": "1.2",
+  "producer_name": "PLC",
+  "producer_version": "20180909",
   "entities": [
     {
       "entity_name": "PLC_STATUS",
-      "from": "Raspberry",
+      "origin": "Raspberry",
       "version_firmware": "20180924A",
       "site": "MyObservatory",
-      "date": "2018-09-25T22:24:16.387",
+      "date": "2018-11-29T15:07:20.999",
       "devices": [
         {
           "device_name": "DHT22",
@@ -44,10 +47,10 @@ Example a a very wimple Json file report contents:
           "device_values": [
             {
               "name": "OutsideTemperature",
-              "type": "float",
+              "data_type": "float",
               "value": "22",
               "unit": "degC",
-              "monitoring_name": "temperature",
+              "monitoring_name": "Temperature_outside",
               "comment": "Temperature"
             }
           ]
@@ -56,7 +59,7 @@ Example a a very wimple Json file report contents:
     }
   ]
 }
-
+          
 A value is stored in a UFKI (Unique Four Key Identifier):
 UFKI = entity_name device_name serial_number name
@@ -238,16 +241,16 @@ https://github.com/hjson/hjson-py
     # To create a Status
     ####################################################################
-    def _status_new(self, name_creator, version_creator):
-        status_header = {'frame_model':'1.1', 'name_creator':name_creator, 'version_creator':version_creator, 'entities':[]}
+    def _status_new(self, producer_name, producer_version):
+        status_header = {'frame_model':'1.2', 'producer_name':producer_name, 'producer_version':producer_version, 'entities':[]}
         #self._status = { 'statuses':[] }
         #self._status['statuses'].append(status_header)
         self._status = status_header
-    def _status_new_entity(self, entity_name, thefrom, version_firmware, site, date=""):
+    def _status_new_entity(self, entity_name, theorigin, version_firmware, site, date=""):
         if date=="":
             date = (celme.Date("now")).iso()
-        entity= {'entity_name':entity_name, 'from':thefrom, 'version_firmware':version_firmware, 'site':site, 'date':date, 'devices':[]}
+        entity= {'entity_name':entity_name, 'origin':theorigin, 'version_firmware':version_firmware, 'site':site, 'date':date, 'devices':[]}
         #self._status['statuses'][0]['entities'].append(entity);
         self._status['entities'].append(entity);
@@ -260,7 +263,7 @@ https://github.com/hjson/hjson-py
         #self._status['statuses'][0]['entities'][indicee]['devices'].append(device)
         self._status['entities'][indicee]['devices'].append(device)
-    def _status_entity_device_new_value(self, entity_name, device_name, serial_number, name, thetype, value, unit="", monitoring_name="", comment=""):
+    def _status_entity_device_new_value(self, entity_name, device_name, serial_number, name, data_type, value, unit="", monitoring_name="", comment=""):
         entities = self._get_entity_names()
         indicee = self._get_indice_from_entities(entities,entity_name)
         if indicee == -1:
@@ -270,7 +273,7 @@ https://github.com/hjson/hjson-py
         indiced = self._get_indice_from_devices(devices, device_name, serial_number)
         if indiced == -1:
             return ""
-        dico = {'name':name, 'type':thetype, 'value':value, 'unit':unit, 'monitoring_name':monitoring_name, 'comment':comment}
+        dico = {'name':name, 'data_type':data_type, 'value':value, 'unit':unit, 'monitoring_name':monitoring_name, 'comment':comment}
         #self._status['statuses'][0]['entities'][indicee]['devices'][indiced]['device_values'].append(dico)
         self._status['entities'][indicee]['devices'][indiced]['device_values'].append(dico)
@@ -278,7 +281,7 @@ https://github.com/hjson/hjson-py
 # === status_json methods
 # ========================================================
-    def new_status(self, name_creator, version_creator):
+    def new_status(self, producer_name, producer_version):
         """ Initialize a new status
         Inputs:
@@ -295,9 +298,9 @@ https://github.com/hjson/hjson-py
         Method append_entity
         """
         self._init()
-        self._status_new(name_creator, version_creator)
+        self._status_new(producer_name, producer_version)
-    def append_entity(self, entity_name, thefrom, version_firmware, site, date=""):
+    def append_entity(self, entity_name, theorigin, version_firmware, site, date=""):
         """ Append a new entity to a creator
         Inputs:
@@ -314,7 +317,7 @@ https://github.com/hjson/hjson-py
         ---------------
         Methods append_device, get_entities
         """
-        self._status_new_entity(entity_name, thefrom, version_firmware, site, date)
+        self._status_new_entity(entity_name, theorigin, version_firmware, site, date)
         self._entity_name = entity_name
     def append_device(self, device_name, device_type, serial_number, error_code):
@@ -340,7 +343,7 @@ https://github.com/hjson/hjson-py
         self._device_name = device_name
         self._serial_number = serial_number
-    def append_value(self, name, thetype, value, unit="", monitoring_name="", comment=""):
+    def append_value(self, name, data_type, value, unit="", monitoring_name="", comment=""):
         """ Append a new value to a device
         Inputs:
@@ -362,7 +365,7 @@ https://github.com/hjson/hjson-py
         entity_name = self._entity_name
         device_name = self._device_name
         serial_number = self._serial_number
-        self._status_entity_device_new_value(entity_name, device_name, serial_number, name, thetype, value, unit, monitoring_name, comment)
+        self._status_entity_device_new_value(entity_name, device_name, serial_number, name, data_type, value, unit, monitoring_name, comment)
     def load_json(self, full_filename):        
         """ Load a Json file as an object
@@ -483,7 +486,7 @@ https://github.com/hjson/hjson-py
                     res.append(re)
         return res
-    def get_values(self, only_device_name="", only_serial_number="", getvalue=False):
+    def get_ufkis(self, only_device_name="", only_serial_number="", getvalue=False):
         """ Get the current values
         Inputs:
@@ -494,6 +497,7 @@ https://github.com/hjson/hjson-py
         ------
         >>> report = report.Status_json()
         >>> print("{}",format(report.get_devices()))
+        >>> print("{}",format(report.get_ufkis("","",True))
         Related topics:
         ---------------
@@ -521,6 +525,16 @@ https://github.com/hjson/hjson-py
                         res.append(re)
         return res
+    def get_sensors(self, only_device_name="", only_serial_number="", getvalue=False):
+        """ Get the current values. Alias of get_ufkis.
+        """
+        return self.get_ufkis(only_device_name, only_serial_number, getvalue);
+        
+    def get_values(self, only_device_name="", only_serial_number="", getvalue=False):
+        """ Get the current values. Alias of get_ufkis.
+        """
+        return self.get_ufkis(only_device_name, only_serial_number, getvalue);
+        
 # ========================================================
 # === debug methods
@@ -604,10 +618,10 @@ if __name__ == &quot;__main__&quot;:
     rep.append_device("DHT22", "meteo", "1", "0")
     rep.append_value(  "OutsideTemperature",  "float","22","degC","Temperature_outside","Temperature")
     # --- List the UFKIs
-    ufiks = rep.get_values("","",False)
+    ufkis = rep.get_ufkis("","",False)
     print(" List of all UFKIs:")
-    for ufik in ufiks:
-        print("  UFKI = {}".format(ufik))
+    for ufki in ufkis:
+        print("  UFKI = {}".format(ufki))
     # --- save the Json file
     rep.save_json("plc_verysimple.json")
@@ -646,12 +660,10 @@ if __name__ == &quot;__main__&quot;:
     rep.append_value(  "SkyTemperature",  "float","-15.67","degC","Temperature_sky","Temperature of the sky")
     rep.append_value(  "CanTemperature",  "float","22.47","degC","","Temperature of the TO can")
     # --- List the UFKIs
-    ufiks = rep.get_values("","",False)
+    ufkis = rep.get_ufkis("","",False)
     print(" List of all UFKIs:")
-    for ufik in ufiks:
-        print("  UFKI = {}".format(ufik))
-    # --- read the value of one UFKI
-        
+    for ufki in ufkis:
+        print("  UFKI = {}".format(ufki))
     # --- save the Json file
     rep.save_json("plc_guitalens.json")
@@ -667,6 +679,6 @@ if __name__ == &quot;__main__&quot;:
     res = rep.get_devices()
     print(" devices = {}".format(res))
     print(" List of all UFKIs:")
-    ufiks = rep.get_values("","",False)
-    for ufik in ufiks:
-        print("  UFKI = {}".format(ufik))
+    ufkis = rep.get_ufkis("","",True)
+    for ufki in ufkis:
+        print("  UFKI = {}".format(ufki))