tina4-python 0.2.29__tar.gz → 0.2.31__tar.gz

{tina4_python-0.2.29 → tina4_python-0.2.31}/PKG-INFO

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

{tina4_python-0.2.29 → tina4_python-0.2.31}/pyproject.toml

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

{tina4_python-0.2.29 → tina4_python-0.2.31}/tina4_python/Database.py

@@ -16,7 +16,7 @@ from tina4_python.DatabaseResult import DatabaseResult
 class Database:
     SQLITE = "sqlite3"
     FIREBIRD = "firebird.driver"
-    MYSQL = "mysql"
+    MYSQL = "mysql.connector"
     POSTGRES = "postgres"
 
     def __init__(self, _connection_string, _username="", _password=""):
@@ -39,8 +39,7 @@ class Database:
             self.dba = self.database_module.connect(self.database_path)
             self.port = None
             self.host = None
-
-        if self.database_engine == self.FIREBIRD:
+        elif self.database_engine == self.FIREBIRD:
             # <host>/<port>:<file>
             temp_params = self.database_path.split(":", 1)
             host_port = temp_params[0].split("/", 1)
@@ -57,10 +56,32 @@ class Database:
                 user=self.username,
                 password=self.password
             )
+        else:
+            temp_params = self.database_path.split(":", 1)
+            host_port = temp_params[0].split("/", 1)
+            self.host = host_port[0]
+            if len(host_port) > 1:
+                self.port = int(host_port[1])
+            else:
+                self.port = 0
+
+            self.database_path = temp_params[1]
+
+            self.dba = self.database_module.connect(
+                database=self.database_path,
+                port=self.port,
+                host=self.host,
+                user=self.username,
+                password=self.password
+            )
 
         Debug("DATABASE:", self.database_module, self.host, self.port, self.database_path, self.username,
               Constant.TINA4_LOG_DEBUG)
 
+    def database_exists(self, database_name):
+
+        return True
+
     def current_timestamp(self):
         """
         Gets the current timestamp based on the database being used
@@ -103,14 +124,15 @@ class Database:
         """
         # modify the select statement for limit and skip
         if self.database_engine == self.FIREBIRD:
-            sql = f"select first {limit} skip {skip} * from ({sql})"
+            sql = f"select first {limit} skip {skip} * from ({sql}) as t"
         elif self.database_engine == self.SQLITE:
-            sql = f"select * from ({sql}) limit {skip},{limit}"
+            sql = f"select * from ({sql}) as t limit {skip},{limit}"
         else:
-            sql = f"select * from ({sql}) limit {skip},{limit}"
+            sql = f"select * from ({sql}) as t limit {skip},{limit}"
 
         cursor = self.dba.cursor()
         try:
+            sql = self.parse_place_holders(sql)
             cursor.execute(sql, params)
             return self.get_database_result(cursor)
         except Exception as e:
@@ -126,6 +148,7 @@ class Database:
         :return:
         """
         # Calling the fetch method with limit as 1 and returning the result
+        sql = self.parse_place_holders(sql)
         record = self.fetch(sql, params=params, limit=1, skip=skip)
         if record.error is None and record.count == 1:
             data = {}
@@ -141,6 +164,19 @@ class Database:
         else:
             return None
 
+    def parse_place_holders(self, sql):
+        """
+        Sanitizes a sql statement to replace param chars with the appropriate placeholders
+        MYSQL expects %s and firebird, posgres and sqlite expect ?
+        :param sql:
+        :return:
+        """
+
+        if self.database_engine == self.MYSQL:
+            return sql.replace("?", "%s")
+        else:
+            return sql.replace("%s", "?")
+
     def execute(self, sql, params=()):
         """
         Execute a query based on a sql statement
@@ -148,13 +184,18 @@ class Database:
         :param params:
         :return:
         """
+        sql = self.parse_place_holders(sql)
         cursor = self.dba.cursor()
         # Running an execute statement and committing any changes to the database
         try:
             cursor.execute(sql, params)
-            if "returning" in sql:
+            if "returning" in sql.lower():
                 return self.get_database_result(cursor)
             else:
+                # see if we are mysql and if we are insert statement to get the last record
+                if "insert" in sql.lower() and self.database_engine == self.MYSQL:
+                    return DatabaseResult([{"id": cursor.lastrowid}], [], None)
+
                 # On success return an empty result set with no error
                 return DatabaseResult(None, [], None)
         except Exception as e:
@@ -169,6 +210,7 @@ class Database:
         :param params:
         :return:
         """
