fix: Cleanup code to comply with ruff
This commit is contained in:
20
main.py
20
main.py
@@ -1,5 +1,3 @@
|
|||||||
from flask import Flask
|
|
||||||
from server import app
|
|
||||||
import server
|
import server
|
||||||
from gunicorn.app.base import BaseApplication
|
from gunicorn.app.base import BaseApplication
|
||||||
import os
|
import os
|
||||||
@@ -20,23 +18,21 @@ class GunicornApp(BaseApplication):
|
|||||||
def load(self):
|
def load(self):
|
||||||
return self.application
|
return self.application
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
if __name__ == '__main__':
|
|
||||||
dotenv.load_dotenv()
|
dotenv.load_dotenv()
|
||||||
|
|
||||||
workers = os.getenv('WORKERS', 1)
|
workers = os.getenv("WORKERS", 1)
|
||||||
threads = os.getenv('THREADS', 2)
|
threads = os.getenv("THREADS", 2)
|
||||||
workers = int(workers)
|
workers = int(workers)
|
||||||
threads = int(threads)
|
threads = int(threads)
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
'bind': '0.0.0.0:5000',
|
"bind": "0.0.0.0:5000",
|
||||||
'workers': workers,
|
"workers": workers,
|
||||||
'threads': threads,
|
"threads": threads,
|
||||||
}
|
}
|
||||||
|
|
||||||
gunicorn_app = GunicornApp(server.app, options)
|
gunicorn_app = GunicornApp(server.app, options)
|
||||||
print(f'Starting server with {workers} workers and {threads} threads', flush=True)
|
print(f"Starting server with {workers} workers and {threads} threads", flush=True)
|
||||||
gunicorn_app.run()
|
gunicorn_app.run()
|
||||||
|
|||||||
16
server.py
16
server.py
@@ -1,9 +1,6 @@
|
|||||||
from functools import cache
|
|
||||||
import json
|
|
||||||
from flask import (
|
from flask import (
|
||||||
Flask,
|
Flask,
|
||||||
make_response,
|
make_response,
|
||||||
redirect,
|
|
||||||
request,
|
request,
|
||||||
jsonify,
|
jsonify,
|
||||||
render_template,
|
render_template,
|
||||||
@@ -11,7 +8,6 @@ from flask import (
|
|||||||
send_file,
|
send_file,
|
||||||
)
|
)
|
||||||
import os
|
import os
|
||||||
import json
|
|
||||||
import requests
|
import requests
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import dotenv
|
import dotenv
|
||||||
@@ -26,6 +22,7 @@ def find(name, path):
|
|||||||
if name in files:
|
if name in files:
|
||||||
return os.path.join(root, name)
|
return os.path.join(root, name)
|
||||||
|
|
||||||
|
|
||||||
# Assets routes
|
# Assets routes
|
||||||
@app.route("/assets/<path:path>")
|
@app.route("/assets/<path:path>")
|
||||||
def send_assets(path):
|
def send_assets(path):
|
||||||
@@ -74,17 +71,13 @@ def wellknown(path):
|
|||||||
# region Main routes
|
# region Main routes
|
||||||
@app.route("/")
|
@app.route("/")
|
||||||
def index():
|
def index():
|
||||||
# Get current time in the format "dd MMM YYYY hh:mm AM/PM"
|
|
||||||
# current_datetime = datetime.now().strftime("%d %b %Y %I:%M %p")
|
|
||||||
# return render_template("index.html", datetime=current_datetime)
|
|
||||||
|
|
||||||
# Print the IP address of the requester
|
# Print the IP address of the requester
|
||||||
print(f"Request from IP: {request.remote_addr}")
|
print(f"Request from IP: {request.remote_addr}")
|
||||||
# And the headers
|
# And the headers
|
||||||
print(f"Request headers: {request.headers}")
|
print(f"Request headers: {request.headers}")
|
||||||
|
# Get current time in the format "dd MMM YYYY hh:mm AM/PM"
|
||||||
|
current_datetime = datetime.now().strftime("%d %b %Y %I:%M %p")
|
||||||
# return redirect("https://ya.c.woodburn.au")
|
return render_template("index.html", datetime=current_datetime)
|
||||||
|
|
||||||
|
|
||||||
@app.route("/<path:path>")
|
@app.route("/<path:path>")
|
||||||
@@ -116,6 +109,7 @@ def catch_all(path: str):
|
|||||||
|
|
||||||
api_requests = 0
|
api_requests = 0
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/v1/data", methods=["GET"])
|
@app.route("/api/v1/data", methods=["GET"])
|
||||||
def api_data():
|
def api_data():
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user