Skip to content

Commit 0b2e755

Browse files
committed
[emu] Check chosen credential before create billing event (#920)
* check chosen credential before create billing event
1 parent 7058601 commit 0b2e755

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

services/api/src/owl/utils/billing/oss.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ def create_llm_events(
574574
model_id: str,
575575
input_tokens: int,
576576
output_tokens: int,
577-
model_provider: str = "",
578577
is_byok: bool = False,
579578
*,
580579
create_usage: bool = True,
@@ -620,7 +619,6 @@ def create_image_gen_events(
620619
text_output_token: int,
621620
image_input_token: int,
622621
image_output_token: int,
623-
model_provider: str = "",
624622
is_byok: bool = False,
625623
create_usage: bool = True,
626624
) -> None:
@@ -686,7 +684,6 @@ def create_embedding_events(
686684
self,
687685
model_id: str,
688686
token_usage: int,
689-
model_provider: str = "",
690687
is_byok: bool = False,
691688
*,
692689
create_usage: bool = True,
@@ -731,7 +728,6 @@ def create_reranker_events(
731728
self,
732729
model_id: str,
733730
num_searches: int,
734-
model_provider: str = "",
735731
is_byok: bool = False,
736732
*,
737733
create_usage: bool = True,

services/api/src/owl/utils/lm.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,13 +1728,12 @@ async def _setup_chat(
17281728
finally:
17291729
# # Consume rate limits
17301730
# await asyncio.gather(rpm_limiter.hit(), tpm_limiter.hit(self._chat_usage.total_tokens))
1731-
if self.billing is not None:
1731+
if self.billing is not None and router.chosen_credential is not None:
17321732
try:
17331733
self.billing.create_llm_events(
17341734
model_id=model,
17351735
input_tokens=self._chat_usage.prompt_tokens,
17361736
output_tokens=self._chat_usage.completion_tokens,
1737-
model_provider=router.chosen_credential.provider,
17381737
is_byok=router.chosen_credential.is_byok,
17391738
)
17401739
except Exception as e:
@@ -2214,7 +2213,6 @@ def _record_image_usage(
22142213
self,
22152214
*,
22162215
model_id: str,
2217-
model_provider: str,
22182216
is_byok: bool,
22192217
usage: Usage | None,
22202218
source: Literal["image_endpoint", "completion"],
@@ -2260,7 +2258,6 @@ def _record_image_usage(
22602258
text_output_token=text_output_token,
22612259
image_input_token=image_input_token,
22622260
image_output_token=image_output_token,
2263-
model_provider=model_provider,
22642261
is_byok=is_byok,
22652262
)
22662263
except Exception as e:
@@ -2290,7 +2287,6 @@ async def image_generation(
22902287
)
22912288
self._record_image_usage(
22922289
model_id=resolved_model,
2293-
model_provider=router.chosen_credential.provider,
22942290
is_byok=router.chosen_credential.is_byok,
22952291
usage=provider_result.usage,
22962292
source=provider_result.source,
@@ -2328,7 +2324,6 @@ async def image_edit(
23282324
)
23292325
self._record_image_usage(
23302326
model_id=resolved_model,
2331-
model_provider=router.chosen_credential.provider,
23322327
is_byok=router.chosen_credential.is_byok,
23332328
usage=provider_result.usage,
23342329
source=provider_result.source,
@@ -2384,12 +2379,11 @@ async def _setup_embedding(self, model: str):
23842379
# await asyncio.gather(
23852380
# rpm_limiter.hit(), tpm_limiter.hit(self._embed_usage.total_tokens)
23862381
# )
2387-
if self.billing is not None:
2382+
if self.billing is not None and router.chosen_credential is not None:
23882383
try:
23892384
self.billing.create_embedding_events(
23902385
model_id=model,
23912386
token_usage=self._embed_usage.total_tokens,
2392-
model_provider=router.chosen_credential.provider,
23932387
is_byok=router.chosen_credential.is_byok,
23942388
)
23952389
except Exception as e:
@@ -2524,12 +2518,11 @@ async def _setup_reranking(self, model: str):
25242518
finally:
25252519
# # Consume rate limits
25262520
# await asyncio.gather(rpm_limiter.hit(), spm_limiter.hit(self._rerank_usage.documents))
2527-
if self.billing is not None:
2521+
if self.billing is not None and router.chosen_credential is not None:
25282522
try:
25292523
self.billing.create_reranker_events(
25302524
model_id=model,
25312525
num_searches=self._rerank_usage.documents,
2532-
model_provider=router.chosen_credential.provider,
25332526
is_byok=router.chosen_credential.is_byok,
25342527
)
25352528
except Exception as e:

0 commit comments

Comments
 (0)