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

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

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

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

{tina4_python-0.2.109 → tina4_python-0.2.111}/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.109 → tina4_python-0.2.111}/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.109 → tina4_python-0.2.111}/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
@@ -166,7 +168,16 @@ class Router:
                         Request, Response = middleware_runner.call_before_methods(Request, Response)
                         Request, Response = 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:

{tina4_python-0.2.109 → tina4_python-0.2.111}/tina4_python/Session.py

@@ -179,6 +179,88 @@ class SessionRedisHandler(SessionHandler):
             Debug("Session save failure", str(e), Constant.TINA4_LOG_ERROR)
             return False
 
+class SessionValkeyHandler(SessionHandler):
+
+    @staticmethod
+    def __init_valkey():
+        try:
+            valkey = importlib.import_module("valkey")
+        except Exception as e:
+            Debug("Valkey not installed, install with pip/uv", str(e), Constant.TINA4_LOG_ERROR)
+            sys.exit(1)
+
+        params = {
+            "host": os.getenv("TINA4_SESSION_VALKEY_HOST", "localhost"),
+            "port": int(os.getenv("TINA4_SESSION_VALKEY_PORT", 6379)),
+            "decode_responses": True
+        }
+        if os.getenv("TINA4_SESSION_VALKEY_SECRET", ""):
+            params["password"] = os.getenv("TINA4_SESSION_VALKEY_SECRET", "")
+            params["username"] = os.getenv("TINA4_SESSION_VALKEY_USER", "default")
+
+        if os.getenv("TINA4_SESSION_VALKEY_SSL", "False").upper() == "TRUE":
+            params["ssl"] = True
+
+        valkey_instance = valkey.Valkey(**params)
+
+        return valkey_instance
+
+    """
+    Session Valkey Handler
+    """
+    @staticmethod
+    def load(session, _hash):
+        """
+        Loads the Valkey session
+        :param session:
+        :param _hash:
+        :return:
+        """
+        try:
+            session.session_hash = _hash
+            r = SessionValkeyHandler.__init_valkey()
+            token = r.get(_hash)
+            if tina4_python.tina4_auth.valid(token):
+                payload = tina4_python.tina4_auth.get_payload(token)
+                for key in payload:
+                    if key != "expires":
+                        session.set(key, payload[key])
+            else:
+                Debug("Session expired, starting a new one", Constant.TINA4_LOG_DEBUG)
+                session.start(_hash)
+        except Exception:
+            Debug("Valkey not available, sessions will fail", Constant.TINA4_LOG_ERROR)
+
+
+    @staticmethod
+    def close(session):
+        """
+        Closes the Valkey session
+        :param session:
+        :return:
+        """
+        r = SessionValkeyHandler.__init_valkey()
+        try:
+            r.set(session.session_hash, "")
+            return True
+        except Exception:
+            return False
+
+    @staticmethod
+    def save(session):
+        """
+        Saves the Valkey session
+        :param session:
+        :return:
+        """
+        r = SessionValkeyHandler.__init_valkey()
+        try:
+            token = tina4_python.tina4_auth.get_token(payload_data=session.session_values)
+            r.set(session.session_hash, token)
+            return True
+        except Exception as e:
+            Debug("Session save failure", str(e), Constant.TINA4_LOG_ERROR)
+            return False
 
 class Session:
 

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

@@ -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,10 +92,24 @@ 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
+
+                                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", "")}
 
@@ -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.109 → tina4_python-0.2.111}/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):
@@ -279,7 +279,6 @@ async def app(scope, receive, send):
                 webserver.content_raw = b""
             webserver.content_length = parsed_headers_lowercase["content-length"]
             webserver.router_handler = Router()
-            webserver.session = Session
 
             cookie_list = {}
             if "cookie" in webserver.lowercase_headers:
@@ -340,6 +339,7 @@ def webserver(host_name, port):
     :return:
     """
     if os.getenv('TINA4_DEFAULT_WEBSERVER', 'FALSE').upper() == 'TRUE':
+        Debug("Using default webserver", Constant.TINA4_LOG_INFO)
         # runs the built-in webserver (websockets) don't work on windows
         web_server = Webserver(host_name, int(port))  # HTTPServer((host_name, int(port)), Webserver)
         web_server.router_handler = Router()
@@ -354,6 +354,7 @@ def webserver(host_name, port):
         web_server.server_close()
     else:
         # Runs a hyper corn server
+        Debug("Using hypercorn webserver", Constant.TINA4_LOG_INFO)
         try:
             from hypercorn.config import Config
             from hypercorn.asyncio import serve