a2p2 0.7.3__tar.gz → 0.7.5__tar.gz

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

@@ -1,19 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: a2p2
-Version: 0.7.3
-Summary: UNKNOWN
-Home-page: http://www.jmmc.fr/a2p2
-Author: JMMC Tech Group
-Author-email: jmmc-tech-group@jmmc.fr
+Version: 0.7.5
+Author-email: JMMC Tech Group <jmmc-tech-group@jmmc.fr>
 License: OSI Approved :: GNU General Public License v3 (GPLv3)
-Keywords: observation preparation tool optical-interferometry p2 samp
-Platform: UNKNOWN
+Project-URL: Homepage, https://www.jmmc.fr/a2p2
+Project-URL: Bug Reports, https://github.com/JMMC-OpenDev/a2p2/issues
+Project-URL: Source, https://github.com/JMMC-OpenDev/a2p2
+Keywords: observation,optical-interferometry,p2,preparation,samp,tool
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: appdirs
+Requires-Dist: astropy>=5.2.2
+Requires-Dist: pyvo>=1.6.1
+Requires-Dist: p2api
+Dynamic: license-file
+
+a2p2 |A2P2Badge|
+================
+
+**Move your Aspro2 observation details to an observatory proposal database.**
 
 Description
 -----------
@@ -113,5 +123,3 @@ Interaction diagram
 .. _a2p2:      http://www.jmmc.fr/a2p2
 .. _tutorial:  https://github.com/JMMC-OpenDev/a2p2/wiki/ASPRO2-A2P2-Tutorial
 .. _issue:     https://github.com/JMMC-OpenDev/a2p2/issues
-
-

{a2p2-0.7.3 → a2p2-0.7.5}/a2p2/jmmc/catalogs.py

@@ -4,6 +4,9 @@ __all__ = []
 
 import logging
 
+import pyvo
+import astropy.table.table
+
 from ..client import A2P2ClientPreferences
 
 from .utils import JmmcAPI
@@ -17,20 +20,36 @@ class Catalog():
         Credential can be explicitly given for method that require an authentication, else:
         - a2p2 preferences login will be used if present (see a2p2 -c)
         - or uses .netrc file
+        A where clause can be added to limit on rows of interest (adql syntax)
+        A joins list of dictionnary can be provided to combine this catalog to other ones ( format is: [{"name":"cattojoin","id":"commonkey"},...] )
     """
 
-    def __init__(self, catalogName, username=None, password=None, prod=False, apiUrl=None):
+    def __init__(self, catalogName, username=None, password=None, prod=False, apiUrl=None, tapUrl=None, where=None, joins=None):
         self.catalogName = catalogName
+        self.where = where
+        self.joins = joins
         self.prod = prod
+        self.colDelimiterName = "coldelimiter___"
 
         # Manage prod & preprod or user provided access points
         if apiUrl:
             self.apiUrl = apiUrl  # trust given url as catalogAPI if value is provided
-        elif self.prod:
-            self.apiUrl = "https://oidb.jmmc.fr/restxq/catalogs"
-        else:
-            self.apiUrl = "https://oidb-beta.jmmc.fr/restxq/catalogs"
-
+        if tapUrl:
+            self.tapUrl = tapUrl  # trust given url as TAP server if value is provided
+
+        if not(apiUrl):
+            if self.prod:
+                self.apiUrl = "https://oidb.jmmc.fr/restxq/catalogs"
+            else:
+                self.apiUrl = "https://oidb-beta.jmmc.fr/restxq/catalogs"
+
+        if not(tapUrl):
+            if self.prod:
+                self.tapUrl = "https://tap.jmmc.fr/vollt/tap"
+            else:
+                self.tapUrl = "https://tap-preprod.jmmc.fr/vollt/tap"
+
+        self.tap = pyvo.dal.TAPService(self.tapUrl)
         self.api = JmmcAPI(self.apiUrl, username, password)
 
         logger.info(f"Create catalog wrapper to access '{catalogName}' ({PRODLABEL[self.prod]} API at {self.api.rootURL})")
@@ -40,7 +59,7 @@ class Catalog():
         return self.api._get("")
 
     def metadata(self):
-        """ Get catalog metadata """
+        """ Get catalog metadata"""
         return self.api._get(f"/meta/{self.catalogName}")
 
     def pis(self):
@@ -66,12 +85,75 @@ class Catalog():
                 return pi["name"]
 
     def getRow(self, id):
-        """ Get a single catalog record for the given id.
+        """ Get a single catalog record for the given id on the main catalog.
 
             usage: cat.getRow(42)
         """
         return self.api._get(f"/{self.catalogName}/{id}")
 
