fix ruff format

This commit is contained in:
Joel Krauska
2025-11-21 11:36:48 -08:00
parent 5e0852e558
commit ed695684d9
2 changed files with 43 additions and 35 deletions

View File

@@ -24,7 +24,9 @@ async def get_fuzzy_nodes(query):
return result.scalars()
async def get_packets(node_id=None, portnum=None, after=None, before=None, limit=None, packet_id=None):
async def get_packets(
node_id=None, portnum=None, after=None, before=None, limit=None, packet_id=None
):
async with database.async_session() as session:
# --- Fast path: fetch by packet_id (uses primary key lookup) ---
if packet_id is not None:
@@ -53,7 +55,6 @@ async def get_packets(node_id=None, portnum=None, after=None, before=None, limit
return packets
async def get_packets_from(node_id=None, portnum=None, since=None, limit=500):
async with database.async_session() as session:
q = select(Packet)
@@ -75,7 +76,6 @@ async def get_packet(packet_id):
return result.scalar_one_or_none()
async def get_packets_seen(packet_id):
async with database.async_session() as session:
result = await session.execute(
@@ -373,11 +373,11 @@ async def get_total_packet_count(
# CASE 1: no filters -> count everything
if (
period_type is None and
length is None and
channel is None and
from_node is None and
to_node is None
period_type is None
and length is None
and channel is None
and from_node is None
and to_node is None
):
async with database.async_session() as session:
q = select(func.count(Packet.id))
@@ -431,19 +431,17 @@ async def get_total_packet_seen_count(
# SPECIAL CASE: direct packet_id lookup
if packet_id is not None:
async with database.async_session() as session:
q = select(func.count(PacketSeen.packet_id)).where(
PacketSeen.packet_id == packet_id
)
q = select(func.count(PacketSeen.packet_id)).where(PacketSeen.packet_id == packet_id)
res = await session.execute(q)
return res.scalar() or 0
# No filters -> return ALL seen entries
if (
period_type is None and
length is None and
channel is None and
from_node is None and
to_node is None
period_type is None
and length is None
and channel is None
and from_node is None
and to_node is None
):
async with database.async_session() as session:
q = select(func.count(PacketSeen.packet_id))

View File

@@ -193,6 +193,7 @@ async def index(request):
starting_url = CONFIG["site"].get("starting", "/map") # default to /map if not set
raise web.HTTPFound(location=starting_url)
@routes.get("/net")
async def net(request):
return web.Response(
@@ -200,21 +201,21 @@ async def net(request):
content_type="text/html",
)
@routes.get("/map")
async def map(request):
template = env.get_template("map.html")
return web.Response(
text=template.render(),
content_type="text/html"
)
return web.Response(text=template.render(), content_type="text/html")
@routes.get("/nodelist")
async def nodelist(request):
template = env.get_template("nodelist.html")
return web.Response(
text=template.render(),
content_type="text/html",
)
template = env.get_template("nodelist.html")
return web.Response(
text=template.render(),
content_type="text/html",
)
@routes.get("/firehose")
async def firehose(request):
@@ -223,21 +224,24 @@ async def firehose(request):
content_type="text/html",
)
@routes.get("/chat")
async def chat(request):
template = env.get_template("chat.html")
return web.Response(
text=template.render(),
content_type="text/html",
)
template = env.get_template("chat.html")
return web.Response(
text=template.render(),
content_type="text/html",
)
@routes.get("/new_packet/{packet_id}")
async def new_packet(request):
template = env.get_template("new_packet.html")
return web.Response(
text=template.render(),
content_type="text/html",
)
template = env.get_template("new_packet.html")
return web.Response(
text=template.render(),
content_type="text/html",
)
@routes.get("/new_node/{from_node_id}")
async def firehose_node(request):
@@ -247,6 +251,7 @@ async def firehose_node(request):
content_type="text/html",
)
@routes.get("/nodegraph")
async def nodegraph(request):
template = env.get_template("nodegraph.html")
@@ -255,6 +260,7 @@ async def nodegraph(request):
content_type="text/html",
)
@routes.get("/top")
async def top(request):
template = env.get_template("top.html")
@@ -263,6 +269,7 @@ async def top(request):
content_type="text/html",
)
# Keep !!
@routes.get("/graph/traceroute/{packet_id}")
async def graph_traceroute(request):
@@ -370,6 +377,7 @@ async def graph_traceroute(request):
content_type="image/svg+xml",
)
@routes.get("/stats")
async def stats(request):
try:
@@ -392,6 +400,7 @@ async def stats(request):
content_type="text/plain",
)
'''
@routes.get("/top")
async def top(request):
@@ -470,6 +479,7 @@ async def top(request):
return web.Response(text=rendered, status=500, content_type="text/html")
'''
async def run_server():
# Wait for database migrations to complete before starting web server
logger.info("Checking database schema status...")