fix compat

Author: lgc2333

nonebot_plugin_picmenu_next/data_source/collect.py

@@ -60,7 +60,11 @@ async def get_info_from_plugin(plugin: Plugin) -> PMNPluginInfo:
     extra: PMNPluginExtra | None = None
     if meta:
         with warning_suppress(f"Failed to parse plugin metadata of {plugin.id_}"):
-            extra = type_validate_python(PMNPluginExtra, meta.extra)
+            metadata_extra = {
+                kl if (kl := key.lower()) == "author" else key: value
+                for key, value in meta.extra.items()
+            }
+            extra = type_validate_python(PMNPluginExtra, metadata_extra)
 
     name = normalize_plugin_name(meta.name if meta else plugin.id_)
 

nonebot_plugin_picmenu_next/data_source/mixin.py

@@ -1,7 +1,14 @@
 from collections import defaultdict
-from collections.abc import Callable, Coroutine, Sequence
+from collections.abc import Coroutine, Sequence
 from dataclasses import dataclass
-from typing import Any, Concatenate, Generic, TypeAlias, TypeVar
+from typing import (  # noqa: UP035 - Python 3.10 compat
+    Any,
+    Callable,
+    Concatenate,
+    Generic,
+    TypeAlias,
+    TypeVar,
+)
 from typing_extensions import ParamSpec
 
 from cookit import DecoListCollector

nonebot_plugin_picmenu_next/data_source/models.py

@@ -8,7 +8,6 @@
     model_fields_set,
     model_validator,
     model_with_model_config,
-    type_dump_python,
 )
 from nonebot import get_plugin
 from nonebot.plugin import Plugin
@@ -96,19 +95,6 @@ class PMNPluginExtra(CompatModel):
     menu_data: list[PMDataItem] | None = None
     pmn: PMNData | None = None
 
-    @model_validator(mode="before")
-    def normalize_input(cls, values: Any):  # noqa: N805
-        if isinstance(values, PMNPluginExtra):
-            values = type_dump_python(values, exclude_unset=True)
-        if not isinstance(values, dict):
-            raise TypeError(f"Expected dict, got {type(values)}")
-        should_normalize_keys = {x for x in values if x.lower() == "author"}
-        for key in should_normalize_keys:
-            value = values[key]
-            del values[key]
-            values[key.lower()] = value
-        return values
-
 
 class OptionalPMNPluginInfo(CompatModel):
     name: str | None = None
@@ -175,12 +161,14 @@ class ExternalPluginInfo(CompatModel):
     pmn: ExternalPMNData = ExternalPMNData()
     supported_adapters: set[str] | None = None
 
-    @model_validator(mode="after")
-    def normalize_input(cls, values: dict[str, Any]):  # noqa: N805
+    @model_validator(mode="before")
+    def normalize_input(cls, values: Any):  # noqa: N805
         # these params cannot be explicitly none
+        if not isinstance(values, dict):
+            return values
         for key in ("name", "funcs"):
             if key in values and values[key] is None:
-                raise TypeError(f"`{key}` cannot be null")
+                raise ValueError(f"`{key}` cannot be null")
         return values
 
     def has_func_override(self) -> bool:

pyproject.toml

@@ -7,7 +7,7 @@ dependencies = [
     "nonebot2>=2.5.0",
     "nonebot-plugin-alconna>=0.62.1",
     "nonebot-plugin-localstore>=0.7.4",
-    "cookit[jinja,loguru,nonebot-alconna,nonebot-localstore,pw,pyd]>=0.13.3",
+    "cookit[jinja,loguru,nonebot-alconna,nonebot-localstore,pw,pyd]>=0.14.0",
     "pypinyin>=0.55.0",
     "jieba>=0.42.1",
     "thefuzz>=0.22.1",

tests_nbp_picmenu_next/data_source/test_collect.py

@@ -136,6 +136,26 @@ async def test_plugin_metadata_falls_back_to_distribution_version_and_author(
     assert info.author == "Alice"
 
 
+async def test_plugin_metadata_normalizes_picmenu_extra_at_collection_boundary(
+    picmenu_plugin: object,
+) -> None:
+    """Collection accepts the legacy capitalized author key in metadata extras."""
+    from nonebot_plugin_picmenu_next.data_source import collect
+
+    metadata = PluginMetadata(
+        name="Capitalized Author",
+        description="description",
+        usage="usage",
+        extra={"Author": "Alice"},
+    )
+
+    info = await collect.get_info_from_plugin(
+        make_plugin("capitalized_author", metadata),
+    )
+
+    assert info.author == "Alice"
+
+
 def test_collect_menus_loads_yaml_and_applies_or_appends_external_infos(
     picmenu_plugin: object,
     monkeypatch: "pytest.MonkeyPatch",
@@ -249,7 +269,7 @@ def test_external_config_rejects_disallowed_nulls(
     from pydantic import ValidationError
 
     for key in ("name", "funcs"):
-        with pytest.raises(TypeError, match=f"`{key}` cannot be null"):
+        with pytest.raises(ValidationError, match=f"`{key}` cannot be null"):
             type_validate_python(ExternalPluginInfo, {key: None})
 
     with pytest.raises(ValidationError):

tests_nbp_picmenu_next/data_source/test_mixin.py

@@ -6,6 +6,14 @@
 import pytest
 
 
+def test_mixin_type_aliases_resolve_at_runtime(picmenu_plugin: object) -> None:
+    """Mixin extension type aliases resolve while the plugin data source loads."""
+    from nonebot_plugin_picmenu_next.data_source import mixin
+
+    assert mixin.PluginCollectMixin is not None
+    assert mixin.SelfMixin is not None
+
+
 def test_self_mixin_registration_requires_an_owning_plugin(
     picmenu_plugin: object,
     monkeypatch: "pytest.MonkeyPatch",

tests_nbp_picmenu_next/data_source/test_models.py

@@ -98,23 +98,16 @@ def test_external_pmn_conversion_preserves_only_declared_display_options(
     assert converted.alc_force_enable_detect is False
 
 
-def test_model_validators_accept_model_instances_and_reject_non_mapping_input(
+def test_external_model_validator_rejects_non_mapping_input(
     picmenu_plugin: object,
 ) -> None:
-    """Both external schemas normalize model input but reject scalar configuration."""
+    """External configuration rejects scalar input before field validation."""
     from cookit.pyd import type_validate_python
-    from nonebot_plugin_picmenu_next.data_source.models import (
-        ExternalPluginInfo,
-        PMNPluginExtra,
-    )
+    from nonebot_plugin_picmenu_next.data_source.models import ExternalPluginInfo
 
-    extra = PMNPluginExtra(author="Alice")
     external = ExternalPluginInfo(name="External")
 
-    assert type_validate_python(PMNPluginExtra, extra).author == "Alice"
     assert type_validate_python(ExternalPluginInfo, external).name == "External"
-    with pytest.raises(TypeError, match="Expected dict"):
-        type_validate_python(PMNPluginExtra, 1)
     with pytest.raises(ValidationError):
         type_validate_python(ExternalPluginInfo, 1)