Add formatting helpers

Author: alukach

src/stac_auth_proxy/utils/filters.py

@@ -3,30 +3,23 @@
 import json
 import re
 from typing import Optional
-from urllib.parse import parse_qs, urlencode
+from urllib.parse import parse_qs
 
 from cql2 import Expr
 
-from .requests import dict_to_bytes
-
 
 def append_qs_filter(qs: str, filter: Expr, filter_lang: Optional[str] = None) -> bytes:
     """Insert a filter expression into a query string. If a filter already exists, combine them."""
     qs_dict = {k: v[0] for k, v in parse_qs(qs).items()}
     new_qs_dict = append_body_filter(
         qs_dict, filter, filter_lang or qs_dict.get("filter-lang", "cql2-text")
     )
-    return dict_to_bytes(
-        urlencode(
-            {
-                k: json.dumps(v) if isinstance(v, (list, dict)) else v
-                for k, v in new_qs_dict.items()
-            }
-        )
-    )
+    return dict_to_query_string(new_qs_dict).encode("utf-8")
 
 
-def append_body_filter(body: dict, filter: Expr, filter_lang: Optional[str]) -> dict:
+def append_body_filter(
+    body: dict, filter: Expr, filter_lang: Optional[str] = None
+) -> dict:
     """Insert a filter expression into a request body. If a filter already exists, combine them."""
     cur_filter = body.get("filter")
     filter_lang = filter_lang or body.get("filter-lang", "cql2-json")
@@ -54,3 +47,16 @@ def is_item_endpoint(path: str) -> bool:
 def is_search_endpoint(path: str) -> bool:
     """Check if the path is a search endpoint."""
     return path == "/search"
+
+
+def dict_to_query_string(params: dict) -> str:
+    """
+    Convert a dictionary to a query string. Dict values are converted to JSON strings,
+    unlike the default behavior of urllib.parse.urlencode.
+    """
+    parts = []
+    for key, val in params.items():
+        if isinstance(val, (dict, list)):
+            val = json.dumps(val, separators=(",", ":"))
+        parts.append(f"{key}={val}")
+    return "&".join(parts)