Add bot filtering modes to aggregation explorer

front_end/src/app/(main)/aggregation-explorer/components/aggregation_graph_panel.tsx

@@ -90,6 +90,7 @@ export default function AggregationGraphPanel({
         choice: method.id,
         label: method.label,
         includeBots: method.includeBots,
+        onlyBots: method.onlyBots,
         color: colorById.get(method.id) ?? METAC_COLORS.gray["400"],
       })),
     [methods, colorById]

front_end/src/app/(main)/aggregation-explorer/components/aggregation_method_selector.tsx

@@ -15,6 +15,8 @@ import LoadingIndicator from "@/components/ui/loading_indicator";
 import Switch from "@/components/ui/switch";
 import { useAuth } from "@/contexts/auth_context";
 
+type BotMode = "exclude" | "include" | "only";
+
 import AggregationLabel from "./aggregation_label";
 import {
   AGGREGATION_EXPLORER_OPTIONS,
@@ -99,6 +101,7 @@ type Props = {
     joinedBeforeDate?: string;
     userIds?: number[];
     includeBots?: boolean;
+    onlyBots?: boolean;
   }) => void;
   defaultIncludeBots?: boolean;
 };
@@ -120,7 +123,9 @@ export default function AggregationMethodSelector({
     AggregationMethod.recency_weighted
   );
   const [selectedChildId, setSelectedChildId] = useState<string | null>(null);
-  const [includeBots, setIncludeBots] = useState(defaultIncludeBots);
+  const [botMode, setBotMode] = useState<BotMode>(
+    defaultIncludeBots ? "include" : "exclude"
+  );
   const [joinedBeforeDate, setJoinedBeforeDate] = useState("");
   const [userFilterEnabled, setUserFilterEnabled] = useState(false);
   const [userIdsText, setUserIdsText] = useState("");
@@ -224,11 +229,18 @@ export default function AggregationMethodSelector({
           ) : null}
 
           {showBotToggle ? (
-            <div className="mt-3 flex items-center justify-between">
+            <div className="mt-3">
               <label className="text-xs font-medium uppercase tracking-wide text-gray-600 dark:text-gray-400">
-                {t("includeBots")}
+                {t("bots")}
               </label>
-              <Switch checked={includeBots} onChange={setIncludeBots} />
+              <StyledSelect
+                value={botMode}
+                onChange={(e) => setBotMode(e.target.value as BotMode)}
+              >
+                <option value="exclude">{t("excludeBots")}</option>
+                <option value="include">{t("includeBots")}</option>
+                <option value="only">{t("onlyBots")}</option>
+              </StyledSelect>
             </div>
           ) : null}
 
@@ -269,7 +281,10 @@ export default function AggregationMethodSelector({
                   parsedUserIds.length
                     ? parsedUserIds
                     : undefined,
-                includeBots: showBotToggle ? includeBots : undefined,
+                includeBots:
+                  showBotToggle && botMode === "include" ? true : undefined,
+                onlyBots:
+                  showBotToggle && botMode === "only" ? true : undefined,
               });
             }}
           >

front_end/src/app/(main)/aggregation-explorer/hooks/aggregation-data.ts

