refac
This commit is contained in:
1 parent
e1f96aa20e
commit
959558fd82
2 files changed
+15
-12
No files matched your search
@@ -1988,6 +1988,10 @@ ENABLE_CALENDAR = os.getenv('ENABLE_CALENDAR', 'True').lower() == 'true'
|
|||||||
ENABLE_AUTOMATIONS = os.getenv('ENABLE_AUTOMATIONS', 'True').lower() == 'true'
|
ENABLE_AUTOMATIONS = os.getenv('ENABLE_AUTOMATIONS', 'True').lower() == 'true'
|
||||||
|
|
||||||
ENABLE_SUBAGENTS = os.getenv('ENABLE_SUBAGENTS', 'False').lower() == 'true'
|
ENABLE_SUBAGENTS = os.getenv('ENABLE_SUBAGENTS', 'False').lower() == 'true'
|
||||||
|
SUBAGENTS_BACKGROUND_ENABLED = os.getenv('SUBAGENTS_BACKGROUND_ENABLED', 'False').lower() == 'true'
|
||||||
|
SUBAGENTS_MAX_CONCURRENT = int(os.getenv('SUBAGENTS_MAX_CONCURRENT', '20'))
|
||||||
|
SUBAGENTS_MAX_ASYNC = int(os.getenv('SUBAGENTS_MAX_ASYNC', '20'))
|
||||||
|
SUBAGENTS_SYSTEM_PROMPT = os.getenv('SUBAGENTS_SYSTEM_PROMPT', '')
|
||||||
|
|
||||||
AUTOMATION_MAX_COUNT = os.getenv('AUTOMATION_MAX_COUNT', '')
|
AUTOMATION_MAX_COUNT = os.getenv('AUTOMATION_MAX_COUNT', '')
|
||||||
|
|
||||||
@@ -3022,6 +3026,10 @@ DEFAULT_CONFIG = {
|
|||||||
'calendar.enable': ENABLE_CALENDAR,
|
'calendar.enable': ENABLE_CALENDAR,
|
||||||
'automations.enable': ENABLE_AUTOMATIONS,
|
'automations.enable': ENABLE_AUTOMATIONS,
|
||||||
'subagents.enable': ENABLE_SUBAGENTS,
|
'subagents.enable': ENABLE_SUBAGENTS,
|
||||||
|
'subagents.background_enabled': SUBAGENTS_BACKGROUND_ENABLED,
|
||||||
|
'subagents.max_concurrent': SUBAGENTS_MAX_CONCURRENT,
|
||||||
|
'subagents.max_async': SUBAGENTS_MAX_ASYNC,
|
||||||
|
'subagents.system_prompt': SUBAGENTS_SYSTEM_PROMPT,
|
||||||
'automations.max_count': AUTOMATION_MAX_COUNT,
|
'automations.max_count': AUTOMATION_MAX_COUNT,
|
||||||
'automations.min_interval': AUTOMATION_MIN_INTERVAL,
|
'automations.min_interval': AUTOMATION_MIN_INTERVAL,
|
||||||
'automations.auth_token_expires_in': AUTOMATION_AUTH_TOKEN_EXPIRES_IN,
|
'automations.auth_token_expires_in': AUTOMATION_AUTH_TOKEN_EXPIRES_IN,
|
||||||
|
|||||||
@@ -58,6 +58,9 @@ async def compact_messages_for_request(
|
|||||||
return messages, previous_summary, False
|
return messages, previous_summary, False
|
||||||
|
|
||||||
boundary = _find_compaction_boundary(messages)
|
boundary = _find_compaction_boundary(messages)
|
||||||
|
if boundary is None:
|
||||||
|
return messages, previous_summary, False
|
||||||
|
|
||||||
compacted_messages = messages[:boundary]
|
compacted_messages = messages[:boundary]
|
||||||
recent_messages = messages[boundary:]
|
recent_messages = messages[boundary:]
|
||||||
if not compacted_messages or not recent_messages:
|
if not compacted_messages or not recent_messages:
|
||||||
@@ -240,19 +243,11 @@ def _exceeds_token_threshold(messages: list[dict], system_prompt: str, summary:
|
|||||||
return estimated > threshold
|
return estimated > threshold
|
||||||
|
|
||||||
|
|
||||||
def _find_compaction_boundary(messages: list[dict]) -> int:
|
def _find_compaction_boundary(messages: list[dict]) -> int | None:
|
||||||
keep_count = max(2, len(messages) * 2 // 5)
|
keep_count = max(2, len(messages) * 2 // 5)
|
||||||
split = max(1, len(messages) - keep_count)
|
target = max(1, len(messages) - keep_count)
|
||||||
|
boundaries = [idx for idx, message in enumerate(messages) if message.get('role') == 'user'][1:]
|
||||||
while split < len(messages) - 1:
|
return next((idx for idx in reversed(boundaries) if idx <= target), None)
|
||||||
previous = messages[split - 1] if split > 0 else {}
|
|
||||||
current = messages[split]
|
|
||||||
if current.get('role') == 'tool' or previous.get('tool_calls') or previous.get('output'):
|
|
||||||
split += 1
|
|
||||||
continue
|
|
||||||
break
|
|
||||||
|
|
||||||
return min(split, len(messages) - 2)
|
|
||||||
|
|
||||||
|
|
||||||
async def _generate_summary(
|
async def _generate_summary(
|
||||||
|
|||||||
Reference in new issue
Block a user