style: simplify wrapped expressions

This commit is contained in:
huanghuoguoguo
2026-06-07 22:03:25 +08:00
parent 7fb3cfa638
commit 573e1fe36e
3 changed files with 6 additions and 20 deletions

View File

@@ -517,12 +517,8 @@ class MonitoringService:
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.total_tokens), 0),
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.duration), 0),
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.cost), 0.0),
sqlalchemy.func.sum(
sqlalchemy.case((LLMCall.status == 'success', 1), else_=0)
),
sqlalchemy.func.sum(
sqlalchemy.case((LLMCall.status == 'error', 1), else_=0)
),
sqlalchemy.func.sum(sqlalchemy.case((LLMCall.status == 'success', 1), else_=0)),
sqlalchemy.func.sum(sqlalchemy.case((LLMCall.status == 'error', 1), else_=0)),
# Count of successful calls that nonetheless recorded zero tokens —
# a data-quality signal that usage reporting may be broken upstream.
sqlalchemy.func.sum(
@@ -578,9 +574,7 @@ class MonitoringService:
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.total_tokens), 0),
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.duration), 0),
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.cost), 0.0),
sqlalchemy.func.sum(
sqlalchemy.case((LLMCall.status == 'error', 1), else_=0)
),
sqlalchemy.func.sum(sqlalchemy.case((LLMCall.status == 'error', 1), else_=0)),
).group_by(LLMCall.model_name)
)
by_model_result = await self.ap.persistence_mgr.execute_async(by_model_query)

View File

@@ -159,11 +159,7 @@ class PreProcessor(stage.PipelineStage):
# Check if this model supports vision, if not, remove all images
# TODO this checking should be performed in runner, and in this stage, the image should be reserved
if (
selected_runner == 'local-agent'
and llm_model
and 'vision' not in (llm_model.model_entity.abilities or [])
):
if selected_runner == 'local-agent' and llm_model and 'vision' not in (llm_model.model_entity.abilities or []):
for msg in query.messages:
if isinstance(msg.content, list):
for me in msg.content:

View File

@@ -469,9 +469,7 @@ class LocalAgentRunner(runner.RequestRunner):
query,
use_llm_model,
req_messages,
query.use_funcs
if _model_has_ability(use_llm_model, 'func_call')
else [],
query.use_funcs if _model_has_ability(use_llm_model, 'func_call') else [],
extra_args=use_llm_model.model_entity.extra_args,
remove_think=remove_think,
)
@@ -487,9 +485,7 @@ class LocalAgentRunner(runner.RequestRunner):
query,
use_llm_model,
req_messages,
query.use_funcs
if _model_has_ability(use_llm_model, 'func_call')
else [],
query.use_funcs if _model_has_ability(use_llm_model, 'func_call') else [],
extra_args=use_llm_model.model_entity.extra_args,
remove_think=remove_think,
)