From b1c1bcbfdca7f70803eb2da7525b51843d05ebde Mon Sep 17 00:00:00 2001 From: Cooper Bailey Date: Wed, 15 Nov 2023 13:26:18 -0800 Subject: [PATCH] added some functionality to get the expanded information of the tables, mostly worked in server.py to interact with init.sql --- backend/src/server.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/server.py b/backend/src/server.py index d9d5da0b..949ea1e9 100644 --- a/backend/src/server.py +++ b/backend/src/server.py @@ -16,13 +16,13 @@ def get_all_entries(): """ with Database() as db: try: - entries_sql = db.execute_return("""SELECT id, name FROM proteins""") + entries_sql = db.execute_return("""SELECT id, name, filePDBAlphaFold, length, mass FROM proteins""") log.warn(entries_sql) # if we got a result back if entries_sql is not None: return [ - ProteinEntry(id=str(entry[0]), name=entry[1]) + ProteinEntry(id=str(entry[0]), name=entry[1], filePDBAlphaFold=entry[2], length=entry[3], mass=entry[4]) for entry in entries_sql ] except Exception as e: @@ -37,7 +37,7 @@ def get_protein_entry(protein_id: str): with Database() as db: try: entry_sql = db.execute_return( - """SELECT id, name FROM proteins + """SELECT id, name, filePDBAlphaFold, length, mass FROM proteins WHERE id = %s""", [protein_id], ) @@ -46,7 +46,7 @@ def get_protein_entry(protein_id: str): # if we got a result back if entry_sql is not None and len(entry_sql) != 0: # return the only entry - return ProteinEntry(id=str(entry_sql[0][0]), name=entry_sql[0][1]) + return ProteinEntry(id=str(entry_sql[0][0]), name=entry_sql[0][1], filePDBAlphaFold=entry_sql[0][2], length=entry_sql[0][3], mass=entry_sql[0][4]) except Exception as e: log.error(e)