@@ -26,10 +26,12 @@ export function buildConfigId(
   optionId: string,
   includeBots: boolean,
   joinedBeforeDate?: string,
-  userIds?: number[]
+  userIds?: number[],
+  onlyBots?: boolean
 ): string {
   const parts = [optionId];
-  if (includeBots) parts.push("bots");
+  if (onlyBots) parts.push("obots");
+  else if (includeBots) parts.push("bots");
   if (joinedBeforeDate) parts.push(joinedBeforeDate);
   if (userIds?.length)
     parts.push(`u${[...userIds].sort((a, b) => a - b).join(",")}`);
@@ -42,6 +44,7 @@ export type SelectedAggregationConfig = {
   joinedBeforeDate?: string;
   userIds?: number[];
   includeBots?: boolean;
+  onlyBots?: boolean;
   enabled?: boolean;
 };
 
@@ -52,6 +55,7 @@ export type AggregationQueryResult = {
   chips: string[]; // filter chips derived from config (for display in label component)
   method: string; // option.id, used for API response lookup
   includeBots: boolean;
+  onlyBots: boolean;
   joinedBeforeDate?: string;
   userIds?: number[];
   isPending: boolean;
@@ -106,7 +110,7 @@ export function buildDisplayLabel(
   option: AggregationOption,
   config: Pick<
     SelectedAggregationConfig,
-    "joinedBeforeDate" | "userIds" | "includeBots" | "optionId"
+    "joinedBeforeDate" | "userIds" | "includeBots" | "onlyBots" | "optionId"
   >
 ): string {
   let label =
@@ -115,7 +119,9 @@ export function buildDisplayLabel(
       ? t("usersJoinedBefore", { date: config.joinedBeforeDate })
       : t(option.labelKey as Parameters<TranslateFunction>[0]);
 
-  if (option.supportsBotToggle && config.includeBots) {
+  if (option.supportsBotToggle && config.onlyBots) {
+    label += ` (${t("onlyBots")})`;
+  } else if (option.supportsBotToggle && config.includeBots) {
     label += ` (${t("withBots")})`;
   }
 
@@ -140,13 +146,14 @@ export function buildChips(
   t: TranslateFunction,
   config: Pick<
     SelectedAggregationConfig,
-    "joinedBeforeDate" | "userIds" | "includeBots"
+    "joinedBeforeDate" | "userIds" | "includeBots" | "onlyBots"
   >
 ): string[] {
   const chips: string[] = [];
   if (config.joinedBeforeDate)
     chips.push(t("beforeDate", { date: config.joinedBeforeDate }));
-  if (config.includeBots) chips.push(t("withBots"));
+  if (config.onlyBots) chips.push(t("onlyBots"));
+  else if (config.includeBots) chips.push(t("withBots"));
   if (config.userIds?.length)
     chips.push(t("usersFilterLabel", { ids: config.userIds.join(", ") }));
   return chips;
@@ -177,6 +184,7 @@ export function useAggregationData({
           postId,
           questionId,
           includeBots: config.includeBots,
+          onlyBots: config.onlyBots,
           aggregationMethods: option.id,
           joinedBeforeDate: config.joinedBeforeDate,
           userIds: config.userIds,
@@ -203,6 +211,7 @@ export function useAggregationData({
           chips: buildChips(t, config),
           method: option.id,
           includeBots: !!config.includeBots,
+          onlyBots: !!config.onlyBots,
           joinedBeforeDate: config.joinedBeforeDate,
           userIds: config.userIds,
           isPending: query.isPending,

front_end/src/app/(main)/aggregation-explorer/hooks/explorer-state.ts

@@ -145,12 +145,14 @@ export function useExplorerState(postData: PostWithForecasts) {
     joinedBeforeDate?: string;
     userIds?: number[];
     includeBots?: boolean;
+    onlyBots?: boolean;
   }) => {
     const configId = buildConfigId(
       payload.optionId,
       payload.includeBots ?? false,
       payload.joinedBeforeDate,
-      payload.userIds
+      payload.userIds,
+      payload.onlyBots
     );
     void setSelectedConfigs((prev) => {
       if (prev.some((c) => c.id === configId)) return prev;
@@ -162,6 +164,7 @@ export function useExplorerState(postData: PostWithForecasts) {
           joinedBeforeDate: payload.joinedBeforeDate,
           userIds: payload.userIds,
           includeBots: payload.includeBots,
+          onlyBots: payload.onlyBots,
           enabled: true,
         },
       ];

front_end/src/app/(main)/aggregation-explorer/hooks/query-state.ts

@@ -56,7 +56,8 @@ function parseConfigSpec(spec: string): SelectedAggregationConfig | null {
   const optionId = parts[0];
   if (!optionId || !VALID_AGGREGATION_METHODS.has(optionId)) return null;
 
-  const includeBots = parts.includes("bots");
+  const onlyBots = parts.includes("obots");
+  const includeBots = !onlyBots && parts.includes("bots");
   const joinedBeforeDate = parts.find((p) => /^\d{4}-\d{2}-\d{2}$/.test(p));
   const userIdsStr = parts.find((p) => /^u\d/.test(p));
   const userIds = userIdsStr
@@ -71,6 +72,7 @@ function parseConfigSpec(spec: string): SelectedAggregationConfig | null {
     id,
     optionId: optionId as AggregationMethod,
     includeBots: includeBots || undefined,
+    onlyBots: onlyBots || undefined,
     joinedBeforeDate,
     userIds: userIds?.length ? userIds : undefined,
     enabled: disabled ? false : undefined,

front_end/src/app/(main)/aggregation-explorer/types.ts

@@ -68,5 +68,6 @@ export type AggregationTooltip = {
   choice: string;
   label: string;
   includeBots: boolean;
+  onlyBots: boolean;
   color: ThemeColor;
 };

front_end/src/services/api/aggregation_explorer/aggregation_explorer.shared.ts

@@ -6,6 +6,7 @@ type AggregationExplorerParams = {
   postId?: number | string | null;
   questionId?: number | string | null;
   includeBots?: boolean;
+  onlyBots?: boolean;
   aggregationMethods?: string;
   userIds?: number[];
   joinedBeforeDate?: string;
@@ -17,6 +18,7 @@ class AggregationExplorerApi extends ApiService {
       post_id: params.postId?.toString() || "",
       question_id: params.questionId?.toString() || "",
       include_bots: params.includeBots?.toString() || "false",
+      only_bots: params.onlyBots?.toString() || "false",
       aggregation_methods: params.aggregationMethods || "",
       joined_before_date: params.joinedBeforeDate || "",
       ...(params.userIds !== undefined ? { user_ids: params.userIds } : {}),

utils/serializers.py

@@ -84,6 +84,7 @@ class DataGetRequestSerializer(serializers.Serializer):
         child=serializers.IntegerField(), required=False, allow_null=True
     )
     include_bots = serializers.BooleanField(required=False, allow_null=True)
+    only_bots = serializers.BooleanField(required=False, allow_null=True)
     anonymized = serializers.BooleanField(required=False)
     joined_before_date = serializers.DateTimeField(required=False)
     include_key_factors = serializers.BooleanField(required=False, default=False)
@@ -139,6 +140,7 @@ def validate(self, attrs):
             "include_user_data",
             "user_ids",
             "include_bots",
+            "only_bots",
             "anonymized",
             "joined_before_date",
             "include_key_factors",
@@ -152,13 +154,17 @@ def validate(self, attrs):
         aggregation_methods = attrs.get("aggregation_methods")
         user_ids = attrs.get("user_ids")
         include_bots = attrs.get("include_bots")
+        only_bots = attrs.get("only_bots")
         minimize = attrs.get("minimize", True)
 
         if not aggregation_methods and (
-            (user_ids is not None) or (include_bots is not None) or not minimize
+            (user_ids is not None)
+            or (include_bots is not None)
+            or (only_bots is not None)
+            or not minimize
         ):
             raise serializers.ValidationError(
-                "If user_ids, include_bots, or minimize is set, "
+                "If user_ids, include_bots, only_bots, or minimize is set, "
                 "aggregation_methods must also be set."
             )
 

utils/the_math/aggregations.py

@@ -736,6 +736,7 @@ def get_aggregations_at_time(
     include_stats: bool = False,
     histogram: bool = False,
     include_bots: bool = False,
+    only_bots: bool = False,
     joined_before: datetime | None = None,
 ) -> dict[AggregationMethod, AggregateForecast]:
     """set include_stats to True if you want to include num_forecasters, q1s, medians,
@@ -747,11 +748,15 @@ def get_aggregations_at_time(
     )
     if only_include_user_ids:
         forecasts = forecasts.filter(author_id__in=only_include_user_ids)
+    elif only_bots:
+        forecasts = forecasts.filter(author__is_bot=True)
     else:
-        # only include forecasts by non-primary bots if user ids explicitly specified
+        # only include forecasts by non-primary bots or blacklisted users
+        # if user ids explicitly specified
         forecasts = forecasts.exclude_non_primary_bots()
-    if not include_bots:
-        forecasts = forecasts.exclude(author__is_bot=True)
+        forecasts = forecasts.exclude_blacklisted_users()
+        if not include_bots:
+            forecasts = forecasts.exclude(author__is_bot=True)
     if len(forecasts) == 0:
         return dict()
     forecast_set = ForecastSet(
@@ -980,6 +985,7 @@ def get_aggregation_history(
     minimize: bool | int = True,
     include_stats: bool = True,
     include_bots: bool = False,
+    only_bots: bool = False,
     histogram: bool | None = None,
     include_future: bool = True,
     joined_before: datetime | None = None,
@@ -999,11 +1005,15 @@ def get_aggregation_history(
 
         if only_include_user_ids:
             forecasts = forecasts.filter(author_id__in=only_include_user_ids)
+        elif only_bots:
+            forecasts = forecasts.filter(author__is_bot=True)
         else:
-            # only include forecasts by non-primary bots if user ids explicitly specified
+            # only include forecasts by non-primary bots or blacklisted users
+            # if user ids explicitly specified
             forecasts = forecasts.exclude_non_primary_bots()
-        if not include_bots:
-            forecasts = forecasts.exclude(author__is_bot=True)
+            forecasts = forecasts.exclude_blacklisted_users()
+            if not include_bots:
+                forecasts = forecasts.exclude(author__is_bot=True)
 
     if include_pre_predictions:
         earliest_time = None

utils/views.py

@@ -74,6 +74,7 @@ def aggregation_explorer_api_view(request) -> Response:
     aggregation_methods = params.get("aggregation_methods", [])
     only_include_user_ids = params.get("user_ids")
     include_bots = params.get("include_bots")
+    only_bots = params.get("only_bots") or False
     minimize = params.get("minimize", True)
     joined_before = params.get("joined_before_date")
 
@@ -88,6 +89,7 @@ def aggregation_explorer_api_view(request) -> Response:
             if include_bots is not None
             else question.include_bots_in_aggregates
         ),
+        only_bots=only_bots,
         histogram=True,
         include_future=False,
         joined_before=joined_before,
@@ -107,6 +109,8 @@ def aggregation_explorer_api_view(request) -> Response:
     forecasters_qs = question.get_forecasters()
     if only_include_user_ids:
         forecasters_qs = forecasters_qs.filter(id__in=only_include_user_ids)
+    elif only_bots:
+        forecasters_qs = forecasters_qs.filter(is_bot=True)
     elif not include_bots:
         forecasters_qs = forecasters_qs.filter(is_bot=False)