diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51c24fe..08f38a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,11 @@ jobs: - name: Check whitespace errors run: git diff --check + - name: Lint (ruff) + run: uv run --locked ruff check . + - name: Run tests - run: uv run --locked pytest -q + run: uv run --locked pytest -q --cov --cov-fail-under=80 docker: name: Docker build diff --git a/.gitignore b/.gitignore index 9d1965c..63ffd1d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ __pycache__/ *.py[cod] *.egg-info/ .pytest_cache/ +.coverage +htmlcov/ +.ruff_cache/ .venv/ .env *.db diff --git a/goodprice/__main__.py b/goodprice/__main__.py index df99afd..39971e7 100644 --- a/goodprice/__main__.py +++ b/goodprice/__main__.py @@ -1,5 +1,4 @@ from goodprice.main import main - if __name__ == "__main__": main() diff --git a/goodprice/analysis/judge.py b/goodprice/analysis/judge.py index efa5e21..5a5351d 100644 --- a/goodprice/analysis/judge.py +++ b/goodprice/analysis/judge.py @@ -68,7 +68,7 @@ def parse_value_typed(raw: str) -> dict[str, Any]: try: score = max(1, min(10, int(data.get("value_score", 0)))) except (TypeError, ValueError): - raise ValueError(f"类型化性价比缺少整数 value_score: {raw!r}") + raise ValueError(f"类型化性价比缺少整数 value_score: {raw!r}") from None return { "value_score": score, "probability": _clamp01(data.get("probability", 0.5)), diff --git a/goodprice/crawler/xianyu.py b/goodprice/crawler/xianyu.py index 5751863..3818ac5 100644 --- a/goodprice/crawler/xianyu.py +++ b/goodprice/crawler/xianyu.py @@ -71,7 +71,7 @@ def search( card_selector = sel.RESULT_CARD try: page.wait_for_selector(card_selector, timeout=30000) - except Exception: + except Exception as exc: if page.locator(sel.RESULT_CARD_FALLBACK).count() > 0: card_selector = sel.RESULT_CARD_FALLBACK else: @@ -83,10 +83,10 @@ def search( if "加载中" in body_text: raise CrawlerAuthError( "搜索结果一直显示加载中,Cookie 可能已失效或未登录,请重新获取" - ) + ) from exc raise RuntimeError( f"未在页面中找到商品卡片,页面可能改版或触发风控。页面摘要: {body_text[:150]}" - ) + ) from exc # 等待真实结果渲染(刚出现卡片时可能只是占位/推荐位) page.wait_for_timeout(3000) for item in parse_search_html(page.content(), card_selector=card_selector): diff --git a/goodprice/main.py b/goodprice/main.py index b68d456..81d9566 100644 --- a/goodprice/main.py +++ b/goodprice/main.py @@ -50,11 +50,11 @@ def _make_crawl_service(session_factory, settings_service, guard): runtime = settings_service.get() from goodprice.analysis.llm import LLMClient from goodprice.crawler.xianyu import XianyuAdapter + from goodprice.notify.feishu import FeishuNotifier + from goodprice.notify.gotify import GotifyNotifier from goodprice.notify.log import LogNotifier from goodprice.notify.serverchan import ServerChanNotifier from goodprice.notify.wecom_robot import WeComRobotNotifier - from goodprice.notify.feishu import FeishuNotifier - from goodprice.notify.gotify import GotifyNotifier adapter = XianyuAdapter(cookie=runtime.xianyu_cookie, proxy=runtime.proxy) seller_service = SellerService(session_factory, adapter=adapter) diff --git a/goodprice/web/routes.py b/goodprice/web/routes.py index 61395b5..995fa5f 100644 --- a/goodprice/web/routes.py +++ b/goodprice/web/routes.py @@ -776,6 +776,7 @@ def save_settings( @router.post("/settings/test-notification/{channel}") def test_notification(request: Request, channel: str): from fastapi import HTTPException + from goodprice.notify.base import NotificationMessage from goodprice.notify.feishu import FeishuNotifier from goodprice.notify.gotify import GotifyNotifier @@ -850,7 +851,9 @@ def _safe_test_url(raw: str) -> str: @router.post("/settings/test-llm") async def test_llm_endpoint(request: Request): import time + from fastapi.responses import JSONResponse + from goodprice.analysis.llm import LLMClient try: @@ -894,7 +897,9 @@ async def test_llm_endpoint(request: Request): @router.post("/settings/test-vision") async def test_vision_endpoint(request: Request): import time + from fastapi.responses import JSONResponse + from goodprice.analysis.llm import LLMClient try: @@ -938,6 +943,7 @@ async def test_vision_endpoint(request: Request): @router.post("/settings/test-jev") async def test_jev_endpoint(request: Request): import time + from fastapi.responses import JSONResponse try: diff --git a/pyproject.toml b/pyproject.toml index 2f97287..b1e8891 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ ] [project.optional-dependencies] -dev = ["pytest>=8.0", "pytest-cov>=4.1"] +dev = ["pytest>=8.0", "pytest-cov>=4.1", "ruff>=0.6"] jev = ["typesafe-sdk>=0.7"] [project.scripts] @@ -38,3 +38,22 @@ include = ["goodprice*"] testpaths = ["tests"] pythonpath = ["."] +[tool.ruff] +target-version = "py311" +line-length = 100 + +[tool.ruff.lint] +# 起步基线:pyflakes + 导入排序 + 核心 pycodestyle + bugbear。 +# E501 交给将来的 formatter;B008 是 FastAPI 依赖注入惯用法。 +select = ["E", "F", "I", "B"] +ignore = ["E501", "B008"] + +[tool.ruff.lint.isort] +known-first-party = ["goodprice"] + +[tool.coverage.run] +source = ["goodprice"] + +[tool.coverage.report] +show_missing = true + diff --git a/tests/test_api.py b/tests/test_api.py index fc445aa..ef9022d 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -1,6 +1,5 @@ import re import time - from datetime import datetime from fastapi.testclient import TestClient diff --git a/tests/test_crawl_service.py b/tests/test_crawl_service.py index 564d8f2..f649f7f 100644 --- a/tests/test_crawl_service.py +++ b/tests/test_crawl_service.py @@ -409,7 +409,7 @@ def test_two_tasks_same_keyword_keep_separate_listings(session_factory, base_set with session_factory() as session: listings = session.query(Listing).all() assert len(listings) == 2 - assert {l.task_id for l in listings} == {t1.id, t2.id} + assert {listing.task_id for listing in listings} == {t1.id, t2.id} def test_last_run_count_increments(session_factory, base_settings): @@ -599,7 +599,7 @@ def test_exclude_words_filter(session_factory, base_settings): assert len(notifier.messages) == 1 with session_factory() as session: listings = session.query(Listing).all() - assert [l.external_id for l in listings] == ["1001"] + assert [listing.external_id for listing in listings] == ["1001"] def test_requirement_mismatch_blocks_and_skips_vision(session_factory, base_settings): diff --git a/tests/test_judge.py b/tests/test_judge.py index 364893d..9b2da9a 100644 --- a/tests/test_judge.py +++ b/tests/test_judge.py @@ -3,13 +3,13 @@ import httpx import pytest +from goodprice.analysis.jev_typesafe import TypeSafeJudger from goodprice.analysis.judge import ( JevJudger, build_judger, parse_requirement_typed, parse_value_typed, ) -from goodprice.analysis.jev_typesafe import TypeSafeJudger from goodprice.analysis.llm import LLMClient from goodprice.config import Settings from goodprice.crawler.base import ListingData diff --git a/tests/test_main.py b/tests/test_main.py index dbd531b..2dadd52 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,7 +1,7 @@ import logging +from logging.handlers import RotatingFileHandler from fastapi.testclient import TestClient -from logging.handlers import RotatingFileHandler from goodprice.main import build_app diff --git a/tests/test_models.py b/tests/test_models.py index 606bc58..3b0e6a8 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,8 +1,7 @@ import pytest from sqlalchemy.exc import IntegrityError -from goodprice.models import Listing, Notification, PriceSnapshot, WatchTask -from goodprice.models import Seller +from goodprice.models import Listing, Notification, PriceSnapshot, Seller, WatchTask def test_watch_task_crud(session_factory): @@ -92,11 +91,11 @@ def test_seller_crud_and_listing_columns(session_factory): def test_blocked_flags(session_factory): with session_factory() as session: - l = Listing(platform="xianyu", external_id="1", title="t", price=1, url="u", blocked=True) + listing = Listing(platform="xianyu", external_id="1", title="t", price=1, url="u", blocked=True) s = Seller(platform="xianyu", seller_uid="u1", blocked=True) - session.add_all([l, s]) + session.add_all([listing, s]) session.commit() - assert l.blocked is True + assert listing.blocked is True assert s.blocked is True diff --git a/tests/test_notify.py b/tests/test_notify.py index 0205939..e327fad 100644 --- a/tests/test_notify.py +++ b/tests/test_notify.py @@ -4,10 +4,10 @@ import pytest from goodprice.notify.base import NotificationMessage +from goodprice.notify.feishu import FeishuNotifier from goodprice.notify.log import LogNotifier from goodprice.notify.serverchan import ServerChanNotifier from goodprice.notify.wecom_robot import WeComRobotNotifier -from goodprice.notify.feishu import FeishuNotifier def test_log_notifier_logs(caplog): diff --git a/tests/test_settings_service.py b/tests/test_settings_service.py index 08d0001..c64f725 100644 --- a/tests/test_settings_service.py +++ b/tests/test_settings_service.py @@ -1,4 +1,3 @@ -from goodprice.config import Settings from goodprice.services.settings_service import RuntimeSettings, SettingsService diff --git a/uv.lock b/uv.lock index 13ad95d..f01b216 100644 --- a/uv.lock +++ b/uv.lock @@ -246,6 +246,7 @@ dependencies = [ dev = [ { name = "pytest" }, { name = "pytest-cov" }, + { name = "ruff" }, ] jev = [ { name = "typesafe-sdk" }, @@ -264,6 +265,7 @@ requires-dist = [ { name = "pytest", marker = "extra == 'dev'", specifier = ">=8.0" }, { name = "pytest-cov", marker = "extra == 'dev'", specifier = ">=4.1" }, { name = "python-multipart", specifier = ">=0.0.9" }, + { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.6" }, { name = "sqlalchemy", specifier = ">=2.0" }, { name = "typesafe-sdk", marker = "extra == 'jev'", specifier = ">=0.7" }, { name = "uvicorn", extras = ["standard"], specifier = ">=0.29" }, @@ -374,8 +376,8 @@ name = "httpcore2" version = "2.13.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "h11", marker = "python_full_version < '3.12' or sys_platform != 'emscripten'" }, - { name = "truststore", marker = "python_full_version < '3.12' or sys_platform != 'emscripten'" }, + { name = "h11" }, + { name = "truststore" }, ] sdist = { url = "https://files.pythonhosted.org/packages/cb/f3/1db7aa2bc2524062192bb0e0323969492d1883152a232fe36eea65f4e35c/httpcore2-2.13.1.tar.gz", hash = "sha256:e0aa977abe17e69a3b820a24542a6fa88702676d83880b8d194dcd18408e5103", size = 68071, upload-time = "2026-09-23T07:47:22.372Z" } wheels = [ @@ -862,6 +864,31 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, ] +[[package]] +name = "ruff" +version = "0.16.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/96/bf/c935ca98e73fe8ce65b87ef08a280c0c1e85295d569228c15e87d8fdfaf1/ruff-0.16.9.tar.gz", hash = "sha256:12b625c6cfba78d285d9f48eda5f053374f1e53cb10ef17342a383750db99161", size = 4948764, upload-time = "2026-09-24T20:37:49.416Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0d/26/df51322b52ee1ada7eff2d071ea09d11d5c2d1dcc9f02594f5785c4d1635/ruff-0.16.9-py3-none-linux_armv6l.whl", hash = "sha256:95e6f022090368ab3b824c36276839c53b2adf1a3f4c09fefc33dfc400f6da96", size = 10082922, upload-time = "2026-09-24T20:37:13.045Z" }, + { url = "https://files.pythonhosted.org/packages/a5/27/7bf51f5a7aa375e9f339280a303aab44ca75dc1525f1cdc5991761685b0f/ruff-0.16.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:a5f27be168556594a86d2f415db0cf43f5291917849318f873c7e2791f7a8c67", size = 10236360, upload-time = "2026-09-24T20:37:16.049Z" }, + { url = "https://files.pythonhosted.org/packages/b6/63/09659283f92f02dff45809da194a70da2f688d87c55d8875c4fae3536072/ruff-0.16.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1632eb1d6197f33bd00b1acbc5b71009e89a8895c158e2d2b03a834fac964ab6", size = 9892940, upload-time = "2026-09-24T20:37:17.957Z" }, + { url = "https://files.pythonhosted.org/packages/24/58/98de1b72ec172f5f8f1731236fe21585b3998bf7dfe9fcc44ae9ba626012/ruff-0.16.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b3f951b14d865d5952c89d40a5ca07e87abe24fa5453299878411e127748fb1c", size = 10032114, upload-time = "2026-09-24T20:37:19.942Z" }, + { url = "https://files.pythonhosted.org/packages/c8/7d/f1e17c54ab59d4bad1dce8ee3e22a7a1d0ef4745240decacdcf3832b5bb2/ruff-0.16.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:447fc07e1573afff7cb02803462b12b6c8ece7cf10e2cd78565fa6d7a1c0bf8d", size = 9910227, upload-time = "2026-09-24T20:37:21.872Z" }, + { url = "https://files.pythonhosted.org/packages/34/19/436f647a65075bbd3bab2668b3bdaa5120559b294694018cdcefabbbf30b/ruff-0.16.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8a3e039a6a40ed976c491722b60e0ae4a4aa1a86057f540ee7a37a5d19ae9120", size = 10547484, upload-time = "2026-09-24T20:37:24.229Z" }, + { url = "https://files.pythonhosted.org/packages/03/59/38430a6bc2f6d8095447ac39625cf8b6e9344a47e6c26225c8ba1bff3ffb/ruff-0.16.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4684dded7db60aa57cb118fa158630f5feade4af5782903b6053484bdf9bd129", size = 11412367, upload-time = "2026-09-24T20:37:26.307Z" }, + { url = "https://files.pythonhosted.org/packages/c8/bd/bbb6d7fc7f208c8b8c50dd5dc8206e4cfdb1e7a8fb852606a3adf370c880/ruff-0.16.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d29c934357e45642fda2f34c0b1f4025b4a6c01e15e4bf0016879d60078a142c", size = 10869787, upload-time = "2026-09-24T20:37:28.35Z" }, + { url = "https://files.pythonhosted.org/packages/bc/b8/9c543074918061abbefc3bd139bee22de35abedb00dde0f2d27288838962/ruff-0.16.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a21713e629d3e5bdb2f5c2def1cc7f04f47fa8e1a7eb0571b4a28e1da64bc728", size = 10406494, upload-time = "2026-09-24T20:37:30.624Z" }, + { url = "https://files.pythonhosted.org/packages/35/7a/5a8851bd146e7ccf8fd4b003f6c75c11f8fbdb0e60673b45097986b6bf41/ruff-0.16.9-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:7baa24ef5fc8e77aa93879e1d3f43754a01ae488e869f1ae30cf431afd4d2452", size = 10590083, upload-time = "2026-09-24T20:37:32.439Z" }, + { url = "https://files.pythonhosted.org/packages/87/f0/4c3467188f23f806960b46fa76575a7cd0514c9ba90562650b71efc96980/ruff-0.16.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:a41aac6230aadfaa133bdfa1614488531ffa3e0837567ae04c0da2058a9c0f9e", size = 10119151, upload-time = "2026-09-24T20:37:34.581Z" }, + { url = "https://files.pythonhosted.org/packages/15/34/5a4def5adea572ce6aea0bb64f21f928ee317b80e0db747d7979b01d7261/ruff-0.16.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:c2529fb5896d49115b0e9aa8f887490b34bbe76baf879ec2264ac59406869ce7", size = 9911544, upload-time = "2026-09-24T20:37:36.796Z" }, + { url = "https://files.pythonhosted.org/packages/62/5d/d15ebea7499eef9373318c0ee6ca127832927c6529731f6d48e18dce7ca9/ruff-0.16.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:41e3870277694177429b56406d65dfbdb2c2802c52b715edaf6a0b829c69d4ee", size = 10269884, upload-time = "2026-09-24T20:37:38.857Z" }, + { url = "https://files.pythonhosted.org/packages/d1/56/c5d3cd119ded7a3c7aba0e961b69cb3df701c91662c98ad694467d060ce1/ruff-0.16.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:8adbe4e58af167f767d7b2ba5e83c42e878350796cf78c2f5e14ab9903a92588", size = 10749366, upload-time = "2026-09-24T20:37:41.042Z" }, + { url = "https://files.pythonhosted.org/packages/ac/fe/734ec7527029ac757ecf821f143c9f3fcf69149c21f53a044a899b430f5a/ruff-0.16.9-py3-none-win32.whl", hash = "sha256:0e1dbc2073624dee6618d41d0098690a7244654af746704b64759e12b6b6b385", size = 10152355, upload-time = "2026-09-24T20:37:43.025Z" }, + { url = "https://files.pythonhosted.org/packages/14/21/26e4643629b3ebb44f0a06f9c9a53058d63d989415f63a9a3c28e2ee7f22/ruff-0.16.9-py3-none-win_amd64.whl", hash = "sha256:6bd40fec8cd4c8a3d4dd589bd8ad4e6320c13c29234159bfd959a40d529d597b", size = 10592965, upload-time = "2026-09-24T20:37:44.944Z" }, + { url = "https://files.pythonhosted.org/packages/51/60/5fb1a39dbb5ae314d5f59bc7348a63c1d5c20f3cd83914c4b5cb0be31d2d/ruff-0.16.9-py3-none-win_arm64.whl", hash = "sha256:ed1a252039200f57a59eebc063b54beabea67bfbaaca0eeaa7f54b5fbcda2284", size = 10458649, upload-time = "2026-09-24T20:37:46.882Z" }, +] + [[package]] name = "soupsieve" version = "2.10"