PyMMT 1.0.1__tar.gz → 1.0.2__tar.gz

{pymmt-1.0.1 → pymmt-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyMMT
-Version: 1.0.1
+Version: 1.0.2
 Summary: A python API wrapper for the MMT Observatory
 Author-email: Samuel Wyatt <swyatt@arizona.edu>, Manisha Shrestha <mshrestha1@arizona.edu>, Griffin Hosseinzadeh <griffin0@arizona.edu>
 Project-URL: Homepage, https://github.com/SAGUARO-MMA/PyMMT

{pymmt-1.0.1 → pymmt-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyMMT"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="Samuel Wyatt", email="swyatt@arizona.edu" },
   { name="Manisha Shrestha", email="mshrestha1@arizona.edu" },

{pymmt-1.0.1 → pymmt-1.0.2}/src/PyMMT.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyMMT
-Version: 1.0.1
+Version: 1.0.2
 Summary: A python API wrapper for the MMT Observatory
 Author-email: Samuel Wyatt <swyatt@arizona.edu>, Manisha Shrestha <mshrestha1@arizona.edu>, Griffin Hosseinzadeh <griffin0@arizona.edu>
 Project-URL: Homepage, https://github.com/SAGUARO-MMA/PyMMT

{pymmt-1.0.1 → pymmt-1.0.2}/src/pymmt/pymmt.py

@@ -1,16 +1,22 @@
-import os, json, requests, re, time
+import json
+import os
+import re
+import time
+from datetime import datetime
 from pathlib import Path
-from . import MMT_JSON_KEYS, LOCAL_TARGET_KEYS, isInt, isFloat
+
+import requests  # type: ignore
+
+from . import MMT_JSON_KEYS, isFloat, isInt
 from .instruments.binospec import validate as bino_validate
 from .instruments.mmirs import validate as mmirs_validate
-from datetime import datetime
-
 
-class api():
+BASE_URL = "https://scheduler.mmto.arizona.edu/APIv2"
 
-    def __init__(self, target=None, token=None):
+class api:
 
-        self.base = 'https://scheduler-proxy.mmto.arizona.edu/APIv2'
+    def __init__(self, base=BASE_URL, target=None, token=None):
+        self.base = base
         self.target = target
 
         if token is None:
@@ -62,7 +68,7 @@ class api():
 
 
 class Target(api):
-    def __init__(self, token=None, verbose=True, payload={}):
+    def __init__(self, token=None, verbose=True, payload={}, base=BASE_URL):
         self.verbose = verbose
         self.valid = False
         self.downloaded = False
@@ -73,7 +79,7 @@ class Target(api):
         }
 
         assert token is not None, 'Token cannot be None'
-        super().__init__('catalogTarget', token)
+        super().__init__(target='catalogTarget', token=token, base=base)
 
         allowed_keys = list(MMT_JSON_KEYS)
         self.__dict__.update((str(key).lower(), value) for key, value in payload.items() if str(key).lower() in allowed_keys)
@@ -94,7 +100,7 @@ class Target(api):
 
         if 'ra' in selfkeys:
             ra = selfdict['ra']
-            r = re.compile('.{2}:.{2}:.{2}\.*')
+            r = re.compile(r'.{2}:.{2}:.{2}\.*')
             if not r.match(ra):
                 errors.append('Invalid format for field \'ra\' ['+ra+']. Valid format is dd:dd:dd.d')
         else:
@@ -102,7 +108,7 @@ class Target(api):
 
         if 'dec' in selfkeys:
             dec = selfdict['dec']
-            r = re.compile('.{2}:.{2}:.{2}\.*')
+            r = re.compile(r'.{2}:.{2}:.{2}\.*')
             isNeg = dec.startswith('-')
             if '-' in dec:
                 dec = dec.split('-')[1]
@@ -460,9 +466,9 @@ class Target(api):
 
 
 class Instruments(api):
-    def __init__(self, token=None, verbose=True, payload={}):
+    def __init__(self, token=None, verbose=True, payload={}, base=BASE_URL):
         self. verbose = verbose
-        super().__init__('trimester//schedule/all/', token)
+        super().__init__(target='trimester//schedule/all/', token=token)
 
     def get_instruments(self, date=None, instrumentid=None, getAll=False):
         if date is None and instrumentid is None:
@@ -505,10 +511,10 @@ class Instruments(api):
 
 
 class Datalist(api):
-    def __init__(self, token=None, verbose=True, payload={}):
+    def __init__(self, token=None, verbose=True, payload={}, base=BASE_URL):
         self.verbose = verbose
         self.data = []
-        super().__init__('data/list/catalogtarget', token)
+        super().__init__(target='data/list/catalogtarget', token=token)
 
 
     def get(self, targetid, data_type='raw'):
@@ -530,9 +536,9 @@ class Datalist(api):
 
 
 class Image(api):
-    def __init__(self, token=None, verbose=True, payload={}):
+    def __init__(self, token=None, verbose=True, payload={}, base=BASE_URL):
         self. verbose = verbose
-        super().__init__('data/download/datafile', token)
+        super().__init__(target='data/download/datafile', token=token)
 
 
     def get(self, datafileid=None, filepath=os.getcwd()):