Merge pull request #128 from EOPF-Explorer/fix/align-cache-redis-settings-and-ttl-wiring

fix(cache): align Redis settings and fix Helm env-var wiring for cache TTLs

Author: lhoupert

helm/charts/CACHE_CONFIG.md

@@ -89,13 +89,16 @@ The chart automatically generates the following environment variables based on c
 ### Cache Control
 - `TITILER_EOPF_CACHE_ENABLE`: "true" when cache is enabled
 - `TITILER_EOPF_CACHE_BACKEND`: Backend type (redis/s3/s3-redis)  
-- `TITILER_EOPF_CACHE_TTL_DEFAULT`: Default TTL in seconds
+- `TITILER_EOPF_CACHE_DEFAULT_TTL`: Default TTL in seconds
+- `TITILER_EOPF_CACHE_TILE_TTL`: Tile cache TTL in seconds
+- `TITILER_EOPF_CACHE_METADATA_TTL`: TTL for cached datatrees (from `cache.ttl.datasets`)
+- `TITILER_EOPF_CACHE_VERSION_PROBE_TTL`: Store-version probe throttle (0 disables probing)
 - `TITILER_EOPF_CACHE_NAMESPACE`: Cache key namespace
 
 ### Redis Configuration
 - `TITILER_EOPF_CACHE_REDIS_HOST`: Redis hostname
 - `TITILER_EOPF_CACHE_REDIS_PORT`: Redis port
-- `TITILER_EOPF_CACHE_REDIS_DATABASE`: Redis database number
+- `TITILER_EOPF_CACHE_REDIS_DB`: Redis database number
 - `TITILER_EOPF_CACHE_REDIS_PASSWORD`: Redis password (from secret)
 
 ### S3 Configuration  

helm/charts/README.md

@@ -48,7 +48,7 @@ See [CACHE_CONFIG.md](CACHE_CONFIG.md) for detailed configuration guide.
 | `cache.backend` | Cache backend: `redis`, `s3`, or `s3-redis` | `redis` |
 | `cache.ttl.default` | Default TTL in seconds | `3600` |
 | `cache.ttl.tiles` | Tile cache TTL in seconds | `3600` |
-| `cache.ttl.datasets` | Dataset cache TTL in seconds | `1800` |
+| `cache.ttl.datasets` | Dataset (datatree metadata) cache TTL in seconds | `1800` |
 | `cache.namespace` | Cache key namespace | `titiler-eopf` |
 
 ### Redis Cache Configuration

helm/charts/examples/cache-external-redis-values.yaml

@@ -22,7 +22,7 @@ cache:
     default: 1800  # 30 minutes
     tiles: 3600    # 1 hour
     datasets: 900  # 15 minutes
-  
+
   namespace: "staging-cache"
   exclude_params:
     - "debug"

helm/charts/examples/cache-redis-values.yaml

@@ -15,7 +15,7 @@ cache:
     default: 3600
     tiles: 3600
     datasets: 1800
-  
+
   namespace: "dev-cache"
 
   # Admin API

helm/charts/examples/cache-s3-redis-values.yaml

@@ -31,9 +31,9 @@ cache:
   # Cache settings for production
   ttl:
     default: 7200  # 2 hours
-    tiles: 14400   # 4 hours  
+    tiles: 14400   # 4 hours
     datasets: 3600 # 1 hour
-  
+
   namespace: "prod-cache"
 
   # Admin API

helm/charts/templates/deployment.yaml

@@ -44,12 +44,10 @@ spec:
               value: "true"
             - name: TITILER_EOPF_CACHE_BACKEND
               value: {{ .Values.cache.backend | quote }}
-            - name: TITILER_EOPF_CACHE_TTL_DEFAULT
+            - name: TITILER_EOPF_CACHE_DEFAULT_TTL
               value: {{ .Values.cache.ttl.default | quote }}
-            - name: TITILER_EOPF_CACHE_TTL_TILES
+            - name: TITILER_EOPF_CACHE_TILE_TTL
               value: {{ .Values.cache.ttl.tiles | quote }}
-            - name: TITILER_EOPF_CACHE_TTL_DATASETS
-              value: {{ .Values.cache.ttl.datasets | quote }}
             # TTL the GeoZarr reader actually reads for cached datatrees
             # (EOPFCacheSettings.metadata_ttl).
             - name: TITILER_EOPF_CACHE_METADATA_TTL
