Add current year LFPS support to griddle for LANDFIRE fuel models

[lindsaywiard]

Summary

Griddle can now fetch the current year's FCCS, FBFM13, and FBFM40 release via LANDFIRE Product Service (LFPS) instead of a staged COG, for any version listed in a product's lfps_available config (currently 2025).

Changes

• lib\landfire\config.py: Added lfps_available: ["2025"] to fbfm13 and fccs in LANDFIRE_VERSIONS (fbfm40 already had it).
• griddle\handlers\landfire.py: fetch_fbfm13 and fetch_fccs now route to LFPS when the requested version is in lfps_available, mirroring the branch fetch_fbfm40 already had for seasonal requests. fetch_fbfm40's routing is generalized so an lfps_available version routes through LFPS even without a season.
• griddle\dispatch.py: progress is now threaded through to fetch_fbfm13/fetch_fccs.

Tests

• Unit tests (mocked) for the new LFPS branch on all three fetch functions
• Integration tests that submit a real LFPS job for each product's configured lfps_available version
• A test that fails (not skips) if LANDFIRE moves the seasonal base vintage past our configured version — so a stale lfps_available config surfaces instead of going unnoticed.

[amarcozzi]

I found a bug here:

All three PR #542 handlers define:

progress: Callable[...] | None = None

For version="2025", they pass that value directly to fetch_lfps, which immediately executes:

progress("Submitting LANDFIRE Product Service job...", 10)

If omitted, this becomes None(...) and raises before job submission.

Focused test against PR head 2e6bb55:

CONFIRMED: TypeError: 'NoneType' object is not callable
submit_job called: False

Existing tests miss it because they always provide a MagicMock callback. The preferred fix is to substitute a no-op callback and add
omitted-callback tests for FBFM13, FBFM40, and FCCS.

[lindsaywiard]

I think that bug is all fixed up now :)

[amarcozzi]

Can we just pass it and utilize a callable as normal instead of the new object/None?

[lindsaywiard]

Yep, makes sense! Like this?

[amarcozzi]

It's not a big deal, but it just really feels like an anti-pattern to me. I don't understand why we need a default_progress and don't just give it the same callable as what every other function in griddle.

so kind of like:

Delete this:

def _default_progress(message: str, pct: int | None = None) -> None:
    """No-op progress callback used when a caller doesn't provide one."""

def fetch_fbfm13(
    roi: gpd.GeoDataFrame,
    version: str = LANDFIRE_VERSIONS["fbfm13"]["default"],
    ...
    progress: Callable[[str, int | None], None] = _default_progress,
) -> xr.Dataset:

And just do:

def fetch_fbfm13(
    roi: gpd.GeoDataFrame,
    version: str = LANDFIRE_VERSIONS["fbfm13"]["default"],
    ...
    progress: Callable[[str, int | None], None],   # required, like fetch_lfps
) -> xr.Dataset:

[lindsaywiard]

Yeah, that is cleaner. I was just stuck in how it was already set up. How's this?

[amarcozzi]

Looks great thank you! Sorry to be a stickler about something minor. Approved and ready to merge.

[lindsaywiard]

No worries! I'm happy to indulge