Removed the 'exclude text' from exa searcher

code_tests/low_cost_or_live_api_tests/test_exa_model.py

@@ -96,14 +96,12 @@ async def test_filtered_invoke() -> None:
     model = ExaSearcher(
         num_results=num_results, include_highlights=False, include_text=True
     )
-    exclude_domains = ["alliance.health"]
     search = SearchInput(
         web_search_query="coronavirus",
         highlight_query=None,
         include_domains=[],
-        exclude_domains=exclude_domains,
+        exclude_domains=["alliance.health"],
         include_text="pregnancy",
-        exclude_text="symptoms",
         start_published_date=datetime(2022, 11, 1),
         end_published_date=datetime(2022, 11, 30),
     )
@@ -117,13 +115,11 @@ async def test_filtered_invoke() -> None:
         assert source.published_date <= search.end_published_date
         assert source.published_date >= search.start_published_date
         assert search.include_text is not None
-        assert search.exclude_text is not None
         assert search.include_text in source.text
-        assert search.exclude_text not in source.text
         assert source.url is not None
         assert all(
             exclude_domain not in source.url
-            for exclude_domain in exclude_domains
+            for exclude_domain in search.exclude_domains
         )
         assert len(source.highlights) == 0
         assert len(source.highlight_scores) == 0

code_tests/low_cost_or_live_api_tests/test_metaculus_api.py

@@ -128,12 +128,20 @@ def test_get_questions_from_tournament() -> None:
     questions = MetaculusApi.get_all_open_questions_from_tournament(
         ForecastingTestManager.TOURN_WITH_OPENNESS_AND_TYPE_VARIATIONS
     )
-    assert any(isinstance(question, BinaryQuestion) for question in questions)
-    assert any(isinstance(question, NumericQuestion) for question in questions)
-    assert any(isinstance(question, DateQuestion) for question in questions)
-    assert any(
+    score = 0
+    if any(isinstance(question, BinaryQuestion) for question in questions):
+        score += 1
+    if any(isinstance(question, NumericQuestion) for question in questions):
+        score += 1
+    if any(isinstance(question, DateQuestion) for question in questions):
+        score += 1
+    if any(
         isinstance(question, MultipleChoiceQuestion) for question in questions
-    )
+    ):
+        score += 1
+    assert (
+        score > 1
+    ), "There needs to be multiple question types in the tournament"
 
     for question in questions:
         assert question.state == QuestionState.OPEN
@@ -188,28 +196,6 @@ def test_get_benchmark_questions(num_questions_to_get: int) -> None:
     ), "Questions retrieved with same random seed should return same IDs"
 
 
-def test_get_questions_from_current_quartely_cup() -> None:
-    expected_question_text = "Will BirdCast report 1 billion birds flying over the United States at any point before January 1, 2025?"
-    questions = (
-        MetaculusApi._get_open_binary_questions_from_current_quarterly_cup()
-    )
-
-    if ForecastingTestManager.quarterly_cup_is_not_active():
-        assert len(questions) == 0
-    else:
-        assert len(questions) > 0
-        assert any(
-            question.question_text == expected_question_text
-            for question in questions
-        )
-        assert all(
-            question.state == QuestionState.OPEN for question in questions
-        ), "Expected all questions to be open"
-        assert all(
-            isinstance(question, BinaryQuestion) for question in questions
-        ), "Expected all questions to be binary"
-
-
 def assert_basic_question_attributes_not_none(
     question: MetaculusQuestion, question_id: int
 ) -> None:

code_tests/low_cost_or_live_api_tests/test_smart_searcher.py

@@ -62,16 +62,6 @@ async def test_ask_question_empty_prompt() -> None:
         await searcher.invoke("")
 
 
-async def test_screenshot_question() -> None:
-    with MonetaryCostManager() as cost_manager:
-        searcher = SmartSearcher(num_sites_to_deep_dive=2)
-        question = "When was the most noticeable recent dip in the graph from https://fred.stlouisfed.org/series/GDPC1? Say 0 if you do not know. Please search specifically for the site itself."
-        result = await searcher.invoke(question)
-        logger.info(f"Result: {result}")
-        logger.info(f"Cost: {cost_manager.current_usage}")
-        assert "2020" in result
-
-
 @pytest.mark.skip("Run this when needed as it's purely a qualitative test")
 async def test_screenshot_question_2() -> None:
     with MonetaryCostManager() as cost_manager:

forecasting_tools/ai_models/exa_searcher.py

@@ -70,9 +70,6 @@ class SearchInput(BaseModel, Jsonable):
     include_text: str | None = Field(
         description="A 1-5 word phrase that must be exactly present in the text of the search results"
     )
-    exclude_text: str | None = Field(
-        description="A 1-5 word phrase that must not be present in the text of the search results"
-    )
     start_published_date: datetime | None = Field(
         description="The earliest publication date for search results"
     )
@@ -212,8 +209,6 @@ def _prepare_request_data(
             payload["endPublishedDate"] = search.end_published_date.isoformat()
         if search.include_text:
             payload["includeText"] = [search.include_text]
-        if search.exclude_text:
-            payload["excludeText"] = [search.exclude_text]
 
         return url, headers, payload
 
@@ -225,7 +220,6 @@ def __get_default_search_strategy(cls, search_query: str) -> SearchInput:
             include_domains=[],
             exclude_domains=[],
             include_text=None,
-            exclude_text=None,
             start_published_date=None,
             end_published_date=None,
         )

forecasting_tools/forecasting/helpers/metaculus_api.py

@@ -246,24 +246,6 @@ def __get_general_open_binary_questions_resolving_in_3_months(
         )
         return checked_questions
 
-    @classmethod
-    def _get_open_binary_questions_from_current_quarterly_cup(
-        cls,
-    ) -> list[BinaryQuestion]:
-        questions = cls.get_all_open_questions_from_tournament(
-            cls.CURRENT_QUARTERLY_CUP_ID,
-        )
-        binary_questions = [
-            question
-            for question in questions
-            if isinstance(question, BinaryQuestion)
-        ]
-        assert all(
-            isinstance(question, BinaryQuestion)
-            for question in binary_questions
-        )
-        return binary_questions  # type: ignore
-
     @classmethod
     def __get_questions_from_api(
         cls, params: dict[str, Any], use_old_api: bool = False
@@ -284,7 +266,9 @@ def __get_questions_from_api(
         supported_posts = [
             q
             for q in results
-            if "notebook" not in q and "group_of_questions" not in q
+            if "notebook" not in q
+            and "group_of_questions" not in q
+            and "conditional" not in q
         ]
         removed_posts = [
             post for post in results if post not in supported_posts