phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-03 18:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rebase): clean up errors after rebasing and patch the dashboard

Browse source
This commit is contained in:
Emilio Garcia 2025-11-17 12:20:36 -05:00
parent fda592dd26
commit 0c442cdd8f
2 changed files with 274 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

360
scripts/telemetry/llama-stack-dashboard.json
View file

@ -1,11 +1,24 @@
{ {
"annotations": { "annotations": {
"list": [] "list": [
{
"builtIn": 1,
"datasource": {
"type": "grafana",
"uid": "-- Grafana --"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
}, },
"editable": true, "editable": true,
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 1,
"links": [], "links": [],
"liveNow": false, "liveNow": false,
"panels": [ "panels": [
@ -16,11 +29,40 @@
}, },
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": {
"mode": "palette-classic"
},
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto", "showPoints": "auto",
"fillOpacity": 10 "spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
}, },
"mappings": [], "mappings": [],
"thresholds": { "thresholds": {
@ -32,7 +74,8 @@
} }
] ]
} }
} },
"overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 8,
@ -40,15 +83,16 @@
"x": 0, "x": 0,
"y": 0 "y": 0
}, },
"id": 1, "id": 2,
"options": { "options": {
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "table", "displayMode": "list",
"placement": "bottom", "placement": "bottom",
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"maxHeight": 600,
"mode": "multi", "mode": "multi",
"sort": "none" "sort": "none"
} }
@ -59,9 +103,112 @@
"type": "prometheus", "type": "prometheus",
"uid": "prometheus" "uid": "prometheus"
}, },
"expr": "llama_stack_completion_tokens_total", "disableTextWrap": false,
"legendFormat": "{{model_id}} ({{provider_id}})", "editorMode": "builder",
"refId": "A" "expr": "sum by(gen_ai_request_model) (llama_stack_gen_ai_client_token_usage_sum{gen_ai_token_type=\"input\"})",
"fullMetaSearch": false,
"includeNullMetadata": true,
"legendFormat": "__auto",
"range": true,
"refId": "A",
"useBackend": false
}
],
"title": "Prompt Tokens",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 0
},
"id": 1,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"maxHeight": 600,
"mode": "multi",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
"exemplar": false,
"expr": "sum by(gen_ai_request_model) (llama_stack_gen_ai_client_token_usage_sum{gen_ai_token_type=\"output\"})",
"fullMetaSearch": false,
"includeNullMetadata": true,
"interval": "",
"legendFormat": "__auto",
"range": true,
"refId": "A",
"useBackend": false
} }
], ],
"title": "Completion Tokens", "title": "Completion Tokens",
@ -74,78 +221,40 @@
}, },
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": {
"mode": "palette-classic"
},
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto", "showPoints": "auto",
"fillOpacity": 10 "spanNulls": false,
}, "stacking": {
"mappings": [], "group": "A",
"thresholds": { "mode": "none"
"mode": "absolute", },
"steps": [ "thresholdsStyle": {
{ "mode": "off"
"color": "green", }
"value": null
}
]
}
}
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 0
},
"id": 2,
"options": {
"legend": {
"calcs": [],
"displayMode": "table",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "multi",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "llama_stack_prompt_tokens_total",
"legendFormat": "Prompt - {{model_id}}",
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "llama_stack_tokens_total",
"legendFormat": "Total - {{model_id}}",
"refId": "B"
}
],
"title": "Prompt & Total Tokens",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"custom": {
"drawStyle": "line",
"lineInterpolation": "linear",
"showPoints": "auto",
"fillOpacity": 10
}, },
"mappings": [], "mappings": [],
"thresholds": { "thresholds": {
@ -158,7 +267,8 @@
] ]
}, },
"unit": "ms" "unit": "ms"
} },
"overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 8,
@ -175,6 +285,7 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"maxHeight": 600,
"mode": "multi", "mode": "multi",
"sort": "none" "sort": "none"
} }
@ -219,7 +330,8 @@
} }
] ]
} }
} },
"overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 8,
@ -240,8 +352,11 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "auto" "showPercentChange": false,
"textMode": "auto",
"wideLayout": true
}, },
"pluginVersion": "11.0.0",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@ -272,7 +387,8 @@
} }
] ]
} }
} },
"overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 8,
@ -293,8 +409,11 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "auto" "showPercentChange": false,
"textMode": "auto",
"wideLayout": true
}, },
"pluginVersion": "11.0.0",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@ -315,11 +434,40 @@
}, },
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": {
"mode": "palette-classic"
},
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto", "showPoints": "auto",
"fillOpacity": 10 "spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
}, },
"mappings": [], "mappings": [],
"thresholds": { "thresholds": {
@ -332,7 +480,8 @@
] ]
}, },
"unit": "reqps" "unit": "reqps"
} },
"overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 8,
@ -349,6 +498,7 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"maxHeight": 600,
"mode": "multi", "mode": "multi",
"sort": "none" "sort": "none"
} }
@ -374,11 +524,40 @@
}, },
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": {
"mode": "palette-classic"
},
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto", "showPoints": "auto",
"fillOpacity": 10 "spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
}, },
"mappings": [], "mappings": [],
"thresholds": { "thresholds": {
@ -391,7 +570,8 @@
] ]
}, },
"unit": "Bps" "unit": "Bps"
} },
"overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 8,
@ -408,6 +588,7 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"maxHeight": 600,
"mode": "multi", "mode": "multi",
"sort": "none" "sort": "none"
} }
@ -437,7 +618,7 @@
} }
], ],
"refresh": "5s", "refresh": "5s",
"schemaVersion": 38, "schemaVersion": 39,
"tags": [ "tags": [
"llama-stack" "llama-stack"
], ],
@ -445,13 +626,14 @@
"list": [] "list": []
}, },
"time": { "time": {
"from": "now-15m", "from": "now-3h",
"to": "now" "to": "now"
}, },
"timeRangeUpdatedDuringEditOrView": false,
"timepicker": {}, "timepicker": {},
"timezone": "browser", "timezone": "browser",
"title": "Llama Stack Metrics", "title": "Llama Stack Metrics",
"uid": "llama-stack-metrics", "uid": "llama-stack-metrics",
"version": 0, "version": 17,
"weekStart": "" "weekStart": ""
} }

5
src/llama_stack/core/routers/safety.py
View file

@ -6,12 +6,13 @@
from typing import Any from typing import Any
from opentelemetry import trace
from llama_stack.core.datatypes import SafetyConfig from llama_stack.core.datatypes import SafetyConfig
from llama_stack.log import get_logger from llama_stack.log import get_logger
from llama_stack.telemetry.helpers import safety_request_span_attributes, safety_span_name
from llama_stack_api import ModerationObject, OpenAIMessageParam, RoutingTable, RunShieldResponse, Safety, Shield from llama_stack_api import ModerationObject, OpenAIMessageParam, RoutingTable, RunShieldResponse, Safety, Shield
from opentelemetry import trace
logger = get_logger(name=__name__, category="core::routers") logger = get_logger(name=__name__, category="core::routers")
tracer = trace.get_tracer(__name__) tracer = trace.get_tracer(__name__)