mirror of
https://github.com/tgorordo/smithy.git
synced 2026-06-12 18:42:13 -07:00
debug cgi interface
This commit is contained in:
parent
c57068b34c
commit
8ab9667978
GPG key ID:
0CBED22BB0D94490
4 changed files with 153 additions and 118 deletions
2
justfile
2
justfile
|
|
@ -20,7 +20,7 @@ test:
|
||||||
uv run pytest -vvv --tb=short --log-cli-level=INFO
|
uv run pytest -vvv --tb=short --log-cli-level=INFO
|
||||||
|
|
||||||
compile:
|
compile:
|
||||||
uv run pyinstaller --clean -F src/cmd.py --name smithy
|
uv run pyinstaller --clean -F src/cmd.py --name smithycmd
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
uv run pyclean src test
|
uv run pyclean src test
|
||||||
|
|
|
||||||
147
src/cgi/script.py
Normal file
147
src/cgi/script.py
Normal file
|
|
@ -0,0 +1,147 @@
|
||||||
|
import traceback
|
||||||
|
import sys, os
|
||||||
|
import html
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
|
import polars as pl
|
||||||
|
|
||||||
|
sys.path.insert(0,
|
||||||
|
os.path.abspath(
|
||||||
|
os.path.join(
|
||||||
|
os.path.dirname(os.path.abspath(__file__)), "../smithy/src"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
from smithy import smith_set
|
||||||
|
|
||||||
|
print("Content-Type: text/html\n")
|
||||||
|
message = ""
|
||||||
|
|
||||||
|
content_type = os.environ.get("CONTENT_TYPE", "")
|
||||||
|
content_length = int(os.environ.get("CONTENT_LENGTH", 0) or 0)
|
||||||
|
boundary = content_type.split("boundary=")[-1].encode()
|
||||||
|
|
||||||
|
body = sys.stdin.buffer.read(content_length)
|
||||||
|
parts = body.split(b"--" + boundary)
|
||||||
|
|
||||||
|
spreadsheet = None
|
||||||
|
|
||||||
|
for part in parts:
|
||||||
|
if b'Content-Disposition' in part and b'name="spreadsheet"' in part:
|
||||||
|
header, _, data = part.partition(b"\r\n\r\n")
|
||||||
|
|
||||||
|
filename_match = re.search(br'filename="([^"]+)"', header)
|
||||||
|
if filename_match:
|
||||||
|
filename = filename_match.group(1).decode()
|
||||||
|
filedata = data.rstrip(b"\r\n--")
|
||||||
|
|
||||||
|
spreadsheet = (filename, filedata)
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
if spreadsheet is not None:
|
||||||
|
|
||||||
|
filename, filedata = spreadsheet
|
||||||
|
|
||||||
|
if filename and filedata:
|
||||||
|
filepath = os.path.join("/tmp", filename)
|
||||||
|
|
||||||
|
with open(filepath, 'wb') as f:
|
||||||
|
f.write(filedata)
|
||||||
|
|
||||||
|
try:
|
||||||
|
if filename.endswith(".csv"):
|
||||||
|
df = pl.read_csv(filepath)
|
||||||
|
elif filename.endswith((".xlsx", ".xls")):
|
||||||
|
df = pl.read_excel(filepath)
|
||||||
|
else:
|
||||||
|
message = """
|
||||||
|
<h1>Error</h1>
|
||||||
|
<p>File extension is not valid. Use CSV (.csv) or Excel (.xlsx, .xls).</p>
|
||||||
|
<p><a href="../cgi/smithy.html">Go Back</a></p>
|
||||||
|
"""
|
||||||
|
|
||||||
|
if df is not None:
|
||||||
|
# Normalize
|
||||||
|
df = df.with_columns(
|
||||||
|
[
|
||||||
|
pl.col(c)
|
||||||
|
.cast(pl.Utf8)
|
||||||
|
.str.strip_chars()
|
||||||
|
.cast(pl.Int64, strict=False)
|
||||||
|
.fill_null(0)
|
||||||
|
for c in df.columns
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
smiths = smith_set(df) # Solve!
|
||||||
|
|
||||||
|
message = f"""
|
||||||
|
<h1>The Smith set winners are:</h1>
|
||||||
|
{smiths}
|
||||||
|
<p><a href="../cgi/smithy.html">Go Back</a></p>
|
||||||
|
"""
|
||||||
|
else:
|
||||||
|
message = """
|
||||||
|
<h1>Error</h1>
|
||||||
|
<p>DataFrame was empty.</p>
|
||||||
|
<p><a href="../cgi/smithy.html">Go Back</a></p>
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
message = f"""
|
||||||
|
<h1>Error</h1>
|
||||||
|
<p>Internal Error Encountered: {e}
|
||||||
|
<p><a href="../cgi/smithy.html">Go Back</a></p>
|
||||||
|
"""
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
|
else:
|
||||||
|
message = """
|
||||||
|
<h1>Error</h1>
|
||||||
|
<p>Filename or File Data not found/valid in form submission.</p>
|
||||||
|
<p><a href="../cgi/smithy.html">Go Back</a></p>
|
||||||
|
"""
|
||||||
|
|
||||||
|
else:
|
||||||
|
message = """
|
||||||
|
<h1>Error</h1>
|
||||||
|
<p>No file field found in the form.</p>
|
||||||
|
<p><a href="../cgi/smithy.html">Go Back</a></p>
|
||||||
|
"""
|
||||||
|
|
||||||
|
print("""
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title> Smithy - RCV Ballot Counter </title>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
font-family: Arial, sans-serif;
|
||||||
|
max-width: 600px;
|
||||||
|
margin: 40px auto;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
h1 {
|
||||||
|
font-size: 24px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
""")
|
||||||
|
print(message)
|
||||||
|
print("""
|
||||||
|
</body>
|
||||||
|
<footer>
|
||||||
|
<hr>
|
||||||
|
<p>Author: <a href="https://pages.uoregon.edu/tgorordo">Thomas (Tom) C. Gorordo</a>
|
||||||
|
Source: <a href="https://github.com/tgorordo/pages.uoregon.edu">pages.uoregon.edu/tgorordo</a>,
|
||||||
|
<a href="https://github.com/tgorordo/smithy">smithy</a></p>
|
||||||
|
</footer>
|
||||||
|
</html>
|
||||||
|
""")
|
||||||
|
|
@ -1,117 +1,5 @@
|
||||||
#!/usr/bin/env -S uv run python
|
#!/usr/bin/bash
|
||||||
|
|
||||||
import cgi, cgitb
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
import sys, os
|
|
||||||
import html
|
|
||||||
|
|
||||||
import polars as pl
|
exec "$SCRIPT_DIR/../smithy/.venv/bin/python" "$SCRIPT_DIR/../smithy/src/cgi/cgi.py"
|
||||||
|
|
||||||
sys.path.insert(0,
|
|
||||||
os.path.abspath(
|
|
||||||
os.path.join(
|
|
||||||
os.path.dirname(os.path.abspath(__file__)), "../smithy/src"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
from smithy import smith_set
|
|
||||||
|
|
||||||
cgitb.enable()
|
|
||||||
|
|
||||||
form = cgi.FieldStorage()
|
|
||||||
|
|
||||||
if 'spreadsheet' in form:
|
|
||||||
|
|
||||||
fileitem = form['spreadsheet']
|
|
||||||
if fileitem.filename:
|
|
||||||
filename = os.path.basename(fileitem.filename)
|
|
||||||
filepath = os.path.join("/tmp", filename)
|
|
||||||
|
|
||||||
with open(filepath, 'wb') as f:
|
|
||||||
f.write(fileitem.file.read())
|
|
||||||
print(f"<h2>Upload Successful!</h2>")
|
|
||||||
|
|
||||||
try:
|
|
||||||
if filename.endswith(".csv"):
|
|
||||||
df = pl.read_csv(filepath)
|
|
||||||
elif filename.endswith((".xlsx", ".xls")):
|
|
||||||
df = pl.read_excel(filepath)
|
|
||||||
else:
|
|
||||||
message = """
|
|
||||||
<h1>Error</h1>
|
|
||||||
<p>File extension is not valid. Use CSV (.csv) or Excel (.xlsx, .xls).</p>
|
|
||||||
<p><a href="../smithy.html">Go Back</a></p>
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Normalize
|
|
||||||
df = df.with_columns(
|
|
||||||
[
|
|
||||||
pl.col(c)
|
|
||||||
.cast(pl.Utf8)
|
|
||||||
.str.strip_chars()
|
|
||||||
.cast(pl.Int64, strict=False)
|
|
||||||
.fill_null(0)
|
|
||||||
for c in df.columns
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
smiths = smith_set(df) # Solve!
|
|
||||||
|
|
||||||
message = """
|
|
||||||
<h1>The Smith set winners are:</h1>
|
|
||||||
{smiths}
|
|
||||||
<p><a href="../smithy.html">Go Back</a></p>
|
|
||||||
"""
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
message = """
|
|
||||||
<h1>Error<h1>
|
|
||||||
<p>Internal Error Encountered: {e}
|
|
||||||
<p><a href="../smithy.html">Go Back</a></p>
|
|
||||||
"""
|
|
||||||
|
|
||||||
else:
|
|
||||||
message = """
|
|
||||||
<h1>Error</h1>
|
|
||||||
<p>Filename not found/valid.</p>
|
|
||||||
<p><a href="../smithy.html">Go Back</a></p>
|
|
||||||
"""
|
|
||||||
|
|
||||||
else:
|
|
||||||
message = """
|
|
||||||
<h1>Error</h1>
|
|
||||||
<p>No file field found in the form.</p>
|
|
||||||
<p><a href="../smithy.html">Go Back</a></p>
|
|
||||||
"""
|
|
||||||
|
|
||||||
response = f"""
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title> Smithy - RCV Ballot Counter </title>
|
|
||||||
<style>
|
|
||||||
body {
|
|
||||||
font-family: Arial, sans-serif;
|
|
||||||
max-width: 600px;
|
|
||||||
margin: 40px auto;
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
h1 {
|
|
||||||
font-size: 24px;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{message}
|
|
||||||
</body>
|
|
||||||
<footer>
|
|
||||||
<hr>
|
|
||||||
<p>Author: <a href="https://pages.uoregon.edu/tgorordo">Thomas (Tom) C. Gorordo</a>
|
|
||||||
Source: <a href="https://github.com/tgorordo/pages.uoregon.edu">pages.uoregon.edu/tgorordo</a>,
|
|
||||||
<a href="https://github.com/tgorordo/smithy">smithy</a></p>
|
|
||||||
</footer>
|
|
||||||
"""
|
|
||||||
|
|
||||||
print(response)
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
<h1>Smithy: RCV Ballot Counter - CGI Application Upload</h1>
|
<h1>Smithy: RCV Ballot Counter - CGI Application Upload</h1>
|
||||||
|
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
<form action="/files/forms/smithy.cgi" method="POST" enctype="multipart/form-data">
|
<form action="./smithy.cgi" method="POST" enctype="multipart/form-data">
|
||||||
<label for="spreadsheet">Upload a ballot-box spreadsheet (.xlsx, .xls, .csv):</label>
|
<label for="spreadsheet">Upload a ballot-box spreadsheet (.xlsx, .xls, .csv):</label>
|
||||||
<input type="file" id="spreadsheet" name="spreadsheet" accept=".xlsx,.xls,.csv" required>
|
<input type="file" id="spreadsheet" name="spreadsheet" accept=".xlsx,.xls,.csv" required>
|
||||||
<br>
|
<br>
|
||||||
|
|
@ -57,7 +57,7 @@ and you may also inspect the source of this page to verify that <a href="https:/
|
||||||
i.e. each row is the ranking provided by the ballot of a voter,
|
i.e. each row is the ranking provided by the ballot of a voter,
|
||||||
e.g.:</p>
|
e.g.:</p>
|
||||||
|
|
||||||
<p>
|
<p><a href="../../test/test_ballot.csv">test_ballot.csv<a>:
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Alice</th>
|
<th>Alice</th>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue