Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/retasc/models/inputs/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ class Http(HttpBase, InputBase):
default="http_data",
)

def _make_request(self, context):
def _make_request(self, url: str, context):
"""Make HTTP request and return the response."""
url = context.template.render(self.url)
headers = render_template_dict(self.headers, context)
params = render_template_dict(self.params, context)
data = render_templates(self.data, context)
Expand Down Expand Up @@ -64,18 +63,20 @@ def _extract_items(self, response, context):
return items

def values(self, context) -> Iterator[dict]:
response = self._make_request(context)
url = context.template.render(self.url)
response = self._make_request(url, context)
items = self._extract_items(response, context)

for index, item in enumerate(items):
yield {
"url": url,
"http_item": item,
"http_response": response,
"http_item_index": index,
}

def report_vars(self, values: dict) -> dict:
return {
"http_item": values.get("http_item"),
"url": self.url,
"http_item_index": values.get("http_item_index"),
}
5 changes: 1 addition & 4 deletions tests/test_input_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,7 @@ def test_http_input_report_vars(mock_context, requests_mock):
values = list(http_input.values(mock_context))

report_vars = http_input.report_vars(values[0])
assert report_vars == {
"http_item": {"id": 1, "name": "item1"},
"http_item_index": 0,
}
assert report_vars == {"url": url, "http_item_index": 0}


def test_http_input_http_error(mock_context, requests_mock):
Expand Down