wip, saving files for agenso

Agenso_api.py

@@ -37,21 +37,21 @@ class AGENSO:
                 print("agenso login error: %s"  %str(e))
 
     #send the json to AGENSO
-    def upload(self, token, json_data):
+    def upload(self, json_data):
         url = upload_url
-        return upload_helper(url, token, json_data)
+        return self.upload_helper(url, json_data)
 
-    def AGENSO_bulkupload(token, json_data):
+    def bulkupload(self, json_data):
         url = bulk_upload_url
-        return upload_helper(url, token, json_data)
+        return self.upload_helper(url, json_data)
 
     #handles both normal and bluk uploads
     #Returns a False if the upload failed
     #for normal upload: True if succesful
     #for bulk [[true,200],[true,200]] (for each subrequest)
-    def upload_helper(self, url, token, json_data):
-        status =False
-        params = {'api_token' : token}
+    def upload_helper(self, url, json_data):
+        status = False
+        params = {'api_token' : self.token}
         headers = {'Content-Type': 'application/json'}
         try:
             r = requests.post(url, params= params, headers = headers, data=json_data)
@@ -68,9 +68,9 @@ class AGENSO:
     #get data from AGENSO for a specific location/timestamp
     #params = {"coordinates.latitude": 51.969189, "coordinates.longitude": 5.665395}
     #{"timestamp": 2020-07-02T11:53:50}
-    def retreive(token, params):
+    def retreive(self, params):
         result = ""
-        params['api_token'] = token
+        params['api_token'] = self.token
         r = requests.get(retreive_url, params= params)
         if (r.status_code != 200): #Http Error
             print("URL: %s, statuscode: %d, reply: %s" %(retreive_url, r.status_code, r.text))
@@ -81,11 +81,10 @@ class AGENSO:
 
 if __name__ == '__main__':
     #login
-    token = AGENSO_login()
+    agenso = AGENSO()
     
     #upload data
-    if token != None:
-        test_data = {
+    test_data = {
     "timestamp": "2020-07-02T11:53:50",
     "gps_quality": "fixed",
     "hdop": 1.4,
@@ -105,7 +104,7 @@ if __name__ == '__main__':
         }
     ]
 }
-        data_json = json.dumps(test_data, sort_keys=True, indent=4)
-        status = AGENSO_upload(token, data_json)
-        print(status)
-        AGENSO_retreive(token, {"coordinates.latitude": 51.969189, "coordinates.longitude": 5.665395})
+    data_json = json.dumps(test_data, sort_keys=True, indent=4)
+    status = agenso.upload( data_json)
+    print(status)
+    agenso.retreive( {"coordinates.latitude": 51.969189, "coordinates.longitude": 5.665395})

data_types.py

@@ -142,7 +142,7 @@ class GPS_Ringbuffer:
     #return current GPS location as AGESO data class
     def get_dataobject(self, timestamp):
         data_obj = data_class()
-        data_obj.timestamp = timestamp
+        data_obj.timestamp = timestamp.strftime("%y-%m-%dT%H:%M:%S")
         data_obj.set_gpsquality(self.data[self.point].gpsquality)
         (data_obj.lat, data_obj.lng) = self.get_currentlocation(timestamp)
         data_obj.hdop = self.data[self.point].hdop

global_vars.py

 from threading import Lock
 from collections import deque
 from queue import Queue
+import os
 
 from data_types import *
 

inference.py

@@ -382,8 +382,8 @@ class dl_classification(Thread):
 
 
 # Saves the values from the to_send_queue into files, they are later send to AGENSO in bluk
-class post_processing(Thread, CONFIG):
-    def __init__(self):
+class post_processing(Thread):
+    def __init__(self, CONFIG):
         self._running = True
         # Initialize the thread
         Thread.__init__(self)
@@ -458,9 +458,6 @@ if __name__ == '__main__':
     dl_thread.start()
     proc_res_thread.start()
 
-
-
-
  #   processing_thread.start()
     # post_pros_thread.start()