mirror of
https://github.com/searxng/searxng.git
synced 2024-11-25 20:31:00 +00:00
[refactor] replace pydantic by msgspec
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
e392892578
commit
3e5621e1af
4 changed files with 25 additions and 22 deletions
|
@ -16,6 +16,6 @@ redis==5.0.8
|
||||||
markdown-it-py==3.0.0
|
markdown-it-py==3.0.0
|
||||||
fasttext-predict==0.9.2.2
|
fasttext-predict==0.9.2.2
|
||||||
tomli==2.0.2; python_version < '3.11'
|
tomli==2.0.2; python_version < '3.11'
|
||||||
pydantic==2.9.2
|
msgspec==0.18.6
|
||||||
eval_type_backport; python_version < '3.9'
|
eval_type_backport; python_version < '3.9'
|
||||||
typer-slim==0.12.5
|
typer-slim==0.12.5
|
||||||
|
|
|
@ -30,7 +30,7 @@ import tempfile
|
||||||
import time
|
import time
|
||||||
import typer
|
import typer
|
||||||
|
|
||||||
from pydantic import BaseModel
|
import msgspec
|
||||||
|
|
||||||
from searx import sqlitedb
|
from searx import sqlitedb
|
||||||
from searx import logger
|
from searx import logger
|
||||||
|
@ -90,7 +90,7 @@ def init(cfg: "FaviconCacheConfig"):
|
||||||
raise NotImplementedError(f"favicons db_type '{cfg.db_type}' is unknown")
|
raise NotImplementedError(f"favicons db_type '{cfg.db_type}' is unknown")
|
||||||
|
|
||||||
|
|
||||||
class FaviconCacheConfig(BaseModel):
|
class FaviconCacheConfig(msgspec.Struct): # pylint: disable=too-few-public-methods
|
||||||
"""Configuration of the favicon cache."""
|
"""Configuration of the favicon cache."""
|
||||||
|
|
||||||
db_type: Literal["sqlite", "mem"] = "sqlite"
|
db_type: Literal["sqlite", "mem"] = "sqlite"
|
||||||
|
|
|
@ -4,9 +4,8 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import pathlib
|
import pathlib
|
||||||
from pydantic import BaseModel
|
import msgspec
|
||||||
|
|
||||||
from searx.compat import tomllib
|
|
||||||
from .cache import FaviconCacheConfig
|
from .cache import FaviconCacheConfig
|
||||||
from .proxy import FaviconProxyConfig
|
from .proxy import FaviconProxyConfig
|
||||||
|
|
||||||
|
@ -19,7 +18,7 @@ TOML_CACHE_CFG: dict[str, "FaviconConfig"] = {}
|
||||||
DEFAULT_CFG_TOML_PATH = pathlib.Path(__file__).parent / "favicons.toml"
|
DEFAULT_CFG_TOML_PATH = pathlib.Path(__file__).parent / "favicons.toml"
|
||||||
|
|
||||||
|
|
||||||
class FaviconConfig(BaseModel):
|
class FaviconConfig(msgspec.Struct): # pylint: disable=too-few-public-methods
|
||||||
"""The class aggregates configurations of the favicon tools"""
|
"""The class aggregates configurations of the favicon tools"""
|
||||||
|
|
||||||
cfg_schema: int
|
cfg_schema: int
|
||||||
|
@ -28,10 +27,10 @@ class FaviconConfig(BaseModel):
|
||||||
By specifying a version, it is possible to ensure downward compatibility in
|
By specifying a version, it is possible to ensure downward compatibility in
|
||||||
the event of future changes to the configuration schema"""
|
the event of future changes to the configuration schema"""
|
||||||
|
|
||||||
cache: FaviconCacheConfig = FaviconCacheConfig()
|
cache: FaviconCacheConfig = FaviconCacheConfig
|
||||||
"""Setup of the :py:obj:`.cache.FaviconCacheConfig`."""
|
"""Setup of the :py:obj:`.cache.FaviconCacheConfig`."""
|
||||||
|
|
||||||
proxy: FaviconProxyConfig = FaviconProxyConfig()
|
proxy: FaviconProxyConfig = FaviconCacheConfig
|
||||||
"""Setup of the :py:obj:`.proxy.FaviconProxyConfig`."""
|
"""Setup of the :py:obj:`.proxy.FaviconProxyConfig`."""
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -45,18 +44,22 @@ class FaviconConfig(BaseModel):
|
||||||
return cached
|
return cached
|
||||||
|
|
||||||
with cfg_file.open("rb") as f:
|
with cfg_file.open("rb") as f:
|
||||||
|
data = f.read()
|
||||||
|
|
||||||
cfg = tomllib.load(f)
|
cfg = msgspec.toml.decode(data, type=_FaviconConfig)
|
||||||
cfg = cfg.get("favicons", cfg)
|
schema = cfg.favicons.cfg_schema
|
||||||
|
|
||||||
schema = cfg.get("cfg_schema")
|
|
||||||
if schema != CONFIG_SCHEMA:
|
if schema != CONFIG_SCHEMA:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"config schema version {CONFIG_SCHEMA} is needed, version {schema} is given in {cfg_file}"
|
f"config schema version {CONFIG_SCHEMA} is needed, version {schema} is given in {cfg_file}"
|
||||||
)
|
)
|
||||||
|
|
||||||
cfg = cls(**cfg)
|
cfg = cfg.favicons
|
||||||
if use_cache and cached:
|
if use_cache and cached:
|
||||||
TOML_CACHE_CFG[str(cfg_file.resolve())] = cfg
|
TOML_CACHE_CFG[str(cfg_file.resolve())] = cfg
|
||||||
|
|
||||||
return cfg
|
return cfg
|
||||||
|
|
||||||
|
|
||||||
|
class _FaviconConfig(msgspec.Struct): # pylint: disable=too-few-public-methods
|
||||||
|
# wrapper struct for root object "favicons."
|
||||||
|
favicons: FaviconConfig
|
||||||
|
|
|
@ -12,7 +12,7 @@ import urllib.parse
|
||||||
|
|
||||||
import flask
|
import flask
|
||||||
from httpx import HTTPError
|
from httpx import HTTPError
|
||||||
from pydantic import BaseModel
|
import msgspec
|
||||||
|
|
||||||
from searx import get_setting
|
from searx import get_setting
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ def _initial_resolver_map():
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
|
||||||
class FaviconProxyConfig(BaseModel):
|
class FaviconProxyConfig(msgspec.Struct):
|
||||||
"""Configuration of the favicon proxy."""
|
"""Configuration of the favicon proxy."""
|
||||||
|
|
||||||
max_age: int = 60 * 60 * 24 * 7 # seven days
|
max_age: int = 60 * 60 * 24 * 7 # seven days
|
||||||
|
@ -59,7 +59,7 @@ class FaviconProxyConfig(BaseModel):
|
||||||
outgoing request of the resolver. By default, the value from
|
outgoing request of the resolver. By default, the value from
|
||||||
:ref:`outgoing.request_timeout <settings outgoing>` setting is used."""
|
:ref:`outgoing.request_timeout <settings outgoing>` setting is used."""
|
||||||
|
|
||||||
resolver_map: dict[str, str] = _initial_resolver_map()
|
resolver_map: dict[str, str] = msgspec.field(default_factory=_initial_resolver_map)
|
||||||
"""The resolver_map is a key / value dictionary where the key is the name of
|
"""The resolver_map is a key / value dictionary where the key is the name of
|
||||||
the resolver and the value is the fully qualifying name (fqn) of resolver's
|
the resolver and the value is the fully qualifying name (fqn) of resolver's
|
||||||
function (the callable). The resolvers from the python module
|
function (the callable). The resolvers from the python module
|
||||||
|
|
Loading…
Reference in a new issue