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

a2p2/ob.py

@@ -6,6 +6,10 @@ import logging
 import json
 import xml.etree.ElementTree as ET
 from collections import defaultdict, namedtuple, OrderedDict
+import re
+
+import copy
+
 
 logger = logging.getLogger(__name__)
 
@@ -22,8 +26,11 @@ def etree_to_dict(t):
         d = {t.tag: {k: v[0] if len(v) == 1 else v for k, v in dd.items()}}
         # print("add d=%s"%str(d))
     if t.attrib:
-        d[t.tag].update(('' + k, v)
-                        for k, v in t.attrib.items())  # was '@' but can't be serialized by namedtuple
+        attrs = {}
+        for k, v in t.attrib.items():
+            if not "{" in k[0]: # ignore elementName with prefix
+                attrs[k]=v
+        d[t.tag].update(attrs)
     if t.text:
         text = t.text.strip()
         if children or t.attrib:
@@ -33,6 +40,66 @@ def etree_to_dict(t):
             d[t.tag] = text
     return d
 
+def normalizeObj(obj):
+    """
+    Modify in place the structure if required.
+    Note:
+        dict key must be valid identifier (only tested for EXTRA_INFORMATIONS created fields)
+    """
+    otype=type(obj)
+    if otype is dict:
+        for k,v in obj.items():
+
+            if k in ['observationConfiguration', 'HAinterval', 'LSTinterval'] and not isinstance(v, list):
+                # always defines observationConfiguration as a list
+                normalizeObj(v)
+                obj[k]=[v]
+            elif k=='EXTRA_INFORMATIONS':
+                #print(f"Updating dict {k} was : {obj[k]}")
+                # normalize input that may have various form on list of dict
+                try:
+                    fields=[]
+                    funits={}
+                    for fk in ["parameter","field"]:
+                        if fk in obj[k]:
+                            l=obj[k][fk].copy()
+                            #print(f"'{fk}' => {l}\n({type(l)})\n")
+                            if type(l) is dict:
+                                fields.append(l)
+                            else:
+                                fields+=l
+
+                    #print(f"Fields to update: {fields}")
+                    #store new fields
+                    for vn in fields:
+                        fname=vn["name"]
+                        # test if we have to normalize field name that will become a python field
+                        if not fname.isidentifier():
+                            # replace unvalid chars by _ and append F to avoid starting by _
+                            fname=re.sub('^_','F_', re.sub('\W|^(?=\d)','_', fname))
+                        obj[k][fname]=vn["value"]
+                        if "unit" in vn:
+                            funits[fname]=vn["unit"]
+                    #store units
+                    obj[k]["field_units"]=funits
+                    # remove old arrays or dicts
+                    for fk in ["parameter","field"]:
+                        if fk in obj[k]:
+                            del obj[k][fk]
+                            pass
+                except:
+                    import traceback
+                    print (traceback.format_exc())
+                    print(f"\nCan't read {v}")
+                    pass
+            else:
+                normalizeObj(v)
+        return obj
+    elif otype is list:
+        for e in obj:
+            normalizeObj(e)
+    else:
+        pass
 
 class OB():
     """
@@ -45,29 +112,40 @@ class OB():
 
     every values are string (must be converted for numeric values).
 
+    Following fields are converted to list even if the list get a single element. The OB code can then handle such multiples values.
+    ['observationConfiguration', 'HAinterval', 'LSTinterval']
+
     """
 
     def __init__(self, url):
         # extract XML in elementTree
-
         e = ET.parse(url)
+        # convert data to dict structure
         d = etree_to_dict(e.getroot())
         # keep only content of subelement to avoid schema version change
         # '{http://www.jmmc.fr/aspro-ob/0.1}observingBlockDefinition'
         ds = d[list(d)[0]]  # -> version and name are lost
-        # store attributes
+
+        #self.srcDict  = copy.deepcopy(ds)
+        normalizeObj(ds)
+        #self.normDict = ds
+        #self.srcObj  = toObject(self.srcDict,inputName="OB")
+        #self.normObj  = toObject(self.normDict,inputName="OB")
+
+        # store subelements as attributes
         for e in ds.keys():
             # parse JSON into an object with attributes corresponding to dict keys.
             # We should probably avoid json use...
             o = json.loads(
                 json.dumps(ds[e]), object_hook=lambda d: namedtuple(e, d.keys())(*d.values()))
