switch to poetry

.gitignore

@@ -12,4 +12,5 @@ data
 *.db-wal
 *.log*
 
+dist/
 .tmp/

Dockerfile

@@ -1,9 +1,10 @@
-FROM python:3.12
+FROM python:3.12-slim
 
 WORKDIR /usr/src/app
+COPY pyproject.toml poetry.lock ./
+RUN pip install poetry && poetry install --only main --no-root --no-directory --no-cache
 COPY . .
-RUN pip install --no-cache-dir -r requirements.txt
+RUN poetry install --only main
 ENV PORT=9000 \
     TOKEN=""
-ENTRYPOINT ["python"]
-CMD ["main.py"]
+ENTRYPOINT ["poetry", "run", "python", "-m", "biliparser"]

main.py → biliparser/__main__.py

@@ -44,16 +44,16 @@
     filters,
 )
 
-from biliparser import biliparser
-from biliparser.utils import (
+from . import biliparser
+from .database import db_close, db_init, file_cache
+from .utils import (
     LOCAL_MODE,
     compress,
     escape_markdown,
     headers,
     logger,
     referer_url,
 )
-from database import db_close, db_init, file_cache
 
 BILIBILI_URL_REGEX = r"(?i)(?:https?://)?[\w\.]*?(?:bilibili(?:bb)?\.com|(?:b23(?:bb)?|acg)\.tv)\S+|BV\w{10}"
 BILIBILI_SHARE_URL_REGEX = r"(?i)【.*】 https://[\w\.]*?(?:bilibili\.com|b23\.tv)\S+"
@@ -672,6 +672,7 @@ async def post_shutdown(application: Application):
 
 def add_handler(application: Application):
     application.add_handler(CommandHandler("start", start, block=False))
+    application.add_handler(CommandHandler("file", fetch, block=False))
     application.add_handler(
         MessageHandler(
             filters.Entity(MessageEntity.URL)
@@ -683,8 +684,6 @@ def add_handler(application: Application):
         )
     )
     application.add_handler(InlineQueryHandler(inlineparse, block=False))
-    application.add_handler(CommandHandler("parse", parse, block=False))
-    application.add_handler(CommandHandler("file", fetch, block=False))
     application.add_error_handler(error_handler)
 
 

database.py → biliparser/database.py

@@ -3,7 +3,7 @@
 from tortoise import Tortoise, fields
 from tortoise.models import Model
 
-from biliparser.utils import logger
+from .utils import logger
 
 
 class file_cache(Model):
@@ -23,7 +23,7 @@ async def db_init() -> None:
         logger.info(f"redis_url: {redis_url}")
     await Tortoise.init(
         db_url=db_url,
-        modules={"models": ["database"]},
+        modules={"models": ["biliparser.database"]},
         use_tz=True,
     )
     await Tortoise.generate_schemas()

biliparser/utils.py

@@ -8,7 +8,6 @@
 
 from loguru import logger
 from PIL import Image
-from tortoise.exceptions import IntegrityError
 
 logger.remove()
 logger.add(sys.stdout, backtrace=True, diagnose=True)

pyproject.toml

@@ -0,0 +1,30 @@
+[tool.poetry]
+name = "telegram-bili-feed-helper"
+version = "0.1.0"
+description = ""
+authors = ["simonsmh"]
+license = "GPLv3"
+readme = "README.md"
+packages = [{ include = "biliparser" }]
+
+[tool.poetry.dependencies]
+python = "^3.12"
+aiomysql = "^0.2.0"
+asyncpg = "^0.29.0"
+beautifulsoup4 = "^4.12.3"
+httpx = {extras = ["http2"], version = "^0.27.0"}
+loguru = "^0.7.2"
+lxml = "^5.2.2"
+pillow = "^10.3.0"
+python-telegram-bot = {extras = ["all"], version = "^21.3"}
+redis = "^5.0.5"
+telegraph = {extras = ["aio"], version = "^2.2.0"}
+tortoise-orm = {extras = ["accel"], version = "^0.21.3"}
+
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.2.2"
+pytest-asyncio = "^0.23.7"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"