From ba51ce8b6dc70c92ef53fe457d5a9ccc9da0d8ec Mon Sep 17 00:00:00 2001 From: olaughter Date: Wed, 3 Apr 2024 11:47:00 +0100 Subject: [PATCH] Exclude passages from browse requests --- app/api/api_v1/routers/search.py | 1 + poetry.lock | 172 +++---------------------------- pyproject.toml | 2 +- 3 files changed, 15 insertions(+), 160 deletions(-) diff --git a/app/api/api_v1/routers/search.py b/app/api/api_v1/routers/search.py index 06b3bc23..8d4eb64e 100644 --- a/app/api/api_v1/routers/search.py +++ b/app/api/api_v1/routers/search.py @@ -50,6 +50,7 @@ def _search_request(db: Session, search_body: SearchRequestBody) -> SearchRespon is_browse_request = not search_body.query_string if is_browse_request: search_body.all_results = True + search_body.documents_only = True search_body.exact_match = False data_access_search_params = create_vespa_search_params(db, search_body) try: diff --git a/poetry.lock b/poetry.lock index 50bc6f1e..e37fef82 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,9 @@ -# This file is automatically @generated by Poetry and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "aiohttp" version = "3.9.3" description = "Async http client/server framework (asyncio)" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -101,7 +100,6 @@ speedups = ["Brotli", "aiodns", "brotlicffi"] name = "aiosignal" version = "1.3.1" description = "aiosignal: a list of registered asynchronous callbacks" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -116,7 +114,6 @@ frozenlist = ">=1.1.0" name = "alembic" version = "1.13.1" description = "A database migration tool for SQLAlchemy." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -136,7 +133,6 @@ tz = ["backports.zoneinfo"] name = "alembic-utils" version = "0.8.2" description = "A sqlalchemy/alembic extension for migrating procedures and views" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -159,7 +155,6 @@ nvim = ["neovim", "python-language-server"] name = "annotated-types" version = "0.6.0" description = "Reusable constraint types to use with typing.Annotated" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -171,7 +166,6 @@ files = [ name = "anyio" version = "3.7.1" description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -193,7 +187,6 @@ trio = ["trio (<0.22)"] name = "apscheduler" version = "3.10.4" description = "In-process task scheduler with Cron-like capabilities" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -204,7 +197,7 @@ files = [ [package.dependencies] pytz = "*" six = ">=1.4.0" -tzlocal = ">=2.0,<3.0.0 || >=4.0.0" +tzlocal = ">=2.0,<3.dev0 || >=4.dev0" [package.extras] doc = ["sphinx", "sphinx-rtd-theme"] @@ -222,7 +215,6 @@ zookeeper = ["kazoo"] name = "async-timeout" version = "4.0.3" description = "Timeout context manager for asyncio programs" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -234,7 +226,6 @@ files = [ name = "attrs" version = "23.2.0" description = "Classes Without Boilerplate" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -254,7 +245,6 @@ tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "p name = "authlib" version = "0.15.6" description = "The ultimate Python library in building OAuth and OpenID Connect servers." -category = "main" optional = false python-versions = "*" files = [ @@ -272,7 +262,6 @@ client = ["requests"] name = "aws-error-utils" version = "2.7.0" description = "Error-handling functions for boto3/botocore" -category = "main" optional = false python-versions = ">=3.7,<4" files = [ @@ -287,7 +276,6 @@ botocore = "*" name = "bcrypt" version = "3.2.2" description = "Modern password hashing for your software and your servers" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -315,7 +303,6 @@ typecheck = ["mypy"] name = "black" version = "23.12.1" description = "The uncompromising code formatter." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -362,7 +349,6 @@ uvloop = ["uvloop (>=0.15.2)"] name = "boto3" version = "1.34.75" description = "The AWS SDK for Python" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -382,7 +368,6 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] name = "botocore" version = "1.34.75" description = "Low-level, data-driven core of boto 3." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -405,7 +390,6 @@ crt = ["awscrt (==0.19.19)"] name = "certifi" version = "2024.2.2" description = "Python package for providing Mozilla's CA Bundle." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -417,7 +401,6 @@ files = [ name = "cffi" version = "1.16.0" description = "Foreign Function Interface for Python calling C code." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -482,7 +465,6 @@ pycparser = "*" name = "cfgv" version = "3.4.0" description = "Validate configuration and produce human readable error messages." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -494,7 +476,6 @@ files = [ name = "charset-normalizer" version = "3.3.2" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -594,7 +575,6 @@ files = [ name = "click" version = "8.1.7" description = "Composable command line interface toolkit" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -609,7 +589,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -619,9 +598,8 @@ files = [ [[package]] name = "cpr-data-access" -version = "0.5.6" +version = "0.5.8" description = "" -category = "main" optional = false python-versions = "^3.9" files = [] @@ -649,14 +627,13 @@ vespa = ["pyvespa (>=0.37.1,<0.38.0)", "pyyaml (>=6.0.1,<7.0.0)", "sentence-tran [package.source] type = "git" url = "https://github.com/climatepolicyradar/data-access.git" -reference = "v0.5.6" -resolved_reference = "aa80fdea1f6de27968d806f52a541410ebff0e4b" +reference = "v0.5.8" +resolved_reference = "88713808fc33a30b119c39c643faa00ca677fc68" [[package]] name = "cryptography" version = "42.0.5" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -711,7 +688,6 @@ test-randomorder = ["pytest-randomly"] name = "datasets" version = "2.18.0" description = "HuggingFace community-driven open-source library of datasets" -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -756,7 +732,6 @@ vision = ["Pillow (>=6.2.1)"] name = "db-client" version = "3.3.0" description = "All things to do with the datamodel and its storage. Including alembic migrations and datamodel code." -category = "main" optional = false python-versions = "^3.9" files = [] @@ -782,7 +757,6 @@ resolved_reference = "26311c40257ae4e85acc6d7d4d64e73400328b8e" name = "deprecation" version = "2.1.0" description = "A library to handle automated deprecations" -category = "main" optional = false python-versions = "*" files = [ @@ -797,7 +771,6 @@ packaging = "*" name = "dill" version = "0.3.8" description = "serialize all of Python" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -813,7 +786,6 @@ profile = ["gprof2dot (>=2022.7.29)"] name = "distlib" version = "0.3.8" description = "Distribution utilities" -category = "dev" optional = false python-versions = "*" files = [ @@ -825,7 +797,6 @@ files = [ name = "docker" version = "7.0.0" description = "A Python library for the Docker Engine API." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -847,7 +818,6 @@ websockets = ["websocket-client (>=1.3.0)"] name = "exceptiongroup" version = "1.2.0" description = "Backport of PEP 654 (exception groups)" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -862,7 +832,6 @@ test = ["pytest (>=6)"] name = "fastapi" version = "0.104.1" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -883,7 +852,6 @@ all = ["email-validator (>=2.0.0)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)" name = "fastapi-health" version = "0.4.0" description = "Heath check on FastAPI applications." -category = "main" optional = false python-versions = ">=3.6.1,<4.0.0" files = [ @@ -898,7 +866,6 @@ fastapi = ">=0.63.0" name = "fastapi-pagination" version = "0.12.21" description = "FastAPI pagination" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -934,7 +901,6 @@ tortoise = ["tortoise-orm (>=0.16.18,<0.21.0)"] name = "filelock" version = "3.13.3" description = "A platform independent file lock." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -951,7 +917,6 @@ typing = ["typing-extensions (>=4.8)"] name = "flupy" version = "1.2.0" description = "Method chaining built on generators" -category = "main" optional = false python-versions = "*" files = [ @@ -968,7 +933,6 @@ dev = ["black", "mypy", "pre-commit", "pylint", "pytest", "pytest-benchmark", "p name = "freezegun" version = "1.4.0" description = "Let your Python tests travel through time" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -983,7 +947,6 @@ python-dateutil = ">=2.7" name = "frozenlist" version = "1.4.1" description = "A list-like structure which implements collections.abc.MutableSequence" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1070,7 +1033,6 @@ files = [ name = "fsspec" version = "2024.2.0" description = "File-system specification" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1109,7 +1071,6 @@ tqdm = ["tqdm"] name = "greenlet" version = "3.0.3" description = "Lightweight in-process concurrent programming" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1181,7 +1142,6 @@ test = ["objgraph", "psutil"] name = "h11" version = "0.12.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1193,7 +1153,6 @@ files = [ name = "httpcore" version = "0.14.7" description = "A minimal low-level HTTP client." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1202,20 +1161,19 @@ files = [ ] [package.dependencies] -anyio = ">=3.0.0,<4.0.0" +anyio = "==3.*" certifi = "*" h11 = ">=0.11,<0.13" -sniffio = ">=1.0.0,<2.0.0" +sniffio = "==1.*" [package.extras] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] [[package]] name = "httptools" version = "0.6.1" description = "A collection of framework independent HTTP protocol utils." -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -1264,7 +1222,6 @@ test = ["Cython (>=0.29.24,<0.30.0)"] name = "httpx" version = "0.22.0" description = "The next generation HTTP client." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1281,15 +1238,14 @@ sniffio = "*" [package.extras] brotli = ["brotli", "brotlicffi"] -cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10.0.0,<11.0.0)"] +cli = ["click (==8.*)", "pygments (==2.*)", "rich (==10.*)"] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] [[package]] name = "huggingface-hub" version = "0.22.2" description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub" -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -1324,7 +1280,6 @@ typing = ["types-PyYAML", "types-requests", "types-simplejson", "types-toml", "t name = "identify" version = "2.5.35" description = "File identification library for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1339,7 +1294,6 @@ license = ["ukkonen"] name = "idna" version = "3.6" description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -1351,7 +1305,6 @@ files = [ name = "iniconfig" version = "2.0.0" description = "brain-dead simple config-ini parsing" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1363,7 +1316,6 @@ files = [ name = "itsdangerous" version = "2.1.2" description = "Safely pass data to untrusted environments and back." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1375,7 +1327,6 @@ files = [ name = "jinja2" version = "3.1.3" description = "A very fast and expressive template engine." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1393,7 +1344,6 @@ i18n = ["Babel (>=2.7)"] name = "jmespath" version = "1.0.1" description = "JSON Matching Expressions" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1405,7 +1355,6 @@ files = [ name = "joblib" version = "1.3.2" description = "Lightweight pipelining with Python functions" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1417,7 +1366,6 @@ files = [ name = "json-logging" version = "1.3.0" description = "JSON Python Logging" -category = "main" optional = false python-versions = "*" files = [ @@ -1429,7 +1377,6 @@ files = [ name = "langdetect" version = "1.0.9" description = "Language detection library ported from Google's language-detection." -category = "main" optional = false python-versions = "*" files = [ @@ -1444,7 +1391,6 @@ six = "*" name = "mako" version = "1.3.2" description = "A super-fast templating language that borrows the best ideas from the existing templating languages." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1464,7 +1410,6 @@ testing = ["pytest"] name = "markupsafe" version = "2.1.5" description = "Safely add untrusted strings to HTML/XML markup." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1534,7 +1479,6 @@ files = [ name = "moto" version = "3.1.19" description = "A library that allows your python tests to easily mock out the boto library" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -1584,7 +1528,6 @@ xray = ["aws-xray-sdk (>=0.93,!=0.96)", "setuptools"] name = "mpmath" version = "1.3.0" description = "Python library for arbitrary-precision floating-point arithmetic" -category = "main" optional = false python-versions = "*" files = [ @@ -1602,7 +1545,6 @@ tests = ["pytest (>=4.6)"] name = "multidict" version = "6.0.5" description = "multidict implementation" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1702,7 +1644,6 @@ files = [ name = "multiprocess" version = "0.70.16" description = "better multiprocessing and multithreading in Python" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1727,7 +1668,6 @@ dill = ">=0.3.8" name = "mypy-extensions" version = "1.0.0" description = "Type system extensions for programs checked with the mypy type checker." -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1739,7 +1679,6 @@ files = [ name = "networkx" version = "3.2.1" description = "Python package for creating and manipulating graphs and networks" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -1758,7 +1697,6 @@ test = ["pytest (>=7.2)", "pytest-cov (>=4.0)"] name = "nodeenv" version = "1.8.0" description = "Node.js virtual environment builder" -category = "dev" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" files = [ @@ -1773,7 +1711,6 @@ setuptools = "*" name = "numpy" version = "1.26.4" description = "Fundamental package for array computing in Python" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -1819,7 +1756,6 @@ files = [ name = "nvidia-cublas-cu12" version = "12.1.3.1" description = "CUBLAS native runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1831,7 +1767,6 @@ files = [ name = "nvidia-cuda-cupti-cu12" version = "12.1.105" description = "CUDA profiling tools runtime libs." -category = "main" optional = false python-versions = ">=3" files = [ @@ -1843,7 +1778,6 @@ files = [ name = "nvidia-cuda-nvrtc-cu12" version = "12.1.105" description = "NVRTC native runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1855,7 +1789,6 @@ files = [ name = "nvidia-cuda-runtime-cu12" version = "12.1.105" description = "CUDA Runtime native Libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1867,7 +1800,6 @@ files = [ name = "nvidia-cudnn-cu12" version = "8.9.2.26" description = "cuDNN runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1881,7 +1813,6 @@ nvidia-cublas-cu12 = "*" name = "nvidia-cufft-cu12" version = "11.0.2.54" description = "CUFFT native runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1893,7 +1824,6 @@ files = [ name = "nvidia-curand-cu12" version = "10.3.2.106" description = "CURAND native runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1905,7 +1835,6 @@ files = [ name = "nvidia-cusolver-cu12" version = "11.4.5.107" description = "CUDA solver native runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1922,7 +1851,6 @@ nvidia-nvjitlink-cu12 = "*" name = "nvidia-cusparse-cu12" version = "12.1.0.106" description = "CUSPARSE native runtime libraries" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1937,7 +1865,6 @@ nvidia-nvjitlink-cu12 = "*" name = "nvidia-nccl-cu12" version = "2.19.3" description = "NVIDIA Collective Communication Library (NCCL) Runtime" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1948,7 +1875,6 @@ files = [ name = "nvidia-nvjitlink-cu12" version = "12.4.99" description = "Nvidia JIT LTO Library" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1961,7 +1887,6 @@ files = [ name = "nvidia-nvtx-cu12" version = "12.1.105" description = "NVIDIA Tools Extension" -category = "main" optional = false python-versions = ">=3" files = [ @@ -1973,7 +1898,6 @@ files = [ name = "packaging" version = "24.0" description = "Core utilities for Python packages" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1985,7 +1909,6 @@ files = [ name = "pandas" version = "1.5.3" description = "Powerful data structures for data analysis, time series, and statistics" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2021,8 +1944,8 @@ files = [ [package.dependencies] numpy = [ {version = ">=1.20.3", markers = "python_version < \"3.10\""}, - {version = ">=1.21.0", markers = "python_version >= \"3.10\""}, {version = ">=1.23.2", markers = "python_version >= \"3.11\""}, + {version = ">=1.21.0", markers = "python_version >= \"3.10\" and python_version < \"3.11\""}, ] python-dateutil = ">=2.8.1" pytz = ">=2020.1" @@ -2034,7 +1957,6 @@ test = ["hypothesis (>=5.5.3)", "pytest (>=6.0)", "pytest-xdist (>=1.31)"] name = "parse" version = "1.20.1" description = "parse() is the opposite of format()" -category = "main" optional = false python-versions = "*" files = [ @@ -2046,7 +1968,6 @@ files = [ name = "passlib" version = "1.7.4" description = "comprehensive password hashing framework supporting over 30 schemes" -category = "main" optional = false python-versions = "*" files = [ @@ -2064,7 +1985,6 @@ totp = ["cryptography"] name = "pathspec" version = "0.12.1" description = "Utility library for gitignore style pattern matching of file paths." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2076,7 +1996,6 @@ files = [ name = "pillow" version = "10.3.0" description = "Python Imaging Library (Fork)" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2163,7 +2082,6 @@ xmp = ["defusedxml"] name = "platformdirs" version = "4.2.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2179,7 +2097,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest- name = "pluggy" version = "1.4.0" description = "plugin and hook calling mechanisms for python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2195,7 +2112,6 @@ testing = ["pytest", "pytest-benchmark"] name = "pre-commit" version = "2.21.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2214,7 +2130,6 @@ virtualenv = ">=20.10.0" name = "psycopg2-binary" version = "2.9.9" description = "psycopg2 - Python-PostgreSQL Database Adapter" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2296,7 +2211,6 @@ files = [ name = "pyarrow" version = "15.0.2" description = "Python library for Apache Arrow" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2345,7 +2259,6 @@ numpy = ">=1.16.6,<2" name = "pyarrow-hotfix" version = "0.6" description = "" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -2357,7 +2270,6 @@ files = [ name = "pycparser" version = "2.22" description = "C parser in Python" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2369,7 +2281,6 @@ files = [ name = "pydantic" version = "2.6.4" description = "Data validation using Python type hints" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2389,7 +2300,6 @@ email = ["email-validator (>=2.0.0)"] name = "pydantic-core" version = "2.16.3" description = "" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2481,7 +2391,6 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" name = "pyjwt" version = "2.8.0" description = "JSON Web Token implementation in Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2499,7 +2408,6 @@ tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"] name = "pyright" version = "1.1.356" description = "Command line wrapper for pyright" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2518,7 +2426,6 @@ dev = ["twine (>=3.4.1)"] name = "pytest" version = "7.4.4" description = "pytest: simple powerful testing with Python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2541,7 +2448,6 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no name = "pytest-asyncio" version = "0.18.3" description = "Pytest support for asyncio" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2560,7 +2466,6 @@ testing = ["coverage (==6.2)", "flaky (>=3.5.0)", "hypothesis (>=5.7.1)", "mypy name = "pytest-mock" version = "3.14.0" description = "Thin-wrapper around the mock package for easier use with pytest" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2578,7 +2483,6 @@ dev = ["pre-commit", "pytest-asyncio", "tox"] name = "python-dateutil" version = "2.9.0.post0" description = "Extensions to the standard Python datetime module" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ @@ -2593,7 +2497,6 @@ six = ">=1.5" name = "python-dotenv" version = "0.19.2" description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -2608,7 +2511,6 @@ cli = ["click (>=5.0)"] name = "python-multipart" version = "0.0.5" description = "A streaming multipart parser for Python" -category = "main" optional = false python-versions = "*" files = [ @@ -2622,7 +2524,6 @@ six = ">=1.4.0" name = "python-slugify" version = "6.1.2" description = "A Python slugify application that also handles Unicode" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ @@ -2640,7 +2541,6 @@ unidecode = ["Unidecode (>=1.1.1)"] name = "pytz" version = "2024.1" description = "World timezone definitions, modern and historical" -category = "main" optional = false python-versions = "*" files = [ @@ -2652,7 +2552,6 @@ files = [ name = "pyvespa" version = "0.37.1" description = "Python API for vespa.ai" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2674,7 +2573,6 @@ typing-extensions = "*" name = "pywin32" version = "306" description = "Python for Window Extensions" -category = "main" optional = false python-versions = "*" files = [ @@ -2698,7 +2596,6 @@ files = [ name = "pyyaml" version = "6.0.1" description = "YAML parser and emitter for Python" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2759,7 +2656,6 @@ files = [ name = "regex" version = "2023.12.25" description = "Alternative regular expression module, to replace re." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2862,7 +2758,6 @@ files = [ name = "requests" version = "2.31.0" description = "Python HTTP for Humans." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2884,7 +2779,6 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] name = "requests-toolbelt" version = "0.10.1" description = "A utility belt for advanced users of python-requests" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -2899,7 +2793,6 @@ requests = ">=2.0.1,<3.0.0" name = "responses" version = "0.25.0" description = "A utility library for mocking out the `requests` Python library." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2919,7 +2812,6 @@ tests = ["coverage (>=6.0.0)", "flake8", "mypy", "pytest (>=7.0.0)", "pytest-asy name = "rfc3986" version = "1.5.0" description = "Validating URI References per RFC 3986" -category = "main" optional = false python-versions = "*" files = [ @@ -2937,7 +2829,6 @@ idna2008 = ["idna"] name = "ruff" version = "0.0.291" description = "An extremely fast Python linter, written in Rust." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2964,7 +2855,6 @@ files = [ name = "s3transfer" version = "0.10.1" description = "An Amazon S3 Transfer Manager" -category = "main" optional = false python-versions = ">= 3.8" files = [ @@ -2982,7 +2872,6 @@ crt = ["botocore[crt] (>=1.33.2,<2.0a.0)"] name = "safetensors" version = "0.4.2" description = "" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3115,7 +3004,6 @@ torch = ["safetensors[numpy]", "torch (>=1.10)"] name = "scikit-learn" version = "1.4.1.post1" description = "A set of python modules for machine learning and data mining" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -3158,7 +3046,6 @@ tests = ["black (>=23.3.0)", "matplotlib (>=3.3.4)", "mypy (>=1.3)", "numpydoc ( name = "scipy" version = "1.12.0" description = "Fundamental algorithms for scientific computing in Python" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -3201,7 +3088,6 @@ test = ["asv", "gmpy2", "hypothesis", "mpmath", "pooch", "pytest", "pytest-cov", name = "sentence-transformers" version = "2.6.1" description = "Multilingual text embeddings" -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -3223,7 +3109,6 @@ transformers = ">=4.32.0,<5.0.0" name = "setuptools" version = "69.2.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -3240,7 +3125,6 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar name = "six" version = "1.16.0" description = "Python 2 and 3 compatibility utilities" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -3252,7 +3136,6 @@ files = [ name = "sniffio" version = "1.3.1" description = "Sniff out which async library your code is running under" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3264,7 +3147,6 @@ files = [ name = "sqlakeyset" version = "2.0.1708907391" description = "offset-free paging for sqlalchemy" -category = "main" optional = false python-versions = ">=3.7,<4.0" files = [ @@ -3282,7 +3164,6 @@ typing_extensions = ">=4,<5" name = "sqlalchemy" version = "1.4.52" description = "Database Abstraction Library" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ @@ -3362,7 +3243,6 @@ sqlcipher = ["sqlcipher3_binary"] name = "sqlalchemy-utils" version = "0.38.3" description = "Various utility functions for SQLAlchemy." -category = "main" optional = false python-versions = "~=3.6" files = [ @@ -3391,7 +3271,6 @@ url = ["furl (>=0.4.1)"] name = "starlette" version = "0.27.0" description = "The little ASGI library that shines." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3410,7 +3289,6 @@ full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyam name = "surrogate" version = "0.1" description = "A Python micro-lib to create stubs for non-existing modules." -category = "dev" optional = false python-versions = "*" files = [ @@ -3421,7 +3299,6 @@ files = [ name = "sympy" version = "1.12" description = "Computer algebra system (CAS) in Python" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3436,7 +3313,6 @@ mpmath = ">=0.19" name = "tenacity" version = "8.2.3" description = "Retry code until it succeeds" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3451,7 +3327,6 @@ doc = ["reno", "sphinx", "tornado (>=4.5)"] name = "text-unidecode" version = "1.3" description = "The most basic Text::Unidecode port" -category = "main" optional = false python-versions = "*" files = [ @@ -3463,7 +3338,6 @@ files = [ name = "threadpoolctl" version = "3.4.0" description = "threadpoolctl" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3475,7 +3349,6 @@ files = [ name = "tokenizers" version = "0.15.2" description = "" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3603,7 +3476,6 @@ testing = ["black (==22.3)", "datasets", "numpy", "pytest", "requests"] name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3615,7 +3487,6 @@ files = [ name = "torch" version = "2.2.2" description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration" -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -3674,7 +3545,6 @@ optree = ["optree (>=0.9.1)"] name = "tqdm" version = "4.66.2" description = "Fast, Extensible Progress Meter" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3695,7 +3565,6 @@ telegram = ["requests"] name = "transformers" version = "4.39.3" description = "State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -3764,7 +3633,6 @@ vision = ["Pillow (>=10.0.1,<=15.0)"] name = "triton" version = "2.2.0" description = "A language and compiler for custom Deep Learning operations" -category = "main" optional = false python-versions = "*" files = [ @@ -3788,7 +3656,6 @@ tutorials = ["matplotlib", "pandas", "tabulate", "torch"] name = "types-sqlalchemy" version = "1.4.53.38" description = "Typing stubs for SQLAlchemy" -category = "dev" optional = false python-versions = "*" files = [ @@ -3800,7 +3667,6 @@ files = [ name = "typing-extensions" version = "4.10.0" description = "Backported and Experimental Type Hints for Python 3.8+" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3812,7 +3678,6 @@ files = [ name = "tzdata" version = "2024.1" description = "Provider of IANA time zone data" -category = "main" optional = false python-versions = ">=2" files = [ @@ -3824,7 +3689,6 @@ files = [ name = "tzlocal" version = "5.2" description = "tzinfo object for the local timezone" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3842,7 +3706,6 @@ devenv = ["check-manifest", "pytest (>=4.3)", "pytest-cov", "pytest-mock (>=3.3) name = "urllib3" version = "1.26.18" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ @@ -3859,7 +3722,6 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] name = "uvicorn" version = "0.20.0" description = "The lightning-fast ASGI server." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3874,7 +3736,7 @@ h11 = ">=0.8" httptools = {version = ">=0.5.0", optional = true, markers = "extra == \"standard\""} python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} pyyaml = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} -uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "(sys_platform != \"win32\" and sys_platform != \"cygwin\") and platform_python_implementation != \"PyPy\" and extra == \"standard\""} watchfiles = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} websockets = {version = ">=10.4", optional = true, markers = "extra == \"standard\""} @@ -3885,7 +3747,6 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", name = "uvloop" version = "0.19.0" description = "Fast implementation of asyncio event loop on top of libuv" -category = "main" optional = false python-versions = ">=3.8.0" files = [ @@ -3930,7 +3791,6 @@ test = ["Cython (>=0.29.36,<0.30.0)", "aiohttp (==3.9.0b0)", "aiohttp (>=3.8.1)" name = "virtualenv" version = "20.25.1" description = "Virtual Python Environment builder" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3951,7 +3811,6 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess name = "watchfiles" version = "0.21.0" description = "Simple, modern and high performance file watching and code reload in python." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -4039,7 +3898,6 @@ anyio = ">=3.0.0" name = "websockets" version = "12.0" description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -4121,7 +3979,6 @@ files = [ name = "werkzeug" version = "2.1.2" description = "The comprehensive WSGI web application library." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -4136,7 +3993,6 @@ watchdog = ["watchdog"] name = "xmltodict" version = "0.13.0" description = "Makes working with XML feel like you are working with JSON" -category = "dev" optional = false python-versions = ">=3.4" files = [ @@ -4148,7 +4004,6 @@ files = [ name = "xxhash" version = "3.4.1" description = "Python binding for xxHash" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4266,7 +4121,6 @@ files = [ name = "yarl" version = "1.9.4" description = "Yet another URL library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4369,4 +4223,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "8d5c63afe126cfae11eaa4dbf5c35b0b714d2164056cbea77dcf96b6fa40d9d6" +content-hash = "03626f2a154b4d61e456c1db12170c6ed71e255f7399d2c106c14afa35ab8bc3" diff --git a/pyproject.toml b/pyproject.toml index 4fe54600..47444f32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ python = "^3.9" Authlib = "^0.15.5" bcrypt = "^3.2.0" boto3 = "^1.26" -cpr-data-access = {git = "https://github.com/climatepolicyradar/data-access.git", tag="v0.5.6", extras = ["vespa"]} +cpr-data-access = {git = "https://github.com/climatepolicyradar/data-access.git", tag="v0.5.8", extras = ["vespa"]} fastapi = "^0.104.1" fastapi-health = "^0.4.0" fastapi-pagination = { extras = ["sqlalchemy"], version = "^0.12.19" }