refining

Author: vaibhav45sktech

databusclient/api/queries.py

@@ -58,12 +58,24 @@ def parse_content_variants_string(variants_str: str) -> dict:
     Parameters
     ----------
     variants_str : str
-        Comma-separated string of content variants, e.g., "lang=en, type=full, sorted=true"
+        Comma-separated string of content variants, e.g., "lang=en, type=full, sorted"
     
     Returns
     -------
     dict
-        Dictionary of key-value pairs, e.g., {"lang": "en", "type": "full", "sorted": "true"}
+        Dictionary of parsed content variants. For key=value pairs, both the key
+        and value are returned as strings (no type conversion is performed, so
+        "true" remains the string "true", not a boolean). For standalone values
+        without an "=" sign, the value is recorded as the boolean ``True``.
+        
+        Example: "lang=en, type=full, sorted" -> {"lang": "en", "type": "full", "sorted": True}
+    
+    Notes
+    -----
+    - All values from key=value pairs are kept as strings. If you need boolean
+      or numeric conversion, perform it after calling this function.
+    - Standalone items (e.g., "sorted") are stored with boolean ``True`` as
+      their value, indicating presence rather than a specific string value.
     """
     if not variants_str or variants_str.strip() == "":
         return {}

databusclient/cli.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 import json
 import os
-import re
 from typing import List
 
 import click

tests/test_deploy.py

@@ -11,39 +11,9 @@
     _get_content_variants,
     BadArgumentException,
 )
-from databusclient.cli import parse_distribution_str
-
-EXAMPLE_URL = "https://raw.githubusercontent.com/dbpedia/databus/608482875276ef5df00f2360a2f81005e62b58bd/server/app/api/swagger.yml"
 
 
-def test_parse_distribution_str():
-    """Test the new pipe-separated distribution string parser"""
-    
-    # Test with multiple content variants
-    result = parse_distribution_str("http://example.com/data|lang=en|type=full|sorted=true|.ttl|.gz")
-    assert result["url"] == "http://example.com/data"
-    assert result["variants"] == {"lang": "en", "type": "full", "sorted": "true"}
-    assert result["formatExtension"] == "ttl"
-    assert result["compression"] == "gz"
-    
-    # Test with single content variant
-    result = parse_distribution_str("http://mysite.com/data.json|lang=fr|.json")
-    assert result["url"] == "http://mysite.com/data.json"
-    assert result["variants"] == {"lang": "fr"}
-    assert result["formatExtension"] == "json"
-    assert result["compression"] is None
-    
-    # Test URL only
-    result = parse_distribution_str("http://example.com/file.csv")
-    assert result["url"] == "http://example.com/file.csv"
-    assert result["variants"] == {}
-    assert result["formatExtension"] is None
-    assert result["compression"] is None
-    
-    # Test with compression only (no format extension)
-    result = parse_distribution_str("http://example.com/data|.gz")
-    assert result["url"] == "http://example.com/data"
-    assert result["compression"] == "gz"
+EXAMPLE_URL = "https://raw.githubusercontent.com/dbpedia/databus/608482875276ef5df00f2360a2f81005e62b58bd/server/app/api/swagger.yml"
 
 
 def test_get_content_variants():