Skip to content

Commit 094c904

Browse files
tisniktisnik
authored
Merge pull request #1597 from asimurka/refactor_provider_response
LCORE-2034: Refactored delete response models
2 parents 2ee5f84 + 1909b2b commit 094c904

11 files changed

Lines changed: 175 additions & 241 deletions

File tree

‎docs/openapi.json‎

Lines changed: 66 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2996,16 +2996,16 @@
29962996
"examples": {
29972997
"deleted": {
29982998
"value": {
2999+
"deleted": true,
29993000
"prompt_id": "pmpt_0123456789abcdef0123456789abcdef01234567",
3000-
"response": "Prompt deleted successfully",
3001-
"success": true
3001+
"response": "Prompt deleted successfully"
30023002
}
30033003
},
3004-
"not_deleted": {
3004+
"not found": {
30053005
"value": {
3006+
"deleted": false,
30063007
"prompt_id": "pmpt_0123456789abcdef0123456789abcdef01234567",
3007-
"response": "Prompt cannot be deleted",
3008-
"success": false
3008+
"response": "Prompt not found"
30093009
}
30103010
}
30113011
}
@@ -7565,15 +7565,15 @@
75657565
"deleted": {
75667566
"value": {
75677567
"conversation_id": "123e4567-e89b-12d3-a456-426614174000",
7568-
"response": "Conversation deleted successfully",
7569-
"success": true
7568+
"deleted": true,
7569+
"response": "Conversation deleted successfully"
75707570
}
75717571
},
75727572
"not found": {
75737573
"value": {
75747574
"conversation_id": "123e4567-e89b-12d3-a456-426614174000",
7575-
"response": "Conversation can not be deleted",
7576-
"success": true
7575+
"deleted": false,
7576+
"response": "Conversation not found"
75777577
}
75787578
}
75797579
}
@@ -8475,15 +8475,15 @@
84758475
"deleted": {
84768476
"value": {
84778477
"conversation_id": "123e4567-e89b-12d3-a456-426614174000",
8478-
"response": "Conversation deleted successfully",
8479-
"success": true
8478+
"deleted": true,
8479+
"response": "Conversation deleted successfully"
84808480
}
84818481
},
84828482
"not found": {
84838483
"value": {
84848484
"conversation_id": "123e4567-e89b-12d3-a456-426614174000",
8485-
"response": "Conversation can not be deleted",
8486-
"success": true
8485+
"deleted": false,
8486+
"response": "Conversation not found"
84878487
}
84888488
}
84898489
}
@@ -11871,56 +11871,61 @@
1187111871
},
1187211872
"ConversationDeleteResponse": {
1187311873
"properties": {
11874-
"conversation_id": {
11875-
"type": "string",
11876-
"title": "Conversation Id",
11877-
"description": "The conversation ID (UUID) that was deleted.",
11878-
"examples": [
11879-
"123e4567-e89b-12d3-a456-426614174000"
11880-
]
11881-
},
11882-
"success": {
11874+
"deleted": {
1188311875
"type": "boolean",
11884-
"title": "Success",
11876+
"title": "Deleted",
1188511877
"description": "Whether the deletion was successful.",
1188611878
"examples": [
1188711879
true,
1188811880
false
1188911881
]
1189011882
},
11891-
"response": {
11883+
"conversation_id": {
1189211884
"type": "string",
11893-
"title": "Response",
11894-
"description": "A message about the deletion result.",
11885+
"title": "Conversation Id",
11886+
"description": "Conversation identifier that was passed to delete.",
1189511887
"examples": [
11896-
"Conversation deleted successfully",
11897-
"Conversation cannot be deleted"
11888+
"123e4567-e89b-12d3-a456-426614174000"
1189811889
]
11890+
},
11891+
"response": {
11892+
"type": "string",
11893+
"title": "Response",
11894+
"description": "Human-readable outcome of the delete operation.",
11895+
"readOnly": true
11896+
},
11897+
"success": {
11898+
"type": "boolean",
11899+
"title": "Success",
11900+
"description": "DEPRECATED: Successful response flag. Will be removed in a future release.",
11901+
"deprecated": true,
11902+
"readOnly": true
1189911903
}
1190011904
},
1190111905
"type": "object",
1190211906
"required": [
11907+
"deleted",
1190311908
"conversation_id",
11904-
"success",
11905-
"response"
11909+
"response",
11910+
"success"
1190611911
],
1190711912
"title": "ConversationDeleteResponse",
11908-
"description": "Model representing a response for deleting a conversation.\n\nAttributes:\n conversation_id: The conversation ID (UUID) that was deleted.\n success: Whether the deletion was successful.\n response: A message about the deletion result.",
11913+
"description": "Response for deleting a conversation.",
1190911914
"examples": [
1191011915
{
1191111916
"label": "deleted",
1191211917
"value": {
1191311918
"conversation_id": "123e4567-e89b-12d3-a456-426614174000",
11914-
"response": "Conversation deleted successfully",
11915-
"success": true
11919+
"deleted": true,
11920+
"response": "Conversation deleted successfully"
1191611921
}
1191711922
},
1191811923
{
1191911924
"label": "not found",
1192011925
"value": {
1192111926
"conversation_id": "123e4567-e89b-12d3-a456-426614174000",
11922-
"response": "Conversation can not be deleted",
11923-
"success": true
11927+
"deleted": false,
11928+
"response": "Conversation not found"
1192411929
}
1192511930
}
1192611931
]
@@ -15958,6 +15963,15 @@
1595815963
},
1595915964
"PromptDeleteResponse": {
1596015965
"properties": {
15966+
"deleted": {
15967+
"type": "boolean",
15968+
"title": "Deleted",
15969+
"description": "Whether the deletion was successful.",
15970+
"examples": [
15971+
true,
15972+
false
15973+
]
15974+
},
1596115975
"prompt_id": {
1596215976
"type": "string",
1596315977
"title": "Prompt Id",
@@ -15966,48 +15980,44 @@
1596615980
"pmpt_0123456789abcdef0123456789abcdef01234567"
1596715981
]
1596815982
},
15969-
"success": {
15970-
"type": "boolean",
15971-
"title": "Success",
15972-
"description": "Whether Llama Stack deleted the prompt.",
15973-
"examples": [
15974-
true,
15975-
false
15976-
]
15977-
},
1597815983
"response": {
1597915984
"type": "string",
1598015985
"title": "Response",
15981-
"description": "Human-readable outcome.",
15982-
"examples": [
15983-
"Prompt deleted successfully",
15984-
"Prompt cannot be deleted"
15985-
]
15986+
"description": "Human-readable outcome of the delete operation.",
15987+
"readOnly": true
15988+
},
15989+
"success": {
15990+
"type": "boolean",
15991+
"title": "Success",
15992+
"description": "DEPRECATED: Successful response flag. Will be removed in a future release.",
15993+
"deprecated": true,
15994+
"readOnly": true
1598615995
}
1598715996
},
1598815997
"type": "object",
1598915998
"required": [
15999+
"deleted",
1599016000
"prompt_id",
15991-
"success",
15992-
"response"
16001+
"response",
16002+
"success"
1599316003
],
1599416004
"title": "PromptDeleteResponse",
1599516005
"description": "Result of deleting a stored prompt (always HTTP 200, like conversations v2).",
1599616006
"examples": [
1599716007
{
1599816008
"label": "deleted",
1599916009
"value": {
16010+
"deleted": true,
1600016011
"prompt_id": "pmpt_0123456789abcdef0123456789abcdef01234567",
16001-
"response": "Prompt deleted successfully",
16002-
"success": true
16012+
"response": "Prompt deleted successfully"
1600316013
}
1600416014
},
1600516015
{
16006-
"label": "not_deleted",
16016+
"label": "not found",
1600716017
"value": {
16018+
"deleted": false,
1600816019
"prompt_id": "pmpt_0123456789abcdef0123456789abcdef01234567",
16009-
"response": "Prompt cannot be deleted",
16010-
"success": false
16020+
"response": "Prompt not found"
1601116021
}
1601216022
}
1601316023
]

‎src/app/endpoints/conversations_v1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ async def delete_conversation_endpoint_handler(
377377
conversation_id=llama_stack_conv_id
378378
)
379379
logger.info(
380-
"Remote deletion of %s successful (remote_deleted=%s)",
380+
"Remote deletion of %s: success=%s",
381381
normalized_conv_id,
382382
delete_response.deleted,
383383
)

0 commit comments

Comments
 (0)