[FIX] Seed challenge_llm from the exported tool's resolved value so challenge-enabled deploys pass

backend/prompt_studio/prompt_studio_registry_v2/prompt_studio_registry_helper.py

@@ -143,6 +143,31 @@ def get_tool_by_prompt_registry_id(
             image_tag=settings.STRUCTURE_TOOL_IMAGE_TAG,
         )
 
+    @staticmethod
+    def get_resolved_settings(prompt_registry_id: str) -> dict[str, Any]:
+        """Return the settings export already resolved for this exported tool.
+
+        ``frame_export_json`` resolves adapter-valued settings at export time -
+        notably ``challenge_llm``, which falls back to the default profile's LLM
+        when the project set none - and stores them under
+        ``tool_metadata[tool_settings]``. ``Tool`` (built from ``tool_spec`` /
+        ``tool_property``) does not carry them, so callers that only have a
+        ``Tool`` cannot see the resolved values.
+
+        Returns an empty dict when the registry row is missing or carries no
+        settings, so callers can treat "no resolved settings" as a no-op.
+        """
+        try:
+            prompt_registry_tool = PromptStudioRegistry.objects.get(pk=prompt_registry_id)
+        except Exception as e:
+            logger.warning(
+                f"Error while fetching resolved settings for prompt registry ID "
+                f"{prompt_registry_id}: {e}"
+            )
+            return {}
+        metadata = prompt_registry_tool.tool_metadata or {}
+        return metadata.get(JsonSchemaKey.TOOL_SETTINGS, {}) or {}
+
     @staticmethod
     def update_or_create_psr_tool(
         custom_tool: CustomTool,

backend/tool_instance_v2/serializers.py

@@ -5,6 +5,9 @@
 from adapter_processor_v2.adapter_processor import AdapterProcessor
 from adapter_processor_v2.models import AdapterInstance
 from prompt_studio.prompt_studio_registry_v2.constants import PromptStudioRegistryKeys
+from prompt_studio.prompt_studio_registry_v2.prompt_studio_registry_helper import (
+    PromptStudioRegistryHelper,
+)
 from rest_framework.serializers import ListField, Serializer, UUIDField, ValidationError
 from workflow_manager.workflow_v2.constants import WorkflowKey
 from workflow_manager.workflow_v2.models.workflow import Workflow
@@ -170,11 +173,26 @@ def create(self, validated_data: dict[str, Any]) -> Any:
         validated_data[TIKey.PK] = uuid.uuid4()
         # TODO: Use version from tool props
         validated_data[TIKey.VERSION] = ""
+        tool_settings = ToolProcessor.get_default_settings(tool)
+        # `get_default_settings` seeds an adapter-valued property with "" when
+        # the spec carries no default (e.g. challenge_llm). The exported tool
+        # already resolved a real value for it, so prefer that - otherwise the
+        # instance stores "", which fails deployment validation against the
+        # adapter enum. Only spec-declared keys are overlaid; the export's
+        # settings are a superset (llm, vector-db, ...) and the rest are not
+        # part of the instance schema. Non-Prompt-Studio tools resolve to {}
+        # here, making this a no-op for them.
+        resolved_settings = PromptStudioRegistryHelper.get_resolved_settings(
+            prompt_registry_id=str(tool_uid)
+        )
+        for key in tool_settings:
+            if key in resolved_settings:
+                tool_settings[key] = resolved_settings[key]
         validated_data[TIKey.METADATA] = {
             # TODO: Review and remove tool instance ID
             WorkflowKey.WF_TOOL_INSTANCE_ID: str(validated_data[TIKey.PK]),
             PromptStudioRegistryKeys.PROMPT_REGISTRY_ID: str(tool_uid),
-            **ToolProcessor.get_default_settings(tool),
+            **tool_settings,
         }
         if TIKey.STEP not in validated_data:
             validated_data[TIKey.STEP] = workflow.tool_instances.count() + 1