nonebot-plugin-cnrail 0.2.0__tar.gz → 0.2.2.dev1__tar.gz

{nonebot_plugin_cnrail-0.2.0 → nonebot_plugin_cnrail-0.2.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-cnrail
-Version: 0.2.0
+Version: 0.2.2.dev1
 Summary: NoneBot2 plugin for query the train time table
 Home-page: https://github.com/lgc-NB2Dev/nonebot-plugin-cnrail
 Author-Email: student_2333 <lgc2333@126.com>, XieXiLin <support@xiexilin.com>
@@ -9,7 +9,7 @@ Project-URL: Homepage, https://github.com/lgc-NB2Dev/nonebot-plugin-cnrail
 Requires-Python: <4.0,>=3.9
 Requires-Dist: nonebot2>=2.2.0
 Requires-Dist: httpx>=0.24
-Requires-Dist: nonebot-plugin-alconna>=0.40.0rc1
+Requires-Dist: nonebot-plugin-alconna>=0.40.1
 Requires-Dist: nonebot-plugin-htmlrender>=0.2.2
 Requires-Dist: jinja2>=3.1.2
 Requires-Dist: pytz>=2023.3.post1
@@ -121,7 +121,9 @@ plugins = [
 
 ## ⚙️ 配置
 
-暂无
+|         配置项         | 必填 |              默认值               |              说明              |
+| :--------------------: | :--: | :-------------------------------: | :----------------------------: |
+| `CNRAIL_ACG_IMAGE_URL` |  否  | `https://www.loliapi.com/acg/pe/` | 用于指令返回图片背景的图片 URL |
 
 ## 🎉 使用
 
@@ -162,6 +164,11 @@ Telegram：[@lgc2333](https://t.me/lgc2333)
 
 ## 📝 更新日志
 
+### 0.2.1
+
+- 适配 [MoeFactory API](https://train.moefactory.com)
+- 新增配置项 `CNRAIL_ACG_IMAGE_URL`
+
 ### 0.2.0
 
 - 适配 Pydantic V1 & V2

{nonebot_plugin_cnrail-0.2.0 → nonebot_plugin_cnrail-0.2.2.dev1}/README.md

@@ -104,7 +104,9 @@ plugins = [
 
 ## ⚙️ 配置
 
-暂无
+|         配置项         | 必填 |              默认值               |              说明              |
+| :--------------------: | :--: | :-------------------------------: | :----------------------------: |
+| `CNRAIL_ACG_IMAGE_URL` |  否  | `https://www.loliapi.com/acg/pe/` | 用于指令返回图片背景的图片 URL |
 
 ## 🎉 使用
 
@@ -145,6 +147,11 @@ Telegram：[@lgc2333](https://t.me/lgc2333)
 
 ## 📝 更新日志
 
+### 0.2.1
+
+- 适配 [MoeFactory API](https://train.moefactory.com)
+- 新增配置项 `CNRAIL_ACG_IMAGE_URL`
+
 ### 0.2.0
 
 - 适配 Pydantic V1 & V2

{nonebot_plugin_cnrail-0.2.0 → nonebot_plugin_cnrail-0.2.2.dev1}/nonebot_plugin_cnrail/__init__.py

@@ -6,7 +6,7 @@ require("nonebot_plugin_htmlrender")
 from . import __main__ as __main__  # noqa: E402
 from .config import ConfigModel  # noqa: E402
 
-__version__ = "0.2.0"
+__version__ = "0.2.2.dev1"
 __plugin_meta__ = PluginMetadata(
     name="CNRail",
     description="查询 12306 列车时刻表",

{nonebot_plugin_cnrail-0.2.0 → nonebot_plugin_cnrail-0.2.2.dev1}/nonebot_plugin_cnrail/__main__.py

@@ -10,7 +10,12 @@ from nonebot import logger
 from nonebot_plugin_alconna import AlconnaMatcher, CommandResult, on_alconna
 from nonebot_plugin_alconna.uniseg import UniMessage
 
-from .data_source import MultipleTrainFoundError, query_train_info, render_train_info
+from .data_source import (
+    MultipleTrainFoundError,
+    generate_word,
+    query_train_info,
+    render_train_info,
+)
 
 
 def parse_date(date_str: str) -> date:
@@ -22,7 +27,9 @@ def parse_date(date_str: str) -> date:
     def parse(df: str) -> Optional[date]:
         with suppress(ValueError):
             parsed = (
-                datetime.strptime(date_str, df).replace(year=today_date.year).date()  # noqa: DTZ007
+                datetime.strptime(date_str, df)
+                .replace(year=today_date.year)
+                .date()  # noqa: DTZ007
             )
             if parsed < today_date:
                 parsed = parsed.replace(year=today_date.year + 1)
@@ -67,7 +74,9 @@ async def _(matcher: AlconnaMatcher, parma: Arparma):
 
     try:
         # use local timezone
-        date_obj = parse_date(train_date) if train_date else date.today()  # noqa: DTZ011
+        date_obj = (
+            parse_date(train_date) if train_date else date.today()
+        )  # noqa: DTZ011
     except ValueError:
         await matcher.finish("日期格式不正确")
 
@@ -75,7 +84,12 @@ async def _(matcher: AlconnaMatcher, parma: Arparma):
         train_info = await query_train_info(train_no, date_obj.isoformat())
     except MultipleTrainFoundError as e:
         much_text = "\n结果过多，仅显示前五个" if len(e.trains) > 5 else ""
-        info_text = "\n".join(x.word for x in e.trains[:5])
+        info_text = "\n".join(
+            [
+                await generate_word(train_code=i, train_date=date_obj.isoformat())
+                for i in e.trains[:5]
+            ],
+        )
         await matcher.finish(
             f"查询到多个车次，请检查您的车次是否正确\n{info_text}{much_text}",
         )
@@ -94,7 +108,10 @@ async def _(matcher: AlconnaMatcher, parma: Arparma):
         )
 
     try:
-        img_bytes = await render_train_info(train_info)
+        img_bytes = await render_train_info(
+            return_data=train_info,
+            train_date=date_obj.isoformat(),
+        )
     except Exception:
         logger.exception("Failed to render train info")
         await matcher.finish("渲染图片时出现错误，请检查后台输出")

nonebot_plugin_cnrail-0.2.2.dev1/nonebot_plugin_cnrail/config.py

@@ -0,0 +1,13 @@
+from typing_extensions import Annotated
+
+from nonebot import get_plugin_config
+from pydantic import BaseModel, Field, HttpUrl
+
+
+class ConfigModel(BaseModel):
+    CNRAIL_ACG_IMAGE_URL: Annotated[str, HttpUrl] = Field(
+        "https://www.loliapi.com/acg/pe/",
+    )
+
+
+config = get_plugin_config(ConfigModel)

nonebot_plugin_cnrail-0.2.2.dev1/nonebot_plugin_cnrail/data_source.py

@@ -0,0 +1,177 @@
+from pathlib import Path
+from typing import List, Optional
+
+import httpx
+import jinja2
+import pytz
+from nonebot import logger
+from nonebot.compat import type_validate_python
+from nonebot_plugin_htmlrender import get_new_page
+from playwright.async_api import Request, Route
+
+from .config import config
+from .models import ReturnData, TrainDetailData, TrainSearchResult, TrainSNData
+
+MOERAIL_API_BASE = "https://train.moefactory.com/api/"
+
+TEMPLATE_PATH = Path(__file__).parent / "templates" / "train_table.html.jinja"
+
+ROUTE_BASE_URL = "https://cnrail.nonebot/"
+ROUTE_IMAGE_URL = f"{ROUTE_BASE_URL}image"
+
+TZ_SHANGHAI = pytz.timezone("Asia/Shanghai")
+
+
+class MultipleTrainFoundError(Exception):
+    def __init__(self, trains: List[str]) -> None:
+        self.trains = trains
+        super().__init__(trains)
+
+
+async def generate_word(train_code: str, train_date: str) -> str:
+    async with httpx.AsyncClient(
+        base_url=MOERAIL_API_BASE,
+        follow_redirects=True,
+    ) as client:
+        resp = await client.post(
+            url="/trainNumber/query",
+            data={
+                "date": train_date.replace("-", ""),
+                "trainNumber": train_code,
+            },
+        )
+        resp.raise_for_status()
+        result = type_validate_python(TrainSearchResult, resp.json()["data"])
+    return f"{result.data[0].train_number} | {result.data[0].begin_station_name} - {result.data[0].end_station_name} | 耗时 {result.data[0].duration_minutes} 分钟"
+
+
+async def get_train_sn(train_code: str) -> Optional[List[TrainSNData]]:
+    async with httpx.AsyncClient(
+        base_url=MOERAIL_API_BASE,
+        follow_redirects=True,
+    ) as client:
+        resp = await client.post(
+            url="/crTrainSN/query",
+            data={
+                "keyword": train_code,
+            },
+        )
+        resp.raise_for_status()
+    return (
+        type_validate_python(List[TrainSNData], resp.json()["data"])
+        if resp.json()["data"]
+        else None
+    )
+
+
+async def query_train_info(
+    train_code: str,
+    train_date: str,
+) -> Optional[ReturnData]:
+    async with httpx.AsyncClient(
+        base_url=MOERAIL_API_BASE,
+        follow_redirects=True,
+    ) as client:
+        resp = await client.post(
+            url="/trainNumber/query",
+            data={
+                "date": train_date.replace("-", ""),
+                "trainNumber": train_code,
+            },
+        )
+        resp.raise_for_status()
+        result = type_validate_python(TrainSearchResult, resp.json()["data"])
+
+    if result.total_count != 1 and result.data[0].train_number != train_code:
+        async with httpx.AsyncClient(
+            base_url=MOERAIL_API_BASE,
+            follow_redirects=True,
+        ) as client:
+            resp = await client.post(
+                url="/search/getTrainCandidates",
+                data={
+                    "keywords": train_code,
+                },
+            )
+            resp.raise_for_status()
+            result = resp.json()["data"]
+            if not result:
+                return None
+            raise MultipleTrainFoundError(result)
+
+    search_data = result.data[0]
+
+    async with httpx.AsyncClient(
+        base_url=MOERAIL_API_BASE,
+        follow_redirects=True,
+    ) as client:
+        resp = await client.post(
+            url="/trainDetails/query",
+            data={
+                "date": train_date.replace("-", ""),
+                "trainIndex": search_data.train_index,
+            },
+        )
+        resp.raise_for_status()
+
+    datail_data = type_validate_python(TrainDetailData, resp.json()["data"])
+
+    sn_data = await get_train_sn(train_code)
+
+    return ReturnData(
+        search=search_data,
+        datail=datail_data,
+        sn=sn_data,
+        train_date=train_date,
+    )
+
+
+async def render_train_info(return_data: ReturnData, train_date: str) -> bytes:
+    template = jinja2.Template(
+        TEMPLATE_PATH.read_text(encoding="u8"),
+        enable_async=True,
+    )
+    html = await template.render_async(
+        summary=return_data.search,
+        detail=return_data.datail,
+        sn=(
+            next((i.train_sn for i in return_data.sn if i.date == train_date), None)
+            if return_data.sn
+            else None
+        ),
+        train_date=return_data.train_date,
+    )
+    if (dbg := Path.cwd() / "cnrail-debug.html").exists():
+        dbg.write_text(html, encoding="u8")
+
+    async def bg_router(route: Route, _: Request):
+        async with httpx.AsyncClient(follow_redirects=True) as client:
+            resp = await client.get(config.CNRAIL_ACG_IMAGE_URL, follow_redirects=True)
+        try:
+            resp.raise_for_status()
+        except Exception:
+            logger.exception("Failed to fetch image")
+            await route.abort()
+        else:
+            await route.fulfill(
+                status=resp.status_code,
+                headers=dict(resp.headers),
+                body=resp.content,
+            )
+
+    async def root_router(route: Route, _: Request):
+        await route.fulfill(
+            status=200,
+            headers={"Content-Type": "text/html"},
+            body=html,
+        )
+
+    async with get_new_page() as page:
+        await page.route(ROUTE_BASE_URL, root_router)
+        await page.route(ROUTE_IMAGE_URL, bg_router)
+        await page.goto(ROUTE_BASE_URL)
+        await page.wait_for_selector("#done", state="attached")
+
+        elem = await page.query_selector(".bg-wrapper")
+        assert elem
+        return await elem.screenshot(type="jpeg")

nonebot_plugin_cnrail-0.2.2.dev1/nonebot_plugin_cnrail/models.py

@@ -0,0 +1,122 @@
+from datetime import datetime, timedelta
+from typing import List, Optional, Union
+from nonebot.log import logger
+import pytz
+from pydantic import BaseModel, Field
+
+TZ_SHANGHAI = pytz.timezone("Asia/Shanghai")
+
+
+class TrainSearchData(BaseModel):
+    train_index: int = Field(alias="trainIndex")
+    train_number: str = Field(alias="trainNumber")
+    begin_station_name: str = Field(alias="beginStationName")
+    departure_time: str = Field(alias="departureTime")
+    end_station_name: str = Field(alias="endStationName")
+    arrival_time: str = Field(alias="arrivalTime")
+    day_count: int = Field(alias="dayCount")
+    duration_minutes: int = Field(alias="durationMinutes")
+    distance: int = Field(alias="distance")
+    train_type: str = Field(alias="trainType")
+    cr_type: int = Field(alias="crType")
+    out_of_date_flag: int = Field(alias="outOfDateFlag")
+
+    @property
+    def pass_time(self) -> str:
+        start_datetime = datetime.strptime(self.departure_time, "%H:%M")
+        end_datetime = datetime.strptime(self.arrival_time, "%H:%M")
+        if end_datetime < start_datetime:
+            end_datetime += timedelta(days=1)
+        time_difference = end_datetime - start_datetime
+        return f"{(str(self.day_count - 1 + time_difference.days) + ' 天') if (self.day_count - 1 + time_difference.days) > 0 else ''} {time_difference.seconds // 3600} 时 {time_difference.seconds % 3600 // 60} 分"
+
+
+class TrainSearchResult(BaseModel):
+    page_index: int = Field(alias="pageIndex")
+    page_size: int = Field(alias="pageSize")
+    total_pages: int = Field(alias="totalPages")
+    total_count: int = Field(alias="totalCount")
+    data: List[TrainSearchData]
+
+
+class TrainDetailviaSation(BaseModel):
+    station_name: str = Field(alias="stationName")
+    station_telegram_code: Optional[str] = Field(alias="stationTelegramCode")
+    train_number: str = Field(alias="trainNumber")
+    arrival_time: Optional[str] = Field(alias="arrivalTime")
+    departure_time: Optional[str] = Field(alias="departureTime")
+    stop_minutes: int = Field(alias="stopMinutes")
+    distance: int
+    checkout_name: Optional[str] = Field(alias="checkoutName")
+    speed: Optional[int]
+    day_index: int = Field(alias="dayIndex")
+    company_name: str = Field(alias="companyName")
+    province: str
+    district: str
+    out_of_date_flag: int = Field(alias="outOfDateFlag")
+    is_turn: bool = Field(alias="isTurn")
+
+
+class TrainDetailRoutingItem(BaseModel):
+    train_number: str = Field(alias="trainNumber")
+    begin_station_name: str = Field(alias="beginStationName")
+    departure_time: str = Field(alias="departureTime")
+    end_station_name: str = Field(alias="endStationName")
+    arrival_time: str = Field(alias="arrivalTime")
+
+
+class TrainDetailRoutingMissingItem(BaseModel):
+    train_number: str = Field(alias="trainNumber")
+    begin_station_name: Optional[str] = Field(alias="beginStationName")
+    departure_time: Optional[str] = Field(alias="departureTime")
+    end_station_name: Optional[str] = Field(alias="endStationName")
+    arrival_time: Optional[str] = Field(alias="arrivalTime")
+
+
+class TrainDetailRouing(BaseModel):
+    routing_items: List[
+        Union[TrainDetailRoutingItem, TrainDetailRoutingMissingItem]
+    ] = Field(alias="routingItems")
+    train_model: str = Field(alias="trainModel")
+
+
+class TrainDetailData(BaseModel):
+    train_number: str = Field(alias="trainNumber")
+    train_type: str = Field(alias="trainType")
+    company_name: str = Field(alias="companyName")
+    food_coach_name: Optional[str] = Field(alias="foodCoachName")
+    via_stations: List[TrainDetailviaSation] = Field(alias="viaStations")
+    cr_type: int = Field(alias="crType")
+    routing: TrainDetailRouing
+
+    def arrived(self, station_index: int, train_date: str) -> bool:  # 有待修改
+        logger.debug(f"index: {station_index}, date: {train_date}")
+        station = self.via_stations[station_index]
+        arrive_time_str = (
+            station.arrival_time
+            if station.arrival_time is not None
+            else station.departure_time
+        )
+        arrive_datetime = (
+            datetime.fromisoformat(
+                f"{train_date}T{arrive_time_str}",
+            )
+            + timedelta(days=station.day_index)
+        ).replace(tzinfo=TZ_SHANGHAI)
+        logger.debug(
+            f"arrive: {arrive_time_str}, arrive_datetime: {arrive_datetime}, now: {datetime.now(TZ_SHANGHAI)}, bool: {datetime.now(TZ_SHANGHAI) >= arrive_datetime}",
+        )
+        return datetime.now(TZ_SHANGHAI) >= arrive_datetime
+
+
+class TrainSNData(BaseModel):
+    train_sn: str = Field(alias="trainSN")
+    date: str
+    train_number: str = Field(alias="trainNumber")
+
+
+class ReturnData(BaseModel):
+    search: TrainSearchData
+    datail: TrainDetailData
+    sn: Optional[List[TrainSNData]]
+    train_date: str

{nonebot_plugin_cnrail-0.2.0 → nonebot_plugin_cnrail-0.2.2.dev1}/nonebot_plugin_cnrail/templates/train_table.html.jinja

@@ -180,15 +180,14 @@
       border-top: 1px solid var(--split-line-color);
       margin: 10px 20px;
       padding-top: 10px;
-      display: flex;
-      justify-content: space-between;
+      line-height: 1.7;
     }
 
     .admin,
     .emu_no {
-        font-size: 12px;
-        color: var(--top-sub-color);
-        text-align: left;
+      font-size: 12px;
+      color: var(--top-sub-color);
+      text-align: left;
     }
 
     .card-bottom {
@@ -289,46 +288,38 @@
     <div class="main">
       <div class="card-top">
         <div class="card-title">
-          {{ " / ".join(info.station_train_codes) }}
+          {{ summary.train_number }}
         </div>
         <div class="station">
           <div class="station-top">
             <div class="departure-station">
-              <div class="place">{{ info.summary.from_station }}</div>
+              <div class="place">{{ summary.begin_station_name }}</div>
               <div class="time">
                 <div class="departure-mark">始</div>
-                {{ info.stations[0].start_time }}
+                {{ summary.departure_time }}
               </div>
             </div>
             <div class="arrow-box">
-              {% set total_time = info.total_time -%}
-              {%- if info.arrive_next_day -%}
-              <div class="duration">历时 {{ total_time[0] }} 时 {{ total_time[1] }} 分</div>
+              <div class="duration">历时 {{ summary.pass_time }}</div>
               <div class="arrow-icon">
                 <div class="line"></div>
                 <div class="triangle"></div>
               </div>
-              {%- else -%}
-              <div class="date">{{ info.date_summary }}</div>
-              <div class="arrow-icon">
-                <div class="line"></div>
-                <div class="triangle"></div>
-              </div>
-              <div class="duration">历时 {{ total_time[0] }} 时 {{ total_time[1] }} 分</div>
-              {%- endif %}
             </div>
             <div class="terminal-station">
-              <div class="place">{{ info.summary.to_station }}</div>
+              <div class="place">{{ summary.end_station_name }}</div>
               <div class="time">
-                {{ info.stations[-1].arrive_time }}
+                {{ summary.arrival_time }}
                 <div class="terminal-mark">终</div>
               </div>
             </div>
           </div>
           <div class="station-bottom">
-            <div class="admin">担当路局：{{ info.maintancer }}</div>
-            {%- if info.emu_no -%}
-            <div class="emu_no">车组号：{{ info.emu_no }}</div>
+            <div class="admin">担当路局：{{ detail.company_name }}</div>
+            {%- if sn -%}
+            <div class="emu_no">车组号：{{ sn }}</div>
+            {%- else -%}
+            <div class="emu_no">列车型号：{{ detail.routing.train_model }}</div>
             {%- endif %}
           </div>
         </div>
@@ -349,22 +340,21 @@
               </tr>
             </thead>
             <tbody>
-              {% for station in info.stations -%}
+              {% for station in detail.via_stations -%}
               <tr>
                 <td>
-                  <div class="station-point{% if info.arrived(loop.index0) %} arrived{% endif %}"></div>
+
+                  <div class="station-point{% if detail.arrived(loop.index0, train_date) %} arrived{% endif %}"></div>
                 </td>
                 <td>{{ station.station_name }}</td>
                 <td>
-                  {%- if station.start_time.startswith("-") %}{{ station.arrive_time }}
-                  {%- else %}{{ station.start_time }}{% endif -%}
+                  {% if loop.first %}-{% else %}{{ station.arrival_time}}{% endif %}
                 </td>
                 <td>
-                  {%- if station.arrive_time.startswith("-") %}{{ station.start_time }}
-                  {%- else %}{{ station.arrive_time }}{% endif -%}
+                  {% if loop.last %}-{% else %}{{ station.departure_time }}{% endif %}
                 </td>
-                <td>{% if loop.first %}始发站{% elif loop.last %}终点站{% else %}{{ station.stay_minutes }} 分{% endif %}</td>
-                <td>{{ station.station_train_code }}</td>
+                <td>{% if loop.first %}始发站{% elif loop.last %}终点站{% else %}{{ station.stop_minutes }} 分{% endif %}</td>
+                <td>{{ station.train_number }}</td>
               </tr>
               {% endfor -%}
             </tbody>
@@ -595,4 +585,4 @@
   main();
 </script>
 
-</html>
+</html>

{nonebot_plugin_cnrail-0.2.0 → nonebot_plugin_cnrail-0.2.2.dev1}/pyproject.toml

@@ -9,14 +9,14 @@ authors = [
 dependencies = [
     "nonebot2>=2.2.0",
     "httpx>=0.24",
-    "nonebot-plugin-alconna>=0.40.0rc1",
+    "nonebot-plugin-alconna>=0.40.1",
     "nonebot-plugin-htmlrender>=0.2.2",
     "jinja2>=3.1.2",
     "pytz>=2023.3.post1",
 ]
 requires-python = ">=3.9,<4.0"
 readme = "README.md"
-version = "0.2.0"
+version = "0.2.2.dev1"
 
 [project.license]
 text = "MIT"

nonebot_plugin_cnrail-0.2.0/nonebot_plugin_cnrail/config.py

@@ -1,9 +0,0 @@
-from nonebot import get_plugin_config
-from pydantic import BaseModel
-
-
-class ConfigModel(BaseModel):
-    pass
-
-
-config = get_plugin_config(ConfigModel)

nonebot_plugin_cnrail-0.2.0/nonebot_plugin_cnrail/data_source.py

@@ -1,202 +0,0 @@
-from datetime import datetime
-from pathlib import Path
-from typing import List, Optional
-
-import httpx
-import jinja2
-import pytz
-from nonebot import logger
-from nonebot.compat import type_validate_python
-from nonebot_plugin_htmlrender import get_new_page
-from playwright.async_api import Request, Route
-
-from .models import TrainInfo, TrainStation, TrainSummary
-
-CHINA_RAIL_SEARCH_API = "https://search.12306.cn/search/v1/train/search"
-CHINA_RAIL_DETAIL_API = "https://kyfw.12306.cn/otn/queryTrainInfo/query"
-RAIL_RE_API = "https://api.rail.re/"
-
-CNRAIL_DATA_BASE_URL = "https://cnrail-data.baka.pub/data/"
-
-ACG_IMAGE_URL = "https://www.loliapi.com/acg/pe/"
-
-TEMPLATE_PATH = Path(__file__).parent / "templates" / "train_table.html.jinja"
-
-ROUTE_BASE_URL = "https://cnrail.nonebot/"
-ROUTE_IMAGE_URL = f"{ROUTE_BASE_URL}image"
-
-TZ_SHANGHAI = pytz.timezone("Asia/Shanghai")
-
-
-class MultipleTrainFoundError(Exception):
-    def __init__(self, trains: List[TrainSummary]) -> None:
-        self.trains = trains
-        super().__init__(trains)
-
-
-async def query_emu_from_train_code(train_code: str) -> Optional[List]:
-    async with httpx.AsyncClient(base_url=RAIL_RE_API, follow_redirects=True) as client:
-        resp = await client.get(f"/train/{train_code}")
-        resp.raise_for_status()
-
-    data = resp.json()
-    if not data:
-        return None
-
-    return data
-
-
-async def query_emu_from_emu_no(emu_no: str) -> Optional[List]:
-    async with httpx.AsyncClient(base_url=RAIL_RE_API, follow_redirects=True) as client:
-        resp = await client.get(f"/emu/{emu_no}")
-        resp.raise_for_status()
-
-    data = resp.json()
-    if not data:
-        return None
-
-    return data
-
-
-async def query_train_info(train_code: str, train_date: str) -> Optional[TrainInfo]:
-    train_code = train_code.upper()
-
-    async def get_search_data(train_code: str, train_date: str) -> Optional[List]:
-        async with httpx.AsyncClient(follow_redirects=True) as client:
-            resp = await client.get(
-                CHINA_RAIL_SEARCH_API,
-                params={
-                    "keyword": train_code,
-                    "date": train_date.replace("-", ""),
-                },
-            )
-            resp.raise_for_status()
-
-        return resp.json()["data"]
-
-    raw_data = await get_search_data(train_code=train_code, train_date=train_date)
-    if not raw_data:
-        async with httpx.AsyncClient(
-            base_url=CNRAIL_DATA_BASE_URL,
-            follow_redirects=True,
-        ) as client:
-            resp = await client.get("/alias.json")
-            resp.raise_for_status()
-
-        try:
-            train_code = resp.json()[train_code]
-        except KeyError:
-            return None
-
-        raw_data = await get_search_data(train_code=train_code, train_date=train_date)
-        if not raw_data:
-            return None
-
-    data = type_validate_python(List[TrainSummary], raw_data)
-    if len(data) > 1:
-        summary = next(
-            (train for train in data if train.station_train_code == train_code),
-            None,
-        )
-        if not summary:
-            raise MultipleTrainFoundError(data)
-    else:
-        summary = data[0]
-
-    if summary.station_train_code != train_code:
-        return None
-
-    async with httpx.AsyncClient(follow_redirects=True) as client:
-        resp = await client.get(
-            CHINA_RAIL_DETAIL_API,
-            params={
-                "leftTicketDTO.train_no": summary.train_no,
-                "leftTicketDTO.train_date": train_date,
-                "rand_code": "",
-            },
-        )
-        resp.raise_for_status()
-
-    raw_data = resp.json()["data"]["data"]
-    if not raw_data:
-        return None
-
-    stations = type_validate_python(List[TrainStation], raw_data)
-
-    async with httpx.AsyncClient(
-        base_url=CNRAIL_DATA_BASE_URL,
-        follow_redirects=True,
-    ) as client:
-        resp = await client.get("/maintance.json")
-        resp.raise_for_status()
-
-    maintancer = resp.json()[train_code]
-
-    today_date = datetime.now(TZ_SHANGHAI).date()
-    train_date_obj = (
-        datetime.strptime(train_date, "%Y-%m-%d").replace(tzinfo=TZ_SHANGHAI).date()
-    )
-
-    emu_no = None
-
-    if (train_date_obj <= today_date) and (
-        emu_data := await query_emu_from_train_code(train_code)
-    ):
-        for i in emu_data:
-            date_data = (
-                datetime.strptime(i["date"], "%Y-%m-%d %H:%M")
-                .replace(tzinfo=TZ_SHANGHAI)
-                .date()
-            )
-            if date_data == train_date_obj:
-                emu_no = i["emu_no"]
-                break
-
-    return TrainInfo(
-        summary=summary,
-        stations=stations,
-        maintancer=maintancer,
-        emu_no=emu_no,
-    )
-
-
-async def render_train_info(info: TrainInfo) -> bytes:
-    template = jinja2.Template(
-        TEMPLATE_PATH.read_text(encoding="u8"),
-        enable_async=True,
-    )
-    html = await template.render_async(info=info)
-    if (dbg := Path.cwd() / "cnrail-debug.html").exists():
-        dbg.write_text(html, encoding="u8")
-
-    async def bg_router(route: Route, _: Request):
-        async with httpx.AsyncClient(follow_redirects=True) as client:
-            resp = await client.get(ACG_IMAGE_URL)
-        try:
-            resp.raise_for_status()
-        except Exception:
-            logger.exception("Failed to fetch image")
-            await route.abort()
-        else:
-            await route.fulfill(
-                status=resp.status_code,
-                headers=dict(resp.headers),
-                body=resp.content,
-            )
-
-    async def root_router(route: Route, _: Request):
-        await route.fulfill(
-            status=200,
-            headers={"Content-Type": "text/html"},
-            body=html,
-        )
-
-    async with get_new_page() as page:
-        await page.route(ROUTE_BASE_URL, root_router)
-        await page.route(ROUTE_IMAGE_URL, bg_router)
-        await page.goto(ROUTE_BASE_URL)
-        await page.wait_for_selector("#done", state="attached")
-
-        elem = await page.query_selector(".bg-wrapper")
-        assert elem
-        return await elem.screenshot(type="jpeg")

nonebot_plugin_cnrail-0.2.0/nonebot_plugin_cnrail/models.py

@@ -1,102 +0,0 @@
-from datetime import datetime, timedelta
-from typing import Any, List, Optional, Tuple, cast
-
-import pytz
-from pydantic import BaseModel, Field, PrivateAttr
-
-TZ_SHANGHAI = pytz.timezone("Asia/Shanghai")
-
-
-class TrainSummary(BaseModel):
-    date: str
-    from_station: str
-    station_train_code: str
-    to_station: str
-    total_num: str
-    train_no: str
-
-    @property
-    def date_iso(self) -> str:
-        return f"{self.date[:4]}-{self.date[4:6]}-{self.date[6:]}"
-
-    @property
-    def word(self) -> str:
-        return f"{self.station_train_code} {self.from_station}-{self.to_station} | 途经 {self.total_num} 站"
-
-
-class TrainStation(BaseModel):
-    arrive_day_str: str
-    arrive_time: str
-    station_train_code: str
-    station_name: str
-    arrive_day_diff: str
-    OT: List[Any] = Field(default_factory=list)
-    start_time: str
-    wz_num: str
-    station_no: str
-    running_time: str
-
-    @property
-    def stay_minutes(self) -> int:
-        arrive_t = datetime.strptime(self.arrive_time, "%H:%M").replace(
-            tzinfo=TZ_SHANGHAI,
-        )
-        start_t = datetime.strptime(self.start_time, "%H:%M").replace(
-            tzinfo=TZ_SHANGHAI,
-        )
-        if arrive_t > start_t:
-            start_t += timedelta(days=1)
-        return (start_t - arrive_t).seconds // 60
-
-
-class TrainInfo(BaseModel):
-    summary: TrainSummary
-    stations: List[TrainStation]
-    maintancer: str
-    emu_no: Optional[str]
-
-    _arrive_next_day: Optional[bool] = PrivateAttr(None)
-
-    @property
-    def station_train_codes(self) -> List[str]:
-        codes = []
-        for x in (x for x in self.stations if x.station_train_code not in codes):
-            codes.append(x.station_train_code)  # noqa: PERF401
-        return codes
-
-    @property
-    def total_time(self) -> Tuple[int, int]:
-        return cast(
-            Any,
-            tuple(int(x) for x in self.stations[-1].running_time.split(":")),
-        )
-
-    @property
-    def date_summary(self) -> str:
-        week_names = ["一", "二", "三", "四", "五", "六", "日"]
-        date = datetime.fromisoformat(self.summary.date_iso)
-        return f"{date.month} 月 {date.day} 日 周{week_names[date.weekday()]}"
-
-    @property
-    def arrive_next_day(self) -> bool:
-        if self._arrive_next_day is None:
-            self._arrive_next_day = bool(
-                next((x for x in self.stations if int(x.arrive_day_diff) > 0), None),
-            )
-        return self._arrive_next_day
-
-    def arrived(self, station_index: int) -> bool:
-        # 不在今日到达的车次，拿不到始发日期，摆烂了
-        if self.arrive_next_day:
-            return True
-
-        station = self.stations[station_index]
-        arrive_time_str = (
-            station.arrive_time if ":" in station.arrive_time else station.start_time
-        )
-        arrive_datetime = datetime.fromisoformat(
-            f"{self.summary.date_iso}T{arrive_time_str}",
-        ).replace(tzinfo=TZ_SHANGHAI)
-        # if (day_diff := int(station.arrive_day_diff)) > 0:
-        #     arrive_time += timedelta(days=day_diff)
-        return datetime.now(TZ_SHANGHAI) >= arrive_datetime