Single conflict on studio/backend/core/inference/external_provider.py: main added `previous_response_id` plumbing for OpenAI Responses chaining in the same body-builder block PR 5711 uses for service_tier / parallel_tool_calls. Kept both sets — service_tier+parallel_tool_calls write first, then previous_response_id appends. No behavioural change to either feature. 163 backend routing tests still pass; frontend tsc clean. |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| _html_to_md.py | ||
| anthropic_compat.py | ||
| audio_codecs.py | ||
| chat_template_helpers.py | ||
| defaults.py | ||
| external_provider.py | ||
| inference.py | ||
| key_exchange.py | ||
| llama_cpp.py | ||
| llama_server_args.py | ||
| mlx_inference.py | ||
| orchestrator.py | ||
| pricing.py | ||
| providers.py | ||
| safetensors_agentic.py | ||
| tool_call_parser.py | ||
| tools.py | ||
| worker.py | ||