diff --git a/VERSION b/VERSION index 46b81d815a..d8b698973a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.11.0 +2.12.0 diff --git a/nucliadb/MANIFEST.in b/nucliadb/MANIFEST.in index 439e892b76..db7f159c37 100644 --- a/nucliadb/MANIFEST.in +++ b/nucliadb/MANIFEST.in @@ -3,7 +3,7 @@ include *.rst include *.txt include VERSION include nucliadb/py.typed -include nucliadb/static -include nucliadb/static/* +include nucliadb/standalone/static +include nucliadb/standalone/static/* include **/*.pb include **/*.png \ No newline at end of file diff --git a/nucliadb/nucliadb/reader/api/v1/resource.py b/nucliadb/nucliadb/reader/api/v1/resource.py index 50c117bd1b..9ebc7c0402 100644 --- a/nucliadb/nucliadb/reader/api/v1/resource.py +++ b/nucliadb/nucliadb/reader/api/v1/resource.py @@ -17,8 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -from typing import List, Literal, Optional, Union -from typing import get_args as typing_get_args +from typing import List, Optional, Union from fastapi import Header, HTTPException, Query, Request, Response from fastapi_versioning import version @@ -191,10 +190,6 @@ async def get_resource( return result -PageShortcuts = Literal["last", "first"] -PAGE_SHORTCUTS = typing_get_args(PageShortcuts) - - @api.get( f"/{KB_PREFIX}/{{kbid}}/{RSLUG_PREFIX}/{{rslug}}/{{field_type}}/{{field_id}}", status_code=200, @@ -229,7 +224,9 @@ async def get_resource_field( ExtractedDataTypeName.FILE, ] ), - page: Union[Literal["last", "first"], int] = Query("last"), + # not working with latest pydantic/fastapi + # page: Union[Literal["last", "first"], int] = Query("last"), + page: Union[str, int] = Query("last"), ) -> Response: storage = await get_storage(service_name=SERVICE_NAME) driver = await get_driver()