Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bulk Scan Updates #94

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
249 changes: 249 additions & 0 deletions microsetta_admin/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import secrets
from datetime import datetime
import io
import random
import math

from jwt import PyJWTError
from werkzeug.exceptions import BadRequest
Expand Down Expand Up @@ -774,6 +776,253 @@ def scan():
recorded_type)


def _get_color_code(cnt):
codes = ["#C0C0C0", "#808080", "#800000", "#FF0000", "#800080", "#FF00FF",
"#008000", "#00FF00", "#FFd700", "#000080", "#0000FF", "#00FFFF",
"#FFE4C4", "#7FFFD4", "#DEB887", "#FF7F50", "#6495ED", "#FF8C00",
"#FF1493", "#00BFFF", "#1E90FF", "#DAA520", "#4B0082", "#F0E68C",
"#90EE90", "#778899", "#FFA500", "#BC8F8F", "#D8BFD8", "#DCDCDC"]

if cnt >= len(codes):
val = '0123456789ABCDEF'
code = [random.choice(val) for i in range(6)]
color_code = ['#' + ''.join(code)]
return color_code[0]

return codes[random.randrange(0, len(codes)-1)]


def _get_legends(criteria):

dict = {}
curr_dict = session.get(criteria, None)

if curr_dict is None or len(curr_dict) == 1:
status, fields = APIRequest.get(
'/api/admin/barcode_query_fields')

if status == 200:
for obj in fields:
if obj["label"] == criteria:
cnt = 1
for val in obj["values"]:
color_code = None
if criteria == "Project":
if not ('-' in obj["values"][val]):
color_code = _get_color_code(cnt)
elif "Sample" in criteria:
color_code = _get_color_code(cnt)

if color_code is not None:
while color_code in dict.values():
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this has the potential to go into an infinite loop if the supply of defined colors is exhausted. Can that be handled more gracefully?

color_code = _get_color_code(cnt)

if criteria == "Sample Status":
tmp = obj["values"][val].replace(' ', '-')
tmp = tmp.lower()
dict[tmp] = color_code
else:
dict[obj["values"][val]] = color_code
cnt = cnt + 1

dict['None'] = "#000000"
session[criteria] = dict
else:
dict = session.get(criteria)

return dict


def _compose_table(legends, type):
output_dict = {}
scanned_data = session.get('scan_data')
cassidysymons marked this conversation as resolved.
Show resolved Hide resolved
curr_row = ""
curr_cols = []

for rec in scanned_data:

status, response = APIRequest.get(
'/api/admin/rack/sample/%s' % rec
)
code = response['barcode']

if status == 201:
status, data = APIRequest.get(
'/api/admin/search/samples/%s' % code
)

val = ""
proj = data["sample"]["sample_projects"][0]
status = data["sample"]["_latest_scan_status"]
src = data["sample"]["site"]

if type == "Sample Site":
val = data["sample"]["site"]
elif type == "Sample Status":
val = data["sample"]["_latest_scan_status"]
elif type == "Project":
val = data["sample"]["sample_projects"][0]

if curr_row == "":
curr_row = response['location_row']
if val is None or val == "":
tmp = legends['None']
curr_cols.append([code, tmp, proj, status, src])
else:
curr_cols.append([code, legends[val], proj, status, src])
elif curr_row == response['location_row']:
if val is None:
tmp = legends['None']
curr_cols.append([code, tmp, proj, status, src])
else:
curr_cols.append([code, legends[val], proj, status, src])
else:
output_dict[curr_row] = curr_cols
curr_cols = []
curr_row = response['location_row']
if val is None:
tmp = legends['None']
curr_cols.append([code, tmp, proj, status, src])
else:
curr_cols.append([code, legends[val], proj, status, src])

output_dict[curr_row] = curr_cols
return output_dict


def _visualize_scans():
filename = request.form['scanned_file']
criteria = request.form['sort_criteria']
session['recent_criteria'] = criteria
legends = _get_legends(criteria)

