tina4-python 0.1.52__tar.gz → 0.2.64__tar.gz

{tina4_python-0.1.52 → tina4_python-0.2.64}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: tina4-python
-Version: 0.1.52
+Version: 0.2.64
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com
@@ -9,9 +9,12 @@ 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)
+Requires-Dist: litequeue (>=0.9,<0.10)
 Requires-Dist: mypy (>=0.991,<0.992)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
@@ -56,6 +59,22 @@ If you are developing on Tina4, make sure you copy the public folder from tina4_
 
 ### Installation
 
+Virtual environment
+
+Linux / Mac
+```bash
+python3 -m venv venv
+source ./venv/bin/activate
+pip install poetry
+```
+
+Windows
+```bash
+python -m venv venv
+.\venv\Scripts\activate
+pip install poetry
+```
+
 #### Windows
 
 1.) Install Poetry:
@@ -158,10 +177,10 @@ from tina4_python.Router import get
 from tina4_python.Response import Response
 
 @get("/hello/{name}")
-async def greet(**params):
+async def greet(**params): #(request, response)
    name = params['request'].params['name']
-   return params['response'](f"Hello, {name}!")
- ````
+   return params['response'](f"Hello, {name}!") # return response()
+````
 
 This code creates a route for a GET request to `/hello/{name}`, where `name` is a parameter in the URL. The function `greet` accepts this parameter and responds with a personalized greeting.
 
@@ -201,6 +220,16 @@ async def capture_get(request, response):
 @post("/capture")
 async def capture_post(request, response):
     return response(request.body)
+
+@get("/simple")
+async def simple_get(request, response):
+    print("<h1>Hello World!</h1>")
+
+@get("/redirect")
+async def simple_get(request, response):
+    
+    return response.redirect("/test")
+
 ```
 
 In your ```src/__init__.py``` add the following code
@@ -224,33 +253,150 @@ For ease of use you can supply an `API_KEY` param to your .env with a secret of
 API_KEY=somehash
 ```
 
+### Suppressing the default webservice
+
+You may want to use your Tina4 project as a library in another project so suppressing the default webservice is probably needed.
+
+```.env
+TINA4_DEFAULT_WEBSERVER="False"
+```
+or in your `__init__.py` file
+```python
+import os
+os.environ["TINA4_DEFAULT_WEBSERVER"] = "False"
+```
+Additionally, it will require you to rename `src` to the name of your package
 
 ### Features
-| Completed                  | To Do             |
-|----------------------------|-------------------|
-| Python pip package         |                   |
-| Basic environment handling |                   |
-| Basic routing              | OpenAPI (Swagger) |
-| Enhanced routing           |                   |
-| CSS Support                |                   |
-| Image Support              |                   |
-| Localization               |                   |
-| Error Pages                |                   |
-| Template handling          |                   |
-| Form posting               |                   |
-| JWT tokens & security      |                   |
+| Completed                  | To Do |
+|----------------------------|-------|
+| Python pip package         |       |
+| Basic environment handling |       |
+| Routing with Swagger       |       |
+| Enhanced Routing           |       |
+| CSS Support                |       |
+| Image Support              |       |
+| Localization               |       |
+| Error Pages                |       |
+| Template handling          |       |
+| Form posting               |       |
+| Migrations                 |       |
+| Colored Debugging          |       |
+| Database Abstraction       |       |   
+
+### Database
+
+```bash
+
+Various databases initialised:
+
+dba = Database("sqlite3:test.db", "username", "password")
+dba = Database("mysql:localhost/3306:myschema", "username", "password")
+dba = Database("postgres:localhost/5432:myschema", "username", "password")
+dba = Database("firebird:localhost/3050:/home/database/FIREBIRD.FDB", "username", "password")
+
+NoSQL support (Still to be developed):
+
+dba = Database("mongodb:localhost/27017:mycollection", "username", "password")
+dba = Database("firebase:https://your_storage.firebaseio.com", "username", "password")
+
+Fetching records and passing data as parameters, limit and skip specified:
+
+records = dba.fetch("select * from table where something = ? and something2 = ?", params=["something", "something2"], limit=10, skip=5)
+
+print (records)
+print (records.to_json())
+{
+  id : 1
+  something: "something",
+  something2: "something2"
+}
+
+print(records[0].id)
+1
+
+record = dba.fetch_one("select * from table where something = ? and something2 = ?", params=["something", "something2"])
+
+print(record.id)
+
+print (records.to_json())
+1
+
+
+Executing sql queries:
+
+dba.execute ("update table set something = ? and something2 = ? where id = ?", params=["something", "something2", 1])
+dba.execute ("delete from table where id = ?", params=[1])
+
+
+Starting a transaction:
+
+dba.start_transaction()
+
+
+Rollback a transaction:
+
+dba.roll_back()
+
+
+Commit a transaction:
+
+dba.commit()
+
+
+Select method (Still in development):
+
+dba.select(["id", "something", "something2"], "table_name", filter={"id": 1}, limit=10, skip=0)
+dba.select(["id", "something", "something2"], "table_name", filter=[{"id": 1}, {"id": 2}], limit=10, skip=0)
+dba.select(["id", "something", "sum(id)"])
+   .from(["table"])
+   .join(["tabel2"])
+   .on([""])
+   .and([{"id": 1}])
+   .where({"id" : 2}, "id = ?", [{"id": 2}])
+   .having()
+   .group_by()
+   .order_by(["id"])
+
+
+Updating records - records will be found by primary key specified and then updated:
+
+dba.update(table_name="table_name", records.fromJSON(json_string))
+dba.update(table_name="table_name", records, primary_key="id")
+dba.update(table_name="table_name", record, primary_key="id") # primary key implied by first key value pair
+
+
+Inserting records - pass a dictionary for a single record and a list of dictionaries for multiple records:
+
+dba.insert(table_name="table_name", dba.from_json(json_string))
+dba.insert(table_name="table_name", {"id": 1, "something": "hello", "something2": "world"})
+dba.insert(table_name="table_name", [{"id": 1, "something": "hello", "something2": "world"}, 
+{"id": 2, "something": "hello2", "something2": "world2"}])
+
+
+Deleting records - specify table name. Records can either be found by primary key or filter:
+
+dba.delete("table_name", record, primary_key="id")
+dba.delete("table_name", filter={"id": 1})
+dba.delete("table_name", filter=[{"id": 1}, {"id": 2}])
+
+Migration updates:
+
+   - record count added
+   - Database result object updated
+```
 
 ### Building and Deployment
 
 #### Using Python
 
