a2p2 0.2.14__py3-none-any.whl → 0.7.4__py3-none-any.whl

a2p2/__main__.py

@@ -2,7 +2,40 @@
 from __future__ import with_statement
 
 import traceback
+
 from argparse import ArgumentParser
+from a2p2 import __release_notes__
+from distutils.version import LooseVersion
+
+
+
+def createMdReleaseNotes():
+    """
+    Present in a reverse ordered way the dictionnary version items.
+    """
+    txt = "# A2P2 release notes"
+    lvs = [LooseVersion(v) for v in __release_notes__]
+    for lv in sorted(lvs, reverse=True):
+        v=lv.vstring
+        txt += "\n## V " + v + " :"
+        keys = []
+        for k in sorted(__release_notes__[v]):
+            if not ("TODO" in k):
+                keys.append(k)
+        for k in sorted(__release_notes__[v]):
+            if "TODO" in k:
+                keys.append(k)
+
+        for e in keys:
+            infos = __release_notes__[v][e]
+            if infos:
+                txt += "\n### " + e + " : "
+                for i in infos:
+                    txt += "\n- " + i
+        txt += "\n\n"
+    f=open("release-notes.md", "w")
+    f.write(txt)
+    print(f"{f.name} generated")
 
 
 def main():
@@ -14,17 +47,23 @@ def main():
                         help='fake API to avoid remote connection (dev. only).')
     parser.add_argument('-v', '--verbose', action='store_true', help='Verbose')
     parser.add_argument('-c', '--createprefs', action='store_true', help='Create preferences file')
+    parser.add_argument('-r', '--releasenotes', action='store_true', help='Create md release notes file')
 
     args = parser.parse_args()
 
     from . import A2p2Client
 
+    if args.releasenotes:
+        createMdReleaseNotes()
+        exit()
+
     if args.createprefs:
         A2p2Client.createPreferencesFile()
         exit()
 
+
     try:
-        with A2p2Client(args.fakeapi) as a2p2c:
+        with A2p2Client(args.fakeapi, args.verbose) as a2p2c:
             # if  args.config:
             #    print(a2p2c)
             # else:

a2p2/chara/facility.py

@@ -4,19 +4,28 @@ __all__ = []
 
 from a2p2.chara.gui import CharaUI
 from a2p2.facility import Facility
+import requests
+import logging
+import traceback
 
 HELPTEXT = "TODO update this HELP message in a2p2/chara/facility.py"
 
+logger = logging.getLogger(__name__)
 
 class CharaFacility(Facility):
 
     def __init__(self, a2p2client):
         Facility.__init__(self, a2p2client, "CHARA", HELPTEXT)
         self.charaUI = CharaUI(self)
+        self.connected2OB2 = False
+        self.validQueueServer = None
 
     def processOB(self, ob):
+        if not ob:
+            return
+
         self.a2p2client.ui.addToLog(
-            "Receive OB for '" + self.facilityName + "' interferometer")
+            "OB received for '" + self.facilityName + "' interferometer")
         # show ob dict for debug
         self.a2p2client.ui.addToLog(str(ob), False)
 
@@ -26,8 +35,49 @@ class CharaFacility(Facility):
         # give focus on last updated UI
         self.a2p2client.ui.showFacilityUI(self.charaUI)
 
+    def checkServer(self):
+        if self.validQueueServer:
+            # recheck ?
+            return True
+        else:
+            # search and test servers from preferences
+            queueServers=self.a2p2client.preferences.getCharaQueueServer()
+            msg=""
+            if queueServers :
+                for queueServer in queueServers:
+                    logger.debug(f'Trying to send OB on queuserver : {queueServer}')
+                    try:
+                        c=requests.get(queueServer, timeout=3)
+                        msg+=f"Connection succeeded on OB server : {c.json()}\n"
+                        self.validQueueServer = queueServer
+                        break
+                    except:
+                        msg+=f"Connection failed on {queueServer}\n"
+
+            self.a2p2client.ui.addToLog(msg)
+            self.charaUI.display(msg)
+
+            return self.validQueueServer
+
     def consumeOB(self, ob):
