remove nested filters (#1843)

* remove nested filters

* remove from openapi schema aswell
This commit is contained in:
jackstar12
2023-07-31 10:21:30 +02:00
committed by GitHub
parent 7f0c7138af
commit 67d3a4f359
2 changed files with 7 additions and 40 deletions
+2 -15
View File
@@ -4,11 +4,7 @@ from typing import Any, List, Optional, Type
import jinja2
import shortuuid
from pydantic.schema import (
field_schema,
get_flat_models_from_fields,
get_model_name_map,
)
from pydantic.schema import field_schema
from lnbits.jinja2_templating import Jinja2Templates
from lnbits.requestvars import g
@@ -102,20 +98,11 @@ def generate_filter_params_openapi(model: Type[FilterModel], keep_optional=False
:param keep_optional: If false, all parameters will be optional, otherwise inferred from model
"""
fields = list(model.__fields__.values())
models = get_flat_models_from_fields(fields, set())
namemap = get_model_name_map(models)
params = []
for field in fields:
schema, definitions, _ = field_schema(field, model_name_map=namemap)
# Support nested definition
if "$ref" in schema:
name = schema["$ref"].split("/")[-1]
schema = definitions[name]
schema, _, _ = field_schema(field, model_name_map={})
description = "Supports Filtering"
if schema["type"] == "object":
description += f". Nested attributes can be filtered too, e.g. `{field.alias}.[additional].[attributes]`"
if (
hasattr(model, "__search_fields__")
and field.name in model.__search_fields__