tina4-python 0.2.26__tar.gz → 0.2.28__tar.gz

{tina4_python-0.2.26 → tina4_python-0.2.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tina4-python
-Version: 0.2.26
+Version: 0.2.28
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com
@@ -9,7 +9,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: Jinja2 (>=3.0.3,<4.0.0)
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: Jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: bcrypt (>=4.1.3,<5.0.0)
 Requires-Dist: cryptography (>=42.0.5,<43.0.0)
 Requires-Dist: libsass (>=0.22.0,<0.23.0)

{tina4_python-0.2.26 → tina4_python-0.2.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.2.26"
+version = "0.2.28"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"
@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-Jinja2 = "^3.0.3"
+Jinja2 = "^3.1.4"
 mypy = "^0.991"
 libsass = "^0.22.0"
 python-dotenv = "^1.0.1"
@@ -22,6 +22,8 @@ bcrypt = "^4.1.3"
 flake8 = "^7.0.0"
 pytest = "^7.2.0"
 jurigged = "^0.5.3"
+safety = "^3.2.8"
+ruff = "^0.7.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

{tina4_python-0.2.26 → tina4_python-0.2.28}/tina4_python/Auth.py

@@ -127,12 +127,17 @@ class Auth:
             with open(self.self_signed, "wb") as f:
                 f.write(cert.public_bytes(serialization.Encoding.PEM))
 
-    def get_token(self, payload_data):
+    def get_token(self, payload_data, expiry_minutes=0):
         private_key = self.load_private_key()
         now = datetime.datetime.now()
-        token_limit_minutes = int(os.environ.get("TINA4_TOKEN_LIMIT", 2))
-        expiry_time = now + datetime.timedelta(minutes=token_limit_minutes)
-        payload_data["expires"] = expiry_time.isoformat()
+
+        if not "expires" in payload_data:
+            token_limit_minutes = int(os.environ.get("TINA4_TOKEN_LIMIT", 2))
+            if expiry_minutes != 0:
+                token_limit_minutes  = expiry_minutes
+            expiry_time = now + datetime.timedelta(minutes=token_limit_minutes)
+            payload_data["expires"] = expiry_time.isoformat()
+
         token = jwt.encode(
             payload=payload_data,
             key=private_key,

{tina4_python-0.2.26 → tina4_python-0.2.28}/tina4_python/Router.py

@@ -65,9 +65,9 @@ class Router:
 
         Response.headers = {}
         Response.content = ""
-        Response.http_code = Constant.HTTP_OK
+        Response.http_code = Constant.HTTP_NOT_FOUND
         Response.content_type = Constant.TEXT_HTML
-        result = None
+        result = Response
 
         Debug("Root Path " + tina4_python.root_path + " " + url, method, Constant.TINA4_LOG_DEBUG)
         tina4_python.tina4_current_request["url"] = url
@@ -165,6 +165,11 @@ class Router:
 
                 result = await router_response(request=Request, response=Response.Response)
 
+                # 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:
+                    if result.http_code == Constant.HTTP_NOT_FOUND:
+                        result.http_code = Constant.HTTP_OK
+
                 if "middleware" in route:
                     middleware_runner = MiddleWare(route["middleware"]["class"])
 
@@ -190,36 +195,39 @@ class Router:
 
                 break
 
-        if result is None:
-            if old_stdout is not None:
-                sys.stdout = old_stdout
+        if result is None and old_stdout is not None:
+            sys.stdout = old_stdout
+            if buffer.getvalue() != "":
+                try:
+                    return Response.Response(json.loads(buffer.getvalue()), Constant.HTTP_OK, Constant.APPLICATION_JSON)
+                except:
+                    return Response.Response(buffer.getvalue(), Constant.HTTP_OK, Constant.TEXT_HTML)
             else:
-                sys.stdout = buffer = io.StringIO()
-
-            try:
-                return Response.Response(json.loads(buffer.getvalue()), Constant.HTTP_OK, Constant.APPLICATION_JSON)
-            except:
-                return Response.Response(buffer.getvalue(), Constant.HTTP_OK, Constant.TEXT_HTML)
+                result = Response
+                result.http_code = Constant.HTTP_NOT_FOUND
 
         # If no route is matched, serve 404
         if result.http_code == Constant.HTTP_NOT_FOUND:
             # Serve twigs if the files exist
+            twig_files = []
             if url == "/":
-                twig_file = "index.twig"
+                twig_files.append("index.twig")
             else:
-                twig_file = url + ".twig"
+                twig_files.append(url + ".twig")
+                twig_files.append(url + "index.twig")
 
             # see if we can find the twig file
-            if os.path.isfile(tina4_python.root_path + os.sep + "src" + os.sep + "templates" + os.sep + twig_file):
-                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.Response(content, Constant.HTTP_OK, Constant.TEXT_HTML, result.headers)
+            for twig_file in twig_files:
+                if os.path.isfile(tina4_python.root_path + os.sep + "src" + os.sep + "templates" + os.sep + twig_file):
+                    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.Response(content, Constant.HTTP_OK, Constant.TEXT_HTML, result.headers)
 
         if result.http_code == Constant.HTTP_NOT_FOUND:
             content = Template.render_twig_template(

{tina4_python-0.2.26 → tina4_python-0.2.28}/tina4_python/Webserver.py

@@ -8,7 +8,7 @@ import asyncio
 import base64
 import json
 import os
-import sys
+import re
 from urllib.parse import unquote_plus
 from urllib.parse import urlparse, parse_qsl
 import tina4_python
@@ -16,6 +16,13 @@ from tina4_python import Constant
 from tina4_python.Constant import HTTP_REDIRECT
 from tina4_python.Session import Session
 
+def is_int(v):
+    try:
+        f=int(v)
+    except ValueError:
+        return False
+    return True
+
 
 class Webserver:
     async def get_content_length(self):
@@ -102,23 +109,66 @@ class Webserver:
             headers = await self.get_headers(headers, self.response_protocol, Constant.HTTP_OK)
             return headers
 
-
         params = dict(parse_qsl(urlparse(self.path).query, keep_blank_values=True))
 
+        new_params = {}
+        new_params.update(params)
+
+        for key, value in params.items():
+            regex = r"(\w+)"
+            matches = re.finditer(regex, key)
+            start_var = new_params
+            var_names = []
+            for matchNum, match in enumerate(matches, start=0):
+                if is_int(match.group()):
+                    var_names.append(int(match.group()))
+                else:
+                    var_names.append(match.group())
+
+            counter = 0
+
+            while counter < len(var_names):
+                var_name = var_names[counter]
+                if not is_int(var_name):
+                    if isinstance(start_var, dict) and var_name in start_var:
+                        start_var = start_var[var_name]
+                    else:
+                        if counter+1 < len(var_names) and is_int(var_names[counter+1]) :
+                            if var_name not in start_var:
+                                start_var[var_name] = []
+                            start_var = start_var[var_name]
+                        else:
+                            if counter-1 > 0 and is_int(var_names[counter-1]):
+                                index = int(var_names[counter-1])
+                                new_value = {var_name: value}
+                                if index in range(len(start_var)):
+                                    start_var[index].update(new_value)
+                                else:
+                                    while len(start_var) < index:
+                                        start_var.append({})
+                                    start_var.append(new_value)
+                                start_var = start_var[index]
+                            else:
+                                if isinstance(start_var, dict):
+                                    start_var[var_name] = value
+                                    start_var = start_var[var_name]
+
+                counter += 1
+
+        params.update(new_params)
         content_length = await self.get_content_length()
         if method != Constant.TINA4_GET:
             body = await self.get_content_body(content_length)
         else:
             body = None
 
-        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}
+        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",

{tina4_python-0.2.26 → tina4_python-0.2.28}/tina4_python/__init__.py

@@ -45,7 +45,6 @@ load_env(environment)
 
 print(ShellColors.bright_yellow + "Setting debug mode", os.getenv("TINA4_DEBUG_LEVEL"), ShellColors.end)
 
-
 if importlib.util.find_spec("jurigged"):
     import jurigged
 
@@ -61,7 +60,6 @@ localize()
 Debug(Messages.MSG_ASSUMING_ROOT_PATH.format(root_path=root_path, library_path=library_path),
       Constant.TINA4_LOG_INFO)
 
-
 tina4_routes = {}
 tina4_current_request = {}
 tina4_api_key = None
@@ -139,6 +137,7 @@ if os.path.exists(root_path + os.sep + "src" + os.sep + "app"):
 else:
     Debug("Missing src/app folder", Constant.TINA4_LOG_WARNING)
 
+
 # compile sass
 def compile_scss():
     try:
@@ -168,23 +167,28 @@ if os.path.exists(root_path + os.sep + "src" + os.sep + "scss"):
 else:
     Debug("Missing scss folder", Constant.TINA4_LOG_WARNING)
 
+
 # end compile sass
 
 
 def file_get_contents(file_path):
     return Path(file_path).read_text()
 
+
 # Add swagger routes
-@get("/swagger/swagger.json")
+@get(os.getenv("SWAGGER_ROUTE", "/swagger")+"/swagger.json")
 async def get_swagger_json(request, response):
     json = Swagger.get_json(request)
     return response(json)
 
-@get("/swagger")
+
+@get(os.getenv("SWAGGER_ROUTE", "/swagger"))
 async def get_swagger(request, response):
-    html = file_get_contents(root_path + os.sep +"src"+os.sep+"public"+ os.sep+"swagger"+os.sep+"index.html")
+    html = file_get_contents(
+        root_path + os.sep + "src" + os.sep + "public" + os.sep + "swagger" + os.sep + "index.html")
     return response(html)
 
+
 def webserver(host_name, port):
     web_server = Webserver(host_name, int(port))  # HTTPServer((host_name, int(port)), Webserver)
     web_server.router_handler = Router()
@@ -204,7 +208,8 @@ def run_web_server(in_hostname="localhost", in_port=7145):
     Debug(Messages.MSG_STARTING_WEBSERVER.format(port=in_port), Constant.TINA4_LOG_INFO)
     webserver(in_hostname, in_port)
 
-if os.getenv('TINA4_DEFAULT_WEBSERVER', 'True') == 'True' :
+
+if os.getenv('TINA4_DEFAULT_WEBSERVER', 'True') == 'True':
     if importlib.util.find_spec("jurigged"):
         Debug("Jurigged enabled", Constant.TINA4_LOG_INFO)
         jurigged.watch("./")

tina4_python-0.2.26/tina4_python/.env

@@ -1,7 +0,0 @@
-# Project Settings
-PROJECT_NAME="My Project"
-VERSION=1.0.0
-TINA4_LANGUAGE=en
-TINA4_SECRET=ABCDEF
-TINA4_DEBUG_LEVEL=[TINA4_LOG_ALL]
-API_KEY=f9ca99e18c7bce9c6852df4257a3280b