a2p2 0.7.1__tar.gz → 0.7.3__tar.gz

{a2p2-0.7.1/a2p2.egg-info → a2p2-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.7.1
+Version: 0.7.3
 Summary: UNKNOWN
 Home-page: http://www.jmmc.fr/a2p2
 Author: JMMC Tech Group
@@ -80,6 +80,9 @@ Each facilities get it's own code directory to manage specific GUI and specific
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------

{a2p2-0.7.1 → a2p2-0.7.3}/README.rst

@@ -68,6 +68,9 @@ Each facilities get it's own code directory to manage specific GUI and specific
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------

{a2p2-0.7.1 → a2p2-0.7.3}/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,15 +47,21 @@ 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, args.verbose) as a2p2c:
             # if  args.config:

a2p2-0.7.3/a2p2/chara/facility.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+
+__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(
+            "OB received for '" + self.facilityName + "' interferometer")
+        # show ob dict for debug
+        self.a2p2client.ui.addToLog(str(ob), False)
+
+        # performs operation
+        self.consumeOB(ob)
+
+        # 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):
+        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-0.7.1 → a2p2-0.7.3}/a2p2/client.py

@@ -59,7 +59,9 @@ class A2p2Client():
         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")
@@ -236,6 +238,15 @@ class A2P2ClientPreferences():
         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()
@@ -270,7 +281,7 @@ class A2P2ClientPreferences():
             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://localhost:2468/test"
+            s['#queueserver'] = 'http://192.168.3.153:2468/test,http://localhost:2468/test'
 
             config['p2'] = {}
             s=config['p2']
@@ -329,7 +340,9 @@ class A2P2ClientPreferences():
 
     # Retrieve CHARA prefs
     def getCharaQueueServer(self):
-        return self.getConfig("chara", "queueserver", None)
+        s = self.getConfig("chara", "queueserver", None)
+        if s:
+            return s.split(",")
 
 
     # Retrieve P2 prefs