-        # for the prototype: just delegate handling to the GUI
-        # we could imagine to store obs in a list and recompute a sorted
-        # summary report e.g.
+        if self.checkServer():
+            try:
+                r = requests.post(self.validQueueServer, json=ob.as_dict(), timeout=3)
+                msg = ""
+                msg+=f"OB sent to remote server queue : {r}"
+                self.connected2OB2 = True
+                self.a2p2client.ui.addToLog(msg)
+                self.charaUI.display(msg)
+            except:
+                print(traceback.format_exc())
+                msg=f"Can't send OB to the '{self.validQueueServer}' queue server, please relaunch it or try again for a new one."
+                self.validQueueServer = None
+                self.a2p2client.ui.addToLog(msg)
+                self.charaUI.display(msg)
+        else:
+            msg=f"Can't find any queue server, please launch it, edit your preferences or check your ssh port forwarding"
+
+        # display OB
         self.charaUI.displayOB(ob)
+
+

a2p2/chara/gui.py

@@ -4,6 +4,7 @@ __all__ = []
 
 import sys
 import traceback
+import logging
 
 from a2p2.gui import FacilityUI
 
@@ -17,6 +18,7 @@ else:
 # Constants
 _HR = "\n----------------------------------------------\n"
 
+logger = logging.getLogger(__name__)
 
 class CharaUI(FacilityUI):
 
@@ -40,6 +42,10 @@ class CharaUI(FacilityUI):
         else:
             return None
 
+    def display(self, msg):
+        self.text.insert(END, msg)
+
+
     def displayOB(self, ob):
         try:
             buffer = self.extractReport(ob)
@@ -89,8 +95,8 @@ AO Flat Star:
         targets = {}  # store  ids for futur retrieval in schedule
         for oc in ob.observationConfiguration:
             targets[oc.id] = oc
-            if "SCI" in oc.type:
-                sciences.append(oc)
+            # if "SCI" in oc.type:
+            sciences.append(oc)
 
         # Retrieve cals from schedule
         cals = {}
@@ -107,13 +113,28 @@ AO Flat Star:
 
         for oc in sciences:
             sct = oc.SCTarget
+            extrainfos = self.get(sct, "EXTRA_INFORMATIONS")
             ftt = self.get(oc, "FTTarget")
             aot = self.get(oc, "AOTarget")
-            buffer += oc.observationConstraints.LSTinterval + "\n"
-            buffer += "Object:\n"
+
+            if self.get(oc,'observationConstraints'):
+                buffer += ", ".join(oc.observationConstraints.LSTinterval) + "\n"
+            else:
+                buffer += "                   NOT OBSERVABLE \n"
+            buffer += f"{oc.type} Object:\n"
             fluxes = ", ".join([e[0] + "=" + e[1]
                                 for e in ob.getFluxes(sct).items()])
-            info = sct.SPECTYP + ", " + sct.PARALLAX
+            try:
+                info = sct.SPECTYP
+            except:
+                info = "no SPECTYP"
+            info+=", "
+            try:
+                info += sct.PARALLAX
+            except:
+                info += "no PARALLAX"
+
+
             buffer += sct.name + " (" + info + ") : " + fluxes + "\n"
             if ftt:
                 buffer += "Fringe Finder:\n"
@@ -131,6 +152,11 @@ AO Flat Star:
                 for cal in cals:
                     buffer += "- " + cal + "\n"
 
+            # Display Extra_Informations if any
+            if extrainfos:
+                buffer += "Extra_infos:\n"
+                buffer += ", ".join([f"{field}={self.get(extrainfos,field)}" for field in extrainfos._fields])
+
             buffer += _HR
 
         return buffer

a2p2/client.py

@@ -6,6 +6,7 @@ import time
 import traceback
 import os
 import configparser
+import logging
 
 from a2p2 import __version__
 from a2p2.facility import FacilityManager
@@ -16,6 +17,21 @@ from a2p2.vlti.facility import VltiFacility
 
 
 
