LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows
Python ai-agentsdata-engineeringdocument-aigenerative-aiidpjson-extractionllmmcp-serverocrpdf-extractionprompt-engineeringstructured-output
UN-3991 [FIX] Show model names on Prompt Studio tiles for shared users (#2240)
Kirtiman Mishra3816b2ace026
diff --git a/backend/adapter_processor_v2/adapter_processor.py b/backend/adapter_processor_v2/adapter_processor.pyindex bcf6ac74f..a9c7f40e3 100644--- a/backend/adapter_processor_v2/adapter_processor.py+++ b/backend/adapter_processor_v2/adapter_processor.py@@ -109,6 +109,37 @@ class AdapterProcessor:raise InValidAdapterId()return updated_adapters[0].get(key_value)+ @staticmethod+ def get_icon(adapter: AdapterInstance) -> str:+ """Registry icon for an adapter, or the warning icon if unresolvable."""+ if not adapter.is_available:+ return AdapterKeys.UNAVAILABLE_ICON+ try:+ adapter_class = Adapterkit().get_adapter_class_by_adapter_id(+ adapter.adapter_id+ )+ except Exception as e:+ logger.warning(+ "Adapter %s is not in the SDK registry: %s", adapter.adapter_id, e+ )+ return AdapterKeys.UNAVAILABLE_ICON+ return adapter_class.get_icon() or AdapterKeys.UNAVAILABLE_ICON++ @staticmethod+ def get_model_label(adapter: AdapterInstance) -> str:+ """Model name from the adapter metadata.++ Adapters without a model use the adapter id's provider prefix.+ """+ try:+ model = adapter.metadata.get("model")+ except Exception as e:+ logger.error(+ "Could not read metadata for adapter %s: %s", adapter.adapter_id, e+ )+ model = None+ return model or adapter.adapter_id.split("|")[0]+@staticmethoddef test_adapter(adapter_id: str, adapter_metadata: dict[str, Any]) -> bool:try:@@ -214,27 +245,6 @@ class AdapterProcessor:else:raise InternalServiceError()- @staticmethod- def get_adapter_instance_by_id(adapter_instance_id: str) -> Adapter:- """Get the adapter instance by its ID.-- Parameters:- - adapter_instance_id (str): The ID of the adapter instance.-- Returns:- - Adapter: The adapter instance with the specified ID.-- Raises:- - Exception: If there is an error while fetching the adapter instance.- """- try:- adapter = AdapterInstance.objects.get(id=adapter_instance_id)- except Exception as e:- logger.error(f"Unable to fetch adapter: {e}")- if not adapter:- logger.error("Unable to fetch adapter")- return adapter.adapter_name-@staticmethoddef get_adapters_by_type(adapter_type: AdapterTypes, user: Userdiff --git a/backend/adapter_processor_v2/constants.py b/backend/adapter_processor_v2/constants.pyindex 5aee0f42f..438ee0907 100644--- a/backend/adapter_processor_v2/constants.py+++ b/backend/adapter_processor_v2/constants.py@@ -35,6 +35,7 @@ class AdapterKeys:IS_AVAILABLE = "is_available"DEPRECATION_METADATA = "deprecation_metadata"IS_DEPRECATED = "is_deprecated"+ UNAVAILABLE_ICON = "⚠️"class AllowedDomains(Enum):diff --git a/backend/adapter_processor_v2/serializers.py b/backend/adapter_processor_v2/serializers.pyindex c8545223b..8209dd75c 100644--- a/backend/adapter_processor_v2/serializers.py+++ b/backend/adapter_processor_v2/serializers.py@@ -184,24 +184,7 @@ class AdapterListSerializer(BaseAdapterSerializer):if not instance.is_available and instance.deprecation_metadata:rep[AdapterKeys.DEPRECATION_METADATA] = instance.deprecation_metadata- # Only call SDK for available adapters- if instance.is_available:- try:- rep[common.ICON] = AdapterProcessor.get_adapter_data_with_key(- instance.adapter_id, common.ICON- )- except Exception as e:- # Log error but don't fail serialization- import logging-- logger = logging.getLogger(__name__)- logger.warning(- f"Failed to retrieve icon for adapter {instance.adapter_id}: {e}"- )- rep[common.ICON] = "⚠️" # Fallback icon for SDK errors- else:- # Use generic warning icon for deprecated adapters- rep[common.ICON] = "⚠️"+ rep[common.ICON] = AdapterProcessor.get_icon(instance)model = instance.metadata.get("model")if model:diff --git a/backend/prompt_studio/prompt_profile_manager_v2/serializers.py b/backend/prompt_studio/prompt_profile_manager_v2/serializers.pyindex 008fed385..5fa6d3bf9 100644--- a/backend/prompt_studio/prompt_profile_manager_v2/serializers.py+++ b/backend/prompt_studio/prompt_profile_manager_v2/serializers.py@@ -1,6 +1,9 @@import logging+from typing import Anyfrom adapter_processor_v2.adapter_processor import AdapterProcessor+from adapter_processor_v2.models import AdapterInstance+from rest_framework.serializers import ValidationErrorfrom backend.serializers import AuditSerializerfrom prompt_studio.prompt_profile_manager_v2.constants import ProfileManagerKeys@@ -9,33 +12,58 @@ from .models import ProfileManagerlogger = logging.getLogger(__name__)+# Adapter FK -> "conf" response key read by the UI.+ADAPTER_LABELS = (+ (ProfileManagerKeys.LLM, "LLM"),+ (ProfileManagerKeys.EMBEDDING_MODEL, "Embedding Model"),+ (ProfileManagerKeys.VECTOR_STORE, "Vector Store"),+ (ProfileManagerKeys.X2TEXT, "Text Extractor"),+)+class ProfileManagerSerializer(AuditSerializer):class Meta:model = ProfileManagerfields = "__all__"- # View owns uniqueness (IntegrityError->DuplicateData on create); drop- # the DRF auto-validator that 400s on re-save / PUT before the view runs.+ # Dropped so a duplicate create surfaces the view's DuplicateData.validators = []+ def validate(self, attrs: dict[str, Any]) -> dict[str, Any]:+ """Reject a change to an adapter the requester cannot access.++ An unchanged value passes, so a co-owner can still save a profile+ that points at an adapter shared only with the owner.+ """+ request = self.context.get("request")+ if not request:+ return attrs+ accessible = AdapterInstance.objects.for_user(request.user)+ for field, _ in ADAPTER_LABELS:+ adapter = attrs.get(field)+ if not adapter or adapter == getattr(self.instance, field, None):+ continue+ if not accessible.filter(id=adapter.id).exists():+ raise ValidationError({field: "No access to the selected adapter."})+ return attrs+def to_representation(self, instance): # type: ignore- rep: dict[str, str] = super().to_representation(instance)- llm = rep[ProfileManagerKeys.LLM]- embedding = rep[ProfileManagerKeys.EMBEDDING_MODEL]- vector_db = rep[ProfileManagerKeys.VECTOR_STORE]- x2text = rep[ProfileManagerKeys.X2TEXT]- if llm:- rep[ProfileManagerKeys.LLM] = AdapterProcessor.get_adapter_instance_by_id(llm)- if embedding:- rep[ProfileManagerKeys.EMBEDDING_MODEL] = (- AdapterProcessor.get_adapter_instance_by_id(embedding)- )- if vector_db:- rep[ProfileManagerKeys.VECTOR_STORE] = (- AdapterProcessor.get_adapter_instance_by_id(vector_db)- )- if x2text:- rep[ProfileManagerKeys.X2TEXT] = AdapterProcessor.get_adapter_instance_by_id(- x2text- )+ """Resolve the adapter FKs to the name, model and icon the UI renders.++ Not filtered by adapter access - display data only, no credentials.+ """+ rep: dict[str, Any] = super().to_representation(instance)+ conf: dict[str, str] = {}+ for field, label in ADAPTER_LABELS:+ adapter = getattr(instance, field)+ if not adapter:+ continue+ # Keep the id for adapters the viewer cannot access.+ rep[f"{field}_id"] = str(rep[field])+ rep[field] = adapter.adapter_name+ conf[label] = AdapterProcessor.get_model_label(adapter)+ if field == ProfileManagerKeys.LLM:+ rep["icon"] = AdapterProcessor.get_icon(adapter)+ if conf:+ conf["Profile Name"] = instance.profile_name+ rep["conf"] = confreturn repdiff --git a/backend/prompt_studio/prompt_profile_manager_v2/tests/__init__.py b/backend/prompt_studio/prompt_profile_manager_v2/tests/__init__.pynew file mode 100644index 000000000..e69de29bbdiff --git a/backend/prompt_studio/prompt_profile_manager_v2/tests/test_profile_display_info.py b/backend/prompt_studio/prompt_profile_manager_v2/tests/test_profile_display_info.pynew file mode 100644index 000000000..987bef824--- /dev/null+++ b/backend/prompt_studio/prompt_profile_manager_v2/tests/test_profile_display_info.py@@ -0,0 +1,98 @@+"""Profile serializer resolves adapter FKs to display data without an access check.++The DRF base is patched out so the assertions cover only that resolution.+"""++from __future__ import annotations++import unittest+from types import SimpleNamespace+from unittest.mock import patch++from backend.serializers import AuditSerializer++from prompt_studio.prompt_profile_manager_v2.serializers import ProfileManagerSerializer+++def _adapter(name: str, model: str) -> SimpleNamespace:+ return SimpleNamespace(adapter_name=name, model=model)+++def _represent(instance: SimpleNamespace, base_rep: dict) -> dict:+ with (+ patch.object(AuditSerializer, "to_representation", return_value=base_rep),+ patch(+ "prompt_studio.prompt_profile_manager_v2.serializers."+ "AdapterProcessor.get_model_label",+ side_effect=lambda adapter: adapter.model,+ ),+ patch(+ "prompt_studio.prompt_profile_manager_v2.serializers."+ "AdapterProcessor.get_icon",+ return_value="/icons/adapter-icons/OpenAI.png",+ ),+ ):+ return ProfileManagerSerializer().to_representation(instance)+++class ProfileDisplayInfoTests(unittest.TestCase):+ def test_display_info_resolved_without_adapter_access(self) -> None:+ instance = SimpleNamespace(+ profile_name="Prod",+ llm=_adapter("Shared GPT", "gpt-4o"),+ embedding_model=_adapter("Shared Embed", "text-embedding-3-small"),+ vector_store=_adapter("Shared Qdrant", "qdrant"),+ x2text=_adapter("Shared LLMW", "llmwhisperer"),+ )+ base_rep = {+ field: "some-uuid"+ for field in ("llm", "embedding_model", "vector_store", "x2text")+ }++ rep = _represent(instance, base_rep)++ self.assertEqual(+ rep["conf"],+ {+ "LLM": "gpt-4o",+ "Embedding Model": "text-embedding-3-small",+ "Vector Store": "qdrant",+ "Text Extractor": "llmwhisperer",+ "Profile Name": "Prod",+ },+ )+ # Only the LLM contributes the tile icon.+ self.assertEqual(rep["icon"], "/icons/adapter-icons/OpenAI.png")+ # FK ids are replaced by the adapter names.+ self.assertEqual(rep["llm"], "Shared GPT")++ def test_unset_adapters_are_skipped(self) -> None:+ instance = SimpleNamespace(+ profile_name="Half configured",+ llm=_adapter("Shared GPT", "gpt-4o"),+ embedding_model=None,+ vector_store=None,+ x2text=None,+ )++ rep = _represent(instance, {"llm": "some-uuid", "embedding_model": None})++ self.assertEqual(+ rep["conf"], {"LLM": "gpt-4o", "Profile Name": "Half configured"}+ )+ self.assertIsNone(rep["embedding_model"])++ def test_profile_with_no_adapters_has_empty_conf(self) -> None:+ instance = SimpleNamespace(+ profile_name="Empty",+ llm=None,+ embedding_model=None,+ vector_store=None,+ x2text=None,+ )++ rep = _represent(instance, {})++ # No "Profile Name" either - the tile has nothing to show.+ self.assertEqual(rep["conf"], {})+ self.assertNotIn("icon", rep)diff --git a/backend/prompt_studio/prompt_profile_manager_v2/views.py b/backend/prompt_studio/prompt_profile_manager_v2/views.pyindex d8d9bbb65..907a137e4 100644--- a/backend/prompt_studio/prompt_profile_manager_v2/views.py+++ b/backend/prompt_studio/prompt_profile_manager_v2/views.py@@ -36,7 +36,10 @@ class ProfileManagerView(viewsets.ModelViewSet):return [IsOwnerOrSharedUserOrSharedToOrg()]def get_queryset(self) -> QuerySet | None:- queryset = ProfileManager.objects.for_user(self.request.user)+ # Serializer reads all four adapters for the display info+ queryset = ProfileManager.objects.for_user(self.request.user).select_related(+ "llm", "embedding_model", "vector_store", "x2text"+ )filter_args = FilterHelper.build_filter_args(self.request,ProfileManagerKeys.CREATED_BY,diff --git a/backend/prompt_studio/prompt_studio_core_v2/views.py b/backend/prompt_studio/prompt_studio_core_v2/views.pyindex 5741c7ccd..b3d42cf5f 100644--- a/backend/prompt_studio/prompt_studio_core_v2/views.py+++ b/backend/prompt_studio/prompt_studio_core_v2/views.py@@ -375,7 +375,7 @@ class PromptStudioCoreView(profile_manager_instances = ProfileManager.objects.filter(prompt_studio_tool=prompt_tool- )+ ).select_related("llm", "embedding_model", "vector_store", "x2text")serialized_instances = ProfileManagerSerializer(profile_manager_instances, many=Truediff --git a/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx b/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsxindex c76e073e1..e5e120399 100644--- a/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx+++ b/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx@@ -63,6 +63,21 @@ function AddLlmProfile({const { setPostHogCustomEvent } = usePostHogEvents();const { getStrategies } = useRetrievalStrategies();+ const editedProfile = llmProfiles?.find(+ (item) => item?.profile_id === editLlmProfileId,+ );++ const adapterOptions = (items, field) => {+ const id = editedProfile?.[`${field}_id`];+ if (!id || items?.some((item) => item?.value === id)) {+ return items;+ }+ return [+ ...items,+ { value: id, label: editedProfile?.[field], disabled: true },+ ];+ };+useEffect(() => {setAdaptorProfilesDropdown();}, []);@@ -121,38 +136,18 @@ function AddLlmProfile({setModalTitle("Edit LLM Profile");- const llmProfileDetails = [...llmProfiles].find(- (item) => item?.profile_id === editLlmProfileId,- );-- const llmItem = llmItems.find(- (item) => item?.label === llmProfileDetails?.llm,- );-- const vectorDbItem = vectorDbItems.find(- (item) => item?.label === llmProfileDetails?.vector_store,- );-- const embeddingItem = embeddingItems.find(- (item) => item?.label === llmProfileDetails?.embedding_model,- );-- const x2TextItem = x2TextItems.find(- (item) => item?.label === llmProfileDetails?.x2text,- );-setResetForm(true);setFormDetails({- profile_name: llmProfileDetails?.profile_name,- llm: llmItem?.value || null,- chunk_size: llmProfileDetails?.chunk_size,- vector_store: vectorDbItem?.value || null,- chunk_overlap: llmProfileDetails?.chunk_overlap,- embedding_model: embeddingItem?.value || null,- x2text: x2TextItem?.value || null,- retrieval_strategy: llmProfileDetails?.retrieval_strategy,- similarity_top_k: llmProfileDetails?.similarity_top_k,- section: llmProfileDetails?.section,+ profile_name: editedProfile?.profile_name,+ llm: editedProfile?.llm_id || null,+ chunk_size: editedProfile?.chunk_size,+ vector_store: editedProfile?.vector_store_id || null,+ chunk_overlap: editedProfile?.chunk_overlap,+ embedding_model: editedProfile?.embedding_model_id || null,+ x2text: editedProfile?.x2text_id || null,+ retrieval_strategy: editedProfile?.retrieval_strategy,+ similarity_top_k: editedProfile?.similarity_top_k,+ section: editedProfile?.section,prompt_studio_tool: details?.tool_id,});setActiveKey(true);@@ -501,7 +496,7 @@ function AddLlmProfile({help={getBackendErrorDetail("llm", backendErrors)}><Select- options={llmItems}+ options={adapterOptions(llmItems, "llm")}onSelect={handleLlmChangeForTokens}/></Form.Item>@@ -556,7 +551,9 @@ function AddLlmProfile({}help={getBackendErrorDetail("vector_store", backendErrors)}>- <Select options={vectorDbItems} />+ <Select+ options={adapterOptions(vectorDbItems, "vector_store")}+ /></Form.Item></Col><Col span={1} />@@ -598,7 +595,9 @@ function AddLlmProfile({}help={getBackendErrorDetail("embedding_model", backendErrors)}>- <Select options={embeddingItems} />+ <Select+ options={adapterOptions(embeddingItems, "embedding_model")}+ /></Form.Item><Form.Itemlabel="Text Extractor"@@ -615,7 +614,7 @@ function AddLlmProfile({}help={getBackendErrorDetail("x2text", backendErrors)}>- <Select options={x2TextItems} />+ <Select options={adapterOptions(x2TextItems, "x2text")} /></Form.Item><CollapseexpandIcon={({ isActive }) => handleCaretIcon(isActive)}diff --git a/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx b/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsxindex 363aac078..776b9eea5 100644--- a/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx+++ b/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx@@ -9,10 +9,8 @@ import { useParams } from "react-router-dom";import {displayPromptResult,- getLLMModelNamesForProfiles,promptType,} from "../../../helpers/GetStaticData";-import { fetchAllPages } from "../../../helpers/pagination";import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";import { useAlertStore } from "../../../store/alert-store";import { useCustomToolStore } from "../../../store/custom-tool-store";@@ -35,14 +33,12 @@ try {}let publicOutputsApi;-let publicAdapterApi;let publicDefaultOutputApi;try {const mod = await import("../../../plugins/prompt-studio-public-share/helpers/PublicShareAPIs");publicOutputsApi = mod.publicOutputsApi;- publicAdapterApi = mod.publicAdapterApi;publicDefaultOutputApi = mod.publicDefaultOutputApi;} catch {// The component will remain null if it is not available@@ -141,22 +137,15 @@ function CombinedOutput({ docId, setFilledFields, selectedPrompts }) {return;}- const fetchAdapterInfo = async () => {- let url = `/api/v1/unstract/${sessionDetails?.orgId}/adapter/?adapter_type=LLM`;- if (isPublicSource) {- url = publicAdapterApi(id, "LLM");- }- try {- const adapterList = await fetchAllPages(axiosPrivate, { url });- setAdapterData(getLLMModelNamesForProfiles(llmProfiles, adapterList));- } catch (err) {- setAlertDetails(- handleException(err, "Failed to fetch adapter information"),- );- }- };- fetchAdapterInfo();- }, []);+ // Model name comes from the profile payload, not the viewer's adapters.+ setAdapterData(+ (llmProfiles || []).map((profile) => ({+ profile_name: profile?.profile_name,+ llm_model: profile?.conf?.LLM,+ profile_id: profile?.profile_id,+ })),+ );+ }, [llmProfiles, isSimplePromptStudio]);useEffect(() => {const key = singlePassExtractMode ? defaultLlmProfile : "0";diff --git a/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx b/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsxindex 820758311..ef358abe1 100644--- a/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx+++ b/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx@@ -15,7 +15,6 @@ import "./OutputForDocModal.css";import {displayPromptResult,getDocIdFromKey,- getLLMModelNamesForProfiles,} from "../../../helpers/GetStaticData";import { useExceptionHandler } from "../../../hooks/useExceptionHandler";import { useAlertStore } from "../../../store/alert-store";@@ -24,13 +23,11 @@ import { SpinnerLoader } from "../../widgets/spinner-loader/SpinnerLoader";import { ProfileInfoBar } from "../profile-info-bar/ProfileInfoBar";let publicOutputsApi;-let publicAdapterApi;try {const mod = await import("../../../plugins/prompt-studio-public-share/helpers/PublicShareAPIs");publicOutputsApi = mod.publicOutputsApi;- publicAdapterApi = mod.publicAdapterApi;} catch {// The component will remain null of it is not available}@@ -84,7 +81,6 @@ function OutputForDocModal({return;}handleGetOutputForDocs(selectedProfile);- getAdapterInfo();}, [open,selectedProfile,@@ -92,6 +88,17 @@ function OutputForDocModal({isSinglePassExtractLoading,]);+ useEffect(() => {+ // Model name comes from the profile payload, not the viewer's adapters.+ setAdapterData(+ (llmProfiles || []).map((profile) => ({+ profile_name: profile?.profile_name,+ llm_model: profile?.conf?.LLM,+ profile_id: profile?.profile_id,+ })),+ );+ }, [llmProfiles]);+useEffect(() => {setSelectedProfile(profileId);}, [profileManagerId, singlePassExtractMode]);@@ -176,17 +183,6 @@ function OutputForDocModal({return promptOutputInstance;};- const getAdapterInfo = () => {- let url = `/api/v1/unstract/${sessionDetails.orgId}/adapter/?adapter_type=LLM`;- if (isPublicSource) {- url = publicAdapterApi(id, "LLM");- }- axiosPrivate.get(url).then((res) => {- const adapterList = res.data;- setAdapterData(getLLMModelNamesForProfiles(llmProfiles, adapterList));- });- };-const handleGetOutputForDocs = (profile = profileManagerId) => {if (!profile) {setRows([]);diff --git a/frontend/src/components/custom-tools/prompt-card/ProfileIcon.jsx b/frontend/src/components/custom-tools/prompt-card/ProfileIcon.jsxnew file mode 100644index 000000000..4d10178c0--- /dev/null+++ b/frontend/src/components/custom-tools/prompt-card/ProfileIcon.jsx@@ -0,0 +1,25 @@+import { Image } from "antd";+import PropTypes from "prop-types";++import { isImageUrl } from "../../../helpers/GetStaticData";++function ProfileIcon({ icon }) {+ if (!isImageUrl(icon)) {+ return <span className="prompt-card-llm-icon">{icon}</span>;+ }+ return (+ <Image+ src={icon}+ width={15}+ height={15}+ preview={false}+ className="prompt-card-llm-icon"+ />+ );+}++ProfileIcon.propTypes = {+ icon: PropTypes.string,+};++export { ProfileIcon };diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx b/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsxindex 5cb5d099b..7061eb9ed 100644--- a/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx+++ b/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx@@ -83,7 +83,6 @@ function PromptCardItems({indexDocs,isSimplePromptStudio,isPublicSource,- adapters,selectedHighlight,details,singlePassExtractMode,@@ -114,32 +113,6 @@ function PromptCardItems({);}, [allTableSettings]);- const getModelOrAdapterId = (profile, adapters) => {- const result = { conf: {} };- const keys = [- { key: "llm", label: "LLM" },- { key: "embedding_model", label: "Embedding Model" },- { key: "vector_store", label: "Vector Store" },- { key: "x2text", label: "Text Extractor" },- ];-- keys.forEach((key) => {- const adapterName = profile[key.key];- const adapter = adapters?.find(- (adapter) => adapter?.adapter_name === adapterName,- );- if (adapter) {- result.conf[key.label] =- adapter?.model || adapter?.adapter_id?.split("|")[0];- if (adapter?.adapter_type === "LLM") {- result.icon = adapter?.icon;- }- result.conf["Profile Name"] = profile?.profile_name;- }- });- return result;- };-const getUpdatedCoverage = (promptId, singlePass, promptOutputs) => {let updatedCoverage = null;Object.keys(promptOutputs).forEach((key) => {@@ -166,18 +139,17 @@ function PromptCardItems({getUpdatedCoverage(promptId, singlePassExtractMode, promptOutputs) ||coverageCountData;- const getAdapterInfo = async (adapterData) => {- // If simple prompt studio, return early+ useEffect(() => {+ setExpandCard(true);+ }, [isSinglePassExtractLoading]);++ useEffect(() => {if (isSimplePromptStudio) {return;}-- // Update llmProfiles with additional fields- const updatedProfiles = llmProfiles?.map((profile) => {- return { ...getModelOrAdapterId(profile, adapterData), ...profile };- });+ // conf and icon come from the profile payload, not the viewer's adapters.setLlmProfileDetails(- updatedProfiles+ (llmProfiles || []).map((profile) => ({...profile,isDefault: profile?.profile_id === selectedLlmProfileId,@@ -192,15 +164,7 @@ function PromptCardItems({return 0;}),);- };-- useEffect(() => {- setExpandCard(true);- }, [isSinglePassExtractLoading]);-- useEffect(() => {- getAdapterInfo(adapters);- }, [llmProfiles, selectedLlmProfileId]);+ }, [llmProfiles, selectedLlmProfileId, isSimplePromptStudio]);return (<Carddiff --git a/frontend/src/components/custom-tools/prompt-card/PromptOutput.jsx b/frontend/src/components/custom-tools/prompt-card/PromptOutput.jsxindex b8aaa4b39..d001ca95c 100644--- a/frontend/src/components/custom-tools/prompt-card/PromptOutput.jsx+++ b/frontend/src/components/custom-tools/prompt-card/PromptOutput.jsx@@ -4,16 +4,7 @@ import {PlayCircleFilled,PlayCircleOutlined,} from "@ant-design/icons";-import {- Button,- Col,- Divider,- Image,- Radio,- Space,- Tooltip,- Typography,-} from "antd";+import { Button, Col, Divider, Radio, Space, Tooltip, Typography } from "antd";import { AnimatePresence, motion } from "framer-motion";import PropTypes from "prop-types";import { useState } from "react";@@ -32,6 +23,7 @@ import { TokenUsage } from "../token-usage/TokenUsage";import { CopyPromptOutputBtn } from "./CopyPromptOutputBtn";import { TABLE } from "./constants";import { DisplayPromptResult } from "./DisplayPromptResult";+import { ProfileIcon } from "./ProfileIcon";import { PromptOutputExpandBtn } from "./PromptOutputExpandBtn";import { PromptRunCost } from "./PromptRunCost";import { PromptRunTimer } from "./PromptRunTimer";@@ -130,7 +122,7 @@ function PromptOutput({const noHighlightEnforceType = !["table", "record"].includes(enforceType);const tooltipContent = (adapterConf) => (<div>- {Object.entries(adapterConf)?.map(([key, value]) => (+ {Object.entries(adapterConf || {}).map(([key, value]) => (<div key={key}><strong>{key}:</strong> {value}</div>@@ -355,13 +347,7 @@ function PromptOutput({><div className="llm-info"><div className="llm-info-left">- <Image- src={profile?.icon}- width={15}- height={15}- preview={false}- className="prompt-card-llm-icon"- />+ <ProfileIcon icon={profile?.icon} /><Typography.TextclassName="prompt-card-llm-title"ellipsis={{ tooltip: profile?.conf?.LLM }}diff --git a/frontend/src/components/custom-tools/prompt-card/PromptOutputsModal.jsx b/frontend/src/components/custom-tools/prompt-card/PromptOutputsModal.jsxindex f3e79ffb5..3297c2407 100644--- a/frontend/src/components/custom-tools/prompt-card/PromptOutputsModal.jsx+++ b/frontend/src/components/custom-tools/prompt-card/PromptOutputsModal.jsx@@ -1,10 +1,11 @@-import { Col, Image, Modal, Row, Typography } from "antd";+import { Col, Modal, Row, Typography } from "antd";import PropTypes from "prop-types";import usePromptOutput from "../../../hooks/usePromptOutput";import { useCustomToolStore } from "../../../store/custom-tool-store";import SpaceWrapper from "../../widgets/space-wrapper/SpaceWrapper";import { TABLE } from "./constants";import { DisplayPromptResult } from "./DisplayPromptResult";+import { ProfileIcon } from "./ProfileIcon";let TableOutput;try {@@ -68,13 +69,7 @@ function PromptOutputsModal({<div>{displayLlmProfile && (<div className="prompt-output-llm-bg">- <Image- src={profile?.icon}- width={15}- height={15}- preview={false}- className="prompt-card-llm-icon"- />+ <ProfileIcon icon={profile?.icon} /><Typography.Text className="prompt-card-llm-title">{profile?.conf?.LLM}</Typography.Text>diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.jsindex 10b0fdb58..9e067896c 100644--- a/frontend/src/helpers/GetStaticData.js+++ b/frontend/src/helpers/GetStaticData.js@@ -476,6 +476,11 @@ const isNonNegativeNumber = (value) => {return typeof value === "number" && !isNaN(value) && value >= 0;};+// Icons are image URLs; an unresolved adapter falls back to an emoji.+// Detect the URL - compound (ZWJ) emoji break length heuristics.+const isImageUrl = (value) =>+ typeof value === "string" && /^(https?:\/\/|\/|data:image\/)/.test(value);+// Default token usage object with all counts initialized to 0const defaultTokenUsage = {embedding_tokens: 0,@@ -490,23 +495,6 @@ const generateUUID = () => {return uuid;};-function getLLMModelNamesForProfiles(profiles, adapters) {- // Create a mapping of adapter_ids to model names- const adapterMap = adapters.reduce((map, adapter) => {- map[adapter?.adapter_name] = adapter?.model;- return map;- }, {});-- // Map through profiles and find corresponding model names using the adapterMap- return profiles.map((profile) => {- return {- profile_name: profile?.profile_name,- llm_model: adapterMap[profile?.llm],- profile_id: profile?.profile_id,- };- });-}-function getFormattedTotalCost(tokenUsageDetails) {const value = tokenUsageDetails?.cost_in_dollars ?? 0;@@ -780,7 +768,6 @@ export {formatSecondsToHMS,formatTimeDisplay,formattedDateTime,- timeAgo,formattedDateTimeWithSeconds,generateApiRunStatusId,generateCoverageKey,@@ -790,13 +777,13 @@ export {getDateTimeString,getDocIdFromKey,getFormattedTotalCost,- getLLMModelNamesForProfiles,getMenuItem,getOrgNameFromPathname,getReadableDateAndTime,getSequenceNumber,getTimeForLogs,homePagePath,+ isImageUrl,isJson,isNonNegativeNumber,isValidJsonKey,@@ -817,6 +804,7 @@ export {sourceTypes,THEME,TRIAL_PLAN,+ timeAgo,titleCase,toolIdeOutput,UNSTRACT_ADMIN,