Pulling in latest fh-llm-client for CommonLLMNames (#810)

Future-House · Jan 14, 2025 · bdb1a3b · bdb1a3b
1 parent e5b6447
commit bdb1a3b
Show file tree

Hide file tree

Showing 13 changed files with 6,423 additions and 5,022 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -84,7 +84,7 @@ repos:
           - aiohttp>=3.10.6 # Match pyproject.toml
           - PyMuPDF>=1.24.12
           - anyio
-          - fh-llm-client>=0.0.3 # Match pyproject.toml
+          - fh-llm-client>=0.0.9 # Match pyproject.toml
           - fhaviary[llm]>=0.14 # Match pyproject.toml
           - ldp>=0.17 # Match pyproject.toml
           - html2text

diff --git a/paperqa/settings.py b/paperqa/settings.py
@@ -10,7 +10,12 @@
 
 import anyio
 from aviary.core import ToolSelector
-from llmclient import EmbeddingModel, LiteLLMModel, embedding_model_factory
+from llmclient import (
+    CommonLLMNames,
+    EmbeddingModel,
+    LiteLLMModel,
+    embedding_model_factory,
+)
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -438,7 +443,7 @@ class AgentSettings(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     agent_llm: str = Field(
-        default="gpt-4o-2024-08-06",
+        default=CommonLLMNames.GPT_4O.value,
         description="Model to use for agent.",
     )
 
@@ -596,7 +601,7 @@ class Settings(BaseSettings):
     model_config = SettingsConfigDict(extra="ignore")
 
     llm: str = Field(
-        default="gpt-4o-2024-08-06",
+        default=CommonLLMNames.GPT_4O.value,
         description=(
             "Default LLM for most things, including answers. Should be 'best' LLM."
         ),
@@ -612,7 +617,7 @@ class Settings(BaseSettings):
         ),
     )
     summary_llm: str = Field(
-        default="gpt-4o-2024-08-06",
+        default=CommonLLMNames.GPT_4O.value,
         description="Default LLM for summaries and parsing citations.",
     )
     summary_llm_config: dict | None = Field(

diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,7 @@ dependencies = [
     "PyMuPDF>=1.24.12",  # For pymupdf.set_messages addition
     "aiohttp>=3.10.6",  # TODO: remove in favor of httpx, pin for aiohttp.ClientConnectionResetError
     "anyio",
-    "fh-llm-client>=0.0.3",  # Pin for EmbeddingModel
+    "fh-llm-client>=0.0.9",  # Pin for CommonLLMNames
     "fhaviary[llm]>=0.14",  # For MultipleChoiceQuestion
     "html2text",  # TODO: evaluate moving to an opt-in dependency
     "httpx",

diff --git a/tests/cassettes/TestTaskDataset.test_tool_failure.yaml b/tests/cassettes/TestTaskDataset.test_tool_failure.yaml
diff --git a/tests/cassettes/test_docs_lifecycle.yaml b/tests/cassettes/test_docs_lifecycle.yaml
diff --git a/tests/cassettes/test_partitioning_fn_docs[False].yaml b/tests/cassettes/test_partitioning_fn_docs[False].yaml