-1. Building the package:
- ```bash
- python3 -m pip install --upgrade build
- python3 -m build
- python3 -m pip install --upgrade twine
- python3 -m twine upload dist/*
- ```
+Building the package without poetry - you will need to request an API key:
+```bash
+python3 -m pip install --upgrade build
+python3 -m build
+python3 -m pip install --upgrade twine
+python3 -m twine upload dist/*
+```
 
 #### Using Poetry
 
@@ -276,3 +422,13 @@ Flake8 Code tests
 poetry run flake8 ./tina4_python
 ```
 
+### Using queues
+
+```bash
+docker run -d --hostname=my-kafka --name=some-kafka -p 9092:9092 apache/kafka
+```
+
+```bash
+docker run -d --hostname=my-rabbit --name=some-rabbit -p 15672:15672 -p 5672:5672 rabbitmq:3
+```
+

{tina4_python-0.1.52 → tina4_python-0.2.64}/README.md

@@ -36,6 +36,22 @@ If you are developing on Tina4, make sure you copy the public folder from tina4_
 
 ### Installation
 
+Virtual environment
+
+Linux / Mac
+```bash
+python3 -m venv venv
+source ./venv/bin/activate
+pip install poetry
+```
+
+Windows
+```bash
+python -m venv venv
+.\venv\Scripts\activate
+pip install poetry
+```
+
 #### Windows
 
 1.) Install Poetry:
@@ -138,10 +154,10 @@ from tina4_python.Router import get
 from tina4_python.Response import Response
 
 @get("/hello/{name}")
-async def greet(**params):
+async def greet(**params): #(request, response)
    name = params['request'].params['name']
-   return params['response'](f"Hello, {name}!")
- ````
+   return params['response'](f"Hello, {name}!") # return response()
+````
 
 This code creates a route for a GET request to `/hello/{name}`, where `name` is a parameter in the URL. The function `greet` accepts this parameter and responds with a personalized greeting.
 
@@ -181,6 +197,16 @@ async def capture_get(request, response):
 @post("/capture")
 async def capture_post(request, response):
     return response(request.body)
+
+@get("/simple")
+async def simple_get(request, response):
+    print("<h1>Hello World!</h1>")
+
+@get("/redirect")
+async def simple_get(request, response):
+    
+    return response.redirect("/test")
+
 ```
 
 In your ```src/__init__.py``` add the following code