{a2p2-0.7.1 → a2p2-0.7.3}/a2p2/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.1"
+__version__ = "0.7.3"
 
 __release_notes__ = {
     # "0.1.6": {
@@ -21,19 +21,9 @@ __release_notes__ = {
     #
     #        ],
     #    },
-    "0.7.1": {
-       "STATUS": [
-       ],
-       "A2P2": [
-           "Fix ttk import on MacOS",
-       ],
-       "VLTI": [
-            "Add first P112 support using radiobutton to select proper onaxis offaxis or wide GRAVITY templates",
-            "Improve coordinate's checks and computations",
-            "Add FT's propermotions and parallax"
-       ],
+    "0.7.3": {
        "CHARA": [
-            "Display log of received OB also for calibrators"
+            "Better reuse of last working queueserver"
        ],
        "TODO-SCIENCE": [
            "Merge AO or GS in a same code section for every instruments",
@@ -47,6 +37,33 @@ __release_notes__ = {
            "Complete test suite with more real p2 submissions",
            "Try to read OB in P2 and send them back to Aspro2 as a new obs",
        ],
+    },"0.7.2": {
+       "STATUS": [
+       ],
+       "A2P2": [
+           "Auto update chara queueserver preference",
+           "a2p2 -r generates release-notes.md (rendered on a2p2 repository)"
+       ],
+       "VLTI": [
+            "Bugfix to support missin preference file"
+       ],
+       "CHARA": [
+            "Support and try every queueserver's Urls comma separated from the queuserver user preference"
+       ],
+    },"0.7.1": {
+       "STATUS": [
+       ],
+       "A2P2": [
+           "Fix ttk import on MacOS",
+       ],
+       "VLTI": [
+            "Add first P112 support using radiobutton to select proper onaxis offaxis or wide GRAVITY templates",
+            "Improve coordinate's checks and computations",
+            "Add FT's propermotions and parallax"
+       ],
+       "CHARA": [
+            "Display log of received OB also for calibrators"
+       ]
     },"0.6.9": {
        "STATUS": [
        ],

{a2p2-0.7.1 → a2p2-0.7.3}/a2p2/vlti/gravity.py

@@ -73,7 +73,6 @@ class Gravity(VltiInstrument):
                 obsTSF = TSF(self, self.getGravityObsTemplateName(
                     ob, OBJTYPE, dualField))
 
-                obTarget = OBTarget()
                 obConstraints = OBConstraints(self)
 
                 # Check SPEC_RES from instrumentMode and set SPEC_POL except for single_offaxis ( missing keyword INS_SPEC_RES)
@@ -93,13 +92,10 @@ class Gravity(VltiInstrument):
 
                 scienceTarget = observationConfiguration.SCTarget
 
+                obTarget = OBTarget(self, scienceTarget)
+
                 # define target
-                acqTSF.SEQ_INS_SOBJ_NAME = scienceTarget.name.strip().replace(
-                    ' ', '_')  # allowed characters: letters, digits, + - _ . and no spaces
-                obTarget.name = acqTSF.SEQ_INS_SOBJ_NAME
-                obTarget.ra, obTarget.dec = self.getCoords(scienceTarget)
-                obTarget.properMotionRa, obTarget.properMotionDec = self.getPMCoords(
-                    scienceTarget)
+                acqTSF.SEQ_INS_SOBJ_NAME = obTarget.name
 
                 # Set baseline  interferometric array code (should be a keywordlist)
                 acqTSF.ISS_BASELINE = [self.getBaselineCode(ob)]

{a2p2-0.7.1 → a2p2-0.7.3}/a2p2/vlti/gui.py

@@ -229,8 +229,8 @@ class TreeFrame(Frame):
         for isvt in self.vltiUI.facility.getIssVltiTypes():
             boolv = BooleanVar()
             self.issVltiTypeCheckboxesVars[isvt]=boolv
-            boolv.set( isvt in pvltitypes or len(pvltitypes)==0 )
-            logger.debug(f"Set prefrence value for {isvt} : {boolv.get()}")
+            boolv.set( not pvltitypes or len(pvltitypes)==0 or isvt in pvltitypes )
+            logger.debug(f"Set preference value for {isvt} : {boolv.get()}")
             cb = Checkbutton(buttonframe, text=isvt, variable=boolv, onvalue=True, offvalue=False)
             cb.grid(row=0, column=cindex)
             cindex += 1

{a2p2-0.7.1 → a2p2-0.7.3}/a2p2/vlti/instrument.py

@@ -700,9 +700,14 @@ class FixedDict(object):
 
 class OBTarget(FixedDict):
 
-    def __init__(self):
+    def __init__(self, instrument, scienceTarget):
         FixedDict.__init__(
             self, ('name', 'ra', 'dec', 'properMotionRa', 'properMotionDec'))
+        # Target name can include any alphanumeric character, and space, dot, plus or minus signs [a-z][A-Z][0-9][.+- ]
+        # ( https://www.eso.org/sci/observing/phase2/p2intro/p2-tutorials/p2-ImportTargetList.html )
+        self.name = re.sub(r'[^a-zA-Z0-9.\+\- ]+','',scienceTarget.name.strip())
+        self.ra, self.dec = instrument.getCoords(scienceTarget)
+        self.properMotionRa, self.properMotionDec = instrument.getPMCoords(scienceTarget)
 
 
 class OBConstraints(TSF):

{a2p2-0.7.1 → a2p2-0.7.3}/a2p2/vlti/matisse.py

@@ -48,7 +48,6 @@ class Matisse(VltiInstrument):
             acqTSF = TSF(self, f"MATISSE_img_acq{tsfSuffix}.tsf")  # or .tsfx?
             obsTSF = TSF(self, f"MATISSE_hyb_obs{tsfSuffix}.tsf")
 
-            obTarget = OBTarget()
             obConstraints = OBConstraints(self)
 
             if 'SCIENCE' in observationConfiguration.type:
@@ -57,15 +56,7 @@ class Matisse(VltiInstrument):
                 obsTSF.DPR_CATG = 'CALIB'
 
             scienceTarget = observationConfiguration.SCTarget
-
-            # define target
-
-            obTarget.name = scienceTarget.name.replace(' ',
-                                                       '_')  # allowed characters: letters, digits, + - _ . and no spaces
-            # allowed characters: letters, digits, + - _ . and no spaces
-            obTarget.ra, obTarget.dec = self.getCoords(scienceTarget)
-            obTarget.properMotionRa, obTarget.properMotionDec = self.getPMCoords(
-                scienceTarget)
+            obTarget = OBTarget(self, scienceTarget)
 
             # Set baseline  interferometric array code (should be a keywordlist)
             acqTSF.ISS_BASELINE = [self.getBaselineCode(ob)]

{a2p2-0.7.1 → a2p2-0.7.3}/a2p2/vlti/pionier.py

@@ -48,7 +48,7 @@ class Pionier(VltiInstrument):
             kappaTSF = TSF(self, "PIONIER_gen_cal_kappa.tsf")
             darkTSF = TSF(self, "PIONIER_gen_cal_dark.tsf")
 
-            obTarget = OBTarget()
+
             obConstraints = OBConstraints(self)
 
             # set common properties
@@ -63,14 +63,7 @@ class Pionier(VltiInstrument):
 
             scienceTarget = observationConfiguration.SCTarget
 
-            # define target
-            # acqTSF.SEQ_INS_SOBJ_NAME = scienceTarget.name.strip()
-
-            obTarget.name = scienceTarget.name.strip().replace(
-                ' ', '_')  # allowed characters: letters, digits, + - _ . and no spaces
-            obTarget.ra, obTarget.dec = self.getCoords(scienceTarget)
-            obTarget.properMotionRa, obTarget.properMotionDec = self.getPMCoords(
-                scienceTarget)
+            obTarget = OBTarget(self, scienceTarget)
 
             # Set baseline  interferometric array code (should be a keywordlist)
             acqTSF.ISS_BASELINE = [self.getBaselineCode(ob)]

{a2p2-0.7.1 → a2p2-0.7.3/a2p2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.7.1
+Version: 0.7.3
 Summary: UNKNOWN
 Home-page: http://www.jmmc.fr/a2p2
 Author: JMMC Tech Group
@@ -80,6 +80,9 @@ Each facilities get it's own code directory to manage specific GUI and specific
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------

a2p2-0.7.1/a2p2/chara/facility.py

@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-
-__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
-
-    def processOB(self, ob):
-        if not ob:
-            return
-
-        self.a2p2client.ui.addToLog(
-            "OB received for '" + self.facilityName + "' interferometer")
-        # show ob dict for debug
-        self.a2p2client.ui.addToLog(str(ob), False)
-
-        # performs operation
-        self.consumeOB(ob)
-
-        # give focus on last updated UI
-        self.a2p2client.ui.showFacilityUI(self.charaUI)
-
-    def consumeOB(self, ob):
-        # forward message if a server is present in the preferences
-        charaServer=self.a2p2client.preferences.getCharaQueueServer()
-        if charaServer :
-            try:
-                r = requests.post(charaServer, json=ob.as_dict())
-                msg = ""
-                if not self.connected2OB2:
-                    try:
-                        c=requests.get(charaServer)
-                        msg += f"Connection succeeded on OB2 server : {c.json()}\n"
-                    except:
-                        msg += f"Connection succeded on a non identified OB2 server\n"
-                msg+=f"OB sent to remote server queue : {r}"
-                self.connected2OB2 = True
-            except:
-                print(traceback.format_exc())
-                msg=f"Can't send OB to the queue server, please launch it or check your ssh port forwarding ( {charaServer} )"
-                self.connected2OB2 = False
-
-            self.a2p2client.ui.addToLog(msg)
-            self.charaUI.display(msg)
-
-        # display OB
-        self.charaUI.displayOB(ob)
-
-