Revert "much stricter ruff linting"

This reverts commit 310dbf1574.

modules/caption/joycaption.py

@@ -65,7 +65,7 @@ def load(repo: str | None = None):
     if llava_model is None or opts.repo != repo:
         opts.repo = repo
         llava_model = None
-        log.info(f'Caption: type=vlm model="JoyCaption" {opts!s}')
+        log.info(f'Caption: type=vlm model="JoyCaption" {str(opts)}')
         processor = AutoProcessor.from_pretrained(repo, max_pixels=1024*1024, cache_dir=shared.opts.hfcache_dir)
         quant_args = model_quant.create_config(module='LLM')
         llava_model = LlavaForConditionalGeneration.from_pretrained(

modules/caption/moondream3.py

@@ -402,7 +402,7 @@ def predict(question: str, image: Image.Image, repo: str, model_name: str | None
     except Exception as e:
         from modules import errors
         errors.display(e, 'Moondream3')
-        return f"Error: {e!s}"
+        return f"Error: {str(e)}"
     finally:
         offload_aux('moondream3')
 

modules/caption/vqa.py

@@ -13,7 +13,7 @@ from modules import shared, devices, errors, model_quant, sd_models, sd_models_c
 from modules.sd_offload_aux import register_aux, deregister_aux, move_aux_to_gpu, offload_aux
 from modules.logger import log, console
 from modules.caption import vqa_detection
-from modules.caption.models_def import vlm_models, vlm_prefill, vlm_prompt_mapping, vlm_prompt_placeholders, vlm_prompts_common, vlm_prompts_florence, vlm_prompts_moondream, vlm_prompts_moondream2, vlm_prompts_promptgen, get_vlm_repo
+from modules.caption.models_def import vlm_models, vlm_system, vlm_default, vlm_prefill, vlm_prompts, vlm_prompt_mapping, vlm_prompt_placeholders, vlm_prompts_common, vlm_prompts_florence, vlm_prompts_moondream, vlm_prompts_moondream2, vlm_prompts_promptgen, get_vlm_repo
 
 # Debug logging - function-based to avoid circular import
 debug_enabled = os.environ.get('SD_CAPTION_DEBUG', None) is not None