adamapi - npm Package Compare versions

Comparing version 2.0.8 to 2.0.9

adamapi.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: adamapi
-Version: 2.0.8
+Version: 2.0.9
 Summary: Python Adam API
@@ -14,3 +14,3 @@ Home-page: https://git.services.meeo.it/das/adamapi
         1. adamapi==1.0.1 , This package works only with ADAMCORE 1.
-        2. adamapi==2.0.8, This pachage works only with ADAMCORE 2.
+        2. adamapi==2.0.9, This pachage works only with ADAMCORE 2.
         
@@ -17,0 +17,0 @@ ## Requirements

adamapi/__init__.py

@@ -31,5 +31,6 @@ """
     def __init__(self,json):
-        self.pk=json["pk"]
-        self.status=json["status"]
+        self.pk=json["pk"] if "pk" in json else ""
+        self.status=json["status"] if "status" in json else ""
         self.location = json["location"] if "location" in json else ""
+        self.error = json["error"] if "error" in json else ""
 
@@ -36,0 +37,0 @@

adamapi/datasets.py

@@ -46,2 +46,3 @@ """
         params={ 'datasetId':datasetId }
+        params["type"]="adamapi"
         if 'page' in kwargs:
@@ -48,0 +49,0 @@ params['page']=kwargs['page']

adamapi/get_data.py

@@ -72,3 +72,3 @@ """
                      self.LOG.exception("Un error occurd : %s"%(e))
-                     raise AdamApiError( e )
+                     raise AdamApiMessage( {"error":e} )
 
@@ -80,6 +80,6 @@ with open(fname,"wb") as f:
              else:
-                 return AdamApiError({"pk":params["pk"],"status":status})
+                 return AdamApiMessage({"pk":params["pk"],"status":status})
         if fname is None:
             self.LOG.error("Unprocessable requests with productId and geometry. Execute a request with only once of two params")
-            raise AdamApiError( "Unprocessable requests with productId and geometry. Execute a request with only once of two params")
+            raise AdamApiMessage( {"error":"Unprocessable requests with productId and geometry. Execute a request with only once of two params"})
         self._checkDirFile(fname)
@@ -122,6 +122,6 @@ if "productId" in params:
                            except requests.exceptions.HTTPError as er:
-                               raise AdamApiError( response_download.json())
+                               raise AdamApiMessage( {"error":response_download.json()})
                            except Exception as e:
                                self.LOG.exception("Un error occurd : %s"%(e))
-                               raise AdamApiError( e )
+                               raise AdamApiMessage( {"error":e} )
                     else:
@@ -132,3 +132,3 @@ return AdamApiMessage(response_order.json())
                     self.LOG.error("Failed request")
-                    raise AdamApiError(status)
+                    raise AdamApiMessage({"status":status,"error":"Failed Request"})
             else:
@@ -138,6 +138,6 @@ with open( fname, 'wb' ) as f:
         except requests.exceptions.HTTPError as er:
-            raise AdamApiError(response_order.json())
+            raise AdamApiMessage({"error":response_order.json()})
         except Exception as e:
             self.LOG.exception("Un error occurd : %s"%(e))
-            raise AdamApiError( e )
+            raise AdamApiMessage( {"error":e} )
 
@@ -174,2 +174,3 @@ return fname
             params["end_date"]=end_date
+        params["type"]="adamapi"
         return params,fname
@@ -176,0 +177,0 @@

adamapi/search.py

@@ -51,2 +51,3 @@ """
         params['datasetId']=datasetId.split(":",1)[1]
+        params["type"]="adamapi"
 
@@ -53,0 +54,0 @@ for par in kwargs:

PKG-INFO

 Metadata-Version: 2.1
 Name: adamapi
-Version: 2.0.8
+Version: 2.0.9
 Summary: Python Adam API
@@ -14,3 +14,3 @@ Home-page: https://git.services.meeo.it/das/adamapi
         1. adamapi==1.0.1 , This package works only with ADAMCORE 1.
-        2. adamapi==2.0.8, This pachage works only with ADAMCORE 2.
+        2. adamapi==2.0.9, This pachage works only with ADAMCORE 2.
         
@@ -17,0 +17,0 @@ ## Requirements

setup.py

@@ -31,3 +31,3 @@ """
         name="adamapi",
-        version="2.0.8",
+        version="2.0.9",
         author="MEEO s.r.l.",
@@ -34,0 +34,0 @@ author_email="[e-mail]",

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

48517

0.67%

Lines of code

575

0.7%