Merge branch 'master' into cdcUpdateTest

server/lib/nl/detection/llm_fallback.py

@@ -60,6 +60,10 @@ def need_llm(heuristic: Detection, prev_uttr: Utterance,
   need_sv = False
   need_place = False
 
+  # Do not use LLM when an entity has been identified.
+  if _has_entity(heuristic):
+    return NeedLLM.No
+
   # 1. If there was no SV or prop.
   if _has_no_sv(heuristic, ctr) and _has_no_prop(heuristic, ctr):
 
@@ -79,8 +83,8 @@ def need_llm(heuristic: Detection, prev_uttr: Utterance,
       ctr.info('info_fallback_no_sv_found', '')
       need_sv = True
 
-  # 2. If there was no place or entity.
-  if _has_no_place(heuristic) and _has_no_entity(heuristic):
+  # 2. If there was no place and no entity.
+  if _has_no_place(heuristic) and not _has_entity(heuristic):
 
     # For COUNTRY contained-in type, Earth is assumed
     # (e.g., countries with worst health), so exclude that.
@@ -118,8 +122,8 @@ def _has_no_prop(d: Detection, ctr: counters.Counters) -> bool:
       d.svs_detected.prop, d.svs_detected.sv_threshold, ctr)
 
 
-def _has_no_entity(d: Detection) -> bool:
-  return not d.places_detected or not d.places_detected.entities_found
+def _has_entity(d: Detection) -> bool:
+  return d.places_detected and d.places_detected.entities_found
 
 
 #