Merge pull request #37 from dreadnode/bugfix/http-spec-json-string-return

test(http): ensure JSONPath transform outputs valid JSON

Author: briangreunke

rigging/generator/http.py

@@ -191,7 +191,7 @@ def parse_response_body(self, data: str) -> str:
                 matches = [match.value for match in jsonpath_expr.find(result)]
                 if len(matches) == 0:
                     raise Exception(f"No matches found for JSONPath: {transform.pattern} from {result}")
-                result = json.dumps(matches) if len(matches) > 1 else str(matches[0])
+                result = json.dumps(matches) if len(matches) > 1 else json.dumps(matches[0])
 
             elif transform.type == "regex":
                 matches = re.findall(_to_str(transform.pattern), result)

tests/test_http_spec.py

@@ -1,3 +1,4 @@
+import json
 import pytest
 from pydantic import ValidationError
 
@@ -246,3 +247,39 @@ def test_parse_response_body_list() -> None:
     )
     result = spec.parse_response_body('{"foo": [{"baz": 1}, {"baz": 2}]}')
     assert result == "[1, 2]"
+
+
+def test_parse_single_value_response_body() -> None:
+    spec = HTTPSpec(
+        request={
+            "url": "https://api.example.com/v1/chat",
+            "method": "POST",
+            "headers": {"Authorization": "Bearer {{api_key}}"},
+            "transforms": [{"type": "json", "pattern": {"model": "$model", "messages": "$messages"}}],
+        },
+        response={
+            "valid_status_codes": [200, 201],
+            "transforms": [{"type": "jsonpath", "pattern": "$.foo"}],
+        },
+    )
+    result = spec.parse_response_body('{"foo": 1, "bar": 2}')
+    assert result == "1"
+
+
+
+def test_jsonpath_transform_into_json() -> None:
+    spec = HTTPSpec(
+        request={
+            "url": "https://api.example.com/v1/chat",
+            "method": "POST",
+            "headers": {"Authorization": "Bearer {{api_key}}"},
+            "transforms": [{"type": "json", "pattern": {"model": "$model", "messages": "$messages"}}],
+        },
+        response={
+            "valid_status_codes": [200, 201],
+            "transforms": [{"type": "jsonpath", "pattern": "$"}],
+        },
+    )
+    result = spec.parse_response_body('{"foo": [{"baz": 1}, {"baz": 2}]}')
+    assert result
+    assert json.loads(result)