+# prepare global logging
+a2p2Rootlogger = logging.getLogger("a2p2")
+a2p2Rootlogger.setLevel(logging.INFO)
+# uncomment next two lines to log requests done by p2api as debug and maybe other ones...
+#a2p2Rootlogger = logging.getLogger()
+#a2p2Rootlogger.setLevel(logging.DEBUG)
+console = logging.StreamHandler()
+console.setLevel(logging.DEBUG)
+consoleFormatter = logging.Formatter(
+    '%(levelname)s - %(name)s  - %(asctime)s - %(filename)s:%(lineno)d - %(message)s')
+console.setFormatter(consoleFormatter)
+a2p2Rootlogger.addHandler(console)
+
+logger = logging.getLogger(__name__)
+
 
 class A2p2Client():
     """Transmit your Aspro2 observation to remote Observatory scheduling database.
@@ -24,8 +40,7 @@ class A2p2Client():
            a2p2.run()
            ..."""
 
-
-    def __init__(self, fakeAPI=False):
+    def __init__(self, fakeAPI=False, verbose=False):
         """Create the A2p2 client."""
 
         self.preferences = A2P2ClientPreferences()
@@ -35,17 +50,26 @@ class A2p2Client():
             self.apiName = "fakeAPI"
         self.fakeAPI = fakeAPI
 
+        if verbose:
+            a2p2Rootlogger.setLevel(logging.DEBUG)
+
         self.ui = MainWindow(self)
         # Instantiate the samp client and connect to the hub later
         self.a2p2SampClient = A2p2SampClient()
         self.facilityManager = FacilityManager(self)
 
         if self.preferences.exists():
-            pass
+            A2P2ClientPreferences.updatePreferencesFile()
+            self.ui.addToLog(
+                f"Using preference from '{A2P2ClientPreferences.getPreferencesFileName()}'.\n")
         else:
-            self.ui.addToLog("No preference file found, please create one so your data persists (launch program with -c option).\n\n")
+            self.ui.addToLog(
+                "No preference file found, please create one so your data persists (launch program with -c option).\n")
+
+        self.ui.addToLog("Please often update ( pip install -U [--user] a2p2 ) and don't hesitate to send any feedback or issues!\n\n")
 
-        self.errors=[]
+
+        self.errors = []
 
         pass
 
@@ -101,18 +125,20 @@ class A2p2Client():
         # bool of status change
         flag = [0]
 
+        logger.info("Running client ...")
 
         # handle autologin
         if self.preferences.getP2AutoLoginBoolean():
-            self.ui.addToLog("\nAutologin into P2 API please wait...\n")
+            logger.debug("Autologin using '%s' file" %
+                         A2P2ClientPreferences.getPreferencesFileName())
             self.ui.loop()
-            vltifacility = self.facilityManager.facilities.get(VltiFacility.getName())
+            vltifacility = self.facilityManager.facilities.get(
+                VltiFacility.getName())
             vltifacility.autologin()
 
-
         # We now run the loop to wait for the message in a try/finally block so that if
         # the program is interrupted e.g. by control-C, the client terminates
-        # gracefully.
+        # gracefully. ( but sometimes fails inside tkinter/__init__.py CallWrapper/__call__() )
 
         # We test every 1s to see if the hub has sent a message
         delay = 0.1
@@ -125,8 +151,14 @@ class A2p2Client():
                 loop_cnt += 1
                 time.sleep(delay)
 
+#                if loop_cnt % each == 0:
+#                    logger.debug(f"loop {loop_cnt}")
+
                 self.ui.loop()
 
+                # process any stacked OBs
+                self.facilityManager.processOB()
+
                 if not self.a2p2SampClient.is_connected() and loop_cnt % each == 0:
                     try:
                         self.a2p2SampClient.connect()
@@ -142,11 +174,21 @@ class A2p2Client():
 
                 if self.a2p2SampClient.has_message():
                     try:
