Skip to content
Open
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
6 changes: 4 additions & 2 deletions ai_oca_bridge/models/ai_bridge_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,16 @@ def _execute(self, **kwargs):
**kwargs,
)
payload = self._add_extra_payload_fields(payload)
request_kwargs = self._execute_kwargs(**kwargs)
timeout = request_kwargs.pop("timeout", 30)
try:
response = requests.post(
self.ai_bridge_id.url,
json=payload,
auth=self._get_auth(),
headers=self._get_headers(),
timeout=30, # Default timeout, can be overridden by _execute_kwargs
**self._execute_kwargs(**kwargs),
timeout=timeout,
**request_kwargs,
)
self.result = response.content
response.raise_for_status()
Expand Down
21 changes: 21 additions & 0 deletions ai_oca_bridge/tests/test_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,24 @@ def test_bridge_execute_computed_fields(self):
self.assertEqual(
execution.payload["_id"], json.loads(execution.payload_txt)["_id"]
)

def test_execute_timeout_from_kwargs(self):
"""timeout via _execute_kwargs must not raise TypeError."""
execution = self.env["ai.bridge.execution"].create(
{
"ai_bridge_id": self.bridge.id,
"model_id": self.env["ir.model"]._get_id("res.partner"),
"res_id": self.partner.id,
}
)
response = mock.Mock()
response.status_code = 200
response.content = b'{"ok": true}'
response.json.return_value = {"ok": True}
response.raise_for_status = mock.Mock()
with mock.patch("requests.post", return_value=response) as mock_post:
execution._execute()
self.assertEqual(mock_post.call_args.kwargs["timeout"], 30)
execution._execute(timeout=90)
self.assertEqual(mock_post.call_args.kwargs["timeout"], 90)
self.assertEqual(execution.state, "done")
Loading