Framework Hackathon Update

Author: evahteev

.gitignore

@@ -71,6 +71,8 @@ yarn-error.log*
 .vercel
 *.tsbuildinfo
 next-env.d.ts
+coverage/
+/coverage
 
 # Misc
 *.log

README.md

@@ -212,4 +212,3 @@ This project is licensed under the MIT License - see the LICENSE file for detail
 
 Contributions are highly encouraged! Please consult the CONTRIBUTING.md document for details on our code of conduct, and
 the process for submitting pull requests to the project.
-

bot/.env.example

@@ -1,6 +1,6 @@
 # Telegram Bot Settings
 # Bmeme stage
-BOT_TOKEN="BOT_TOKEN"
+BOT_TOKEN="bot_key"
 SUPPORT_URL="dex.guru"
 RATE_LIMIT=0.5
 DEBUG=True
@@ -10,14 +10,14 @@ WEBHOOK_HOST="0.0.0.0"  # use "localhost" if not using Docker
 WEBHOOK_PORT=8080
 WEBHOOK_BASE_URL="https://example.com"
 WEBHOOK_PATH="/webhook"
-WEBHOOK_SECRET="Pl7U9AJUFb2"
+WEBHOOK_SECRET="secret"
 
 
-FLOW_API="http://flow-api"
+FLOW_API="http://localhost:8000"
 FLOW_SYS_KEY="secret"
 
-ENGINE_ADMIN_PREFIX="http://engine"
-ENGINE_URL="http://engine/engine-rest"
+ENGINE_ADMIN_PREFIX="http://localhost:8000"
+ENGINE_URL="http://localhost:8000/engine-rest"
 ENGINE_USERNAME="demo"
 ENGINE_PASSWORD="demo"
 ENGINE_USERS_GROUP_ID="camunda-admin"
@@ -37,3 +37,5 @@ PROMETHEUS_PORT=9090
 GRAFANA_PORT=3000
 GRAFANA_ADMIN_USER="admin"
 GRAFANA_ADMIN_PASSWORD="admin"
+
+WEB3_PROVIDER="https://rpc.gurunetwork.ai/archive/261"

bot/.gitignore

@@ -135,4 +135,6 @@ dmypy.json
 
 logs/
 
+Pipfile.lock
+Pipfile
 

bot/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-alpine3.18
+FROM docker-registry.dexguru.biz/dex.guru/utils/python:3.10-alpine3.18
 
 WORKDIR /usr/src/app
 
@@ -23,4 +23,4 @@ RUN adduser -D appuser \
 
 USER appuser
 
-CMD ["python", "-m", "bot"]
+CMD [ "python", "./bot_server/__main__.py" ]

bot/README.md

@@ -5,6 +5,7 @@
 from typing import Sequence
 
 import httpx
+
 # import sentry_sdk
 import uvloop
 
@@ -17,7 +18,10 @@
 from bot_server.core.loader import app, bot, dp
 from bot_server.handlers import get_handlers_router
 from bot_server.handlers.metrics import MetricsView
-from bot_server.keyboards.default_commands import remove_default_commands, set_default_commands
+from bot_server.keyboards.default_commands import (
+    remove_default_commands,
+    set_default_commands,
+)
 from bot_server.keyboards.inline.task import task_keyboard
 from bot_server.middlewares import register_middlewares
 from bot_server.middlewares.prometheus import prometheus_middleware_factory
@@ -36,7 +40,7 @@
 
 
 async def fetch_camunda_tasks() -> Sequence[dict]:
-    pass # till user
+    pass  # till user
     # async with httpx.AsyncHTTPTransport() as transport:
     #
     #     camunda_client = CamundaEngineClient(
@@ -68,20 +72,23 @@ async def fetch_camunda_task_and_send_notification() -> dict:
     if tasks:
         tasks_dict = defaultdict(list)
         for task in tasks:
-            if task['telegram_user_id']:
-                tasks_dict[task['telegram_user_id']].append(task)
+            if task["telegram_user_id"]:
+                tasks_dict[task["telegram_user_id"]].append(task)
 
         for user_id, tasks in tasks_dict.items():
-            await bot.send_message(chat_id=user_id, text="Tasks available in tasklist:",
-                                   reply_markup=task_keyboard(tasks))
-
+            await bot.send_message(
+                chat_id=user_id,
+                text="Tasks available in tasklist:",
+                reply_markup=task_keyboard(tasks),
+            )
 
-async def check_for_camunda_tasks(dispatcher):
-    while True:
-        # Assume you have a list of user IDs to poll tasks for
-        await fetch_camunda_task_and_send_notification()
 
-        await asyncio.sleep(300)  # Check every 60 seconds, adjust as needed
+# async def check_for_camunda_tasks(dispatcher):
+#     while True:
+#         # Assume you have a list of user IDs to poll tasks for
+#         await fetch_camunda_task_and_send_notification()
+#
+#         await asyncio.sleep(300)  # Check every 60 seconds, adjust as needed
 
 
 async def on_startup() -> None:
@@ -96,7 +103,7 @@ async def on_startup() -> None:
         app.router.add_route("GET", "/metrics", MetricsView)
 
     await set_default_commands(bot)
-    asyncio.create_task(check_for_camunda_tasks(dp))  # Start the polling task
+    # asyncio.create_task(check_for_camunda_tasks(dp))  # Start the polling task
 
     bot_info = await bot.get_me()
 
@@ -122,10 +129,11 @@ async def on_shutdown() -> None:
 
     await remove_default_commands(bot)
 
+    await bot.delete_webhook()
+    await bot.close()
     await dp.storage.close()
     await dp.fsm.storage.close()
 
-    await bot.delete_webhook()
     await bot.session.close()
 
     logger.info("bot stopped")
@@ -179,7 +187,7 @@ async def handle_mention_message(message: Message):
         "message_id": message.message_id,
         "from_user": message.from_user.id,
         "text": message.text,
-        "date": message.date.isoformat()
+        "date": message.date.isoformat(),
     }
     await message.answer("Mention saved!")