From 1ae340e297ebfaa8946bcea419a631bd7ff2e457 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Fri, 27 Jun 2025 19:10:25 +0000 Subject: [PATCH 1/2] Updating reference tables --- simple_app/utils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/simple_app/utils.py b/simple_app/utils.py index fa8a483..594048f 100644 --- a/simple_app/utils.py +++ b/simple_app/utils.py @@ -1186,14 +1186,14 @@ def main_utils(): REFERENCE_TABLES = [ - 'Publications', - 'Telescopes', - 'Instruments', - 'Modes', - 'PhotometryFilters', - 'Versions', - 'Parameters', - 'Regimes' + "Publications", + "Telescopes", + "Instruments", + "PhotometryFilters", + "Versions", + "Parameters", + "Regimes", + "CompanionList" ] if __name__ == '__main__': From 0d1432f6f612da5aa512f8556c9d5abc84ea6635 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Fri, 27 Jun 2025 19:24:12 +0000 Subject: [PATCH 2/2] updating test --- simple_app/tests/test_utils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/simple_app/tests/test_utils.py b/simple_app/tests/test_utils.py index fda6862..2c154cc 100644 --- a/simple_app/tests/test_utils.py +++ b/simple_app/tests/test_utils.py @@ -130,11 +130,13 @@ def test_one_df_query(db): assert db bad_query = 'thisisabadquery' good_query = 'twa' + # test search object results = db.search_object(bad_query, fmt='pandas') assert not len(results) # bad query should return empty table results = db.search_object(good_query, fmt='pandas') assert isinstance(results, pd.DataFrame) + # test search string with pytest.raises(KeyError): ref_results: Optional[dict] = db.search_string(bad_query, fmt='pandas', verbose=False) @@ -146,9 +148,11 @@ def test_one_df_query(db): filtered_results: Optional[pd.DataFrame] = results.merge(ref_sources, on='source', suffixes=(None, 'extra')) assert isinstance(filtered_results, pd.DataFrame) filtered_results.drop(columns=list(filtered_results.filter(regex='extra')), inplace=True) + # test one_df_query stringed_results = one_df_query(filtered_results) assert isinstance(stringed_results, str) + # test sql query with pytest.raises(OperationalError): _ = db.sql_query('notasqlquery', fmt='pandas') @@ -156,11 +160,14 @@ def test_one_df_query(db): _ = db.sql_query('select * from NotaTable', fmt='pandas') with pytest.raises(OperationalError): _ = db.sql_query('select * from Sources where notacolumn == "asdf"', fmt='pandas') - raw_sql_query = db.sql_query('select * from Sources where source == "Luhman 16"', fmt='pandas') + + # Using a source that returns a single row + raw_sql_query = db.sql_query('select * from Sources where source == "WISE J104915.57-531906.1"', fmt='pandas') assert isinstance(raw_sql_query, pd.DataFrame) + + # Testing conversion to a markdown string stringed_results = one_df_query(raw_sql_query) assert isinstance(stringed_results, str) - return def test_multi_df_query(db):