nodes/cedarconnor-upsampler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Google Drive support to bypass 32MB ImgBB limit

Browse Source 
- Add Google Drive API integration for large image uploads
- Add new node parameters: google_drive_creds_path, google_drive_folder_id, upload_method
- Auto-select upload method based on image size (>30MB uses Google Drive)
- Add comprehensive setup documentation (GOOGLE_DRIVE_SETUP.md)
- Update requirements.txt with Google API dependencies
- Add security improvements: redact API keys in logs, add .gitignore
- Fix dropdown field configuration for upload_method parameter

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

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude Code
2025-07-23 20:12:26 -07:00
parent d499da970e
commit 34c300aa28
4 changed files with 325 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+51
View File
@@ -0,0 +1,51 @@
# API Keys and Credentials
*.json
!example_workflow.json
!package.json
!requirements.txt
google-drive-*.json
service-account*.json
credentials/
*.key
*.pem
*.env
.env
# Python
__pycache__/
*.py[cod]
*$py.class
*.so
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST
# IDE
.vscode/
.idea/
*.swp
*.swo
# OS
.DS_Store
Thumbs.db
# Temporary files
temp/
tmp/
*.tmp
*.temp
GOOGLE_DRIVE_SETUP.md
+114
View File
@@ -0,0 +1,114 @@
# Google Drive Setup for ComfyUI Upsampler
This guide explains how to set up Google Drive as an upload method for large images (>30MB) that exceed ImgBB's free limit.
## Prerequisites
Install the required Google API libraries:
```bash
pip install google-api-python-client google-auth
```
## Setup Steps
### 1. Create Google Cloud Project
1. Go to [Google Cloud Console](https://console.cloud.google.com/)
2. Create a new project or select an existing one
3. Enable the Google Drive API for your project
### 2. Create Service Account
1. Go to "IAM & Admin" > "Service Accounts"
2. Click "Create Service Account"
3. Enter a name (e.g., "upsampler-drive")
4. Click "Create and Continue"
5. Skip role assignment (click "Continue")
6. Click "Done"
### 3. Generate Credentials
1. Click on your created service account
2. Go to "Keys" tab
3. Click "Add Key" > "Create new key"
4. Select "JSON" format
5. Download the JSON file
6. Save it securely (e.g., `~/google-drive-creds.json`)
### 4. Configure the Node
#### Method 1: Use node parameters (Recommended)
- Set `google_drive_creds_path` to your JSON file path
- Set `google_drive_folder_id` to your folder ID (optional)
- Set `upload_method` to "google_drive" or "auto"
#### Method 2: Use environment variables
Set these environment variables:
```bash
export GOOGLE_DRIVE_CREDS_PATH="/path/to/your/credentials.json"
export GOOGLE_DRIVE_FOLDER_ID="your_folder_id" # Optional - can also be set in node
```
**Note:** Node parameters take priority over environment variables.
## Usage
### Upload Method Options:
- **"auto"** (default): Automatically chooses based on image size and available credentials
- **"google_drive"**: Forces Google Drive upload
- **"imgbb"**: Forces ImgBB upload (requires API key)
### Auto Selection Logic:
- Images >30MB: Prefers Google Drive if credentials available
- Images ≤30MB: Prefers ImgBB if API key available
- Falls back to free services if no credentials
## Optional: Specify Upload Folder
To upload to a specific Google Drive folder:
### Method 1: Using Node Parameter (Easier)
1. Create or navigate to the desired folder in Google Drive
2. Copy the folder ID from the URL (the long string after `/folders/`)
- Example URL: `https://drive.google.com/drive/folders/1ABC123DEF456GHI789JKL`
- Folder ID: `1ABC123DEF456GHI789JKL`
3. Paste this ID into the `google_drive_folder_id` field in the node
### Method 2: Using Environment Variable
1. Follow steps 1-2 above to get the folder ID
2. Set the `GOOGLE_DRIVE_FOLDER_ID` environment variable to this ID
**Note:** The node parameter takes priority over the environment variable.
## Security Notes
- Keep your service account JSON file secure
- Don't commit credentials to version control
- The service account only has access to files it creates
- Uploaded files are made publicly readable (required for Upsampler API)
## Troubleshooting
### "Credentials file not found"
- Check the file path is correct
- Ensure the file exists and is readable
- Use absolute paths
### "Permission denied"
- Verify the service account has Drive API access
- Check the JSON credentials file is valid
### "Module not found"
- Install required packages: `pip install google-api-python-client google-auth`
## Quick Setup Summary
Once you've completed the setup, your node will have these new fields:
1. **`google_drive_creds_path`**: Path to your downloaded JSON credentials file
2. **`google_drive_folder_id`**: (Optional) ID of the Google Drive folder to upload to
3. **`upload_method`**: Choose "auto", "google_drive", or "imgbb"
**Example Configuration:**
- `google_drive_creds_path`: `C:\ComfyUI\credentials\google-drive-key.json`
- `google_drive_folder_id`: `1ABC123DEF456GHI789JKL` (optional)
- `upload_method`: `auto` (recommended)
With these settings, large images will automatically upload to your specified Google Drive folder, bypassing the 32MB ImgBB limit!
nodes.py
+157 -18
View File
@@ -2,6 +2,7 @@ import os
import requests
import time
import tempfile
import json
from typing import Tuple, Optional, Dict, Any
from urllib.parse import urlparse
from PIL import Image
@@ -11,6 +12,14 @@ import numpy as np
import folder_paths
from comfy.utils import ProgressBar
try:
from googleapiclient.discovery import build
from googleapiclient.http import MediaIoBaseUpload
from google.oauth2.service_account import Credentials
GOOGLE_DRIVE_AVAILABLE = True
except ImportError:
GOOGLE_DRIVE_AVAILABLE = False
class UpsamplerSmartUpscale:
@classmethod
@@ -26,6 +35,9 @@ class UpsamplerSmartUpscale:
},
"optional": {
"imgbb_api_key": ("STRING", {"multiline": False, "default": ""}),
"google_drive_creds_path": ("STRING", {"multiline": False, "default": ""}),
"google_drive_folder_id": ("STRING", {"multiline": False, "default": ""}),
"upload_method": (["imgbb", "google_drive", "auto"], {"default": "auto"})
"description": ("STRING", {"multiline": True, "default": ""}),
"should_enhance_faces": ("BOOLEAN", {"default": False}),
"should_preserve_blur": ("BOOLEAN", {"default": False}),
@@ -39,7 +51,8 @@ class UpsamplerSmartUpscale:
def upscale(self, image: torch.Tensor, api_key: str, input_image_type: str,
upscale_factor: float, global_creativity: int, detail: int,
imgbb_api_key: str = "", description: str = "", should_enhance_faces: bool = False,
imgbb_api_key: str = "", google_drive_creds_path: str = "", google_drive_folder_id: str = "", upload_method: str = "auto",
description: str = "", should_enhance_faces: bool = False,
should_preserve_blur: bool = False) -> Tuple[torch.Tensor]:
print(f"🚀 [Upsampler] Starting Smart Upscale process...")
@@ -54,9 +67,9 @@ class UpsamplerSmartUpscale:
hosting_api_key = imgbb_api_key or os.getenv('IMGBB_API_KEY', '')
print(f"🔑 [Upsampler] Image hosting: {'ImgBB (with API key)' if hosting_api_key else 'Free services (no API key)'}")
# Upload image to temporary hosting service
# Upload image to hosting service
print(f"📤 [Upsampler] Uploading image to hosting service...")
image_url = self._upload_image_temp(pil_image, hosting_api_key)
image_url = self._upload_image_temp(pil_image, hosting_api_key, google_drive_creds_path, google_drive_folder_id, upload_method)
print(f"✅ [Upsampler] Image uploaded successfully: {image_url}")
# Prepare API request
@@ -159,21 +172,46 @@ class UpsamplerSmartUpscale:
return tensor
def _upload_image_temp(self, image: Image.Image, imgbb_api_key: str = None) -> str:
def _upload_image_temp(self, image: Image.Image, imgbb_api_key: str = None,
google_drive_creds_path: str = "", google_drive_folder_id: str = "", upload_method: str = "auto") -> str:
import base64
import io
# Convert image to base64
# Convert image to base64 for compatibility
buffer = io.BytesIO()
image.save(buffer, format='PNG')
buffer.seek(0)
image_data = base64.b64encode(buffer.getvalue()).decode()
image_size_mb = len(buffer.getvalue()) / (1024 * 1024)
# Option 1: ImgBB (Free, requires API key)
if imgbb_api_key:
print(f"📊 [Upload] Image size: {image_size_mb:.2f} MB")
# Determine upload method
if upload_method == "google_drive":
return self._upload_to_google_drive(image, google_drive_creds_path, google_drive_folder_id)
elif upload_method == "imgbb":
if not imgbb_api_key:
raise Exception("ImgBB API key required for ImgBB upload method")
return self._upload_to_imgbb(image_data, imgbb_api_key)
elif upload_method == "auto":
# Auto-select based on image size and available credentials
if image_size_mb > 30: # Close to ImgBB limit
print(f"🔄 [Upload] Large image detected ({image_size_mb:.2f} MB), preferring Google Drive...")
if google_drive_creds_path and GOOGLE_DRIVE_AVAILABLE:
return self._upload_to_google_drive(image, google_drive_creds_path, google_drive_folder_id)
elif imgbb_api_key:
print(f"⚠️ [Upload] Image is close to ImgBB 32MB limit, but no Google Drive credentials available")
return self._upload_to_imgbb(image_data, imgbb_api_key)
else:
raise Exception(f"Image too large ({image_size_mb:.2f} MB) for free services. Please use Google Drive or ImgBB.")
else:
# Try ImgBB first for smaller images
if imgbb_api_key:
return self._upload_to_imgbb(image_data, imgbb_api_key)
elif google_drive_creds_path and GOOGLE_DRIVE_AVAILABLE:
return self._upload_to_google_drive(image, google_drive_creds_path, google_drive_folder_id)
# Option 2: Try free services without API key
# Fallback to free services
try:
return self._upload_to_free_service(image_data)
except Exception as e:
@@ -181,10 +219,10 @@ class UpsamplerSmartUpscale:
f"Image upload failed: {str(e)}\n\n"
"To resolve this, you have several options:\n"
"1. Get a free ImgBB API key from https://api.imgbb.com/\n"
"2. Add 'imgbb_api_key' parameter to the node input\n"
"3. Set IMGBB_API_KEY environment variable\n"
"4. Use your own hosting solution\n\n"
"ImgBB is recommended as it's free and reliable."
"2. Set up Google Drive API credentials\n"
"3. Add 'imgbb_api_key' or 'google_drive_creds_path' parameter\n"
"4. Set IMGBB_API_KEY environment variable\n\n"
"For large images (>30MB), Google Drive is recommended."
)
def _upload_to_imgbb(self, image_data: str, api_key: str) -> str:
@@ -216,6 +254,100 @@ class UpsamplerSmartUpscale:
print(f"❌ [ImgBB] API error: {response.status_code} - {response.text}")
raise Exception(f"ImgBB API error: {response.status_code} - {response.text}")
def _upload_to_google_drive(self, image: Image.Image, creds_path: str, folder_id: str = "") -> str:
"""Upload image to Google Drive and return public URL"""
if not GOOGLE_DRIVE_AVAILABLE:
raise Exception(
"Google Drive upload requires google-api-python-client and google-auth libraries.\n"
"Install with: pip install google-api-python-client google-auth"
)
if not creds_path:
creds_path = os.getenv('GOOGLE_DRIVE_CREDS_PATH', '')
if not creds_path or not os.path.exists(creds_path):
raise Exception(
f"Google Drive credentials file not found at: {creds_path}\n"
"Please provide a valid service account JSON file path.\n"
"See: https://developers.google.com/drive/api/v3/quickstart/python"
)
print(f"🔄 [Google Drive] Authenticating with credentials: {creds_path}")
# Use folder ID from parameter first, then environment variable
if not folder_id:
folder_id = os.getenv('GOOGLE_DRIVE_FOLDER_ID', '')
if folder_id:
print(f"📁 [Google Drive] Using folder ID: {folder_id}")
else:
print(f"📁 [Google Drive] No folder specified, uploading to root directory")
try:
# Load service account credentials
creds = Credentials.from_service_account_file(
creds_path,
scopes=['https://www.googleapis.com/auth/drive.file']
)
service = build('drive', 'v3', credentials=creds)
# Save image to temp file
temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.png')
image.save(temp_file.name, format='PNG')
temp_file.close()
# Upload file to Google Drive
file_metadata = {
'name': f'upsampler_temp_{int(time.time())}.png'
}
# Add folder as parent if specified
if folder_id:
file_metadata['parents'] = [folder_id]
print(f"🔄 [Google Drive] Uploading image...")
with open(temp_file.name, 'rb') as f:
media = MediaIoBaseUpload(f, mimetype='image/png', resumable=True)
file = service.files().create(
body=file_metadata,
media_body=media,
fields='id'
).execute()
file_id = file.get('id')
print(f"✅ [Google Drive] File uploaded with ID: {file_id}")
# Make file publicly viewable
permission = {
'type': 'anyone',
'role': 'reader'
}
service.permissions().create(fileId=file_id, body=permission).execute()
print(f"✅ [Google Drive] File made publicly accessible")
# Clean up temp file
try:
os.unlink(temp_file.name)
except:
pass
# Return direct download URL
public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
print(f"✅ [Google Drive] Public URL: {public_url}")
return public_url
except Exception as e:
# Clean up temp file on error
try:
os.unlink(temp_file.name)
except:
pass
print(f"❌ [Google Drive] Upload failed: {str(e)}")
raise Exception(f"Google Drive upload failed: {str(e)}")
def _upload_to_free_service(self, image_data: str) -> str:
"""Try uploading to free services that don't require API keys"""
@@ -320,7 +452,7 @@ class UpsamplerSmartUpscale:
}
print(f"📡 [Upsampler API] Sending request to: https://upsampler.com/api/v1/{endpoint}")
print(f"🔑 [Upsampler API] Using API key: {api_key[:10]}...")
print(f"🔑 [Upsampler API] Using API key: {'*' * 8}[REDACTED]")
response = requests.post(
f"https://upsampler.com/api/v1/{endpoint}",
@@ -457,6 +589,9 @@ class UpsamplerDynamicUpscale:
},
"optional": {
"imgbb_api_key": ("STRING", {"multiline": False, "default": ""}),
"google_drive_creds_path": ("STRING", {"multiline": False, "default": ""}),
"google_drive_folder_id": ("STRING", {"multiline": False, "default": ""}),
"upload_method": (["imgbb", "google_drive", "auto"], {"default": "auto"})
"description": ("STRING", {"multiline": True, "default": ""}),
"should_enhance_faces": ("BOOLEAN", {"default": False}),
"should_preserve_hands": ("BOOLEAN", {"default": False}),
@@ -471,7 +606,8 @@ class UpsamplerDynamicUpscale:
def upscale(self, image: torch.Tensor, api_key: str, input_image_type: str,
upscale_factor: float, global_creativity: int, resemblance: int,
detail: int, imgbb_api_key: str = "", description: str = "", should_enhance_faces: bool = False,
detail: int, imgbb_api_key: str = "", google_drive_creds_path: str = "", google_drive_folder_id: str = "", upload_method: str = "auto",
description: str = "", should_enhance_faces: bool = False,
should_preserve_hands: bool = False, should_preserve_blur: bool = False) -> Tuple[torch.Tensor]:
# Reuse the same methods from SmartUpscale
@@ -480,7 +616,7 @@ class UpsamplerDynamicUpscale:
# Get ImgBB API key from parameter or environment variable
hosting_api_key = imgbb_api_key or os.getenv('IMGBB_API_KEY', '')
image_url = upscaler._upload_image_temp(pil_image, hosting_api_key)
image_url = upscaler._upload_image_temp(pil_image, hosting_api_key, google_drive_creds_path, google_drive_folder_id, upload_method)
payload = {
"input": {
@@ -515,6 +651,9 @@ class UpsamplerPreciseUpscale:
},
"optional": {
"imgbb_api_key": ("STRING", {"multiline": False, "default": ""}),
"google_drive_creds_path": ("STRING", {"multiline": False, "default": ""}),
"google_drive_folder_id": ("STRING", {"multiline": False, "default": ""}),
"upload_method": (["imgbb", "google_drive", "auto"], {"default": "auto"})
"should_enhance_faces": ("BOOLEAN", {"default": False}),
"should_preserve_blur": ("BOOLEAN", {"default": False}),
}
@@ -526,8 +665,8 @@ class UpsamplerPreciseUpscale:
CATEGORY = "Upsampler"
def upscale(self, image: torch.Tensor, api_key: str, input_image_type: str,
upscale_factor: float, imgbb_api_key: str = "", should_enhance_faces: bool = False,
should_preserve_blur: bool = False) -> Tuple[torch.Tensor]:
upscale_factor: float, imgbb_api_key: str = "", google_drive_creds_path: str = "", google_drive_folder_id: str = "", upload_method: str = "auto",
should_enhance_faces: bool = False, should_preserve_blur: bool = False) -> Tuple[torch.Tensor]:
# Reuse the same methods from SmartUpscale
upscaler = UpsamplerSmartUpscale()
@@ -535,7 +674,7 @@ class UpsamplerPreciseUpscale:
# Get ImgBB API key from parameter or environment variable
hosting_api_key = imgbb_api_key or os.getenv('IMGBB_API_KEY', '')
image_url = upscaler._upload_image_temp(pil_image, hosting_api_key)
image_url = upscaler._upload_image_temp(pil_image, hosting_api_key, google_drive_creds_path, google_drive_folder_id, upload_method)
payload = {
"input": {
requirements.txt
+3 -1
View File
@@ -1,2 +1,4 @@
requests>=2.28.0
Pillow>=9.0.0
Pillow>=9.0.0
google-api-python-client>=2.0.0
google-auth>=2.0.0