-            # observationConfiguration may be uniq but force it to be a list
-            if "observationConfiguration" in e and not isinstance(o, list):
-                setattr(self, e, [o])
-            else:
-                setattr(self, e, o)
+            setattr(self, e, o)
+
+        # store normalized source for str repr
         self.ds = ds
 
+    def as_dict(self):
+        return self.ds
+
     def getFluxes(self, target):
         """
         Return a flux mesurements as dict (ordered dict by BVRIJHK ).
@@ -81,6 +159,14 @@ class OB():
 
         return OrderedDict(sorted(fluxes.items(), key=lambda t: order.find(t[0])))
 
+    def getPeriod(self):
+        """
+        Return period given by Aspro2 as integer.
+        """
+        # use re to remove alpha characters from "Period 109" and make.
+        return int(re.sub(r"\D", "", self.interferometerConfiguration.version))
+
+
     def get(self, obj, fieldname, defaultvalue=None):
         if fieldname in obj._fields:
             return getattr(obj, fieldname)

a2p2/samp.py

@@ -15,12 +15,14 @@ class Receiver(object):
         self.received = False
 
     def receive_call(self, private_key, sender_id, msg_id, mtype, params, extra):
+        self.mtype=mtype
         self.params = params
         self.received = True
         self.client.reply(
             msg_id, {"samp.status": "samp.ok", "samp.result": {}})
 
     def receive_notification(self, private_key, sender_id, mtype, params, extra):
+        self.mtype=mtype
         self.params = params
         self.received = True
 
@@ -47,6 +49,7 @@ class A2p2SampClient():
         # an error is thrown here if no hub is present
 
         # TODO get samp client name and display it in the UI
+        # TODO !! declare mtypes as enum
 
         # Instantiate the receiver
         self.r = Receiver(self.sampClient)
@@ -54,6 +57,10 @@ class A2p2SampClient():
         self.sampClient.bind_receive_call("ob.load.data", self.r.receive_call)
         self.sampClient.bind_receive_notification(
             "ob.load.data", self.r.receive_notification)
+        # Listen for Model related instructions
+        self.sampClient.bind_receive_call("fr.jmmc.litpro.start.setting",self.r.receive_call)
+        self.sampClient.bind_receive_notification(
+            "fr.jmmc.litpro.start.setting",self.r.receive_notification)
 
     def disconnect(self):
         self.sampClient.disconnect()
@@ -82,6 +89,9 @@ class A2p2SampClient():
     def clear_message(self):
         return self.r.clear()
 
+    def has_ob_message(self):
+        return "ob.load.data" in self.r.mtype
+
     def get_ob_url(self):
         url = self.r.params['url']
         if url.startswith("file:///"):
@@ -92,3 +102,10 @@ class A2p2SampClient():
         elif url.startswith("file:/"):  # work arround bugged file urls on *nix
             return url[5:]
         return url
+
+    def has_model_message(self):
+        return "fr.jmmc.litpro.start.setting" in self.r.mtype
+
+    def get_model(self):
+        return self.r.params['model']
+

a2p2/version.py

@@ -1,132 +1,268 @@
-__version__ = "0.2.15"
+__version__ = "0.7.4"
 
 __release_notes__ = {
     # "0.1.6": {
-    #    "STATUS":[
-    #             "This version get lot of changes and may contain bugs or missing features, please provide any feedback to improve and prepare a better future release !"
-    #         ],
     #    "A2P2": [
-    #
     #        ],
     #    "VLTI": [
-    #
     #        ],
     #    "CHARA": [
-    #
-    #        ],
-    #    "TODO-SCIENCE": [
-    #
-    #        ],
-    #    "TODO-DEV": [
-    #
     #        ],
     #    },
-    "0.2.15": {
-        "STATUS": [
-            "add a wrapper on p2 to make run's tree faster (~2.5x)",
+#
+#       "TODO-SCIENCE": [
+#           "Merge AO or GS in a same code section for every instruments",
+#          "Check DIT table from the last template user manuals (especially MATISSE) and remove PIONIER's one",
+#           "flag ~important~ keywords which MUST be set in a2p2 code and not leaved to there default values?",
+#       ],
+#       "TODO-DEV": [
+#           "Support multiple period version (two major at least)",
+#           "Support numlist keyword : eg. SEQ.HWPOFF (done in conf but must be range check compatible)",
+#          "Unify ob name creation in vlti instrument createOB()",
+#          "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.4": {
+       "A2P2": [
+           "Use pyproject.toml for python installation",
+        ],"VLTI": [
+            "Do not switch PIONIER mode to FREE when the magnitude of the IAS star is too high : an error may be provided by p2"
+        ],
+    },"0.7.3": {
+       "CHARA": [
+            "Better reuse of last working queueserver"
+       ],
+    },"0.7.2": {
+       "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": {
+       "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": {
+       "A2P2": [
+            "ctrl-c support improved to qui a2p2 from terminal",
+       ],
+       "VLTI": [
+            "OB's tree list selection mode limited to a single selection",
+            "OB are stacked if Aspro2 send an OB without proper tree selection. stacked OB can be submitted after proper container selection or cancelled",
+            "Provide checkboxes of types of interferometric observations to complete full OB"
+       ],
+       "CHARA": [
+       ],
+    },"0.6.8": {
+       "A2P2": [
+           "increase astropy version to avoid a dependency issue with numy"
+       ],
+    },"0.6.7": {
+       "CHARA": [
+           "Enhance information  while using OB2 server prototype",
+       ]
+     }, "0.6.6": {
+       "CHARA": [
+           "Fix formating of OB supporting array of observability time intervals",
+       ],
+    },"0.6.5": {
+        "CHARA": [
+            "Experimental: forward OBs through json payload to the location defined in preference",
         ],
+    },"0.6.4": {
         "A2P2": [
+            "Fix import that may break run on windows..."
         ],
+    },"0.6.3": {
         "VLTI": [
+            "Always use GRAVITY acqTSF.SEQ_INS_SOBJ_HMAG after P110",
         ],
-        "CHARA": [
+    },"0.6.2": {
+        "VLTI": [
+            "Fix GRAVITY gen acq tsf",
         ],
-        "TODO-SCIENCE": [
-            "Check DIT table from last template user manuals",
-            "Use a calibrator template for MATISSE (instead of default hyb_obs)",
-            "flag ~important~ keywords which MUST be set in a2p2 code and not leaved to there default values"
+    },"0.6.1": {
+        "VLTI": [
+            "Updated configuration for ESO P111",
+        ]
+    },"0.6.0": {
+        "A2P2": [
+            "Read Extra_informations from last Aspro2 OBXML"
         ],
-        "TODO-DEV": [
-            "Support multiple period version (two major at least)",
-            "Add warning if Aspro2's IP versions differs from the selected container" ,
-            "Support numlist keyword : eg. SEQ.HWPOFF",
-            "Optimize VLTI run chooser : DEMO tests suffer from a long run filtering",
-            "Unify ob name creation in vlti instrument createOB()",
-            "Complete test suite with real p2 submission"
+    },"0.5.3": {
+        "VLTI": [
+            "Update DIT tables to last instrument template (version is stored in the table config to report warning)",
+            "Do not stop OB creation if K mag is out of range during DIT calculation but show a warning and ask to proceed or abort",
+        ]
+    },"0.4.6": {
+        "A2P2": [
+            "Huge speedup of ESO P2 runs treeview",
+            "Explicit SAMP unregister reduce risk of SAMP ghosts",
         ],
-    },
-    "0.2.14": {
-        "STATUS": [
-            "BugFix: ask for container Name only if one is selected"
+        "VLTI": [
+            "Check consistency between Aspro2 inteferometer period and RUN's IP version",
+            "Handle use SEQ.INS.SOBJ.HMAG after P110 instead of SEQ.FI.HMAG",
         ],
+    },"0.4.5": {
         "A2P2": [
+            "clarify some text in the default generated preference file",
         ],
         "VLTI": [
+            "Change log message : Run filled -> OB transmitted",
+            "Missing flux error message enhanced : show associated target name",
+            "Handle ALPHA DELTA coordinates of associated guide star",
+            "MATISSE: handle Aspro2's frindge tracker mode : None or GRA4MAT",
+            "MATISSE: define DPR.CATG  (always was CALIB)",
+            "MATISSE: use V band for COU.GS.MAG or try G one on ATs.",
+            "GRAVITY: include dual keywords in gravity_rangeTable",
+        ],
+    },"0.4.4": {
+        "A2P2": [
+            "add Catalog.piname() to get a pi name for a given jmmc account looking at a given catalog (jmmc.login preference is used without parameter)",
+            "Add new preference to put jmmc account credentials",
         ],
-        "CHARA": [
+    },"0.4.3": {
+        "A2P2": [
+            "Enhance a2p2.jmmc.models._model so it automagically computes component names >{(())>",
         ],
-    },
-    "0.2.13": {
-        "STATUS": [
+    },"0.4.2": {
+        "A2P2": [
+            "Add option to select public CatalogAPI server",
         ],
+    },"0.4.1": {
         "A2P2": [
-            "A2P2 is no longer python2 compatible. Hope it will be ok for everybody ? Send an issue else ;)",
-            "Fix generated release note order according to semver values",
-            "Dry tests done looping on a few OBXML files"
-            "Added -c option to a2p2 so we generated a config file ( helps to automatically fill P2 login info & autologin : )"
+            "Add version alpha of a2p2.fr.webservices.Calliper client",
+        ],
+    }, "0.4.0": {
+        "A2P2": [
+            "First basic support of SAMP messages from Aspro for models",
+            "Support model compositions in models module",
         ],
+    }, "0.3.10": {
+
+        "A2P2": [
+            "Fix bug that occurs when user has no preference file",
+            "Add new serialisation of a2p2.jmmc.Models"
+        ],
+    }, "0.3.9": {
         "VLTI": [
-            "Conf updated with IPs 106.25",
-            "BugFix: OB no more sent to P2 if OB's instrument is not the same than p2 selected container"
+            "Bugfix for single CAL SCI",
         ],
-        "CHARA": [
+    }, "0.3.8": {
+        "VLTI": [
+            "Enhance CAL SCI sequence : [CAL1] SCI [CAL2 [SCI CAL3 [...] ] ] ",
+            "Fix COU_AG_PMA and COU_AG_PMD for MATISSE acq template",
+            "Do not throw a dialog for every submitted OBs",
+            "Enhance some messages",
+            # "BugFix to create a folder on non tutorial accounts"
+        ],
+
+    }, "0.3.7": {
+        "VLTI": [
+            "Revert SEQ.RELOFF.X/Y = 0.0 (same as default) for GRAVITY dual_obs_exp template"
+        ],
+    }, "0.3.6": {
+        "VLTI": [
+            "Disable SEQ.RELOFF.X for GRAVITY dual to make OB compliant"
+        ],
+    }, "0.3.5": {
+        "VLTI": [
+            "Accept to add calibrator inside a Concatenation container",
+            "Use p2.iss.vltitype preference keys to set supported value of instrument's acquisition templates. ( run 'a2p2 -c' )"
         ],
     },
-    "0.2.12": {
-        "STATUS": [
+    "0.3.4": {
+        "VLTI": [
+            "Sync templates with P109",
+            "Create OB in selected folder: do not create anymore a folder but create a concatenation for SM if a Run's root is selected."
         ],
+    },
+    "0.3.3": {
         "A2P2": [
-            "Fix import in main console script"
+            "Add basic support of Aspro2's model for SAMP interoperability",
         ],
         "VLTI": [
+            "Fix missing import for p2api module"
         ],
-        "CHARA": [
+    },
+    "0.3.2": {
+        "A2P2": [
+            "Improve setup.py that now requires python 3+ and a fresh version of astropy",
+        ],
+        "VLTI": [
+            #            "revert back to p2 requests use which now reuses connections",
         ],
     },
-    "0.2.11": {
-        "STATUS": [
+    "0.3.1": {
+        "A2P2": [
+            "Bug fix for authenticated Catalog access",
         ],
+    },
+    "0.3.0": {
         "A2P2": [
-            "enhance setup.py so it install Windows special-cases .exe files"
+            "Give a try to embedd some code to interact with JMMC services",
         ],
         "VLTI": [
+            #            "revert back to p2 requests use which now reuses connections",
         ],
-        "CHARA": [
+    },
+    "0.2.15": {
+        "VLTI": [
+            #            "add a wrapper on p2 to make run's tree faster (~2.5x)",
         ],
     },
-    "0.2.10": {
-        "STATUS": [
+    "0.2.14": {
+        "A2P2": [
+            "BugFix: ask for container Name only if one is selected"
         ],
+    },
+    "0.2.13": {
         "A2P2": [
-            "Patch bad SAMP url handling on Windows"
+            "A2P2 is no longer python2 compatible. Hope it will be ok for everybody ? Send an issue else ;)",
+            "Fix generated release note order according to semver values",
+            "Dry tests done looping on a few OBXML files"
+            "Added -c option to a2p2 so we generated a config file ( helps to automatically fill P2 login info & autologin : )"
         ],
         "VLTI": [
+            "Conf updated with IPs 106.25",
+            "BugFix: OB no more sent to P2 if OB's instrument is not the same than p2 selected container"
         ],
-        "CHARA": [
+    },
+    "0.2.12": {
+        "A2P2": [
+            "Fix import in main console script"
         ],
     },
-    "0.2.9": {
-        "STATUS": [
+    "0.2.11": {
+        "A2P2": [
+            "enhance setup.py so it install Windows special-cases .exe files"
         ],
+    },
+    "0.2.10": {
         "A2P2": [
-
+            "Patch bad SAMP url handling on Windows"
         ],
+    },
+    "0.2.9": {
         "VLTI": [
             "Fix bug that prevent to create any folder or concatenation at RUNS's root"
         ],
-        "CHARA": [
-
-        ],
-        "TODO-SCIENCE": [
-
-        ],
-        "TODO-DEV": [
-
-        ],
     },
     "0.2.8": {
-        "STATUS": [
-        ],
         "A2P2": [
             "Fix release notes order in the GUI",
             "Handle special jmmc account, kindly set by ESO colleagues to perfom future tests as closed as possible to the real UX"
@@ -137,10 +273,6 @@ __release_notes__ = {
         ],
         "CHARA": [
         ],
-        "TODO-SCIENCE": [
-        ],
-        "TODO-DEV": [
-        ]
     }, "0.2.7": {
         "STATUS": [
             "This version get lot of changes and may contain bugs or missing features, please provide any feedback to improve and prepare a better future release !"
@@ -158,96 +290,41 @@ __release_notes__ = {
             "Support Concatenations (also shown in the tree panel)",
             "Show type in the container chooser instead of containerID"
         ],
-        "CHARA": [
-        ],
-        "TODO-SCIENCE": [
-            "Complete/fix GRAVITY DIT table with P105 changes that will come in the next template user manual",
-            "Use a calibrator template for MATISSE (instead of default hyb_obs)",
-            "flag ~important~ keyword that MUST be set in a2p2 code to avoid default"
-        ],
-        "TODO-DEV": [
-            "Support numlist keyword : eg. SEQ.HWPOFF",
-            "Optimize VLTI run chooser : DEMO tests suffer from a long run filtering",
-            "Do not set default values in a2p2 if not set",
-            "unify ob name creation in vlti instrument createOB()"
-        ]
     }, "0.2.6": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "Support baseline back again (single one at present)"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.2.5": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "Add missing template name in log",
             "Fix error removing baseline after constraint changes on P2 side. Next a2p2 version should add them back in acq templates"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.2.4": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "Fix bug / wrong keys"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.2.3": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "Hide password in login frame"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.2.2": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "ignore default time constraints computed by Aspro"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.2.1": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "fix support for a list of multiples time constraints"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.2.0": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "bug fix"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.1.6": {
         "A2P2": [
@@ -257,20 +334,11 @@ __release_notes__ = {
             "general config updates",
             "add PIONIER"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.1.5": {
-        "A2P2": [
-
-        ],
         "VLTI": [
             "bugfix for dualfield cases"
         ],
-        "CHARA": [
-
-        ]
     },
     "0.1.4": {
         "A2P2": [