@@ -66,7 +64,7 @@ spec:
             - name: TITILER_EOPF_CACHE_REDIS_PORT
               value: {{ include "titiler-eopf.cache.redis.port" . | quote }}
               {{- if .Values.cache.redis.external.database }}
-            - name: TITILER_EOPF_CACHE_REDIS_DATABASE
+            - name: TITILER_EOPF_CACHE_REDIS_DB
               value: {{ .Values.cache.redis.external.database | quote }}
               {{- end }}
               {{- /* Redis Authentication - External Redis */ -}}

helm/charts/values.yaml

@@ -86,7 +86,7 @@ cache:
   ttl:
     default: 3600  # 1 hour
     tiles: 3600
-    datasets: 1800  # 30 minutes
+    datasets: 1800  # 30 minutes (feeds cache metadata_ttl for cached datatrees)
 
   # Store-version probe (stale-on-append protection): TTL in seconds between
   # HEAD probes of a store's root zarr.json. Set to 0 to disable probing and

tests/test_settings.py

@@ -4,7 +4,7 @@
 from pydantic import ValidationError
 from pydantic_settings import SettingsConfigDict
 
-from titiler.eopf.settings import DataStoreSettings
+from titiler.eopf.settings import DataStoreSettings, EOPFCacheSettings
 
 
 class IsolatedDataStoreSettings(DataStoreSettings):
@@ -54,3 +54,33 @@ def test_datastore_settings_error(params, monkeypatch):
     monkeypatch.delenv("TITILER_EOPF_STORE_PATH", raising=False)
     with pytest.raises(ValidationError):
         IsolatedDataStoreSettings(**params)
+
+
+class IsolatedEOPFCacheSettings(EOPFCacheSettings):
+    """EOPFCacheSettings without .env loading."""
+
+    model_config = SettingsConfigDict(
+        env_prefix="TITILER_EOPF_CACHE_", env_file=None, extra="ignore"
+    )
+
+
+def test_eopf_cache_resolves_redis_db(monkeypatch):
+    """EOPFCacheSettings resolves the Redis db from TITILER_EOPF_CACHE_REDIS_DB.
+
+    The reader dataset cache and the response/tile cache both connect through
+    ``EOPFCacheSettings.redis``, so a configured ``db`` must propagate to that
+    shared ``CacheRedisSettings`` — otherwise the two caches would target
+    different Redis databases.
+    """
+    monkeypatch.setenv("TITILER_EOPF_CACHE_ENABLE", "true")
+    monkeypatch.setenv("TITILER_EOPF_CACHE_BACKEND", "redis")
+    monkeypatch.setenv("TITILER_EOPF_CACHE_REDIS_HOST", "redis.example")
+    monkeypatch.setenv("TITILER_EOPF_CACHE_REDIS_PORT", "6380")
+    monkeypatch.setenv("TITILER_EOPF_CACHE_REDIS_DB", "3")
+
+    settings = IsolatedEOPFCacheSettings()
+
+    assert settings.redis is not None
+    assert settings.redis.host == "redis.example"
+    assert settings.redis.port == 6380
+    assert settings.redis.db == 3

titiler/eopf/cache.py

@@ -18,7 +18,7 @@ class RedisCache:
 
     @classmethod
     def get_instance(
-        cls, host: str, port: int, password: SecretStr | None
+        cls, host: str, port: int, password: SecretStr | None, db: int = 0
     ) -> redis.ConnectionPool:
         """Get the redis connection pool."""
         assert redis, "Redis package needs to be installed to use Redis Cache"
@@ -27,7 +27,7 @@ def get_instance(
                 host=host,
                 port=port,
                 password=password.get_secret_value() if password else None,
-                db=0,
+                db=db,
                 # Use RESP3 to stay aligned with the async cache backend
                 # (and to work with the fakeredis server used in tests).
                 protocol=3,

titiler/eopf/reader.py

@@ -199,6 +199,7 @@ def _open_dataset_cached(
             settings.redis.host,
             settings.redis.port,
             settings.redis.password,
+            settings.redis.db,
         )
     )