version revision and build added

Author: winemug

podcomm/definitions.py

@@ -23,10 +23,13 @@
 
 API_VERSION_MAJOR = 1
 API_VERSION_MINOR = 3
+API_VERSION_REVISION = 4
+API_VERSION_BUILD = 90420
 
 REST_URL_PING = "/omnipy/ping"
 REST_URL_OMNIPY_SHUTDOWN = "/omnipy/shutdown"
 REST_URL_OMNIPY_RESTART = "/omnipy/restart"
+REST_URL_OMNIPY_UPDATE = "/pdm/updatesw"
 
 REST_URL_TOKEN = "/omnipy/token"
 REST_URL_CHECK_PASSWORD = "/omnipy/pwcheck"
@@ -53,6 +56,7 @@
 logger = None
 packet_logger = None
 
+
 def ensure_log_dir():
     if not os.path.isdir(DATA_PATH):
         os.mkdir(DATA_PATH)
@@ -80,6 +84,7 @@ def getLogger(with_console=False):
 
     return logger
 
+
 def get_packet_logger(with_console=False):
     global packet_logger
 
@@ -102,12 +107,15 @@ def get_packet_logger(with_console=False):
 
     return packet_logger
 
+
 def configureLogging():
     pass
 
+
 class RequestType(IntEnum):
     pass
 
+
 class BolusState(IntEnum):
     NotRunning = 0
     Extended = 1

podcomm/protocol_radio.py

@@ -107,8 +107,11 @@ def send_message_get_message(self, message,
 
             if self.pod_message is None:
                 self.current_exchange.successful = False
+                self.stats.append(self.current_exchange)
                 raise self.response_exception
+
             self.current_exchange.successful = True
+            self.stats.append(self.current_exchange)
             return self.pod_message
 
     def get_packet(self, timeout=30000):
@@ -220,7 +223,6 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
         try:
             if tx_power is not None:
                 self.packet_radio.set_tx_power(tx_power)
-            self._awaken()
         except PacketRadioError:
             if not self._radio_init(3):
                 raise
@@ -501,7 +503,3 @@ def _get_packet(self, data):
             except:
                 getLogger().exception("RECEIVED DATA: %s RSSI: %d" % (binascii.hexlify(data[2:]), rssi))
         return None, rssi
-
-    def _awaken(self):
-        #self.packet_radio.send_packet(bytes(), 0, 0, 250)
-        pass

restapi.py

@@ -28,7 +28,8 @@
 
 app = Flask(__name__, static_url_path="/")
 configureLogging()
-logger = getLogger()
+logger = getLogger(with_console=False)
+get_packet_logger(with_console=False)
 
 
 class RestApiException(Exception):
@@ -99,8 +100,9 @@ def _archive_pod():
         archive_suffix = datetime.utcnow().strftime("_%Y%m%d_%H%M%S")
 
         if os.path.isfile(DATA_PATH + POD_FILE + POD_FILE_SUFFIX):
-            archive_name = os.rename(DATA_PATH + POD_FILE + POD_FILE_SUFFIX,
-                                     DATA_PATH + POD_FILE + archive_suffix + POD_FILE_SUFFIX)
+            archive_name = DATA_PATH + POD_FILE + archive_suffix + POD_FILE_SUFFIX
+            os.rename(DATA_PATH + POD_FILE + POD_FILE_SUFFIX,
+                                     archive_name)
         if os.path.isfile(DATA_PATH + POD_FILE + POD_DB_SUFFIX):
             os.rename(DATA_PATH + POD_FILE + POD_DB_SUFFIX,
                       DATA_PATH + POD_FILE + archive_suffix + POD_DB_SUFFIX)
@@ -148,6 +150,7 @@ def _save_activated_pod_address(addr):
     except:
         logger.exception("Error while storing activated radio address")
 
+
 def _create_response(success, response, pod_status=None):
 
     if pod_status is None:
@@ -164,7 +167,8 @@ def _create_response(success, response, pod_status=None):
                        "response": response,
                        "status": pod_status,
                        "datetime": time.time(),
-                       "api": {"version_major": API_VERSION_MAJOR, "version_minor": API_VERSION_MINOR}
+                       "api": {"version_major": API_VERSION_MAJOR, "version_minor": API_VERSION_MINOR,
+                               "version_revision": API_VERSION_REVISION, "version_build": API_VERSION_BUILD}
                        }, indent=4, sort_keys=True)
 
 
@@ -197,6 +201,7 @@ def _verify_auth(request_obj):
         logger.exception("Error during verify_auth")
         raise
 