-                        ob = OB(self.a2p2SampClient.get_ob_url())
-                        self.facilityManager.processOB(ob)
+                        if self.a2p2SampClient.has_ob_message():
+                            ob = OB(self.a2p2SampClient.get_ob_url())
+                            self.facilityManager.processOB(ob)
                     except:
                         self.ui.addToLog(
-                            "Exception during ob creation: " + traceback.format_exc(), False)
+                            "Exception during a2p2 ob creation: " + traceback.format_exc(), False)
+                        self.ui.addToLog("Can't process last OB")
+
+                    try:
+                        if self.a2p2SampClient.has_model_message():
+                                m = self.a2p2SampClient.get_model()
+                                self.showModel(m)
+                    except:
+                        self.ui.addToLog(
+                            "Exception during a2p2 ob creation: " + traceback.format_exc(), False)
                         self.ui.addToLog("Can't process last OB")
 
                     # always clear previous received message
@@ -156,16 +198,27 @@ class A2p2Client():
                     loop_cnt = -1
             except KeyboardInterrupt:
                 loop_cnt = -1
+        print("\nDisconnecting SAMP ...")
+        self.a2p2SampClient.disconnect()
+        print("Bye!")
+
 
     def createPreferencesFile():
         A2P2ClientPreferences.createPreferencesFile()
 
+
+    def showModel(self, xmlmodel):
+        from a2p2.jmmc.models import modelsFromXml
+        self.ui.addToLog("Received star model")
+        self.ui.addToLog(modelsFromXml(xmlmodel))
+
+
 class A2P2ClientPreferences():
     # define application name
     appname = "a2p2"
 
     def __init__(self):
-        self._config =  A2P2ClientPreferences.getPreferences()
+        self._config = A2P2ClientPreferences.getPreferences()
         pass
 
     def exists(self):
@@ -176,36 +229,84 @@ class A2P2ClientPreferences():
 
     def getPreferences():
         preferences_file = A2P2ClientPreferences.getPreferencesFileName()
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(allow_no_value=True)
         config.read(preferences_file)
         return config
 
     def getPreferencesFileName():
         from appdirs import user_config_dir
-        preferences_file = os.path.join(user_config_dir(A2P2ClientPreferences.appname), "prefs.ini")
+        preferences_file = os.path.join(user_config_dir(
+            A2P2ClientPreferences.appname), "prefs.ini")
         return preferences_file
+    def updatePreferencesFile():
+        return
+        # TODO
+        # we suppose the file exists
+        filename = A2P2ClientPreferences.getPreferencesFileName()
+        buffer=""
+        for line in open(filename):
+            buffer+=line+"\n"
+        print (buffer)
 
     def createPreferencesFile():
-        filename=A2P2ClientPreferences.getPreferencesFileName()
-
+        filename = A2P2ClientPreferences.getPreferencesFileName()
         if os.path.exists(filename):
-            print("%s already exists. Nothing done"%filename)
+            print(f"{filename} already exists. Nothing done")
+            p=A2P2ClientPreferences()
+            versionInPref=p.getA2P2Version()
+            if __version__ != versionInPref:
+                print(f"HINT: You may try to backup this file (V{versionInPref}) and merge with a new generated one for V{__version__}.")
         else:
-            config = configparser.ConfigParser()
+            import getpass
+
+            config = configparser.ConfigParser(allow_no_value=True)
             #config['DEFAULT'] = {'_noprefyet': '42'}
+
+            config['a2p2'] = {}
+            s = config['a2p2']
+            s['# A2P2 SECTION'] = ""
+            s['# = > please do not modify next properties <'] = ""
+            s['version'] = __version__
+
+
+            config['jmmc'] = {}
+            s = config['jmmc']
+            s['# JMMC SECTION'] = ""
+            s['# = > please uncomment and update next properties to make it active <'] = ""
+            s['#login'] = "my.email@my.lab"
+            s['#password'] = "12345zZ"
+
+            config['chara'] = {}
+            s = config['chara']
+            s['# CHARA SECTION'] = ""
+            s['# = > please uncomment and update next properties to make it active <'] = ""
+            s['# = > queueserver may be uncommented to forward OB to a remote server instead <'] = ""
+            s['#queueserver'] = 'http://192.168.3.153:2468/test,http://localhost:2468/test'
+
             config['p2'] = {}
