Merge pull request #30 from The-Obstacle-Is-The-Way/chore/env-cleanup-model-upgrade

.env.example

@@ -1,22 +1,30 @@
-# LLM Provider (choose one)
+# ============== LLM CONFIGURATION ==============
+
+# Provider: "openai" or "anthropic"
+LLM_PROVIDER=openai
+
+# API Keys (at least one required for full LLM analysis)
 OPENAI_API_KEY=sk-your-key-here
 ANTHROPIC_API_KEY=sk-ant-your-key-here
 
-# Optional: PubMed API key (higher rate limits)
-NCBI_API_KEY=your-ncbi-key-here
+# Model names (optional - sensible defaults)
+OPENAI_MODEL=gpt-5.1
+ANTHROPIC_MODEL=claude-sonnet-4-5-20250929
 
-# Optional: For HuggingFace deployment
-HF_TOKEN=hf_your-token-here
+# ============== AGENT CONFIGURATION ==============
 
-# Agent Config
 MAX_ITERATIONS=10
+SEARCH_TIMEOUT=30
 LOG_LEVEL=INFO
 
-# ============== PARTNER SERVICES (Mario's Modal Integration) ==============
+# ============== EXTERNAL SERVICES ==============
+
+# PubMed (optional - higher rate limits)
+NCBI_API_KEY=your-ncbi-key-here
 
-# Modal (Code Execution)
+# Modal Sandbox (optional - for secure code execution)
 MODAL_TOKEN_ID=ak-your-modal-token-id-here
 MODAL_TOKEN_SECRET=your-modal-token-secret-here
 
-# Vector Database
+# Vector Database (optional - for LlamaIndex RAG)
 CHROMA_DB_PATH=./chroma_db

src/app.py

@@ -68,9 +68,11 @@ def configure_orchestrator(
             if api_provider == "anthropic":
                 anthropic_provider = AnthropicProvider(api_key=user_api_key)
                 model = AnthropicModel(settings.anthropic_model, provider=anthropic_provider)
-            else:
+            elif api_provider == "openai":
                 openai_provider = OpenAIProvider(api_key=user_api_key)
                 model = OpenAIModel(settings.openai_model, provider=openai_provider)
+            else:
+                raise ValueError(f"Unsupported API provider: {api_provider}")
         judge_handler = JudgeHandler(model=model)
 
     return create_orchestrator(

src/utils/config.py

@@ -26,8 +26,10 @@ class Settings(BaseSettings):
     llm_provider: Literal["openai", "anthropic"] = Field(
         default="openai", description="Which LLM provider to use"
     )
-    openai_model: str = Field(default="gpt-4o", description="OpenAI model name")
-    anthropic_model: str = Field(default="claude-sonnet-4-20250514", description="Anthropic model")
+    openai_model: str = Field(default="gpt-5.1", description="OpenAI model name")
+    anthropic_model: str = Field(
+        default="claude-sonnet-4-5-20250929", description="Anthropic model"
+    )
 
     # Embedding Configuration
     # Note: OpenAI embeddings require OPENAI_API_KEY (Anthropic has no embeddings API)
@@ -52,23 +54,14 @@ class Settings(BaseSettings):
     # Logging
     log_level: Literal["DEBUG", "INFO", "WARNING", "ERROR"] = "INFO"
 
-    # Partner Service Configuration (Mario's Modal Integration)
+    # External Services
     modal_token_id: str | None = Field(default=None, description="Modal token ID")
     modal_token_secret: str | None = Field(default=None, description="Modal token secret")
     chroma_db_path: str = Field(default="./chroma_db", description="ChromaDB storage path")
-    enable_modal_analysis: bool = Field(
-        default=False,
-        description="Opt-in flag to enable Modal analysis. Must also have modal_available=True.",
-    )
 
     @property
     def modal_available(self) -> bool:
-        """Check if Modal credentials are configured (credentials check only).
-
-        Note: This is a credentials check, NOT an opt-in flag.
-        Use `enable_modal_analysis` to opt-in, then check `modal_available` for credentials.
-        Typical usage: `if settings.enable_modal_analysis and settings.modal_available`
-        """
+        """Check if Modal credentials are configured."""
         return bool(self.modal_token_id and self.modal_token_secret)
 
     def get_api_key(self) -> str:

tests/unit/tools/test_clinicaltrials.py

@@ -123,26 +123,21 @@ class TestClinicalTrialsTool:
                 await tool.search("metformin alzheimer")
 
 
-def _can_reach_clinicaltrials() -> bool:
-    """Check if ClinicalTrials.gov API is reachable."""
-    try:
-        resp = requests.get("https://clinicaltrials.gov/api/v2/studies", timeout=5)
-        return resp.status_code < 500
-    except (requests.RequestException, OSError):
-        return False
-
-
 class TestClinicalTrialsIntegration:
     """Integration tests (marked for separate run)."""
 
     @pytest.mark.integration
     @pytest.mark.asyncio
-    @pytest.mark.skipif(
-        not _can_reach_clinicaltrials(),
-        reason="ClinicalTrials.gov API not reachable (network/SSL issue)",
-    )
     async def test_real_api_call(self) -> None:
         """Test actual API call (requires network)."""
+        # Skip at runtime if API unreachable (avoids network call at collection time)
+        try:
+            resp = requests.get("https://clinicaltrials.gov/api/v2/studies", timeout=5)
+            if resp.status_code >= 500:
+                pytest.skip("ClinicalTrials.gov API not reachable (server error)")
+        except (requests.RequestException, OSError):
+            pytest.skip("ClinicalTrials.gov API not reachable (network/SSL issue)")
+
         tool = ClinicalTrialsTool()
         results = await tool.search("metformin diabetes", max_results=3)