+
 def _adjust_time(adjustment):
     logger.info("Adjusting local time by %d ms" % adjustment)
     pdm = _get_pdm()
@@ -242,10 +247,9 @@ def _api_result(result_lambda, generic_err_message):
 def _get_pdm_address(timeout):
     packet = None
     with PdmLock():
-        radio = _get_pdm().get_radio()
-        radio.stop()
-
         try:
+            radio = _get_pdm().get_radio()
+            radio.stop()
             packet = radio.get_packet(timeout)
         finally:
             radio.disconnect()
@@ -277,6 +281,7 @@ def create_token():
 def check_password():
     _verify_auth(request)
 
+
 def get_pdm_address():
     _verify_auth(request)
 
@@ -290,6 +295,7 @@ def get_pdm_address():
 
     return {"radio_address": address, "radio_address_hex": "%8X" % address}
 
+
 def new_pod():
     _verify_auth(request)
 
@@ -310,6 +316,7 @@ def new_pod():
     _archive_pod()
     _set_pod(pod)
 
+
 def activate_pod():
     _verify_auth(request)
 
@@ -326,6 +333,7 @@ def activate_pod():
     pdm.activate_pod(req_address, utc_offset=utc_offset)
     _save_activated_pod_address(req_address)
 
+
 def start_pod():
     _verify_auth(request)
 
@@ -339,12 +347,14 @@ def start_pod():
 
     pdm.inject_and_start(schedule)
 
+
 def _int_parameter(obj, parameter):
     if request.args.get(parameter) is not None:
         obj.__dict__[parameter] = int(request.args.get(parameter))
         return True
     return False
 
+
 def _float_parameter(obj, parameter):
     if request.args.get(parameter) is not None:
         obj.__dict__[parameter] = float(request.args.get(parameter))
@@ -403,6 +413,7 @@ def get_rl_info():
     r = RileyLink()
     return r.get_info()
 
+
 def get_status():
     _verify_auth(request)
     t = request.args.get('type')
@@ -415,13 +426,15 @@ def get_status():
     id = pdm.update_status(req_type)
     return {"row_id":id}
 
+
 def deactivate_pod():
     _verify_auth(request)
     pdm = _get_pdm()
     id = pdm.deactivate_pod()
     _archive_pod()
     return {"row_id":id}
 
+
 def bolus():
     _verify_auth(request)
 
@@ -478,6 +491,7 @@ def is_pdm_busy():
     pdm = _get_pdm()
     return {"busy": pdm.is_busy()}
 
+
 def acknowledge_alerts():
     _verify_auth(request)
 
@@ -499,6 +513,7 @@ def shutdown():
     os.system("sudo shutdown -h")
     return {"shutdown": time.time()}
 
+
 def restart():
     global g_deny
     _verify_auth(request)
@@ -511,14 +526,26 @@ def restart():
     os.system("sudo shutdown -r")
     return {"restart": time.time()}
 
+
+def update_omnipy():
+    global g_deny
+    _verify_auth(request)
+
+    g_deny = True
+    pdm = _get_pdm()
+    while pdm.is_busy():
+        time.sleep(1)
+    os.system("/bin/bash /home/pi/omnipy/scripts/pi-update.sh")
+    return {"update started": time.time()}
+
+
 @app.route("/")
 def main_page():
     try:
         return app.send_static_file("omnipy.html")
     except:
         logger.exception("Error while serving root file")
 
-
 @app.route('/content/<path:path>')
 def send_content(path):
     try:
@@ -610,12 +637,18 @@ def a19():
 def a20():
     return _api_result(lambda: archive_pod(), "Failure while archiving pod")
 
+@app.route(REST_URL_OMNIPY_UPDATE)
+def a20():
+    return _api_result(lambda: update_omnipy(), "Failure while archiving pod")
+
+
 def _run_flask():
     try:
         app.run(host='0.0.0.0', port=4444, debug=True, use_reloader=False)
     except:
         logger.exception("Error while running rest api, exiting")
 
+
 def _exit_with_grace():
     try:
         global g_deny
@@ -630,6 +663,7 @@ def _exit_with_grace():
 
     exit(0)
 
+
 if __name__ == '__main__':
     logger.info("Rest api is starting")
 

version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/python3
+from podcomm.definitions import API_VERSION_MAJOR, API_VERSION_MINOR, API_VERSION_REVISION, API_VERSION_BUILD
+
+
+print("%d.%d.%d.%d" % (API_VERSION_MAJOR, API_VERSION_MINOR, API_VERSION_REVISION, API_VERSION_BUILD))