Skip to content

add headers in run service #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergioLangaritaBenitez merged 6 commits into from
Jul 30, 2026
Merged

add headers in run service #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df346e8
fix: add DELETE support and Content-Type header in make_request
SergioLangaritaBenitez Jun 18, 2026
8a2c2e2
fix: update test_make_request_post to expect Content-Type header
SergioLangaritaBenitez Jun 18, 2026
66da7ae
add headers in run service
SergioLangaritaBenitez Jul 30, 2026
66d179a
fix conflict
SergioLangaritaBenitez Jul 30, 2026
c499aea
add exception
SergioLangaritaBenitez Jul 30, 2026
1f2bf6b
fix tests
SergioLangaritaBenitez Jul 30, 2026
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
7 changes: 7 additions & 0 deletions oscar_python/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ def make_request(c, path, method, **kwargs):
if "data" in kwargs.keys() and kwargs["data"]:
req_kwargs["data"] = kwargs["data"]
req_kwargs["headers"]["Content-Type"] = "application/json"
if "headers" in kwargs.keys() and kwargs["headers"]:
try:
for header in kwargs["headers"].split(","):
chunck = header.split(":")
req_kwargs["headers"][chunck[0]] = chunck[1].lstrip()
except Exception as e:
print("error: " + str(e))
result = requests.request(method, url, **req_kwargs)
else:
result = requests.request(method, url, headers=headers, verify=c.ssl, timeout=timeout)
Expand Down
3 changes: 2 additions & 1 deletion oscar_python/default_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ def run_service(self, name, **kwargs):
path = _JOB_PATH + "/" + name

response = utils.make_request(self, path, _POST, data=send_data,
token=token, timeout=kwargs.get("timeout"))
token=token, timeout=kwargs.get("timeout"),
headers=kwargs.get("headers"))

if kwargs.get("output"):
utils.decode_output(response.text, kwargs["output"])
Expand Down
8 changes: 4 additions & 4 deletions tests/test_default_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_run_service_with_input_and_token(mock_decode_output, mock_encode_input,
mock_encode_input.assert_called_once_with("test_input")
mock_make_request.assert_called_once_with(
client, _RUN_PATH+"/test_service", _POST,
data="encoded_input", token="test_token", timeout=30)
data="encoded_input", token="test_token", timeout=30, headers=None)
mock_decode_output.assert_called_once_with("response_text", "output_file")
assert response == mock_response

Expand All @@ -45,7 +45,7 @@ def test_run_service_with_input_no_token(mock_encode_input, mock_make_request, c
mock_encode_input.assert_called_once_with("test_input")
mock_make_request.assert_called_once_with(
client, _RUN_PATH+"/test_service", _POST,
data="encoded_input", token="test_token", timeout=None)
data="encoded_input", token="test_token", timeout=None, headers=None)
assert response == mock_response


Expand All @@ -57,9 +57,9 @@ def test_run_service_no_input(mock_make_request, client):

response = client.run_service("test_service", input="data")
mock_make_request.assert_called_with(client, _RUN_PATH+"/test_service", _POST,
token="test_token", data=b'ZGF0YQ==', timeout=None)
token="test_token", data=b'ZGF0YQ==', timeout=None, headers=None)

response = client.run_service("test_service", input="data", async_call=True, timeout=30)
mock_make_request.assert_called_with(client, _JOB_PATH+"/test_service", _POST,
token="test_token", data=b'ZGF0YQ==', timeout=30)
token="test_token", data=b'ZGF0YQ==', timeout=30, headers=None)
assert response == mock_response
Loading