Skip to content

Commit faa1eea

Browse files
Remove LD support from deprecated LangChain, BeeAI, and Prometheus models
Change OpenAi, Ollama, Anthropic, LangChain, and BeeAI from FlagAwareModel to plain BaseModel since they don't need LaunchDarkly overrides and LangChain/BeeAI are being deprecated. Prometheus already used BaseModel. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent dfe23f5 commit faa1eea

2 files changed

Lines changed: 12 additions & 18 deletions

File tree

src/dremioai/config/settings.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,23 @@ def prometheus_metrics_port(self) -> int | None:
304304
return self.metrics.port if self.metrics is not None else None
305305

306306

307-
class OpenAi(FlagAwareModel):
307+
class OpenAi(BaseModel):
308308
api_key: Annotated[str, AfterValidator(_resolve_token_file)] = None
309309
model: Optional[str] = Field(default="gpt-4o")
310310
org: Optional[str] = Field(default=None)
311+
model_config = ConfigDict(validate_assignment=True)
311312

312313

313-
class Ollama(FlagAwareModel):
314+
class Ollama(BaseModel):
314315
model: Optional[str] = Field(default="llama3.1")
316+
model_config = ConfigDict(validate_assignment=True)
315317

316318

317-
class LangChain(FlagAwareModel):
319+
class LangChain(BaseModel):
318320
llm: Optional[Model] = None
319321
openai: Optional[OpenAi] = Field(default_factory=OpenAi)
320322
ollama: Optional[Ollama] = Field(default=None)
323+
model_config = ConfigDict(validate_assignment=True)
321324

322325

323326
class Prometheus(BaseModel):
@@ -344,17 +347,19 @@ class MCPServer(BaseModel):
344347
model_config = ConfigDict(validate_assignment=True)
345348

346349

347-
class Anthropic(FlagAwareModel):
350+
class Anthropic(BaseModel):
348351
api_key: Annotated[str, AfterValidator(_resolve_token_file)] = None
349352
chat_model: Optional[str] = Field(default=None)
353+
model_config = ConfigDict(validate_assignment=True)
350354

351355

352-
class BeeAI(FlagAwareModel):
356+
class BeeAI(BaseModel):
353357
mcp_server: Optional[MCPServer] = Field(default=None)
354358
sliding_memory_size: Optional[int] = Field(default=10)
355359
anthropic: Optional[Anthropic] = Field(default=None)
356360
openai: Optional[OpenAi] = Field(default=None)
357361
ollama: Optional[Ollama] = Field(default=None)
362+
model_config = ConfigDict(validate_assignment=True)
358363

359364

360365
class Settings(FlagAwareMixin, BaseSettings):

tests/config/golden_flag_keys.yaml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
flag_keys:
2-
- beeai.anthropic.api_key
3-
- beeai.anthropic.chat_model
4-
- beeai.mcp_server
5-
- beeai.ollama.model
6-
- beeai.openai.api_key
7-
- beeai.openai.model
8-
- beeai.openai.org
9-
- beeai.sliding_memory_size
2+
- beeai
103
- dremio.allow_dml
114
- dremio.api.http_retry.backoff_multiplier
125
- dremio.api.http_retry.initial_delay
@@ -22,11 +15,7 @@ flag_keys:
2215
- dremio.raw_project_id
2316
- dremio.uri
2417
- dremio.wlm.engine_name
25-
- langchain.llm
26-
- langchain.ollama.model
27-
- langchain.openai.api_key
28-
- langchain.openai.model
29-
- langchain.openai.org
18+
- langchain
3019
- launchdarkly
3120
- log_level
3221
- prometheus

0 commit comments

Comments
 (0)