mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-14 06:30:57 +00:00
style: simplify wrapped expressions
This commit is contained in:
@@ -517,12 +517,8 @@ class MonitoringService:
|
|||||||
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.total_tokens), 0),
|
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.duration), 0),
|
||||||
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.cost), 0.0),
|
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.cost), 0.0),
|
||||||
sqlalchemy.func.sum(
|
sqlalchemy.func.sum(sqlalchemy.case((LLMCall.status == 'success', 1), else_=0)),
|
||||||
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 == 'error', 1), else_=0)
|
|
||||||
),
|
|
||||||
# Count of successful calls that nonetheless recorded zero tokens —
|
# Count of successful calls that nonetheless recorded zero tokens —
|
||||||
# a data-quality signal that usage reporting may be broken upstream.
|
# a data-quality signal that usage reporting may be broken upstream.
|
||||||
sqlalchemy.func.sum(
|
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.total_tokens), 0),
|
||||||
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.duration), 0),
|
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.duration), 0),
|
||||||
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.cost), 0.0),
|
sqlalchemy.func.coalesce(sqlalchemy.func.sum(LLMCall.cost), 0.0),
|
||||||
sqlalchemy.func.sum(
|
sqlalchemy.func.sum(sqlalchemy.case((LLMCall.status == 'error', 1), else_=0)),
|
||||||
sqlalchemy.case((LLMCall.status == 'error', 1), else_=0)
|
|
||||||
),
|
|
||||||
).group_by(LLMCall.model_name)
|
).group_by(LLMCall.model_name)
|
||||||
)
|
)
|
||||||
by_model_result = await self.ap.persistence_mgr.execute_async(by_model_query)
|
by_model_result = await self.ap.persistence_mgr.execute_async(by_model_query)
|
||||||
|
|||||||
@@ -159,11 +159,7 @@ class PreProcessor(stage.PipelineStage):
|
|||||||
|
|
||||||
# Check if this model supports vision, if not, remove all images
|
# 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
|
# TODO this checking should be performed in runner, and in this stage, the image should be reserved
|
||||||
if (
|
if selected_runner == 'local-agent' and llm_model and 'vision' not in (llm_model.model_entity.abilities or []):
|
||||||
selected_runner == 'local-agent'
|
|
||||||
and llm_model
|
|
||||||
and 'vision' not in (llm_model.model_entity.abilities or [])
|
|
||||||
):
|
|
||||||
for msg in query.messages:
|
for msg in query.messages:
|
||||||
if isinstance(msg.content, list):
|
if isinstance(msg.content, list):
|
||||||
for me in msg.content:
|
for me in msg.content:
|
||||||
|
|||||||
@@ -469,9 +469,7 @@ class LocalAgentRunner(runner.RequestRunner):
|
|||||||
query,
|
query,
|
||||||
use_llm_model,
|
use_llm_model,
|
||||||
req_messages,
|
req_messages,
|
||||||
query.use_funcs
|
query.use_funcs if _model_has_ability(use_llm_model, 'func_call') else [],
|
||||||
if _model_has_ability(use_llm_model, 'func_call')
|
|
||||||
else [],
|
|
||||||
extra_args=use_llm_model.model_entity.extra_args,
|
extra_args=use_llm_model.model_entity.extra_args,
|
||||||
remove_think=remove_think,
|
remove_think=remove_think,
|
||||||
)
|
)
|
||||||
@@ -487,9 +485,7 @@ class LocalAgentRunner(runner.RequestRunner):
|
|||||||
query,
|
query,
|
||||||
use_llm_model,
|
use_llm_model,
|
||||||
req_messages,
|
req_messages,
|
||||||
query.use_funcs
|
query.use_funcs if _model_has_ability(use_llm_model, 'func_call') else [],
|
||||||
if _model_has_ability(use_llm_model, 'func_call')
|
|
||||||
else [],
|
|
||||||
extra_args=use_llm_model.model_entity.extra_args,
|
extra_args=use_llm_model.model_entity.extra_args,
|
||||||
remove_think=remove_think,
|
remove_think=remove_think,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user