Refactor extra dependencies in pyproject.toml

Makefile

@@ -59,15 +59,15 @@ venv: .venv
 
 .venv:
 	@echo "(If 'uv' fails with 'No such file or directory', try 'make install-uv')"
-	uv sync -q --extra dev
+	uv sync -q
 	.venv/bin/black --version
 	@echo "(If 'pyright' fails with 'error while loading shared libraries: libatomic.so.1:', try 'make install-libatomic')"
 	.venv/bin/pyright --version
 	.venv/bin/pytest --version
 
 .PHONY: sync
 sync:
-	uv sync --extra dev
+	uv sync
 
 .PHONY: install-uv
 install-uv:

make.bat

@@ -57,15 +57,15 @@ goto end
 
 :venv
 echo Creating virtual environment...
-uv sync -q --extra dev
+uv sync -q
 .venv\Scripts\python --version
 .venv\Scripts\black --version
 .venv\Scripts\pyright --version
 .venv\Scripts\python -m pytest --version
 goto end
 
 :sync
-uv sync --extra dev
+uv sync
 goto end
 
 :install-uv

pyproject.toml

@@ -44,21 +44,10 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = [
-  "azure-mgmt-authorization>=4.0.0",
-  "azure-mgmt-keyvault>=12.1.1",  
-  "coverage[toml]>=7.9.1",
-  "google-api-python-client>=2.184.0",
-  "google-auth-httplib2>=0.2.0",
-  "google-auth-oauthlib>=1.2.2",
-  "isort>=7.0.0",
+# Needed to enable --logfire flag to tools/query.py
+logfire = [
   "logfire>=4.1.0",
   "opentelemetry-instrumentation-httpx>=0.57b0",
-  "pydantic-ai-slim[openai]>=1.39.0",
-  "pyright>=1.1.408",  # 407 has a regression
-  "pytest>=8.3.5",
-  "pytest-asyncio>=0.26.0",
-  "pytest-mock>=3.14.0",
 ]
 
 [project.urls]
@@ -89,6 +78,18 @@ known_local_folder = ["conftest"]
 
 [dependency-groups]
 dev = [
-    "isort>=7.0.0",
-    "pyright>=1.1.408",
+  "azure-mgmt-authorization>=4.0.0",
+  "azure-mgmt-keyvault>=12.1.1",
+  "coverage[toml]>=7.9.1",
+  "google-api-python-client>=2.184.0",
+  "google-auth-httplib2>=0.2.0",
+  "google-auth-oauthlib>=1.2.2",
+  "isort>=7.0.0",
+  "logfire>=4.1.0",  # So 'make check' passes
+  "opentelemetry-instrumentation-httpx>=0.57b0",
+  "pydantic-ai-slim[openai]>=1.39.0",
+  "pyright>=1.1.408",  # 407 has a regression
+  "pytest>=8.3.5",
+  "pytest-asyncio>=0.26.0",
+  "pytest-mock>=3.14.0",
 ]

tools/query.py

@@ -1134,8 +1134,10 @@ async def load_podcast_index(
 
 
 def load_index_file[T: Mapping[str, typing.Any]](
-    file: str, selector: str, cls: type[T], verbose: bool = True
+    file: str | None, selector: str, cls: type[T], verbose: bool = True
 ) -> tuple[list[T], dict[str, T]]:
+    if file is None:
+        return [], {}
     # If this crashes, the file is malformed -- go figure it out.
     try:
         with open(file) as f: