fix(telegram): pin ptb>=22.6, fix double progress, clean up stale hatch config
This commit is contained in:
@@ -205,18 +205,16 @@ class AgentLoop:
|
|||||||
thoughts = [
|
thoughts = [
|
||||||
self._strip_think(response.content),
|
self._strip_think(response.content),
|
||||||
response.reasoning_content,
|
response.reasoning_content,
|
||||||
*(f"Thinking [{b.get('signature', '...')}]:\n{b.get('thought', '...')}"
|
*(
|
||||||
for b in (response.thinking_blocks or []) if isinstance(b, dict) and "signature" in b)
|
f"Thinking [{b.get('signature', '...')}]:\n{b.get('thought', '...')}"
|
||||||
|
for b in (response.thinking_blocks or [])
|
||||||
|
if isinstance(b, dict) and "signature" in b
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
combined_thoughts = "\n\n".join(filter(None, thoughts))
|
combined_thoughts = "\n\n".join(filter(None, thoughts))
|
||||||
tool_hint_str = self._tool_hint(response.tool_calls)
|
|
||||||
|
|
||||||
if combined_thoughts:
|
if combined_thoughts:
|
||||||
await on_progress(combined_thoughts)
|
await on_progress(combined_thoughts)
|
||||||
await on_progress(f"{combined_thoughts}\n\n{tool_hint_str}", tool_hint=True)
|
await on_progress(self._tool_hint(response.tool_calls), tool_hint=True)
|
||||||
else:
|
|
||||||
await on_progress(tool_hint_str, tool_hint=True)
|
|
||||||
|
|
||||||
tool_call_dicts = [
|
tool_call_dicts = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -292,7 +292,7 @@ class TelegramChannel(BaseChannel):
|
|||||||
reply_parameters=reply_params
|
reply_parameters=reply_params
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning("HTML parse failed (or draft send failed), falling back to plain text: {}", e)
|
logger.warning("HTML parse failed, falling back to plain text: {}", e)
|
||||||
try:
|
try:
|
||||||
if is_progress and draft_id:
|
if is_progress and draft_id:
|
||||||
await self._app.bot.send_message_draft(
|
await self._app.bot.send_message_draft(
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ dependencies = [
|
|||||||
"rich>=14.0.0,<15.0.0",
|
"rich>=14.0.0,<15.0.0",
|
||||||
"croniter>=6.0.0,<7.0.0",
|
"croniter>=6.0.0,<7.0.0",
|
||||||
"dingtalk-stream>=0.24.0,<1.0.0",
|
"dingtalk-stream>=0.24.0,<1.0.0",
|
||||||
"python-telegram-bot[socks]>=22.0,<23.0",
|
"python-telegram-bot[socks]>=22.6,<23.0",
|
||||||
"lark-oapi>=1.5.0,<2.0.0",
|
"lark-oapi>=1.5.0,<2.0.0",
|
||||||
"socksio>=1.0.0,<2.0.0",
|
"socksio>=1.0.0,<2.0.0",
|
||||||
"python-socketio>=5.16.0,<6.0.0",
|
"python-socketio>=5.16.0,<6.0.0",
|
||||||
@@ -68,9 +68,6 @@ nanobot = "nanobot.cli.commands:app"
|
|||||||
requires = ["hatchling"]
|
requires = ["hatchling"]
|
||||||
build-backend = "hatchling.build"
|
build-backend = "hatchling.build"
|
||||||
|
|
||||||
[tool.hatch.metadata]
|
|
||||||
allow-direct-references = true
|
|
||||||
|
|
||||||
[tool.hatch.build.targets.wheel]
|
[tool.hatch.build.targets.wheel]
|
||||||
packages = ["nanobot"]
|
packages = ["nanobot"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user