+    def getTable(self, maxrec=10000):
+        """ Get an astropy table from the main catalog joined the other if provided in constructor.
+
+            usage: cat.getRows()
+        """
+        # using SELECT TOP N below to workarround astroquery.utils.tap BUG
+
+        clauses = []
+        if self.joins :
+            joinedCatalogNames = []
+            for join in self.joins:
+                joinedCatalogNames.append(join["name"] + ".*")
+
+            # colDelimiterName is added so we can keep the mainCatalog colnames for later updates (using rowsToDict)
+            clauses.append(f"SELECT TOP {maxrec} {self.catalogName}.*, '' as {self.colDelimiterName}, {', '.join(joinedCatalogNames)} FROM {self.catalogName}" )
+
+            for join in self.joins:
+                if "catalogKey" in join.keys():
+                    catalogKey=join["catalogKey"]
+                else:
+                    # we could use the (cached) metadata key, but this would add a additional remote call.A2P2ClientPreferences
+                    # let's try with this convention using the same key name
+                    catalogKey=join["id"]
+                name=join["name"]
+                id=join["id"]
+                # LEFT JOIN may be an option provided by join key ?
+                clauses.append (f" LEFT JOIN {name} ON {self.catalogName}.{catalogKey} = {name}.{id}")
+
+            if self.where:
+                clauses.append(f" WHERE {self.catalogName}.{self.where}")
+        else:
+            clauses.append(f"SELECT TOP {maxrec} * FROM {self.catalogName}")
+            if self.where:
+                clauses.append(f" WHERE {self.where}")
+
+        query = "  ".join(clauses)
+        logger.info(f"Queriing TAP : {query}")
+        return self.tap.search(query,maxrec=maxrec).to_table()
+
+
+    def tableToDict(self, table):
+        """ Convert table (astropy.table or row) to a list of dict so we can modify content and update remote catalog using updateRows().
+
+            usage: cat.tableToDict(table)
+        """
+        colnames = table.colnames
+        if "coldelimiter___" in colnames:
+            colnames = colnames[0:colnames.index("coldelimiter___")]
+        dicts=[]
+        # handle single row case
+        table = table if isinstance(table, astropy.table.table.Table ) else [table]
+        for row in table:
+            dict = {}
+            for colname in colnames:
+                v=row[colname]
+                if isinstance(v,str):
+                    dict[colname] = v
+                else:
+                    # avoid np.numeric type to make it json serializable
+                    dict[colname] = v.item()
+            dicts.append(dict)
+        return dicts
+
     def updateRow(self, id, values):
         """ Update record identified by given id and associated values.
 
@@ -87,6 +169,7 @@ class Catalog():
         """
 
         # We may check befere sending payload that we always provide an id for every record
+        # What is the behaviour if we provide various data assosiated to the same id ?
         return self.api._put(f"/{self.catalogName}", values)
 
     def addRows(self, values):
@@ -97,6 +180,7 @@ class Catalog():
         """
         return self.api._post(f"/{self.catalogName}", json=values)
 
+
     def getDelegations(self, pi=None):
         """ Get -all- delegations.
             A specific pi parameter may be given but requires admin priviledges. Else use current piname will be used by remote service.

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

@@ -1,45 +1,43 @@
-__version__ = "0.7.3"
+__version__ = "0.7.5"
 
 __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.7.3": {
+#
+#       "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.5": {
+       "A2P2": [
+           "Add support for join and filter in a2p2.jmmc.Catalog wrapper",
+        ],
+    },"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"
        ],