@@ -204,33 +230,150 @@ For ease of use you can supply an `API_KEY` param to your .env with a secret of
 API_KEY=somehash
 ```
 
+### Suppressing the default webservice
+
+You may want to use your Tina4 project as a library in another project so suppressing the default webservice is probably needed.
+
+```.env
+TINA4_DEFAULT_WEBSERVER="False"
+```
+or in your `__init__.py` file
+```python
+import os
+os.environ["TINA4_DEFAULT_WEBSERVER"] = "False"
+```
+Additionally, it will require you to rename `src` to the name of your package
 
 ### Features
-| Completed                  | To Do             |
-|----------------------------|-------------------|
-| Python pip package         |                   |
-| Basic environment handling |                   |
-| Basic routing              | OpenAPI (Swagger) |
-| Enhanced routing           |                   |
-| CSS Support                |                   |
-| Image Support              |                   |
-| Localization               |                   |
-| Error Pages                |                   |
-| Template handling          |                   |
-| Form posting               |                   |
-| JWT tokens & security      |                   |
+| Completed                  | To Do |
+|----------------------------|-------|
+| Python pip package         |       |
+| Basic environment handling |       |
+| Routing with Swagger       |       |
+| Enhanced Routing           |       |
+| CSS Support                |       |
+| Image Support              |       |
+| Localization               |       |
+| Error Pages                |       |
+| Template handling          |       |
+| Form posting               |       |
+| Migrations                 |       |
+| Colored Debugging          |       |
+| Database Abstraction       |       |   
+
+### Database
+
+```bash
+
+Various databases initialised:
+
+dba = Database("sqlite3:test.db", "username", "password")
+dba = Database("mysql:localhost/3306:myschema", "username", "password")
+dba = Database("postgres:localhost/5432:myschema", "username", "password")
+dba = Database("firebird:localhost/3050:/home/database/FIREBIRD.FDB", "username", "password")
+
+NoSQL support (Still to be developed):
+
+dba = Database("mongodb:localhost/27017:mycollection", "username", "password")
+dba = Database("firebase:https://your_storage.firebaseio.com", "username", "password")
+
+Fetching records and passing data as parameters, limit and skip specified:
+
+records = dba.fetch("select * from table where something = ? and something2 = ?", params=["something", "something2"], limit=10, skip=5)
+
+print (records)
+print (records.to_json())
+{
+  id : 1
+  something: "something",
+  something2: "something2"
+}
+
+print(records[0].id)
+1
+
+record = dba.fetch_one("select * from table where something = ? and something2 = ?", params=["something", "something2"])
+
+print(record.id)
+
+print (records.to_json())
+1
+
+
+Executing sql queries:
+
+dba.execute ("update table set something = ? and something2 = ? where id = ?", params=["something", "something2", 1])
+dba.execute ("delete from table where id = ?", params=[1])
+
+
+Starting a transaction:
+
+dba.start_transaction()
+
+
+Rollback a transaction:
+
+dba.roll_back()
+
+
+Commit a transaction:
+
+dba.commit()
+
+
+Select method (Still in development):
+
+dba.select(["id", "something", "something2"], "table_name", filter={"id": 1}, limit=10, skip=0)
+dba.select(["id", "something", "something2"], "table_name", filter=[{"id": 1}, {"id": 2}], limit=10, skip=0)
+dba.select(["id", "something", "sum(id)"])
+   .from(["table"])
+   .join(["tabel2"])
+   .on([""])
+   .and([{"id": 1}])
+   .where({"id" : 2}, "id = ?", [{"id": 2}])
+   .having()
+   .group_by()
+   .order_by(["id"])
+
+
+Updating records - records will be found by primary key specified and then updated:
+
+dba.update(table_name="table_name", records.fromJSON(json_string))
+dba.update(table_name="table_name", records, primary_key="id")
+dba.update(table_name="table_name", record, primary_key="id") # primary key implied by first key value pair
+
+
+Inserting records - pass a dictionary for a single record and a list of dictionaries for multiple records:
+
+dba.insert(table_name="table_name", dba.from_json(json_string))
+dba.insert(table_name="table_name", {"id": 1, "something": "hello", "something2": "world"})
+dba.insert(table_name="table_name", [{"id": 1, "something": "hello", "something2": "world"}, 
+{"id": 2, "something": "hello2", "something2": "world2"}])
+
+
+Deleting records - specify table name. Records can either be found by primary key or filter:
+
+dba.delete("table_name", record, primary_key="id")
+dba.delete("table_name", filter={"id": 1})
+dba.delete("table_name", filter=[{"id": 1}, {"id": 2}])
+
+Migration updates:
+
+   - record count added
+   - Database result object updated
+```
 
 ### Building and Deployment
 
 #### Using Python
 
-1. Building the package:
- ```bash
- python3 -m pip install --upgrade build
- python3 -m build
- python3 -m pip install --upgrade twine
- python3 -m twine upload dist/*
- ```
+Building the package without poetry - you will need to request an API key:
+```bash
+python3 -m pip install --upgrade build
+python3 -m build
+python3 -m pip install --upgrade twine
+python3 -m twine upload dist/*
+```
 
 #### Using Poetry
 
@@ -255,3 +398,13 @@ Flake8 Code tests
 ```
 poetry run flake8 ./tina4_python
 ```
+
+### Using queues
+
+```bash
+docker run -d --hostname=my-kafka --name=some-kafka -p 9092:9092 apache/kafka
+```
+
+```bash
+docker run -d --hostname=my-rabbit --name=some-rabbit -p 15672:15672 -p 5672:5672 rabbitmq:3
+```

{tina4_python-0.1.52 → tina4_python-0.2.64}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.1.52"
+version = "0.2.64"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"
@@ -9,18 +9,24 @@ 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"
 pyjwt = "^2.8.0"
 cryptography = "^42.0.5"
 watchdog = "^4.0.0"
+bcrypt = "^4.1.3"
+litequeue = "^0.9"
 
 [tool.poetry.group.dev.dependencies]
 flake8 = "^7.0.0"
 pytest = "^7.2.0"
 jurigged = "^0.5.3"
+safety = "^3.2.8"
+ruff = "^0.7.0"
+mysql-connector-python = "^9.1.0"
+psycopg2-binary = "^2.9.10"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

{tina4_python-0.1.52 → tina4_python-0.2.64}/tina4_python/Auth.py

@@ -6,8 +6,9 @@
 # flake8: noqa: E501
 import datetime
 import os
-
 import jwt
+import bcrypt
+from json import JSONEncoder
 from cryptography import x509
 from cryptography.x509 import NameOID
 from cryptography.hazmat.primitives import serialization, hashes
@@ -15,6 +16,15 @@ from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.backends import default_backend
 
 
+class AuthJSONSerializer(JSONEncoder):
+    def default(self, o):
+        if isinstance(o, datetime.datetime):
+            return o.isoformat()
+        else:
+            raise TypeError(f'Object of type {o.__class__.__name__} '
+                            f'is not JSON serializable')
+
+
 class Auth:
     secret = None
     private_key = None
@@ -22,6 +32,28 @@ class Auth:
     loaded_private_key = None
     loaded_public_key = None
 
+    def hash_password(self, text):
+        """
+        Generates a Bcrypt password hash
+        :param text:
+        :return:
+        """
+        password_bytes = text.encode('utf-8')
+        # Generate a salt
+        salt = bcrypt.gensalt()
+        # Hash the password
+        return bcrypt.hashpw(password_bytes, salt).decode('utf-8')
+
+    def check_password(self, password_hash, text):
+        """
+        Checks a Bcrypt password hash
+        :param password_hash:
+        :param text:
+        :return:
+        """
+        password_bytes = text.encode('utf-8')
+        return bcrypt.checkpw(password_bytes, password_hash.encode('utf-8'))
+
     def load_private_key(self):
         if self.loaded_private_key:
             return self.loaded_private_key
@@ -104,16 +136,22 @@ 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 = 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,
-            algorithm='RS256'
+            algorithm='RS256',
+            json_encoder=AuthJSONSerializer
         )
 
         return token

{tina4_python-0.1.52 → tina4_python-0.2.64}/tina4_python/Constant.py

@@ -26,10 +26,14 @@ HTTP_BAD_REQUEST = 400
 HTTP_UNAUTHORIZED = 401
 HTTP_FORBIDDEN = 403
 HTTP_NOT_FOUND = 404
+HTTP_REDIRECT = 302
+HTTP_SERVER_ERROR = 500
 
 LOOKUP_HTTP_CODE = {HTTP_OK: "OK", HTTP_CREATED: "Created", HTTP_BAD_REQUEST: "Bad Request",
                     HTTP_PARTIAL_CONTENT: "Partial Content", HTTP_UNAUTHORIZED: "Unauthorized",
-                    HTTP_FORBIDDEN: "Forbidden", HTTP_NOT_FOUND: "Not Found", HTTP_NO_CONTENT: "No Content"}
+                    HTTP_FORBIDDEN: "Forbidden", HTTP_NOT_FOUND: "Not Found", HTTP_NO_CONTENT: "No Content",
+                    HTTP_REDIRECT: "Redirect",
+                    HTTP_SERVER_ERROR: "Internal Server Error"}
 
 TEXT_HTML = "text/html"
 TEXT_CSS = "text/css"