Upload 3 files

core/api_service.py

@@ -114,6 +114,7 @@ class GenerationParameters:
     seed: Optional[int] = None
     model: str = "NAID4.5F"
     noise_schedule: str = "native"
+    variety_plus: bool = False  # VAR+ option (skip_cfg_above_sigma)
     # Character prompts: List of (prompt, negative) tuples
     character_prompts: List[Tuple[str, str]] = None
     # Character reference (NAID4.5 feature)
@@ -225,9 +226,22 @@ class NAIAPIService:
             "use_coords": False,
             "v4_prompt": v4_prompt,
             "v4_negative_prompt": v4_negative_prompt,
-            "skip_cfg_above_sigma": None,
         }
 
+        # VAR+ (skip_cfg_above_sigma) handling
+        # Reference: NAIA2.0/core/api_service.py:307-321
+        if params.variety_plus:
+            # NAID4.5: 58, NAID4.0/NAID3: 19
+            if model_name in ['nai-diffusion-4-5-curated']:
+                api_parameters["skip_cfg_above_sigma"] = 58
+            elif model_name == 'nai-diffusion-4-5-full':
+                api_parameters["skip_cfg_above_sigma"] = 58.93178654671047
+            else:
+                api_parameters["skip_cfg_above_sigma"] = 19
+            print(f"NAIA-WEB: VAR+ enabled (skip_cfg_above_sigma={api_parameters['skip_cfg_above_sigma']})")
+        else:
+            api_parameters["skip_cfg_above_sigma"] = None
+
         # Add character reference if provided (NAID4.5 feature)
         if params.character_reference:
             ref = params.character_reference
@@ -252,6 +266,12 @@ class NAIAPIService:
             api_parameters["inpaintImg2ImgStrength"] = 1
             api_parameters["normalize_reference_strength_multiple"] = True
 
+            # Character Reference 활성화 시 skip_cfg_above_sigma 제거
+            # Reference: NAIA2.0/core/api_service.py:533-536
+            if 'skip_cfg_above_sigma' in api_parameters:
+                del api_parameters['skip_cfg_above_sigma']
+                print("NAIA-WEB: skip_cfg_above_sigma removed (Character Reference enabled)")
+
             print(f"NAIA-WEB: Character reference enabled (style_aware={ref.style_aware}, fidelity={ref.fidelity})")
 
         # Build request payload

core/generation_service.py

@@ -30,6 +30,8 @@ class GenerationRequest:
     scale: float = 5.0
     cfg_rescale: float = 0.4     # NAIA2.0 default
     sampler: str = "k_euler"
+    noise_schedule: str = "karras"  # Noise schedule (karras, native, exponential, polyexponential)
+    variety_plus: bool = False      # VAR+ option
     seed: Optional[int] = None
 
     # Prompt processing options
@@ -126,6 +128,8 @@ class GenerationService:
                 sampler=request.sampler,
                 seed=request.seed,
                 model=request.model,
+                noise_schedule=request.noise_schedule,
+                variety_plus=request.variety_plus,
                 character_prompts=request.character_prompts if request.character_prompts else None,
                 character_reference=request.character_reference,
             )

core/prompt_processor.py

@@ -152,7 +152,7 @@ class PromptProcessor:
         if the user's post_prompt does NOT contain "quality".
         This allows users to customize quality tags via post_prompt.
 
-        Negative quality tags are always appended.
+        Negative quality tags are appended only if not already present.
         """
         # Check if post_prompt contains "quality" (case-insensitive)
         has_quality_in_post = "quality" in context.post_prompt.lower()
@@ -167,13 +167,20 @@ class PromptProcessor:
         else:
             context.processing_log.append("Skipped positive quality tags (post_prompt has 'quality')")
 
-        # Append quality tags to negative prompt (always)
-        if context.negative_prompt:
+        # Append quality tags to negative prompt (only if not already present)
+        # Check for signature pattern "lowres, {bad}" to detect existing quality tags
+        negative_lower = context.negative_prompt.lower() if context.negative_prompt else ""
+        has_quality_tags = "lowres, {bad}" in negative_lower
+
+        if has_quality_tags:
+            context.processing_log.append("Skipped negative quality tags (already present)")
+        elif context.negative_prompt:
             context.negative_prompt = f"{context.negative_prompt}, {QUALITY_TAGS_NEGATIVE}"
+            context.processing_log.append("Injected negative quality tags")
         else:
             context.negative_prompt = QUALITY_TAGS_NEGATIVE
+            context.processing_log.append("Injected negative quality tags")
 
-        context.processing_log.append("Injected negative quality tags")
         return context
 
     def _remove_auto_hide_tags(self, context: PromptContext) -> PromptContext: