tina4-python 0.2.110__tar.gz → 0.2.112__tar.gz

{tina4_python-0.2.110 → tina4_python-0.2.112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.110
+Version: 0.2.112
 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.110 → tina4_python-0.2.112}/pyproject.toml

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

{tina4_python-0.2.110 → tina4_python-0.2.112}/tina4_python/Database.py

@@ -141,7 +141,6 @@ class Database:
         :return: bool : True if table exists, else False
         """
 
-        sql = ""
         if self.database_engine == MSSQL:
             sql = "select count(*) as count_table from sys.tables WHERE name = '"+table_name.upper()+"'"
         elif self.database_engine == SQLITE:
@@ -158,7 +157,11 @@ class Database:
         else:
             return False
 
-        record = self.fetch_one(sql)
+        try:
+            record = self.fetch_one(sql)
+        except Exception as e:
+            raise Exception (f"Error checking if table {table_name} exists: "+str(e))
+
         if record:
             if record["count_table"] > 0:
                 return True

{tina4_python-0.2.110 → tina4_python-0.2.112}/tina4_python/MiddleWare.py

@@ -26,7 +26,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 +35,10 @@ class MiddleWare:
         """
         for method in self.before_methods:
             method = getattr(self.middleware_class, method)
-            request, response = method(request, response)
+            request, response = await method(request, response)
         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 +47,10 @@ class MiddleWare:
         """
         for method in self.after_methods:
             method = getattr(self.middleware_class, method)
-            request, response = method(request, response)
+            request, response = await method(request, response)
         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 +59,7 @@ class MiddleWare:
         """
         for method in self.any_methods:
             method = getattr(self.middleware_class, method)
-            request, response = method(request, response)
+            request, response = await method(request, response)
         return request, response
 
     def call_direct_method(self, request, response, method_name):

{tina4_python-0.2.110 → tina4_python-0.2.112}/tina4_python/ORM.py

@@ -330,16 +330,16 @@ class ORM:
             self.__populate_orm({})
 
         # Debug("Checking for", self.__table_name__, TINA4_LOG_INFO)
-        if self.__dba__:
+        if self.__dba__ is not None:
             self.__table_exists = self.__dba__.table_exists(self.__table_name__)
             if not self.__table_exists:
                 sql = self.__create_table__(self.__table_name__)
                 filename = root_path + os.sep + "migrations" + os.sep + "__" + self.__table_name__ + ".sql"
                 os.makedirs(os.path.dirname(filename), exist_ok=True)
-                with open(filename, "w") as f:
-                    f.write(sql)
-                    f.close()
-            # Debug("Table Exists", self.__table_exists, TINA4_LOG_INFO)
+                #with open(filename, "w") as f:
+                #    f.write(sql)
+                #    f.close()
+                Debug.warning("Create Table ? ", sql)
         else:
             self.__table_exists = False
 

{tina4_python-0.2.110 → tina4_python-0.2.112}/tina4_python/Router.py

@@ -143,6 +143,7 @@ class Router:
                 Request.headers = headers  # Add the headers
                 Request.params = request["params"]
                 Request.body = request["body"] if "body" in request else None
+                Request.files = request["files"] if "files" in request else None
                 Request.session = session
                 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
@@ -151,6 +152,7 @@ class Router:
                 Request.transport = request["transport"] if "transport" in request else None
                 Request.asgi_response = request["asgi_response"] if "asgi_response" in request else None
 
+
                 tina4_python.tina4_current_request = Request
 
                 old_stdout = sys.stdout  # Memorize the default stdout stream
@@ -159,14 +161,23 @@ 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)
 
-                result = await router_response(request=Request, response=Response.Response)
+                try:
+                    result = await router_response(request=Request, response=Response.Response)
+                except Exception as e:
+                    error_string = tina4_python.global_exception_handler(e)
+                    if Constant.TINA4_LOG_DEBUG in os.getenv("TINA4_DEBUG_LEVEL") or Constant.TINA4_LOG_ALL in os.getenv("TINA4_DEBUG_LEVEL"):
+                        html = Template.render_twig_template("errors/500.twig",
+                                                             {"server": {"url": url}, "error_message": error_string})
+                        return Response.Response(html, Constant.HTTP_SERVER_ERROR, Constant.TEXT_HTML)
+                    else:
+                        return Response.Response(error_string, Constant.HTTP_SERVER_ERROR, Constant.TEXT_HTML)
 
                 # we have found a result ... make sure we reflect this if the user didn't actually put the correct http response code in
                 if result is not None:
@@ -176,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.110 → tina4_python-0.2.112}/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:
@@ -64,6 +64,7 @@ class Webserver:
                     content = b"\r\n" + content
                     data_array = content.split(str.encode(boundary))
                     body = {}
+                    files = {}
                     for data in data_array:
                         data = data.split(b"\r\n\r\n")
                         data_names = data[0].decode("utf-8").split("; ")
@@ -91,12 +92,26 @@ class Webserver:
                                 if "Content-Type" in meta_data:
                                     content_type = meta_data["Content-Type"]
 
-                                body[key_name] = {"file_name": file_name, "content_type": content_type,
-                                                  "content": base64.encodebytes(data_value).decode("utf-8").replace(
-                                                      "\n", "")}
-                    return body
 
-        return {"data": base64.encodebytes(content).decode("utf-8").replace("\n", "")}
+                                if key_name in body:
+                                    body[key_name] = [body[key_name]]
+                                    body[key_name].append({"file_name": file_name, "content_type": content_type,"content": base64.encodebytes(data_value).decode("utf-8").replace(
+                                        "\n", "")})
+                                else:
+                                    body[key_name] = {"file_name": file_name, "content_type": content_type,"content": base64.encodebytes(data_value).decode("utf-8").replace(
+                                        "\n", "")}
+
+                                if key_name in files:
+                                    files[key_name] = [files[key_name]]
+                                    files[key_name].append({"file_name": file_name, "content_type": content_type,"content": base64.encodebytes(data_value).decode("utf-8").replace(
+                                        "\n", "")})
+                                else:
+                                    files[key_name] = {"file_name": file_name, "content_type": content_type,"content": base64.encodebytes(data_value).decode("utf-8").replace(
+                                        "\n", "")}
+
+                    return body, files
+
+        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)
@@ -181,11 +196,12 @@ class Webserver:
 
         content_length = await self.get_content_length()
         if method != Constant.TINA4_GET:
-            body = await self.get_content_body(content_length)
+            body, files = await self.get_content_body(content_length)
         else:
             body = None
+            files = None
 
-        request = {"params": params, "body": body, "raw_data": self.request, "url": self.path, "session": self.session,
+        request = {"params": params, "body": body, "files": files, "raw_data": self.request, "url": self.path, "session": self.session,
                    "headers": self.lowercase_headers, "raw_request": self.request_raw, "raw_content": self.content_raw,
                    "transport": transport, "asgi_response": asgi_response}
 

{tina4_python-0.2.110 → tina4_python-0.2.112}/tina4_python/__init__.py

@@ -82,7 +82,7 @@ def global_exception_handler(exception):
             or debug_level in os.getenv("TINA4_DEBUG_LEVEL", [Constant.TINA4_LOG_ALL])):
         pass
     else:
-        error_string = ""
+        error_string = "An exception happened"
     return error_string
 
 def start_in_thread(target, exception_hook=None):