Merge pull request #20 from AlexNikic/main

Added response options similarity matrix

Author: woodthom2

.gitmodules

@@ -1,8 +1,7 @@
-[submodule "harmony"]
-	path = harmony
-	url = https://github.com/harmonydata/harmony.git
-	branch = catalogue-match-instruments
 [submodule "mhc_embeddings"]
 	path = mhc_embeddings
 	url = https://github.com/harmonydata/mhc_embeddings.git
 	branch = main
+[submodule "harmony"]
+	path = harmony
+	url = https://github.com/AlexNikic/harmony.git

harmony

@@ -189,7 +189,6 @@ def parse_instruments(
     return instruments
 
 
-
 @router.post(
     path="/match", response_model=MatchResponse, status_code=status.HTTP_200_OK, response_model_exclude_none=True
 )
@@ -299,14 +298,18 @@ def match(
     else:
         query_similarity = None
 
+    # Response options similarity
+    response_options_similarity = match_response_from_library.response_options_similarity.tolist()
+
     return MatchResponse(
         instruments=instruments,
         questions=match_response_from_library.questions,
         matches=matches_jsonable,
         query_similarity=query_similarity,
         closest_catalogue_instrument_matches=closest_catalogue_instrument_matches,
         instrument_to_instrument_similarities=match_response_from_library.instrument_to_instrument_similarities,
-        clusters=match_response_from_library.clusters
+        clusters=match_response_from_library.clusters,
+        response_options_similarity=response_options_similarity
     )
 
 

harmony_api/routers/text_router.py

@@ -123,7 +123,7 @@
 class TestMatch(unittest.TestCase):
 
     def test_gad_7_correct_size_dictionary_response(self):
-        self.assertEqual(7, len(response.json()))
+        self.assertEqual(8, len(response.json()))
 
     def test_gad_7_first_question_conserved(self):
         self.assertEqual("Feeling nervous, anxious, or on edge", response.json()["questions"][0]["question_text"])

tests/local_tests/test_match_local.py

@@ -1477,7 +1477,7 @@
 class TestMatchBiggerPayload(unittest.TestCase):
 
     def test_big_match_command(self):
-        self.assertEqual(7, len(response.json()))
+        self.assertEqual(8, len(response.json()))
 
 
 if __name__ == '__main__':

tests/local_tests/test_match_local_bigger.py

@@ -62,7 +62,7 @@
 class TestMatch(unittest.TestCase):
 
     def test_negation_instrument_correct_size_dictionary_response(self):
-        self.assertEqual(7, len(response.json()))
+        self.assertEqual(8, len(response.json()))
 
     def test_negation_instrument_first_question_conserved(self):
         self.assertEqual("I feel nervous", response.json()["questions"][0]["question_text"])