first commit

Author: Yuri Zmytrakov

stac_fastapi/core/stac_fastapi/core/core.py

@@ -269,34 +269,27 @@ async def all_collections(
         request = kwargs["request"]
         base_url = str(request.base_url)
 
-        # Get the global limit from environment variable
-        global_limit = None
-        env_limit = os.getenv("STAC_ITEM_LIMIT")
-        if env_limit:
-            try:
-                global_limit = int(env_limit)
-            except ValueError:
-                # Handle invalid integer in environment variable
-                pass
-
-        # Apply global limit if it exists
-        if global_limit is not None:
-            # If a limit was provided, use the smaller of the two
-            if limit is not None:
-                limit = min(limit, global_limit)
-            else:
-                limit = global_limit
+        global_max_limit = int(os.getenv("STAC_COLLECTION_GLOBAL_MAX_LIMIT", 300))
+        default_limit = int(os.getenv("STAC_DEFAULT_COLLECTION_LIMIT", 10))
+        query_limit = request.query_params.get("limit")
+
+        body_limit = None
+        try:
+            if request.method == "POST" and request.body():
+                body_data = await request.json()
+                body_limit = body_data.get("limit")
+        except:
+            pass
+
+        if body_limit is not None:
+            limit = int(body_limit)
+        elif query_limit:
+            limit = int(query_limit)
         else:
-            # No global limit, use provided limit or default
-            if limit is None:
-                query_limit = request.query_params.get("limit")
-                if query_limit:
-                    try:
-                        limit = int(query_limit)
-                    except ValueError:
-                        limit = 10
-                else:
-                    limit = 10
+            limit = default_limit
+
+        if global_max_limit > 0:
+            limit = min(limit, global_max_limit)
 
         token = request.query_params.get("token")
 
@@ -660,7 +653,17 @@ async def get_search(
         Raises:
             HTTPException: If any error occurs while searching the catalog.
         """
-        limit = int(request.query_params.get("limit", os.getenv("STAC_ITEM_LIMIT", 10)))
+        global_max_limit = int(os.getenv("STAC_ITEM_GLOBAL_MAX_LIMIT", 300))
+        default_limit = int(os.getenv("STAC_DEFAULT_ITEM_LIMIT", 100))
+
+        query_limit = request.query_params.get("limit")
+        if query_limit:
+            limit = int(query_limit)
+        else:
+            limit = default_limit
+
+        if global_max_limit > 0:
+            limit = min(limit, global_max_limit)
 
         base_args = {
             "collections": collections,

stac_fastapi/tests/api/test_api.py

@@ -1475,9 +1475,11 @@ def create_items(date_prefix: str, start_day: int, count: int) -> dict:
 
 
 @pytest.mark.asyncio
-async def test_collections_limit_env_variable(app_client, txn_client, load_test_data):
+async def test_collections_limit_env_variable(
+    app_client, txn_client, load_test_data, monkeypatch
+):
     limit = "5"
-    os.environ["STAC_ITEM_LIMIT"] = limit
+    os.environ["STAC_DEFAULT_COLLECTION_LIMIT"] = limit
     item = load_test_data("test_collection.json")
 
     for i in range(10):
@@ -1497,7 +1499,7 @@ async def test_search_collection_limit_env_variable(
     app_client, txn_client, load_test_data
 ):
     limit = "5"
-    os.environ["STAC_ITEM_LIMIT"] = limit
+    os.environ["STAC_DEFAULT_ITEM_LIMIT"] = limit
 
     test_collection = load_test_data("test_collection.json")
     test_collection_id = "test-collection-search-limit"