update APIs

Author: haobibo

demo/app_common/api/api_common_sys_info.py

@@ -1,17 +1,28 @@
+from datetime import datetime
+
 from aloha.service.api.v0 import APIHandler
 from aloha.util import (sys_info, sys_gpu, sys_cuda)
 
 
+def echo(*args, **kwargs):
+    return {
+        'sys_time': datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'),
+        **kwargs
+    }
+
+
 class SysStatusInfo(APIHandler):
     @staticmethod
     def get_sys_info(kind: str = None, **kwargs) -> dict:
-        kinds = ['sys', 'gpu', 'cuda']
-        if kind is None:
+        kinds = ['echo']
+        if kind is None or len(kind) == 0:
             pass
         else:
             kinds = [kind]
 
         dict_func = {
+            "echo": echo,
+
             "sys": sys_info.get_sys_info,
             "os": sys_info.get_os_info,
             "cpu": sys_info.get_cpu_info,
@@ -26,8 +37,10 @@ def get_sys_info(kind: str = None, **kwargs) -> dict:
             "cuda-paddle": sys_cuda.get_gpu_status_for_paddle,
         }
         ret = {}
-        for k in kinds:
-            ret.update({k: dict_func.get(k, sys_info.get_sys_info)()})
+        for k in sorted(set(kinds)):
+            if k not in dict_func:
+                k = 'echo'
+            ret.update({k: dict_func.get(k)()})
 
         return ret
 

demo/app_common/debug.py

@@ -1,20 +1,27 @@
 def main():
+    from aloha.service import DefaultHandler404
     from aloha.service.app import Application
     from aloha.settings import SETTINGS
+
     modules_to_load = [
         'app_common.api.api_common_sys_info'
     ]
 
     if 'service' not in SETTINGS.config:
         SETTINGS.config['service'] = {}
 
+    # load the service modules from SETTINGS.config['service']['modules']
     SETTINGS.config['service'].update({
         'modules': modules_to_load,
         'debug': True,
     })
 
-    # load the service modules from SETTINGS.config['service']['modules']
+    # Use self defined 404 handler
+    SETTINGS.config['default_handler_class'] = DefaultHandler404
+
     app = Application()
+
+    # The event loop starts after start.
     app.start()
 
 

src/aloha/service/__init__.py

@@ -1,6 +1,7 @@
 import sys
 
 from .api import v0, v1, v2
+from .http import DefaultHandler404
 
 for module in (v0, v1, v2):
     full_name = '{}.{}'.format(__package__, module.__name__.rsplit('.')[-1])

src/aloha/service/http/__init__.py

@@ -1,3 +1,3 @@
 from .base_api_client import AbstractApiClient
-from .base_api_handler import AbstractApiHandler
+from .base_api_handler import AbstractApiHandler, DefaultHandler404
 from .plain_http_handler import PlainHttpHandler

src/aloha/service/http/base_api_client.py

@@ -61,7 +61,4 @@ def call(self, api_url: str, data: dict = None, timeout=5, **kwargs):
             LOG.error(str(e))
             raise RuntimeError(resp.text)
 
-        try:
-            return ret['data']
-        except KeyError:
-            raise RuntimeError(resp.text)
+        return ret

src/aloha/service/http/base_api_handler.py

@@ -64,3 +64,20 @@ def request_body(self) -> dict:
     def request_param(self) -> dict:
         url_arguments: dict = {k: v[0].decode('utf-8') for k, v in self.request.arguments.items()}
         return url_arguments
+
+
+class DefaultHandler404(AbstractApiHandler):
+    def response(self, *args, **kwargs) -> Optional[dict]:
+        return self.prepare()
+
+    def prepare(self):  # for all methods
+        msg = {
+            "code": 404,
+            "status": "error",
+            "message": [
+                'Requested URL cannot be found: %s' % self.request.uri
+            ]
+        }
+        msg = json.dumps(msg, ensure_ascii=False, default=str, separators=(',', ':'))
+        self.set_status(404, reason='Not Found')
+        self.finish(msg)

src/aloha/util/sys_cuda.py

@@ -7,7 +7,7 @@
 Status = namedtuple('Status', 'version,gpu_availability')
 
 
-def get_gpu_status_for_tf() -> dict:
+def get_gpu_status_for_tf(*args, **kwargs) -> dict:
     status = Status(version=None, gpu_availability=False)
     try:
         import tensorflow as tf
@@ -22,7 +22,7 @@ def get_gpu_status_for_tf() -> dict:
     return status._asdict()
 
 
-def get_gpu_status_for_torch() -> dict:
+def get_gpu_status_for_torch(*args, **kwargs) -> dict:
     status = Status(version=None, gpu_availability=False)
     try:
         import torch
@@ -37,7 +37,7 @@ def get_gpu_status_for_torch() -> dict:
     return status._asdict()
 
 
-def get_gpu_status_for_paddle() -> dict:
+def get_gpu_status_for_paddle(*args, **kwargs) -> dict:
     status = Status(version=None, gpu_availability=False)
     try:
         import paddle

src/aloha/util/sys_info.py

@@ -23,7 +23,7 @@ def get_size(bytes, suffix="B"):
         bytes /= factor
 
 
-def get_os_info() -> dict:
+def get_os_info(*args, **kwargs) -> dict:
     ret = {}
 
     boot_time = datetime.fromtimestamp(psutil.boot_time())
@@ -34,7 +34,7 @@ def get_os_info() -> dict:
     return ret
 
 
-def get_cpu_info() -> dict:
+def get_cpu_info(*args, **kwargs) -> dict:
     cpu_freq = psutil.cpu_freq()  # CPU frequencies
     ret = {
         "num_cores_physical": psutil.cpu_count(logical=False),
@@ -50,7 +50,7 @@ def get_cpu_info() -> dict:
     return ret
 
 
-def get_mem_info() -> dict:
+def get_mem_info(*args, **kwargs) -> dict:
     svmem = psutil.virtual_memory()
     swap = psutil.swap_memory()
 
@@ -67,7 +67,7 @@ def get_mem_info() -> dict:
     }
 
 
-def get_disk_info() -> dict:
+def get_disk_info(*args, **kwargs) -> dict:
     # get IO statistics since boot
     disk_io = psutil.disk_io_counters()
     partitions = psutil.disk_partitions()
@@ -101,7 +101,7 @@ def get_disk_info() -> dict:
     return ret
 
 
-def get_net_info() -> dict:
+def get_net_info(*args, **kwargs) -> dict:
     # get IO statistics since boot
     net_io = psutil.net_io_counters()