remove pyngrok, removed unnecessary bot.close(), bot.logout() etc. calls
All checks were successful
Build Docs / changes (push) Successful in 5s
Build Docs / build-docs (push) Successful in 1m1s
Build Docs / deploy-docs (push) Successful in 5s

This commit is contained in:
Alexander Kalinovsky
2025-04-12 15:45:40 +07:00
parent dc006c70fd
commit 783ecac91a
3 changed files with 1 additions and 54 deletions

View File

@@ -21,7 +21,6 @@ dependencies = [
"greenlet>=3.1.1",
"mkdocs-material>=9.6.5",
"pydantic-settings>=2.7.1",
"pyngrok>=7.2.3",
"pytest>=8.3.4",
"ruff>=0.9.6",
"sqlmodel>=0.0.22",

View File

@@ -40,9 +40,6 @@ async def default_lifespan(app: "QBotApp"):
logger.debug("starting qbot app")
if app.lifespan_bot_init:
if app.config.USE_NGROK:
app.ngrok_init()
await app.bot_init()
app.config.TELEGRAM_BOT_USERNAME = (await app.bot.get_me()).username
@@ -57,11 +54,7 @@ async def default_lifespan(app: "QBotApp"):
logger.info("stopping qbot app")
if app.lifespan_bot_init:
await app.bot_close()
if app.config.USE_NGROK:
app.ngrok_stop()
await app.bot_close()
logger.info("qbot app stopped")
@@ -151,32 +144,6 @@ class QBotApp(Generic[UserType, ConfigType], FastAPI):
for command_name, command in router._commands.items():
self.bot_commands[command_name] = command
def ngrok_init(self):
try:
from pyngrok import ngrok
from pyngrok.conf import PyngrokConfig
except ImportError:
logger.error("pyngrok is not installed")
raise
tunnel = ngrok.connect(
self.config.API_PORT,
pyngrok_config=PyngrokConfig(auth_token=self.config.NGROK_AUTH_TOKEN),
)
self.config.NGROK_URL = tunnel.public_url
def ngrok_stop(self):
try:
from pyngrok import ngrok
except ImportError:
logger.error("pyngrok is not installed")
raise
ngrok.disconnect(self.config.NGROK_URL)
ngrok.kill()
async def bot_init(self):
commands_captions = dict[str, list[tuple[str, str]]]()
@@ -267,8 +234,3 @@ class QBotApp(Generic[UserType, ConfigType], FastAPI):
i18n=self.i18n,
app_state=app_state,
)
async def bot_close(self):
await self.bot.delete_webhook()
await self.bot.log_out()
await self.bot.close()

14
uv.lock generated
View File

@@ -809,18 +809,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/eb/f5/b9e2a42aa8f9e34d52d66de87941ecd236570c7ed2e87775ed23bbe4e224/pymdown_extensions-10.14.3-py3-none-any.whl", hash = "sha256:05e0bee73d64b9c71a4ae17c72abc2f700e8bc8403755a00580b49a4e9f189e9", size = 264467 },
]
[[package]]
name = "pyngrok"
version = "7.2.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "pyyaml" },
]
sdist = { url = "https://files.pythonhosted.org/packages/55/56/6bc450f685c32312219c155725e179d82173388d9b5532a570b0f7cba987/pyngrok-7.2.3.tar.gz", hash = "sha256:ce33c8a3b2ee6e7f727ed1c99b5dac9476ffe1905eab6b8aa506a9cbe5d71d4e", size = 39518 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/b1/18/b04c16630a55072df02c55419fde1bd3acd101f56add62781d2a9ac94c5c/pyngrok-7.2.3-py3-none-any.whl", hash = "sha256:d199afcef9c9f285eacdb622fd22261e91b1ba5a7802182ad2a9a702111e0865", size = 23074 },
]
[[package]]
name = "pytest"
version = "8.3.4"
@@ -915,7 +903,6 @@ dependencies = [
{ name = "greenlet" },
{ name = "mkdocs-material" },
{ name = "pydantic-settings" },
{ name = "pyngrok" },
{ name = "pytest" },
{ name = "ruff" },
{ name = "sqlmodel" },
@@ -930,7 +917,6 @@ requires-dist = [
{ name = "greenlet", specifier = ">=3.1.1" },
{ name = "mkdocs-material", specifier = ">=9.6.5" },
{ name = "pydantic-settings", specifier = ">=2.7.1" },
{ name = "pyngrok", specifier = ">=7.2.3" },
{ name = "pytest", specifier = ">=8.3.4" },
{ name = "ruff", specifier = ">=0.9.6" },
{ name = "sqlmodel", specifier = ">=0.0.22" },