roberteam/lewangoalski
6
2
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: db revamp, add relations, annotate the db

Browse Source 
also allows for request retrieval, and adds decorator for authed access
This commit is contained in:
sherl
2025-05-27 01:28:40 +02:00
parent 00a30695b7
commit 4893715118
5 changed files with 139 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlaskWebProject/FlaskWebProject/lewy.py
View File

@@ -72,7 +72,7 @@ def setup():
app.add_url_rule('/api/', view_func=lewy_api.api_greeting) app.add_url_rule('/api/', view_func=lewy_api.api_greeting)
app.add_url_rule('/api/<path:received_request>', view_func=lewy_api.api_global_catchall) app.add_url_rule('/api/<path:received_request>', view_func=lewy_api.api_global_catchall)
db = lewy_db.initDB(app, config) db = lewy_globals.setupDb(app, config)
scrape = scraper() scrape = scraper()
with app.app_context(): with app.app_context():

2
FlaskWebProject/FlaskWebProject/lewy_api.py
View File

@@ -27,7 +27,7 @@ def api_global_catchall(received_request):
if request_list == [''] or request_list == []: if request_list == [''] or request_list == []:
resp = api_greeting() resp = api_greeting()
try: try:
status, received, data = lewy_api_v1.lookup(request_list) status, received, data = lewy_api_v1.lookup(request_list, request)
except Exception as e: except Exception as e:
lewy_globals.apiFailedRequests += 1 lewy_globals.apiFailedRequests += 1
stripped_filename = __file__[max(__file__.rfind("/"), __file__.rfind("\\")) + 1:] stripped_filename = __file__[max(__file__.rfind("/"), __file__.rfind("\\")) + 1:]

42
FlaskWebProject/FlaskWebProject/lewy_api_v1.py
View File

@@ -2,19 +2,40 @@
# - HTTP status code, # - HTTP status code,
# - human-readable status message, # - human-readable status message,
# - json with appropriate data # - json with appropriate data
from flask_sqlalchemy import SQLAlchemy
from functools import wraps
from lewy_globals import getDb, colors as c
import flask, json, time import flask, json, time
import lewy_db
import lewy_globals import lewy_globals
def incrementBadRequests(): def require_authentication(func):
@wraps(func)
def wrapper(*args, **kwargs):
token = kwargs["r"].args.get('token')
if token == lewy_globals.config['api']['api_key']:
try:
status, received, data = func(*args, **kwargs)
return status, received, data
except:
raise AssertionError(f"Function \"{func.__name__}\" does not return status, code, and data as it should!")
else:
return 401, "error", {'error_msg': "Unauthorized"}
return wrapper
def increment_bad_requests():
lewy_globals.apiFailedRequests += 1 lewy_globals.apiFailedRequests += 1
def notImplemented(data): def not_implemented(data):
# TODO: change list to string -> data, not data[0] # TODO: change list to string -> data, not data[0]
return 501, f"not recognised/implemented: {data[0]}", [] return 501, f"not recognised/implemented: {data[0]}", []
def stub_hello(): def stub_hello():
return 200, 'hello from v1! stats are at /api/v1/stats', [] return 200, 'hello from v1! stats are at /api/v1/stats', []
def epochToDate(epoch):
return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(epoch))
def stats(): def stats():
data_to_send = { data_to_send = {
"start_time": lewy_globals.starttime, "start_time": lewy_globals.starttime,
@@ -25,11 +46,18 @@ def stats():
"outside_api_requests": lewy_globals.outsideApiHits, "outside_api_requests": lewy_globals.outsideApiHits,
"local_api_requests": lewy_globals.apiRequests - lewy_globals.outsideApiHits "local_api_requests": lewy_globals.apiRequests - lewy_globals.outsideApiHits
} }
return 200, "OK", data_to_send return 200, "ok", data_to_send
def get_matches():
pass
@require_authentication
def debugger_halt(r):
print(f"{c.WARNING}[{epochToDate(time.time())}]{c.ENDC} {r.remote_addr} triggered a debugger halt!")
breakpoint()
return 200, "ok", []
def lookup(data): def lookup(data, request):
if data == []: if data == []:
return stub_hello() return stub_hello()
match data[0].lower(): match data[0].lower():
@@ -39,6 +67,8 @@ def lookup(data):
return stub_hello() return stub_hello()
case 'info': case 'info':
return stub_hello() return stub_hello()
case 'halt':
return debugger_halt(r = request)
case _: case _:
incrementBadRequests() increment_bad_requests()
return notImplemented(data) return not_implemented(data)

