Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 CI Change #931

Merged
merged 7 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ pull_request_rules:
- base=main
- base=dev
- "status-success=👷Flow"
- "status-success=test"
actions:
merge:
method: merge
Expand Down
2 changes: 1 addition & 1 deletion .requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ curl-cffi==0.5.7 ; python_version >= "3.10" and python_version < "4.0"
cytoolz==0.12.2 ; python_version >= "3.10" and python_version < "4" and implementation_name == "cpython"
decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0"
duckduckgo-search==3.8.5 ; python_version >= "3.10" and python_version < "4.0"
dxsp==5.2.8 ; python_version >= "3.10" and python_version < "4.0"
dxsp==5.2.9 ; python_version >= "3.10" and python_version < "4.0"
dynaconf==3.2.3 ; python_version >= "3.10" and python_version < "4.0"
eth-abi==4.2.1 ; python_version >= "3.10" and python_version < "4"
eth-account==0.9.0 ; python_version >= "3.10" and python_version < "4"
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ nicegui = "^1.3.15"
ping3 = "^4.0.4"
talkytrend = "1.15.2"
iamlistening = "4.2.11"
findmyorder = "1.8.3"
dxsp = "5.2.9"
findmyorder = "1.8.4"
dxsp = "5.2.10"
cefi = "3.1.6"
myllm = "3.1.23"

Expand Down
2 changes: 1 addition & 1 deletion tt/plugins/default_plugins/cex_exchange_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async def handle_message(self, msg):
if not self.should_handle(msg):
return
logger.debug("settings.bot_ignore: {}", settings.bot_ignore)
if not msg.startswith(settings.bot_ignore):
if settings.bot_ignore not in msg or settings.bot_prefix not in msg:
if await self.fmo.search(msg):
order = await self.fmo.get_order(msg)
if order and settings.trading_enabled:
Expand Down
2 changes: 1 addition & 1 deletion tt/plugins/default_plugins/dex_exchange_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ async def handle_message(self, msg):
if not self.should_handle(msg):
return

if not msg.startswith(settings.bot_ignore):
if settings.bot_ignore not in msg or settings.bot_prefix not in msg:
if await self.fmo.search(msg):
order = await self.fmo.get_order(msg)
if order and settings.trading_enabled:
Expand Down
6 changes: 2 additions & 4 deletions tt/plugins/default_plugins/llm_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ async def handle_message(self, msg):
"""Handles incoming messages"""
if not self.should_handle(msg):
return
if (
self.llm.llm_ai_mode
and not msg.startswith(settings.llm_prefix)
and not msg.startswith(settings.bot_prefix)
if self.llm.llm_ai_mode and (
settings.bot_ignore not in msg or settings.bot_prefix not in msg
):
chat = await self.llm.chat(str(msg))
await self.send_notification(chat)
Expand Down