-       "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.2": {
-       "STATUS": [
-       ],
        "A2P2": [
            "Auto update chara queueserver preference",
            "a2p2 -r generates release-notes.md (rendered on a2p2 repository)"
@@ -51,8 +49,6 @@ __release_notes__ = {
             "Support and try every queueserver's Urls comma separated from the queuserver user preference"
        ],
     },"0.7.1": {
-       "STATUS": [
-       ],
        "A2P2": [
            "Fix ttk import on MacOS",
        ],
@@ -65,8 +61,6 @@ __release_notes__ = {
             "Display log of received OB also for calibrators"
        ]
     },"0.6.9": {
-       "STATUS": [
-       ],
        "A2P2": [
             "ctrl-c support improved to qui a2p2 from terminal",
        ],
@@ -94,8 +88,6 @@ __release_notes__ = {
             "Experimental: forward OBs through json payload to the location defined in preference",
         ],
     },"0.6.4": {
-        "STATUS": [
-        ],
         "A2P2": [
             "Fix import that may break run on windows..."
         ],
@@ -238,7 +230,7 @@ __release_notes__ = {
         ],
     },
     "0.2.14": {
-        "STATUS": [
+        "A2P2": [
             "BugFix: ask for container Name only if one is selected"
         ],
     },

{a2p2-0.7.3 → a2p2-0.7.5}/a2p2/vlti/facility.py

@@ -191,10 +191,17 @@ class VltiFacility(Facility):
             instrument = self.getInstrument(o.instrumentConfiguration.name)
             instrument.checkOB(o)
             # check for warnings and abort if requested by user
+            # this implementation should be more detailled so we can have various VERSION associated to various warning
             if len(instrument.warnings)>0:
                 linesep="\n  -  "
-                version=instrument.getDitTable()["VERSION"]
-                answer = self.ui.AskYesNoMessage(f"According to the template manual {version} :\n \n  -  {linesep.join(instrument.warnings)}\n\nClick \"Yes\" to proceed \"No\" to abort the submission")
+                header=""
+                try:
+                    # some ditTable may have a VERSION entry some not...
+                    version=instrument.getDitTable()["VERSION"]
+                    header= f"According to the template manual {version} :\n \n  - \n"
+                except:
+                    pass
+                answer = self.ui.AskYesNoMessage(f"{header} {linesep.join(instrument.warnings)}\n\nClick \"Yes\" to proceed \"No\" to abort the submission")
                 instrument.warnings.clear()
                 if answer == False:
                     self.ui.addToLog("Submission has been marked to be aborted - do not proceed")

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

@@ -124,9 +124,6 @@ class Pionier(VltiInstrument):
             else:
                 obConstraints.skyTransparency = 'Clear'
 
-            if acqTSF.ISS_IAS_HMAG > 7.5:
-                acqTSF.INS_DISP_NAME = "FREE"
-
             # FIXME: error (OB): "Phase 2 constraints must closely follow what was requested in the Phase 1 proposal.
             # The seeing value allowed for this OB is >= java0x0 arcsec."
             # FIXME REPLACE SEEING THAT IS NO MORE SUPPORTED

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

@@ -1,19 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: a2p2
-Version: 0.7.3
-Summary: UNKNOWN
-Home-page: http://www.jmmc.fr/a2p2
-Author: JMMC Tech Group
-Author-email: jmmc-tech-group@jmmc.fr
+Version: 0.7.5
+Author-email: JMMC Tech Group <jmmc-tech-group@jmmc.fr>
 License: OSI Approved :: GNU General Public License v3 (GPLv3)
-Keywords: observation preparation tool optical-interferometry p2 samp
-Platform: UNKNOWN
+Project-URL: Homepage, https://www.jmmc.fr/a2p2
+Project-URL: Bug Reports, https://github.com/JMMC-OpenDev/a2p2/issues
+Project-URL: Source, https://github.com/JMMC-OpenDev/a2p2
+Keywords: observation,optical-interferometry,p2,preparation,samp,tool
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: appdirs
+Requires-Dist: astropy>=5.2.2
+Requires-Dist: pyvo>=1.6.1
+Requires-Dist: p2api
+Dynamic: license-file
+
+a2p2 |A2P2Badge|
+================
+
+**Move your Aspro2 observation details to an observatory proposal database.**
 
 Description
 -----------
@@ -113,5 +123,3 @@ Interaction diagram
 .. _a2p2:      http://www.jmmc.fr/a2p2
 .. _tutorial:  https://github.com/JMMC-OpenDev/a2p2/wiki/ASPRO2-A2P2-Tutorial
 .. _issue:     https://github.com/JMMC-OpenDev/a2p2/issues
-
-

{a2p2-0.7.3 → a2p2-0.7.5}/a2p2.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 MANIFEST.in
 README.rst
+pyproject.toml
 setup.cfg
 setup.py
 a2p2/__init__.py

{a2p2-0.7.3 → a2p2-0.7.5}/a2p2.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 a2p2 = a2p2.__main__:main
-

{a2p2-0.7.3 → a2p2-0.7.5}/a2p2.egg-info/requires.txt

@@ -1,3 +1,4 @@
+appdirs
 astropy>=5.2.2
+pyvo>=1.6.1
 p2api
-appdirs

a2p2-0.7.5/pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "a2p2"
+dynamic = ["version", "description"]
+#version = "1.2.3"
+#description = ["description"]
+readme = "README.rst"
+license = { "text" = "OSI Approved :: GNU General Public License v3 (GPLv3)" }
+requires-python = ">=3"
+authors = [
+    { name = "JMMC Tech Group", email = "jmmc-tech-group@jmmc.fr" },
+]
+keywords = [
+    "observation",
+    "optical-interferometry",
+    "p2",
+    "preparation",
+    "samp",
+    "tool",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.6",
+]
+dependencies = [
+    "appdirs",
+    "astropy>=5.2.2",
+    "pyvo>=1.6.1",
+    "p2api",
+]
+
+[project.scripts]
+a2p2 = "a2p2.__main__:main"
+
+[project.urls]
+Homepage = "https://www.jmmc.fr/a2p2"
+"Bug Reports" = "https://github.com/JMMC-OpenDev/a2p2/issues"
+Source = "https://github.com/JMMC-OpenDev/a2p2"
+

a2p2-0.7.5/setup.py

@@ -0,0 +1,19 @@
+from setuptools import setup, find_packages
+
+with open('README.rst') as README:
+    long_description = README.read()
+    description = long_description[
+        :long_description.index('Description')].split("*")[1].strip()
+
+versions = {}
+with open("a2p2/version.py") as fp:
+    exec(fp.read(), versions)
+
+setup(
+    version=versions['__version__'],
+    description=description
+# not yet moved to pyproject.toml
+#    packages=find_packages(),
+#    include_package_data=True,
+#    keywords='observation preparation tool optical-interferometry p2 samp'
+)

a2p2-0.7.3/setup.py

@@ -1,44 +0,0 @@
-from setuptools import setup, find_packages
-
-with open('README.rst') as README:
-    long_description = README.read()
-    description = long_description[
-        :long_description.index('Description')].split("*")[1].strip()
-    long_description = long_description[long_description.index('Description'):]
-
-version = {}
-with open("a2p2/version.py") as fp:
-    exec(fp.read(), version)
-
-setup(
-    name='a2p2',
-    version=version['__version__'],
-    python_requires='>=3',
-    description=description,
-    long_description=long_description,
-    #      install_requires=['astropy', 'p2api','pygtk'],
-    # PyGtk is not working on some linux
-    # anaconda also fails
-    # prefere the use of your default python packages on your linux
-    # what is the solution for mac ?
-    # we continue moving tk as first gui backend
-    # install_requires=['astropy', 'p2api', 'python-tk'] + (['pygtk'] if
-    # platform.startswith("win") else []),
-    install_requires=['astropy>=5.2.2', 'p2api', 'appdirs'],
-    url='http://www.jmmc.fr/a2p2',
-    author='JMMC Tech Group',
-    author_email='jmmc-tech-group@jmmc.fr',
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-#        'Programming Language :: Python :: 2',
-#        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-    ],
-    license='OSI Approved :: GNU General Public License v3 (GPLv3)',
-    packages=find_packages(),
-    include_package_data=True,
-    entry_points={'console_scripts': ['a2p2=a2p2.__main__:main']},
-    keywords='observation preparation tool optical-interferometry p2 samp'
-)