ZYM/ACM-OpenWebUI-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: use latest openrouter API for metrics

Browse Source
This commit is contained in:
ZhuangYumin
2025-07-23 16:44:15 +08:00
parent fa92290db6
commit 384e62a6ab
1 changed files with 38 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
openrouter_provider.py
View File

@@ -117,48 +117,17 @@ class Pipe:
print(f"Error fetching models: {e}") print(f"Error fetching models: {e}")
return [{"id": "error", "name": f"Error: {str(e)}"}] return [{"id": "error", "name": f"Error: {str(e)}"}]
def _fetch_generation_details(self, generation_id: str) -> dict: async def _report_api_call_direct(self, usage_info: dict, user_email: str, model_id: str, __event_emitter__: Callable[[Any], Awaitable[None]]):
"""Fetch generation details from OpenRouter API""" """Report API call to upstream reporting service using direct usage information"""
try:
time.sleep(0.5)
cnt = 0
max_allowed = 10
while cnt < max_allowed:
cnt += 1
headers = {"Authorization": f"Bearer {self.valves.OPENROUTER_API_KEY}"}
response = requests.get(
"https://openrouter.ai/api/v1/generation",
headers=headers,
params={"id": generation_id},
timeout=30
)
if response.status_code == 200:
return response.json()
elif response.status_code == 404:
print(f"Generation not found, retrying... ({cnt}/{max_allowed})")
time.sleep(1)
continue
else:
print(f"Error fetching generation details: {response.status_code}")
return {}
except Exception as e:
print(f"Error fetching generation details: {e}")
return {}
async def _report_api_call(self, generation_data: dict, user_email: str, model_id: str, __event_emitter__: Callable[[Any], Awaitable[None]]):
"""Report API call to upstream reporting service"""
if not self.valves.REPORT_API_URL or not self.valves.REPORT_API_KEY: if not self.valves.REPORT_API_URL or not self.valves.REPORT_API_KEY:
return return
try: try:
data = generation_data.get("data", {}) # Extract required fields for reporting from usage info
# Extract required fields for reporting
timestamp = int(time.time()) timestamp = int(time.time())
input_tokens = data.get("tokens_prompt", 0) input_tokens = usage_info.get("prompt_tokens", 0)
output_tokens = data.get("tokens_completion", 0) output_tokens = usage_info.get("completion_tokens", 0)
cost_usd = data.get("total_cost", 0.0) cost_usd = usage_info.get("cost", 0.0)
# Prepare API call record # Prepare API call record
api_call_record = { api_call_record = {
@@ -225,6 +194,9 @@ class Pipe:
if self.valves.INCLUDE_REASONING: if self.valves.INCLUDE_REASONING:
payload["include_reasoning"] = True payload["include_reasoning"] = True
# Add usage tracking to get token and cost information directly
payload["usage"] = {"include": True}
# Set up headers # Set up headers
headers = { headers = {
"Authorization": f"Bearer {self.valves.OPENROUTER_API_KEY}", "Authorization": f"Bearer {self.valves.OPENROUTER_API_KEY}",
@@ -290,19 +262,18 @@ class Pipe:
res = response.json() res = response.json()
print(f"OpenRouter response keys: {list(res.keys())}") print(f"OpenRouter response keys: {list(res.keys())}")
# Extract generation ID for reporting # Extract usage information directly from response for reporting
generation_id = res.get("id", "") if user_email and model_id:
if generation_id and user_email and model_id: usage_info = res.get("usage", {})
try: if usage_info:
generation_data = self._fetch_generation_details(generation_id) try:
if generation_data: await self._report_api_call_direct(usage_info, user_email, model_id, __event_emitter__)
await self._report_api_call(generation_data, user_email, model_id, __event_emitter__) except Exception as e:
except Exception as e: print(f"Error reporting API call: {e}")
print(f"Error reporting API call: {e}") return f"Error: {e}"
return f"Error: {e}" else:
else: print(f"No usage information found in response")
print(f"No generation ID found for reporting") return f"Error: No usage information found in response"
return f"Error: No generation ID found for reporting"
# Check if we have choices in the response # Check if we have choices in the response
if not res.get("choices") or len(res["choices"]) == 0: if not res.get("choices") or len(res["choices"]) == 0:
@@ -354,7 +325,8 @@ class Pipe:
# State tracking # State tracking
in_reasoning_state = False # True if we've output the opening <think> tag in_reasoning_state = False # True if we've output the opening <think> tag
latest_citations = [] # The latest citations list latest_citations = [] # The latest citations list
generation_id = "" # Track generation ID for reporting done_received = False # Track if we've received [DONE]
usage_info = None # Store usage information for reporting
# Process the response stream # Process the response stream
for line in response.iter_lines(): for line in response.iter_lines():
@@ -365,34 +337,31 @@ class Pipe:
if not line_text.startswith("data: "): if not line_text.startswith("data: "):
continue continue
elif line_text == "data: [DONE]": elif line_text == "data: [DONE]":
done_received = True
# Handle citations at the end # Handle citations at the end
if latest_citations: if latest_citations:
citation_list = [f"1. {l}" for l in latest_citations] citation_list = [f"1. {l}" for l in latest_citations]
citation_list_str = "\n".join(citation_list) citation_list_str = "\n".join(citation_list)
yield f"\n\n---\nCitations:\n{citation_list_str}" yield f"\n\n---\nCitations:\n{citation_list_str}"
# Handle reporting at the end
if generation_id and user_email and model_id:
try:
generation_data = self._fetch_generation_details(generation_id)
if generation_data:
await self._report_api_call(generation_data, user_email, model_id, __event_emitter__)
except Exception as e:
print(f"Error reporting API call: {e}")
yield f"Error: {e}"
yield "" ## trick
else:
print(f"No generation ID found for reporting")
yield f"Error: No generation ID found for reporting"
continue continue
try: try:
chunk = json.loads(line_text[6:]) chunk = json.loads(line_text[6:])
# Extract generation ID from any chunk that has it # Check for usage information (appears after [DONE])
if not generation_id and "id" in chunk: if "usage" in chunk:
generation_id = chunk["id"] usage_info = chunk["usage"]
print(f"Extracted generation ID for reporting: {generation_id}") print(f"Extracted usage info: {usage_info}")
# Handle reporting with usage information
if user_email and model_id and usage_info:
try:
await self._report_api_call_direct(usage_info, user_email, model_id, __event_emitter__)
except Exception as e:
print(f"Error reporting API call: {e}")
yield f"Error: {e}"
yield "" # trick to ensure proper completion
continue
if "choices" in chunk and chunk["choices"]: if "choices" in chunk and chunk["choices"]:
choice = chunk["choices"][0] choice = chunk["choices"][0]