+        sql = self.parse_place_holders(sql)
         cursor = self.dba.cursor()
         # Running an execute statement and committing any changes to the database
         try:
@@ -246,7 +288,9 @@ class Database:
 
             sql = f"INSERT INTO {table_name} ({columns}) VALUES ({placeholders})"
 
-            sql += f" returning ({primary_key})"
+            if self.database_engine == self.FIREBIRD or self.database_engine == self.SQLITE:
+                sql += f" returning ({primary_key})"
+
             records = DatabaseResult()
             for record in data:
                 record = self.sanitize(record)

{tina4_python-0.2.29 → tina4_python-0.2.31}/tina4_python/Router.py

@@ -11,10 +11,10 @@ import os
 import sys
 import io
 import tina4_python
-from tina4_python import Constant
-from tina4_python.Debug import Debug
+from tina4_python import Constant,Auth
 from tina4_python import Response
 from tina4_python import Request
+from tina4_python.Debug import Debug
 from tina4_python.Template import Template
 from tina4_python.MiddleWare import MiddleWare
 
@@ -107,6 +107,7 @@ class Router:
                 return Response.Response(content, Constant.HTTP_FORBIDDEN, Constant.TEXT_HTML)
             else:
                 if request["body"] is not None and "formToken" in request["body"]:
+                    request["params"]["formToken"] = request["body"]["formToken"]
                     del request["body"]["formToken"]
 
         # split URL and extract query string
@@ -181,6 +182,7 @@ class Router:
                         Request, result = middleware_runner.call_any_methods(Request, result)
 
                 if result is not None:
+                    result.headers["FreshToken"] = tina4_python.tina4_auth.get_token({"path": url})
                     if "cache" in route and route["cache"] is not None:
                         if not route["cache"]["cached"]:
                             result.headers["Cache-Control"] = "max-age=1, must-revalidate"
@@ -196,12 +198,14 @@ class Router:
                 break
 
         if result is None and old_stdout is not None:
+            result = Response
+            result.headers["FreshToken"] = tina4_python.tina4_auth.get_token({"path": url})
             sys.stdout = old_stdout
             if buffer.getvalue() != "":
                 try:
-                    return Response.Response(json.loads(buffer.getvalue()), Constant.HTTP_OK, Constant.APPLICATION_JSON)
+                    return Response.Response(json.loads(buffer.getvalue()), Constant.HTTP_OK, Constant.APPLICATION_JSON, result.headers)
                 except:
-                    return Response.Response(buffer.getvalue(), Constant.HTTP_OK, Constant.TEXT_HTML)
+                    return Response.Response(buffer.getvalue(), Constant.HTTP_OK, Constant.TEXT_HTML, result.headers)
             else:
                 result = Response
                 result.http_code = Constant.HTTP_NOT_FOUND
@@ -223,6 +227,7 @@ class Router:
                           tina4_python.root_path + os.sep + "src" + os.sep + "templates" + os.sep + twig_file,
                           Constant.TINA4_LOG_DEBUG)
 
+                    result.headers["FreshToken"] = tina4_python.tina4_auth.get_token({"path": url})
                     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})
@@ -234,6 +239,7 @@ class Router:
                 "errors/404.twig", {"server": {"url": url}})
             return Response.Response(content, Constant.HTTP_NOT_FOUND, Constant.TEXT_HTML)
 
+        result.headers["FreshToken"] = tina4_python.tina4_auth.get_token({"path": url})
         return result
 
     @staticmethod

{tina4_python-0.2.29 → tina4_python-0.2.31}/tina4_python/__init__.py

@@ -186,6 +186,8 @@ async def get_swagger_json(request, response):
 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 = html.replace("{SWAGGER_ROUTE}", os.getenv("SWAGGER_ROUTE", "/swagger"))
     return response(html)
 
 

{tina4_python-0.2.29 → tina4_python-0.2.31}/tina4_python/public/swagger/index.html

@@ -71,7 +71,7 @@
 
         // Build a system
         const ui = SwaggerUIBundle({
-            url: "/swagger/swagger.json",
+            url: "{SWAGGER_ROUTE}/swagger.json",
             dom_id: '#swagger-ui',
             deepLinking: true,
             presets: [
@@ -87,4 +87,4 @@
 </script>
 </body>
 
-</html>
+</html>