Merge branch 'master' into mistralai

Author: AAClause

basilisk/provider_engine/openai_engine.py

@@ -123,6 +123,26 @@ def models(self) -> list[ProviderAIModel]:
 				vision=True,
 				max_temperature=2.0,
 			),
+			ProviderAIModel(
+				id="gpt-4o-search-preview",
+				name="GPT-4o Search Preview",
+				# Translators: This is a model description
+				description=_("GPT model for web search in Chat Completions"),
+				context_window=128000,
+				max_output_tokens=16384,
+				vision=True,
+				max_temperature=2.0,
+			),
+			ProviderAIModel(
+				id="gpt-4o-mini-search-preview",
+				name="GPT-4o mini Search Preview",
+				# Translators: This is a model description
+				description=_("Fast, affordable small model for web search"),
+				context_window=128000,
+				max_output_tokens=16384,
+				vision=True,
+				max_temperature=2.0,
+			),
 			ProviderAIModel(
 				id="chatgpt-4o-latest",
 				name="ChatGPT 4o",
@@ -390,15 +410,21 @@ def completion(
 			chat completion chunks.
 		"""
 		super().completion(new_block, conversation, system_message, **kwargs)
+		model_id = new_block.model.model_id
 		params = {
-			"model": new_block.model.model_id,
+			"model": model_id,
 			"messages": self.get_messages(
 				new_block, conversation, system_message
 			),
-			"temperature": new_block.temperature,
-			"top_p": new_block.top_p,
 			"stream": new_block.stream,
 		}
+		if model_id not in [
+			"gpt-4o-search-preview",
+			"gpt-4o-mini-search-preview",
+		]:
+			params.update(
+				{"temperature": new_block.temperature, "top_p": new_block.top_p}
+			)
 		if new_block.max_tokens:
 			params["max_tokens"] = new_block.max_tokens
 		params.update(kwargs)

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "more-itertools (>=10.6.0,<10.7.0)",
     "numpy (>=2.2.1,<2.3.0)",
     "ollama (>=0.4.7,<0.5.0)",
-    "openai (>=1.65.1,<1.66.0)",
+    "openai>=1.66.0,<1.67.0",
     "ordered-set (>=4.1.0,<4.2.0)",
     "pillow (>=11.1.0,<11.2.0)",
     "psutil (>=7.0.0,<7.1.0)",
@@ -86,7 +86,7 @@ extend-select = ["INT","I","C90","D","T201","T203"]
 extend-ignore = ["D206"]
 
 [tool.ruff.lint.mccabe]
-max-complexity = 10
+max-complexity = 12
 
 [tool.ruff.lint.isort]
 known-first-party = ["basilisk"]