tina4-python 0.2.111__tar.gz → 0.2.113__tar.gz

{tina4_python-0.2.111 → tina4_python-0.2.113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.111
+Version: 0.2.113
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.111 → tina4_python-0.2.113}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.111"
+version = "0.2.113"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.111 → tina4_python-0.2.113}/tina4_python/MiddleWare.py

@@ -4,6 +4,8 @@
 # License: MIT https://opensource.org/licenses/MIT
 #
 # flake8: noqa: E501
+import asyncio
+
 class MiddleWare:
     def __init__(self, middleware_class):
         """
@@ -26,7 +28,7 @@ class MiddleWare:
             else:
                 self.any_methods.append(method)
 
-    def call_before_methods(self, request, response):
+    async def call_before_methods(self, request, response):
         """
         Call before methods
         :param request:
@@ -35,10 +37,15 @@ class MiddleWare:
         """
         for method in self.before_methods:
             method = getattr(self.middleware_class, method)
-            request, response = method(request, response)
+            result = method(request, response)
+            if asyncio.iscoroutine(result):
+                request, response = await result
+            else:
+                request, response = result
+
         return request, response
 
-    def call_after_methods(self, request, response):
+    async def call_after_methods(self, request, response):
         """
         Call after methods
         :param request:
@@ -47,10 +54,14 @@ class MiddleWare:
         """
         for method in self.after_methods:
             method = getattr(self.middleware_class, method)
-            request, response = method(request, response)
+            result = method(request, response)
+            if asyncio.iscoroutine(result):
+                request, response = await result
+            else:
+                request, response = result
         return request, response
 
-    def call_any_methods(self, request, response):
+    async def call_any_methods(self, request, response):
         """
         Call any methods
         :param request:
@@ -59,7 +70,11 @@ class MiddleWare:
         """
         for method in self.any_methods:
             method = getattr(self.middleware_class, method)
-            request, response = method(request, response)
+            result = method(request, response)
+            if asyncio.iscoroutine(result):
+                request, response = await result
+            else:
+                request, response = result
         return request, response
 
     def call_direct_method(self, request, response, method_name):

{tina4_python-0.2.111 → tina4_python-0.2.113}/tina4_python/Router.py

@@ -161,12 +161,12 @@ class Router:
                 if "middleware" in route:
                     middleware_runner = MiddleWare(route["middleware"]["class"])
 
-                    if "methods" in route["middleware"]:
+                    if "methods" in route["middleware"] and route["middleware"]["methods"] is not None and len(route["middleware"]["methods"]) > 0:
                         for method in route["middleware"]["methods"]:
                             Request, Response = middleware_runner.call_direct_method(Request, Response, method)
                     else:
-                        Request, Response = middleware_runner.call_before_methods(Request, Response)
-                        Request, Response = middleware_runner.call_any_methods(Request, Response)
+                        Request, Response = await middleware_runner.call_before_methods(Request, Response)
+                        Request, Response = await middleware_runner.call_any_methods(Request, Response)
 
                 try:
                     result = await router_response(request=Request, response=Response.Response)
@@ -187,12 +187,12 @@ class Router:
                 if "middleware" in route:
                     middleware_runner = MiddleWare(route["middleware"]["class"])
 
-                    if "methods" in route["middleware"]:
+                    if "methods" in route["middleware"] and route["middleware"]["methods"] is not None and len(route["middleware"]["methods"]) > 0:
                         for method in route["middleware"]["methods"]:
                             Request, result = middleware_runner.call_direct_method(Request, result, method)
                     else:
-                        Request, result = middleware_runner.call_after_methods(Request, result)
-                        Request, result = middleware_runner.call_any_methods(Request, result)
+                        Request, result = await middleware_runner.call_after_methods(Request, result)
+                        Request, result = await middleware_runner.call_any_methods(Request, result)
 
                 if result is not None:
                     result.headers["FreshToken"] = tina4_python.tina4_auth.get_token({"path": url})

{tina4_python-0.2.111 → tina4_python-0.2.113}/tina4_python/Template.py

@@ -15,6 +15,7 @@ from jinja2 import Environment, FileSystemLoader, Undefined
 from tina4_python.Session import Session
 from random import random as RANDOM
 
+
 class Template:
     # initializes the twig template engine
     @staticmethod
@@ -30,11 +31,12 @@ class Template:
         Template.twig.globals['RANDOM'] = RANDOM
         Template.twig.globals['formToken'] = Template.get_form_token
         Template.twig.filters['formToken'] = Template.get_form_token_input
-        if Constant.TINA4_LOG_DEBUG in os.getenv("TINA4_DEBUG_LEVEL") or Constant.TINA4_LOG_ALL in os.getenv("TINA4_DEBUG_LEVEL"):
+        if Constant.TINA4_LOG_DEBUG in os.getenv("TINA4_DEBUG_LEVEL") or Constant.TINA4_LOG_ALL in os.getenv(
+                "TINA4_DEBUG_LEVEL"):
             Template.twig.globals['dump'] = Template.dump
         else:
             Template.twig.globals['dump'] = Template.production_dump
-        Debug("Twig Initialized on "+path, Constant.TINA4_LOG_INFO)
+        Debug("Twig Initialized on " + path, Constant.TINA4_LOG_INFO)
         return Template.twig
 
     @staticmethod
@@ -52,7 +54,7 @@ class Template:
                     return obj.session_values
                 raise TypeError("Type %s not serializable to Jinja2 template" % type(obj))
 
-            return "<pre>"+json.dumps(param, indent=True, default=json_serialize)+"</pre>"
+            return "<pre>" + json.dumps(param, indent=True, default=json_serialize) + "</pre>"
         else:
             return ""
 
@@ -62,7 +64,8 @@ class Template:
 
     @staticmethod
     def get_form_token_input(form_name):
-        return '<input type="hidden" name="formToken" value="'+Template.get_form_token({"formName": form_name})+'"><!--"'+str(datetime.now().isoformat())+'"-->'
+        return '<input type="hidden" name="formToken" value="' + Template.get_form_token(
+            {"formName": form_name}) + '"><!--"' + str(datetime.now().isoformat()) + '"-->'
 
     @staticmethod
     def convert_special_types(obj):
@@ -102,4 +105,3 @@ class Template:
     @staticmethod
     def render(template_or_file_name, data=None):
         return Template.render_twig_template(template_or_file_name, data)
-

{tina4_python-0.2.111 → tina4_python-0.2.113}/tina4_python/Webserver.py

@@ -48,7 +48,7 @@ class Webserver:
                 for data in content_data:
                     data = data.split("=", 1)
                     body[data[0]] = unquote_plus(data[1])
-                return body
+                return body, {}
             elif self.lowercase_headers["content-type"] == "application/json":
                 # print("CONTENT", content, self.request)
                 try:
@@ -111,7 +111,7 @@ class Webserver:
 
                     return body, files
 
-        return {"data": base64.encodebytes(content).decode("utf-8").replace("\n", "")}
+        return {"data": base64.encodebytes(content).decode("utf-8").replace("\n", "")}, {}
 
     async def send_basic_headers(self, headers):
         self.send_header("Access-Control-Allow-Origin", "*", headers)