torbjorn/my-pal-mcp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix syntax error from incomplete merge conflict resolution

Browse Source 
- Remove merge conflict markers from providers/openai.py
- Include o3-pro in temperature constraint check for O3/O4 models

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Lachlan Donald
2025-06-14 15:50:40 +10:00
parent a3aaf6f79b
commit c12dc1d765
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
providers/openai.py
View File

@@ -58,13 +58,8 @@ class OpenAIModelProvider(OpenAICompatibleProvider):
config = self.SUPPORTED_MODELS[resolved_name] config = self.SUPPORTED_MODELS[resolved_name]
# Define temperature constraints per model # Define temperature constraints per model
<<<<<<< HEAD if resolved_name in ["o3", "o3-mini", "o3-pro", "o4-mini", "o4-mini-high"]:
if resolved_name in ["o3", "o3-mini", "o4-mini", "o4-mini-high"]:
# O3 and O4 reasoning models only support temperature=1.0 # O3 and O4 reasoning models only support temperature=1.0
=======
if model_name in ["o3", "o3-mini", "o3-pro"]:
# O3 models only support temperature=1.0
>>>>>>> 155c4ec (Add o3-pro model support and extend test coverage)
temp_constraint = FixedTemperatureConstraint(1.0) temp_constraint = FixedTemperatureConstraint(1.0)
else: else:
# Other OpenAI models support 0.0-2.0 range # Other OpenAI models support 0.0-2.0 range