Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import json
import re
from pathlib import Path
from typing import Any, List, Literal, Optional
from typing import Annotated, Any, List, Literal, Optional

from pydantic import Field, SecretStr, field_validator, model_validator
from pydantic_settings import BaseSettings, SettingsConfigDict
from pydantic_settings import BaseSettings, NoDecode, SettingsConfigDict

from src.utils.constants import (
DEFAULT_CLAUDE_MAX_COST_PER_REQUEST,
Expand Down Expand Up @@ -220,7 +220,9 @@ class Settings(BaseSettings):
)
enable_git_integration: bool = Field(True, description="Enable git commands")
enable_file_uploads: bool = Field(True, description="Enable file upload handling")
upload_save_extensions: List[str] = Field(
# NoDecode: pydantic-settings would otherwise JSON-decode the env value
# before parse_upload_save_extensions runs, rejecting ".pdf,.png".
upload_save_extensions: Annotated[List[str], NoDecode] = Field(
default=[],
description=(
"Extra file extensions (for example .pdf) accepted as uploads in agentic "
Expand Down Expand Up @@ -405,6 +407,8 @@ def parse_upload_save_extensions(cls, v: Any) -> List[str]:
"""Parse comma-separated extensions into lowercase '.ext' form."""
if v is None:
return []
if isinstance(v, str) and v.strip().startswith("["):
v = json.loads(v)
items = v.split(",") if isinstance(v, str) else list(v)
exts = []
for item in items:
Expand Down
14 changes: 14 additions & 0 deletions tests/unit/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -725,3 +725,17 @@ def test_upload_save_extensions_rejects_invalid(tmp_path, bad):
def test_upload_save_dir_rejects_unsafe(tmp_path, bad):
with pytest.raises(ValueError):
create_test_config(approved_directory=str(tmp_path), upload_save_dir=bad)


@pytest.mark.parametrize(
"raw", [".pdf,.png", " .PDF , png ", '[".pdf", ".png"]', '[".PDF","png"]']
)
def test_upload_save_extensions_from_environment(tmp_path, monkeypatch, raw):
"""The env var is parsed as a comma list or a JSON list (regression: a comma
list made pydantic-settings fail with 'error parsing value' at startup)."""
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "test_token")
monkeypatch.setenv("TELEGRAM_BOT_USERNAME", "test_bot")
monkeypatch.setenv("APPROVED_DIRECTORY", str(tmp_path))
monkeypatch.setenv("UPLOAD_SAVE_EXTENSIONS", raw)
settings = Settings(_env_file=None)
assert settings.upload_save_extensions == [".pdf", ".png"]