Skip to content

Commit bdb1a3b

Browse files
authored
Pulling in latest fh-llm-client for CommonLLMNames (#810)
1 parent e5b6447 commit bdb1a3b

13 files changed

+6423
-5022
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ repos:
8484
- aiohttp>=3.10.6 # Match pyproject.toml
8585
- PyMuPDF>=1.24.12
8686
- anyio
87-
- fh-llm-client>=0.0.3 # Match pyproject.toml
87+
- fh-llm-client>=0.0.9 # Match pyproject.toml
8888
- fhaviary[llm]>=0.14 # Match pyproject.toml
8989
- ldp>=0.17 # Match pyproject.toml
9090
- html2text

paperqa/settings.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010

1111
import anyio
1212
from aviary.core import ToolSelector
13-
from llmclient import EmbeddingModel, LiteLLMModel, embedding_model_factory
13+
from llmclient import (
14+
CommonLLMNames,
15+
EmbeddingModel,
16+
LiteLLMModel,
17+
embedding_model_factory,
18+
)
1419
from pydantic import (
1520
BaseModel,
1621
ConfigDict,
@@ -438,7 +443,7 @@ class AgentSettings(BaseModel):
438443
model_config = ConfigDict(extra="forbid")
439444

440445
agent_llm: str = Field(
441-
default="gpt-4o-2024-08-06",
446+
default=CommonLLMNames.GPT_4O.value,
442447
description="Model to use for agent.",
443448
)
444449

@@ -596,7 +601,7 @@ class Settings(BaseSettings):
596601
model_config = SettingsConfigDict(extra="ignore")
597602

598603
llm: str = Field(
599-
default="gpt-4o-2024-08-06",
604+
default=CommonLLMNames.GPT_4O.value,
600605
description=(
601606
"Default LLM for most things, including answers. Should be 'best' LLM."
602607
),
@@ -612,7 +617,7 @@ class Settings(BaseSettings):
612617
),
613618
)
614619
summary_llm: str = Field(
615-
default="gpt-4o-2024-08-06",
620+
default=CommonLLMNames.GPT_4O.value,
616621
description="Default LLM for summaries and parsing citations.",
617622
)
618623
summary_llm_config: dict | None = Field(

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies = [
2525
"PyMuPDF>=1.24.12", # For pymupdf.set_messages addition
2626
"aiohttp>=3.10.6", # TODO: remove in favor of httpx, pin for aiohttp.ClientConnectionResetError
2727
"anyio",
28-
"fh-llm-client>=0.0.3", # Pin for EmbeddingModel
28+
"fh-llm-client>=0.0.9", # Pin for CommonLLMNames
2929
"fhaviary[llm]>=0.14", # For MultipleChoiceQuestion
3030
"html2text", # TODO: evaluate moving to an opt-in dependency
3131
"httpx",

tests/cassettes/TestTaskDataset.test_tool_failure.yaml

Lines changed: 138 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/cassettes/test_docs_lifecycle.yaml

Lines changed: 1152 additions & 1142 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/cassettes/test_partitioning_fn_docs[False].yaml

Lines changed: 969 additions & 330 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)