-            import getpass
-            config['p2']['# = > please uncomment and update next properties to make it active <']=""
-            config['p2']['#username'] = getpass.getuser()
-            config['p2']['#password'] = "12345zZ"
-            config['p2']['#user_comment_name'] = "changed it if your local USER name is not fine"
-            config['p2']['#autologin'] = "yes"
+            s=config['p2']
+            s['# ESO P2 SECTION'] = ""
+            s['# = > please uncomment and update next properties to make it active <'] = ""
+            s['#username'] = getpass.getuser()
+            s['#password'] = "12345zZ"
+            s['#autologin'] = "yes"
+            s['# = > please change next properties to change the name recorded in the OB comments <'] = ""
+            s['user_comment_name'] = f"{getpass.getuser()}"
+
+            config['p2.iss.vltitype'] = {}
+            s=config['p2.iss.vltitype']
+            s['# = > please uncomment the default values to add for ISS.VLTITYPE <'] = ""
+            s['# = > all supported will be added for any VLTI instrument if info is not provided by Aspro2 <'] = None
+            s['#snapshot'] = None
+            s['#imaging'] = None
+            s['#time-series'] = None
+            s['#astrometry'] = None
 
             os.makedirs(os.path.dirname(filename), exist_ok=True)
             with open(filename, 'w+') as configfile:
                 config.write(configfile)
 
-            print("%s template created. Please adjust."%filename)
+            print("'%s' template file created to store preferences. Please check and adjust it's content." % filename)
 
     def getConfig(self, section, key, default=None):
         try:
@@ -213,19 +314,44 @@ class A2P2ClientPreferences():
         except:
             return default
 
+    def getConfigKeys(self, section, default=None):
+        try:
+            return list(self._config[section].keys())
+        except:
+            return default
+
+
     def getConfigBoolean(self, section, key, default=None):
         try:
-            return self._config.getboolean(section,key)
+            return self._config.getboolean(section, key)
         except:
             return default
 
+    # Retrieve A2P2 prefs
+    def getA2P2Version(self):
+        return self.getConfig("a2p2", "version", 'missing')
+
+    # Retrieve JMMC prefs
+    def getJmmcLogin(self):
+        return self.getConfig("jmmc", "login", None)
 
-    # retrieve P2 username in config or use default demo account
+    def getJmmcPassword(self):
+        return self.getConfig("jmmc", "password", None)
+
+    # Retrieve CHARA prefs
+    def getCharaQueueServer(self):
+        s = self.getConfig("chara", "queueserver", None)
+        if s:
+            return s.split(",")
+
+
+    # Retrieve P2 prefs
     def getP2Username(self):
-        return self.getConfig("p2","username", '52052')
+        """ Get P2 username in config or use default demo account """
+        return self.getConfig("p2", "username", '52052')
 
-    # retrieve P2 password in config or use default demo account
     def getP2Password(self):
+        """Get P2 password in config or use default demo account"""
         return self.getConfig("p2", "password", 'tutorial')
 
     def getP2UserCommentName(self):
@@ -233,5 +359,6 @@ class A2P2ClientPreferences():
         return self.getConfig("p2", "user_comment_name", getpass.getuser())
 
     def getP2AutoLoginBoolean(self):
-            return self.getConfigBoolean("p2", "autologin", False)
+        return self.getConfigBoolean("p2", "autologin", False)
+
 

a2p2/facility.py

@@ -2,6 +2,9 @@
 
 __all__ = []
 
+import logging
+
+logger = logging.getLogger(__name__)
 
 class FacilityManager():
     """
@@ -35,7 +38,17 @@ class FacilityManager():
 
         return " | ".join(status)
 
-    def processOB(self, ob):
+    def processOB(self, ob=None):
+
+        # handled queued obs if ob is null
+        # TODO add a new method in the futur
+        if not ob:
+            for f in self.facilities.values():
+                f.processOB(ob)
+            return
+
+        # else handle given ob
+
         """ Test instrument on facility that registerInstrument() before OB forward for specialized handling."""
         interferometer = ob.interferometerConfiguration.name
         insname = ob.instrumentConfiguration.name