Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) Query builder #985

Merged
merged 89 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
805f3a3
add poc draft
thomasht86 Sep 18, 2024
5bbd8e7
rename ui to userQuery
thomasht86 Sep 24, 2024
8cd21f3
nn operators - not passing
thomasht86 Sep 24, 2024
8b8297f
start with annotations
thomasht86 Sep 25, 2024
6fce39d
more tests
thomasht86 Sep 25, 2024
c58a8a4
rest of methods 🚀 passing tests ✅
thomasht86 Sep 25, 2024
d749f54
unify test classes
thomasht86 Sep 25, 2024
09a3fb5
Merge branch 'master' into thomasht86/qbuilder-poc
thomasht86 Sep 27, 2024
b4bf206
restructure
thomasht86 Sep 27, 2024
511bb71
add integration test
thomasht86 Sep 27, 2024
bc49b31
rename Field to Queryfield
thomasht86 Sep 30, 2024
26e8c1d
use unit tests for integration tests
thomasht86 Sep 30, 2024
1f9c40b
refacotring of unit tests
thomasht86 Sep 30, 2024
d0371e0
simplify
thomasht86 Oct 23, 2024
2eb7f63
add dunder methods to remove build
thomasht86 Oct 23, 2024
268616c
Merge branch 'master' into thomasht86/qbuilder-poc
thomasht86 Nov 26, 2024
b60c6cf
no index annotation on userQuery
thomasht86 Dec 2, 2024
8538efd
more integration tests
thomasht86 Dec 2, 2024
41f70ec
more unit tests
thomasht86 Dec 2, 2024
cb30290
clean userquery
thomasht86 Dec 2, 2024
a336bee
add userinput
thomasht86 Dec 2, 2024
10cc0b3
userinput integration
thomasht86 Dec 2, 2024
52b609e
no parenthesis annotations
thomasht86 Dec 2, 2024
e1b3cb7
predicate
thomasht86 Dec 2, 2024
21c8954
annotation formatting and predicate
thomasht86 Dec 2, 2024
634513c
wand
thomasht86 Dec 2, 2024
f791d49
timeout
thomasht86 Dec 2, 2024
a191796
exclude markdown files in resources
thomasht86 Dec 2, 2024
4ddef4d
Merge branch 'master' into thomasht86/qbuilder-poc
thomasht86 Dec 4, 2024
86c85af
add fuzzy integration test
thomasht86 Dec 4, 2024
0d896a1
add uri integration test
thomasht86 Dec 4, 2024
0a53f30
sameElement integration test
thomasht86 Dec 4, 2024
7d5b5df
near and onear with distance
thomasht86 Dec 4, 2024
2ac91cc
passing grouping
thomasht86 Dec 5, 2024
6969366
verify results of grouping
thomasht86 Dec 5, 2024
a82b411
more grouping methods
thomasht86 Dec 5, 2024
d4997ee
more grouping unit tests
thomasht86 Dec 5, 2024
940268b
more grouping integration tests
thomasht86 Dec 5, 2024
44e8fb1
module level working
thomasht86 Dec 5, 2024
58f19dd
next - restructure and add docstrings to public methods
thomasht86 Dec 5, 2024
1310616
fix module export
thomasht86 Dec 6, 2024
0b7222b
renames
thomasht86 Dec 6, 2024
cdbbf5d
Merge branch 'master' into thomasht86/qbuilder-poc
thomasht86 Jan 6, 2025
f5705a5
fix case
thomasht86 Jan 6, 2025
f1467f5
use type annotations
thomasht86 Jan 6, 2025
9f727bc
add annotation
thomasht86 Jan 6, 2025
804b116
annotation
thomasht86 Jan 6, 2025
1290371
mypy passing
thomasht86 Jan 6, 2025
fe7f108
remove old file (moved to builder)
thomasht86 Jan 6, 2025
fcb9469
mypy to unittest extra dependency
thomasht86 Jan 6, 2025
27a5f18
adapt near
thomasht86 Jan 6, 2025
5f656f3
add near int
thomasht86 Jan 6, 2025
e9c65c6
fix from_ type anno
thomasht86 Jan 6, 2025
2ba87bf
add near and onear integration tests
thomasht86 Jan 6, 2025
84085f4
add schema to unit tests
thomasht86 Jan 6, 2025
bf9d7bb
add pyvespa schema to from_ args
thomasht86 Jan 6, 2025
a2a35e9
add Schema
thomasht86 Jan 6, 2025
1c1eaea
docstrings to weighetsed and dotproduct
thomasht86 Jan 6, 2025
d1c9a87
remove maxDiff from tests and fix spaces
thomasht86 Jan 6, 2025
2769e14
better ordering test
thomasht86 Jan 6, 2025
e5cf92a
docstring to where and order by
thomasht86 Jan 6, 2025
63fcbc9
fix link
thomasht86 Jan 6, 2025
7167008
fix docstring
thomasht86 Jan 6, 2025
eed6657
moore docstrings and doctests
thomasht86 Jan 6, 2025
3abb3d2
more docstrings
thomasht86 Jan 6, 2025
ef8b1b1
wekand docstring
thomasht86 Jan 6, 2025
507a51e
add unit test
thomasht86 Jan 7, 2025
89fcad4
change nn targetHits default to 100
thomasht86 Jan 7, 2025
e4f9491
even more docstrings
thomasht86 Jan 7, 2025
bcb1c5b
distance param to near and onear
thomasht86 Jan 7, 2025
da45e8e
last docstrings
thomasht86 Jan 7, 2025
9c39825
ok
thomasht86 Jan 7, 2025
b2da9dd
add automodule to reference api docs
thomasht86 Jan 7, 2025
e2ad885
add Query to exports
thomasht86 Jan 7, 2025
6cfec85
from dataclass to normal
thomasht86 Jan 7, 2025
1224593
docstring for grouping
thomasht86 Jan 7, 2025
cfc5ff4
one more grouping test
thomasht86 Jan 7, 2025
a5e34f4
fix doc link
thomasht86 Jan 7, 2025
1afa070
all grouping methods
thomasht86 Jan 9, 2025
84174d4
rename to qb
thomasht86 Jan 9, 2025
455abd8
move grouping tests to separate file
thomasht86 Jan 9, 2025
e612449
all grouping unit tests
thomasht86 Jan 9, 2025
309360c
return q
thomasht86 Jan 9, 2025
c5e9b03
working as and alias
thomasht86 Jan 10, 2025
3f4f7ff
returning q in all unit test methods
thomasht86 Jan 10, 2025
bf79040
whitespace in doctest
thomasht86 Jan 10, 2025
d750d0d
all grouping tests!
thomasht86 Jan 10, 2025
38dc7a4
also run new integration tests
thomasht86 Jan 10, 2025
3d40121
run new integration tests in parallel
thomasht86 Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .github/workflows/integration-except-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ on:
- master

