a2p2 0.7.2__tar.gz → 0.7.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.7.2
+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.2 → 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.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.2 → a2p2-0.7.3}/a2p2/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 
 __release_notes__ = {
     # "0.1.6": {
@@ -21,18 +21,9 @@ __release_notes__ = {
     #
     #        ],
     #    },
-    "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"
-       ],
+    "0.7.3": {
        "CHARA": [
-            "Support and try every queueserver's Urls comma separated from the queuserver user preference"
+            "Better reuse of last working queueserver"
        ],
        "TODO-SCIENCE": [
            "Merge AO or GS in a same code section for every instruments",
@@ -46,6 +37,19 @@ __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-0.7.2 → a2p2-0.7.3/a2p2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.7.2
+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.2/a2p2/chara/facility.py

@@ -1,68 +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
-        queueServers=self.a2p2client.preferences.getCharaQueueServer()
-        if queueServers :
-            for queueServer in queueServers:
-                logger.debug(f'Trying to send OB on queuserver : {queueServer}')
-                try:
-                    if not self.connected2OB2:
-                        try:
-                            c=requests.get(queueServer, timeout=5)
-                            msg += f"Connection succeeded on OB2 server : {c.json()}\n"
-                        except:
-                            msg += f"Connection succeded on a non identified OB2 server\n"
-                    r = requests.post(queueServer, json=ob.as_dict(), timeout=5)
-                    msg = ""
-                    msg+=f"OB sent to remote server queue : {r}"
-                    self.connected2OB2 = True
-                    self.a2p2client.ui.addToLog(msg)
-                    self.charaUI.display(msg)
-                    break # do only send to the first server
-                except:
-                    print(traceback.format_exc())
-                    msg=f"Can't send OB to the '{queueServer}' queue server, please launch it, edit your preferences or check your ssh port forwarding "
-                    self.connected2OB2 = False
-                    self.a2p2client.ui.addToLog(msg)
-                    self.charaUI.display(msg)
-
-
-        # display OB
-        self.charaUI.displayOB(ob)
-
-