root/ubuntu-post-install
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default PaintPlus OpenAI provider to gpt-image-2, fix GPU quick-start

Browse Source 
dall-e-2/dall-e-3 retired May 12 2026 and gpt-image-1 deprecates Oct 23
2026, so move every OpenAI default (config.py, both provider classes,
both compose files, .env.example, the in-app provider-settings dropdown,
README) to gpt-image-2 for both generation and edits. Also fix response
parsing in ai_provider.py's OpenAIProvider, which never sent a model
param and assumed a url response — gpt-image-1/2 only return b64_json.

Separately, .env.example shipped AI_PROVIDER=replicate by default, but
replicate has no driver in remote_provider.py, so following the
documented "cp .env.example .env" setup silently broke every AI call
and defeated the GPU quick-start (an explicit non-empty .env value
overrides docker-compose.gpu.yml's own local_gpu fallback). Default to
local_gpu instead, mark replicate/stability as not-yet-implemented, and
recommend Lykon/dreamshaper-8-inpainting as a hands/face-tuned
HF_MODEL_INPAINT override for 4-6GB cards (Quadro P2200, GTX 1060/1660).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Nb2vJ8W7bHKx1JXVvpCraH
This commit is contained in:
Claude
2026-06-26 15:17:18 +00:00
parent 36a126bee7
commit 43c66ea860
8 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paintplus/backend/app/services/ai_provider.py
+19 -19
View File
@@ -62,12 +62,22 @@ class AIProvider(ABC):
class OpenAIProvider(AIProvider):
"""OpenAI DALL-E 2 based image editing (NOTE: Lower quality than DALL-E 3)"""
"""OpenAI image API — gpt-image-2 (generation + edits, same model/endpoint family)."""
def __init__(self, api_key: str):
def __init__(self, api_key: str, model: str = "gpt-image-2", edit_model: str = "gpt-image-2"):
self.api_key = api_key
self.model = model
self.edit_model = edit_model
self.base_url = "https://api.openai.com/v1"
async def _fetch_result(self, client: httpx.AsyncClient, item: dict) -> bytes:
# gpt-image-1/2 only ever return b64_json; dall-e-2/dall-e-3 default to a url.
if item.get('b64_json'):
return base64.b64decode(item['b64_json'])
image_response = await client.get(item['url'])
image_response.raise_for_status()
return image_response.content
async def edit_image(
self,
patch_image_bytes: bytes,
@@ -77,7 +87,7 @@ class OpenAIProvider(AIProvider):
full_image_bytes: Optional[bytes] = None,
model: Optional[str] = None
) -> bytes:
"""Edit image using OpenAI DALL-E 2 (NOTE: Uses older model, lower quality)"""
"""Edit image using OpenAI's images/edits endpoint"""
async with httpx.AsyncClient(timeout=60.0) as client:
files = {
@@ -86,6 +96,7 @@ class OpenAIProvider(AIProvider):
}
data = {
'model': model or self.edit_model,
'prompt': prompt,
'n': 1,
'size': '1024x1024' # Will be adjusted based on input
@@ -104,13 +115,7 @@ class OpenAIProvider(AIProvider):
response.raise_for_status()
result = response.json()
# Download the generated image
image_url = result['data'][0]['url']
image_response = await client.get(image_url)
image_response.raise_for_status()
return image_response.content
return await self._fetch_result(client, result['data'][0])
async def text_to_image(
self,
@@ -120,10 +125,11 @@ class OpenAIProvider(AIProvider):
model: Optional[str] = None,
negative_prompt: Optional[str] = None
) -> bytes:
"""Generate image using OpenAI DALL-E"""
"""Generate image using OpenAI's images/generations endpoint"""
async with httpx.AsyncClient(timeout=60.0) as client:
data = {
'model': model or self.model,
'prompt': prompt,
'n': 1,
'size': f'{width}x{height}' if width == height else '1024x1024'
@@ -141,13 +147,7 @@ class OpenAIProvider(AIProvider):
response.raise_for_status()
result = response.json()
# Download the generated image
image_url = result['data'][0]['url']
image_response = await client.get(image_url)
image_response.raise_for_status()
return image_response.content
return await self._fetch_result(client, result['data'][0])
class StabilityAIProvider(AIProvider):
@@ -518,7 +518,7 @@ def get_ai_provider(provider_name: Optional[str] = None, model: Optional[str] =
if provider == "openai":
if not settings.openai_api_key:
raise ValueError("OpenAI API key not configured")
return OpenAIProvider(settings.openai_api_key)
return OpenAIProvider(settings.openai_api_key, settings.openai_model, settings.openai_edit_model)
elif provider == "stability":
if not settings.stability_api_key:
paintplus/backend/app/services/remote_provider.py
+3 -4
View File
@@ -28,12 +28,11 @@ class RemoteAIProvider(ABC):
class OpenAIRemoteProvider(RemoteAIProvider):
"""OpenAI image API — gpt-image-1 / dall-e-3."""
"""OpenAI image API — gpt-image-2 (generation + edits, same model/endpoint family)."""
def __init__(self, api_key: str, model: str = "dall-e-3", edit_model: str = "gpt-image-1"):
def __init__(self, api_key: str, model: str = "gpt-image-2", edit_model: str = "gpt-image-2"):
self.api_key = api_key
self.model = model
# dall-e-3 has no edits/inpaint support at all — edits need a model of their own.
self.edit_model = edit_model
self.base_url = "https://api.openai.com/v1"
@@ -41,7 +40,7 @@ class OpenAIRemoteProvider(RemoteAIProvider):
return {"Authorization": f"Bearer {self.api_key}"}
async def _fetch_result(self, client: httpx.AsyncClient, item: dict) -> bytes:
# gpt-image-1 only ever returns b64_json; dall-e-2/dall-e-3 default to a url.
# gpt-image-1/2 only ever return b64_json; dall-e-2/dall-e-3 default to a url.
if item.get("b64_json"):
return base64.b64decode(item["b64_json"])
img_r = await client.get(item["url"])