tina4-python 0.2.83__tar.gz → 0.2.85__tar.gz

{tina4_python-0.2.83 → tina4_python-0.2.85}/PKG-INFO

@@ -1,15 +1,17 @@
 Metadata-Version: 2.3
 Name: tina4-python
-Version: 0.2.83
+Version: 0.2.85
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com
-Requires-Python: >=3.12,<4.0
+Requires-Python: >3.10,<4.0
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: bcrypt (>=4.2.1,<5.0.0)
 Requires-Dist: cryptography (>=44.0.0,<45.0.0)
+Requires-Dist: flake8 (>=7.1.1,<8.0.0)
 Requires-Dist: hypercorn (>=0.17.3,<0.18.0)
 Requires-Dist: jinja2 (>=3.1.5,<4.0.0)
 Requires-Dist: libsass (>=0.23.0,<0.24.0)

{tina4_python-0.2.83 → tina4_python-0.2.85}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "tina4-python"
-version = "0.2.83"
+version = "0.2.85"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}
 ]
 readme = "README.md"
-requires-python = ">=3.12,<4.0"
+requires-python = ">3.10,<4.0"
 dependencies = [
     "jinja2 (>=3.1.5,<4.0.0)",
     "libsass (>=0.23.0,<0.24.0)",
@@ -17,8 +17,9 @@ dependencies = [
     "bcrypt (>=4.2.1,<5.0.0)",
     "litequeue (>=0.9,<0.10)",
     "simple-websocket (>=1.1.0,<2.0.0)",
-    "poetry-plugin-export (>=1.9.0,<2.0.0)",
-    "hypercorn (>=0.17.3,<0.18.0)"
+    "hypercorn (>=0.17.3,<0.18.0)",
+    "flake8 (>=7.1.1,<8.0.0)",
+    "poetry-plugin-export (>=1.9.0,<2.0.0)"
 ]
 
 
@@ -26,6 +27,9 @@ dependencies = [
 requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.poetry.requires-plugins]
+poetry-plugin-export = ">=1.8"
+
 [tool.poetry.group.dev.dependencies]
 flake8 = "^7.1.1"
 pytest = "^8.3.4"

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Auth.py

@@ -140,7 +140,7 @@ class Auth:
         private_key = self.load_private_key()
         now = datetime.datetime.now()
 
-        if not "expires" in payload_data:
+        if "expires" not in payload_data:
             token_limit_minutes = int(os.environ.get("TINA4_TOKEN_LIMIT", 2))
             if expiry_minutes != 0:
                 token_limit_minutes  = expiry_minutes

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Database.py

@@ -34,7 +34,7 @@ class Database:
 
         try:
             self.database_module = importlib.import_module(params[0])
-        except Exception as e:
+        except Exception:
             install_message = "What driver are we working with?"
             if params[0] == Database.SQLITE:
                 install_message = "Your python is missing the sqlite3 module, please reinstall or update"
@@ -219,7 +219,7 @@ class Database:
         """
         try:
             json.loads(myjson)
-        except Exception as e:
+        except Exception:
             return False
         return True
 

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/ORM.py

@@ -7,11 +7,10 @@
 import base64
 from datetime import datetime, date
 import inspect
-import sys
 import ast
 import json
 import os
-from tina4_python.Constant import TINA4_LOG_ERROR, TINA4_LOG_INFO
+from tina4_python.Constant import TINA4_LOG_ERROR
 from tina4_python.Debug import Debug
 
 
@@ -37,7 +36,7 @@ def orm(dba):
                 Debug('from src.orm.' + mod_name + ' import ' + mod_name)
                 exec('from src.orm.' + mod_name + ' import ' + mod_name+"\n"+mod_name + ".__dba__ = dba")
             except Exception as e:
-                Debug("Failed to import " + mod_name)
+                Debug("Failed to import " + mod_name, str(e))
     classes = find_all_sub_classes(ORM)
     for a_class in classes:
         a_class.__dba__ = dba
@@ -134,7 +133,7 @@ class DateTimeField(BaseField):
     default_value = datetime.now()
 
     def get_definition(self):
-        return self.column_name.lower() + " timestamp";
+        return self.column_name.lower() + " timestamp"
 
 
 class IntegerField(BaseField):

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Queue.py

@@ -230,7 +230,7 @@ class Queue(object):
                         )
                         delivery_callback(self.consumer, err, response_msg_internal)
 
-                self.producer.produce(self.topic, json.dumps(body), user_id, callback=kafka_delivery_callback)
+                self.producer.produce(prefix+self.topic, json.dumps(body), user_id, callback=kafka_delivery_callback)
                 self.producer.poll(1000)
                 self.producer.flush()
             except Exception as e:

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Request.py

@@ -4,8 +4,6 @@
 # License: MIT https://opensource.org/licenses/MIT
 #
 # flake8: noqa: E501
-import inspect
-
 request = None
 body = None
 params = {}

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Response.py

@@ -9,7 +9,6 @@ import inspect
 from types import ModuleType
 from tina4_python import Constant
 from tina4_python import DatabaseResult
-from tina4_python.Debug import Debug
 from tina4_python.ORM import ORM
 
 headers = {}

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Router.py

@@ -11,7 +11,7 @@ import os
 import sys
 import io
 import tina4_python
-from tina4_python import Constant,Auth
+from tina4_python import Constant
 from tina4_python import Response
 from tina4_python import Request
 from tina4_python.Debug import Debug
@@ -206,7 +206,7 @@ class Router:
             if buffer.getvalue() != "":
                 try:
                     return Response.Response(json.loads(buffer.getvalue()), Constant.HTTP_OK, Constant.APPLICATION_JSON, result.headers)
-                except:
+                except Exception:
                     return Response.Response(buffer.getvalue(), Constant.HTTP_OK, Constant.TEXT_HTML, result.headers)
             else:
                 result = Response
@@ -259,7 +259,7 @@ class Router:
     @staticmethod
     def add(method, route, callback):
         Debug("Adding a route: " + route, Constant.TINA4_LOG_DEBUG)
-        if not callback in tina4_python.tina4_routes:
+        if callback not in tina4_python.tina4_routes:
             tina4_python.tina4_routes[callback] = {"route": route, "callback": callback, "method": method,
                                                    "swagger": None, "cached": False}
         else:

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Session.py

@@ -5,7 +5,6 @@
 #
 # flake8: noqa: E501
 import os
-import json
 from http import cookies
 import sys
 import importlib
@@ -29,7 +28,7 @@ class SessionHandler(object):
             session.session_values[_key] = _value
             session.save()
             return True
-        except:
+        except Exception:
             return False
 
     @staticmethod
@@ -85,7 +84,7 @@ class SessionFileHandler(SessionHandler):
             if os.path.isfile(session.session_path + os.sep + session.session_hash):
                 os.remove(session.session_path + os.sep + session.session_hash)
             return True
-        except:
+        except Exception:
             return False
 
     @staticmethod
@@ -109,7 +108,7 @@ class SessionRedisHandler(SessionHandler):
         try:
             redis = importlib.import_module("redis")
         except Exception as e:
-            Debug("Redis not installed, install with pip install redis or poetry add redis", Constant.TINA4_LOG_ERROR)
+            Debug("Redis not installed, install with pip install redis or poetry add redis", str(e), Constant.TINA4_LOG_ERROR)
             sys.exit(1)
 
         redis_instance = redis.Redis(host=os.getenv("TINA4_SESSION_REDIS_HOST", "localhost"), port=os.getenv("TINA4_SESSION_REDIS_PORT",6379), decode_responses=True)
@@ -139,7 +138,7 @@ class SessionRedisHandler(SessionHandler):
             else:
                 Debug("Session expired, starting a new one", Constant.TINA4_LOG_DEBUG)
                 session.start(_hash)
-        except:
+        except Exception:
             Debug("Redis not available, sessions will fail", Constant.TINA4_LOG_ERROR)
 
 
@@ -154,7 +153,7 @@ class SessionRedisHandler(SessionHandler):
         try:
             r.set(session.session_hash, "")
             return True
-        except:
+        except Exception:
             return False
 
     @staticmethod

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Swagger.py

@@ -4,9 +4,10 @@
 # License: MIT https://opensource.org/licenses/MIT
 #
 # flake8: noqa: E501
-import os, re
+import os
+import re
 import tina4_python
-from tina4_python import Messages, Constant
+from tina4_python import Constant, Debug
 
 
 class Swagger:
@@ -57,6 +58,7 @@ class Swagger:
             for variable in variables:
                 params.append({"name": variable, "in": "path", "type": "string"})
         except Exception as e:
+            Debug.error("Failed to parse path inputs", str(e))
             return []
 
         return params
@@ -74,7 +76,7 @@ class Swagger:
 
         secure_annotation = [],
         if security:
-            secure_annotation = [{"bearerAuth": []}];
+            secure_annotation = [{"bearerAuth": []}]
 
         new_params = []
         for param in params:
@@ -102,7 +104,7 @@ class Swagger:
             },
             "security": secure_annotation,
             "responses": responses
-        };
+        }
 
         if method == Constant.TINA4_GET or example is None:
             del entry["requestBody"]
@@ -111,17 +113,17 @@ class Swagger:
 
     @staticmethod
     def parse_swagger(swagger):
-        if not "tags" in swagger:
+        if "tags" not in swagger:
             swagger["tags"] = []
-        if not "params" in swagger:
+        if "params" not in swagger:
             swagger["params"] = []
-        if not "description" in swagger:
+        if "description" not in swagger:
             swagger["description"] = ""
-        if not "summary" in swagger:
+        if "summary" not in swagger:
             swagger["summary"] = ""
-        if not "example" in swagger:
+        if "example" not in swagger:
             swagger["example"] = None
-        if not "secure" in swagger:
+        if "secure" not in swagger:
             swagger["secure"] = None
 
         if isinstance(swagger["tags"], str):
@@ -137,14 +139,12 @@ class Swagger:
             if "swagger" in route:
                 if route["swagger"] is not None:
                     swagger = Swagger.parse_swagger(route["swagger"])
-                    produces = {}
-
                     responses = {
                         "200": {"description": "Success"},
                         "400": {"description": "Failed"}
                     }
 
-                    if not route["route"] in paths:
+                    if route["route"] not in paths:
                         paths[route["route"]] = {}
                     paths[route["route"]][route["method"].lower()] = Swagger.get_swagger_entry(route["route"],
                                                                                                route["method"].lower(),

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Template.py

@@ -4,7 +4,8 @@
 # License: MIT https://opensource.org/licenses/MIT
 #
 # flake8: noqa: E501
-import os, json
+import os
+import json
 import tina4_python
 from tina4_python import Constant
 from tina4_python.Debug import Debug

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/Webserver.py

@@ -23,7 +23,7 @@ from tina4_python.Template import Template
 
 def is_int(v):
     try:
-        f = int(v)
+        int(v)
     except ValueError:
         return False
     return True
@@ -53,7 +53,7 @@ class Webserver:
                 # print("CONTENT", content, self.request)
                 try:
                     return json.loads(content)
-                except:
+                except Exception:
                     return content.decode("utf-8")
             elif self.lowercase_headers["content-type"] == "text/plain":
                 return content.decode("utf-8")
@@ -237,7 +237,7 @@ class Webserver:
     async def get_data(self, reader):
         try:
             raw_data = await reader.readuntil(b"\r\n\r\n")
-        except:
+        except Exception:
             raw_data = await reader.read(128)
 
         protocol = raw_data.decode("utf-8").split("\r\n", 1)[0]
@@ -267,7 +267,7 @@ class Webserver:
                     break
             try:
                 content = content_data.decode("utf-8")
-            except:  # probably binary or multipart form?
+            except Exception:  # probably binary or multipart form?
                 content = content_data
 
         return protocol, headers, lowercase_headers, content, raw_data, content_data
@@ -353,6 +353,7 @@ class Webserver:
                             await writer.drain()
                         writer.close()
                     except BrokenPipeError as e:
+                        Debug.warning("Socket connection broken: " + str(e))
                         # socket got terminated
                         pass
                 else:

{tina4_python-0.2.83 → tina4_python-0.2.85}/tina4_python/__init__.py

@@ -20,7 +20,7 @@ from tina4_python import Messages, Constant
 from tina4_python.Swagger import Swagger
 from tina4_python.Env import load_env
 from tina4_python.Webserver import Webserver
-from tina4_python.Router import Router, get
+from tina4_python.Router import Router
 from tina4_python.Localization import localize
 from tina4_python.Auth import Auth
 from tina4_python.Debug import Debug
@@ -344,7 +344,7 @@ def webserver(host_name, port):
             config = Config()
             config.bind = [host_name+":"+str(port)]
             asyncio.run(serve(app, config))
-        except Exception:
+        except Exception as e:
             Debug("Not running Hypercorn webserver", str(e), Constant.TINA4_LOG_WARNING)