Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 0 additions & 8 deletions server/integration_tests/explore_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,6 @@ def test_detection_basic_sfr(self):
def test_detection_sdg(self):
self.run_detection('detection_api_sdg', ['Health in USA'], dc='sdg')

def test_detection_bio(self):
self.run_detection('detection_api_bio', [
'What is the phylum of volvox?',
'What types of genes are FGFR1, APOE, and ACHE?',
],
dc='bio',
check_detection=True)

Comment on lines -324 to -331
Copy link
Contributor

Choose a reason for hiding this comment

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

@shixiao-coder In order to get NL tests to pass, I'm seeing I need to remove this test -- we've removed the bio BT tables, so I think this is the right change to make.

Copy link
Contributor

Choose a reason for hiding this comment

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

yep, agreed

def test_detection_multivar(self):
self.run_detection(
'detection_api_multivar',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,149 +3,33 @@
"places_resolved": "",
"main_place_dcid": "<None>",
"main_place_name": "<None>",
"entities_detected": [
"volvox"
],
"entities_resolved": "(name: Volvox, dcid: bio/D044446); (name: Volvox, dcid: bio/Volvox); ",
"query_with_places_removed": "what is the phylum of",
"entities_detected": [],
"entities_resolved": "",
"query_with_places_removed": "",
"sv_matching": {
"CosineScore": [
0.35511,
0.34609,
0.34526,
0.34485,
0.34114,
0.3385,
0.33499,
0.33166,
0.32601,
0.32424,
0.32061,
0.31427,
0.31277,
0.31263,
0.3125,
0.31177,
0.31034,
0.31007,
0.30988,
0.30805,
0.30746,
0.3072,
0.30394
],
"CosineScore": [],
"MultiSV": {},
"Query": "what is the phylum of",
"SV": [
"dc/topic/SDGBiodiversity",
"Count_Person_5OrMoreYears_OtherIndicLanguagesSpokenAtHome",
"Annual_Amount_Emissions_Phenol_SCC_28_MiscellaneousAreaSources",
"Annual_Amount_Emissions_Phenol_SCC_3_IndustrialProcesses",
"Annual_Amount_Emissions_Phenol_SCC_26_WasteDisposalTreatmentAndRecovery",
"Count_Person_5OrMoreYears_GreekSpokenAtHome",
"Annual_Amount_Emissions_Phenol_SCC_23_IndustrialProcesses",
"Amount_FarmInventory_SorghumForSilageOrGreenchop",
"Count_Person_5OrMoreYears_PersianInclFarsiDariSpokenAtHome",
"Count_Person_SpeakEnglishLessThanVeryWell_5OrMoreYears_PersianSpokenAtHome",
"Count_Farm_SorghumForSilageOrGreenchop",
"Annual_Amount_Emissions_Phenol_SCC_22_MobileSources",
"Count_Person_SpeakEnglishLessThanVeryWell_5OrMoreYears_PersianInclFarsiDariSpokenAtHome",
"Amount_FarmInventory_BarleyForGrain",
"Count_Person_5OrMoreYears_OtherAndUnspecifiedLanguagesSpokenAtHome",
"Count_Person_5OrMoreYears_MalayalamKannadaOrOtherDravidianLanguagesSpokenAtHome",
"Amount_FarmInventory_DurumWheatForGrain",
"Count_Person_SpeakEnglishVeryWell_5OrMoreYears_PersianInclFarsiDariSpokenAtHome",
"Count_Person_SpeakEnglishVeryWell_5OrMoreYears_MalayalamKannadaOrOtherDravidianLanguagesSpokenAtHome",
"Count_Person_SpeakEnglishVeryWell_5OrMoreYears_GreekSpokenAtHome",
"Annual_Amount_Emissions_Phenol_SCC_2_InternalCombustionEngines",
"Amount_FarmInventory_CornForSilageOrGreenchop",
"Count_Person_5OrMoreYears_OtherSlavicLanguagesSpokenAtHome"
]
"Query": "What is the phylum of volvox?",
"SV": []
},
"props_matching": {
"CosineScore": [
1.0,
0.47528,
0.36154,
0.34543,
0.34543,
0.34201,
0.32933,
0.31845,
0.31467,
0.3084,
0.30794,
0.28188,
0.27151,
0.27072,
0.2599,
0.2599,
0.24828,
0.24735,
0.24662,
0.24616,
0.23899,
0.23136,
0.23029,
0.22962,
0.22774,
0.22173,
0.21856,
0.21693
],
"PROP": [
"phylum",
"chemblID",
"geneID",
"<-compoundID{typeOf:ChemicalCompoundGeneticVariantAssociation}->variantID",
"<-variantID{typeOf:ChemicalCompoundGeneticVariantAssociation}->compoundID",
"virusGenus",
"typeOfGene",
"fullName",
"ensemblID",
"simplifiedMolecularInputLineEntrySystem",
"geneticVariantFunctionalCategory",
"chromosomeSize",
"virusHost",
"strandOrientation",
"<-geneID{typeOf:GeneGeneticVariantAssociation}->variantID",
"<-variantID{typeOf:GeneGeneticVariantAssociation}->geneID",
"ncbiProteinAccessionNumber",
"hgncID",
"alleleType",
"ofVirusSpecies",
"hasGenomicCoordinates",
"ncbiTaxId",
"umlsConceptUniqueID",
"antigenType",
"alleleOrigin",
"<-diseaseID{typeOf:DiseaseGeneAssociation}->geneID",
"antibodyType",
"inChIKey"
]
"CosineScore": [],
"PROP": []
},
"query_detection_debug_logs": {
"dc_recognize_entities": {
"volvox": [
"bio/D044446",
"bio/Volvox"
]
},
"dc_recognize_entities": {},
"dc_recognize_places": {},
"llm_response": {},
"main_place_inferred": null,
"original_query": "What is the phylum of volvox",
"place_dcid_inference": "Place DCID Inference did not trigger (no place strings found).",
"place_resolution": "Place resolution did not trigger (no place dcids found).",
"places_found_str": [],
"query_transformations": {
"place_detection_input": "What is the phylum of volvox",
"place_detection_with_places_removed": "what is the phylum of",
"sv_detection_query_index_types": [
"medium_ft",
"bio_ft"
],
"sv_detection_query_input": "what is the phylum of",
"sv_detection_query_stop_words_removal": "phylum"
]
}
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,13 @@
],
"peerPlaces": [],
"peerTopics": [
{
"dcid": "dc/topic/EconomicActivity",
"name": "Economic Activity",
"types": [
"Topic"
]
},
{
"dcid": "dc/topic/GlobalEconomicActivity",
"name": "Global Economic Activity",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,23 +377,23 @@
{
"tiles": [
{
"placeDcidOverride": "country/RWA",
"placeDcidOverride": "country/ETH",
"statVarKey": [
"Amount_EconomicActivity_GrossDomesticProduction_Nominal_growth_pc"
],
"title": "Rwanda",
"title": "Ethiopia",
"type": "LINE"
}
]
},
{
"tiles": [
{
"placeDcidOverride": "country/ETH",
"placeDcidOverride": "country/RWA",
"statVarKey": [
"Amount_EconomicActivity_GrossDomesticProduction_Nominal_growth_pc"
],
"title": "Ethiopia",
"title": "Rwanda",
"type": "LINE"
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,68 +1,15 @@
{
"client": "test_detect-and-fulfill",
"config": {
"categories": [
{
"blocks": [
{
"columns": [
{
"tiles": [
{
"answerTableTileSpec": {
"columns": [
{
"header": "Has Genomic Coordinates",
"propertyExpr": "->hasGenomicCoordinates"
}
]
},
"entities": [
"bio/ncbi_109457387",
"bio/ncbi_421941"
],
"title": "The Has Genomic Coordinates for PQLC3 are as follows:",
"type": "ANSWER_TABLE"
}
]
}
]
}
]
}
]
},
"config": {},
"context": {},
"debug": {},
"entities": [
{
"dcid": "bio/ncbi_109457387",
"name": "PQLC3",
"type": ""
},
{
"dcid": "bio/ncbi_421941",
"name": "PQLC3",
"type": ""
}
],
"pastSourceContext": "",
"place": {},
"placeFallback": {},
"placeSource": "UNKNOWN",
"places": [],
"relatedThings": {
"childPlaces": {},
"childTopics": [],
"exploreMore": {},
"mainTopics": [],
"parentPlaces": [],
"parentTopics": [],
"peerPlaces": [],
"peerTopics": []
"failure": "Sorry, could not complete your request. No entity found in the query.",
"place": {
"dcid": "",
"name": "",
"place_type": ""
},
"svSource": "UNKNOWN",
"userMessages": [
"See relevant information based on the previous query."
"Sorry, could not complete your request. No entity found in the query."
]
}
Loading
Loading