p2api 1.1.6__tar.gz → 1.1.9__tar.gz

{p2api-1.1.6 → p2api-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p2api
-Version: 1.1.6
+Version: 1.1.9
 Summary: Binding for the ESO phase 2 programmatic API
 Project-URL: Homepage, https://www.eso.org/copdemo/apidoc/index.html
 Author-email: Thomas Bierwirth <thomas.bierwirth@eso.org>, John Pritchard <john.pritchard@eso.org>

p2api-1.1.9/p2api/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.1.9"

{p2api-1.1.6 → p2api-1.1.9}/p2api/p2api.py

@@ -1742,7 +1742,7 @@ class ApiConnection(object):
         files=None
         _calibs=[]
         if len(calibrations) > 0 :
-            _calibs=calibrations.split(',')
+            _calibs=[int(x) for x in calibrations.split(',')]
         data={
             "phone": phone,
             "notify": notify.split(','),

{p2api-1.1.6 → p2api-1.1.9}/p2api/utils/rrm_trigger.py

@@ -37,6 +37,7 @@ class get_options:
     group.add_argument("--account_id", dest="account_id", help="account_id [required]", type=int, default=None)
     group.add_argument("--RA", dest="RA", help="RA hh:mm:ss.sss [required]", default=None)
     group.add_argument("--DEC", dest="DEC", help="DEC (+/-)dd:mm:ss.sss [required]", default=None)
+    group.add_argument("-u", "--user", dest="user", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
 
     group = parser.add_argument_group("Alternative input OB(s)")
     #group.add_argument("--instrument", dest="instrument", help="instrument", default=None)
@@ -63,7 +64,6 @@ class get_options:
 
     group = parser.add_argument_group("p2 server selection, options and password management")
     group.add_argument("--env", dest="env", help="Use the %s environment [optional], default = production" %("|".join(p2api.API_URL.keys())), default='production')
-    group.add_argument("-u", "--user", dest="user", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
     group.add_argument("-S", "--PWstore", dest="pwstore", help="Store the password in the keyring, default=False", action="store_true", default=False)
     group.add_argument("-R", "--PWreenter", dest="pwreenter", help="Reenter the password, thus overriding any PW in the keyring, default=False", action="store_true", default=False)
     group.add_argument("-Z", "--PWremove", dest="pwremove", help="Remove any password from the keyring, default=False", action="store_true", default=False)
@@ -100,7 +100,15 @@ class get_options:
             and
             options.old_fmt_email_file
         )
-        ) :
+        and not (
+            options.pwstore
+            or
+            options.pw.pwreenter
+            or
+            options.pw.remove
+        )
+        or not options.user
+    ) :
         parser.print_help()
         sys.exit(2)
 
@@ -332,7 +340,7 @@ def main():
         checked_runs=(options.runId or '').split(',')
         if options.runId is None :
             checked_runs="runs scheduled in P{cep}".format(cep=cep)
-        for run in runs :
+        for run in (runs or []) :
             if (
                 ( options.runId is None and run['scheduledPeriod'] == cep )
                 or

{p2api-1.1.6 → p2api-1.1.9}/p2api/utils/rrm_trigger_add_fc.py

@@ -38,6 +38,7 @@ class get_options:
     group.add_argument("--account_id", dest="account_id", help="account_id [required]", type=int, default=None)
     group.add_argument("--RA", dest="RA", help="RA hhmmss.sss [required]", default=None)
     group.add_argument("--DEC", dest="DEC", help="DEC (+/-)ddmmss.sss [required]", default=None)
+    group.add_argument("-u", "--user", dest="user", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
 
     group = parser.add_argument_group("Alternative input OB(s)")
     #group.add_argument("--instrument", dest="instrument", help="instrument", default=None)
@@ -58,7 +59,6 @@ class get_options:
 
     group = parser.add_argument_group("p2 server selection, options and password management")
     group.add_argument("--env", dest="env", help="Use the %s environment [optional], default = production" %("|".join(p2api.API_URL.keys())), default='production')
-    group.add_argument("-u", "--user", dest="user", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
     group.add_argument("-S", "--PWstore", dest="pwstore", help="Store the password in the keyring, default=False", action="store_true", default=False)
     group.add_argument("-R", "--PWreenter", dest="pwreenter", help="Reenter the password, thus overriding any PW in the keyring, default=False", action="store_true", default=False)
     group.add_argument("-Z", "--PWremove", dest="pwremove", help="Remove any password from the keyring, default=False", action="store_true", default=False)
@@ -107,6 +107,14 @@ class get_options:
             and
             options.old_fmt_email_file
         )
+        and not (
+            options.pwstore
+            or
+            options.pw.pwreenter
+            or
+            options.pw.remove
+        )
+        or not options.user
     ) :
         parser.print_help()
         sys.exit(2)
@@ -120,6 +128,7 @@ class get_options:
     self.DEC = options.DEC
 
     self.OBname = options.OBname
+    self.runId = options.runId
 
     self.old_fmt_ftp_file = options.old_fmt_ftp_file
 
@@ -294,7 +303,7 @@ def main():
         checked_runs=(options.runId or '').split(',')
         if options.runId is None :
             checked_runs="runs scheduled in P{cep}".format(cep=cep)
-        for run in runs :
+        for run in (runs or []) :
             if (
                 ( options.runId is None and run['scheduledPeriod'] == cep )
                 or

{p2api-1.1.6 → p2api-1.1.9}/p2api/utils/too_trigger.py

@@ -33,6 +33,7 @@ class get_options:
     group.add_argument("--phone", dest="phone", help="phone", default=None)
     group.add_argument("--notify", dest="notify", help="notify", default=None)
     group.add_argument("--comments", dest="comments", help="comments", default=None)
+    group.add_argument("-u", "--user", dest="user", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
 
     group = parser.add_argument_group("Optional input OB(s)")
     group.add_argument("--calibrations", dest="calibrations", help="calibrations", default=None)
@@ -40,7 +41,6 @@ class get_options:
 
     group = parser.add_argument_group("p2 server selection, options and password management")
     group.add_argument("--env", dest="env", help="Use the %s environment [optional], default = production" %("|".join(p2api.API_URL.keys())), default='production')
-    group.add_argument("-u", "--user", dest="user", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
     group.add_argument("-S", "--PWstore", dest="pwstore", help="Store the password in the keyring, default=False", action="store_true", default=False)
     group.add_argument("-R", "--PWreenter", dest="pwreenter", help="Reenter the password, thus overriding any PW in the keyring, default=False", action="store_true", default=False)
     group.add_argument("-Z", "--PWremove", dest="pwremove", help="Remove any password from the keyring, default=False", action="store_true", default=False)
@@ -54,15 +54,25 @@ class get_options:
     options=parser.parse_args()
 
     if (
-        options.folderId is None
-        or
-        options.priority is None
-        or
-        options.phone is None
-        or
-        options.notify is None
-        or
-        options.comments is None
+        not (
+            options.folderId
+            and
+            options.priority
+            and
+            options.phone
+            and
+            options.notify
+            and
+            options.comments  
+        )
+        and not (
+            options.pwstore
+            or
+            options.pw.pwreenter
+            or
+            options.pw.remove
+        )
+        or not options.user
     ) :
         parser.print_help()
         sys.exit(2)

p2api-1.1.6/p2api/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.1.6"