laantungir/routstr-core
1
0
Fork 0
mirror of https://github.com/Routstr/routstr-core.git synced 2026-08-10 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dynamic-prices

Browse Source 
# Conflicts:
#	routstr/upstream/base.py
This commit is contained in:
9qeklajc
2026-04-13 23:52:46 +02:00
parent af4be5bfec b874b1f01c
commit d89e740ff8
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routstr/upstream/base.py
+11 -4
View File
@@ -5,6 +5,7 @@ import hashlib
import json
import re
import traceback
import uuid
from collections.abc import AsyncGenerator
from typing import Mapping
@@ -523,9 +524,13 @@ class BaseUpstreamProvider:
if isinstance(obj, dict):
if obj.get("model"):
last_model_seen = str(obj.get("model"))
if requested_model:
obj["model"] = requested_model
if "id" not in obj or not isinstance(obj["id"], str):
obj["id"] = f"chatcmpl-{uuid.uuid4()}"
if isinstance(obj.get("usage"), dict):
# Hold this chunk back to merge cost later
usage_chunk_data = obj
@@ -665,6 +670,8 @@ class BaseUpstreamProvider:
if requested_model:
response_json["model"] = requested_model
if "id" not in response_json or not isinstance(response_json["id"], str):
response_json["id"] = f"chatcmpl-{uuid.uuid4()}"
cost_data = await adjust_payment_for_tokens(
key, response_json, session, deducted_max_cost
@@ -994,6 +1001,8 @@ class BaseUpstreamProvider:
if requested_model:
response_json["model"] = requested_model
if "id" not in response_json or not isinstance(response_json["id"], str):
response_json["id"] = f"chatcmpl-{uuid.uuid4()}"
cost_data = await adjust_payment_for_tokens(
key, response_json, session, deducted_max_cost
@@ -2353,7 +2362,6 @@ class BaseUpstreamProvider:
extra={
"original_amount": amount,
"refund_amount": emergency_refund,
"deduction": 60,
},
)
@@ -2528,7 +2536,7 @@ class BaseUpstreamProvider:
)
refund_token = await self.send_refund(
amount - 60,
amount,
unit,
mint,
payment_token_hash,
@@ -2823,7 +2831,7 @@ class BaseUpstreamProvider:
)
refund_token = await self.send_refund(
amount - 60,
amount,
unit,
mint,
payment_token_hash,
@@ -3284,7 +3292,6 @@ class BaseUpstreamProvider:
extra={
"original_amount": amount,
"refund_amount": emergency_refund,
"deduction": 60,
},
)