Skip to content

UN-3479 [FIX] Stamp adapter_key alongside adapter_id_key on tool_instance PATCH #1995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chandrasekharan-zipstack merged 1 commit into from
May 27, 2026
Merged

UN-3479 [FIX] Stamp adapter_key alongside adapter_id_key on tool_instance PATCH #1995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions backend/tool_instance_v2/tool_instance_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,26 +97,24 @@ def update_metadata_with_adapter_properties(
"""
if adapter_key in metadata:
adapter_value = metadata[adapter_key]
adapter_id = None
if ToolInstanceHelper.is_uuid_format(adapter_value):
logger.debug(f"Adapter value '{adapter_value}' is already in UUID format")
adapter = AdapterInstance.objects.get(
id=adapter_value, adapter_type=adapter_type.value
)
adapter_id = str(adapter.id)
metadata_key_for_id = adapter_property.get(
AdapterPropertyKey.ADAPTER_ID_KEY, AdapterPropertyKey.ADAPTER_ID
)
metadata[metadata_key_for_id] = adapter_id
else:
adapter = AdapterProcessor.get_adapter_by_name_and_type(
adapter_type=adapter_type, adapter_name=adapter_value
)
adapter_id = str(adapter.id)
metadata_key_for_id = adapter_property.get(
AdapterPropertyKey.ADAPTER_ID_KEY, AdapterPropertyKey.ADAPTER_ID
)
metadata[metadata_key_for_id] = adapter_id
adapter_id = str(adapter.id)
metadata_key_for_id = adapter_property.get(
AdapterPropertyKey.ADAPTER_ID_KEY, AdapterPropertyKey.ADAPTER_ID
)
# Keep adapter_key and adapter_id_key both canonical to the resolved
# target UUID; otherwise stale UUID-shaped values at adapter_key
# bypass the lazy migrator and fail schema enum validation later.
metadata[adapter_key] = adapter_id
metadata[metadata_key_for_id] = adapter_id

@staticmethod
def update_metadata_with_adapter_instances(
Expand Down