tina4-python 0.2.20__tar.gz → 0.2.22__tar.gz

{tina4_python-0.2.20 → tina4_python-0.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tina4-python
-Version: 0.2.20
+Version: 0.2.22
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com

{tina4_python-0.2.20 → tina4_python-0.2.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.2.20"
+version = "0.2.22"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"

{tina4_python-0.2.20 → tina4_python-0.2.22}/tina4_python/Request.py

@@ -16,6 +16,7 @@ class Request:
         self.request = request if request is not None else {}
         self.cookies = {}
         self.cookies = {}
+        self.url = None
         self.session = None
         self.files = {}
         self.raw_data = raw_data if raw_data is not None else None

{tina4_python-0.2.20 → tina4_python-0.2.22}/tina4_python/Response.py

@@ -22,8 +22,7 @@ class Response:
     """
 
     def __init__(self, content, http_code=Constant.HTTP_OK, content_type=Constant.TEXT_HTML, headers=None):
-        if headers is None:
-            headers = {}
+        self.headers = headers if headers is not None else {}
 
         if content is None:
             content = ""
@@ -54,7 +53,7 @@ class Response:
         self.content = content
         self.http_code = http_code
         self.content_type = content_type
-        self.headers = headers
+
 
     @staticmethod
     def redirect(redirect_url):

{tina4_python-0.2.20 → tina4_python-0.2.22}/tina4_python/Router.py

@@ -113,6 +113,7 @@ class Router:
             with open(static_file, 'rb') as file:
                 return Response(file.read(), Constant.HTTP_OK, mime_type)
 
+        old_stdout = None
         for route in tina4_python.tina4_routes.values():
             if route["method"] != method:
                 continue
@@ -135,11 +136,27 @@ class Router:
                 Request.raw_data = request["raw_data"] if "raw_data" in request else None
                 Request.raw_request = request["raw_request"] if "raw_request" in request else None
                 Request.raw_content = request["raw_content"] if "raw_content" in request else None
+                Request.url = url
 
                 tina4_python.tina4_current_request = Request
+
                 old_stdout = sys.stdout # Memorize the default stdout stream
                 sys.stdout = buffer = io.StringIO()
                 result = await router_response(request=Request, response=Response)
+
+                if "cache" in route and route["cache"] is not None:
+                    if not route["cache"]["cached"]:
+                        result.headers["Cache-Control"] = "max-age=1, must-revalidate"
+                        result.headers["Pragma"] = "no-cache"
+                        result.headers["Clear-Site-Data"] =  "cache"
+                    else:
+                        result.headers["Cache-Control"] = "max-age="+str(route["cache"]["max_age"])+", must-revalidate"
+                        result.headers["Pragma"] = "cache"
+                else:
+                    result.headers["Cache-Control"] = "max-age=-1, must-revalidate"
+                    result.headers["Pragma"] = "cache"
+
+
                 break
 
         if result is None:
@@ -162,9 +179,12 @@ class Router:
                 Debug("Looking for twig file",
                       tina4_python.root_path + os.sep + "src" + os.sep + "templates" + os.sep + twig_file,
                       Constant.TINA4_LOG_DEBUG)
+
+                result.headers["Cache-Control"] = "max-age=-1, public"
+                result.headers["Pragma"] = "no-cache"
                 content = Template.render_twig_template(twig_file, {"request": tina4_python.tina4_current_request})
                 if content != "":
-                    return Response(content, Constant.HTTP_OK, Constant.TEXT_HTML)
+                    return Response(content, Constant.HTTP_OK, Constant.TEXT_HTML, result.headers)
 
         if result.http_code == Constant.HTTP_NOT_FOUND:
             content = Template.render_twig_template(
@@ -189,7 +209,7 @@ class Router:
     def add(method, route, callback):
         Debug("Adding a route: " + route, Constant.TINA4_LOG_DEBUG)
         if not callback in tina4_python.tina4_routes:
-            tina4_python.tina4_routes[callback] = {"route": route, "callback": callback, "method": method, "swagger": None}
+            tina4_python.tina4_routes[callback] = {"route": route, "callback": callback, "method": method, "swagger": None, "cached": False}
         else:
             tina4_python.tina4_routes[callback]["route"] = route
             tina4_python.tina4_routes[callback]["callback"] = callback
@@ -274,3 +294,18 @@ def delete(path):
         return callback
 
     return actual_delete
+
+def cached(is_cached, max_age=60):
+    """
+    Sets whether the route is cached or not
+    :param is_cached:
+    :param max_age:
+    :return:
+    """
+    def actual_cached(callback):
+        if callback not in tina4_python.tina4_routes:
+            tina4_python.tina4_routes[callback] = {}
+        tina4_python.tina4_routes[callback]["cache"] = {"cached": is_cached, "max_age": max_age}
+        return callback
+
+    return actual_cached

{tina4_python-0.2.20 → tina4_python-0.2.22}/tina4_python/Webserver.py

@@ -111,12 +111,14 @@ class Webserver:
         else:
             body = None
 
-        request = {"params": params, "body": body, "raw_data": self.request, "headers": self.lowercase_headers, "raw_request": self.request_raw, "raw_content": self.content_raw}
+        request = {"params": params, "body": body, "raw_data": self.request, "url": self.path, "headers": self.lowercase_headers, "raw_request": self.request_raw, "raw_content": self.content_raw}
 
         tina4_python.tina4_current_request = request
 
         response = await self.router_handler.resolve(method, self.path, request, self.lowercase_headers, self.session)
 
+
+
         if HTTP_REDIRECT != response.http_code:
             self.send_header("Access-Control-Allow-Origin", "*", headers)
             self.send_header("Access-Control-Allow-Headers",
@@ -136,8 +138,6 @@ class Webserver:
         for response_header in response.headers:
             self.send_header(response_header, response.headers[response_header], headers)
 
-
-
         headers = await self.get_headers(headers, self.response_protocol, response.http_code)
 
         if isinstance(response.content, str):