jobs:
integration-except-cloud:
integration-tests:
runs-on: ubuntu-latest
strategy:
matrix:
test-suite:
[
"test_integration_docker.py",
"test_integration_grouping.py",
"test_integration_queries.py",
]
steps:
- name: Free disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
Expand All @@ -21,13 +29,15 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.9'
cache: 'pip'
python-version: "3.9"
cache: "pip"
cache-dependency-path: |
pyproject.toml

- name: Install dependencies
run: |
pip install -e .[dev]
- name: Run integration docker

- name: Run integration test
run: |
pytest tests/integration/test_integration_docker.py -s -v
pytest tests/integration/${{ matrix.test-suite }} -s -v
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,5 @@ markdown_before/
*.pem
*.crt

# Exclude markdown files from vespa/resources
# Exclude markdown files in vespa/resources - directory
vespa/resources/*.md
8 changes: 8 additions & 0 deletions docs/sphinx/source/reference-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,15 @@ VespaCloud
:members:
:special-members: __init__

################
vespa.querybuilder
################

.. automodule:: vespa.querybuilder
:members:
:undoc-members:
:special-members: __init__
:show-inheritance:

################
vespa.exceptions
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ unittest = [
"requests-mock",
"vespacli",
"pytest-asyncio",
"mypy>=1.14.1",
]
docs = [
"sphinx",
Expand Down
Loading
Loading