return render_template('bulk_scan.html',
**build_login_variables(),
stage="Visualization",
filename=filename,
data=criteria,
legends=legends,
table=_compose_table(legends, criteria),
status_options=STATUS_OPTIONS,
message=""
)


def _post_bulk_scan_add():
send_email = request.form.get('send_email', False)
session[SEND_EMAIL_CHECKBOX_DEFAULT_NAME] = send_email

sample_barcode = request.form['sample_barcode']
technician_notes = request.form['technician_notes']
sample_status = request.form['sample_status']

# Do the actual update
status, response = APIRequest.post(
'/api/admin/scan/%s' % sample_barcode,
json={
"sample_status": sample_status,
"technician_notes": technician_notes
}
)

message = ""
if status == 201:
message = "Success: Sample scanned successfully!"
else:
message = "Error: Unable to scan sample!"

filename = session.get('scan_file', "")
criteria = session.get('recent_criteria', "Project")
legends = _get_legends(criteria)
return render_template('bulk_scan.html',
**build_login_variables(),
stage="Visualization",
filename=filename,
data=criteria,
legends=legends,
table=_compose_table(legends, criteria),
status_options=STATUS_OPTIONS,
message=message
)


def _post_bulk_scan():
obj_file = request.files['file_picker']
sort_criteria = request.form['sort_criteria']
error_msg = ""

if obj_file is not None:
filename = obj_file.filename
ds = pd.read_csv(obj_file, dtype={'TubeCode': str, 'RackID': str})
file_data = ds.values.tolist()

scanned_samples = []
rowCnt = 1
raginirai553 marked this conversation as resolved.
Show resolved Hide resolved
for rec in file_data:
status, response = APIRequest.get(
'/api/admin/rack/sample/%s' % rec[6],)

if status == 404:
obj = {}
obj["rack_id"] = rec[6]
if math.isnan(rec[3]):
raginirai553 marked this conversation as resolved.
Show resolved Hide resolved
error_msg = "Error: Empty column in row number" + rowCnt
break
else:
obj["location_col"] = str(int(rec[3]))
if math.isnan(rec[4]):
raginirai553 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isnan check needs to be removed, rec[4] will never be a number. Also, the error message strategy as written doesn't work - when it hits the isnan block, it throws an internal server error, meaning the user will never see the error.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved the issued! As per the revised flow, samples without row or column numbers are ignored during bulk scan. Further, appropriate errors are displayed for such samples.

Screen Shot 2023-05-12 at 9 34 21 AM

error_msg = "Error: Empty row in row number " + rowCnt
break
else:
obj["location_row"] = rec[4]
sample_barcode = rec[5]
status, response = APIRequest.post(
'/api/admin/rack/%s/add' % sample_barcode,
json=obj
)
scanned_samples.append(rec[6])
rowCnt += 1

legends = _get_legends(sort_criteria)
session['scan_data'] = scanned_samples

return render_template('bulk_scan.html',
**build_login_variables(),
stage="Visualization",
filename=filename,
data=sort_criteria,
legends=legends,
table=_compose_table(legends, sort_criteria),
status_options=STATUS_OPTIONS,
message=error_msg
)


@app.route('/scan-bulk', methods=['GET', 'POST'])
def bulk_scan():

if request.method == 'GET':
return render_template('bulk_scan.html',
**build_login_variables(),
stage="Scanning",
filename="",
data="",
legends={},
table={},
status_options={},
message=""
)

if request.method == 'POST':
stage = request.form["stage"]
if stage == "Scanning":
return _post_bulk_scan()
elif stage == "Visualization":
return _visualize_scans()
elif stage == "Sample_Scan":
return _post_bulk_scan_add()


@app.route('/metadata_pulldown', methods=['GET', 'POST'])
def metadata_pulldown():
allow_missing = request.form.get('allow_missing_samples', False)
Expand Down
Loading