more cleanup

Author: tmeiczin

example/resources/form.py

@@ -5,6 +5,7 @@
 """
 
 from reliqua.resources.base import Resource
+from reliqua.status_codes import HTTP
 
 
 class Contact(Resource):
@@ -34,3 +35,6 @@ def on_post(self, req, resp):
         p = req.params
         if p.get("subject"):
             resp.media = {"success": True}
+        else:
+            resp.status = HTTP("400")
+            resp.media = {"error": "Subject is required"}

example/resources/media.py

@@ -7,6 +7,7 @@
 import os
 
 from reliqua.resources.base import Resource
+from reliqua.status_codes import HTTP
 
 
 class Gzip(Resource):
@@ -16,19 +17,25 @@ class Gzip(Resource):
         "/gzip": {},
     }
 
-    def on_get(self, req, resp):
+    def on_get(self, _req, resp):
         """
         Send contact message.
 
         :accepts json:          Accepts JSON
-        :response 200 binary:       All good
-        :return gzip:      Return data
+        :response 200 binary:   All good
+        :return gzip:           Return data
         """
-        fh = open("/tmp/hello.txt.gz", "rb")
-        resp.append_header("Content-Disposition", "attachment; filename=hello.txt.gz")
-        resp.content_type = "application/gzip"
-        resp.content_encoding = "gzip"
-        resp.data = fh.read()
+        try:
+            with open("/tmp/hello.txt.gz", "rb") as fh:
+                resp.append_header("Content-Disposition", "attachment; filename=hello.txt.gz")
+                resp.content_type = "application/gzip"
+                resp.content_encoding = "gzip"
+                resp.data = fh.read()
+        except FileNotFoundError:
+            resp.status = HTTP("404")
+        except Exception as e:
+            resp.status = HTTP("500")
+            resp.media = {"error": str(e)}
 
 
 class Binary(Resource):
@@ -38,16 +45,23 @@ class Binary(Resource):
         "/bin/{filename}": {},
     }
 
-    def on_get(self, req, resp, filename):
+    def on_get(self, _req, resp, filename):
         """
         Send contact message.
 
         :param str filename:    [in=path] Filename
-        :response 200 binary:       All good
+        :response 200 binary:   All good
         :return binary:         Return data
         """
         path = f"/tmp/{filename}"
-        resp.stream = open(path, "rb")
-        resp.content_type = "application/gzip"
-        resp.content_encoding = "gzip"
-        resp.content_length = os.path.getsize(path)
+        try:
+            with open(path, "rb") as fh:
+                resp.stream = fh
+                resp.content_type = "application/gzip"
+                resp.content_encoding = "gzip"
+                resp.content_length = os.path.getsize(path)
+        except FileNotFoundError:
+            resp.status = HTTP("404")
+        except Exception as e:
+            resp.status = HTTP("500")
+            resp.media = {"error": str(e)}

example/resources/servers.py

@@ -26,20 +26,20 @@ class Server(Resource):
 
     def on_get_by_id(self, _req, resp, id=None):
         """
-        Retrieve servers.
+        Retrieve a server.
 
-        Retrieve a list of servers in the lab.
+        Retrieve a server by its ID.
 
         :param str id:       [in=path, required] Server ID
 
-        :response 200:       server was retrieved
-        :response 400:       invalid query parameter
+        :response 200:       Server was retrieved
+        :response 404:       Server not found
 
         :return json:
         """
         try:
-            resp.media = servers[id]
-        except IndexError:
+            resp.media = servers[int(id)]
+        except (IndexError, ValueError):
             resp.status = HTTP("404")
 
 
@@ -54,14 +54,14 @@ class Servers(Resource):
 
     def on_get(self, req, resp):
         """
-        Retrieve a server.
+        Retrieve servers.
 
-        Retrieve server information
+        Retrieve a list of servers in the lab.
 
         :param list labs:     [in=query] The labs servers are located
 
-        :response 200:       server  was retrieved
-        :response 400:       invalid query parameter
+        :response 200:        Servers were retrieved
+        :response 400:        Invalid query parameter
 
         :return json:
         """
@@ -70,18 +70,18 @@ def on_get(self, req, resp):
 
     def on_get_by_cpu(self, _req, resp, cpus=1):
         """
-        Retrieve a server by cpu.
+        Retrieve a server by CPU.
 
-        Retrieve server information by cpu
+        Retrieve server information by CPU.
 
         :param int cpus:     [in=path required] Number of CPUs for server
 
-        :response 200:       server  was retrieved
-        :response 400:       invalid query parameter
+        :response 200:       Server was retrieved
+        :response 404:       Server not found
 
         :return json:
         """
         try:
-            resp.media = servers[cpus]
-        except IndexError:
+            resp.media = servers[int(cpus)]
+        except (IndexError, ValueError):
             resp.status = HTTP("404")

example/resources/users.py

@@ -64,7 +64,7 @@ def on_get_by_id(self, _req, resp, id=None):
         """
         try:
             resp.media = users[int(id)]
-        except IndexError:
+        except (IndexError, ValueError):
             resp.status = HTTP("404")
 
     def on_delete_by_id(self, _req, resp, id=None):
@@ -78,7 +78,7 @@ def on_delete_by_id(self, _req, resp, id=None):
         try:
             users.pop(int(id))
             resp.media = {"success": True}
-        except IndexError:
+        except (IndexError, ValueError):
             resp.status = HTTP("400")