162
FlaskWebProject/FlaskWebProject/lewy_db.py
View File

@@ -1,86 +1,106 @@
from datetime import datetime
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from sqlalchemy import ForeignKey
from sqlalchemy.orm import Mapped, mapped_column, DeclarativeBase, relationship
from typing import List
import toml import toml
global db global db
def initDB(app, config): def initDB(app, config):
tablenameprefix = config['general']['db_prefix'] + "_lewangoalski_" global sportowcy, trofea, sportowcy_w_meczach, statystyki_sportowcow, kluby, mecze
tnp = config['general']['db_prefix'] + "_lewangoalski_"
db = SQLAlchemy(app) class Base(DeclarativeBase):
pass
class sportowcy(db.Model): db = SQLAlchemy(app, model_class=Base)
__tablename__ = tablenameprefix + "sportowcy"
id_zawodnika = db.Column(db.Integer, primary_key=True)
data_urodzenia = db.Column(db.String(10))
czy_aktywny = db.Column(db.Boolean)
klub = db.Column(db.String(63))
narodowosc = db.Column(db.String(3))
ilosc_trofeow = db.Column(db.Integer)
ostatnie_trofeum = db.Column(db.Integer)
pierwszy_mecz = db.Column(db.Integer)
# ostatni_mecz = db.Column(db.Integer) # statystyki_sportowcow już to przechowuje
wycena = db.Column(db.BigInteger)
ostatni_gol_dla = db.Column(db.String(3))
statystyka = db.Column(db.Integer)
class trofea(db.Model): class sportowcy(Base):
__tablename__ = tablenameprefix + "trofea" __tablename__ = tnp + "sportowcy"
id_trofeum = db.Column(db.Integer, primary_key=True) id_zawodnika: Mapped[ int] = mapped_column(primary_key=True)
id_zawodnika = db.Column(db.Integer) # != None zewnetrzne_id_zawodnika: Mapped[ str] = mapped_column()
nazwa = db.Column(db.String(127)) data_urodzenia: Mapped[ str] = mapped_column()
sezon = db.Column(db.String(9)) czy_aktywny: Mapped[ bool] = mapped_column()
rok = db.Column(db.String(4)) klub_id: Mapped[ List[str]] = mapped_column(ForeignKey(f"{tnp}kluby.id_klubu"))
klub: Mapped[ List["kluby"]] = relationship(back_populates="sportowcy_w_klubie", foreign_keys=[klub_id])
narodowosc: Mapped[ str] = mapped_column()
ilosc_trofeow: Mapped[ int] = mapped_column()
ostatnie_trofeum_id: Mapped[ int] = mapped_column(ForeignKey(f"{tnp}trofea.id_trofeum"))
ostatnie_trofeum: Mapped[ "trofea"] = relationship(back_populates="zawodnik", foreign_keys=[ostatnie_trofeum_id])
pierwszy_mecz: Mapped[ int] = mapped_column()
wycena: Mapped[ int] = mapped_column()
ostatni_gol_dla_id: Mapped[ str] = mapped_column(ForeignKey(f"{tnp}kluby.id_klubu"))
ostatni_gol_dla: Mapped[ "kluby"] = relationship(back_populates="sportowcy_ostatni_gol", foreign_keys=[ostatni_gol_dla_id])
statystyki_id: Mapped[ List[int]] = mapped_column(ForeignKey(f"{tnp}statystyki_sportowcow.id_statystyki"))
statystyki: Mapped[List["statystyki_sportowcow"]] = relationship(back_populates="sportowiec")
trofea: Mapped[ List["trofea"]] = relationship(back_populates="zawodnik", foreign_keys="[trofea.id_zawodnika]")
class sportowcy_w_meczach(db.Model): class trofea(Base):
__tablename__ = tablenameprefix + "sportowcy_w_meczach" __tablename__ = tnp + "trofea"
id_rekordu = db.Column(db.Integer, primary_key=True) id_trofeum: Mapped[ int] = mapped_column(primary_key=True)
id_zawodnika = db.Column(db.Integer) # != None id_zawodnika: Mapped[ int] = mapped_column(ForeignKey(f"{tnp}sportowcy.id_zawodnika"))
zewnetrzne_id_meczu = db.Column(db.Integer) # != None zawodnik: Mapped[ "sportowcy"] = relationship(back_populates="trofea", foreign_keys=[id_zawodnika])
czas_gry = db.Column(db.Integer) nazwa: Mapped[ str] = mapped_column()
goli = db.Column(db.Integer) sezon: Mapped[ str] = mapped_column()
asyst = db.Column(db.Integer) rok: Mapped[ str] = mapped_column()
interwencje_bramkarza = db.Column(db.Integer)
suma_interwencji_na_bramke = db.Column(db.Integer)
zolte_kartki = db.Column(db.Integer)
czerwone_kartki = db.Column(db.Integer)
wygrana = db.Column(db.Integer)
wynik = db.Column(db.Float)
class statystyki_sportowcow(db.Model): class sportowcy_w_meczach(Base):
__tablename__ = tablenameprefix + "statystyki_sportowcow" __tablename__ = tnp + "sportowcy_w_meczach"
id_statystyki = db.Column(db.Integer, primary_key=True) id_rekordu: Mapped[ int] = mapped_column(primary_key=True)
ostatni_mecz = db.Column(db.Integer) id_zawodnika: Mapped[ int] = mapped_column(ForeignKey(f"{tnp}sportowcy.id_zawodnika"))
ilosc_wystapien = db.Column(db.Integer) zawodnik: Mapped[ "sportowcy"] = relationship()
minut_gry = db.Column(db.BigInteger) zewnetrzne_id_meczu: Mapped[ str] = mapped_column(ForeignKey(f"{tnp}mecze.zewnetrzne_id_meczu"))
gier_sum = db.Column(db.Integer) czas_gry: Mapped[ int] = mapped_column()
goli_sum = db.Column(db.Integer) goli: Mapped[ int] = mapped_column()
asyst_sum = db.Column(db.Integer) asyst: Mapped[ int] = mapped_column()
interwencji_sum = db.Column(db.Integer) interwencje_bramkarza: Mapped[ int] = mapped_column()
nieobronionych_interwencji_sum = db.Column(db.Integer) suma_interwencji_na_bramke: Mapped[ int] = mapped_column()
zoltych_kartek_sum = db.Column(db.Integer) zolte_kartki: Mapped[ int] = mapped_column()
czerwonych_kartek_sum = db.Column(db.Integer) czerwone_kartki: Mapped[ int] = mapped_column()
wygranych_sum = db.Column(db.Integer) wygrana: Mapped[ int] = mapped_column()
wynik_sum = db.Column(db.Integer) wynik: Mapped[ float] = mapped_column()
meczow_do_wynikow_sum = db.Column(db.Integer)
class kluby(db.Model): class statystyki_sportowcow(Base):
__tablename__ = tablenameprefix + "kluby" __tablename__ = tnp + "statystyki_sportowcow"
id_klubu = db.Column(db.String(63), primary_key=True) id_statystyki: Mapped[ int] = mapped_column(primary_key=True)
pelna_nazwa = db.Column(db.String(63)) sportowiec: Mapped[ "sportowcy"] = relationship(back_populates="statystyki")
skrocona_nazwa = db.Column(db.String(3)) ostatni_mecz: Mapped[ int] = mapped_column(ForeignKey(f"{tnp}mecze.id_meczu"))
ilosc_wystapien: Mapped[ int] = mapped_column()
minut_gry: Mapped[ int] = mapped_column()
gier_sum: Mapped[ int] = mapped_column()
goli_sum: Mapped[ int] = mapped_column()
asyst_sum: Mapped[ int] = mapped_column()
interwencji_sum: Mapped[ int] = mapped_column()
nieobronionych_interwencji_sum: Mapped[ int] = mapped_column()
zoltych_kartek_sum: Mapped[ int] = mapped_column()
czerwonych_kartek_sum: Mapped[ int] = mapped_column()
wygranych_sum: Mapped[ int] = mapped_column()
wynik_sum: Mapped[ int] = mapped_column()
meczow_do_wynikow_sum: Mapped[ int] = mapped_column()
class mecze(db.Model): class kluby(Base):
__tablename__ = tablenameprefix + "mecze" __tablename__ = tnp + "kluby"
id_meczu = db.Column(db.Integer, primary_key=True) id_klubu: Mapped[ str] = mapped_column(primary_key=True)
zewnetrzne_id_meczu = db.Column(db.String(15)) # != None pelna_nazwa: Mapped[ str] = mapped_column()
data = db.Column(db.DateTime) skrocona_nazwa: Mapped[ str] = mapped_column()
gospodarze = db.Column(db.String(3)) sportowcy_w_klubie: Mapped[ List["sportowcy"]] = relationship(back_populates="klub", foreign_keys="[sportowcy.klub_id]")
goscie = db.Column(db.String(3)) sportowcy_ostatni_gol: Mapped[ "sportowcy"] = relationship(back_populates="ostatni_gol_dla", foreign_keys="[sportowcy.ostatni_gol_dla_id]")
gosp_wynik = db.Column(db.Integer)
gosc_wynik = db.Column(db.Integer) class mecze(Base):
sezon = db.Column(db.String(9)) __tablename__ = tnp + "mecze"
nazwa_turnieju = db.Column(db.String(127)) id_meczu: Mapped[ int] = mapped_column(primary_key=True)
skrocona_nazwa_turnieju = db.Column(db.String(15)) zewnetrzne_id_meczu: Mapped[ str] = mapped_column(unique=True)
flaga = db.Column(db.Integer) data: Mapped[ datetime] = mapped_column()
gospodarze_id: Mapped[ str] = mapped_column(ForeignKey(f"{tnp}kluby.id_klubu"))
gospodarze: Mapped[ "kluby"] = relationship(foreign_keys=[gospodarze_id])
goscie_id: Mapped[ str] = mapped_column(ForeignKey(f"{tnp}kluby.id_klubu"))
goscie: Mapped[ "kluby"] = relationship(foreign_keys=[goscie_id])
gosp_wynik: Mapped[ int] = mapped_column()
gosc_wynik: Mapped[ int] = mapped_column()
sezon: Mapped[ str] = mapped_column()
nazwa_turnieju: Mapped[ str] = mapped_column()
skrocona_nazwa_turnieju: Mapped[ str] = mapped_column()
flaga: Mapped[ int] = mapped_column()
return db return db

11
FlaskWebProject/FlaskWebProject/lewy_globals.py
View File

@@ -2,8 +2,9 @@ from git import Repo # hash ostatniego commitu
import os import os
import time import time
import toml import toml
import lewy_db
global config, randomly_generated_passcode global db, config, randomly_generated_passcode
class colors: class colors:
HEADER = '\033[95m' HEADER = '\033[95m'
@@ -81,6 +82,14 @@ def getConfig(configfile):
else: else:
return toml.load(configfile) return toml.load(configfile)
def setupDb(app, config):
global db
db = lewy_db.initDB(app, config)
return db
def getDb():
return db
def setConfig(configfile): def setConfig(configfile):
global config global config
config = getConfig(configfile) config = getConfig(configfile)