Refactor/module structure

CHANGES.md

@@ -8,6 +8,20 @@ Note: Minor version `0.X.0` update might break the API, It's recommended to pin
 
 ## [unreleased]
 
+* switch from pygeofilter to cql2
+* split `tipg.collections` into focused modules
+    * move data models and the abstract `Collection` base class (`Column`, `Parameter`, `Feature`, `ItemList`, `Collection`, `CollectionList`, `Catalog`) to `tipg.dbmodel`
+    * move cql2 filter building (`cql_where`, ...) to `tipg.filter`
+    * move shared SQL helpers to `tipg.sqlhelpers`
+    * move the `PgCollection` implementation to `tipg.pgcollection`
+    * `tipg.collections` now defines the catalog builders `pg_get_collection_index` and `register_collection_catalog`, and re-exports the models, `PgCollection` and the settings singletons so existing `from tipg.collections import ...` imports keep working
+* split the `tipg.model` response models into a `tipg.models` package
+    * `tipg.models.common` (`Link`), `tipg.models.features` (Features/Common models), `tipg.models.tiles` (tile models)
+    * `tipg.model` is now a back-compat shim re-exporting from `tipg.models`, so existing `from tipg.model import ...` imports keep working
+* split the `tipg.factory` router factories into a `tipg.factories` package
+    * `tipg.factories.base` (`EndpointsFactory`, `FactoryExtension`), `tipg.factories.features` (`OGCFeaturesFactory`), `tipg.factories.tiles` (`OGCTilesFactory`), `tipg.factories.endpoints` (`Endpoints`), `tipg.factories.utils` (shared render helpers)
+    * `tipg.factory` is now a back-compat shim re-exporting from `tipg.factories`, so existing `from tipg.factory import ...` imports keep working
+
 ## [1.3.1] - 2026-02-26
 
 * fix: bbox filter when collection's geometry is not in EPSG:4326 CRS

docs/src/user_guide/factories.md

@@ -72,9 +72,9 @@ app.include_router(endpoints.router)
 
 #### Creation Options
 
-- **collections_dependency** (Callable[..., tipg.collections.CollectionList]): Callable which return a CollectionList dictionary
+- **collections_dependency** (Callable[..., tipg.dbmodel.CollectionList]): Callable which return a CollectionList dictionary
 
-- **collection_dependency** (Callable[..., tipg.collections.Collection]): Callable which return a Collection instance
+- **collection_dependency** (Callable[..., tipg.dbmodel.Collection]): Callable which return a Collection instance
 
 - **with_common** (bool, optional): Create Full OGC Features API set of endpoints with OGC Common endpoints (landing `/` and conformance `/conformance`). Defaults to `True`
 
@@ -111,7 +111,7 @@ app.include_router(endpoints.router)
 
 #### Creation Options
 
-- **collection_dependency** (Callable[..., tipg.collections.Collection]): Callable which return a Collection instance
+- **collection_dependency** (Callable[..., tipg.dbmodel.Collection]): Callable which return a Collection instance
 
 - **supported_tms** (morecantile.TileMatrixSets): morecantile TileMatrixSets instance (holds a set of TileMatrixSet documents)
 
@@ -154,9 +154,9 @@ app.include_router(endpoints.router)
 
 #### Creation Options
 
-- **collections_dependency** (Callable[..., tipg.collections.CollectionList]): Callable which return a CollectionList dictionary
+- **collections_dependency** (Callable[..., tipg.dbmodel.CollectionList]): Callable which return a CollectionList dictionary
 
-- **collection_dependency** (Callable[..., tipg.collections.Collection]): Callable which return a Collection instance
+- **collection_dependency** (Callable[..., tipg.dbmodel.Collection]): Callable which return a Collection instance
 
 - **supported_tms** (morecantile.TileMatrixSets): morecantile TileMatrixSets instance (holds a set of TileMatrixSet documents)
 

pyproject.toml

@@ -22,15 +22,14 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "orjson",
+    "cql2>=0.5,<0.6",
     "asyncpg>=0.23.0",
-    "buildpg>=0.3",
     "fastapi>=0.100.0",
     "jinja2>=2.11.2,<4.0.0",
     "morecantile>=5.0,<7.0",
     "pydantic>=2.4,<3.0",
     "pydantic-settings~=2.0",
     "geojson-pydantic>=1.0,<3.0",
-    "pygeofilter>=0.2.0,<0.3.0",
     "ciso8601~=2.3",
     "starlette-cramjam>=0.4,<0.6",
 ]
@@ -95,7 +94,7 @@ exclude_lines = [
 [tool.isort]
 profile = "black"
 known_first_party = ["tipg"]
-known_third_party = ["geojson_pydantic", "buildpg", "pydantic"]
+known_third_party = ["geojson_pydantic", "pydantic"]
 forced_separate = [
     "fastapi",
     "starlette",

tests/routes/test_tiles.py

@@ -3,7 +3,7 @@
 import mapbox_vector_tile
 import numpy as np
 
-from tipg.collections import mvt_settings
+from tipg.pgcollection import mvt_settings
 
 
 def test_tilejson(app):