refactor: use pydantic settings

app/config.py

@@ -0,0 +1,10 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Settings(BaseSettings):
+    google_api_key: str
+
+    model_config = SettingsConfigDict(env_file=".env")
+
+
+settings = Settings()  # type: ignore

app/main.py

@@ -1,14 +1,12 @@
-import os
-
 from fastapi import FastAPI
 from google import genai
 from pydantic import BaseModel
 
-from app import agent
+from app import agent, config
 
+gemini = genai.Client(api_key=config.settings.google_api_key)
 app = FastAPI()
 
-gemini = genai.Client(api_key=os.environ["GOOGLE_API_KEY"])
 
 
 class Source(BaseModel):

app/tools/literature.py

@@ -1,4 +1,3 @@
-import time
 from xml.etree import ElementTree
 
 import httpx

main.py

@@ -7,7 +7,7 @@ import streamlit as st
 from google import genai
 from google.genai import types
 
-from app.agent import respond
+from app import agent, config
 
 
 def format_output(response: list[dict]) -> tuple[str, str]:
@@ -39,7 +39,7 @@ def format_output(response: list[dict]) -> tuple[str, str]:
 
 
 def main():
-    gemini_client = genai.Client(api_key=os.environ["GOOGLE_API_KEY"])
+    gemini_client = genai.Client(api_key=config.settings.google_api_key)
 
     st.title("Elna")
     with st.form("search", border=False):
@@ -49,7 +49,7 @@ def main():
 
         if submit:
             with st.spinner("Thinking...", show_time=True):
-                output = respond(gemini_client, query)
+                output = agent.respond(gemini_client, query)
 
             answer, footnotes = format_output(output)
             response.markdown(f"{answer}\n\n{footnotes}")

pyproject.toml

@@ -9,6 +9,7 @@ dependencies = [
     "google-genai>=1.14.0",
     "httpx>=0.28.1",
     "pydantic>=2.11.4",
+    "pydantic-settings>=2.9.1",
     "python-fasthtml>=0.12.15",
     "streamlit>=1.45.0",
     "tenacity>=9.1.2",

uv.lock

@@ -205,6 +205,7 @@ dependencies = [
     { name = "google-genai" },
     { name = "httpx" },
     { name = "pydantic" },
+    { name = "pydantic-settings" },
     { name = "python-fasthtml" },
     { name = "streamlit" },
     { name = "tenacity" },
@@ -216,6 +217,7 @@ requires-dist = [
     { name = "google-genai", specifier = ">=1.14.0" },
     { name = "httpx", specifier = ">=0.28.1" },
     { name = "pydantic", specifier = ">=2.11.4" },
+    { name = "pydantic-settings", specifier = ">=2.9.1" },
     { name = "python-fasthtml", specifier = ">=0.12.15" },
     { name = "streamlit", specifier = ">=1.45.0" },
     { name = "tenacity", specifier = ">=9.1.2" },
@@ -800,6 +802,20 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/6f/9a/e73262f6c6656262b5fdd723ad90f518f579b7bc8622e43a942eec53c938/pydantic_core-2.33.2-cp313-cp313t-win_amd64.whl", hash = "sha256:c2fc0a768ef76c15ab9238afa6da7f69895bb5d1ee83aeea2e3509af4472d0b9", size = 1935777, upload-time = "2025-04-23T18:32:25.088Z" },
 ]
 
+[[package]]
+name = "pydantic-settings"
+version = "2.9.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+    { name = "python-dotenv" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/67/1d/42628a2c33e93f8e9acbde0d5d735fa0850f3e6a2f8cb1eb6c40b9a732ac/pydantic_settings-2.9.1.tar.gz", hash = "sha256:c509bf79d27563add44e8446233359004ed85066cd096d8b510f715e6ef5d268", size = 163234, upload-time = "2025-04-18T16:44:48.265Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356, upload-time = "2025-04-18T16:44:46.617Z" },
+]
+
 [[package]]
 name = "pydeck"
 version = "0.9.1"