Remove probe sequential species experiment; keep probe pick cap

psq_rag/llm/select.py

@@ -1563,23 +1563,6 @@ def _split_probe_tags_by_bundle(
     return out
 
 
-def _species_cap_from_count_tags(selected_tags: Sequence[str]) -> Optional[int]:
-    """Derive species max-picks cap from count-like probe tags."""
-    s = set(selected_tags)
-    if "zero_pictured" in s:
-        return 0
-    if "solo" in s:
-        return 1
-    if "duo" in s:
-        return 2
-    if "trio" in s:
-        return 3
-    if "group" in s:
-        # Conservative finite cap for open-ended "group".
-        return 4
-    return None
-
-
 def llm_infer_probe_tags(
     query_text: str,
     log=None,
@@ -1644,15 +1627,10 @@ def llm_infer_probe_tags(
     if max_pick_override < 0:
         max_pick_override = 0
 
-    sequential_species = (os.environ.get("PSQ_PROBE_SEQUENTIAL_SPECIES", "0") or "0").strip().lower() in {
-        "1", "true", "yes", "on"
-    }
-
     def _call_chunks(
         chunks: Sequence[Sequence[str]],
         *,
         label: str,
-        max_pick_cap: Optional[int] = None,
     ) -> List[str]:
         out_tags: List[str] = []
         out_seen: Set[str] = set()
@@ -1666,8 +1644,6 @@ def llm_infer_probe_tags(
             per_call_budget = len(chunk_tags)
             if max_pick_override > 0:
                 per_call_budget = min(per_call_budget, max_pick_override)
-            if max_pick_cap is not None:
-                per_call_budget = min(per_call_budget, max(0, int(max_pick_cap)))
             if per_call_budget <= 0:
                 if log:
                     log(f"Stage3p {label}: skipping call with budget=0")
@@ -1699,34 +1675,8 @@ def llm_infer_probe_tags(
                         out_tags.append(t)
         return out_tags
 
-    selected: List[str] = []
-
-    if sequential_species:
-        bundle_by_tag = _probe_bundle_map(log=log)
-        species_tags = [t for t in probe_tags if bundle_by_tag.get(t, "") == "species_taxonomy"]
-        non_species_tags = [t for t in probe_tags if t not in set(species_tags)]
-        if log:
-            log(
-                "Stage3p: sequential species mode on "
-                f"(non_species={len(non_species_tags)}, species={len(species_tags)})"
-            )
-
-        non_species_chunks = _split_probe_tags_by_bundle(non_species_tags, split_calls, log=log) if non_species_tags else []
-        selected_non_species = _call_chunks(non_species_chunks, label="non_species")
-        selected.extend(selected_non_species)
-
-        if species_tags:
-            species_cap = _species_cap_from_count_tags(selected_non_species)
-            if log:
-                log(f"Stage3p: species cap from count tags = {species_cap!r}")
-            species_chunks = [species_tags]
-            selected_species = _call_chunks(species_chunks, label="species", max_pick_cap=species_cap)
-            for t in selected_species:
-                if t not in selected:
-                    selected.append(t)
-    else:
-        probe_chunks = _split_probe_tags_by_bundle(probe_tags, split_calls, log=log)
-        selected = _call_chunks(probe_chunks, label="all")
+    probe_chunks = _split_probe_tags_by_bundle(probe_tags, split_calls, log=log)
+    selected: List[str] = _call_chunks(probe_chunks, label="all")
 
     selected = _apply_species_anchor_mapping(selected, query_text=query_text, log=log)