tina4-python 0.1.45__tar.gz → 0.1.46__tar.gz

{tina4_python-0.1.45 → tina4_python-0.1.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tina4-python
-Version: 0.1.45
+Version: 0.1.46
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com
@@ -40,6 +40,7 @@ After installing poetry you can do the following:
 poetry new project-name
 cd project-name
 poetry add tina4_python
+poetry add jurigged
 ```
 Create an entry point for Tina4 called ```app.py``` and add the following to the file
 ```python
@@ -85,30 +86,33 @@ After defining templates and routes, run the Tina4Python server:
 
 - **Normal Server**:
 ```bash
-poetry run
+poetry run python app.py
 ```
 
 - **Server with Hot Reloading**:
 ```bash
-poetry run jurigged main.py
+poetry run jurigged app.py
 ```
 
 - **Server on a Specific Port**:
 ```bash
-poetry run app.py 7777
+poetry run python app.py 7777
+```
+
+- **Server to not autostart **:
+```bash
+poetry run python app.py manual
 ```
   
 - **Server with alternate language** (for example fr = French):
 ```bash
-poetry run main.py fr
+poetry run python app.py fr
 ```
 
 Add more translations by going [here](TRANSLATIONS.md)
 
 ### Templating
-
-
-Tina4 uses [Twig](https://twig.symfony.com/) templating to provide a simple and efficient way to create web pages.
+Tina4 uses Jinja2 (Twig) templating to provide a simple and efficient way to create web pages.
 
 1.) **Twig Files**: Add your Twig files within the `src/templates` folder. For instance, you might create files like `index.twig`, `base.twig`, etc., containing your HTML structure with Twig templating syntax for dynamic content.
 
@@ -219,18 +223,21 @@ For ease of use you can supply an `API_KEY` param to your .env with a secret of
 API_KEY=somehash
 ```
 
+
 ### Features
-| Completed                  | To Do                            |
-|----------------------------|----------------------------------|
-| Python pip package         | Implement JWT for token handling |
-| Basic environment handling |                                  |
-| Basic routing              | OpenAPI (Swagger)                |
-| Enhanced routing           |                                  |
-| CSS Support                |                                  |
-| Image Support              |                                  |
-| Localization               |                                  |
-| Error Pages                |                                  |
-| Template handling          |                                  |
+| 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      |                   |
 
 ### Building and Deployment
 

{tina4_python-0.1.45 → tina4_python-0.1.46}/README.md

@@ -21,6 +21,7 @@ After installing poetry you can do the following:
 poetry new project-name
 cd project-name
 poetry add tina4_python
+poetry add jurigged
 ```
 Create an entry point for Tina4 called ```app.py``` and add the following to the file
 ```python
@@ -66,30 +67,33 @@ After defining templates and routes, run the Tina4Python server:
 
 - **Normal Server**:
 ```bash
-poetry run
+poetry run python app.py
 ```
 
 - **Server with Hot Reloading**:
 ```bash
-poetry run jurigged main.py
+poetry run jurigged app.py
 ```
 
 - **Server on a Specific Port**:
 ```bash
-poetry run app.py 7777
+poetry run python app.py 7777
+```
+
+- **Server to not autostart **:
+```bash
+poetry run python app.py manual
 ```
   
 - **Server with alternate language** (for example fr = French):
 ```bash
-poetry run main.py fr
+poetry run python app.py fr
 ```
 
 Add more translations by going [here](TRANSLATIONS.md)
 
 ### Templating
-
-
-Tina4 uses [Twig](https://twig.symfony.com/) templating to provide a simple and efficient way to create web pages.
+Tina4 uses Jinja2 (Twig) templating to provide a simple and efficient way to create web pages.
 
 1.) **Twig Files**: Add your Twig files within the `src/templates` folder. For instance, you might create files like `index.twig`, `base.twig`, etc., containing your HTML structure with Twig templating syntax for dynamic content.
 
@@ -200,18 +204,21 @@ For ease of use you can supply an `API_KEY` param to your .env with a secret of
 API_KEY=somehash
 ```
 
+
 ### Features
-| Completed                  | To Do                            |
-|----------------------------|----------------------------------|
-| Python pip package         | Implement JWT for token handling |
-| Basic environment handling |                                  |
-| Basic routing              | OpenAPI (Swagger)                |
-| Enhanced routing           |                                  |
-| CSS Support                |                                  |
-| Image Support              |                                  |
-| Localization               |                                  |
-| Error Pages                |                                  |
-| Template handling          |                                  |
+| 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      |                   |
 
 ### Building and Deployment
 

{tina4_python-0.1.45 → tina4_python-0.1.46}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.1.45"
+version = "0.1.46"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"
@@ -18,9 +18,6 @@ cryptography = "^42.0.5"
 pytest = "^7.2.0"
 jurigged = "^0.5.3"
 
-[tool.poetry.scripts]
-run = "main:main"
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

{tina4_python-0.1.45 → tina4_python-0.1.46}/tina4_python/Webserver.py

@@ -196,8 +196,8 @@ class Webserver:
         self.router_handler = None
         self.running = False
 
-    def serve_forever(self):
-        asyncio.run(self.run_server())
+    async def serve_forever(self):
+        await self.run_server()
 
     def server_close(self):
         self.running = False

{tina4_python-0.1.45 → tina4_python-0.1.46}/tina4_python/__init__.py

@@ -3,11 +3,13 @@
 # Copy-right 2007 - current Tina4
 # License: MIT https://opensource.org/licenses/MIT
 #
+import asyncio
 import gettext
 import os
 import shutil
 import importlib
 import sys
+
 from tina4_python.Env import load_env
 from tina4_python.Webserver import Webserver
 from tina4_python.Router import Router
@@ -26,7 +28,7 @@ MSG_STARTING_WEBSERVER = _('Starting webserver on {port}')
 MSG_ENTRY_POINT_NAME = _('Entry point name ... {name}')
 
 if os.getenv('environment') is not None:
-    environment = ".env."+os.getenv('environment')
+    environment = ".env." + os.getenv('environment')
 else:
     environment = ".env"
 
@@ -48,7 +50,7 @@ tina4_auth = Auth(root_path)
 
 token = tina4_auth.get_token({"name": "Tina4"})
 print("TEST TOKEN", token)
-print("VALID TOKEN", tina4_auth.valid(token+"a"))
+print("VALID TOKEN", tina4_auth.valid(token + "a"))
 print("VALID TOKEN", tina4_auth.valid(token))
 print("PAYLOAD", tina4_auth.get_payload(token))
 
@@ -87,48 +89,46 @@ if not os.path.exists(root_path + os.sep + "src" + os.sep + "public"):
     destination_dir = root_path + os.sep + "src" + os.sep + "public"
     shutil.copytree(source_dir, destination_dir)
 
-# please keep in place otherwise auto loading files does not work nicely
+# please keep in place otherwise autoloading of files does not work nicely
 from src import *
-
-def initialize():
-    print(Messages.MSG_LOAD_ALL_THINGS)
+from src.routes import *
+from src.app import *
 
 
 def webserver(host_name, port):
     web_server = Webserver(host_name, int(port))  # HTTPServer((host_name, int(port)), Webserver)
     web_server.router_handler = Router()
     print(Messages.MSG_SERVER_STARTED.format(host_name=host_name, port=port))
-
     try:
-        web_server.serve_forever()
+        asyncio.run(web_server.serve_forever())
     except KeyboardInterrupt:
         pass
-
     web_server.server_close()
     print(Messages.MSG_SERVER_STOPPED)
 
 
-def main(in_hostname="localhost", in_port=7145):
+def run_web_server(in_hostname="localhost", in_port=7145):
     print(Messages.MSG_STARTING_WEBSERVER.format(port=in_port))
-    initialize()
     webserver(in_hostname, in_port)
 
-
 if importlib.util.find_spec("jurigged"):
     print("Jurigged enabled")
     jurigged.watch("./")
 
-print(Messages.MSG_ENTRY_POINT_NAME.format(name=__name__))
-if __name__ == '__main__' or __name__ == 'tina4_python':
-    # Start up a webserver based on params passed on the command line
-    HOSTNAME = "localhost"
-    PORT = 7145
-    if len(sys.argv) > 1:
-        PORT = sys.argv[1]
-        if ":" in PORT:
-            SERVER_CONFIG = PORT.split(":")
-            HOSTNAME = SERVER_CONFIG[0]
-            PORT = SERVER_CONFIG[1]
 
+# Start up a webserver based on params passed on the command line
+HOSTNAME = "localhost"
+PORT = 7145
+if len(sys.argv) > 1:
+    PORT = sys.argv[1]
+    if ":" in PORT:
+        SERVER_CONFIG = PORT.split(":")
+        HOSTNAME = SERVER_CONFIG[0]
+        PORT = SERVER_CONFIG[1]
+
+if PORT != "stop" and PORT != "manual":
     PORT = int(PORT)
-    main(HOSTNAME, PORT)
+    print("Threading")
+    run_web_server(HOSTNAME, PORT)
+else:
+    print("Webserver is set to manual start, please call run_web_server(HOSTNAME, PORT)")