mirror of
https://github.com/lancedb/lancedb.git
synced 2026-04-01 13:30:40 +00:00
Compare commits
68 Commits
python-v0.
...
python-v0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d550124bd | ||
|
|
c57cb310a2 | ||
|
|
97754f5123 | ||
|
|
7b1c063848 | ||
|
|
c7f189f27b | ||
|
|
a0a2942ad5 | ||
|
|
e3d53dd185 | ||
|
|
66804e99fc | ||
|
|
9f85d4c639 | ||
|
|
1ba19d728e | ||
|
|
4c44587af0 | ||
|
|
1d1cafb59c | ||
|
|
4714598155 | ||
|
|
74f457a0f2 | ||
|
|
cca6a7c989 | ||
|
|
ad96489114 | ||
|
|
76429730c0 | ||
|
|
874b74dd3c | ||
|
|
61de47f3a5 | ||
|
|
f4d613565e | ||
|
|
410ab9b6fe | ||
|
|
1d6e00b902 | ||
|
|
a0228036ae | ||
|
|
d8fc071a7d | ||
|
|
e6fd8d071e | ||
|
|
670dcca551 | ||
|
|
ed7e01a58b | ||
|
|
3450ccaf7f | ||
|
|
9b229f1e7c | ||
|
|
f5b21c0aa4 | ||
|
|
e927924d26 | ||
|
|
11a4966bfc | ||
|
|
dd5aaa72dc | ||
|
|
3a200d77ef | ||
|
|
bd09c53938 | ||
|
|
0b18e33180 | ||
|
|
c89240b16c | ||
|
|
099ff355a4 | ||
|
|
c5995fda67 | ||
|
|
25eb1fbfa4 | ||
|
|
4ac41c5c3f | ||
|
|
9a5b0398ec | ||
|
|
d1d720d08a | ||
|
|
c2e543f1b7 | ||
|
|
216c1b5f77 | ||
|
|
fc1867da83 | ||
|
|
f951da2b00 | ||
|
|
6530d82690 | ||
|
|
b3fc9c444f | ||
|
|
6de8f42dcd | ||
|
|
5c3bd68e58 | ||
|
|
4be85444f0 | ||
|
|
68c07f333f | ||
|
|
814a379e08 | ||
|
|
f31561c5bb | ||
|
|
e0c5ceac03 | ||
|
|
e93bb3355a | ||
|
|
b75991eb07 | ||
|
|
97ca9bb943 | ||
|
|
fa1b04f341 | ||
|
|
367abe99d2 | ||
|
|
52ce2c995c | ||
|
|
e71a00998c | ||
|
|
39a2ac0a1c | ||
|
|
bc7b344fa4 | ||
|
|
f91d2f5fec | ||
|
|
cf81b6419f | ||
|
|
0498ac1f2f |
@@ -1,5 +1,5 @@
|
|||||||
[tool.bumpversion]
|
[tool.bumpversion]
|
||||||
current_version = "0.27.0-beta.2"
|
current_version = "0.27.2-beta.1"
|
||||||
parse = """(?x)
|
parse = """(?x)
|
||||||
(?P<major>0|[1-9]\\d*)\\.
|
(?P<major>0|[1-9]\\d*)\\.
|
||||||
(?P<minor>0|[1-9]\\d*)\\.
|
(?P<minor>0|[1-9]\\d*)\\.
|
||||||
|
|||||||
@@ -23,12 +23,15 @@ runs:
|
|||||||
steps:
|
steps:
|
||||||
- name: CONFIRM ARM BUILD
|
- name: CONFIRM ARM BUILD
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
ARM_BUILD: ${{ inputs.arm-build }}
|
||||||
run: |
|
run: |
|
||||||
echo "ARM BUILD: ${{ inputs.arm-build }}"
|
echo "ARM BUILD: $ARM_BUILD"
|
||||||
- name: Build x86_64 Manylinux wheel
|
- name: Build x86_64 Manylinux wheel
|
||||||
if: ${{ inputs.arm-build == 'false' }}
|
if: ${{ inputs.arm-build == 'false' }}
|
||||||
uses: PyO3/maturin-action@v1
|
uses: PyO3/maturin-action@v1
|
||||||
with:
|
with:
|
||||||
|
maturin-version: "1.12.4"
|
||||||
command: build
|
command: build
|
||||||
working-directory: python
|
working-directory: python
|
||||||
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
||||||
@@ -44,6 +47,7 @@ runs:
|
|||||||
if: ${{ inputs.arm-build == 'true' }}
|
if: ${{ inputs.arm-build == 'true' }}
|
||||||
uses: PyO3/maturin-action@v1
|
uses: PyO3/maturin-action@v1
|
||||||
with:
|
with:
|
||||||
|
maturin-version: "1.12.4"
|
||||||
command: build
|
command: build
|
||||||
working-directory: python
|
working-directory: python
|
||||||
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
||||||
|
|||||||
1
.github/workflows/build_mac_wheel/action.yml
vendored
1
.github/workflows/build_mac_wheel/action.yml
vendored
@@ -20,6 +20,7 @@ runs:
|
|||||||
uses: PyO3/maturin-action@v1
|
uses: PyO3/maturin-action@v1
|
||||||
with:
|
with:
|
||||||
command: build
|
command: build
|
||||||
|
maturin-version: "1.12.4"
|
||||||
# TODO: pass through interpreter
|
# TODO: pass through interpreter
|
||||||
args: ${{ inputs.args }}
|
args: ${{ inputs.args }}
|
||||||
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ runs:
|
|||||||
uses: PyO3/maturin-action@v1
|
uses: PyO3/maturin-action@v1
|
||||||
with:
|
with:
|
||||||
command: build
|
command: build
|
||||||
|
maturin-version: "1.12.4"
|
||||||
args: ${{ inputs.args }}
|
args: ${{ inputs.args }}
|
||||||
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'"
|
||||||
working-directory: python
|
working-directory: python
|
||||||
|
|||||||
6
.github/workflows/dev.yml
vendored
6
.github/workflows/dev.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
name: Label PR
|
name: Label PR
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: srvaroa/labeler@master
|
- uses: srvaroa/labeler@v1
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
commitlint:
|
commitlint:
|
||||||
@@ -24,7 +24,7 @@ jobs:
|
|||||||
name: Verify PR title / description conforms to semantic-release
|
name: Verify PR title / description conforms to semantic-release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: "18"
|
node-version: "18"
|
||||||
# These rules are disabled because Github will always ensure there
|
# These rules are disabled because Github will always ensure there
|
||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
|
|
||||||
${{ github.event.pull_request.body }}
|
${{ github.event.pull_request.body }}
|
||||||
- if: failure()
|
- if: failure()
|
||||||
uses: actions/github-script@v6
|
uses: actions/github-script@v7
|
||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
const message = `**ACTION NEEDED**
|
const message = `**ACTION NEEDED**
|
||||||
|
|||||||
4
.github/workflows/docs.yml
vendored
4
.github/workflows/docs.yml
vendored
@@ -53,7 +53,7 @@ jobs:
|
|||||||
python -m pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -e .
|
python -m pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -e .
|
||||||
python -m pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -r ../docs/requirements.txt
|
python -m pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -r ../docs/requirements.txt
|
||||||
- name: Set up node
|
- name: Set up node
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
@@ -68,7 +68,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
PYTHONPATH=. mkdocs build
|
PYTHONPATH=. mkdocs build
|
||||||
- name: Setup Pages
|
- name: Setup Pages
|
||||||
uses: actions/configure-pages@v2
|
uses: actions/configure-pages@v5
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-pages-artifact@v3
|
uses: actions/upload-pages-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
|||||||
9
.github/workflows/nodejs.yml
vendored
9
.github/workflows/nodejs.yml
vendored
@@ -7,6 +7,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- Cargo.toml
|
- Cargo.toml
|
||||||
|
- Cargo.lock
|
||||||
- nodejs/**
|
- nodejs/**
|
||||||
- rust/**
|
- rust/**
|
||||||
- docs/src/js/**
|
- docs/src/js/**
|
||||||
@@ -37,7 +38,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
@@ -77,7 +78,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
name: Setup Node.js 20 for build
|
name: Setup Node.js 20 for build
|
||||||
with:
|
with:
|
||||||
# @napi-rs/cli v3 requires Node >= 20.12 (via @inquirer/prompts@8).
|
# @napi-rs/cli v3 requires Node >= 20.12 (via @inquirer/prompts@8).
|
||||||
@@ -94,7 +95,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
npm ci --include=optional
|
npm ci --include=optional
|
||||||
npm run build:debug -- --profile ci
|
npm run build:debug -- --profile ci
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
name: Setup Node.js ${{ matrix.node-version }} for test
|
name: Setup Node.js ${{ matrix.node-version }} for test
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node-version }}
|
node-version: ${{ matrix.node-version }}
|
||||||
@@ -143,7 +144,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|||||||
20
.github/workflows/npm-publish.yml
vendored
20
.github/workflows/npm-publish.yml
vendored
@@ -19,6 +19,7 @@ on:
|
|||||||
paths:
|
paths:
|
||||||
- .github/workflows/npm-publish.yml
|
- .github/workflows/npm-publish.yml
|
||||||
- Cargo.toml # Change in dependency frequently breaks builds
|
- Cargo.toml # Change in dependency frequently breaks builds
|
||||||
|
- Cargo.lock
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
group: ${{ github.workflow }}-${{ github.ref }}
|
||||||
@@ -124,7 +125,12 @@ jobs:
|
|||||||
pre_build: |-
|
pre_build: |-
|
||||||
set -e &&
|
set -e &&
|
||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y protobuf-compiler pkg-config
|
apt-get install -y protobuf-compiler pkg-config &&
|
||||||
|
# The base image (manylinux2014-cross) sets TARGET_CC to the old
|
||||||
|
# GCC 4.8 cross-compiler. aws-lc-sys checks TARGET_CC before CC,
|
||||||
|
# so it picks up GCC even though the napi-rs image sets CC=clang.
|
||||||
|
# Override to use the image's clang-18 which supports -fuse-ld=lld.
|
||||||
|
export TARGET_CC=clang TARGET_CXX=clang++
|
||||||
- target: x86_64-unknown-linux-musl
|
- target: x86_64-unknown-linux-musl
|
||||||
# This one seems to need some extra memory
|
# This one seems to need some extra memory
|
||||||
host: ubuntu-2404-8x-x64
|
host: ubuntu-2404-8x-x64
|
||||||
@@ -144,9 +150,10 @@ jobs:
|
|||||||
set -e &&
|
set -e &&
|
||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y protobuf-compiler pkg-config &&
|
apt-get install -y protobuf-compiler pkg-config &&
|
||||||
# https://github.com/aws/aws-lc-rs/issues/737#issuecomment-2725918627
|
export TARGET_CC=clang TARGET_CXX=clang++ &&
|
||||||
ln -s /usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5/crtbeginS.o /usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/lib/crtbeginS.o &&
|
# The manylinux2014 sysroot has glibc 2.17 headers which lack
|
||||||
ln -s /usr/aarch64-unknown-linux-gnu/lib/gcc /usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/lib/gcc &&
|
# AT_HWCAP2 (added in Linux 3.17). Define it for aws-lc-sys.
|
||||||
|
export CFLAGS="$CFLAGS -DAT_HWCAP2=26" &&
|
||||||
rustup target add aarch64-unknown-linux-gnu
|
rustup target add aarch64-unknown-linux-gnu
|
||||||
- target: aarch64-unknown-linux-musl
|
- target: aarch64-unknown-linux-musl
|
||||||
host: ubuntu-2404-8x-x64
|
host: ubuntu-2404-8x-x64
|
||||||
@@ -266,7 +273,7 @@ jobs:
|
|||||||
- target: x86_64-unknown-linux-gnu
|
- target: x86_64-unknown-linux-gnu
|
||||||
host: ubuntu-latest
|
host: ubuntu-latest
|
||||||
- target: aarch64-unknown-linux-gnu
|
- target: aarch64-unknown-linux-gnu
|
||||||
host: buildjet-16vcpu-ubuntu-2204-arm
|
host: ubuntu-2404-8x-arm64
|
||||||
node:
|
node:
|
||||||
- '20'
|
- '20'
|
||||||
runs-on: ${{ matrix.settings.host }}
|
runs-on: ${{ matrix.settings.host }}
|
||||||
@@ -356,7 +363,8 @@ jobs:
|
|||||||
if [[ $DRY_RUN == "true" ]]; then
|
if [[ $DRY_RUN == "true" ]]; then
|
||||||
ARGS="$ARGS --dry-run"
|
ARGS="$ARGS --dry-run"
|
||||||
fi
|
fi
|
||||||
if [[ $GITHUB_REF =~ refs/tags/v(.*)-beta.* ]]; then
|
VERSION=$(node -p "require('./package.json').version")
|
||||||
|
if [[ $VERSION == *-* ]]; then
|
||||||
ARGS="$ARGS --tag preview"
|
ARGS="$ARGS --tag preview"
|
||||||
fi
|
fi
|
||||||
npm publish $ARGS
|
npm publish $ARGS
|
||||||
|
|||||||
1
.github/workflows/pypi-publish.yml
vendored
1
.github/workflows/pypi-publish.yml
vendored
@@ -9,6 +9,7 @@ on:
|
|||||||
paths:
|
paths:
|
||||||
- .github/workflows/pypi-publish.yml
|
- .github/workflows/pypi-publish.yml
|
||||||
- Cargo.toml # Change in dependency frequently breaks builds
|
- Cargo.toml # Change in dependency frequently breaks builds
|
||||||
|
- Cargo.lock
|
||||||
|
|
||||||
env:
|
env:
|
||||||
PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/"
|
PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/"
|
||||||
|
|||||||
5
.github/workflows/python.yml
vendored
5
.github/workflows/python.yml
vendored
@@ -7,9 +7,14 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- Cargo.toml
|
- Cargo.toml
|
||||||
|
- Cargo.lock
|
||||||
- python/**
|
- python/**
|
||||||
- rust/**
|
- rust/**
|
||||||
- .github/workflows/python.yml
|
- .github/workflows/python.yml
|
||||||
|
- .github/workflows/build_linux_wheel/**
|
||||||
|
- .github/workflows/build_mac_wheel/**
|
||||||
|
- .github/workflows/build_windows_wheel/**
|
||||||
|
- .github/workflows/run_tests/**
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||||
|
|||||||
17
.github/workflows/rust.yml
vendored
17
.github/workflows/rust.yml
vendored
@@ -7,6 +7,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- Cargo.toml
|
- Cargo.toml
|
||||||
|
- Cargo.lock
|
||||||
- rust/**
|
- rust/**
|
||||||
- .github/workflows/rust.yml
|
- .github/workflows/rust.yml
|
||||||
|
|
||||||
@@ -206,14 +207,14 @@ jobs:
|
|||||||
- name: Downgrade dependencies
|
- name: Downgrade dependencies
|
||||||
# These packages have newer requirements for MSRV
|
# These packages have newer requirements for MSRV
|
||||||
run: |
|
run: |
|
||||||
cargo update -p aws-sdk-bedrockruntime --precise 1.64.0
|
cargo update -p aws-sdk-bedrockruntime --precise 1.77.0
|
||||||
cargo update -p aws-sdk-dynamodb --precise 1.55.0
|
cargo update -p aws-sdk-dynamodb --precise 1.68.0
|
||||||
cargo update -p aws-config --precise 1.5.10
|
cargo update -p aws-config --precise 1.6.0
|
||||||
cargo update -p aws-sdk-kms --precise 1.51.0
|
cargo update -p aws-sdk-kms --precise 1.63.0
|
||||||
cargo update -p aws-sdk-s3 --precise 1.65.0
|
cargo update -p aws-sdk-s3 --precise 1.79.0
|
||||||
cargo update -p aws-sdk-sso --precise 1.50.0
|
cargo update -p aws-sdk-sso --precise 1.62.0
|
||||||
cargo update -p aws-sdk-ssooidc --precise 1.51.0
|
cargo update -p aws-sdk-ssooidc --precise 1.63.0
|
||||||
cargo update -p aws-sdk-sts --precise 1.51.0
|
cargo update -p aws-sdk-sts --precise 1.63.0
|
||||||
cargo update -p home --precise 0.5.9
|
cargo update -p home --precise 0.5.9
|
||||||
- name: cargo +${{ matrix.msrv }} check
|
- name: cargo +${{ matrix.msrv }} check
|
||||||
env:
|
env:
|
||||||
|
|||||||
2432
Cargo.lock
generated
2432
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
30
Cargo.toml
30
Cargo.toml
@@ -5,7 +5,7 @@ exclude = ["python"]
|
|||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
edition = "2021"
|
edition = "2024"
|
||||||
authors = ["LanceDB Devs <dev@lancedb.com>"]
|
authors = ["LanceDB Devs <dev@lancedb.com>"]
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
repository = "https://github.com/lancedb/lancedb"
|
repository = "https://github.com/lancedb/lancedb"
|
||||||
@@ -15,20 +15,20 @@ categories = ["database-implementations"]
|
|||||||
rust-version = "1.91.0"
|
rust-version = "1.91.0"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
lance = { "version" = "=3.0.0-rc.2", default-features = false, "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance = { version = "=4.0.0", default-features = false }
|
||||||
lance-core = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-core = { version = "=4.0.0" }
|
||||||
lance-datagen = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-datagen = { version = "=4.0.0" }
|
||||||
lance-file = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-file = { version = "=4.0.0" }
|
||||||
lance-io = { "version" = "=3.0.0-rc.2", default-features = false, "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-io = { version = "=4.0.0", default-features = false }
|
||||||
lance-index = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-index = { version = "=4.0.0" }
|
||||||
lance-linalg = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-linalg = { version = "=4.0.0" }
|
||||||
lance-namespace = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-namespace = { version = "=4.0.0" }
|
||||||
lance-namespace-impls = { "version" = "=3.0.0-rc.2", default-features = false, "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-namespace-impls = { version = "=4.0.0", default-features = false }
|
||||||
lance-table = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-table = { version = "=4.0.0" }
|
||||||
lance-testing = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-testing = { version = "=4.0.0" }
|
||||||
lance-datafusion = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-datafusion = { version = "=4.0.0" }
|
||||||
lance-encoding = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-encoding = { version = "=4.0.0" }
|
||||||
lance-arrow = { "version" = "=3.0.0-rc.2", "tag" = "v3.0.0-rc.2", "git" = "https://github.com/lance-format/lance.git" }
|
lance-arrow = { version = "=4.0.0" }
|
||||||
ahash = "0.8"
|
ahash = "0.8"
|
||||||
# Note that this one does not include pyarrow
|
# Note that this one does not include pyarrow
|
||||||
arrow = { version = "57.2", optional = false }
|
arrow = { version = "57.2", optional = false }
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
import functools
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
@@ -26,6 +27,7 @@ SEMVER_RE = re.compile(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@functools.total_ordering
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
class SemVer:
|
class SemVer:
|
||||||
major: int
|
major: int
|
||||||
@@ -156,7 +158,9 @@ def read_current_version(repo_root: Path) -> str:
|
|||||||
|
|
||||||
|
|
||||||
def determine_latest_tag(tags: Iterable[TagInfo]) -> TagInfo:
|
def determine_latest_tag(tags: Iterable[TagInfo]) -> TagInfo:
|
||||||
return max(tags, key=lambda tag: tag.semver)
|
# Stable releases (no prerelease) are always preferred over pre-releases.
|
||||||
|
# Within each group, standard semver ordering applies.
|
||||||
|
return max(tags, key=lambda tag: (not tag.semver.prerelease, tag.semver))
|
||||||
|
|
||||||
|
|
||||||
def write_outputs(args: argparse.Namespace, payload: dict) -> None:
|
def write_outputs(args: argparse.Namespace, payload: dict) -> None:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
version: "3.9"
|
version: "3.9"
|
||||||
services:
|
services:
|
||||||
localstack:
|
localstack:
|
||||||
image: localstack/localstack:3.3
|
image: localstack/localstack:4.0
|
||||||
ports:
|
ports:
|
||||||
- 4566:4566
|
- 4566:4566
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -1,27 +1,27 @@
|
|||||||
#Simple base dockerfile that supports basic dependencies required to run lance with FTS and Hybrid Search
|
# Simple base dockerfile that supports basic dependencies required to run lance with FTS and Hybrid Search
|
||||||
#Usage docker build -t lancedb:latest -f Dockerfile .
|
# Usage: docker build -t lancedb:latest -f Dockerfile .
|
||||||
FROM python:3.10-slim-buster
|
FROM python:3.12-slim-bookworm
|
||||||
|
|
||||||
# Install Rust
|
# Install build dependencies in a single layer
|
||||||
RUN apt-get update && apt-get install -y curl build-essential && \
|
RUN apt-get update && \
|
||||||
curl https://sh.rustup.rs -sSf | sh -s -- -y
|
apt-get install -y --no-install-recommends \
|
||||||
|
curl \
|
||||||
# Set the environment variable for Rust
|
build-essential \
|
||||||
ENV PATH="/root/.cargo/bin:${PATH}"
|
protobuf-compiler \
|
||||||
|
git \
|
||||||
# Install protobuf compiler
|
ca-certificates && \
|
||||||
RUN apt-get install -y protobuf-compiler && \
|
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN apt-get -y update &&\
|
# Install Rust (pinned installer, non-interactive)
|
||||||
apt-get -y upgrade && \
|
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal
|
||||||
apt-get -y install git
|
|
||||||
|
|
||||||
|
# Set the environment variable for Rust
|
||||||
|
ENV PATH="/root/.cargo/bin:${PATH}"
|
||||||
|
|
||||||
# Verify installations
|
# Verify installations
|
||||||
RUN python --version && \
|
RUN python --version && \
|
||||||
rustc --version && \
|
rustc --version && \
|
||||||
protoc --version
|
protoc --version
|
||||||
|
|
||||||
RUN pip install tantivy lancedb
|
RUN pip install --no-cache-dir tantivy lancedb
|
||||||
|
|||||||
@@ -52,14 +52,21 @@ plugins:
|
|||||||
options:
|
options:
|
||||||
docstring_style: numpy
|
docstring_style: numpy
|
||||||
heading_level: 3
|
heading_level: 3
|
||||||
show_source: true
|
|
||||||
show_symbol_type_in_heading: true
|
|
||||||
show_signature_annotations: true
|
show_signature_annotations: true
|
||||||
show_root_heading: true
|
show_root_heading: true
|
||||||
|
show_docstring_examples: true
|
||||||
|
show_docstring_attributes: false
|
||||||
|
show_docstring_other_parameters: true
|
||||||
|
show_symbol_type_heading: true
|
||||||
|
show_labels: false
|
||||||
|
show_if_no_docstring: true
|
||||||
|
show_source: false
|
||||||
members_order: source
|
members_order: source
|
||||||
docstring_section_style: list
|
docstring_section_style: list
|
||||||
signature_crossrefs: true
|
signature_crossrefs: true
|
||||||
separate_signature: true
|
separate_signature: true
|
||||||
|
filters:
|
||||||
|
- "!^_"
|
||||||
import:
|
import:
|
||||||
# for cross references
|
# for cross references
|
||||||
- https://arrow.apache.org/docs/objects.inv
|
- https://arrow.apache.org/docs/objects.inv
|
||||||
@@ -113,7 +120,7 @@ markdown_extensions:
|
|||||||
emoji_index: !!python/name:material.extensions.emoji.twemoji
|
emoji_index: !!python/name:material.extensions.emoji.twemoji
|
||||||
emoji_generator: !!python/name:material.extensions.emoji.to_svg
|
emoji_generator: !!python/name:material.extensions.emoji.to_svg
|
||||||
- markdown.extensions.toc:
|
- markdown.extensions.toc:
|
||||||
toc_depth: 3
|
toc_depth: 4
|
||||||
permalink: true
|
permalink: true
|
||||||
permalink_title: Anchor link to this section
|
permalink_title: Anchor link to this section
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
mkdocs==1.5.3
|
mkdocs==1.6.1
|
||||||
mkdocs-jupyter==0.24.1
|
mkdocs-jupyter==0.24.1
|
||||||
mkdocs-material==9.5.3
|
mkdocs-material==9.6.23
|
||||||
mkdocs-autorefs<=1.0
|
mkdocs-autorefs>=0.5,<=1.0
|
||||||
mkdocstrings[python]==0.25.2
|
mkdocstrings[python]>=0.24,<1.0
|
||||||
griffe
|
griffe>=0.40,<1.0
|
||||||
mkdocs-render-swagger-plugin
|
mkdocs-render-swagger-plugin>=0.1.0
|
||||||
pydantic
|
pydantic>=2.0,<3.0
|
||||||
mkdocs-redirects
|
mkdocs-redirects>=1.2.0
|
||||||
@@ -14,7 +14,7 @@ Add the following dependency to your `pom.xml`:
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.lancedb</groupId>
|
<groupId>com.lancedb</groupId>
|
||||||
<artifactId>lancedb-core</artifactId>
|
<artifactId>lancedb-core</artifactId>
|
||||||
<version>0.27.0-beta.2</version>
|
<version>0.27.2-beta.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -71,11 +71,12 @@ Add new columns with defined values.
|
|||||||
|
|
||||||
#### Parameters
|
#### Parameters
|
||||||
|
|
||||||
* **newColumnTransforms**: [`AddColumnsSql`](../interfaces/AddColumnsSql.md)[]
|
* **newColumnTransforms**: `Field`<`any`> \| `Field`<`any`>[] \| `Schema`<`any`> \| [`AddColumnsSql`](../interfaces/AddColumnsSql.md)[]
|
||||||
pairs of column names and
|
Either:
|
||||||
the SQL expression to use to calculate the value of the new column. These
|
- An array of objects with column names and SQL expressions to calculate values
|
||||||
expressions will be evaluated for each row in the table, and can
|
- A single Arrow Field defining one column with its data type (column will be initialized with null values)
|
||||||
reference existing columns in the table.
|
- An array of Arrow Fields defining columns with their data types (columns will be initialized with null values)
|
||||||
|
- An Arrow Schema defining columns with their data types (columns will be initialized with null values)
|
||||||
|
|
||||||
#### Returns
|
#### Returns
|
||||||
|
|
||||||
@@ -484,19 +485,7 @@ Modeled after ``VACUUM`` in PostgreSQL.
|
|||||||
- Prune: Removes old versions of the dataset
|
- Prune: Removes old versions of the dataset
|
||||||
- Index: Optimizes the indices, adding new data to existing indices
|
- Index: Optimizes the indices, adding new data to existing indices
|
||||||
|
|
||||||
Experimental API
|
The frequency an application should call optimize is based on the frequency of
|
||||||
----------------
|
|
||||||
|
|
||||||
The optimization process is undergoing active development and may change.
|
|
||||||
Our goal with these changes is to improve the performance of optimization and
|
|
||||||
reduce the complexity.
|
|
||||||
|
|
||||||
That being said, it is essential today to run optimize if you want the best
|
|
||||||
performance. It should be stable and safe to use in production, but it our
|
|
||||||
hope that the API may be simplified (or not even need to be called) in the
|
|
||||||
future.
|
|
||||||
|
|
||||||
The frequency an application shoudl call optimize is based on the frequency of
|
|
||||||
data modifications. If data is frequently added, deleted, or updated then
|
data modifications. If data is frequently added, deleted, or updated then
|
||||||
optimize should be run frequently. A good rule of thumb is to run optimize if
|
optimize should be run frequently. A good rule of thumb is to run optimize if
|
||||||
you have added or modified 100,000 or more records or run more than 20 data
|
you have added or modified 100,000 or more records or run more than 20 data
|
||||||
|
|||||||
@@ -8,6 +8,14 @@
|
|||||||
|
|
||||||
## Properties
|
## Properties
|
||||||
|
|
||||||
|
### numDeletedRows
|
||||||
|
|
||||||
|
```ts
|
||||||
|
numDeletedRows: number;
|
||||||
|
```
|
||||||
|
|
||||||
|
***
|
||||||
|
|
||||||
### version
|
### version
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
|
|||||||
@@ -37,3 +37,12 @@ tbl.optimize({cleanupOlderThan: new Date()});
|
|||||||
```ts
|
```ts
|
||||||
deleteUnverified: boolean;
|
deleteUnverified: boolean;
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Because they may be part of an in-progress transaction, files newer than
|
||||||
|
7 days old are not deleted by default. If you are sure that there are no
|
||||||
|
in-progress transactions, then you can set this to true to delete all
|
||||||
|
files older than `cleanupOlderThan`.
|
||||||
|
|
||||||
|
**WARNING**: This should only be set to true if you can guarantee that
|
||||||
|
no other process is currently working on this dataset. Otherwise the
|
||||||
|
dataset could be put into a corrupted state.
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ new EmbeddingFunction<T, M>(): EmbeddingFunction<T, M>
|
|||||||
### computeQueryEmbeddings()
|
### computeQueryEmbeddings()
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
computeQueryEmbeddings(data): Promise<number[] | Float32Array | Float64Array>
|
computeQueryEmbeddings(data): Promise<number[] | Uint8Array | Float32Array | Float64Array>
|
||||||
```
|
```
|
||||||
|
|
||||||
Compute the embeddings for a single query
|
Compute the embeddings for a single query
|
||||||
@@ -63,7 +63,7 @@ Compute the embeddings for a single query
|
|||||||
|
|
||||||
#### Returns
|
#### Returns
|
||||||
|
|
||||||
`Promise`<`number`[] \| `Float32Array` \| `Float64Array`>
|
`Promise`<`number`[] \| `Uint8Array` \| `Float32Array` \| `Float64Array`>
|
||||||
|
|
||||||
***
|
***
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ new TextEmbeddingFunction<M>(): TextEmbeddingFunction<M>
|
|||||||
### computeQueryEmbeddings()
|
### computeQueryEmbeddings()
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
computeQueryEmbeddings(data): Promise<number[] | Float32Array | Float64Array>
|
computeQueryEmbeddings(data): Promise<number[] | Uint8Array | Float32Array | Float64Array>
|
||||||
```
|
```
|
||||||
|
|
||||||
Compute the embeddings for a single query
|
Compute the embeddings for a single query
|
||||||
@@ -48,7 +48,7 @@ Compute the embeddings for a single query
|
|||||||
|
|
||||||
#### Returns
|
#### Returns
|
||||||
|
|
||||||
`Promise`<`number`[] \| `Float32Array` \| `Float64Array`>
|
`Promise`<`number`[] \| `Uint8Array` \| `Float32Array` \| `Float64Array`>
|
||||||
|
|
||||||
#### Overrides
|
#### Overrides
|
||||||
|
|
||||||
|
|||||||
@@ -7,5 +7,10 @@
|
|||||||
# Type Alias: IntoVector
|
# Type Alias: IntoVector
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
type IntoVector: Float32Array | Float64Array | number[] | Promise<Float32Array | Float64Array | number[]>;
|
type IntoVector:
|
||||||
|
| Float32Array
|
||||||
|
| Float64Array
|
||||||
|
| Uint8Array
|
||||||
|
| number[]
|
||||||
|
| Promise<Float32Array | Float64Array | Uint8Array | number[]>;
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -36,6 +36,20 @@ is also an [asynchronous API client](#connections-asynchronous).
|
|||||||
|
|
||||||
::: lancedb.table.Tags
|
::: lancedb.table.Tags
|
||||||
|
|
||||||
|
## Expressions
|
||||||
|
|
||||||
|
Type-safe expression builder for filters and projections. Use these instead
|
||||||
|
of raw SQL strings with [where][lancedb.query.LanceQueryBuilder.where] and
|
||||||
|
[select][lancedb.query.LanceQueryBuilder.select].
|
||||||
|
|
||||||
|
::: lancedb.expr.Expr
|
||||||
|
|
||||||
|
::: lancedb.expr.col
|
||||||
|
|
||||||
|
::: lancedb.expr.lit
|
||||||
|
|
||||||
|
::: lancedb.expr.func
|
||||||
|
|
||||||
## Querying (Synchronous)
|
## Querying (Synchronous)
|
||||||
|
|
||||||
::: lancedb.query.Query
|
::: lancedb.query.Query
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# LanceDB Java SDK
|
# LanceDB Java Enterprise Client
|
||||||
|
|
||||||
## Configuration and Initialization
|
## Configuration and Initialization
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.lancedb</groupId>
|
<groupId>com.lancedb</groupId>
|
||||||
<artifactId>lancedb-parent</artifactId>
|
<artifactId>lancedb-parent</artifactId>
|
||||||
<version>0.27.0-beta.2</version>
|
<version>0.27.2-beta.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -56,21 +56,21 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-slf4j2-impl</artifactId>
|
<artifactId>log4j-slf4j2-impl</artifactId>
|
||||||
<version>2.24.3</version>
|
<version>2.25.3</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-core</artifactId>
|
<artifactId>log4j-core</artifactId>
|
||||||
<version>2.24.3</version>
|
<version>2.25.3</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-api</artifactId>
|
<artifactId>log4j-api</artifactId>
|
||||||
<version>2.24.3</version>
|
<version>2.25.3</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
20
java/pom.xml
20
java/pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.lancedb</groupId>
|
<groupId>com.lancedb</groupId>
|
||||||
<artifactId>lancedb-parent</artifactId>
|
<artifactId>lancedb-parent</artifactId>
|
||||||
<version>0.27.0-beta.2</version>
|
<version>0.27.2-beta.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>${project.artifactId}</name>
|
<name>${project.artifactId}</name>
|
||||||
<description>LanceDB Java SDK Parent POM</description>
|
<description>LanceDB Java SDK Parent POM</description>
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<arrow.version>15.0.0</arrow.version>
|
<arrow.version>15.0.0</arrow.version>
|
||||||
<lance-core.version>3.1.0-beta.2</lance-core.version>
|
<lance-core.version>3.0.1</lance-core.version>
|
||||||
<spotless.skip>false</spotless.skip>
|
<spotless.skip>false</spotless.skip>
|
||||||
<spotless.version>2.30.0</spotless.version>
|
<spotless.version>2.30.0</spotless.version>
|
||||||
<spotless.java.googlejavaformat.version>1.7</spotless.java.googlejavaformat.version>
|
<spotless.java.googlejavaformat.version>1.7</spotless.java.googlejavaformat.version>
|
||||||
@@ -111,7 +111,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
<version>2.2.1</version>
|
<version>3.3.1</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-sources</id>
|
<id>attach-sources</id>
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>2.9.1</version>
|
<version>3.11.2</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-javadocs</id>
|
<id>attach-javadocs</id>
|
||||||
@@ -178,15 +178,15 @@
|
|||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.4.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.3.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.14.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<compilerArgs>
|
<compilerArgs>
|
||||||
<arg>-h</arg>
|
<arg>-h</arg>
|
||||||
@@ -205,11 +205,11 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.4.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
<artifactId>maven-install-plugin</artifactId>
|
||||||
<version>2.5.2</version>
|
<version>3.1.3</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.diffplug.spotless</groupId>
|
<groupId>com.diffplug.spotless</groupId>
|
||||||
@@ -327,7 +327,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-gpg-plugin</artifactId>
|
<artifactId>maven-gpg-plugin</artifactId>
|
||||||
<version>1.5</version>
|
<version>3.2.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>sign-artifacts</id>
|
<id>sign-artifacts</id>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lancedb-nodejs"
|
name = "lancedb-nodejs"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
version = "0.27.0-beta.2"
|
version = "0.27.2-beta.1"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description.workspace = true
|
description.workspace = true
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
@@ -15,6 +15,8 @@ crate-type = ["cdylib"]
|
|||||||
async-trait.workspace = true
|
async-trait.workspace = true
|
||||||
arrow-ipc.workspace = true
|
arrow-ipc.workspace = true
|
||||||
arrow-array.workspace = true
|
arrow-array.workspace = true
|
||||||
|
arrow-buffer = "57.2"
|
||||||
|
half.workspace = true
|
||||||
arrow-schema.workspace = true
|
arrow-schema.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
futures.workspace = true
|
futures.workspace = true
|
||||||
@@ -25,12 +27,12 @@ napi = { version = "3.8.3", default-features = false, features = [
|
|||||||
] }
|
] }
|
||||||
napi-derive = "3.5.2"
|
napi-derive = "3.5.2"
|
||||||
# Prevent dynamic linking of lzma, which comes from datafusion
|
# Prevent dynamic linking of lzma, which comes from datafusion
|
||||||
lzma-sys = { version = "*", features = ["static"] }
|
lzma-sys = { version = "0.1", features = ["static"] }
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
|
|
||||||
# Workaround for build failure until we can fix it.
|
# Pin to resolve build failures; update periodically for security patches.
|
||||||
aws-lc-sys = "=0.28.0"
|
aws-lc-sys = "=0.38.0"
|
||||||
aws-lc-rs = "=1.13.0"
|
aws-lc-rs = "=1.16.1"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
napi-build = "2.3.1"
|
napi-build = "2.3.1"
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ describe.each([arrow15, arrow16, arrow17, arrow18])(
|
|||||||
tableFromIPC,
|
tableFromIPC,
|
||||||
DataType,
|
DataType,
|
||||||
Dictionary,
|
Dictionary,
|
||||||
|
Uint8: ArrowUint8,
|
||||||
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
||||||
} = <any>arrow;
|
} = <any>arrow;
|
||||||
type Schema = ApacheArrow["Schema"];
|
type Schema = ApacheArrow["Schema"];
|
||||||
@@ -362,6 +363,38 @@ describe.each([arrow15, arrow16, arrow17, arrow18])(
|
|||||||
).toEqual(new Float64().toString());
|
).toEqual(new Float64().toString());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("will infer FixedSizeList<Float32> from Float32Array values", async function () {
|
||||||
|
const table = makeArrowTable([
|
||||||
|
{ id: "a", vector: new Float32Array([0.1, 0.2, 0.3]) },
|
||||||
|
{ id: "b", vector: new Float32Array([0.4, 0.5, 0.6]) },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(DataType.isFixedSizeList(table.getChild("vector")?.type)).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
const vectorType = table.getChild("vector")?.type;
|
||||||
|
expect(vectorType.listSize).toBe(3);
|
||||||
|
expect(vectorType.children[0].type.toString()).toEqual(
|
||||||
|
new Float32().toString(),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("will infer FixedSizeList<Uint8> from Uint8Array values", async function () {
|
||||||
|
const table = makeArrowTable([
|
||||||
|
{ id: "a", vector: new Uint8Array([1, 2, 3]) },
|
||||||
|
{ id: "b", vector: new Uint8Array([4, 5, 6]) },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(DataType.isFixedSizeList(table.getChild("vector")?.type)).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
const vectorType = table.getChild("vector")?.type;
|
||||||
|
expect(vectorType.listSize).toBe(3);
|
||||||
|
expect(vectorType.children[0].type.toString()).toEqual(
|
||||||
|
new ArrowUint8().toString(),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it("will use dictionary encoded strings if asked", async function () {
|
it("will use dictionary encoded strings if asked", async function () {
|
||||||
const table = makeArrowTable([{ str: "hello" }]);
|
const table = makeArrowTable([{ str: "hello" }]);
|
||||||
expect(DataType.isUtf8(table.getChild("str")?.type)).toBe(true);
|
expect(DataType.isUtf8(table.getChild("str")?.type)).toBe(true);
|
||||||
|
|||||||
@@ -1259,6 +1259,98 @@ describe("schema evolution", function () {
|
|||||||
expect(await table.schema()).toEqual(expectedSchema);
|
expect(await table.schema()).toEqual(expectedSchema);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("can add columns with schema for explicit data types", async function () {
|
||||||
|
const con = await connect(tmpDir.name);
|
||||||
|
const table = await con.createTable("vectors", [
|
||||||
|
{ id: 1n, vector: [0.1, 0.2] },
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Define schema for new columns with explicit data types
|
||||||
|
// Note: All columns must be nullable when using addColumns with Schema
|
||||||
|
// because they are initially populated with null values
|
||||||
|
const newColumnsSchema = new Schema([
|
||||||
|
new Field("price", new Float64(), true),
|
||||||
|
new Field("category", new Utf8(), true),
|
||||||
|
new Field("rating", new Int32(), true),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const result = await table.addColumns(newColumnsSchema);
|
||||||
|
expect(result).toHaveProperty("version");
|
||||||
|
expect(result.version).toBe(2);
|
||||||
|
|
||||||
|
const expectedSchema = new Schema([
|
||||||
|
new Field("id", new Int64(), true),
|
||||||
|
new Field(
|
||||||
|
"vector",
|
||||||
|
new FixedSizeList(2, new Field("item", new Float32(), true)),
|
||||||
|
true,
|
||||||
|
),
|
||||||
|
new Field("price", new Float64(), true),
|
||||||
|
new Field("category", new Utf8(), true),
|
||||||
|
new Field("rating", new Int32(), true),
|
||||||
|
]);
|
||||||
|
expect(await table.schema()).toEqual(expectedSchema);
|
||||||
|
|
||||||
|
// Verify that new columns are populated with null values
|
||||||
|
const results = await table.query().toArray();
|
||||||
|
expect(results).toHaveLength(1);
|
||||||
|
expect(results[0].price).toBeNull();
|
||||||
|
expect(results[0].category).toBeNull();
|
||||||
|
expect(results[0].rating).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("can add a single column using Field", async function () {
|
||||||
|
const con = await connect(tmpDir.name);
|
||||||
|
const table = await con.createTable("vectors", [
|
||||||
|
{ id: 1n, vector: [0.1, 0.2] },
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Add a single field
|
||||||
|
const priceField = new Field("price", new Float64(), true);
|
||||||
|
const result = await table.addColumns(priceField);
|
||||||
|
expect(result).toHaveProperty("version");
|
||||||
|
expect(result.version).toBe(2);
|
||||||
|
|
||||||
|
const expectedSchema = new Schema([
|
||||||
|
new Field("id", new Int64(), true),
|
||||||
|
new Field(
|
||||||
|
"vector",
|
||||||
|
new FixedSizeList(2, new Field("item", new Float32(), true)),
|
||||||
|
true,
|
||||||
|
),
|
||||||
|
new Field("price", new Float64(), true),
|
||||||
|
]);
|
||||||
|
expect(await table.schema()).toEqual(expectedSchema);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("can add multiple columns using array of Fields", async function () {
|
||||||
|
const con = await connect(tmpDir.name);
|
||||||
|
const table = await con.createTable("vectors", [
|
||||||
|
{ id: 1n, vector: [0.1, 0.2] },
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Add multiple fields as array
|
||||||
|
const fields = [
|
||||||
|
new Field("price", new Float64(), true),
|
||||||
|
new Field("category", new Utf8(), true),
|
||||||
|
];
|
||||||
|
const result = await table.addColumns(fields);
|
||||||
|
expect(result).toHaveProperty("version");
|
||||||
|
expect(result.version).toBe(2);
|
||||||
|
|
||||||
|
const expectedSchema = new Schema([
|
||||||
|
new Field("id", new Int64(), true),
|
||||||
|
new Field(
|
||||||
|
"vector",
|
||||||
|
new FixedSizeList(2, new Field("item", new Float32(), true)),
|
||||||
|
true,
|
||||||
|
),
|
||||||
|
new Field("price", new Float64(), true),
|
||||||
|
new Field("category", new Utf8(), true),
|
||||||
|
]);
|
||||||
|
expect(await table.schema()).toEqual(expectedSchema);
|
||||||
|
});
|
||||||
|
|
||||||
it("can alter the columns in the schema", async function () {
|
it("can alter the columns in the schema", async function () {
|
||||||
const con = await connect(tmpDir.name);
|
const con = await connect(tmpDir.name);
|
||||||
const schema = new Schema([
|
const schema = new Schema([
|
||||||
@@ -1697,6 +1789,65 @@ describe.each([arrow15, arrow16, arrow17, arrow18])(
|
|||||||
expect(results2[0].text).toBe(data[1].text);
|
expect(results2[0].text).toBe(data[1].text);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("full text search fast search", async () => {
|
||||||
|
const db = await connect(tmpDir.name);
|
||||||
|
const data = [{ text: "hello world", vector: [0.1, 0.2, 0.3], id: 1 }];
|
||||||
|
const table = await db.createTable("test", data);
|
||||||
|
await table.createIndex("text", {
|
||||||
|
config: Index.fts(),
|
||||||
|
});
|
||||||
|
|
||||||
|
// Insert unindexed data after creating the index.
|
||||||
|
await table.add([{ text: "xyz", vector: [0.4, 0.5, 0.6], id: 2 }]);
|
||||||
|
|
||||||
|
const withFlatSearch = await table
|
||||||
|
.search("xyz", "fts")
|
||||||
|
.limit(10)
|
||||||
|
.toArray();
|
||||||
|
expect(withFlatSearch.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const fastSearchResults = await table
|
||||||
|
.search("xyz", "fts")
|
||||||
|
.fastSearch()
|
||||||
|
.limit(10)
|
||||||
|
.toArray();
|
||||||
|
expect(fastSearchResults.length).toBe(0);
|
||||||
|
|
||||||
|
const nearestToTextFastSearch = await table
|
||||||
|
.query()
|
||||||
|
.nearestToText("xyz")
|
||||||
|
.fastSearch()
|
||||||
|
.limit(10)
|
||||||
|
.toArray();
|
||||||
|
expect(nearestToTextFastSearch.length).toBe(0);
|
||||||
|
|
||||||
|
// fastSearch should be chainable with other methods.
|
||||||
|
const chainedFastSearch = await table
|
||||||
|
.search("xyz", "fts")
|
||||||
|
.fastSearch()
|
||||||
|
.select(["text"])
|
||||||
|
.limit(5)
|
||||||
|
.toArray();
|
||||||
|
expect(chainedFastSearch.length).toBe(0);
|
||||||
|
|
||||||
|
await table.optimize();
|
||||||
|
|
||||||
|
const indexedFastSearch = await table
|
||||||
|
.search("xyz", "fts")
|
||||||
|
.fastSearch()
|
||||||
|
.limit(10)
|
||||||
|
.toArray();
|
||||||
|
expect(indexedFastSearch.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const indexedNearestToTextFastSearch = await table
|
||||||
|
.query()
|
||||||
|
.nearestToText("xyz")
|
||||||
|
.fastSearch()
|
||||||
|
.limit(10)
|
||||||
|
.toArray();
|
||||||
|
expect(indexedNearestToTextFastSearch.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
test("prewarm full text search index", async () => {
|
test("prewarm full text search index", async () => {
|
||||||
const db = await connect(tmpDir.name);
|
const db = await connect(tmpDir.name);
|
||||||
const data = [
|
const data = [
|
||||||
@@ -2145,3 +2296,36 @@ describe("when creating an empty table", () => {
|
|||||||
expect((actualSchema.fields[1].type as Float64).precision).toBe(2);
|
expect((actualSchema.fields[1].type as Float64).precision).toBe(2);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Ensure we can create float32 arrays without using Arrow
|
||||||
|
// by utilizing native JS TypedArray support
|
||||||
|
//
|
||||||
|
// https://github.com/lancedb/lancedb/issues/3115
|
||||||
|
describe("when creating a table with Float32Array vectors", () => {
|
||||||
|
let tmpDir: tmp.DirResult;
|
||||||
|
beforeEach(() => {
|
||||||
|
tmpDir = tmp.dirSync({ unsafeCleanup: true });
|
||||||
|
});
|
||||||
|
afterEach(() => {
|
||||||
|
tmpDir.removeCallback();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should persist Float32Array as FixedSizeList<Float32> in the LanceDB schema", async () => {
|
||||||
|
const db = await connect(tmpDir.name);
|
||||||
|
const table = await db.createTable("test", [
|
||||||
|
{ id: "a", vector: new Float32Array([0.1, 0.2, 0.3]) },
|
||||||
|
{ id: "b", vector: new Float32Array([0.4, 0.5, 0.6]) },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const schema = await table.schema();
|
||||||
|
const vectorField = schema.fields.find((f) => f.name === "vector");
|
||||||
|
expect(vectorField).toBeDefined();
|
||||||
|
expect(vectorField!.type).toBeInstanceOf(FixedSizeList);
|
||||||
|
|
||||||
|
const fsl = vectorField!.type as FixedSizeList;
|
||||||
|
expect(fsl.listSize).toBe(3);
|
||||||
|
expect(fsl.children[0].type.typeId).toBe(Type.Float);
|
||||||
|
// precision: HALF=0, SINGLE=1, DOUBLE=2
|
||||||
|
expect((fsl.children[0].type as Float32).precision).toBe(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
110
nodejs/__test__/vector_types.test.ts
Normal file
110
nodejs/__test__/vector_types.test.ts
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
import * as tmp from "tmp";
|
||||||
|
|
||||||
|
import { type Table, connect } from "../lancedb";
|
||||||
|
import {
|
||||||
|
Field,
|
||||||
|
FixedSizeList,
|
||||||
|
Float32,
|
||||||
|
Int64,
|
||||||
|
Schema,
|
||||||
|
makeArrowTable,
|
||||||
|
} from "../lancedb/arrow";
|
||||||
|
|
||||||
|
describe("Vector query with different typed arrays", () => {
|
||||||
|
let tmpDir: tmp.DirResult;
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
tmpDir?.removeCallback();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function createFloat32Table(): Promise<Table> {
|
||||||
|
tmpDir = tmp.dirSync({ unsafeCleanup: true });
|
||||||
|
const db = await connect(tmpDir.name);
|
||||||
|
const schema = new Schema([
|
||||||
|
new Field("id", new Int64(), true),
|
||||||
|
new Field(
|
||||||
|
"vec",
|
||||||
|
new FixedSizeList(2, new Field("item", new Float32())),
|
||||||
|
true,
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
const data = makeArrowTable(
|
||||||
|
[
|
||||||
|
{ id: 1n, vec: [1.0, 0.0] },
|
||||||
|
{ id: 2n, vec: [0.0, 1.0] },
|
||||||
|
{ id: 3n, vec: [1.0, 1.0] },
|
||||||
|
],
|
||||||
|
{ schema },
|
||||||
|
);
|
||||||
|
return db.createTable("test_f32", data);
|
||||||
|
}
|
||||||
|
|
||||||
|
it("should search with Float32Array (baseline)", async () => {
|
||||||
|
const table = await createFloat32Table();
|
||||||
|
const results = await table
|
||||||
|
.query()
|
||||||
|
.nearestTo(new Float32Array([1.0, 0.0]))
|
||||||
|
.limit(1)
|
||||||
|
.toArray();
|
||||||
|
|
||||||
|
expect(results.length).toBe(1);
|
||||||
|
expect(Number(results[0].id)).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should search with number[] (backward compat)", async () => {
|
||||||
|
const table = await createFloat32Table();
|
||||||
|
const results = await table
|
||||||
|
.query()
|
||||||
|
.nearestTo([1.0, 0.0])
|
||||||
|
.limit(1)
|
||||||
|
.toArray();
|
||||||
|
|
||||||
|
expect(results.length).toBe(1);
|
||||||
|
expect(Number(results[0].id)).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should search with Float64Array via raw path", async () => {
|
||||||
|
const table = await createFloat32Table();
|
||||||
|
const results = await table
|
||||||
|
.query()
|
||||||
|
.nearestTo(new Float64Array([1.0, 0.0]))
|
||||||
|
.limit(1)
|
||||||
|
.toArray();
|
||||||
|
|
||||||
|
expect(results.length).toBe(1);
|
||||||
|
expect(Number(results[0].id)).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should add multiple query vectors with Float64Array", async () => {
|
||||||
|
const table = await createFloat32Table();
|
||||||
|
const results = await table
|
||||||
|
.query()
|
||||||
|
.nearestTo(new Float64Array([1.0, 0.0]))
|
||||||
|
.addQueryVector(new Float64Array([0.0, 1.0]))
|
||||||
|
.limit(2)
|
||||||
|
.toArray();
|
||||||
|
|
||||||
|
expect(results.length).toBeGreaterThanOrEqual(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Float16Array is only available in Node 22+; not in TypeScript's standard lib yet
|
||||||
|
const float16ArrayCtor = (globalThis as unknown as Record<string, unknown>)
|
||||||
|
.Float16Array as (new (values: number[]) => unknown) | undefined;
|
||||||
|
const hasFloat16 = float16ArrayCtor !== undefined;
|
||||||
|
const f16it = hasFloat16 ? it : it.skip;
|
||||||
|
|
||||||
|
f16it("should search with Float16Array via raw path", async () => {
|
||||||
|
const table = await createFloat32Table();
|
||||||
|
const results = await table
|
||||||
|
.query()
|
||||||
|
.nearestTo(new float16ArrayCtor!([1.0, 0.0]) as Float32Array)
|
||||||
|
.limit(1)
|
||||||
|
.toArray();
|
||||||
|
|
||||||
|
expect(results.length).toBe(1);
|
||||||
|
expect(Number(results[0].id)).toBe(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
599
nodejs/examples/package-lock.json
generated
599
nodejs/examples/package-lock.json
generated
@@ -30,12 +30,15 @@
|
|||||||
"x64",
|
"x64",
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
"darwin",
|
"darwin",
|
||||||
"linux",
|
"linux",
|
||||||
"win32"
|
"win32"
|
||||||
],
|
],
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"reflect-metadata": "^0.2.2"
|
"reflect-metadata": "^0.2.2"
|
||||||
},
|
},
|
||||||
@@ -91,14 +94,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
"version": "7.26.2",
|
"version": "7.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
|
||||||
"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
|
"integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/helper-validator-identifier": "^7.25.9",
|
"@babel/helper-validator-identifier": "^7.28.5",
|
||||||
"js-tokens": "^4.0.0",
|
"js-tokens": "^4.0.0",
|
||||||
"picocolors": "^1.0.0"
|
"picocolors": "^1.1.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
@@ -233,19 +237,21 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/helper-string-parser": {
|
"node_modules/@babel/helper-string-parser": {
|
||||||
"version": "7.25.9",
|
"version": "7.27.1",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
|
||||||
"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
|
"integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/helper-validator-identifier": {
|
"node_modules/@babel/helper-validator-identifier": {
|
||||||
"version": "7.25.9",
|
"version": "7.28.5",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
|
||||||
"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
|
"integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
@@ -260,25 +266,27 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/helpers": {
|
"node_modules/@babel/helpers": {
|
||||||
"version": "7.26.0",
|
"version": "7.28.6",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
|
||||||
"integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
|
"integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/template": "^7.25.9",
|
"@babel/template": "^7.28.6",
|
||||||
"@babel/types": "^7.26.0"
|
"@babel/types": "^7.28.6"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/parser": {
|
"node_modules/@babel/parser": {
|
||||||
"version": "7.26.2",
|
"version": "7.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
|
||||||
"integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
|
"integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/types": "^7.26.0"
|
"@babel/types": "^7.29.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"parser": "bin/babel-parser.js"
|
"parser": "bin/babel-parser.js"
|
||||||
@@ -510,14 +518,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/template": {
|
"node_modules/@babel/template": {
|
||||||
"version": "7.25.9",
|
"version": "7.28.6",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
|
||||||
"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
|
"integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/code-frame": "^7.25.9",
|
"@babel/code-frame": "^7.28.6",
|
||||||
"@babel/parser": "^7.25.9",
|
"@babel/parser": "^7.28.6",
|
||||||
"@babel/types": "^7.25.9"
|
"@babel/types": "^7.28.6"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
@@ -542,13 +551,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/types": {
|
"node_modules/@babel/types": {
|
||||||
"version": "7.26.0",
|
"version": "7.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
|
||||||
"integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
|
"integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/helper-string-parser": "^7.25.9",
|
"@babel/helper-string-parser": "^7.27.1",
|
||||||
"@babel/helper-validator-identifier": "^7.25.9"
|
"@babel/helper-validator-identifier": "^7.28.5"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
@@ -1151,95 +1161,6 @@
|
|||||||
"url": "https://opencollective.com/libvips"
|
"url": "https://opencollective.com/libvips"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@isaacs/cliui": {
|
|
||||||
"version": "8.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
|
|
||||||
"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
|
|
||||||
"dependencies": {
|
|
||||||
"string-width": "^5.1.2",
|
|
||||||
"string-width-cjs": "npm:string-width@^4.2.0",
|
|
||||||
"strip-ansi": "^7.0.1",
|
|
||||||
"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
|
|
||||||
"wrap-ansi": "^8.1.0",
|
|
||||||
"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
|
|
||||||
"version": "6.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
|
|
||||||
"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/ansi-regex?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
|
|
||||||
"version": "6.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
|
|
||||||
"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/cliui/node_modules/emoji-regex": {
|
|
||||||
"version": "9.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
|
|
||||||
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/cliui/node_modules/string-width": {
|
|
||||||
"version": "5.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
|
|
||||||
"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
|
|
||||||
"dependencies": {
|
|
||||||
"eastasianwidth": "^0.2.0",
|
|
||||||
"emoji-regex": "^9.2.2",
|
|
||||||
"strip-ansi": "^7.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/cliui/node_modules/strip-ansi": {
|
|
||||||
"version": "7.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
|
|
||||||
"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"ansi-regex": "^6.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
|
|
||||||
"version": "8.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
|
|
||||||
"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"ansi-styles": "^6.1.0",
|
|
||||||
"string-width": "^5.0.1",
|
|
||||||
"strip-ansi": "^7.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@isaacs/fs-minipass": {
|
"node_modules/@isaacs/fs-minipass": {
|
||||||
"version": "4.0.1",
|
"version": "4.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
|
||||||
@@ -1606,15 +1527,6 @@
|
|||||||
"resolved": "../dist",
|
"resolved": "../dist",
|
||||||
"link": true
|
"link": true
|
||||||
},
|
},
|
||||||
"node_modules/@pkgjs/parseargs": {
|
|
||||||
"version": "0.11.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
|
|
||||||
"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
|
|
||||||
"optional": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/aspromise": {
|
"node_modules/@protobufjs/aspromise": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
|
||||||
@@ -1846,6 +1758,7 @@
|
|||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
|
||||||
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
|
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
|
||||||
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
@@ -1854,6 +1767,7 @@
|
|||||||
"version": "4.3.0",
|
"version": "4.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||||
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"color-convert": "^2.0.1"
|
"color-convert": "^2.0.1"
|
||||||
},
|
},
|
||||||
@@ -2019,13 +1933,15 @@
|
|||||||
"node_modules/balanced-match": {
|
"node_modules/balanced-match": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
|
||||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
|
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
|
||||||
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
|
||||||
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
|
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
@@ -2102,6 +2018,19 @@
|
|||||||
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
|
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"node_modules/call-bind-apply-helpers": {
|
||||||
|
"version": "1.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
|
||||||
|
"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"es-errors": "^1.3.0",
|
||||||
|
"function-bind": "^1.1.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/callsites": {
|
"node_modules/callsites": {
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
|
||||||
@@ -2298,9 +2227,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/cross-spawn": {
|
"node_modules/cross-spawn": {
|
||||||
"version": "7.0.3",
|
"version": "7.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||||
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
|
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"path-key": "^3.1.0",
|
"path-key": "^3.1.0",
|
||||||
"shebang-command": "^2.0.0",
|
"shebang-command": "^2.0.0",
|
||||||
@@ -2384,10 +2315,19 @@
|
|||||||
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
|
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eastasianwidth": {
|
"node_modules/dunder-proto": {
|
||||||
"version": "0.2.0",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
|
||||||
"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
|
"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"call-bind-apply-helpers": "^1.0.1",
|
||||||
|
"es-errors": "^1.3.0",
|
||||||
|
"gopd": "^1.2.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"node_modules/ejs": {
|
"node_modules/ejs": {
|
||||||
"version": "3.1.10",
|
"version": "3.1.10",
|
||||||
@@ -2425,7 +2365,8 @@
|
|||||||
"node_modules/emoji-regex": {
|
"node_modules/emoji-regex": {
|
||||||
"version": "8.0.0",
|
"version": "8.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
|
||||||
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
|
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
|
||||||
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/error-ex": {
|
"node_modules/error-ex": {
|
||||||
"version": "1.3.2",
|
"version": "1.3.2",
|
||||||
@@ -2442,6 +2383,51 @@
|
|||||||
"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
|
"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"node_modules/es-define-property": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/es-errors": {
|
||||||
|
"version": "1.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
|
||||||
|
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/es-object-atoms": {
|
||||||
|
"version": "1.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
|
||||||
|
"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"es-errors": "^1.3.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/es-set-tostringtag": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"es-errors": "^1.3.0",
|
||||||
|
"get-intrinsic": "^1.2.6",
|
||||||
|
"has-tostringtag": "^1.0.2",
|
||||||
|
"hasown": "^2.0.2"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/escalade": {
|
"node_modules/escalade": {
|
||||||
"version": "3.2.0",
|
"version": "3.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
|
||||||
@@ -2554,19 +2540,21 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/filelist/node_modules/brace-expansion": {
|
"node_modules/filelist/node_modules/brace-expansion": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
|
||||||
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
|
"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"balanced-match": "^1.0.0"
|
"balanced-match": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/filelist/node_modules/minimatch": {
|
"node_modules/filelist/node_modules/minimatch": {
|
||||||
"version": "5.1.6",
|
"version": "5.1.9",
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
|
||||||
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
|
"integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"brace-expansion": "^2.0.1"
|
"brace-expansion": "^2.0.1"
|
||||||
},
|
},
|
||||||
@@ -2604,39 +2592,16 @@
|
|||||||
"resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-1.12.0.tgz",
|
"resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-1.12.0.tgz",
|
||||||
"integrity": "sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ=="
|
"integrity": "sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ=="
|
||||||
},
|
},
|
||||||
"node_modules/foreground-child": {
|
|
||||||
"version": "3.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
|
|
||||||
"integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
|
|
||||||
"dependencies": {
|
|
||||||
"cross-spawn": "^7.0.0",
|
|
||||||
"signal-exit": "^4.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/foreground-child/node_modules/signal-exit": {
|
|
||||||
"version": "4.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
|
|
||||||
"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/form-data": {
|
"node_modules/form-data": {
|
||||||
"version": "4.0.1",
|
"version": "4.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
|
||||||
"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
|
"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"asynckit": "^0.4.0",
|
"asynckit": "^0.4.0",
|
||||||
"combined-stream": "^1.0.8",
|
"combined-stream": "^1.0.8",
|
||||||
|
"es-set-tostringtag": "^2.1.0",
|
||||||
|
"hasown": "^2.0.2",
|
||||||
"mime-types": "^2.1.12"
|
"mime-types": "^2.1.12"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -2684,7 +2649,6 @@
|
|||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
|
||||||
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
|
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
|
||||||
"dev": true,
|
|
||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
@@ -2707,6 +2671,30 @@
|
|||||||
"node": "6.* || 8.* || >= 10.*"
|
"node": "6.* || 8.* || >= 10.*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/get-intrinsic": {
|
||||||
|
"version": "1.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
|
||||||
|
"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"call-bind-apply-helpers": "^1.0.2",
|
||||||
|
"es-define-property": "^1.0.1",
|
||||||
|
"es-errors": "^1.3.0",
|
||||||
|
"es-object-atoms": "^1.1.1",
|
||||||
|
"function-bind": "^1.1.2",
|
||||||
|
"get-proto": "^1.0.1",
|
||||||
|
"gopd": "^1.2.0",
|
||||||
|
"has-symbols": "^1.1.0",
|
||||||
|
"hasown": "^2.0.2",
|
||||||
|
"math-intrinsics": "^1.1.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/get-package-type": {
|
"node_modules/get-package-type": {
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
|
||||||
@@ -2716,6 +2704,19 @@
|
|||||||
"node": ">=8.0.0"
|
"node": ">=8.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/get-proto": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"dunder-proto": "^1.0.1",
|
||||||
|
"es-object-atoms": "^1.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/get-stream": {
|
"node_modules/get-stream": {
|
||||||
"version": "6.0.1",
|
"version": "6.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
|
||||||
@@ -2758,6 +2759,18 @@
|
|||||||
"node": ">=4"
|
"node": ">=4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/gopd": {
|
||||||
|
"version": "1.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
|
||||||
|
"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/graceful-fs": {
|
"node_modules/graceful-fs": {
|
||||||
"version": "4.2.11",
|
"version": "4.2.11",
|
||||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
|
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
|
||||||
@@ -2778,11 +2791,37 @@
|
|||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/has-symbols": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/has-tostringtag": {
|
||||||
|
"version": "1.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
|
||||||
|
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"has-symbols": "^1.0.3"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/hasown": {
|
"node_modules/hasown": {
|
||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
|
||||||
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
|
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"function-bind": "^1.1.2"
|
"function-bind": "^1.1.2"
|
||||||
},
|
},
|
||||||
@@ -2882,6 +2921,7 @@
|
|||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
|
||||||
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
|
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
|
||||||
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
@@ -2919,7 +2959,8 @@
|
|||||||
"node_modules/isexe": {
|
"node_modules/isexe": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
||||||
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
|
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
|
||||||
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/istanbul-lib-coverage": {
|
"node_modules/istanbul-lib-coverage": {
|
||||||
"version": "3.2.2",
|
"version": "3.2.2",
|
||||||
@@ -2987,20 +3028,6 @@
|
|||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/jackspeak": {
|
|
||||||
"version": "3.4.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
|
|
||||||
"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
|
|
||||||
"dependencies": {
|
|
||||||
"@isaacs/cliui": "^8.0.2"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"@pkgjs/parseargs": "^0.11.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/jake": {
|
"node_modules/jake": {
|
||||||
"version": "10.9.2",
|
"version": "10.9.2",
|
||||||
"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
|
"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
|
||||||
@@ -3605,10 +3632,11 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/js-yaml": {
|
"node_modules/js-yaml": {
|
||||||
"version": "3.14.1",
|
"version": "3.14.2",
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
|
||||||
"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
|
"integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"argparse": "^1.0.7",
|
"argparse": "^1.0.7",
|
||||||
"esprima": "^4.0.0"
|
"esprima": "^4.0.0"
|
||||||
@@ -3728,6 +3756,15 @@
|
|||||||
"tmpl": "1.0.5"
|
"tmpl": "1.0.5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/math-intrinsics": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/merge-stream": {
|
"node_modules/merge-stream": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
|
||||||
@@ -3776,10 +3813,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minimatch": {
|
"node_modules/minimatch": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.5",
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
|
||||||
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
|
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"brace-expansion": "^1.1.7"
|
"brace-expansion": "^1.1.7"
|
||||||
},
|
},
|
||||||
@@ -3796,31 +3834,17 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minizlib": {
|
"node_modules/minizlib": {
|
||||||
"version": "3.0.1",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
|
||||||
"integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
|
"integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minipass": "^7.0.4",
|
"minipass": "^7.1.2"
|
||||||
"rimraf": "^5.0.5"
|
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 18"
|
"node": ">= 18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/mkdirp": {
|
|
||||||
"version": "3.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
|
|
||||||
"integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
|
|
||||||
"bin": {
|
|
||||||
"mkdirp": "dist/cjs/src/bin.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ms": {
|
"node_modules/ms": {
|
||||||
"version": "2.1.3",
|
"version": "2.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||||
@@ -4010,11 +4034,6 @@
|
|||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/package-json-from-dist": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
|
|
||||||
},
|
|
||||||
"node_modules/parse-json": {
|
"node_modules/parse-json": {
|
||||||
"version": "5.2.0",
|
"version": "5.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
|
||||||
@@ -4055,6 +4074,7 @@
|
|||||||
"version": "3.1.1",
|
"version": "3.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||||
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
|
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
|
||||||
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
@@ -4065,26 +4085,6 @@
|
|||||||
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
|
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/path-scurry": {
|
|
||||||
"version": "1.11.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
|
|
||||||
"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
|
|
||||||
"dependencies": {
|
|
||||||
"lru-cache": "^10.2.0",
|
|
||||||
"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16 || 14 >=14.18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/path-scurry/node_modules/lru-cache": {
|
|
||||||
"version": "10.4.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
|
|
||||||
"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
|
|
||||||
},
|
|
||||||
"node_modules/picocolors": {
|
"node_modules/picocolors": {
|
||||||
"version": "1.1.1",
|
"version": "1.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
|
||||||
@@ -4246,61 +4246,6 @@
|
|||||||
"node": ">=10"
|
"node": ">=10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/rimraf": {
|
|
||||||
"version": "5.0.10",
|
|
||||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
|
|
||||||
"integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"glob": "^10.3.7"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"rimraf": "dist/esm/bin.mjs"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rimraf/node_modules/brace-expansion": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
|
|
||||||
"dependencies": {
|
|
||||||
"balanced-match": "^1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rimraf/node_modules/glob": {
|
|
||||||
"version": "10.4.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
|
|
||||||
"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
|
|
||||||
"dependencies": {
|
|
||||||
"foreground-child": "^3.1.0",
|
|
||||||
"jackspeak": "^3.1.2",
|
|
||||||
"minimatch": "^9.0.4",
|
|
||||||
"minipass": "^7.1.2",
|
|
||||||
"package-json-from-dist": "^1.0.0",
|
|
||||||
"path-scurry": "^1.11.1"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"glob": "dist/esm/bin.mjs"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rimraf/node_modules/minimatch": {
|
|
||||||
"version": "9.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
|
|
||||||
"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
|
|
||||||
"dependencies": {
|
|
||||||
"brace-expansion": "^2.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16 || 14 >=14.17"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/semver": {
|
"node_modules/semver": {
|
||||||
"version": "7.6.3",
|
"version": "7.6.3",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
|
||||||
@@ -4354,6 +4299,7 @@
|
|||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
|
||||||
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
|
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
|
||||||
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"shebang-regex": "^3.0.0"
|
"shebang-regex": "^3.0.0"
|
||||||
},
|
},
|
||||||
@@ -4365,6 +4311,7 @@
|
|||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
|
||||||
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
|
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
|
||||||
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
@@ -4452,20 +4399,7 @@
|
|||||||
"version": "4.2.3",
|
"version": "4.2.3",
|
||||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
||||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
||||||
"dependencies": {
|
"dev": true,
|
||||||
"emoji-regex": "^8.0.0",
|
|
||||||
"is-fullwidth-code-point": "^3.0.0",
|
|
||||||
"strip-ansi": "^6.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/string-width-cjs": {
|
|
||||||
"name": "string-width",
|
|
||||||
"version": "4.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
|
||||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"emoji-regex": "^8.0.0",
|
"emoji-regex": "^8.0.0",
|
||||||
"is-fullwidth-code-point": "^3.0.0",
|
"is-fullwidth-code-point": "^3.0.0",
|
||||||
@@ -4479,18 +4413,7 @@
|
|||||||
"version": "6.0.1",
|
"version": "6.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
||||||
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
|
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
|
||||||
"dependencies": {
|
"dev": true,
|
||||||
"ansi-regex": "^5.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/strip-ansi-cjs": {
|
|
||||||
"name": "strip-ansi",
|
|
||||||
"version": "6.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
|
||||||
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ansi-regex": "^5.0.1"
|
"ansi-regex": "^5.0.1"
|
||||||
},
|
},
|
||||||
@@ -4541,15 +4464,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tar": {
|
"node_modules/tar": {
|
||||||
"version": "7.4.3",
|
"version": "7.5.10",
|
||||||
"resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
|
"resolved": "https://registry.npmjs.org/tar/-/tar-7.5.10.tgz",
|
||||||
"integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
|
"integrity": "sha512-8mOPs1//5q/rlkNSPcCegA6hiHJYDmSLEI8aMH/CdSQJNWztHC9WHNam5zdQlfpTwB9Xp7IBEsHfV5LKMJGVAw==",
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@isaacs/fs-minipass": "^4.0.0",
|
"@isaacs/fs-minipass": "^4.0.0",
|
||||||
"chownr": "^3.0.0",
|
"chownr": "^3.0.0",
|
||||||
"minipass": "^7.1.2",
|
"minipass": "^7.1.2",
|
||||||
"minizlib": "^3.0.1",
|
"minizlib": "^3.1.0",
|
||||||
"mkdirp": "^3.0.1",
|
|
||||||
"yallist": "^5.0.0"
|
"yallist": "^5.0.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -4782,6 +4705,7 @@
|
|||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||||
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
|
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
|
||||||
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"isexe": "^2.0.0"
|
"isexe": "^2.0.0"
|
||||||
},
|
},
|
||||||
@@ -4809,23 +4733,6 @@
|
|||||||
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/wrap-ansi-cjs": {
|
|
||||||
"name": "wrap-ansi",
|
|
||||||
"version": "7.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
|
||||||
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
|
|
||||||
"dependencies": {
|
|
||||||
"ansi-styles": "^4.0.0",
|
|
||||||
"string-width": "^4.1.0",
|
|
||||||
"strip-ansi": "^6.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/wrappy": {
|
"node_modules/wrappy": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ import {
|
|||||||
Float32,
|
Float32,
|
||||||
Float64,
|
Float64,
|
||||||
Int,
|
Int,
|
||||||
|
Int8,
|
||||||
|
Int16,
|
||||||
Int32,
|
Int32,
|
||||||
Int64,
|
Int64,
|
||||||
LargeBinary,
|
LargeBinary,
|
||||||
@@ -35,6 +37,8 @@ import {
|
|||||||
Timestamp,
|
Timestamp,
|
||||||
Type,
|
Type,
|
||||||
Uint8,
|
Uint8,
|
||||||
|
Uint16,
|
||||||
|
Uint32,
|
||||||
Utf8,
|
Utf8,
|
||||||
Vector,
|
Vector,
|
||||||
makeVector as arrowMakeVector,
|
makeVector as arrowMakeVector,
|
||||||
@@ -113,8 +117,9 @@ export type TableLike =
|
|||||||
export type IntoVector =
|
export type IntoVector =
|
||||||
| Float32Array
|
| Float32Array
|
||||||
| Float64Array
|
| Float64Array
|
||||||
|
| Uint8Array
|
||||||
| number[]
|
| number[]
|
||||||
| Promise<Float32Array | Float64Array | number[]>;
|
| Promise<Float32Array | Float64Array | Uint8Array | number[]>;
|
||||||
|
|
||||||
export type MultiVector = IntoVector[];
|
export type MultiVector = IntoVector[];
|
||||||
|
|
||||||
@@ -122,14 +127,48 @@ export function isMultiVector(value: unknown): value is MultiVector {
|
|||||||
return Array.isArray(value) && isIntoVector(value[0]);
|
return Array.isArray(value) && isIntoVector(value[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Float16Array is not in TypeScript's standard lib yet; access dynamically
|
||||||
|
type Float16ArrayCtor = new (
|
||||||
|
...args: unknown[]
|
||||||
|
) => { buffer: ArrayBuffer; byteOffset: number; byteLength: number };
|
||||||
|
const float16ArrayCtor = (globalThis as unknown as Record<string, unknown>)
|
||||||
|
.Float16Array as Float16ArrayCtor | undefined;
|
||||||
|
|
||||||
export function isIntoVector(value: unknown): value is IntoVector {
|
export function isIntoVector(value: unknown): value is IntoVector {
|
||||||
return (
|
return (
|
||||||
value instanceof Float32Array ||
|
value instanceof Float32Array ||
|
||||||
value instanceof Float64Array ||
|
value instanceof Float64Array ||
|
||||||
|
value instanceof Uint8Array ||
|
||||||
|
(float16ArrayCtor !== undefined && value instanceof float16ArrayCtor) ||
|
||||||
(Array.isArray(value) && !Array.isArray(value[0]))
|
(Array.isArray(value) && !Array.isArray(value[0]))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract the underlying byte buffer and data type from a typed array
|
||||||
|
* for passing to the Rust NAPI layer without precision loss.
|
||||||
|
*/
|
||||||
|
export function extractVectorBuffer(
|
||||||
|
vector: Float32Array | Float64Array | Uint8Array,
|
||||||
|
): { data: Uint8Array; dtype: string } | null {
|
||||||
|
if (float16ArrayCtor !== undefined && vector instanceof float16ArrayCtor) {
|
||||||
|
return {
|
||||||
|
data: new Uint8Array(vector.buffer, vector.byteOffset, vector.byteLength),
|
||||||
|
dtype: "float16",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (vector instanceof Float64Array) {
|
||||||
|
return {
|
||||||
|
data: new Uint8Array(vector.buffer, vector.byteOffset, vector.byteLength),
|
||||||
|
dtype: "float64",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (vector instanceof Uint8Array && !(vector instanceof Float32Array)) {
|
||||||
|
return { data: vector, dtype: "uint8" };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
export function isArrowTable(value: object): value is TableLike {
|
export function isArrowTable(value: object): value is TableLike {
|
||||||
if (value instanceof ArrowTable) return true;
|
if (value instanceof ArrowTable) return true;
|
||||||
return "schema" in value && "batches" in value;
|
return "schema" in value && "batches" in value;
|
||||||
@@ -529,7 +568,8 @@ function isObject(value: unknown): value is Record<string, unknown> {
|
|||||||
!(value instanceof Date) &&
|
!(value instanceof Date) &&
|
||||||
!(value instanceof Set) &&
|
!(value instanceof Set) &&
|
||||||
!(value instanceof Map) &&
|
!(value instanceof Map) &&
|
||||||
!(value instanceof Buffer)
|
!(value instanceof Buffer) &&
|
||||||
|
!ArrayBuffer.isView(value)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -588,6 +628,13 @@ function inferType(
|
|||||||
return new Bool();
|
return new Bool();
|
||||||
} else if (value instanceof Buffer) {
|
} else if (value instanceof Buffer) {
|
||||||
return new Binary();
|
return new Binary();
|
||||||
|
} else if (ArrayBuffer.isView(value) && !(value instanceof DataView)) {
|
||||||
|
const info = typedArrayToArrowType(value);
|
||||||
|
if (info !== undefined) {
|
||||||
|
const child = new Field("item", info.elementType, true);
|
||||||
|
return new FixedSizeList(info.length, child);
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
} else if (Array.isArray(value)) {
|
} else if (Array.isArray(value)) {
|
||||||
if (value.length === 0) {
|
if (value.length === 0) {
|
||||||
return undefined; // Without any values we can't infer the type
|
return undefined; // Without any values we can't infer the type
|
||||||
@@ -746,6 +793,32 @@ function makeListVector(lists: unknown[][]): Vector<unknown> {
|
|||||||
return listBuilder.finish().toVector();
|
return listBuilder.finish().toVector();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Map a JS TypedArray instance to the corresponding Arrow element DataType
|
||||||
|
* and its length. Returns undefined if the value is not a recognized TypedArray.
|
||||||
|
*/
|
||||||
|
function typedArrayToArrowType(
|
||||||
|
value: ArrayBufferView,
|
||||||
|
): { elementType: DataType; length: number } | undefined {
|
||||||
|
if (value instanceof Float32Array)
|
||||||
|
return { elementType: new Float32(), length: value.length };
|
||||||
|
if (value instanceof Float64Array)
|
||||||
|
return { elementType: new Float64(), length: value.length };
|
||||||
|
if (value instanceof Uint8Array)
|
||||||
|
return { elementType: new Uint8(), length: value.length };
|
||||||
|
if (value instanceof Uint16Array)
|
||||||
|
return { elementType: new Uint16(), length: value.length };
|
||||||
|
if (value instanceof Uint32Array)
|
||||||
|
return { elementType: new Uint32(), length: value.length };
|
||||||
|
if (value instanceof Int8Array)
|
||||||
|
return { elementType: new Int8(), length: value.length };
|
||||||
|
if (value instanceof Int16Array)
|
||||||
|
return { elementType: new Int16(), length: value.length };
|
||||||
|
if (value instanceof Int32Array)
|
||||||
|
return { elementType: new Int32(), length: value.length };
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
/** Helper function to convert an Array of JS values to an Arrow Vector */
|
/** Helper function to convert an Array of JS values to an Arrow Vector */
|
||||||
function makeVector(
|
function makeVector(
|
||||||
values: unknown[],
|
values: unknown[],
|
||||||
@@ -814,6 +887,16 @@ function makeVector(
|
|||||||
"makeVector cannot infer the type if all values are null or undefined",
|
"makeVector cannot infer the type if all values are null or undefined",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if (ArrayBuffer.isView(sampleValue) && !(sampleValue instanceof DataView)) {
|
||||||
|
const info = typedArrayToArrowType(sampleValue);
|
||||||
|
if (info !== undefined) {
|
||||||
|
const fslType = new FixedSizeList(
|
||||||
|
info.length,
|
||||||
|
new Field("item", info.elementType, true),
|
||||||
|
);
|
||||||
|
return vectorFromArray(values, fslType);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (Array.isArray(sampleValue)) {
|
if (Array.isArray(sampleValue)) {
|
||||||
// Default Arrow inference doesn't handle list types
|
// Default Arrow inference doesn't handle list types
|
||||||
return makeListVector(values as unknown[][]);
|
return makeListVector(values as unknown[][]);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
Table as ArrowTable,
|
Table as ArrowTable,
|
||||||
type IntoVector,
|
type IntoVector,
|
||||||
RecordBatch,
|
RecordBatch,
|
||||||
|
extractVectorBuffer,
|
||||||
fromBufferToRecordBatch,
|
fromBufferToRecordBatch,
|
||||||
fromRecordBatchToBuffer,
|
fromRecordBatchToBuffer,
|
||||||
tableFromIPC,
|
tableFromIPC,
|
||||||
@@ -661,10 +662,8 @@ export class VectorQuery extends StandardQueryBase<NativeVectorQuery> {
|
|||||||
const res = (async () => {
|
const res = (async () => {
|
||||||
try {
|
try {
|
||||||
const v = await vector;
|
const v = await vector;
|
||||||
const arr = Float32Array.from(v);
|
|
||||||
//
|
|
||||||
// biome-ignore lint/suspicious/noExplicitAny: we need to get the `inner`, but js has no package scoping
|
// biome-ignore lint/suspicious/noExplicitAny: we need to get the `inner`, but js has no package scoping
|
||||||
const value: any = this.addQueryVector(arr);
|
const value: any = this.addQueryVector(v);
|
||||||
const inner = value.inner as
|
const inner = value.inner as
|
||||||
| NativeVectorQuery
|
| NativeVectorQuery
|
||||||
| Promise<NativeVectorQuery>;
|
| Promise<NativeVectorQuery>;
|
||||||
@@ -676,7 +675,12 @@ export class VectorQuery extends StandardQueryBase<NativeVectorQuery> {
|
|||||||
return new VectorQuery(res);
|
return new VectorQuery(res);
|
||||||
} else {
|
} else {
|
||||||
super.doCall((inner) => {
|
super.doCall((inner) => {
|
||||||
inner.addQueryVector(Float32Array.from(vector));
|
const raw = Array.isArray(vector) ? null : extractVectorBuffer(vector);
|
||||||
|
if (raw) {
|
||||||
|
inner.addQueryVectorRaw(raw.data, raw.dtype);
|
||||||
|
} else {
|
||||||
|
inner.addQueryVector(Float32Array.from(vector as number[]));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -765,14 +769,23 @@ export class Query extends StandardQueryBase<NativeQuery> {
|
|||||||
* a default `limit` of 10 will be used. @see {@link Query#limit}
|
* a default `limit` of 10 will be used. @see {@link Query#limit}
|
||||||
*/
|
*/
|
||||||
nearestTo(vector: IntoVector): VectorQuery {
|
nearestTo(vector: IntoVector): VectorQuery {
|
||||||
|
const callNearestTo = (
|
||||||
|
inner: NativeQuery,
|
||||||
|
resolved: Float32Array | Float64Array | Uint8Array | number[],
|
||||||
|
): NativeVectorQuery => {
|
||||||
|
const raw = Array.isArray(resolved)
|
||||||
|
? null
|
||||||
|
: extractVectorBuffer(resolved);
|
||||||
|
if (raw) {
|
||||||
|
return inner.nearestToRaw(raw.data, raw.dtype);
|
||||||
|
}
|
||||||
|
return inner.nearestTo(Float32Array.from(resolved as number[]));
|
||||||
|
};
|
||||||
|
|
||||||
if (this.inner instanceof Promise) {
|
if (this.inner instanceof Promise) {
|
||||||
const nativeQuery = this.inner.then(async (inner) => {
|
const nativeQuery = this.inner.then(async (inner) => {
|
||||||
if (vector instanceof Promise) {
|
const resolved = vector instanceof Promise ? await vector : vector;
|
||||||
const arr = await vector.then((v) => Float32Array.from(v));
|
return callNearestTo(inner, resolved);
|
||||||
return inner.nearestTo(arr);
|
|
||||||
} else {
|
|
||||||
return inner.nearestTo(Float32Array.from(vector));
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return new VectorQuery(nativeQuery);
|
return new VectorQuery(nativeQuery);
|
||||||
}
|
}
|
||||||
@@ -780,10 +793,8 @@ export class Query extends StandardQueryBase<NativeQuery> {
|
|||||||
const res = (async () => {
|
const res = (async () => {
|
||||||
try {
|
try {
|
||||||
const v = await vector;
|
const v = await vector;
|
||||||
const arr = Float32Array.from(v);
|
|
||||||
//
|
|
||||||
// biome-ignore lint/suspicious/noExplicitAny: we need to get the `inner`, but js has no package scoping
|
// biome-ignore lint/suspicious/noExplicitAny: we need to get the `inner`, but js has no package scoping
|
||||||
const value: any = this.nearestTo(arr);
|
const value: any = this.nearestTo(v);
|
||||||
const inner = value.inner as
|
const inner = value.inner as
|
||||||
| NativeVectorQuery
|
| NativeVectorQuery
|
||||||
| Promise<NativeVectorQuery>;
|
| Promise<NativeVectorQuery>;
|
||||||
@@ -794,7 +805,7 @@ export class Query extends StandardQueryBase<NativeQuery> {
|
|||||||
})();
|
})();
|
||||||
return new VectorQuery(res);
|
return new VectorQuery(res);
|
||||||
} else {
|
} else {
|
||||||
const vectorQuery = this.inner.nearestTo(Float32Array.from(vector));
|
const vectorQuery = callNearestTo(this.inner, vector);
|
||||||
return new VectorQuery(vectorQuery);
|
return new VectorQuery(vectorQuery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,12 +5,15 @@ import {
|
|||||||
Table as ArrowTable,
|
Table as ArrowTable,
|
||||||
Data,
|
Data,
|
||||||
DataType,
|
DataType,
|
||||||
|
Field,
|
||||||
IntoVector,
|
IntoVector,
|
||||||
MultiVector,
|
MultiVector,
|
||||||
Schema,
|
Schema,
|
||||||
dataTypeToJson,
|
dataTypeToJson,
|
||||||
fromDataToBuffer,
|
fromDataToBuffer,
|
||||||
|
fromTableToBuffer,
|
||||||
isMultiVector,
|
isMultiVector,
|
||||||
|
makeEmptyTable,
|
||||||
tableFromIPC,
|
tableFromIPC,
|
||||||
} from "./arrow";
|
} from "./arrow";
|
||||||
|
|
||||||
@@ -84,6 +87,16 @@ export interface OptimizeOptions {
|
|||||||
* tbl.optimize({cleanupOlderThan: new Date()});
|
* tbl.optimize({cleanupOlderThan: new Date()});
|
||||||
*/
|
*/
|
||||||
cleanupOlderThan: Date;
|
cleanupOlderThan: Date;
|
||||||
|
/**
|
||||||
|
* Because they may be part of an in-progress transaction, files newer than
|
||||||
|
* 7 days old are not deleted by default. If you are sure that there are no
|
||||||
|
* in-progress transactions, then you can set this to true to delete all
|
||||||
|
* files older than `cleanupOlderThan`.
|
||||||
|
*
|
||||||
|
* **WARNING**: This should only be set to true if you can guarantee that
|
||||||
|
* no other process is currently working on this dataset. Otherwise the
|
||||||
|
* dataset could be put into a corrupted state.
|
||||||
|
*/
|
||||||
deleteUnverified: boolean;
|
deleteUnverified: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -381,15 +394,16 @@ export abstract class Table {
|
|||||||
abstract vectorSearch(vector: IntoVector | MultiVector): VectorQuery;
|
abstract vectorSearch(vector: IntoVector | MultiVector): VectorQuery;
|
||||||
/**
|
/**
|
||||||
* Add new columns with defined values.
|
* Add new columns with defined values.
|
||||||
* @param {AddColumnsSql[]} newColumnTransforms pairs of column names and
|
* @param {AddColumnsSql[] | Field | Field[] | Schema} newColumnTransforms Either:
|
||||||
* the SQL expression to use to calculate the value of the new column. These
|
* - An array of objects with column names and SQL expressions to calculate values
|
||||||
* expressions will be evaluated for each row in the table, and can
|
* - A single Arrow Field defining one column with its data type (column will be initialized with null values)
|
||||||
* reference existing columns in the table.
|
* - An array of Arrow Fields defining columns with their data types (columns will be initialized with null values)
|
||||||
|
* - An Arrow Schema defining columns with their data types (columns will be initialized with null values)
|
||||||
* @returns {Promise<AddColumnsResult>} A promise that resolves to an object
|
* @returns {Promise<AddColumnsResult>} A promise that resolves to an object
|
||||||
* containing the new version number of the table after adding the columns.
|
* containing the new version number of the table after adding the columns.
|
||||||
*/
|
*/
|
||||||
abstract addColumns(
|
abstract addColumns(
|
||||||
newColumnTransforms: AddColumnsSql[],
|
newColumnTransforms: AddColumnsSql[] | Field | Field[] | Schema,
|
||||||
): Promise<AddColumnsResult>;
|
): Promise<AddColumnsResult>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -501,19 +515,7 @@ export abstract class Table {
|
|||||||
* - Index: Optimizes the indices, adding new data to existing indices
|
* - Index: Optimizes the indices, adding new data to existing indices
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* Experimental API
|
* The frequency an application should call optimize is based on the frequency of
|
||||||
* ----------------
|
|
||||||
*
|
|
||||||
* The optimization process is undergoing active development and may change.
|
|
||||||
* Our goal with these changes is to improve the performance of optimization and
|
|
||||||
* reduce the complexity.
|
|
||||||
*
|
|
||||||
* That being said, it is essential today to run optimize if you want the best
|
|
||||||
* performance. It should be stable and safe to use in production, but it our
|
|
||||||
* hope that the API may be simplified (or not even need to be called) in the
|
|
||||||
* future.
|
|
||||||
*
|
|
||||||
* The frequency an application shoudl call optimize is based on the frequency of
|
|
||||||
* data modifications. If data is frequently added, deleted, or updated then
|
* data modifications. If data is frequently added, deleted, or updated then
|
||||||
* optimize should be run frequently. A good rule of thumb is to run optimize if
|
* optimize should be run frequently. A good rule of thumb is to run optimize if
|
||||||
* you have added or modified 100,000 or more records or run more than 20 data
|
* you have added or modified 100,000 or more records or run more than 20 data
|
||||||
@@ -806,9 +808,40 @@ export class LocalTable extends Table {
|
|||||||
// TODO: Support BatchUDF
|
// TODO: Support BatchUDF
|
||||||
|
|
||||||
async addColumns(
|
async addColumns(
|
||||||
newColumnTransforms: AddColumnsSql[],
|
newColumnTransforms: AddColumnsSql[] | Field | Field[] | Schema,
|
||||||
): Promise<AddColumnsResult> {
|
): Promise<AddColumnsResult> {
|
||||||
return await this.inner.addColumns(newColumnTransforms);
|
// Handle single Field -> convert to array of Fields
|
||||||
|
if (newColumnTransforms instanceof Field) {
|
||||||
|
newColumnTransforms = [newColumnTransforms];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle array of Fields -> convert to Schema
|
||||||
|
if (
|
||||||
|
Array.isArray(newColumnTransforms) &&
|
||||||
|
newColumnTransforms.length > 0 &&
|
||||||
|
newColumnTransforms[0] instanceof Field
|
||||||
|
) {
|
||||||
|
const fields = newColumnTransforms as Field[];
|
||||||
|
newColumnTransforms = new Schema(fields);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle Schema -> use schema-based approach
|
||||||
|
if (newColumnTransforms instanceof Schema) {
|
||||||
|
const schema = newColumnTransforms;
|
||||||
|
// Convert schema to buffer using Arrow IPC format
|
||||||
|
const emptyTable = makeEmptyTable(schema);
|
||||||
|
const schemaBuf = await fromTableToBuffer(emptyTable);
|
||||||
|
return await this.inner.addColumnsWithSchema(schemaBuf);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle SQL expressions (existing functionality)
|
||||||
|
if (Array.isArray(newColumnTransforms)) {
|
||||||
|
return await this.inner.addColumns(
|
||||||
|
newColumnTransforms as AddColumnsSql[],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error("Invalid input type for addColumns");
|
||||||
}
|
}
|
||||||
|
|
||||||
async alterColumns(
|
async alterColumns(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-darwin-arm64",
|
"name": "@lancedb/lancedb-darwin-arm64",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": ["darwin"],
|
"os": ["darwin"],
|
||||||
"cpu": ["arm64"],
|
"cpu": ["arm64"],
|
||||||
"main": "lancedb.darwin-arm64.node",
|
"main": "lancedb.darwin-arm64.node",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-linux-arm64-gnu",
|
"name": "@lancedb/lancedb-linux-arm64-gnu",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": ["linux"],
|
"os": ["linux"],
|
||||||
"cpu": ["arm64"],
|
"cpu": ["arm64"],
|
||||||
"main": "lancedb.linux-arm64-gnu.node",
|
"main": "lancedb.linux-arm64-gnu.node",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-linux-arm64-musl",
|
"name": "@lancedb/lancedb-linux-arm64-musl",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": ["linux"],
|
"os": ["linux"],
|
||||||
"cpu": ["arm64"],
|
"cpu": ["arm64"],
|
||||||
"main": "lancedb.linux-arm64-musl.node",
|
"main": "lancedb.linux-arm64-musl.node",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-linux-x64-gnu",
|
"name": "@lancedb/lancedb-linux-x64-gnu",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": ["linux"],
|
"os": ["linux"],
|
||||||
"cpu": ["x64"],
|
"cpu": ["x64"],
|
||||||
"main": "lancedb.linux-x64-gnu.node",
|
"main": "lancedb.linux-x64-gnu.node",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-linux-x64-musl",
|
"name": "@lancedb/lancedb-linux-x64-musl",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": ["linux"],
|
"os": ["linux"],
|
||||||
"cpu": ["x64"],
|
"cpu": ["x64"],
|
||||||
"main": "lancedb.linux-x64-musl.node",
|
"main": "lancedb.linux-x64-musl.node",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-win32-arm64-msvc",
|
"name": "@lancedb/lancedb-win32-arm64-msvc",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": [
|
"os": [
|
||||||
"win32"
|
"win32"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-win32-x64-msvc",
|
"name": "@lancedb/lancedb-win32-x64-msvc",
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"os": ["win32"],
|
"os": ["win32"],
|
||||||
"cpu": ["x64"],
|
"cpu": ["x64"],
|
||||||
"main": "lancedb.win32-x64-msvc.node",
|
"main": "lancedb.win32-x64-msvc.node",
|
||||||
|
|||||||
4289
nodejs/package-lock.json
generated
4289
nodejs/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -11,7 +11,7 @@
|
|||||||
"ann"
|
"ann"
|
||||||
],
|
],
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "0.27.0-beta.2",
|
"version": "0.27.2-beta.1",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"exports": {
|
"exports": {
|
||||||
".": "./dist/index.js",
|
".": "./dist/index.js",
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ use lancedb::database::{CreateTableMode, Database};
|
|||||||
use napi::bindgen_prelude::*;
|
use napi::bindgen_prelude::*;
|
||||||
use napi_derive::*;
|
use napi_derive::*;
|
||||||
|
|
||||||
|
use crate::ConnectionOptions;
|
||||||
use crate::error::NapiErrorExt;
|
use crate::error::NapiErrorExt;
|
||||||
use crate::header::JsHeaderProvider;
|
use crate::header::JsHeaderProvider;
|
||||||
use crate::table::Table;
|
use crate::table::Table;
|
||||||
use crate::ConnectionOptions;
|
|
||||||
use lancedb::connection::{ConnectBuilder, Connection as LanceDBConnection};
|
use lancedb::connection::{ConnectBuilder, Connection as LanceDBConnection};
|
||||||
|
|
||||||
use lancedb::ipc::{ipc_file_to_batches, ipc_file_to_schema};
|
use lancedb::ipc::{ipc_file_to_batches, ipc_file_to_schema};
|
||||||
|
|||||||
@@ -3,12 +3,12 @@
|
|||||||
|
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
use lancedb::index::Index as LanceDbIndex;
|
||||||
use lancedb::index::scalar::{BTreeIndexBuilder, FtsIndexBuilder};
|
use lancedb::index::scalar::{BTreeIndexBuilder, FtsIndexBuilder};
|
||||||
use lancedb::index::vector::{
|
use lancedb::index::vector::{
|
||||||
IvfFlatIndexBuilder, IvfHnswPqIndexBuilder, IvfHnswSqIndexBuilder, IvfPqIndexBuilder,
|
IvfFlatIndexBuilder, IvfHnswPqIndexBuilder, IvfHnswSqIndexBuilder, IvfPqIndexBuilder,
|
||||||
IvfRqIndexBuilder,
|
IvfRqIndexBuilder,
|
||||||
};
|
};
|
||||||
use lancedb::index::Index as LanceDbIndex;
|
|
||||||
use napi_derive::napi;
|
use napi_derive::napi;
|
||||||
|
|
||||||
use crate::util::parse_distance_type;
|
use crate::util::parse_distance_type;
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use arrow_array::{
|
||||||
|
Array, Float16Array as ArrowFloat16Array, Float32Array as ArrowFloat32Array,
|
||||||
|
Float64Array as ArrowFloat64Array, UInt8Array as ArrowUInt8Array,
|
||||||
|
};
|
||||||
|
use arrow_buffer::ScalarBuffer;
|
||||||
|
use half::f16;
|
||||||
use lancedb::index::scalar::{
|
use lancedb::index::scalar::{
|
||||||
BooleanQuery, BoostQuery, FtsQuery, FullTextSearchQuery, MatchQuery, MultiMatchQuery, Occur,
|
BooleanQuery, BoostQuery, FtsQuery, FullTextSearchQuery, MatchQuery, MultiMatchQuery, Occur,
|
||||||
Operator, PhraseQuery,
|
Operator, PhraseQuery,
|
||||||
@@ -17,13 +23,40 @@ use lancedb::query::VectorQuery as LanceDbVectorQuery;
|
|||||||
use napi::bindgen_prelude::*;
|
use napi::bindgen_prelude::*;
|
||||||
use napi_derive::napi;
|
use napi_derive::napi;
|
||||||
|
|
||||||
use crate::error::convert_error;
|
|
||||||
use crate::error::NapiErrorExt;
|
use crate::error::NapiErrorExt;
|
||||||
|
use crate::error::convert_error;
|
||||||
use crate::iterator::RecordBatchIterator;
|
use crate::iterator::RecordBatchIterator;
|
||||||
use crate::rerankers::RerankHybridCallbackArgs;
|
use crate::rerankers::RerankHybridCallbackArgs;
|
||||||
use crate::rerankers::Reranker;
|
use crate::rerankers::Reranker;
|
||||||
use crate::util::{parse_distance_type, schema_to_buffer};
|
use crate::util::{parse_distance_type, schema_to_buffer};
|
||||||
|
|
||||||
|
fn bytes_to_arrow_array(data: Uint8Array, dtype: String) -> napi::Result<Arc<dyn Array>> {
|
||||||
|
let buf = arrow_buffer::Buffer::from(data.to_vec());
|
||||||
|
let num_bytes = buf.len();
|
||||||
|
match dtype.as_str() {
|
||||||
|
"float16" => {
|
||||||
|
let scalar_buf = ScalarBuffer::<f16>::new(buf, 0, num_bytes / 2);
|
||||||
|
Ok(Arc::new(ArrowFloat16Array::new(scalar_buf, None)))
|
||||||
|
}
|
||||||
|
"float32" => {
|
||||||
|
let scalar_buf = ScalarBuffer::<f32>::new(buf, 0, num_bytes / 4);
|
||||||
|
Ok(Arc::new(ArrowFloat32Array::new(scalar_buf, None)))
|
||||||
|
}
|
||||||
|
"float64" => {
|
||||||
|
let scalar_buf = ScalarBuffer::<f64>::new(buf, 0, num_bytes / 8);
|
||||||
|
Ok(Arc::new(ArrowFloat64Array::new(scalar_buf, None)))
|
||||||
|
}
|
||||||
|
"uint8" => {
|
||||||
|
let scalar_buf = ScalarBuffer::<u8>::new(buf, 0, num_bytes);
|
||||||
|
Ok(Arc::new(ArrowUInt8Array::new(scalar_buf, None)))
|
||||||
|
}
|
||||||
|
_ => Err(napi::Error::from_reason(format!(
|
||||||
|
"Unsupported vector dtype: {}. Expected one of: float16, float32, float64, uint8",
|
||||||
|
dtype
|
||||||
|
))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
pub struct Query {
|
pub struct Query {
|
||||||
inner: LanceDbQuery,
|
inner: LanceDbQuery,
|
||||||
@@ -78,6 +111,13 @@ impl Query {
|
|||||||
Ok(VectorQuery { inner })
|
Ok(VectorQuery { inner })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[napi]
|
||||||
|
pub fn nearest_to_raw(&mut self, data: Uint8Array, dtype: String) -> Result<VectorQuery> {
|
||||||
|
let array = bytes_to_arrow_array(data, dtype)?;
|
||||||
|
let inner = self.inner.clone().nearest_to(array).default_error()?;
|
||||||
|
Ok(VectorQuery { inner })
|
||||||
|
}
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
pub fn fast_search(&mut self) {
|
pub fn fast_search(&mut self) {
|
||||||
self.inner = self.inner.clone().fast_search();
|
self.inner = self.inner.clone().fast_search();
|
||||||
@@ -163,6 +203,13 @@ impl VectorQuery {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[napi]
|
||||||
|
pub fn add_query_vector_raw(&mut self, data: Uint8Array, dtype: String) -> Result<()> {
|
||||||
|
let array = bytes_to_arrow_array(data, dtype)?;
|
||||||
|
self.inner = self.inner.clone().add_query_vector(array).default_error()?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
pub fn distance_type(&mut self, distance_type: String) -> napi::Result<()> {
|
pub fn distance_type(&mut self, distance_type: String) -> napi::Result<()> {
|
||||||
let distance_type = parse_distance_type(distance_type)?;
|
let distance_type = parse_distance_type(distance_type)?;
|
||||||
@@ -551,15 +598,12 @@ fn parse_fts_query(query: Object) -> napi::Result<FullTextSearchQuery> {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
let mut query = FullTextSearchQuery::new_query(query);
|
let mut query = FullTextSearchQuery::new_query(query);
|
||||||
if let Some(cols) = columns {
|
if let Some(cols) = columns
|
||||||
if !cols.is_empty() {
|
&& !cols.is_empty()
|
||||||
query = query.with_columns(&cols).map_err(|e| {
|
{
|
||||||
napi::Error::from_reason(format!(
|
query = query.with_columns(&cols).map_err(|e| {
|
||||||
"Failed to set full text search columns: {}",
|
napi::Error::from_reason(format!("Failed to set full text search columns: {}", e))
|
||||||
e
|
})?;
|
||||||
))
|
|
||||||
})?;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(query)
|
Ok(query)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ impl napi::bindgen_prelude::FromNapiValue for Session {
|
|||||||
napi_val: napi::sys::napi_value,
|
napi_val: napi::sys::napi_value,
|
||||||
) -> napi::Result<Self> {
|
) -> napi::Result<Self> {
|
||||||
let object: napi::bindgen_prelude::ClassInstance<Self> =
|
let object: napi::bindgen_prelude::ClassInstance<Self> =
|
||||||
napi::bindgen_prelude::ClassInstance::from_napi_value(env, napi_val)?;
|
unsafe { napi::bindgen_prelude::ClassInstance::from_napi_value(env, napi_val)? };
|
||||||
Ok((*object).clone())
|
Ok((*object).clone())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use lancedb::ipc::ipc_file_to_batches;
|
use lancedb::ipc::{ipc_file_to_batches, ipc_file_to_schema};
|
||||||
use lancedb::table::{
|
use lancedb::table::{
|
||||||
AddDataMode, ColumnAlteration as LanceColumnAlteration, Duration, NewColumnTransform,
|
AddDataMode, ColumnAlteration as LanceColumnAlteration, Duration, NewColumnTransform,
|
||||||
OptimizeAction, OptimizeOptions, Table as LanceDbTable,
|
OptimizeAction, OptimizeOptions, Table as LanceDbTable,
|
||||||
@@ -279,6 +279,23 @@ impl Table {
|
|||||||
Ok(res.into())
|
Ok(res.into())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[napi(catch_unwind)]
|
||||||
|
pub async fn add_columns_with_schema(
|
||||||
|
&self,
|
||||||
|
schema_buf: Buffer,
|
||||||
|
) -> napi::Result<AddColumnsResult> {
|
||||||
|
let schema = ipc_file_to_schema(schema_buf.to_vec())
|
||||||
|
.map_err(|e| napi::Error::from_reason(format!("Failed to read IPC schema: {}", e)))?;
|
||||||
|
|
||||||
|
let transforms = NewColumnTransform::AllNulls(schema);
|
||||||
|
let res = self
|
||||||
|
.inner_ref()?
|
||||||
|
.add_columns(transforms, None)
|
||||||
|
.await
|
||||||
|
.default_error()?;
|
||||||
|
Ok(res.into())
|
||||||
|
}
|
||||||
|
|
||||||
#[napi(catch_unwind)]
|
#[napi(catch_unwind)]
|
||||||
pub async fn alter_columns(
|
pub async fn alter_columns(
|
||||||
&self,
|
&self,
|
||||||
@@ -753,12 +770,14 @@ impl From<lancedb::table::AddResult> for AddResult {
|
|||||||
|
|
||||||
#[napi(object)]
|
#[napi(object)]
|
||||||
pub struct DeleteResult {
|
pub struct DeleteResult {
|
||||||
|
pub num_deleted_rows: i64,
|
||||||
pub version: i64,
|
pub version: i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
||||||
fn from(value: lancedb::table::DeleteResult) -> Self {
|
fn from(value: lancedb::table::DeleteResult) -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
num_deleted_rows: value.num_deleted_rows as i64,
|
||||||
version: value.version as i64,
|
version: value.version as i64,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[tool.bumpversion]
|
[tool.bumpversion]
|
||||||
current_version = "0.30.0-beta.3"
|
current_version = "0.30.2"
|
||||||
parse = """(?x)
|
parse = """(?x)
|
||||||
(?P<major>0|[1-9]\\d*)\\.
|
(?P<major>0|[1-9]\\d*)\\.
|
||||||
(?P<minor>0|[1-9]\\d*)\\.
|
(?P<minor>0|[1-9]\\d*)\\.
|
||||||
|
|||||||
2
python/.gitignore
vendored
2
python/.gitignore
vendored
@@ -1,3 +1,5 @@
|
|||||||
# Test data created by some example tests
|
# Test data created by some example tests
|
||||||
data/
|
data/
|
||||||
_lancedb.pyd
|
_lancedb.pyd
|
||||||
|
# macOS debug symbols bundle generated during build
|
||||||
|
*.dSYM/
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lancedb-python"
|
name = "lancedb-python"
|
||||||
version = "0.30.0-beta.3"
|
version = "0.30.2"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
description = "Python bindings for LanceDB"
|
description = "Python bindings for LanceDB"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
@@ -16,11 +16,14 @@ crate-type = ["cdylib"]
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
arrow = { version = "57.2", features = ["pyarrow"] }
|
arrow = { version = "57.2", features = ["pyarrow"] }
|
||||||
async-trait = "0.1"
|
async-trait = "0.1"
|
||||||
|
bytes = "1"
|
||||||
lancedb = { path = "../rust/lancedb", default-features = false }
|
lancedb = { path = "../rust/lancedb", default-features = false }
|
||||||
lance-core.workspace = true
|
lance-core.workspace = true
|
||||||
lance-namespace.workspace = true
|
lance-namespace.workspace = true
|
||||||
|
lance-namespace-impls.workspace = true
|
||||||
lance-io.workspace = true
|
lance-io.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
|
log.workspace = true
|
||||||
pyo3 = { version = "0.26", features = ["extension-module", "abi3-py39"] }
|
pyo3 = { version = "0.26", features = ["extension-module", "abi3-py39"] }
|
||||||
pyo3-async-runtimes = { version = "0.26", features = [
|
pyo3-async-runtimes = { version = "0.26", features = [
|
||||||
"attributes",
|
"attributes",
|
||||||
@@ -28,6 +31,8 @@ pyo3-async-runtimes = { version = "0.26", features = [
|
|||||||
] }
|
] }
|
||||||
pin-project = "1.1.5"
|
pin-project = "1.1.5"
|
||||||
futures.workspace = true
|
futures.workspace = true
|
||||||
|
serde = "1"
|
||||||
|
serde_json = "1"
|
||||||
snafu.workspace = true
|
snafu.workspace = true
|
||||||
tokio = { version = "1.40", features = ["sync"] }
|
tokio = { version = "1.40", features = ["sync"] }
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# LanceDB
|
# LanceDB Python SDK
|
||||||
|
|
||||||
A Python library for [LanceDB](https://github.com/lancedb/lancedb).
|
A Python library for [LanceDB](https://github.com/lancedb/lancedb).
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ name = "lancedb"
|
|||||||
# version in Cargo.toml
|
# version in Cargo.toml
|
||||||
dynamic = ["version"]
|
dynamic = ["version"]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deprecation",
|
"deprecation>=2.1.0",
|
||||||
"numpy",
|
"numpy>=1.24.0",
|
||||||
"overrides>=0.7; python_version<'3.12'",
|
"overrides>=0.7; python_version<'3.12'",
|
||||||
"packaging",
|
"packaging>=23.0",
|
||||||
"pyarrow>=16",
|
"pyarrow>=16",
|
||||||
"pydantic>=1.10",
|
"pydantic>=1.10",
|
||||||
"tqdm>=4.27.0",
|
"tqdm>=4.27.0",
|
||||||
@@ -45,51 +45,51 @@ repository = "https://github.com/lancedb/lancedb"
|
|||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
pylance = [
|
pylance = [
|
||||||
"pylance>=1.0.0b14",
|
"pylance>=4.0.0b7",
|
||||||
]
|
]
|
||||||
tests = [
|
tests = [
|
||||||
"aiohttp",
|
"aiohttp>=3.9.0",
|
||||||
"boto3",
|
"boto3>=1.28.57",
|
||||||
"pandas>=1.4",
|
"pandas>=1.4",
|
||||||
"pytest",
|
"pytest>=7.0",
|
||||||
"pytest-mock",
|
"pytest-mock>=3.10",
|
||||||
"pytest-asyncio",
|
"pytest-asyncio>=0.21",
|
||||||
"duckdb",
|
"duckdb>=0.9.0",
|
||||||
"pytz",
|
"pytz>=2023.3",
|
||||||
"polars>=0.19, <=1.3.0",
|
"polars>=0.19, <=1.3.0",
|
||||||
"tantivy",
|
"tantivy>=0.20.0",
|
||||||
"pyarrow-stubs",
|
"pyarrow-stubs>=16.0",
|
||||||
"pylance>=1.0.0b14,<3.0.0",
|
"pylance>=4.0.0b7",
|
||||||
"requests",
|
"requests>=2.31.0",
|
||||||
"datafusion<52",
|
"datafusion>=52,<53",
|
||||||
]
|
]
|
||||||
dev = [
|
dev = [
|
||||||
"ruff",
|
"ruff>=0.3.0",
|
||||||
"pre-commit",
|
"pre-commit>=3.5.0",
|
||||||
"pyright",
|
"pyright>=1.1.350",
|
||||||
'typing-extensions>=4.0.0; python_version < "3.11"',
|
'typing-extensions>=4.0.0; python_version < "3.11"',
|
||||||
]
|
]
|
||||||
docs = ["mkdocs", "mkdocs-jupyter", "mkdocs-material", "mkdocstrings-python"]
|
docs = ["mkdocs", "mkdocs-jupyter", "mkdocs-material", "mkdocstrings-python"]
|
||||||
clip = ["torch", "pillow", "open-clip-torch"]
|
clip = ["torch", "pillow>=12.1.1", "open-clip-torch"]
|
||||||
siglip = ["torch", "pillow", "transformers>=4.41.0","sentencepiece"]
|
siglip = ["torch", "pillow>=12.1.1", "transformers>=4.41.0","sentencepiece"]
|
||||||
embeddings = [
|
embeddings = [
|
||||||
"requests>=2.31.0",
|
"requests>=2.31.0",
|
||||||
"openai>=1.6.1",
|
"openai>=1.6.1",
|
||||||
"sentence-transformers",
|
"sentence-transformers>=2.2.0",
|
||||||
"torch",
|
"torch>=2.0.0",
|
||||||
"pillow",
|
"pillow>=12.1.1",
|
||||||
"open-clip-torch",
|
"open-clip-torch>=2.20.0",
|
||||||
"cohere",
|
"cohere>=4.0",
|
||||||
"colpali-engine>=0.3.10",
|
"colpali-engine>=0.3.10",
|
||||||
"huggingface_hub",
|
"huggingface_hub>=0.19.0",
|
||||||
"InstructorEmbedding",
|
"InstructorEmbedding>=1.0.1",
|
||||||
"google.generativeai",
|
"google.generativeai>=0.3.0",
|
||||||
"boto3>=1.28.57",
|
"boto3>=1.28.57",
|
||||||
"awscli>=1.29.57",
|
"awscli>=1.44.38",
|
||||||
"botocore>=1.31.57",
|
"botocore>=1.31.57",
|
||||||
'ibm-watsonx-ai>=1.1.2; python_version >= "3.10"',
|
'ibm-watsonx-ai>=1.1.2; python_version >= "3.10"',
|
||||||
"ollama>=0.3.0",
|
"ollama>=0.3.0",
|
||||||
"sentencepiece"
|
"sentencepiece>=0.1.99"
|
||||||
]
|
]
|
||||||
azure = ["adlfs>=2024.2.0"]
|
azure = ["adlfs>=2024.2.0"]
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ from .db import AsyncConnection, DBConnection, LanceDBConnection
|
|||||||
from .io import StorageOptionsProvider
|
from .io import StorageOptionsProvider
|
||||||
from .remote import ClientConfig
|
from .remote import ClientConfig
|
||||||
from .remote.db import RemoteDBConnection
|
from .remote.db import RemoteDBConnection
|
||||||
|
from .expr import Expr, col, lit, func
|
||||||
from .schema import vector
|
from .schema import vector
|
||||||
from .table import AsyncTable, Table
|
from .table import AsyncTable, Table
|
||||||
from ._lancedb import Session
|
from ._lancedb import Session
|
||||||
@@ -271,6 +272,10 @@ __all__ = [
|
|||||||
"AsyncConnection",
|
"AsyncConnection",
|
||||||
"AsyncLanceNamespaceDBConnection",
|
"AsyncLanceNamespaceDBConnection",
|
||||||
"AsyncTable",
|
"AsyncTable",
|
||||||
|
"col",
|
||||||
|
"Expr",
|
||||||
|
"func",
|
||||||
|
"lit",
|
||||||
"URI",
|
"URI",
|
||||||
"sanitize_uri",
|
"sanitize_uri",
|
||||||
"vector",
|
"vector",
|
||||||
|
|||||||
@@ -27,6 +27,32 @@ from .remote import ClientConfig
|
|||||||
IvfHnswPq: type[HnswPq] = HnswPq
|
IvfHnswPq: type[HnswPq] = HnswPq
|
||||||
IvfHnswSq: type[HnswSq] = HnswSq
|
IvfHnswSq: type[HnswSq] = HnswSq
|
||||||
|
|
||||||
|
class PyExpr:
|
||||||
|
"""A type-safe DataFusion expression node (Rust-side handle)."""
|
||||||
|
|
||||||
|
def eq(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def ne(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def lt(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def lte(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def gt(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def gte(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def and_(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def or_(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def not_(self) -> "PyExpr": ...
|
||||||
|
def add(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def sub(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def mul(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def div(self, other: "PyExpr") -> "PyExpr": ...
|
||||||
|
def lower(self) -> "PyExpr": ...
|
||||||
|
def upper(self) -> "PyExpr": ...
|
||||||
|
def contains(self, substr: "PyExpr") -> "PyExpr": ...
|
||||||
|
def cast(self, data_type: pa.DataType) -> "PyExpr": ...
|
||||||
|
def to_sql(self) -> str: ...
|
||||||
|
|
||||||
|
def expr_col(name: str) -> PyExpr: ...
|
||||||
|
def expr_lit(value: Union[bool, int, float, str]) -> PyExpr: ...
|
||||||
|
def expr_func(name: str, args: List[PyExpr]) -> PyExpr: ...
|
||||||
|
|
||||||
class Session:
|
class Session:
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
@@ -135,7 +161,10 @@ class Table:
|
|||||||
def close(self) -> None: ...
|
def close(self) -> None: ...
|
||||||
async def schema(self) -> pa.Schema: ...
|
async def schema(self) -> pa.Schema: ...
|
||||||
async def add(
|
async def add(
|
||||||
self, data: pa.RecordBatchReader, mode: Literal["append", "overwrite"]
|
self,
|
||||||
|
data: pa.RecordBatchReader,
|
||||||
|
mode: Literal["append", "overwrite"],
|
||||||
|
progress: Optional[Any] = None,
|
||||||
) -> AddResult: ...
|
) -> AddResult: ...
|
||||||
async def update(
|
async def update(
|
||||||
self, updates: Dict[str, str], where: Optional[str]
|
self, updates: Dict[str, str], where: Optional[str]
|
||||||
@@ -166,6 +195,8 @@ class Table:
|
|||||||
async def checkout(self, version: Union[int, str]): ...
|
async def checkout(self, version: Union[int, str]): ...
|
||||||
async def checkout_latest(self): ...
|
async def checkout_latest(self): ...
|
||||||
async def restore(self, version: Optional[Union[int, str]] = None): ...
|
async def restore(self, version: Optional[Union[int, str]] = None): ...
|
||||||
|
async def prewarm_index(self, index_name: str) -> None: ...
|
||||||
|
async def prewarm_data(self, columns: Optional[List[str]] = None) -> None: ...
|
||||||
async def list_indices(self) -> list[IndexConfig]: ...
|
async def list_indices(self) -> list[IndexConfig]: ...
|
||||||
async def delete(self, filter: str) -> DeleteResult: ...
|
async def delete(self, filter: str) -> DeleteResult: ...
|
||||||
async def add_columns(self, columns: list[tuple[str, str]]) -> AddColumnsResult: ...
|
async def add_columns(self, columns: list[tuple[str, str]]) -> AddColumnsResult: ...
|
||||||
@@ -220,7 +251,9 @@ class RecordBatchStream:
|
|||||||
|
|
||||||
class Query:
|
class Query:
|
||||||
def where(self, filter: str): ...
|
def where(self, filter: str): ...
|
||||||
def select(self, columns: Tuple[str, str]): ...
|
def where_expr(self, expr: PyExpr): ...
|
||||||
|
def select(self, columns: List[Tuple[str, str]]): ...
|
||||||
|
def select_expr(self, columns: List[Tuple[str, PyExpr]]): ...
|
||||||
def select_columns(self, columns: List[str]): ...
|
def select_columns(self, columns: List[str]): ...
|
||||||
def limit(self, limit: int): ...
|
def limit(self, limit: int): ...
|
||||||
def offset(self, offset: int): ...
|
def offset(self, offset: int): ...
|
||||||
@@ -246,7 +279,9 @@ class TakeQuery:
|
|||||||
|
|
||||||
class FTSQuery:
|
class FTSQuery:
|
||||||
def where(self, filter: str): ...
|
def where(self, filter: str): ...
|
||||||
def select(self, columns: List[str]): ...
|
def where_expr(self, expr: PyExpr): ...
|
||||||
|
def select(self, columns: List[Tuple[str, str]]): ...
|
||||||
|
def select_expr(self, columns: List[Tuple[str, PyExpr]]): ...
|
||||||
def limit(self, limit: int): ...
|
def limit(self, limit: int): ...
|
||||||
def offset(self, offset: int): ...
|
def offset(self, offset: int): ...
|
||||||
def fast_search(self): ...
|
def fast_search(self): ...
|
||||||
@@ -265,7 +300,9 @@ class VectorQuery:
|
|||||||
async def output_schema(self) -> pa.Schema: ...
|
async def output_schema(self) -> pa.Schema: ...
|
||||||
async def execute(self) -> RecordBatchStream: ...
|
async def execute(self) -> RecordBatchStream: ...
|
||||||
def where(self, filter: str): ...
|
def where(self, filter: str): ...
|
||||||
def select(self, columns: List[str]): ...
|
def where_expr(self, expr: PyExpr): ...
|
||||||
|
def select(self, columns: List[Tuple[str, str]]): ...
|
||||||
|
def select_expr(self, columns: List[Tuple[str, PyExpr]]): ...
|
||||||
def select_with_projection(self, columns: Tuple[str, str]): ...
|
def select_with_projection(self, columns: Tuple[str, str]): ...
|
||||||
def limit(self, limit: int): ...
|
def limit(self, limit: int): ...
|
||||||
def offset(self, offset: int): ...
|
def offset(self, offset: int): ...
|
||||||
@@ -282,7 +319,9 @@ class VectorQuery:
|
|||||||
|
|
||||||
class HybridQuery:
|
class HybridQuery:
|
||||||
def where(self, filter: str): ...
|
def where(self, filter: str): ...
|
||||||
def select(self, columns: List[str]): ...
|
def where_expr(self, expr: PyExpr): ...
|
||||||
|
def select(self, columns: List[Tuple[str, str]]): ...
|
||||||
|
def select_expr(self, columns: List[Tuple[str, PyExpr]]): ...
|
||||||
def limit(self, limit: int): ...
|
def limit(self, limit: int): ...
|
||||||
def offset(self, offset: int): ...
|
def offset(self, offset: int): ...
|
||||||
def fast_search(self): ...
|
def fast_search(self): ...
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ from abc import abstractmethod
|
|||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import sys
|
import sys
|
||||||
from typing import TYPE_CHECKING, Dict, Iterable, List, Literal, Optional, Union
|
from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Literal, Optional, Union
|
||||||
|
|
||||||
if sys.version_info >= (3, 12):
|
if sys.version_info >= (3, 12):
|
||||||
from typing import override
|
from typing import override
|
||||||
@@ -1541,6 +1541,8 @@ class AsyncConnection(object):
|
|||||||
storage_options_provider: Optional["StorageOptionsProvider"] = None,
|
storage_options_provider: Optional["StorageOptionsProvider"] = None,
|
||||||
index_cache_size: Optional[int] = None,
|
index_cache_size: Optional[int] = None,
|
||||||
location: Optional[str] = None,
|
location: Optional[str] = None,
|
||||||
|
namespace_client: Optional[Any] = None,
|
||||||
|
managed_versioning: Optional[bool] = None,
|
||||||
) -> AsyncTable:
|
) -> AsyncTable:
|
||||||
"""Open a Lance Table in the database.
|
"""Open a Lance Table in the database.
|
||||||
|
|
||||||
@@ -1573,6 +1575,9 @@ class AsyncConnection(object):
|
|||||||
The explicit location (URI) of the table. If provided, the table will be
|
The explicit location (URI) of the table. If provided, the table will be
|
||||||
opened from this location instead of deriving it from the database URI
|
opened from this location instead of deriving it from the database URI
|
||||||
and table name.
|
and table name.
|
||||||
|
managed_versioning: bool, optional
|
||||||
|
Whether managed versioning is enabled for this table. If provided,
|
||||||
|
avoids a redundant describe_table call when namespace_client is set.
|
||||||
|
|
||||||
Returns
|
Returns
|
||||||
-------
|
-------
|
||||||
@@ -1587,6 +1592,8 @@ class AsyncConnection(object):
|
|||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
index_cache_size=index_cache_size,
|
index_cache_size=index_cache_size,
|
||||||
location=location,
|
location=location,
|
||||||
|
namespace_client=namespace_client,
|
||||||
|
managed_versioning=managed_versioning,
|
||||||
)
|
)
|
||||||
return AsyncTable(table)
|
return AsyncTable(table)
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import sys
|
|||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
import urllib.error
|
import urllib.error
|
||||||
|
import urllib.request
|
||||||
import weakref
|
import weakref
|
||||||
import logging
|
import logging
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
|||||||
298
python/python/lancedb/expr.py
Normal file
298
python/python/lancedb/expr.py
Normal file
@@ -0,0 +1,298 @@
|
|||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
"""Type-safe expression builder for filters and projections.
|
||||||
|
|
||||||
|
Instead of writing raw SQL strings you can build expressions with Python
|
||||||
|
operators::
|
||||||
|
|
||||||
|
from lancedb.expr import col, lit
|
||||||
|
|
||||||
|
# filter: age > 18 AND status = 'active'
|
||||||
|
filt = (col("age") > lit(18)) & (col("status") == lit("active"))
|
||||||
|
|
||||||
|
# projection: compute a derived column
|
||||||
|
proj = {"score": col("raw_score") * lit(1.5)}
|
||||||
|
|
||||||
|
table.search().where(filt).select(proj).to_list()
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Union
|
||||||
|
|
||||||
|
import pyarrow as pa
|
||||||
|
|
||||||
|
from lancedb._lancedb import PyExpr, expr_col, expr_lit, expr_func
|
||||||
|
|
||||||
|
__all__ = ["Expr", "col", "lit", "func"]
|
||||||
|
|
||||||
|
_STR_TO_PA_TYPE: dict = {
|
||||||
|
"bool": pa.bool_(),
|
||||||
|
"boolean": pa.bool_(),
|
||||||
|
"int8": pa.int8(),
|
||||||
|
"int16": pa.int16(),
|
||||||
|
"int32": pa.int32(),
|
||||||
|
"int64": pa.int64(),
|
||||||
|
"uint8": pa.uint8(),
|
||||||
|
"uint16": pa.uint16(),
|
||||||
|
"uint32": pa.uint32(),
|
||||||
|
"uint64": pa.uint64(),
|
||||||
|
"float16": pa.float16(),
|
||||||
|
"float32": pa.float32(),
|
||||||
|
"float": pa.float32(),
|
||||||
|
"float64": pa.float64(),
|
||||||
|
"double": pa.float64(),
|
||||||
|
"string": pa.string(),
|
||||||
|
"utf8": pa.string(),
|
||||||
|
"str": pa.string(),
|
||||||
|
"large_string": pa.large_utf8(),
|
||||||
|
"large_utf8": pa.large_utf8(),
|
||||||
|
"date32": pa.date32(),
|
||||||
|
"date": pa.date32(),
|
||||||
|
"date64": pa.date64(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _coerce(value: "ExprLike") -> "Expr":
|
||||||
|
"""Return *value* as an :class:`Expr`, wrapping plain Python values via
|
||||||
|
:func:`lit` if needed."""
|
||||||
|
if isinstance(value, Expr):
|
||||||
|
return value
|
||||||
|
return lit(value)
|
||||||
|
|
||||||
|
|
||||||
|
# Type alias used in annotations.
|
||||||
|
ExprLike = Union["Expr", bool, int, float, str]
|
||||||
|
|
||||||
|
|
||||||
|
class Expr:
|
||||||
|
"""A type-safe expression node.
|
||||||
|
|
||||||
|
Construct instances with :func:`col` and :func:`lit`, then combine them
|
||||||
|
using Python operators or the named methods below.
|
||||||
|
|
||||||
|
Examples
|
||||||
|
--------
|
||||||
|
>>> from lancedb.expr import col, lit
|
||||||
|
>>> filt = (col("age") > lit(18)) & (col("name").lower() == lit("alice"))
|
||||||
|
>>> proj = {"double": col("x") * lit(2)}
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Make Expr unhashable so that == returns an Expr rather than being used
|
||||||
|
# for dict keys / set membership.
|
||||||
|
__hash__ = None # type: ignore[assignment]
|
||||||
|
|
||||||
|
def __init__(self, inner: PyExpr) -> None:
|
||||||
|
self._inner = inner
|
||||||
|
|
||||||
|
# ── comparisons ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def __eq__(self, other: ExprLike) -> "Expr": # type: ignore[override]
|
||||||
|
"""Equal to (``col("x") == 1``)."""
|
||||||
|
return Expr(self._inner.eq(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __ne__(self, other: ExprLike) -> "Expr": # type: ignore[override]
|
||||||
|
"""Not equal to (``col("x") != 1``)."""
|
||||||
|
return Expr(self._inner.ne(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __lt__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Less than (``col("x") < 1``)."""
|
||||||
|
return Expr(self._inner.lt(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __le__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Less than or equal to (``col("x") <= 1``)."""
|
||||||
|
return Expr(self._inner.lte(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __gt__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Greater than (``col("x") > 1``)."""
|
||||||
|
return Expr(self._inner.gt(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __ge__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Greater than or equal to (``col("x") >= 1``)."""
|
||||||
|
return Expr(self._inner.gte(_coerce(other)._inner))
|
||||||
|
|
||||||
|
# ── logical ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def __and__(self, other: "Expr") -> "Expr":
|
||||||
|
"""Logical AND (``expr_a & expr_b``)."""
|
||||||
|
return Expr(self._inner.and_(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __or__(self, other: "Expr") -> "Expr":
|
||||||
|
"""Logical OR (``expr_a | expr_b``)."""
|
||||||
|
return Expr(self._inner.or_(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __invert__(self) -> "Expr":
|
||||||
|
"""Logical NOT (``~expr``)."""
|
||||||
|
return Expr(self._inner.not_())
|
||||||
|
|
||||||
|
# ── arithmetic ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def __add__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Add (``col("x") + 1``)."""
|
||||||
|
return Expr(self._inner.add(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __radd__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Right-hand add (``1 + col("x")``)."""
|
||||||
|
return Expr(_coerce(other)._inner.add(self._inner))
|
||||||
|
|
||||||
|
def __sub__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Subtract (``col("x") - 1``)."""
|
||||||
|
return Expr(self._inner.sub(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __rsub__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Right-hand subtract (``1 - col("x")``)."""
|
||||||
|
return Expr(_coerce(other)._inner.sub(self._inner))
|
||||||
|
|
||||||
|
def __mul__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Multiply (``col("x") * 2``)."""
|
||||||
|
return Expr(self._inner.mul(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __rmul__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Right-hand multiply (``2 * col("x")``)."""
|
||||||
|
return Expr(_coerce(other)._inner.mul(self._inner))
|
||||||
|
|
||||||
|
def __truediv__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Divide (``col("x") / 2``)."""
|
||||||
|
return Expr(self._inner.div(_coerce(other)._inner))
|
||||||
|
|
||||||
|
def __rtruediv__(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Right-hand divide (``1 / col("x")``)."""
|
||||||
|
return Expr(_coerce(other)._inner.div(self._inner))
|
||||||
|
|
||||||
|
# ── string methods ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def lower(self) -> "Expr":
|
||||||
|
"""Convert string column values to lowercase."""
|
||||||
|
return Expr(self._inner.lower())
|
||||||
|
|
||||||
|
def upper(self) -> "Expr":
|
||||||
|
"""Convert string column values to uppercase."""
|
||||||
|
return Expr(self._inner.upper())
|
||||||
|
|
||||||
|
def contains(self, substr: "ExprLike") -> "Expr":
|
||||||
|
"""Return True where the string contains *substr*."""
|
||||||
|
return Expr(self._inner.contains(_coerce(substr)._inner))
|
||||||
|
|
||||||
|
# ── type cast ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def cast(self, data_type: Union[str, "pa.DataType"]) -> "Expr":
|
||||||
|
"""Cast values to *data_type*.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
data_type:
|
||||||
|
A PyArrow ``DataType`` (e.g. ``pa.int32()``) or one of the type
|
||||||
|
name strings: ``"bool"``, ``"int8"``, ``"int16"``, ``"int32"``,
|
||||||
|
``"int64"``, ``"uint8"``–``"uint64"``, ``"float32"``,
|
||||||
|
``"float64"``, ``"string"``, ``"date32"``, ``"date64"``.
|
||||||
|
"""
|
||||||
|
if isinstance(data_type, str):
|
||||||
|
try:
|
||||||
|
data_type = _STR_TO_PA_TYPE[data_type]
|
||||||
|
except KeyError:
|
||||||
|
raise ValueError(
|
||||||
|
f"unsupported data type: '{data_type}'. Supported: "
|
||||||
|
f"{', '.join(_STR_TO_PA_TYPE)}"
|
||||||
|
)
|
||||||
|
return Expr(self._inner.cast(data_type))
|
||||||
|
|
||||||
|
# ── named comparison helpers (alternative to operators) ──────────────────
|
||||||
|
|
||||||
|
def eq(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Equal to."""
|
||||||
|
return self.__eq__(other)
|
||||||
|
|
||||||
|
def ne(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Not equal to."""
|
||||||
|
return self.__ne__(other)
|
||||||
|
|
||||||
|
def lt(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Less than."""
|
||||||
|
return self.__lt__(other)
|
||||||
|
|
||||||
|
def lte(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Less than or equal to."""
|
||||||
|
return self.__le__(other)
|
||||||
|
|
||||||
|
def gt(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Greater than."""
|
||||||
|
return self.__gt__(other)
|
||||||
|
|
||||||
|
def gte(self, other: ExprLike) -> "Expr":
|
||||||
|
"""Greater than or equal to."""
|
||||||
|
return self.__ge__(other)
|
||||||
|
|
||||||
|
def and_(self, other: "Expr") -> "Expr":
|
||||||
|
"""Logical AND."""
|
||||||
|
return self.__and__(other)
|
||||||
|
|
||||||
|
def or_(self, other: "Expr") -> "Expr":
|
||||||
|
"""Logical OR."""
|
||||||
|
return self.__or__(other)
|
||||||
|
|
||||||
|
# ── utilities ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def to_sql(self) -> str:
|
||||||
|
"""Render the expression as a SQL string (useful for debugging)."""
|
||||||
|
return self._inner.to_sql()
|
||||||
|
|
||||||
|
def __repr__(self) -> str:
|
||||||
|
return f"Expr({self._inner.to_sql()})"
|
||||||
|
|
||||||
|
|
||||||
|
# ── free functions ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
def col(name: str) -> Expr:
|
||||||
|
"""Reference a table column by name.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
name:
|
||||||
|
The column name.
|
||||||
|
|
||||||
|
Examples
|
||||||
|
--------
|
||||||
|
>>> from lancedb.expr import col, lit
|
||||||
|
>>> col("age") > lit(18)
|
||||||
|
Expr((age > 18))
|
||||||
|
"""
|
||||||
|
return Expr(expr_col(name))
|
||||||
|
|
||||||
|
|
||||||
|
def lit(value: Union[bool, int, float, str]) -> Expr:
|
||||||
|
"""Create a literal (constant) value expression.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
value:
|
||||||
|
A Python ``bool``, ``int``, ``float``, or ``str``.
|
||||||
|
|
||||||
|
Examples
|
||||||
|
--------
|
||||||
|
>>> from lancedb.expr import col, lit
|
||||||
|
>>> col("price") * lit(1.1)
|
||||||
|
Expr((price * 1.1))
|
||||||
|
"""
|
||||||
|
return Expr(expr_lit(value))
|
||||||
|
|
||||||
|
|
||||||
|
def func(name: str, *args: ExprLike) -> Expr:
|
||||||
|
"""Call an arbitrary SQL function by name.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
name:
|
||||||
|
The SQL function name (e.g. ``"lower"``, ``"upper"``).
|
||||||
|
*args:
|
||||||
|
The function arguments as :class:`Expr` or plain Python literals.
|
||||||
|
|
||||||
|
Examples
|
||||||
|
--------
|
||||||
|
>>> from lancedb.expr import col, func
|
||||||
|
>>> func("lower", col("name"))
|
||||||
|
Expr(lower(name))
|
||||||
|
"""
|
||||||
|
inner_args = [_coerce(a)._inner for a in args]
|
||||||
|
return Expr(expr_func(name, inner_args))
|
||||||
@@ -12,7 +12,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import sys
|
import sys
|
||||||
from typing import Dict, Iterable, List, Optional, Union
|
from typing import Any, Dict, Iterable, List, Optional, Union
|
||||||
|
|
||||||
if sys.version_info >= (3, 12):
|
if sys.version_info >= (3, 12):
|
||||||
from typing import override
|
from typing import override
|
||||||
@@ -240,7 +240,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
session : Optional[Session]
|
session : Optional[Session]
|
||||||
A session to use for this connection
|
A session to use for this connection
|
||||||
"""
|
"""
|
||||||
self._ns = namespace
|
self._namespace_client = namespace
|
||||||
self.read_consistency_interval = read_consistency_interval
|
self.read_consistency_interval = read_consistency_interval
|
||||||
self.storage_options = storage_options or {}
|
self.storage_options = storage_options or {}
|
||||||
self.session = session
|
self.session = session
|
||||||
@@ -269,7 +269,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
if namespace is None:
|
if namespace is None:
|
||||||
namespace = []
|
namespace = []
|
||||||
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
||||||
response = self._ns.list_tables(request)
|
response = self._namespace_client.list_tables(request)
|
||||||
return response.tables if response.tables else []
|
return response.tables if response.tables else []
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -309,7 +309,9 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
# Try to describe the table first to see if it exists
|
# Try to describe the table first to see if it exists
|
||||||
try:
|
try:
|
||||||
describe_request = DescribeTableRequest(id=table_id)
|
describe_request = DescribeTableRequest(id=table_id)
|
||||||
describe_response = self._ns.describe_table(describe_request)
|
describe_response = self._namespace_client.describe_table(
|
||||||
|
describe_request
|
||||||
|
)
|
||||||
location = describe_response.location
|
location = describe_response.location
|
||||||
namespace_storage_options = describe_response.storage_options
|
namespace_storage_options = describe_response.storage_options
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -323,7 +325,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
location=None,
|
location=None,
|
||||||
properties=self.storage_options if self.storage_options else None,
|
properties=self.storage_options if self.storage_options else None,
|
||||||
)
|
)
|
||||||
declare_response = self._ns.declare_table(declare_request)
|
declare_response = self._namespace_client.declare_table(declare_request)
|
||||||
|
|
||||||
if not declare_response.location:
|
if not declare_response.location:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
@@ -353,7 +355,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
# Only create if namespace returned storage_options (not None)
|
# Only create if namespace returned storage_options (not None)
|
||||||
if storage_options_provider is None and namespace_storage_options is not None:
|
if storage_options_provider is None and namespace_storage_options is not None:
|
||||||
storage_options_provider = LanceNamespaceStorageOptionsProvider(
|
storage_options_provider = LanceNamespaceStorageOptionsProvider(
|
||||||
namespace=self._ns,
|
namespace=self._namespace_client,
|
||||||
table_id=table_id,
|
table_id=table_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -371,6 +373,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
storage_options=merged_storage_options,
|
storage_options=merged_storage_options,
|
||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
location=location,
|
location=location,
|
||||||
|
namespace_client=self._namespace_client,
|
||||||
)
|
)
|
||||||
|
|
||||||
return tbl
|
return tbl
|
||||||
@@ -389,7 +392,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
namespace = []
|
namespace = []
|
||||||
table_id = namespace + [name]
|
table_id = namespace + [name]
|
||||||
request = DescribeTableRequest(id=table_id)
|
request = DescribeTableRequest(id=table_id)
|
||||||
response = self._ns.describe_table(request)
|
response = self._namespace_client.describe_table(request)
|
||||||
|
|
||||||
# Merge storage options: self.storage_options < user options < namespace options
|
# Merge storage options: self.storage_options < user options < namespace options
|
||||||
merged_storage_options = dict(self.storage_options)
|
merged_storage_options = dict(self.storage_options)
|
||||||
@@ -402,10 +405,14 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
# Only create if namespace returned storage_options (not None)
|
# Only create if namespace returned storage_options (not None)
|
||||||
if storage_options_provider is None and response.storage_options is not None:
|
if storage_options_provider is None and response.storage_options is not None:
|
||||||
storage_options_provider = LanceNamespaceStorageOptionsProvider(
|
storage_options_provider = LanceNamespaceStorageOptionsProvider(
|
||||||
namespace=self._ns,
|
namespace=self._namespace_client,
|
||||||
table_id=table_id,
|
table_id=table_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Pass managed_versioning to avoid redundant describe_table call in Rust.
|
||||||
|
# Convert None to False since we already have the answer from describe_table.
|
||||||
|
managed_versioning = response.managed_versioning is True
|
||||||
|
|
||||||
return self._lance_table_from_uri(
|
return self._lance_table_from_uri(
|
||||||
name,
|
name,
|
||||||
response.location,
|
response.location,
|
||||||
@@ -413,6 +420,8 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
storage_options=merged_storage_options,
|
storage_options=merged_storage_options,
|
||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
index_cache_size=index_cache_size,
|
index_cache_size=index_cache_size,
|
||||||
|
namespace_client=self._namespace_client,
|
||||||
|
managed_versioning=managed_versioning,
|
||||||
)
|
)
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -422,7 +431,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
namespace = []
|
namespace = []
|
||||||
table_id = namespace + [name]
|
table_id = namespace + [name]
|
||||||
request = DropTableRequest(id=table_id)
|
request = DropTableRequest(id=table_id)
|
||||||
self._ns.drop_table(request)
|
self._namespace_client.drop_table(request)
|
||||||
|
|
||||||
@override
|
@override
|
||||||
def rename_table(
|
def rename_table(
|
||||||
@@ -484,7 +493,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
request = ListNamespacesRequest(
|
request = ListNamespacesRequest(
|
||||||
id=namespace, page_token=page_token, limit=limit
|
id=namespace, page_token=page_token, limit=limit
|
||||||
)
|
)
|
||||||
response = self._ns.list_namespaces(request)
|
response = self._namespace_client.list_namespaces(request)
|
||||||
return ListNamespacesResponse(
|
return ListNamespacesResponse(
|
||||||
namespaces=response.namespaces if response.namespaces else [],
|
namespaces=response.namespaces if response.namespaces else [],
|
||||||
page_token=response.page_token,
|
page_token=response.page_token,
|
||||||
@@ -520,7 +529,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
mode=_normalize_create_namespace_mode(mode),
|
mode=_normalize_create_namespace_mode(mode),
|
||||||
properties=properties,
|
properties=properties,
|
||||||
)
|
)
|
||||||
response = self._ns.create_namespace(request)
|
response = self._namespace_client.create_namespace(request)
|
||||||
return CreateNamespaceResponse(
|
return CreateNamespaceResponse(
|
||||||
properties=response.properties if hasattr(response, "properties") else None
|
properties=response.properties if hasattr(response, "properties") else None
|
||||||
)
|
)
|
||||||
@@ -555,7 +564,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
mode=_normalize_drop_namespace_mode(mode),
|
mode=_normalize_drop_namespace_mode(mode),
|
||||||
behavior=_normalize_drop_namespace_behavior(behavior),
|
behavior=_normalize_drop_namespace_behavior(behavior),
|
||||||
)
|
)
|
||||||
response = self._ns.drop_namespace(request)
|
response = self._namespace_client.drop_namespace(request)
|
||||||
return DropNamespaceResponse(
|
return DropNamespaceResponse(
|
||||||
properties=(
|
properties=(
|
||||||
response.properties if hasattr(response, "properties") else None
|
response.properties if hasattr(response, "properties") else None
|
||||||
@@ -581,7 +590,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
Response containing the namespace properties.
|
Response containing the namespace properties.
|
||||||
"""
|
"""
|
||||||
request = DescribeNamespaceRequest(id=namespace)
|
request = DescribeNamespaceRequest(id=namespace)
|
||||||
response = self._ns.describe_namespace(request)
|
response = self._namespace_client.describe_namespace(request)
|
||||||
return DescribeNamespaceResponse(
|
return DescribeNamespaceResponse(
|
||||||
properties=response.properties if hasattr(response, "properties") else None
|
properties=response.properties if hasattr(response, "properties") else None
|
||||||
)
|
)
|
||||||
@@ -615,7 +624,7 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
if namespace is None:
|
if namespace is None:
|
||||||
namespace = []
|
namespace = []
|
||||||
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
||||||
response = self._ns.list_tables(request)
|
response = self._namespace_client.list_tables(request)
|
||||||
return ListTablesResponse(
|
return ListTablesResponse(
|
||||||
tables=response.tables if response.tables else [],
|
tables=response.tables if response.tables else [],
|
||||||
page_token=response.page_token,
|
page_token=response.page_token,
|
||||||
@@ -630,6 +639,8 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
storage_options: Optional[Dict[str, str]] = None,
|
storage_options: Optional[Dict[str, str]] = None,
|
||||||
storage_options_provider: Optional[StorageOptionsProvider] = None,
|
storage_options_provider: Optional[StorageOptionsProvider] = None,
|
||||||
index_cache_size: Optional[int] = None,
|
index_cache_size: Optional[int] = None,
|
||||||
|
namespace_client: Optional[Any] = None,
|
||||||
|
managed_versioning: Optional[bool] = None,
|
||||||
) -> LanceTable:
|
) -> LanceTable:
|
||||||
# Open a table directly from a URI using the location parameter
|
# Open a table directly from a URI using the location parameter
|
||||||
# Note: storage_options should already be merged by the caller
|
# Note: storage_options should already be merged by the caller
|
||||||
@@ -643,6 +654,8 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Open the table using the temporary connection with the location parameter
|
# Open the table using the temporary connection with the location parameter
|
||||||
|
# Pass namespace_client to enable managed versioning support
|
||||||
|
# Pass managed_versioning to avoid redundant describe_table call
|
||||||
return LanceTable.open(
|
return LanceTable.open(
|
||||||
temp_conn,
|
temp_conn,
|
||||||
name,
|
name,
|
||||||
@@ -651,6 +664,8 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
index_cache_size=index_cache_size,
|
index_cache_size=index_cache_size,
|
||||||
location=table_uri,
|
location=table_uri,
|
||||||
|
namespace_client=namespace_client,
|
||||||
|
managed_versioning=managed_versioning,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -685,7 +700,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
session : Optional[Session]
|
session : Optional[Session]
|
||||||
A session to use for this connection
|
A session to use for this connection
|
||||||
"""
|
"""
|
||||||
self._ns = namespace
|
self._namespace_client = namespace
|
||||||
self.read_consistency_interval = read_consistency_interval
|
self.read_consistency_interval = read_consistency_interval
|
||||||
self.storage_options = storage_options or {}
|
self.storage_options = storage_options or {}
|
||||||
self.session = session
|
self.session = session
|
||||||
@@ -713,7 +728,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
if namespace is None:
|
if namespace is None:
|
||||||
namespace = []
|
namespace = []
|
||||||
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
||||||
response = self._ns.list_tables(request)
|
response = self._namespace_client.list_tables(request)
|
||||||
return response.tables if response.tables else []
|
return response.tables if response.tables else []
|
||||||
|
|
||||||
async def create_table(
|
async def create_table(
|
||||||
@@ -750,7 +765,9 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
# Try to describe the table first to see if it exists
|
# Try to describe the table first to see if it exists
|
||||||
try:
|
try:
|
||||||
describe_request = DescribeTableRequest(id=table_id)
|
describe_request = DescribeTableRequest(id=table_id)
|
||||||
describe_response = self._ns.describe_table(describe_request)
|
describe_response = self._namespace_client.describe_table(
|
||||||
|
describe_request
|
||||||
|
)
|
||||||
location = describe_response.location
|
location = describe_response.location
|
||||||
namespace_storage_options = describe_response.storage_options
|
namespace_storage_options = describe_response.storage_options
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -764,7 +781,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
location=None,
|
location=None,
|
||||||
properties=self.storage_options if self.storage_options else None,
|
properties=self.storage_options if self.storage_options else None,
|
||||||
)
|
)
|
||||||
declare_response = self._ns.declare_table(declare_request)
|
declare_response = self._namespace_client.declare_table(declare_request)
|
||||||
|
|
||||||
if not declare_response.location:
|
if not declare_response.location:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
@@ -797,7 +814,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
and namespace_storage_options is not None
|
and namespace_storage_options is not None
|
||||||
):
|
):
|
||||||
provider = LanceNamespaceStorageOptionsProvider(
|
provider = LanceNamespaceStorageOptionsProvider(
|
||||||
namespace=self._ns,
|
namespace=self._namespace_client,
|
||||||
table_id=table_id,
|
table_id=table_id,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
@@ -817,6 +834,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
storage_options=merged_storage_options,
|
storage_options=merged_storage_options,
|
||||||
storage_options_provider=provider,
|
storage_options_provider=provider,
|
||||||
location=location,
|
location=location,
|
||||||
|
namespace_client=self._namespace_client,
|
||||||
)
|
)
|
||||||
|
|
||||||
lance_table = await asyncio.to_thread(_create_table)
|
lance_table = await asyncio.to_thread(_create_table)
|
||||||
@@ -837,7 +855,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
namespace = []
|
namespace = []
|
||||||
table_id = namespace + [name]
|
table_id = namespace + [name]
|
||||||
request = DescribeTableRequest(id=table_id)
|
request = DescribeTableRequest(id=table_id)
|
||||||
response = self._ns.describe_table(request)
|
response = self._namespace_client.describe_table(request)
|
||||||
|
|
||||||
# Merge storage options: self.storage_options < user options < namespace options
|
# Merge storage options: self.storage_options < user options < namespace options
|
||||||
merged_storage_options = dict(self.storage_options)
|
merged_storage_options = dict(self.storage_options)
|
||||||
@@ -849,10 +867,14 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
# Create a storage options provider if not provided by user
|
# Create a storage options provider if not provided by user
|
||||||
if storage_options_provider is None and response.storage_options is not None:
|
if storage_options_provider is None and response.storage_options is not None:
|
||||||
storage_options_provider = LanceNamespaceStorageOptionsProvider(
|
storage_options_provider = LanceNamespaceStorageOptionsProvider(
|
||||||
namespace=self._ns,
|
namespace=self._namespace_client,
|
||||||
table_id=table_id,
|
table_id=table_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Capture managed_versioning from describe response.
|
||||||
|
# Convert None to False since we already have the answer from describe_table.
|
||||||
|
managed_versioning = response.managed_versioning is True
|
||||||
|
|
||||||
# Open table in a thread
|
# Open table in a thread
|
||||||
def _open_table():
|
def _open_table():
|
||||||
temp_conn = LanceDBConnection(
|
temp_conn = LanceDBConnection(
|
||||||
@@ -870,6 +892,8 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
index_cache_size=index_cache_size,
|
index_cache_size=index_cache_size,
|
||||||
location=response.location,
|
location=response.location,
|
||||||
|
namespace_client=self._namespace_client,
|
||||||
|
managed_versioning=managed_versioning,
|
||||||
)
|
)
|
||||||
|
|
||||||
lance_table = await asyncio.to_thread(_open_table)
|
lance_table = await asyncio.to_thread(_open_table)
|
||||||
@@ -881,7 +905,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
namespace = []
|
namespace = []
|
||||||
table_id = namespace + [name]
|
table_id = namespace + [name]
|
||||||
request = DropTableRequest(id=table_id)
|
request = DropTableRequest(id=table_id)
|
||||||
self._ns.drop_table(request)
|
self._namespace_client.drop_table(request)
|
||||||
|
|
||||||
async def rename_table(
|
async def rename_table(
|
||||||
self,
|
self,
|
||||||
@@ -943,7 +967,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
request = ListNamespacesRequest(
|
request = ListNamespacesRequest(
|
||||||
id=namespace, page_token=page_token, limit=limit
|
id=namespace, page_token=page_token, limit=limit
|
||||||
)
|
)
|
||||||
response = self._ns.list_namespaces(request)
|
response = self._namespace_client.list_namespaces(request)
|
||||||
return ListNamespacesResponse(
|
return ListNamespacesResponse(
|
||||||
namespaces=response.namespaces if response.namespaces else [],
|
namespaces=response.namespaces if response.namespaces else [],
|
||||||
page_token=response.page_token,
|
page_token=response.page_token,
|
||||||
@@ -978,7 +1002,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
mode=_normalize_create_namespace_mode(mode),
|
mode=_normalize_create_namespace_mode(mode),
|
||||||
properties=properties,
|
properties=properties,
|
||||||
)
|
)
|
||||||
response = self._ns.create_namespace(request)
|
response = self._namespace_client.create_namespace(request)
|
||||||
return CreateNamespaceResponse(
|
return CreateNamespaceResponse(
|
||||||
properties=response.properties if hasattr(response, "properties") else None
|
properties=response.properties if hasattr(response, "properties") else None
|
||||||
)
|
)
|
||||||
@@ -1012,7 +1036,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
mode=_normalize_drop_namespace_mode(mode),
|
mode=_normalize_drop_namespace_mode(mode),
|
||||||
behavior=_normalize_drop_namespace_behavior(behavior),
|
behavior=_normalize_drop_namespace_behavior(behavior),
|
||||||
)
|
)
|
||||||
response = self._ns.drop_namespace(request)
|
response = self._namespace_client.drop_namespace(request)
|
||||||
return DropNamespaceResponse(
|
return DropNamespaceResponse(
|
||||||
properties=(
|
properties=(
|
||||||
response.properties if hasattr(response, "properties") else None
|
response.properties if hasattr(response, "properties") else None
|
||||||
@@ -1039,7 +1063,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
Response containing the namespace properties.
|
Response containing the namespace properties.
|
||||||
"""
|
"""
|
||||||
request = DescribeNamespaceRequest(id=namespace)
|
request = DescribeNamespaceRequest(id=namespace)
|
||||||
response = self._ns.describe_namespace(request)
|
response = self._namespace_client.describe_namespace(request)
|
||||||
return DescribeNamespaceResponse(
|
return DescribeNamespaceResponse(
|
||||||
properties=response.properties if hasattr(response, "properties") else None
|
properties=response.properties if hasattr(response, "properties") else None
|
||||||
)
|
)
|
||||||
@@ -1072,7 +1096,7 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
if namespace is None:
|
if namespace is None:
|
||||||
namespace = []
|
namespace = []
|
||||||
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
request = ListTablesRequest(id=namespace, page_token=page_token, limit=limit)
|
||||||
response = self._ns.list_tables(request)
|
response = self._namespace_client.list_tables(request)
|
||||||
return ListTablesResponse(
|
return ListTablesResponse(
|
||||||
tables=response.tables if response.tables else [],
|
tables=response.tables if response.tables else [],
|
||||||
page_token=response.page_token,
|
page_token=response.page_token,
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ from .rerankers.base import Reranker
|
|||||||
from .rerankers.rrf import RRFReranker
|
from .rerankers.rrf import RRFReranker
|
||||||
from .rerankers.util import check_reranker_result
|
from .rerankers.util import check_reranker_result
|
||||||
from .util import flatten_columns
|
from .util import flatten_columns
|
||||||
|
from .expr import Expr
|
||||||
from lancedb._lancedb import fts_query_to_json
|
from lancedb._lancedb import fts_query_to_json
|
||||||
from typing_extensions import Annotated
|
from typing_extensions import Annotated
|
||||||
|
|
||||||
@@ -70,7 +71,7 @@ def ensure_vector_query(
|
|||||||
) -> Union[List[float], List[List[float]], pa.Array, List[pa.Array]]:
|
) -> Union[List[float], List[List[float]], pa.Array, List[pa.Array]]:
|
||||||
if isinstance(val, list):
|
if isinstance(val, list):
|
||||||
if len(val) == 0:
|
if len(val) == 0:
|
||||||
return ValueError("Vector query must be a non-empty list")
|
raise ValueError("Vector query must be a non-empty list")
|
||||||
sample = val[0]
|
sample = val[0]
|
||||||
else:
|
else:
|
||||||
if isinstance(val, float):
|
if isinstance(val, float):
|
||||||
@@ -83,7 +84,7 @@ def ensure_vector_query(
|
|||||||
return val
|
return val
|
||||||
if isinstance(sample, list):
|
if isinstance(sample, list):
|
||||||
if len(sample) == 0:
|
if len(sample) == 0:
|
||||||
return ValueError("Vector query must be a non-empty list")
|
raise ValueError("Vector query must be a non-empty list")
|
||||||
if isinstance(sample[0], float):
|
if isinstance(sample[0], float):
|
||||||
# val is list of list of floats
|
# val is list of list of floats
|
||||||
return val
|
return val
|
||||||
@@ -449,8 +450,8 @@ class Query(pydantic.BaseModel):
|
|||||||
ensure_vector_query,
|
ensure_vector_query,
|
||||||
] = None
|
] = None
|
||||||
|
|
||||||
# sql filter to refine the query with
|
# sql filter or type-safe Expr to refine the query with
|
||||||
filter: Optional[str] = None
|
filter: Optional[Union[str, Expr]] = None
|
||||||
|
|
||||||
# if True then apply the filter after vector search
|
# if True then apply the filter after vector search
|
||||||
postfilter: Optional[bool] = None
|
postfilter: Optional[bool] = None
|
||||||
@@ -464,8 +465,8 @@ class Query(pydantic.BaseModel):
|
|||||||
# distance type to use for vector search
|
# distance type to use for vector search
|
||||||
distance_type: Optional[str] = None
|
distance_type: Optional[str] = None
|
||||||
|
|
||||||
# which columns to return in the results
|
# which columns to return in the results (dict values may be str or Expr)
|
||||||
columns: Optional[Union[List[str], Dict[str, str]]] = None
|
columns: Optional[Union[List[str], Dict[str, Union[str, Expr]]]] = None
|
||||||
|
|
||||||
# minimum number of IVF partitions to search
|
# minimum number of IVF partitions to search
|
||||||
#
|
#
|
||||||
@@ -606,6 +607,7 @@ class LanceQueryBuilder(ABC):
|
|||||||
query,
|
query,
|
||||||
ordering_field_name=ordering_field_name,
|
ordering_field_name=ordering_field_name,
|
||||||
fts_columns=fts_columns,
|
fts_columns=fts_columns,
|
||||||
|
fast_search=fast_search,
|
||||||
)
|
)
|
||||||
|
|
||||||
if isinstance(query, list):
|
if isinstance(query, list):
|
||||||
@@ -855,14 +857,15 @@ class LanceQueryBuilder(ABC):
|
|||||||
self._offset = offset
|
self._offset = offset
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def select(self, columns: Union[list[str], dict[str, str]]) -> Self:
|
def select(self, columns: Union[list[str], dict[str, Union[str, Expr]]]) -> Self:
|
||||||
"""Set the columns to return.
|
"""Set the columns to return.
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
----------
|
----------
|
||||||
columns: list of str, or dict of str to str default None
|
columns: list of str, or dict of str to str or Expr
|
||||||
List of column names to be fetched.
|
List of column names to be fetched.
|
||||||
Or a dictionary of column names to SQL expressions.
|
Or a dictionary of column names to SQL expressions or
|
||||||
|
:class:`~lancedb.expr.Expr` objects.
|
||||||
All columns are fetched if None or unspecified.
|
All columns are fetched if None or unspecified.
|
||||||
|
|
||||||
Returns
|
Returns
|
||||||
@@ -876,15 +879,15 @@ class LanceQueryBuilder(ABC):
|
|||||||
raise ValueError("columns must be a list or a dictionary")
|
raise ValueError("columns must be a list or a dictionary")
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def where(self, where: str, prefilter: bool = True) -> Self:
|
def where(self, where: Union[str, Expr], prefilter: bool = True) -> Self:
|
||||||
"""Set the where clause.
|
"""Set the where clause.
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
----------
|
----------
|
||||||
where: str
|
where: str or :class:`~lancedb.expr.Expr`
|
||||||
The where clause which is a valid SQL where clause. See
|
The filter condition. Can be a SQL string or a type-safe
|
||||||
`Lance filter pushdown <https://lance.org/guide/read_and_write#filter-push-down>`_
|
:class:`~lancedb.expr.Expr` built with :func:`~lancedb.expr.col`
|
||||||
for valid SQL expressions.
|
and :func:`~lancedb.expr.lit`.
|
||||||
prefilter: bool, default True
|
prefilter: bool, default True
|
||||||
If True, apply the filter before vector search, otherwise the
|
If True, apply the filter before vector search, otherwise the
|
||||||
filter is applied on the result of vector search.
|
filter is applied on the result of vector search.
|
||||||
@@ -1354,15 +1357,17 @@ class LanceVectorQueryBuilder(LanceQueryBuilder):
|
|||||||
|
|
||||||
return result_set
|
return result_set
|
||||||
|
|
||||||
def where(self, where: str, prefilter: bool = None) -> LanceVectorQueryBuilder:
|
def where(
|
||||||
|
self, where: Union[str, Expr], prefilter: bool = None
|
||||||
|
) -> LanceVectorQueryBuilder:
|
||||||
"""Set the where clause.
|
"""Set the where clause.
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
----------
|
----------
|
||||||
where: str
|
where: str or :class:`~lancedb.expr.Expr`
|
||||||
The where clause which is a valid SQL where clause. See
|
The filter condition. Can be a SQL string or a type-safe
|
||||||
`Lance filter pushdown <https://lance.org/guide/read_and_write#filter-push-down>`_
|
:class:`~lancedb.expr.Expr` built with :func:`~lancedb.expr.col`
|
||||||
for valid SQL expressions.
|
and :func:`~lancedb.expr.lit`.
|
||||||
prefilter: bool, default True
|
prefilter: bool, default True
|
||||||
If True, apply the filter before vector search, otherwise the
|
If True, apply the filter before vector search, otherwise the
|
||||||
filter is applied on the result of vector search.
|
filter is applied on the result of vector search.
|
||||||
@@ -1456,13 +1461,14 @@ class LanceFtsQueryBuilder(LanceQueryBuilder):
|
|||||||
query: str | FullTextQuery,
|
query: str | FullTextQuery,
|
||||||
ordering_field_name: Optional[str] = None,
|
ordering_field_name: Optional[str] = None,
|
||||||
fts_columns: Optional[Union[str, List[str]]] = None,
|
fts_columns: Optional[Union[str, List[str]]] = None,
|
||||||
|
fast_search: bool = None,
|
||||||
):
|
):
|
||||||
super().__init__(table)
|
super().__init__(table)
|
||||||
self._query = query
|
self._query = query
|
||||||
self._phrase_query = False
|
self._phrase_query = False
|
||||||
self.ordering_field_name = ordering_field_name
|
self.ordering_field_name = ordering_field_name
|
||||||
self._reranker = None
|
self._reranker = None
|
||||||
self._fast_search = None
|
self._fast_search = fast_search
|
||||||
if isinstance(fts_columns, str):
|
if isinstance(fts_columns, str):
|
||||||
fts_columns = [fts_columns]
|
fts_columns = [fts_columns]
|
||||||
self._fts_columns = fts_columns
|
self._fts_columns = fts_columns
|
||||||
@@ -2203,8 +2209,8 @@ class LanceHybridQueryBuilder(LanceQueryBuilder):
|
|||||||
self._vector_query.select(self._columns)
|
self._vector_query.select(self._columns)
|
||||||
self._fts_query.select(self._columns)
|
self._fts_query.select(self._columns)
|
||||||
if self._where:
|
if self._where:
|
||||||
self._vector_query.where(self._where, self._postfilter)
|
self._vector_query.where(self._where, not self._postfilter)
|
||||||
self._fts_query.where(self._where, self._postfilter)
|
self._fts_query.where(self._where, not self._postfilter)
|
||||||
if self._with_row_id:
|
if self._with_row_id:
|
||||||
self._vector_query.with_row_id(True)
|
self._vector_query.with_row_id(True)
|
||||||
self._fts_query.with_row_id(True)
|
self._fts_query.with_row_id(True)
|
||||||
@@ -2284,10 +2290,20 @@ class AsyncQueryBase(object):
|
|||||||
"""
|
"""
|
||||||
if isinstance(columns, list) and all(isinstance(c, str) for c in columns):
|
if isinstance(columns, list) and all(isinstance(c, str) for c in columns):
|
||||||
self._inner.select_columns(columns)
|
self._inner.select_columns(columns)
|
||||||
elif isinstance(columns, dict) and all(
|
elif isinstance(columns, dict) and all(isinstance(k, str) for k in columns):
|
||||||
isinstance(k, str) and isinstance(v, str) for k, v in columns.items()
|
if any(isinstance(v, Expr) for v in columns.values()):
|
||||||
):
|
# At least one value is an Expr — use the type-safe path.
|
||||||
self._inner.select(list(columns.items()))
|
from .expr import _coerce
|
||||||
|
|
||||||
|
pairs = [(k, _coerce(v)._inner) for k, v in columns.items()]
|
||||||
|
self._inner.select_expr(pairs)
|
||||||
|
elif all(isinstance(v, str) for v in columns.values()):
|
||||||
|
self._inner.select(list(columns.items()))
|
||||||
|
else:
|
||||||
|
raise TypeError(
|
||||||
|
"dict values must be str or Expr, got "
|
||||||
|
+ str({k: type(v) for k, v in columns.items()})
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
raise TypeError("columns must be a list of column names or a dict")
|
raise TypeError("columns must be a list of column names or a dict")
|
||||||
return self
|
return self
|
||||||
@@ -2527,11 +2543,13 @@ class AsyncStandardQuery(AsyncQueryBase):
|
|||||||
"""
|
"""
|
||||||
super().__init__(inner)
|
super().__init__(inner)
|
||||||
|
|
||||||
def where(self, predicate: str) -> Self:
|
def where(self, predicate: Union[str, Expr]) -> Self:
|
||||||
"""
|
"""
|
||||||
Only return rows matching the given predicate
|
Only return rows matching the given predicate
|
||||||
|
|
||||||
The predicate should be supplied as an SQL query string.
|
The predicate can be a SQL string or a type-safe
|
||||||
|
:class:`~lancedb.expr.Expr` built with :func:`~lancedb.expr.col`
|
||||||
|
and :func:`~lancedb.expr.lit`.
|
||||||
|
|
||||||
Examples
|
Examples
|
||||||
--------
|
--------
|
||||||
@@ -2543,7 +2561,10 @@ class AsyncStandardQuery(AsyncQueryBase):
|
|||||||
Filtering performance can often be improved by creating a scalar index
|
Filtering performance can often be improved by creating a scalar index
|
||||||
on the filter column(s).
|
on the filter column(s).
|
||||||
"""
|
"""
|
||||||
self._inner.where(predicate)
|
if isinstance(predicate, Expr):
|
||||||
|
self._inner.where_expr(predicate._inner)
|
||||||
|
else:
|
||||||
|
self._inner.where(predicate)
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def limit(self, limit: int) -> Self:
|
def limit(self, limit: int) -> Self:
|
||||||
|
|||||||
@@ -568,4 +568,4 @@ class RemoteDBConnection(DBConnection):
|
|||||||
|
|
||||||
async def close(self):
|
async def close(self):
|
||||||
"""Close the connection to the database."""
|
"""Close the connection to the database."""
|
||||||
self._client.close()
|
self._conn.close()
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import logging
|
import logging
|
||||||
from functools import cached_property
|
from functools import cached_property
|
||||||
from typing import Dict, Iterable, List, Optional, Union, Literal
|
from typing import Any, Callable, Dict, Iterable, List, Optional, Union, Literal
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
from lancedb._lancedb import (
|
from lancedb._lancedb import (
|
||||||
@@ -35,6 +35,7 @@ import pyarrow as pa
|
|||||||
from lancedb.common import DATA, VEC, VECTOR_COLUMN_NAME
|
from lancedb.common import DATA, VEC, VECTOR_COLUMN_NAME
|
||||||
from lancedb.merge import LanceMergeInsertBuilder
|
from lancedb.merge import LanceMergeInsertBuilder
|
||||||
from lancedb.embeddings import EmbeddingFunctionRegistry
|
from lancedb.embeddings import EmbeddingFunctionRegistry
|
||||||
|
from lancedb.table import _normalize_progress
|
||||||
|
|
||||||
from ..query import LanceVectorQueryBuilder, LanceQueryBuilder, LanceTakeQueryBuilder
|
from ..query import LanceVectorQueryBuilder, LanceQueryBuilder, LanceTakeQueryBuilder
|
||||||
from ..table import AsyncTable, IndexStatistics, Query, Table, Tags
|
from ..table import AsyncTable, IndexStatistics, Query, Table, Tags
|
||||||
@@ -218,8 +219,6 @@ class RemoteTable(Table):
|
|||||||
train: bool = True,
|
train: bool = True,
|
||||||
):
|
):
|
||||||
"""Create an index on the table.
|
"""Create an index on the table.
|
||||||
Currently, the only parameters that matter are
|
|
||||||
the metric and the vector column name.
|
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
----------
|
----------
|
||||||
@@ -250,11 +249,6 @@ class RemoteTable(Table):
|
|||||||
>>> table.create_index("l2", "vector") # doctest: +SKIP
|
>>> table.create_index("l2", "vector") # doctest: +SKIP
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if num_sub_vectors is not None:
|
|
||||||
logging.warning(
|
|
||||||
"num_sub_vectors is not supported on LanceDB cloud."
|
|
||||||
"This parameter will be tuned automatically."
|
|
||||||
)
|
|
||||||
if accelerator is not None:
|
if accelerator is not None:
|
||||||
logging.warning(
|
logging.warning(
|
||||||
"GPU accelerator is not yet supported on LanceDB cloud."
|
"GPU accelerator is not yet supported on LanceDB cloud."
|
||||||
@@ -315,6 +309,7 @@ class RemoteTable(Table):
|
|||||||
mode: str = "append",
|
mode: str = "append",
|
||||||
on_bad_vectors: str = "error",
|
on_bad_vectors: str = "error",
|
||||||
fill_value: float = 0.0,
|
fill_value: float = 0.0,
|
||||||
|
progress: Optional[Union[bool, Callable, Any]] = None,
|
||||||
) -> AddResult:
|
) -> AddResult:
|
||||||
"""Add more data to the [Table](Table). It has the same API signature as
|
"""Add more data to the [Table](Table). It has the same API signature as
|
||||||
the OSS version.
|
the OSS version.
|
||||||
@@ -337,17 +332,29 @@ class RemoteTable(Table):
|
|||||||
One of "error", "drop", "fill".
|
One of "error", "drop", "fill".
|
||||||
fill_value: float, default 0.
|
fill_value: float, default 0.
|
||||||
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
||||||
|
progress: bool, callable, or tqdm-like, optional
|
||||||
|
A callback or tqdm-compatible progress bar. See
|
||||||
|
:meth:`Table.add` for details.
|
||||||
|
|
||||||
Returns
|
Returns
|
||||||
-------
|
-------
|
||||||
AddResult
|
AddResult
|
||||||
An object containing the new version number of the table after adding data.
|
An object containing the new version number of the table after adding data.
|
||||||
"""
|
"""
|
||||||
return LOOP.run(
|
progress, owns = _normalize_progress(progress)
|
||||||
self._table.add(
|
try:
|
||||||
data, mode=mode, on_bad_vectors=on_bad_vectors, fill_value=fill_value
|
return LOOP.run(
|
||||||
|
self._table.add(
|
||||||
|
data,
|
||||||
|
mode=mode,
|
||||||
|
on_bad_vectors=on_bad_vectors,
|
||||||
|
fill_value=fill_value,
|
||||||
|
progress=progress,
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
finally:
|
||||||
|
if owns:
|
||||||
|
progress.close()
|
||||||
|
|
||||||
def search(
|
def search(
|
||||||
self,
|
self,
|
||||||
@@ -647,6 +654,45 @@ class RemoteTable(Table):
|
|||||||
def drop_index(self, index_name: str):
|
def drop_index(self, index_name: str):
|
||||||
return LOOP.run(self._table.drop_index(index_name))
|
return LOOP.run(self._table.drop_index(index_name))
|
||||||
|
|
||||||
|
def prewarm_index(self, name: str) -> None:
|
||||||
|
"""Prewarm an index in the table.
|
||||||
|
|
||||||
|
This is a hint to the database that the index will be accessed in the
|
||||||
|
future and should be loaded into memory if possible. This can reduce
|
||||||
|
cold-start latency for subsequent queries.
|
||||||
|
|
||||||
|
This call initiates prewarming and returns once the request is accepted.
|
||||||
|
It is idempotent and safe to call from multiple clients concurrently.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
name: str
|
||||||
|
The name of the index to prewarm
|
||||||
|
"""
|
||||||
|
return LOOP.run(self._table.prewarm_index(name))
|
||||||
|
|
||||||
|
def prewarm_data(self, columns: Optional[List[str]] = None) -> None:
|
||||||
|
"""Prewarm data for the table.
|
||||||
|
|
||||||
|
This is a hint to the database that the given columns will be accessed
|
||||||
|
in the future and the database should prefetch the data if possible.
|
||||||
|
Currently only supported on remote tables.
|
||||||
|
|
||||||
|
This call initiates prewarming and returns once the request is accepted.
|
||||||
|
It is idempotent and safe to call from multiple clients concurrently.
|
||||||
|
|
||||||
|
This operation has a large upfront cost but can speed up future queries
|
||||||
|
that need to fetch the given columns. Large columns such as embeddings
|
||||||
|
or binary data may not be practical to prewarm. This feature is intended
|
||||||
|
for workloads that issue many queries against the same columns.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
columns: list of str, optional
|
||||||
|
The columns to prewarm. If None, all columns are prewarmed.
|
||||||
|
"""
|
||||||
|
return LOOP.run(self._table.prewarm_data(columns))
|
||||||
|
|
||||||
def wait_for_index(
|
def wait_for_index(
|
||||||
self, index_names: Iterable[str], timeout: timedelta = timedelta(seconds=300)
|
self, index_names: Iterable[str], timeout: timedelta = timedelta(seconds=300)
|
||||||
):
|
):
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ from functools import cached_property
|
|||||||
from typing import (
|
from typing import (
|
||||||
TYPE_CHECKING,
|
TYPE_CHECKING,
|
||||||
Any,
|
Any,
|
||||||
|
Callable,
|
||||||
Dict,
|
Dict,
|
||||||
Iterable,
|
Iterable,
|
||||||
List,
|
List,
|
||||||
@@ -277,7 +278,7 @@ def _sanitize_data(
|
|||||||
|
|
||||||
if metadata:
|
if metadata:
|
||||||
new_metadata = target_schema.metadata or {}
|
new_metadata = target_schema.metadata or {}
|
||||||
new_metadata = new_metadata.update(metadata)
|
new_metadata.update(metadata)
|
||||||
target_schema = target_schema.with_metadata(new_metadata)
|
target_schema = target_schema.with_metadata(new_metadata)
|
||||||
|
|
||||||
_validate_schema(target_schema)
|
_validate_schema(target_schema)
|
||||||
@@ -556,6 +557,21 @@ def _table_uri(base: str, table_name: str) -> str:
|
|||||||
return join_uri(base, f"{table_name}.lance")
|
return join_uri(base, f"{table_name}.lance")
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_progress(progress):
|
||||||
|
"""Normalize a ``progress`` parameter for :meth:`Table.add`.
|
||||||
|
|
||||||
|
Returns ``(progress_obj, owns)`` where *owns* is True when we created a
|
||||||
|
tqdm bar that the caller must close.
|
||||||
|
"""
|
||||||
|
if progress is True:
|
||||||
|
from tqdm.auto import tqdm
|
||||||
|
|
||||||
|
return tqdm(unit=" rows"), True
|
||||||
|
if progress is False or progress is None:
|
||||||
|
return None, False
|
||||||
|
return progress, False
|
||||||
|
|
||||||
|
|
||||||
class Table(ABC):
|
class Table(ABC):
|
||||||
"""
|
"""
|
||||||
A Table is a collection of Records in a LanceDB Database.
|
A Table is a collection of Records in a LanceDB Database.
|
||||||
@@ -974,6 +990,7 @@ class Table(ABC):
|
|||||||
mode: AddMode = "append",
|
mode: AddMode = "append",
|
||||||
on_bad_vectors: OnBadVectorsType = "error",
|
on_bad_vectors: OnBadVectorsType = "error",
|
||||||
fill_value: float = 0.0,
|
fill_value: float = 0.0,
|
||||||
|
progress: Optional[Union[bool, Callable, Any]] = None,
|
||||||
) -> AddResult:
|
) -> AddResult:
|
||||||
"""Add more data to the [Table](Table).
|
"""Add more data to the [Table](Table).
|
||||||
|
|
||||||
@@ -995,6 +1012,29 @@ class Table(ABC):
|
|||||||
One of "error", "drop", "fill".
|
One of "error", "drop", "fill".
|
||||||
fill_value: float, default 0.
|
fill_value: float, default 0.
|
||||||
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
||||||
|
progress: bool, callable, or tqdm-like, optional
|
||||||
|
Progress reporting during the add operation. Can be:
|
||||||
|
|
||||||
|
- ``True`` to automatically create and display a tqdm progress
|
||||||
|
bar (requires ``tqdm`` to be installed)::
|
||||||
|
|
||||||
|
table.add(data, progress=True)
|
||||||
|
|
||||||
|
- A **callable** that receives a dict with keys ``output_rows``,
|
||||||
|
``output_bytes``, ``total_rows``, ``elapsed_seconds``,
|
||||||
|
``active_tasks``, ``total_tasks``, and ``done``::
|
||||||
|
|
||||||
|
def on_progress(p):
|
||||||
|
print(f"{p['output_rows']}/{p['total_rows']} rows, "
|
||||||
|
f"{p['active_tasks']}/{p['total_tasks']} workers")
|
||||||
|
table.add(data, progress=on_progress)
|
||||||
|
|
||||||
|
- A **tqdm-compatible** progress bar whose ``total`` and
|
||||||
|
``update()`` will be called automatically. The postfix shows
|
||||||
|
write throughput (MB/s) and active worker count::
|
||||||
|
|
||||||
|
with tqdm() as pbar:
|
||||||
|
table.add(data, progress=pbar)
|
||||||
|
|
||||||
Returns
|
Returns
|
||||||
-------
|
-------
|
||||||
@@ -1331,7 +1371,7 @@ class Table(ABC):
|
|||||||
1 2 [3.0, 4.0]
|
1 2 [3.0, 4.0]
|
||||||
2 3 [5.0, 6.0]
|
2 3 [5.0, 6.0]
|
||||||
>>> table.delete("x = 2")
|
>>> table.delete("x = 2")
|
||||||
DeleteResult(version=2)
|
DeleteResult(num_deleted_rows=1, version=2)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 1 [1.0, 2.0]
|
0 1 [1.0, 2.0]
|
||||||
@@ -1345,7 +1385,7 @@ class Table(ABC):
|
|||||||
>>> to_remove
|
>>> to_remove
|
||||||
'1, 5'
|
'1, 5'
|
||||||
>>> table.delete(f"x IN ({to_remove})")
|
>>> table.delete(f"x IN ({to_remove})")
|
||||||
DeleteResult(version=3)
|
DeleteResult(num_deleted_rows=1, version=3)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 3 [5.0, 6.0]
|
0 3 [5.0, 6.0]
|
||||||
@@ -1506,22 +1546,17 @@ class Table(ABC):
|
|||||||
in-progress operation (e.g. appending new data) and these files will not
|
in-progress operation (e.g. appending new data) and these files will not
|
||||||
be deleted unless they are at least 7 days old. If delete_unverified is True
|
be deleted unless they are at least 7 days old. If delete_unverified is True
|
||||||
then these files will be deleted regardless of their age.
|
then these files will be deleted regardless of their age.
|
||||||
|
|
||||||
|
.. warning::
|
||||||
|
|
||||||
|
This should only be set to True if you can guarantee that no other
|
||||||
|
process is currently working on this dataset. Otherwise the dataset
|
||||||
|
could be put into a corrupted state.
|
||||||
|
|
||||||
retrain: bool, default False
|
retrain: bool, default False
|
||||||
This parameter is no longer used and is deprecated.
|
This parameter is no longer used and is deprecated.
|
||||||
|
|
||||||
Experimental API
|
The frequency an application should call optimize is based on the frequency of
|
||||||
----------------
|
|
||||||
|
|
||||||
The optimization process is undergoing active development and may change.
|
|
||||||
Our goal with these changes is to improve the performance of optimization and
|
|
||||||
reduce the complexity.
|
|
||||||
|
|
||||||
That being said, it is essential today to run optimize if you want the best
|
|
||||||
performance. It should be stable and safe to use in production, but it our
|
|
||||||
hope that the API may be simplified (or not even need to be called) in the
|
|
||||||
future.
|
|
||||||
|
|
||||||
The frequency an application shoudl call optimize is based on the frequency of
|
|
||||||
data modifications. If data is frequently added, deleted, or updated then
|
data modifications. If data is frequently added, deleted, or updated then
|
||||||
optimize should be run frequently. A good rule of thumb is to run optimize if
|
optimize should be run frequently. A good rule of thumb is to run optimize if
|
||||||
you have added or modified 100,000 or more records or run more than 20 data
|
you have added or modified 100,000 or more records or run more than 20 data
|
||||||
@@ -1746,6 +1781,8 @@ class LanceTable(Table):
|
|||||||
storage_options_provider: Optional["StorageOptionsProvider"] = None,
|
storage_options_provider: Optional["StorageOptionsProvider"] = None,
|
||||||
index_cache_size: Optional[int] = None,
|
index_cache_size: Optional[int] = None,
|
||||||
location: Optional[str] = None,
|
location: Optional[str] = None,
|
||||||
|
namespace_client: Optional[Any] = None,
|
||||||
|
managed_versioning: Optional[bool] = None,
|
||||||
_async: AsyncTable = None,
|
_async: AsyncTable = None,
|
||||||
):
|
):
|
||||||
if namespace is None:
|
if namespace is None:
|
||||||
@@ -1753,6 +1790,7 @@ class LanceTable(Table):
|
|||||||
self._conn = connection
|
self._conn = connection
|
||||||
self._namespace = namespace
|
self._namespace = namespace
|
||||||
self._location = location # Store location for use in _dataset_path
|
self._location = location # Store location for use in _dataset_path
|
||||||
|
self._namespace_client = namespace_client
|
||||||
if _async is not None:
|
if _async is not None:
|
||||||
self._table = _async
|
self._table = _async
|
||||||
else:
|
else:
|
||||||
@@ -1764,6 +1802,8 @@ class LanceTable(Table):
|
|||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
index_cache_size=index_cache_size,
|
index_cache_size=index_cache_size,
|
||||||
location=location,
|
location=location,
|
||||||
|
namespace_client=namespace_client,
|
||||||
|
managed_versioning=managed_versioning,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1806,6 +1846,8 @@ class LanceTable(Table):
|
|||||||
storage_options_provider: Optional["StorageOptionsProvider"] = None,
|
storage_options_provider: Optional["StorageOptionsProvider"] = None,
|
||||||
index_cache_size: Optional[int] = None,
|
index_cache_size: Optional[int] = None,
|
||||||
location: Optional[str] = None,
|
location: Optional[str] = None,
|
||||||
|
namespace_client: Optional[Any] = None,
|
||||||
|
managed_versioning: Optional[bool] = None,
|
||||||
):
|
):
|
||||||
if namespace is None:
|
if namespace is None:
|
||||||
namespace = []
|
namespace = []
|
||||||
@@ -1817,6 +1859,8 @@ class LanceTable(Table):
|
|||||||
storage_options_provider=storage_options_provider,
|
storage_options_provider=storage_options_provider,
|
||||||
index_cache_size=index_cache_size,
|
index_cache_size=index_cache_size,
|
||||||
location=location,
|
location=location,
|
||||||
|
namespace_client=namespace_client,
|
||||||
|
managed_versioning=managed_versioning,
|
||||||
)
|
)
|
||||||
|
|
||||||
# check the dataset exists
|
# check the dataset exists
|
||||||
@@ -1848,6 +1892,16 @@ class LanceTable(Table):
|
|||||||
"Please install with `pip install pylance`."
|
"Please install with `pip install pylance`."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if self._namespace_client is not None:
|
||||||
|
table_id = self._namespace + [self.name]
|
||||||
|
return lance.dataset(
|
||||||
|
version=self.version,
|
||||||
|
storage_options=self._conn.storage_options,
|
||||||
|
namespace=self._namespace_client,
|
||||||
|
table_id=table_id,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
|
|
||||||
return lance.dataset(
|
return lance.dataset(
|
||||||
self._dataset_path,
|
self._dataset_path,
|
||||||
version=self.version,
|
version=self.version,
|
||||||
@@ -2200,12 +2254,18 @@ class LanceTable(Table):
|
|||||||
|
|
||||||
def prewarm_index(self, name: str) -> None:
|
def prewarm_index(self, name: str) -> None:
|
||||||
"""
|
"""
|
||||||
Prewarms an index in the table
|
Prewarm an index in the table.
|
||||||
|
|
||||||
This loads the entire index into memory
|
This is a hint to the database that the index will be accessed in the
|
||||||
|
future and should be loaded into memory if possible. This can reduce
|
||||||
|
cold-start latency for subsequent queries.
|
||||||
|
|
||||||
If the index does not fit into the available cache this call
|
This call initiates prewarming and returns once the request is accepted.
|
||||||
may be wasteful
|
It is idempotent and safe to call from multiple clients concurrently.
|
||||||
|
|
||||||
|
It is generally wasteful to call this if the index does not fit into the
|
||||||
|
available cache. Not all index types support prewarming; unsupported
|
||||||
|
indices will silently ignore the request.
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
----------
|
----------
|
||||||
@@ -2214,6 +2274,29 @@ class LanceTable(Table):
|
|||||||
"""
|
"""
|
||||||
return LOOP.run(self._table.prewarm_index(name))
|
return LOOP.run(self._table.prewarm_index(name))
|
||||||
|
|
||||||
|
def prewarm_data(self, columns: Optional[List[str]] = None) -> None:
|
||||||
|
"""
|
||||||
|
Prewarm data for the table.
|
||||||
|
|
||||||
|
This is a hint to the database that the given columns will be accessed
|
||||||
|
in the future and the database should prefetch the data if possible.
|
||||||
|
Currently only supported on remote tables.
|
||||||
|
|
||||||
|
This call initiates prewarming and returns once the request is accepted.
|
||||||
|
It is idempotent and safe to call from multiple clients concurrently.
|
||||||
|
|
||||||
|
This operation has a large upfront cost but can speed up future queries
|
||||||
|
that need to fetch the given columns. Large columns such as embeddings
|
||||||
|
or binary data may not be practical to prewarm. This feature is intended
|
||||||
|
for workloads that issue many queries against the same columns.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
columns: list of str, optional
|
||||||
|
The columns to prewarm. If None, all columns are prewarmed.
|
||||||
|
"""
|
||||||
|
return LOOP.run(self._table.prewarm_data(columns))
|
||||||
|
|
||||||
def wait_for_index(
|
def wait_for_index(
|
||||||
self, index_names: Iterable[str], timeout: timedelta = timedelta(seconds=300)
|
self, index_names: Iterable[str], timeout: timedelta = timedelta(seconds=300)
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -2449,6 +2532,7 @@ class LanceTable(Table):
|
|||||||
mode: AddMode = "append",
|
mode: AddMode = "append",
|
||||||
on_bad_vectors: OnBadVectorsType = "error",
|
on_bad_vectors: OnBadVectorsType = "error",
|
||||||
fill_value: float = 0.0,
|
fill_value: float = 0.0,
|
||||||
|
progress: Optional[Union[bool, Callable, Any]] = None,
|
||||||
) -> AddResult:
|
) -> AddResult:
|
||||||
"""Add data to the table.
|
"""Add data to the table.
|
||||||
If vector columns are missing and the table
|
If vector columns are missing and the table
|
||||||
@@ -2467,17 +2551,29 @@ class LanceTable(Table):
|
|||||||
One of "error", "drop", "fill", "null".
|
One of "error", "drop", "fill", "null".
|
||||||
fill_value: float, default 0.
|
fill_value: float, default 0.
|
||||||
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
||||||
|
progress: bool, callable, or tqdm-like, optional
|
||||||
|
A callback or tqdm-compatible progress bar. See
|
||||||
|
:meth:`Table.add` for details.
|
||||||
|
|
||||||
Returns
|
Returns
|
||||||
-------
|
-------
|
||||||
int
|
int
|
||||||
The number of vectors in the table.
|
The number of vectors in the table.
|
||||||
"""
|
"""
|
||||||
return LOOP.run(
|
progress, owns = _normalize_progress(progress)
|
||||||
self._table.add(
|
try:
|
||||||
data, mode=mode, on_bad_vectors=on_bad_vectors, fill_value=fill_value
|
return LOOP.run(
|
||||||
|
self._table.add(
|
||||||
|
data,
|
||||||
|
mode=mode,
|
||||||
|
on_bad_vectors=on_bad_vectors,
|
||||||
|
fill_value=fill_value,
|
||||||
|
progress=progress,
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
finally:
|
||||||
|
if owns:
|
||||||
|
progress.close()
|
||||||
|
|
||||||
def merge(
|
def merge(
|
||||||
self,
|
self,
|
||||||
@@ -2713,6 +2809,7 @@ class LanceTable(Table):
|
|||||||
data_storage_version: Optional[str] = None,
|
data_storage_version: Optional[str] = None,
|
||||||
enable_v2_manifest_paths: Optional[bool] = None,
|
enable_v2_manifest_paths: Optional[bool] = None,
|
||||||
location: Optional[str] = None,
|
location: Optional[str] = None,
|
||||||
|
namespace_client: Optional[Any] = None,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Create a new table.
|
Create a new table.
|
||||||
@@ -2773,6 +2870,7 @@ class LanceTable(Table):
|
|||||||
self._conn = db
|
self._conn = db
|
||||||
self._namespace = namespace
|
self._namespace = namespace
|
||||||
self._location = location
|
self._location = location
|
||||||
|
self._namespace_client = namespace_client
|
||||||
|
|
||||||
if data_storage_version is not None:
|
if data_storage_version is not None:
|
||||||
warnings.warn(
|
warnings.warn(
|
||||||
@@ -2997,22 +3095,17 @@ class LanceTable(Table):
|
|||||||
in-progress operation (e.g. appending new data) and these files will not
|
in-progress operation (e.g. appending new data) and these files will not
|
||||||
be deleted unless they are at least 7 days old. If delete_unverified is True
|
be deleted unless they are at least 7 days old. If delete_unverified is True
|
||||||
then these files will be deleted regardless of their age.
|
then these files will be deleted regardless of their age.
|
||||||
|
|
||||||
|
.. warning::
|
||||||
|
|
||||||
|
This should only be set to True if you can guarantee that no other
|
||||||
|
process is currently working on this dataset. Otherwise the dataset
|
||||||
|
could be put into a corrupted state.
|
||||||
|
|
||||||
retrain: bool, default False
|
retrain: bool, default False
|
||||||
This parameter is no longer used and is deprecated.
|
This parameter is no longer used and is deprecated.
|
||||||
|
|
||||||
Experimental API
|
The frequency an application should call optimize is based on the frequency of
|
||||||
----------------
|
|
||||||
|
|
||||||
The optimization process is undergoing active development and may change.
|
|
||||||
Our goal with these changes is to improve the performance of optimization and
|
|
||||||
reduce the complexity.
|
|
||||||
|
|
||||||
That being said, it is essential today to run optimize if you want the best
|
|
||||||
performance. It should be stable and safe to use in production, but it our
|
|
||||||
hope that the API may be simplified (or not even need to be called) in the
|
|
||||||
future.
|
|
||||||
|
|
||||||
The frequency an application shoudl call optimize is based on the frequency of
|
|
||||||
data modifications. If data is frequently added, deleted, or updated then
|
data modifications. If data is frequently added, deleted, or updated then
|
||||||
optimize should be run frequently. A good rule of thumb is to run optimize if
|
optimize should be run frequently. A good rule of thumb is to run optimize if
|
||||||
you have added or modified 100,000 or more records or run more than 20 data
|
you have added or modified 100,000 or more records or run more than 20 data
|
||||||
@@ -3613,19 +3706,47 @@ class AsyncTable:
|
|||||||
"""
|
"""
|
||||||
Prewarm an index in the table.
|
Prewarm an index in the table.
|
||||||
|
|
||||||
|
This is a hint to the database that the index will be accessed in the
|
||||||
|
future and should be loaded into memory if possible. This can reduce
|
||||||
|
cold-start latency for subsequent queries.
|
||||||
|
|
||||||
|
This call initiates prewarming and returns once the request is accepted.
|
||||||
|
It is idempotent and safe to call from multiple clients concurrently.
|
||||||
|
|
||||||
|
It is generally wasteful to call this if the index does not fit into the
|
||||||
|
available cache. Not all index types support prewarming; unsupported
|
||||||
|
indices will silently ignore the request.
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
----------
|
----------
|
||||||
name: str
|
name: str
|
||||||
The name of the index to prewarm
|
The name of the index to prewarm
|
||||||
|
|
||||||
Notes
|
|
||||||
-----
|
|
||||||
This will load the index into memory. This may reduce the cold-start time for
|
|
||||||
future queries. If the index does not fit in the cache then this call may be
|
|
||||||
wasteful.
|
|
||||||
"""
|
"""
|
||||||
await self._inner.prewarm_index(name)
|
await self._inner.prewarm_index(name)
|
||||||
|
|
||||||
|
async def prewarm_data(self, columns: Optional[List[str]] = None) -> None:
|
||||||
|
"""
|
||||||
|
Prewarm data for the table.
|
||||||
|
|
||||||
|
This is a hint to the database that the given columns will be accessed
|
||||||
|
in the future and the database should prefetch the data if possible.
|
||||||
|
Currently only supported on remote tables.
|
||||||
|
|
||||||
|
This call initiates prewarming and returns once the request is accepted.
|
||||||
|
It is idempotent and safe to call from multiple clients concurrently.
|
||||||
|
|
||||||
|
This operation has a large upfront cost but can speed up future queries
|
||||||
|
that need to fetch the given columns. Large columns such as embeddings
|
||||||
|
or binary data may not be practical to prewarm. This feature is intended
|
||||||
|
for workloads that issue many queries against the same columns.
|
||||||
|
|
||||||
|
Parameters
|
||||||
|
----------
|
||||||
|
columns: list of str, optional
|
||||||
|
The columns to prewarm. If None, all columns are prewarmed.
|
||||||
|
"""
|
||||||
|
await self._inner.prewarm_data(columns)
|
||||||
|
|
||||||
async def wait_for_index(
|
async def wait_for_index(
|
||||||
self, index_names: Iterable[str], timeout: timedelta = timedelta(seconds=300)
|
self, index_names: Iterable[str], timeout: timedelta = timedelta(seconds=300)
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -3701,6 +3822,7 @@ class AsyncTable:
|
|||||||
mode: Optional[Literal["append", "overwrite"]] = "append",
|
mode: Optional[Literal["append", "overwrite"]] = "append",
|
||||||
on_bad_vectors: Optional[OnBadVectorsType] = None,
|
on_bad_vectors: Optional[OnBadVectorsType] = None,
|
||||||
fill_value: Optional[float] = None,
|
fill_value: Optional[float] = None,
|
||||||
|
progress: Optional[Union[bool, Callable, Any]] = None,
|
||||||
) -> AddResult:
|
) -> AddResult:
|
||||||
"""Add more data to the [Table](Table).
|
"""Add more data to the [Table](Table).
|
||||||
|
|
||||||
@@ -3722,6 +3844,9 @@ class AsyncTable:
|
|||||||
One of "error", "drop", "fill", "null".
|
One of "error", "drop", "fill", "null".
|
||||||
fill_value: float, default 0.
|
fill_value: float, default 0.
|
||||||
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
The value to use when filling vectors. Only used if on_bad_vectors="fill".
|
||||||
|
progress: callable or tqdm-like, optional
|
||||||
|
A callback or tqdm-compatible progress bar. See
|
||||||
|
:meth:`Table.add` for details.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
schema = await self.schema()
|
schema = await self.schema()
|
||||||
@@ -3732,7 +3857,13 @@ class AsyncTable:
|
|||||||
|
|
||||||
# _santitize_data is an old code path, but we will use it until the
|
# _santitize_data is an old code path, but we will use it until the
|
||||||
# new code path is ready.
|
# new code path is ready.
|
||||||
if on_bad_vectors != "error" or (
|
if mode == "overwrite":
|
||||||
|
# For overwrite, apply the same preprocessing as create_table
|
||||||
|
# so vector columns are inferred as FixedSizeList.
|
||||||
|
data, _ = sanitize_create_table(
|
||||||
|
data, None, on_bad_vectors=on_bad_vectors, fill_value=fill_value
|
||||||
|
)
|
||||||
|
elif on_bad_vectors != "error" or (
|
||||||
schema.metadata is not None and b"embedding_functions" in schema.metadata
|
schema.metadata is not None and b"embedding_functions" in schema.metadata
|
||||||
):
|
):
|
||||||
data = _sanitize_data(
|
data = _sanitize_data(
|
||||||
@@ -3745,8 +3876,9 @@ class AsyncTable:
|
|||||||
)
|
)
|
||||||
_register_optional_converters()
|
_register_optional_converters()
|
||||||
data = to_scannable(data)
|
data = to_scannable(data)
|
||||||
|
progress, owns = _normalize_progress(progress)
|
||||||
try:
|
try:
|
||||||
return await self._inner.add(data, mode or "append")
|
return await self._inner.add(data, mode or "append", progress=progress)
|
||||||
except RuntimeError as e:
|
except RuntimeError as e:
|
||||||
if "Cast error" in str(e):
|
if "Cast error" in str(e):
|
||||||
raise ValueError(e)
|
raise ValueError(e)
|
||||||
@@ -3754,6 +3886,9 @@ class AsyncTable:
|
|||||||
raise ValueError(e)
|
raise ValueError(e)
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
finally:
|
||||||
|
if owns:
|
||||||
|
progress.close()
|
||||||
|
|
||||||
def merge_insert(self, on: Union[str, Iterable[str]]) -> LanceMergeInsertBuilder:
|
def merge_insert(self, on: Union[str, Iterable[str]]) -> LanceMergeInsertBuilder:
|
||||||
"""
|
"""
|
||||||
@@ -4076,7 +4211,7 @@ class AsyncTable:
|
|||||||
async_query = async_query.offset(query.offset)
|
async_query = async_query.offset(query.offset)
|
||||||
if query.columns:
|
if query.columns:
|
||||||
async_query = async_query.select(query.columns)
|
async_query = async_query.select(query.columns)
|
||||||
if query.filter:
|
if query.filter is not None:
|
||||||
async_query = async_query.where(query.filter)
|
async_query = async_query.where(query.filter)
|
||||||
if query.fast_search:
|
if query.fast_search:
|
||||||
async_query = async_query.fast_search()
|
async_query = async_query.fast_search()
|
||||||
@@ -4215,7 +4350,7 @@ class AsyncTable:
|
|||||||
1 2 [3.0, 4.0]
|
1 2 [3.0, 4.0]
|
||||||
2 3 [5.0, 6.0]
|
2 3 [5.0, 6.0]
|
||||||
>>> table.delete("x = 2")
|
>>> table.delete("x = 2")
|
||||||
DeleteResult(version=2)
|
DeleteResult(num_deleted_rows=1, version=2)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 1 [1.0, 2.0]
|
0 1 [1.0, 2.0]
|
||||||
@@ -4229,7 +4364,7 @@ class AsyncTable:
|
|||||||
>>> to_remove
|
>>> to_remove
|
||||||
'1, 5'
|
'1, 5'
|
||||||
>>> table.delete(f"x IN ({to_remove})")
|
>>> table.delete(f"x IN ({to_remove})")
|
||||||
DeleteResult(version=3)
|
DeleteResult(num_deleted_rows=1, version=3)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 3 [5.0, 6.0]
|
0 3 [5.0, 6.0]
|
||||||
@@ -4552,22 +4687,17 @@ class AsyncTable:
|
|||||||
in-progress operation (e.g. appending new data) and these files will not
|
in-progress operation (e.g. appending new data) and these files will not
|
||||||
be deleted unless they are at least 7 days old. If delete_unverified is True
|
be deleted unless they are at least 7 days old. If delete_unverified is True
|
||||||
then these files will be deleted regardless of their age.
|
then these files will be deleted regardless of their age.
|
||||||
|
|
||||||
|
.. warning::
|
||||||
|
|
||||||
|
This should only be set to True if you can guarantee that no other
|
||||||
|
process is currently working on this dataset. Otherwise the dataset
|
||||||
|
could be put into a corrupted state.
|
||||||
|
|
||||||
retrain: bool, default False
|
retrain: bool, default False
|
||||||
This parameter is no longer used and is deprecated.
|
This parameter is no longer used and is deprecated.
|
||||||
|
|
||||||
Experimental API
|
The frequency an application should call optimize is based on the frequency of
|
||||||
----------------
|
|
||||||
|
|
||||||
The optimization process is undergoing active development and may change.
|
|
||||||
Our goal with these changes is to improve the performance of optimization and
|
|
||||||
reduce the complexity.
|
|
||||||
|
|
||||||
That being said, it is essential today to run optimize if you want the best
|
|
||||||
performance. It should be stable and safe to use in production, but it our
|
|
||||||
hope that the API may be simplified (or not even need to be called) in the
|
|
||||||
future.
|
|
||||||
|
|
||||||
The frequency an application shoudl call optimize is based on the frequency of
|
|
||||||
data modifications. If data is frequently added, deleted, or updated then
|
data modifications. If data is frequently added, deleted, or updated then
|
||||||
optimize should be run frequently. A good rule of thumb is to run optimize if
|
optimize should be run frequently. A good rule of thumb is to run optimize if
|
||||||
you have added or modified 100,000 or more records or run more than 20 data
|
you have added or modified 100,000 or more records or run more than 20 data
|
||||||
@@ -4688,7 +4818,16 @@ class IndexStatistics:
|
|||||||
num_indexed_rows: int
|
num_indexed_rows: int
|
||||||
num_unindexed_rows: int
|
num_unindexed_rows: int
|
||||||
index_type: Literal[
|
index_type: Literal[
|
||||||
"IVF_PQ", "IVF_HNSW_PQ", "IVF_HNSW_SQ", "FTS", "BTREE", "BITMAP", "LABEL_LIST"
|
"IVF_FLAT",
|
||||||
|
"IVF_SQ",
|
||||||
|
"IVF_PQ",
|
||||||
|
"IVF_RQ",
|
||||||
|
"IVF_HNSW_SQ",
|
||||||
|
"IVF_HNSW_PQ",
|
||||||
|
"FTS",
|
||||||
|
"BTREE",
|
||||||
|
"BITMAP",
|
||||||
|
"LABEL_LIST",
|
||||||
]
|
]
|
||||||
distance_type: Optional[Literal["l2", "cosine", "dot"]] = None
|
distance_type: Optional[Literal["l2", "cosine", "dot"]] = None
|
||||||
num_indices: Optional[int] = None
|
num_indices: Optional[int] = None
|
||||||
|
|||||||
@@ -324,6 +324,16 @@ def _(value: list):
|
|||||||
return "[" + ", ".join(map(value_to_sql, value)) + "]"
|
return "[" + ", ".join(map(value_to_sql, value)) + "]"
|
||||||
|
|
||||||
|
|
||||||
|
@value_to_sql.register(dict)
|
||||||
|
def _(value: dict):
|
||||||
|
# https://datafusion.apache.org/user-guide/sql/scalar_functions.html#named-struct
|
||||||
|
return (
|
||||||
|
"named_struct("
|
||||||
|
+ ", ".join(f"'{k}', {value_to_sql(v)}" for k, v in value.items())
|
||||||
|
+ ")"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@value_to_sql.register(np.ndarray)
|
@value_to_sql.register(np.ndarray)
|
||||||
def _(value: np.ndarray):
|
def _(value: np.ndarray):
|
||||||
return value_to_sql(value.tolist())
|
return value_to_sql(value.tolist())
|
||||||
|
|||||||
@@ -546,3 +546,24 @@ def test_openai_no_retry_on_401(mock_sleep):
|
|||||||
assert mock_func.call_count == 1
|
assert mock_func.call_count == 1
|
||||||
# Verify that sleep was never called (no retries)
|
# Verify that sleep was never called (no retries)
|
||||||
assert mock_sleep.call_count == 0
|
assert mock_sleep.call_count == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_url_retrieve_downloads_image():
|
||||||
|
"""
|
||||||
|
Embedding functions like open-clip, siglip, and jinaai use url_retrieve()
|
||||||
|
to download images from HTTP URLs. For example, open_clip._to_pil() calls:
|
||||||
|
|
||||||
|
PIL_Image.open(io.BytesIO(url_retrieve(image)))
|
||||||
|
|
||||||
|
Verify that url_retrieve() can download an image and open it as PIL Image,
|
||||||
|
matching the real usage pattern in embedding functions.
|
||||||
|
"""
|
||||||
|
import io
|
||||||
|
|
||||||
|
Image = pytest.importorskip("PIL.Image")
|
||||||
|
from lancedb.embeddings.utils import url_retrieve
|
||||||
|
|
||||||
|
image_url = "http://farm1.staticflickr.com/53/167798175_7c7845bbbd_z.jpg"
|
||||||
|
image_bytes = url_retrieve(image_url)
|
||||||
|
img = Image.open(io.BytesIO(image_bytes))
|
||||||
|
assert img.size[0] > 0 and img.size[1] > 0
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ from lancedb.query import (
|
|||||||
PhraseQuery,
|
PhraseQuery,
|
||||||
BooleanQuery,
|
BooleanQuery,
|
||||||
Occur,
|
Occur,
|
||||||
|
LanceFtsQueryBuilder,
|
||||||
)
|
)
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import pyarrow as pa
|
import pyarrow as pa
|
||||||
@@ -920,6 +921,10 @@ def test_fts_fast_search(table):
|
|||||||
assert query.limit == 5
|
assert query.limit == 5
|
||||||
assert query.columns == ["text"]
|
assert query.columns == ["text"]
|
||||||
|
|
||||||
|
# fast_search should be enabled by keyword argument too
|
||||||
|
query = LanceFtsQueryBuilder(table, "xyz", fast_search=True).to_query_object()
|
||||||
|
assert query.fast_search is True
|
||||||
|
|
||||||
# Verify it executes without error and skips unindexed data
|
# Verify it executes without error and skips unindexed data
|
||||||
results = table.search("xyz", query_type="fts").fast_search().limit(5).to_list()
|
results = table.search("xyz", query_type="fts").fast_search().limit(5).to_list()
|
||||||
assert len(results) == 0
|
assert len(results) == 0
|
||||||
|
|||||||
@@ -177,6 +177,60 @@ async def test_analyze_plan(table: AsyncTable):
|
|||||||
assert "metrics=" in res
|
assert "metrics=" in res
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def table_with_id(tmpdir_factory) -> Table:
|
||||||
|
tmp_path = str(tmpdir_factory.mktemp("data"))
|
||||||
|
db = lancedb.connect(tmp_path)
|
||||||
|
data = pa.table(
|
||||||
|
{
|
||||||
|
"id": pa.array([1, 2, 3, 4], type=pa.int64()),
|
||||||
|
"text": pa.array(["a", "b", "cat", "dog"]),
|
||||||
|
"vector": pa.array(
|
||||||
|
[[0.1, 0.1], [2, 2], [-0.1, -0.1], [0.5, -0.5]],
|
||||||
|
type=pa.list_(pa.float32(), list_size=2),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
table = db.create_table("test_with_id", data)
|
||||||
|
table.create_fts_index("text", with_position=False, use_tantivy=False)
|
||||||
|
return table
|
||||||
|
|
||||||
|
|
||||||
|
def test_hybrid_prefilter_explain_plan(table_with_id: Table):
|
||||||
|
"""
|
||||||
|
Verify that the prefilter logic is not inverted in LanceHybridQueryBuilder.
|
||||||
|
"""
|
||||||
|
plan_prefilter = (
|
||||||
|
table_with_id.search(query_type="hybrid")
|
||||||
|
.vector([0.0, 0.0])
|
||||||
|
.text("dog")
|
||||||
|
.where("id = 1", prefilter=True)
|
||||||
|
.limit(2)
|
||||||
|
.explain_plan(verbose=True)
|
||||||
|
)
|
||||||
|
|
||||||
|
plan_postfilter = (
|
||||||
|
table_with_id.search(query_type="hybrid")
|
||||||
|
.vector([0.0, 0.0])
|
||||||
|
.text("dog")
|
||||||
|
.where("id = 1", prefilter=False)
|
||||||
|
.limit(2)
|
||||||
|
.explain_plan(verbose=True)
|
||||||
|
)
|
||||||
|
|
||||||
|
# prefilter=True: filter is pushed into the LanceRead scan.
|
||||||
|
# The FTS sub-plan exposes this as "full_filter=id = Int64(1)" inside LanceRead.
|
||||||
|
assert "full_filter=id = Int64(1)" in plan_prefilter, (
|
||||||
|
f"Should push the filter into the scan.\nPlan:\n{plan_prefilter}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# prefilter=False: filter is applied as a separate FilterExec after the search.
|
||||||
|
# The filter must NOT be embedded in the scan.
|
||||||
|
assert "full_filter=id = Int64(1)" not in plan_postfilter, (
|
||||||
|
f"Should NOT push the filter into the scan.\nPlan:\n{plan_postfilter}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_normalize_scores():
|
def test_normalize_scores():
|
||||||
cases = [
|
cases = [
|
||||||
(pa.array([0.1, 0.4]), pa.array([0.0, 1.0])),
|
(pa.array([0.1, 0.4]), pa.array([0.0, 1.0])),
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import random
|
import random
|
||||||
|
from typing import get_args, get_type_hints
|
||||||
|
|
||||||
import pyarrow as pa
|
import pyarrow as pa
|
||||||
import pytest
|
import pytest
|
||||||
@@ -22,6 +23,7 @@ from lancedb.index import (
|
|||||||
HnswSq,
|
HnswSq,
|
||||||
FTS,
|
FTS,
|
||||||
)
|
)
|
||||||
|
from lancedb.table import IndexStatistics
|
||||||
|
|
||||||
|
|
||||||
@pytest_asyncio.fixture
|
@pytest_asyncio.fixture
|
||||||
@@ -283,3 +285,23 @@ async def test_create_index_with_binary_vectors(binary_table: AsyncTable):
|
|||||||
for v in range(256):
|
for v in range(256):
|
||||||
res = await binary_table.query().nearest_to([v] * 128).to_arrow()
|
res = await binary_table.query().nearest_to([v] * 128).to_arrow()
|
||||||
assert res["id"][0].as_py() == v
|
assert res["id"][0].as_py() == v
|
||||||
|
|
||||||
|
|
||||||
|
def test_index_statistics_index_type_lists_all_supported_values():
|
||||||
|
expected_index_types = {
|
||||||
|
"IVF_FLAT",
|
||||||
|
"IVF_SQ",
|
||||||
|
"IVF_PQ",
|
||||||
|
"IVF_RQ",
|
||||||
|
"IVF_HNSW_SQ",
|
||||||
|
"IVF_HNSW_PQ",
|
||||||
|
"FTS",
|
||||||
|
"BTREE",
|
||||||
|
"BITMAP",
|
||||||
|
"LABEL_LIST",
|
||||||
|
}
|
||||||
|
|
||||||
|
assert (
|
||||||
|
set(get_args(get_type_hints(IndexStatistics)["index_type"]))
|
||||||
|
== expected_index_types
|
||||||
|
)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import shutil
|
|||||||
import pytest
|
import pytest
|
||||||
import pyarrow as pa
|
import pyarrow as pa
|
||||||
import lancedb
|
import lancedb
|
||||||
|
from lance_namespace.errors import NamespaceNotEmptyError, TableNotFoundError
|
||||||
|
|
||||||
|
|
||||||
class TestNamespaceConnection:
|
class TestNamespaceConnection:
|
||||||
@@ -130,7 +131,7 @@ class TestNamespaceConnection:
|
|||||||
assert len(list(db.table_names(namespace=["test_ns"]))) == 0
|
assert len(list(db.table_names(namespace=["test_ns"]))) == 0
|
||||||
|
|
||||||
# Should not be able to open dropped table
|
# Should not be able to open dropped table
|
||||||
with pytest.raises(RuntimeError):
|
with pytest.raises(TableNotFoundError):
|
||||||
db.open_table("table1", namespace=["test_ns"])
|
db.open_table("table1", namespace=["test_ns"])
|
||||||
|
|
||||||
def test_create_table_with_schema(self):
|
def test_create_table_with_schema(self):
|
||||||
@@ -340,7 +341,7 @@ class TestNamespaceConnection:
|
|||||||
db.create_table("test_table", schema=schema, namespace=["test_namespace"])
|
db.create_table("test_table", schema=schema, namespace=["test_namespace"])
|
||||||
|
|
||||||
# Try to drop namespace with tables - should fail
|
# Try to drop namespace with tables - should fail
|
||||||
with pytest.raises(RuntimeError, match="is not empty"):
|
with pytest.raises(NamespaceNotEmptyError):
|
||||||
db.drop_namespace(["test_namespace"])
|
db.drop_namespace(["test_namespace"])
|
||||||
|
|
||||||
# Drop table first
|
# Drop table first
|
||||||
|
|||||||
@@ -147,7 +147,12 @@ class TrackingNamespace(LanceNamespace):
|
|||||||
This simulates a credential rotation system where each call returns
|
This simulates a credential rotation system where each call returns
|
||||||
new credentials that expire after credential_expires_in_seconds.
|
new credentials that expire after credential_expires_in_seconds.
|
||||||
"""
|
"""
|
||||||
modified = copy.deepcopy(storage_options) if storage_options else {}
|
# Start from base storage options (endpoint, region, allow_http, etc.)
|
||||||
|
# because DirectoryNamespace returns None for storage_options from
|
||||||
|
# describe_table/declare_table when no credential vendor is configured.
|
||||||
|
modified = copy.deepcopy(self.base_storage_options)
|
||||||
|
if storage_options:
|
||||||
|
modified.update(storage_options)
|
||||||
|
|
||||||
# Increment credentials to simulate rotation
|
# Increment credentials to simulate rotation
|
||||||
modified["aws_access_key_id"] = f"AKID_{count}"
|
modified["aws_access_key_id"] = f"AKID_{count}"
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ from lancedb.query import (
|
|||||||
PhraseQuery,
|
PhraseQuery,
|
||||||
Query,
|
Query,
|
||||||
FullTextSearchQuery,
|
FullTextSearchQuery,
|
||||||
|
ensure_vector_query,
|
||||||
)
|
)
|
||||||
from lancedb.rerankers.cross_encoder import CrossEncoderReranker
|
from lancedb.rerankers.cross_encoder import CrossEncoderReranker
|
||||||
from lancedb.table import AsyncTable, LanceTable
|
from lancedb.table import AsyncTable, LanceTable
|
||||||
@@ -1501,6 +1502,18 @@ def test_search_empty_table(mem_db):
|
|||||||
assert results == []
|
assert results == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_ensure_vector_query_empty_list():
|
||||||
|
"""Regression: ensure_vector_query used to return instead of raise ValueError."""
|
||||||
|
with pytest.raises(ValueError, match="non-empty"):
|
||||||
|
ensure_vector_query([])
|
||||||
|
|
||||||
|
|
||||||
|
def test_ensure_vector_query_nested_empty_list():
|
||||||
|
"""Regression: ensure_vector_query used to return instead of raise ValueError."""
|
||||||
|
with pytest.raises(ValueError, match="non-empty"):
|
||||||
|
ensure_vector_query([[]])
|
||||||
|
|
||||||
|
|
||||||
def test_fast_search(tmp_path):
|
def test_fast_search(tmp_path):
|
||||||
db = lancedb.connect(tmp_path)
|
db = lancedb.connect(tmp_path)
|
||||||
|
|
||||||
|
|||||||
@@ -1201,6 +1201,18 @@ async def test_header_provider_overrides_static_headers():
|
|||||||
await db.table_names()
|
await db.table_names()
|
||||||
|
|
||||||
|
|
||||||
|
def test_close():
|
||||||
|
"""Test that close() works without AttributeError."""
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
def handler(req):
|
||||||
|
req.send_response(200)
|
||||||
|
req.end_headers()
|
||||||
|
|
||||||
|
with mock_lancedb_connection(handler) as db:
|
||||||
|
asyncio.run(db.close())
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("exception", [KeyboardInterrupt, SystemExit, GeneratorExit])
|
@pytest.mark.parametrize("exception", [KeyboardInterrupt, SystemExit, GeneratorExit])
|
||||||
def test_background_loop_cancellation(exception):
|
def test_background_loop_cancellation(exception):
|
||||||
"""Test that BackgroundEventLoop.run() cancels the future on interrupt."""
|
"""Test that BackgroundEventLoop.run() cancels the future on interrupt."""
|
||||||
|
|||||||
@@ -326,6 +326,24 @@ def test_add_struct(mem_db: DBConnection):
|
|||||||
table = mem_db.create_table("test2", schema=schema)
|
table = mem_db.create_table("test2", schema=schema)
|
||||||
table.add(data)
|
table.add(data)
|
||||||
|
|
||||||
|
struct_type = pa.struct(
|
||||||
|
[
|
||||||
|
("b", pa.int64()),
|
||||||
|
("a", pa.int64()),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
expected = pa.table(
|
||||||
|
{
|
||||||
|
"s_list": [
|
||||||
|
[
|
||||||
|
pa.scalar({"b": 1, "a": 2}, type=struct_type),
|
||||||
|
pa.scalar({"b": 4, "a": None}, type=struct_type),
|
||||||
|
]
|
||||||
|
],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
assert table.to_arrow() == expected
|
||||||
|
|
||||||
|
|
||||||
def test_add_subschema(mem_db: DBConnection):
|
def test_add_subschema(mem_db: DBConnection):
|
||||||
schema = pa.schema(
|
schema = pa.schema(
|
||||||
@@ -509,6 +527,132 @@ async def test_add_async(mem_db_async: AsyncConnection):
|
|||||||
assert await table.count_rows() == 3
|
assert await table.count_rows() == 3
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_overwrite_infers_vector_schema(mem_db: DBConnection):
|
||||||
|
"""Overwrite should infer vector columns the same way create_table does.
|
||||||
|
|
||||||
|
Regression test for https://github.com/lancedb/lancedb/issues/3183
|
||||||
|
"""
|
||||||
|
table = mem_db.create_table(
|
||||||
|
"test_overwrite_vec",
|
||||||
|
data=[
|
||||||
|
{"vector": [1.0, 2.0, 3.0, 4.0], "item": "foo"},
|
||||||
|
{"vector": [5.0, 6.0, 7.0, 8.0], "item": "bar"},
|
||||||
|
],
|
||||||
|
)
|
||||||
|
# create_table infers vector as fixed_size_list<float32, 4>
|
||||||
|
original_type = table.schema.field("vector").type
|
||||||
|
assert pa.types.is_fixed_size_list(original_type)
|
||||||
|
|
||||||
|
# overwrite with plain Python lists (PyArrow infers list<double>)
|
||||||
|
table.add(
|
||||||
|
[
|
||||||
|
{"vector": [10.0, 20.0, 30.0, 40.0], "item": "baz"},
|
||||||
|
],
|
||||||
|
mode="overwrite",
|
||||||
|
)
|
||||||
|
# overwrite should infer vector column the same way as create_table
|
||||||
|
new_type = table.schema.field("vector").type
|
||||||
|
assert pa.types.is_fixed_size_list(new_type), (
|
||||||
|
f"Expected fixed_size_list after overwrite, got {new_type}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_progress_callback(mem_db: DBConnection):
|
||||||
|
table = mem_db.create_table(
|
||||||
|
"test",
|
||||||
|
data=[{"id": 1}, {"id": 2}],
|
||||||
|
)
|
||||||
|
|
||||||
|
updates = []
|
||||||
|
table.add([{"id": 3}, {"id": 4}], progress=lambda p: updates.append(dict(p)))
|
||||||
|
|
||||||
|
assert len(table) == 4
|
||||||
|
# The done callback always fires, so we should always get at least one.
|
||||||
|
assert len(updates) >= 1, "expected at least one progress callback"
|
||||||
|
for p in updates:
|
||||||
|
assert "output_rows" in p
|
||||||
|
assert "output_bytes" in p
|
||||||
|
assert "total_rows" in p
|
||||||
|
assert "elapsed_seconds" in p
|
||||||
|
assert "active_tasks" in p
|
||||||
|
assert "total_tasks" in p
|
||||||
|
assert "done" in p
|
||||||
|
# The last callback should have done=True.
|
||||||
|
assert updates[-1]["done"] is True
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_progress_tqdm_like(mem_db: DBConnection):
|
||||||
|
"""Test that a tqdm-like object gets total set and update() called."""
|
||||||
|
|
||||||
|
class FakeBar:
|
||||||
|
def __init__(self):
|
||||||
|
self.total = None
|
||||||
|
self.n = 0
|
||||||
|
self.postfix = None
|
||||||
|
|
||||||
|
def update(self, n):
|
||||||
|
self.n += n
|
||||||
|
|
||||||
|
def set_postfix_str(self, s):
|
||||||
|
self.postfix = s
|
||||||
|
|
||||||
|
def refresh(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
table = mem_db.create_table(
|
||||||
|
"test",
|
||||||
|
data=[{"id": 1}, {"id": 2}],
|
||||||
|
)
|
||||||
|
|
||||||
|
bar = FakeBar()
|
||||||
|
table.add([{"id": 3}, {"id": 4}], progress=bar)
|
||||||
|
|
||||||
|
assert len(table) == 4
|
||||||
|
# Postfix should contain throughput and worker count
|
||||||
|
if bar.postfix is not None:
|
||||||
|
assert "MB/s" in bar.postfix
|
||||||
|
assert "workers" in bar.postfix
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_progress_bool(mem_db: DBConnection):
|
||||||
|
"""Test that progress=True creates and closes a tqdm bar automatically."""
|
||||||
|
table = mem_db.create_table(
|
||||||
|
"test",
|
||||||
|
data=[{"id": 1}, {"id": 2}],
|
||||||
|
)
|
||||||
|
|
||||||
|
table.add([{"id": 3}, {"id": 4}], progress=True)
|
||||||
|
assert len(table) == 4
|
||||||
|
|
||||||
|
# progress=False should be the same as None
|
||||||
|
table.add([{"id": 5}], progress=False)
|
||||||
|
assert len(table) == 5
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_add_progress_callback_async(mem_db_async: AsyncConnection):
|
||||||
|
"""Progress callbacks work through the async path too."""
|
||||||
|
table = await mem_db_async.create_table("test", data=[{"id": 1}, {"id": 2}])
|
||||||
|
|
||||||
|
updates = []
|
||||||
|
await table.add([{"id": 3}, {"id": 4}], progress=lambda p: updates.append(dict(p)))
|
||||||
|
|
||||||
|
assert await table.count_rows() == 4
|
||||||
|
assert len(updates) >= 1
|
||||||
|
assert updates[-1]["done"] is True
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_progress_callback_error(mem_db: DBConnection):
|
||||||
|
"""A failing callback must not prevent the write from succeeding."""
|
||||||
|
table = mem_db.create_table("test", data=[{"id": 1}, {"id": 2}])
|
||||||
|
|
||||||
|
def bad_callback(p):
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
|
table.add([{"id": 3}, {"id": 4}], progress=bad_callback)
|
||||||
|
assert len(table) == 4
|
||||||
|
|
||||||
|
|
||||||
def test_polars(mem_db: DBConnection):
|
def test_polars(mem_db: DBConnection):
|
||||||
data = {
|
data = {
|
||||||
"vector": [[3.1, 4.1], [5.9, 26.5]],
|
"vector": [[3.1, 4.1], [5.9, 26.5]],
|
||||||
@@ -2029,3 +2173,33 @@ def test_table_uri(tmp_path):
|
|||||||
db = lancedb.connect(tmp_path)
|
db = lancedb.connect(tmp_path)
|
||||||
table = db.create_table("my_table", data=[{"x": 0}])
|
table = db.create_table("my_table", data=[{"x": 0}])
|
||||||
assert table.uri == str(tmp_path / "my_table.lance")
|
assert table.uri == str(tmp_path / "my_table.lance")
|
||||||
|
|
||||||
|
|
||||||
|
def test_sanitize_data_metadata_not_stripped():
|
||||||
|
"""Regression test: dict.update() returns None, so assigning its result
|
||||||
|
would silently replace metadata with None, causing with_metadata(None)
|
||||||
|
to strip all schema metadata from the target schema."""
|
||||||
|
from lancedb.table import _sanitize_data
|
||||||
|
|
||||||
|
schema = pa.schema(
|
||||||
|
[pa.field("x", pa.int64())],
|
||||||
|
metadata={b"existing_key": b"existing_value"},
|
||||||
|
)
|
||||||
|
batch = pa.record_batch([pa.array([1, 2, 3])], schema=schema)
|
||||||
|
|
||||||
|
# Use a different field type so the reader and target schemas differ,
|
||||||
|
# forcing _cast_to_target_schema to rebuild the schema with the
|
||||||
|
# target's metadata (instead of taking the fast-path).
|
||||||
|
target_schema = pa.schema(
|
||||||
|
[pa.field("x", pa.int32())],
|
||||||
|
metadata={b"existing_key": b"existing_value"},
|
||||||
|
)
|
||||||
|
|
||||||
|
reader = pa.RecordBatchReader.from_batches(schema, [batch])
|
||||||
|
metadata = {b"new_key": b"new_value"}
|
||||||
|
result = _sanitize_data(reader, target_schema=target_schema, metadata=metadata)
|
||||||
|
|
||||||
|
result_schema = result.schema
|
||||||
|
assert result_schema.metadata is not None
|
||||||
|
assert result_schema.metadata[b"existing_key"] == b"existing_value"
|
||||||
|
assert result_schema.metadata[b"new_key"] == b"new_value"
|
||||||
|
|||||||
@@ -121,6 +121,32 @@ def test_value_to_sql_string(tmp_path):
|
|||||||
assert table.to_pandas().query("search == @value")["replace"].item() == value
|
assert table.to_pandas().query("search == @value")["replace"].item() == value
|
||||||
|
|
||||||
|
|
||||||
|
def test_value_to_sql_dict():
|
||||||
|
# Simple flat struct
|
||||||
|
assert value_to_sql({"a": 1, "b": "hello"}) == "named_struct('a', 1, 'b', 'hello')"
|
||||||
|
|
||||||
|
# Nested struct
|
||||||
|
assert (
|
||||||
|
value_to_sql({"outer": {"inner": 1}})
|
||||||
|
== "named_struct('outer', named_struct('inner', 1))"
|
||||||
|
)
|
||||||
|
|
||||||
|
# List inside struct
|
||||||
|
assert value_to_sql({"a": [1, 2]}) == "named_struct('a', [1, 2])"
|
||||||
|
|
||||||
|
# Mixed types
|
||||||
|
assert (
|
||||||
|
value_to_sql({"name": "test", "count": 42, "rate": 3.14, "active": True})
|
||||||
|
== "named_struct('name', 'test', 'count', 42, 'rate', 3.14, 'active', TRUE)"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Null value inside struct
|
||||||
|
assert value_to_sql({"a": None}) == "named_struct('a', NULL)"
|
||||||
|
|
||||||
|
# Empty dict
|
||||||
|
assert value_to_sql({}) == "named_struct()"
|
||||||
|
|
||||||
|
|
||||||
def test_append_vector_columns():
|
def test_append_vector_columns():
|
||||||
registry = EmbeddingFunctionRegistry.get_instance()
|
registry = EmbeddingFunctionRegistry.get_instance()
|
||||||
registry.register("test")(MockTextEmbeddingFunction)
|
registry.register("test")(MockTextEmbeddingFunction)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use arrow::{
|
|||||||
use futures::stream::StreamExt;
|
use futures::stream::StreamExt;
|
||||||
use lancedb::arrow::SendableRecordBatchStream;
|
use lancedb::arrow::SendableRecordBatchStream;
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
exceptions::PyStopAsyncIteration, pyclass, pymethods, Bound, Py, PyAny, PyRef, PyResult, Python,
|
Bound, Py, PyAny, PyRef, PyResult, Python, exceptions::PyStopAsyncIteration, pyclass, pymethods,
|
||||||
};
|
};
|
||||||
use pyo3_async_runtimes::tokio::future_into_py;
|
use pyo3_async_runtimes::tokio::future_into_py;
|
||||||
|
|
||||||
|
|||||||
@@ -9,15 +9,16 @@ use lancedb::{
|
|||||||
database::{CreateTableMode, Database, ReadConsistency},
|
database::{CreateTableMode, Database, ReadConsistency},
|
||||||
};
|
};
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
Bound, FromPyObject, Py, PyAny, PyRef, PyResult, Python,
|
||||||
exceptions::{PyRuntimeError, PyValueError},
|
exceptions::{PyRuntimeError, PyValueError},
|
||||||
pyclass, pyfunction, pymethods,
|
pyclass, pyfunction, pymethods,
|
||||||
types::{PyDict, PyDictMethods},
|
types::{PyDict, PyDictMethods},
|
||||||
Bound, FromPyObject, Py, PyAny, PyRef, PyResult, Python,
|
|
||||||
};
|
};
|
||||||
use pyo3_async_runtimes::tokio::future_into_py;
|
use pyo3_async_runtimes::tokio::future_into_py;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
error::PythonErrorExt, storage_options::py_object_to_storage_options_provider, table::Table,
|
error::PythonErrorExt, namespace::extract_namespace_arc,
|
||||||
|
storage_options::py_object_to_storage_options_provider, table::Table,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[pyclass]
|
#[pyclass]
|
||||||
@@ -182,7 +183,8 @@ impl Connection {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[pyo3(signature = (name, namespace=vec![], storage_options = None, storage_options_provider=None, index_cache_size = None, location=None))]
|
#[allow(clippy::too_many_arguments)]
|
||||||
|
#[pyo3(signature = (name, namespace=vec![], storage_options = None, storage_options_provider=None, index_cache_size = None, location=None, namespace_client=None, managed_versioning=None))]
|
||||||
pub fn open_table(
|
pub fn open_table(
|
||||||
self_: PyRef<'_, Self>,
|
self_: PyRef<'_, Self>,
|
||||||
name: String,
|
name: String,
|
||||||
@@ -191,11 +193,13 @@ impl Connection {
|
|||||||
storage_options_provider: Option<Py<PyAny>>,
|
storage_options_provider: Option<Py<PyAny>>,
|
||||||
index_cache_size: Option<u32>,
|
index_cache_size: Option<u32>,
|
||||||
location: Option<String>,
|
location: Option<String>,
|
||||||
|
namespace_client: Option<Py<PyAny>>,
|
||||||
|
managed_versioning: Option<bool>,
|
||||||
) -> PyResult<Bound<'_, PyAny>> {
|
) -> PyResult<Bound<'_, PyAny>> {
|
||||||
let inner = self_.get_inner()?.clone();
|
let inner = self_.get_inner()?.clone();
|
||||||
|
|
||||||
let mut builder = inner.open_table(name);
|
let mut builder = inner.open_table(name);
|
||||||
builder = builder.namespace(namespace);
|
builder = builder.namespace(namespace.clone());
|
||||||
if let Some(storage_options) = storage_options {
|
if let Some(storage_options) = storage_options {
|
||||||
builder = builder.storage_options(storage_options);
|
builder = builder.storage_options(storage_options);
|
||||||
}
|
}
|
||||||
@@ -209,6 +213,20 @@ impl Connection {
|
|||||||
if let Some(location) = location {
|
if let Some(location) = location {
|
||||||
builder = builder.location(location);
|
builder = builder.location(location);
|
||||||
}
|
}
|
||||||
|
// Extract namespace client from Python object if provided
|
||||||
|
let ns_client = if let Some(ns_obj) = namespace_client {
|
||||||
|
let py = self_.py();
|
||||||
|
Some(extract_namespace_arc(py, ns_obj)?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
if let Some(ns_client) = ns_client {
|
||||||
|
builder = builder.namespace_client(ns_client);
|
||||||
|
}
|
||||||
|
// Pass managed_versioning if provided to avoid redundant describe_table call
|
||||||
|
if let Some(enabled) = managed_versioning {
|
||||||
|
builder = builder.managed_versioning(enabled);
|
||||||
|
}
|
||||||
|
|
||||||
future_into_py(self_.py(), async move {
|
future_into_py(self_.py(), async move {
|
||||||
let table = builder.execute().await.infer_error()?;
|
let table = builder.execute().await.infer_error()?;
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
PyErr, PyResult, Python,
|
||||||
exceptions::{PyIOError, PyNotImplementedError, PyOSError, PyRuntimeError, PyValueError},
|
exceptions::{PyIOError, PyNotImplementedError, PyOSError, PyRuntimeError, PyValueError},
|
||||||
intern,
|
intern,
|
||||||
types::{PyAnyMethods, PyNone},
|
types::{PyAnyMethods, PyNone},
|
||||||
PyErr, PyResult, Python,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use lancedb::error::Error as LanceError;
|
use lancedb::error::Error as LanceError;
|
||||||
|
|||||||
175
python/src/expr.rs
Normal file
175
python/src/expr.rs
Normal file
@@ -0,0 +1,175 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
//! PyO3 bindings for the LanceDB expression builder API.
|
||||||
|
//!
|
||||||
|
//! This module exposes [`PyExpr`] and helper free functions so Python can
|
||||||
|
//! build type-safe filter / projection expressions that map directly to
|
||||||
|
//! DataFusion [`Expr`] nodes, bypassing SQL string parsing.
|
||||||
|
|
||||||
|
use arrow::{datatypes::DataType, pyarrow::PyArrowType};
|
||||||
|
use lancedb::expr::{DfExpr, col as ldb_col, contains, expr_cast, lit as df_lit, lower, upper};
|
||||||
|
use pyo3::{Bound, PyAny, PyResult, exceptions::PyValueError, prelude::*, pyfunction};
|
||||||
|
|
||||||
|
/// A type-safe DataFusion expression.
|
||||||
|
///
|
||||||
|
/// Instances are constructed via the free functions [`expr_col`] and
|
||||||
|
/// [`expr_lit`] and combined with the methods on this struct. On the Python
|
||||||
|
/// side a thin wrapper class (`lancedb.expr.Expr`) delegates to these methods
|
||||||
|
/// and adds Python operator overloads.
|
||||||
|
#[pyclass(name = "PyExpr")]
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct PyExpr(pub DfExpr);
|
||||||
|
|
||||||
|
#[pymethods]
|
||||||
|
impl PyExpr {
|
||||||
|
// ── comparisons ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
fn eq(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().eq(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ne(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().not_eq(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lt(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().lt(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lte(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().lt_eq(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn gt(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().gt(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn gte(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().gt_eq(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── logical ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
fn and_(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().and(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn or_(&self, other: &Self) -> Self {
|
||||||
|
Self(self.0.clone().or(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn not_(&self) -> Self {
|
||||||
|
use std::ops::Not;
|
||||||
|
Self(self.0.clone().not())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── arithmetic ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
fn add(&self, other: &Self) -> Self {
|
||||||
|
use std::ops::Add;
|
||||||
|
Self(self.0.clone().add(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn sub(&self, other: &Self) -> Self {
|
||||||
|
use std::ops::Sub;
|
||||||
|
Self(self.0.clone().sub(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mul(&self, other: &Self) -> Self {
|
||||||
|
use std::ops::Mul;
|
||||||
|
Self(self.0.clone().mul(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn div(&self, other: &Self) -> Self {
|
||||||
|
use std::ops::Div;
|
||||||
|
Self(self.0.clone().div(other.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── string functions ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/// Convert string column to lowercase.
|
||||||
|
fn lower(&self) -> Self {
|
||||||
|
Self(lower(self.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Convert string column to uppercase.
|
||||||
|
fn upper(&self) -> Self {
|
||||||
|
Self(upper(self.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Test whether the string contains `substr`.
|
||||||
|
fn contains(&self, substr: &Self) -> Self {
|
||||||
|
Self(contains(self.0.clone(), substr.0.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── type cast ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/// Cast the expression to `data_type`.
|
||||||
|
///
|
||||||
|
/// `data_type` must be a PyArrow `DataType` (e.g. `pa.int32()`).
|
||||||
|
/// On the Python side, `lancedb.expr.Expr.cast` also accepts type name
|
||||||
|
/// strings via `pa.lib.ensure_type` before forwarding here.
|
||||||
|
fn cast(&self, data_type: PyArrowType<DataType>) -> Self {
|
||||||
|
Self(expr_cast(self.0.clone(), data_type.0))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── utilities ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/// Render the expression as a SQL string (useful for debugging).
|
||||||
|
fn to_sql(&self) -> PyResult<String> {
|
||||||
|
lancedb::expr::expr_to_sql_string(&self.0).map_err(|e| PyValueError::new_err(e.to_string()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn __repr__(&self) -> PyResult<String> {
|
||||||
|
let sql =
|
||||||
|
lancedb::expr::expr_to_sql_string(&self.0).unwrap_or_else(|_| "<expr>".to_string());
|
||||||
|
Ok(format!("PyExpr({})", sql))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── free functions ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/// Create a column reference expression.
|
||||||
|
///
|
||||||
|
/// The column name is preserved exactly as given (case-sensitive), so
|
||||||
|
/// `col("firstName")` correctly references a field named `firstName`.
|
||||||
|
#[pyfunction]
|
||||||
|
pub fn expr_col(name: &str) -> PyExpr {
|
||||||
|
PyExpr(ldb_col(name))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a literal value expression.
|
||||||
|
///
|
||||||
|
/// Supported Python types: `bool`, `int`, `float`, `str`.
|
||||||
|
#[pyfunction]
|
||||||
|
pub fn expr_lit(value: Bound<'_, PyAny>) -> PyResult<PyExpr> {
|
||||||
|
// bool must be checked before int because bool is a subclass of int in Python
|
||||||
|
if let Ok(b) = value.extract::<bool>() {
|
||||||
|
return Ok(PyExpr(df_lit(b)));
|
||||||
|
}
|
||||||
|
if let Ok(i) = value.extract::<i64>() {
|
||||||
|
return Ok(PyExpr(df_lit(i)));
|
||||||
|
}
|
||||||
|
if let Ok(f) = value.extract::<f64>() {
|
||||||
|
return Ok(PyExpr(df_lit(f)));
|
||||||
|
}
|
||||||
|
if let Ok(s) = value.extract::<String>() {
|
||||||
|
return Ok(PyExpr(df_lit(s)));
|
||||||
|
}
|
||||||
|
Err(PyValueError::new_err(format!(
|
||||||
|
"unsupported literal type: {}. Supported: bool, int, float, str",
|
||||||
|
value.get_type().name()?
|
||||||
|
)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Call an arbitrary registered SQL function by name.
|
||||||
|
///
|
||||||
|
/// See `lancedb::expr::func` for the list of supported function names.
|
||||||
|
#[pyfunction]
|
||||||
|
pub fn expr_func(name: &str, args: Vec<PyExpr>) -> PyResult<PyExpr> {
|
||||||
|
let df_args: Vec<DfExpr> = args.into_iter().map(|e| e.0).collect();
|
||||||
|
lancedb::expr::func(name, df_args)
|
||||||
|
.map(PyExpr)
|
||||||
|
.map_err(|e| PyValueError::new_err(e.to_string()))
|
||||||
|
}
|
||||||
@@ -3,17 +3,17 @@
|
|||||||
|
|
||||||
use lancedb::index::vector::{IvfFlatIndexBuilder, IvfRqIndexBuilder, IvfSqIndexBuilder};
|
use lancedb::index::vector::{IvfFlatIndexBuilder, IvfRqIndexBuilder, IvfSqIndexBuilder};
|
||||||
use lancedb::index::{
|
use lancedb::index::{
|
||||||
|
Index as LanceDbIndex,
|
||||||
scalar::{BTreeIndexBuilder, FtsIndexBuilder},
|
scalar::{BTreeIndexBuilder, FtsIndexBuilder},
|
||||||
vector::{IvfHnswPqIndexBuilder, IvfHnswSqIndexBuilder, IvfPqIndexBuilder},
|
vector::{IvfHnswPqIndexBuilder, IvfHnswSqIndexBuilder, IvfPqIndexBuilder},
|
||||||
Index as LanceDbIndex,
|
|
||||||
};
|
};
|
||||||
use pyo3::types::PyStringMethods;
|
|
||||||
use pyo3::IntoPyObject;
|
use pyo3::IntoPyObject;
|
||||||
|
use pyo3::types::PyStringMethods;
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
Bound, FromPyObject, PyAny, PyResult, Python,
|
||||||
exceptions::{PyKeyError, PyValueError},
|
exceptions::{PyKeyError, PyValueError},
|
||||||
intern, pyclass, pymethods,
|
intern, pyclass, pymethods,
|
||||||
types::PyAnyMethods,
|
types::PyAnyMethods,
|
||||||
Bound, FromPyObject, PyAny, PyResult, Python,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::util::parse_distance_type;
|
use crate::util::parse_distance_type;
|
||||||
@@ -41,7 +41,12 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
let inner_opts = FtsIndexBuilder::default()
|
let inner_opts = FtsIndexBuilder::default()
|
||||||
.base_tokenizer(params.base_tokenizer)
|
.base_tokenizer(params.base_tokenizer)
|
||||||
.language(¶ms.language)
|
.language(¶ms.language)
|
||||||
.map_err(|_| PyValueError::new_err(format!("LanceDB does not support the requested language: '{}'", params.language)))?
|
.map_err(|_| {
|
||||||
|
PyValueError::new_err(format!(
|
||||||
|
"LanceDB does not support the requested language: '{}'",
|
||||||
|
params.language
|
||||||
|
))
|
||||||
|
})?
|
||||||
.with_position(params.with_position)
|
.with_position(params.with_position)
|
||||||
.lower_case(params.lower_case)
|
.lower_case(params.lower_case)
|
||||||
.max_token_length(params.max_token_length)
|
.max_token_length(params.max_token_length)
|
||||||
@@ -52,7 +57,7 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
.ngram_max_length(params.ngram_max_length)
|
.ngram_max_length(params.ngram_max_length)
|
||||||
.ngram_prefix_only(params.prefix_only);
|
.ngram_prefix_only(params.prefix_only);
|
||||||
Ok(LanceDbIndex::FTS(inner_opts))
|
Ok(LanceDbIndex::FTS(inner_opts))
|
||||||
},
|
}
|
||||||
"IvfFlat" => {
|
"IvfFlat" => {
|
||||||
let params = source.extract::<IvfFlatParams>()?;
|
let params = source.extract::<IvfFlatParams>()?;
|
||||||
let distance_type = parse_distance_type(params.distance_type)?;
|
let distance_type = parse_distance_type(params.distance_type)?;
|
||||||
@@ -64,10 +69,11 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
ivf_flat_builder = ivf_flat_builder.num_partitions(num_partitions);
|
ivf_flat_builder = ivf_flat_builder.num_partitions(num_partitions);
|
||||||
}
|
}
|
||||||
if let Some(target_partition_size) = params.target_partition_size {
|
if let Some(target_partition_size) = params.target_partition_size {
|
||||||
ivf_flat_builder = ivf_flat_builder.target_partition_size(target_partition_size);
|
ivf_flat_builder =
|
||||||
|
ivf_flat_builder.target_partition_size(target_partition_size);
|
||||||
}
|
}
|
||||||
Ok(LanceDbIndex::IvfFlat(ivf_flat_builder))
|
Ok(LanceDbIndex::IvfFlat(ivf_flat_builder))
|
||||||
},
|
}
|
||||||
"IvfPq" => {
|
"IvfPq" => {
|
||||||
let params = source.extract::<IvfPqParams>()?;
|
let params = source.extract::<IvfPqParams>()?;
|
||||||
let distance_type = parse_distance_type(params.distance_type)?;
|
let distance_type = parse_distance_type(params.distance_type)?;
|
||||||
@@ -86,7 +92,7 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
ivf_pq_builder = ivf_pq_builder.num_sub_vectors(num_sub_vectors);
|
ivf_pq_builder = ivf_pq_builder.num_sub_vectors(num_sub_vectors);
|
||||||
}
|
}
|
||||||
Ok(LanceDbIndex::IvfPq(ivf_pq_builder))
|
Ok(LanceDbIndex::IvfPq(ivf_pq_builder))
|
||||||
},
|
}
|
||||||
"IvfSq" => {
|
"IvfSq" => {
|
||||||
let params = source.extract::<IvfSqParams>()?;
|
let params = source.extract::<IvfSqParams>()?;
|
||||||
let distance_type = parse_distance_type(params.distance_type)?;
|
let distance_type = parse_distance_type(params.distance_type)?;
|
||||||
@@ -101,7 +107,7 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
ivf_sq_builder = ivf_sq_builder.target_partition_size(target_partition_size);
|
ivf_sq_builder = ivf_sq_builder.target_partition_size(target_partition_size);
|
||||||
}
|
}
|
||||||
Ok(LanceDbIndex::IvfSq(ivf_sq_builder))
|
Ok(LanceDbIndex::IvfSq(ivf_sq_builder))
|
||||||
},
|
}
|
||||||
"IvfRq" => {
|
"IvfRq" => {
|
||||||
let params = source.extract::<IvfRqParams>()?;
|
let params = source.extract::<IvfRqParams>()?;
|
||||||
let distance_type = parse_distance_type(params.distance_type)?;
|
let distance_type = parse_distance_type(params.distance_type)?;
|
||||||
@@ -117,7 +123,7 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
ivf_rq_builder = ivf_rq_builder.target_partition_size(target_partition_size);
|
ivf_rq_builder = ivf_rq_builder.target_partition_size(target_partition_size);
|
||||||
}
|
}
|
||||||
Ok(LanceDbIndex::IvfRq(ivf_rq_builder))
|
Ok(LanceDbIndex::IvfRq(ivf_rq_builder))
|
||||||
},
|
}
|
||||||
"HnswPq" => {
|
"HnswPq" => {
|
||||||
let params = source.extract::<IvfHnswPqParams>()?;
|
let params = source.extract::<IvfHnswPqParams>()?;
|
||||||
let distance_type = parse_distance_type(params.distance_type)?;
|
let distance_type = parse_distance_type(params.distance_type)?;
|
||||||
@@ -138,7 +144,7 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
hnsw_pq_builder = hnsw_pq_builder.num_sub_vectors(num_sub_vectors);
|
hnsw_pq_builder = hnsw_pq_builder.num_sub_vectors(num_sub_vectors);
|
||||||
}
|
}
|
||||||
Ok(LanceDbIndex::IvfHnswPq(hnsw_pq_builder))
|
Ok(LanceDbIndex::IvfHnswPq(hnsw_pq_builder))
|
||||||
},
|
}
|
||||||
"HnswSq" => {
|
"HnswSq" => {
|
||||||
let params = source.extract::<IvfHnswSqParams>()?;
|
let params = source.extract::<IvfHnswSqParams>()?;
|
||||||
let distance_type = parse_distance_type(params.distance_type)?;
|
let distance_type = parse_distance_type(params.distance_type)?;
|
||||||
@@ -155,7 +161,7 @@ pub fn extract_index_params(source: &Option<Bound<'_, PyAny>>) -> PyResult<Lance
|
|||||||
hnsw_sq_builder = hnsw_sq_builder.target_partition_size(target_partition_size);
|
hnsw_sq_builder = hnsw_sq_builder.target_partition_size(target_partition_size);
|
||||||
}
|
}
|
||||||
Ok(LanceDbIndex::IvfHnswSq(hnsw_sq_builder))
|
Ok(LanceDbIndex::IvfHnswSq(hnsw_sq_builder))
|
||||||
},
|
}
|
||||||
not_supported => Err(PyValueError::new_err(format!(
|
not_supported => Err(PyValueError::new_err(format!(
|
||||||
"Invalid index type '{}'. Must be one of BTree, Bitmap, LabelList, FTS, IvfPq, IvfSq, IvfHnswPq, or IvfHnswSq",
|
"Invalid index type '{}'. Must be one of BTree, Bitmap, LabelList, FTS, IvfPq, IvfSq, IvfHnswPq, or IvfHnswSq",
|
||||||
not_supported
|
not_supported
|
||||||
|
|||||||
@@ -2,14 +2,15 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
use arrow::RecordBatchStream;
|
use arrow::RecordBatchStream;
|
||||||
use connection::{connect, Connection};
|
use connection::{Connection, connect};
|
||||||
use env_logger::Env;
|
use env_logger::Env;
|
||||||
|
use expr::{PyExpr, expr_col, expr_func, expr_lit};
|
||||||
use index::IndexConfig;
|
use index::IndexConfig;
|
||||||
use permutation::{PyAsyncPermutationBuilder, PyPermutationReader};
|
use permutation::{PyAsyncPermutationBuilder, PyPermutationReader};
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
pymodule,
|
Bound, PyResult, Python, pymodule,
|
||||||
types::{PyModule, PyModuleMethods},
|
types::{PyModule, PyModuleMethods},
|
||||||
wrap_pyfunction, Bound, PyResult, Python,
|
wrap_pyfunction,
|
||||||
};
|
};
|
||||||
use query::{FTSQuery, HybridQuery, Query, VectorQuery};
|
use query::{FTSQuery, HybridQuery, Query, VectorQuery};
|
||||||
use session::Session;
|
use session::Session;
|
||||||
@@ -21,8 +22,10 @@ use table::{
|
|||||||
pub mod arrow;
|
pub mod arrow;
|
||||||
pub mod connection;
|
pub mod connection;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
|
pub mod expr;
|
||||||
pub mod header;
|
pub mod header;
|
||||||
pub mod index;
|
pub mod index;
|
||||||
|
pub mod namespace;
|
||||||
pub mod permutation;
|
pub mod permutation;
|
||||||
pub mod query;
|
pub mod query;
|
||||||
pub mod session;
|
pub mod session;
|
||||||
@@ -54,10 +57,14 @@ pub fn _lancedb(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
|
|||||||
m.add_class::<UpdateResult>()?;
|
m.add_class::<UpdateResult>()?;
|
||||||
m.add_class::<PyAsyncPermutationBuilder>()?;
|
m.add_class::<PyAsyncPermutationBuilder>()?;
|
||||||
m.add_class::<PyPermutationReader>()?;
|
m.add_class::<PyPermutationReader>()?;
|
||||||
|
m.add_class::<PyExpr>()?;
|
||||||
m.add_function(wrap_pyfunction!(connect, m)?)?;
|
m.add_function(wrap_pyfunction!(connect, m)?)?;
|
||||||
m.add_function(wrap_pyfunction!(permutation::async_permutation_builder, m)?)?;
|
m.add_function(wrap_pyfunction!(permutation::async_permutation_builder, m)?)?;
|
||||||
m.add_function(wrap_pyfunction!(util::validate_table_name, m)?)?;
|
m.add_function(wrap_pyfunction!(util::validate_table_name, m)?)?;
|
||||||
m.add_function(wrap_pyfunction!(query::fts_query_to_json, m)?)?;
|
m.add_function(wrap_pyfunction!(query::fts_query_to_json, m)?)?;
|
||||||
|
m.add_function(wrap_pyfunction!(expr_col, m)?)?;
|
||||||
|
m.add_function(wrap_pyfunction!(expr_lit, m)?)?;
|
||||||
|
m.add_function(wrap_pyfunction!(expr_func, m)?)?;
|
||||||
m.add("__version__", env!("CARGO_PKG_VERSION"))?;
|
m.add("__version__", env!("CARGO_PKG_VERSION"))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
696
python/src/namespace.rs
Normal file
696
python/src/namespace.rs
Normal file
@@ -0,0 +1,696 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
//! Namespace utilities for Python bindings
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use async_trait::async_trait;
|
||||||
|
use bytes::Bytes;
|
||||||
|
use lance_namespace::LanceNamespace as LanceNamespaceTrait;
|
||||||
|
use lance_namespace::models::*;
|
||||||
|
use pyo3::prelude::*;
|
||||||
|
use pyo3::types::PyDict;
|
||||||
|
|
||||||
|
/// Wrapper that allows any Python object implementing LanceNamespace protocol
|
||||||
|
/// to be used as a Rust LanceNamespace.
|
||||||
|
///
|
||||||
|
/// This is similar to PyLanceNamespace in lance's Python bindings - it wraps a Python
|
||||||
|
/// object and calls back into Python when namespace methods are invoked.
|
||||||
|
pub struct PyLanceNamespace {
|
||||||
|
py_namespace: Arc<Py<PyAny>>,
|
||||||
|
namespace_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PyLanceNamespace {
|
||||||
|
/// Create a new PyLanceNamespace wrapper around a Python namespace object.
|
||||||
|
pub fn new(_py: Python<'_>, py_namespace: &Bound<'_, PyAny>) -> PyResult<Self> {
|
||||||
|
let namespace_id = py_namespace
|
||||||
|
.call_method0("namespace_id")?
|
||||||
|
.extract::<String>()?;
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
py_namespace: Arc::new(py_namespace.clone().unbind()),
|
||||||
|
namespace_id,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create an Arc<dyn LanceNamespace> from a Python namespace object.
|
||||||
|
pub fn create_arc(
|
||||||
|
py: Python<'_>,
|
||||||
|
py_namespace: &Bound<'_, PyAny>,
|
||||||
|
) -> PyResult<Arc<dyn LanceNamespaceTrait>> {
|
||||||
|
let wrapper = Self::new(py, py_namespace)?;
|
||||||
|
Ok(Arc::new(wrapper))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for PyLanceNamespace {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(f, "PyLanceNamespace {{ id: {} }}", self.namespace_id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get or create the DictWithModelDump class in Python.
|
||||||
|
/// This class acts like a dict but also has model_dump() method.
|
||||||
|
/// This allows it to work with both:
|
||||||
|
/// - depythonize (which expects a dict/Mapping)
|
||||||
|
/// - Python code that calls .model_dump() (like DirectoryNamespace wrapper)
|
||||||
|
fn get_dict_with_model_dump_class(py: Python<'_>) -> PyResult<Bound<'_, PyAny>> {
|
||||||
|
// Use a module-level cache via __builtins__
|
||||||
|
let builtins = py.import("builtins")?;
|
||||||
|
if builtins.hasattr("_DictWithModelDump")? {
|
||||||
|
return builtins.getattr("_DictWithModelDump");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the class using exec
|
||||||
|
let locals = PyDict::new(py);
|
||||||
|
py.run(
|
||||||
|
c"class DictWithModelDump(dict):
|
||||||
|
def model_dump(self):
|
||||||
|
return dict(self)",
|
||||||
|
None,
|
||||||
|
Some(&locals),
|
||||||
|
)?;
|
||||||
|
let class = locals.get_item("DictWithModelDump")?.ok_or_else(|| {
|
||||||
|
pyo3::exceptions::PyRuntimeError::new_err("Failed to create DictWithModelDump class")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Cache it
|
||||||
|
builtins.setattr("_DictWithModelDump", &class)?;
|
||||||
|
Ok(class)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper to call a Python namespace method with JSON serialization.
|
||||||
|
/// For methods that take a request and return a response.
|
||||||
|
/// Uses DictWithModelDump to pass a dict that also has model_dump() method,
|
||||||
|
/// making it compatible with both depythonize and Python wrappers.
|
||||||
|
async fn call_py_method<Req, Resp>(
|
||||||
|
py_namespace: Arc<Py<PyAny>>,
|
||||||
|
method_name: &'static str,
|
||||||
|
request: Req,
|
||||||
|
) -> lance_core::Result<Resp>
|
||||||
|
where
|
||||||
|
Req: serde::Serialize + Send + 'static,
|
||||||
|
Resp: serde::de::DeserializeOwned + Send + 'static,
|
||||||
|
{
|
||||||
|
let request_json = serde_json::to_string(&request).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to serialize request for {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let response_json = tokio::task::spawn_blocking(move || {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let json_module = py.import("json")?;
|
||||||
|
let request_dict = json_module.call_method1("loads", (&request_json,))?;
|
||||||
|
|
||||||
|
// Wrap dict in DictWithModelDump so it works with both depythonize and .model_dump()
|
||||||
|
let dict_class = get_dict_with_model_dump_class(py)?;
|
||||||
|
let request_arg = dict_class.call1((request_dict,))?;
|
||||||
|
|
||||||
|
// Call the Python method
|
||||||
|
let result = py_namespace.call_method1(py, method_name, (request_arg,))?;
|
||||||
|
|
||||||
|
// Convert response to dict, then to JSON
|
||||||
|
// Pydantic models have model_dump() method
|
||||||
|
let result_dict = if result.bind(py).hasattr("model_dump")? {
|
||||||
|
result.call_method0(py, "model_dump")?
|
||||||
|
} else {
|
||||||
|
result
|
||||||
|
};
|
||||||
|
let response_json: String = json_module
|
||||||
|
.call_method1("dumps", (result_dict,))?
|
||||||
|
.extract()?;
|
||||||
|
Ok::<_, PyErr>(response_json)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| lance_core::Error::io(format!("Task join error for {}: {}", method_name, e)))?
|
||||||
|
.map_err(|e: PyErr| lance_core::Error::io(format!("Python error in {}: {}", method_name, e)))?;
|
||||||
|
|
||||||
|
serde_json::from_str(&response_json).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to deserialize response from {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper for methods that return () on success
|
||||||
|
async fn call_py_method_unit<Req>(
|
||||||
|
py_namespace: Arc<Py<PyAny>>,
|
||||||
|
method_name: &'static str,
|
||||||
|
request: Req,
|
||||||
|
) -> lance_core::Result<()>
|
||||||
|
where
|
||||||
|
Req: serde::Serialize + Send + 'static,
|
||||||
|
{
|
||||||
|
let request_json = serde_json::to_string(&request).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to serialize request for {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
tokio::task::spawn_blocking(move || {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let json_module = py.import("json")?;
|
||||||
|
let request_dict = json_module.call_method1("loads", (&request_json,))?;
|
||||||
|
|
||||||
|
// Wrap dict in DictWithModelDump
|
||||||
|
let dict_class = get_dict_with_model_dump_class(py)?;
|
||||||
|
let request_arg = dict_class.call1((request_dict,))?;
|
||||||
|
|
||||||
|
// Call the Python method
|
||||||
|
py_namespace.call_method1(py, method_name, (request_arg,))?;
|
||||||
|
Ok::<_, PyErr>(())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| lance_core::Error::io(format!("Task join error for {}: {}", method_name, e)))?
|
||||||
|
.map_err(|e: PyErr| lance_core::Error::io(format!("Python error in {}: {}", method_name, e)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper for methods that return a primitive type
|
||||||
|
async fn call_py_method_primitive<Req, Resp>(
|
||||||
|
py_namespace: Arc<Py<PyAny>>,
|
||||||
|
method_name: &'static str,
|
||||||
|
request: Req,
|
||||||
|
) -> lance_core::Result<Resp>
|
||||||
|
where
|
||||||
|
Req: serde::Serialize + Send + 'static,
|
||||||
|
Resp: for<'py> pyo3::FromPyObject<'py> + Send + 'static,
|
||||||
|
{
|
||||||
|
let request_json = serde_json::to_string(&request).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to serialize request for {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
tokio::task::spawn_blocking(move || {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let json_module = py.import("json")?;
|
||||||
|
let request_dict = json_module.call_method1("loads", (&request_json,))?;
|
||||||
|
|
||||||
|
// Wrap dict in DictWithModelDump
|
||||||
|
let dict_class = get_dict_with_model_dump_class(py)?;
|
||||||
|
let request_arg = dict_class.call1((request_dict,))?;
|
||||||
|
|
||||||
|
// Call the Python method
|
||||||
|
let result = py_namespace.call_method1(py, method_name, (request_arg,))?;
|
||||||
|
let value: Resp = result.extract(py)?;
|
||||||
|
Ok::<_, PyErr>(value)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| lance_core::Error::io(format!("Task join error for {}: {}", method_name, e)))?
|
||||||
|
.map_err(|e: PyErr| lance_core::Error::io(format!("Python error in {}: {}", method_name, e)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper for methods that return Bytes
|
||||||
|
async fn call_py_method_bytes<Req>(
|
||||||
|
py_namespace: Arc<Py<PyAny>>,
|
||||||
|
method_name: &'static str,
|
||||||
|
request: Req,
|
||||||
|
) -> lance_core::Result<Bytes>
|
||||||
|
where
|
||||||
|
Req: serde::Serialize + Send + 'static,
|
||||||
|
{
|
||||||
|
let request_json = serde_json::to_string(&request).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to serialize request for {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
tokio::task::spawn_blocking(move || {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let json_module = py.import("json")?;
|
||||||
|
let request_dict = json_module.call_method1("loads", (&request_json,))?;
|
||||||
|
|
||||||
|
// Wrap dict in DictWithModelDump
|
||||||
|
let dict_class = get_dict_with_model_dump_class(py)?;
|
||||||
|
let request_arg = dict_class.call1((request_dict,))?;
|
||||||
|
|
||||||
|
// Call the Python method
|
||||||
|
let result = py_namespace.call_method1(py, method_name, (request_arg,))?;
|
||||||
|
let bytes_data: Vec<u8> = result.extract(py)?;
|
||||||
|
Ok::<_, PyErr>(Bytes::from(bytes_data))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| lance_core::Error::io(format!("Task join error for {}: {}", method_name, e)))?
|
||||||
|
.map_err(|e: PyErr| lance_core::Error::io(format!("Python error in {}: {}", method_name, e)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper for methods that take request + data and return a response
|
||||||
|
async fn call_py_method_with_data<Req, Resp>(
|
||||||
|
py_namespace: Arc<Py<PyAny>>,
|
||||||
|
method_name: &'static str,
|
||||||
|
request: Req,
|
||||||
|
data: Bytes,
|
||||||
|
) -> lance_core::Result<Resp>
|
||||||
|
where
|
||||||
|
Req: serde::Serialize + Send + 'static,
|
||||||
|
Resp: serde::de::DeserializeOwned + Send + 'static,
|
||||||
|
{
|
||||||
|
let request_json = serde_json::to_string(&request).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to serialize request for {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let response_json = tokio::task::spawn_blocking(move || {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let json_module = py.import("json")?;
|
||||||
|
let request_dict = json_module.call_method1("loads", (&request_json,))?;
|
||||||
|
|
||||||
|
// Wrap dict in DictWithModelDump
|
||||||
|
let dict_class = get_dict_with_model_dump_class(py)?;
|
||||||
|
let request_arg = dict_class.call1((request_dict,))?;
|
||||||
|
|
||||||
|
// Pass request and bytes to Python method
|
||||||
|
let py_bytes = pyo3::types::PyBytes::new(py, &data);
|
||||||
|
let result = py_namespace.call_method1(py, method_name, (request_arg, py_bytes))?;
|
||||||
|
|
||||||
|
// Convert response dict to JSON
|
||||||
|
let response_json: String = json_module.call_method1("dumps", (result,))?.extract()?;
|
||||||
|
Ok::<_, PyErr>(response_json)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| lance_core::Error::io(format!("Task join error for {}: {}", method_name, e)))?
|
||||||
|
.map_err(|e: PyErr| lance_core::Error::io(format!("Python error in {}: {}", method_name, e)))?;
|
||||||
|
|
||||||
|
serde_json::from_str(&response_json).map_err(|e| {
|
||||||
|
lance_core::Error::io(format!(
|
||||||
|
"Failed to deserialize response from {}: {}",
|
||||||
|
method_name, e
|
||||||
|
))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl LanceNamespaceTrait for PyLanceNamespace {
|
||||||
|
fn namespace_id(&self) -> String {
|
||||||
|
self.namespace_id.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_namespaces(
|
||||||
|
&self,
|
||||||
|
request: ListNamespacesRequest,
|
||||||
|
) -> lance_core::Result<ListNamespacesResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "list_namespaces", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn describe_namespace(
|
||||||
|
&self,
|
||||||
|
request: DescribeNamespaceRequest,
|
||||||
|
) -> lance_core::Result<DescribeNamespaceResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "describe_namespace", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_namespace(
|
||||||
|
&self,
|
||||||
|
request: CreateNamespaceRequest,
|
||||||
|
) -> lance_core::Result<CreateNamespaceResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "create_namespace", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn drop_namespace(
|
||||||
|
&self,
|
||||||
|
request: DropNamespaceRequest,
|
||||||
|
) -> lance_core::Result<DropNamespaceResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "drop_namespace", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn namespace_exists(&self, request: NamespaceExistsRequest) -> lance_core::Result<()> {
|
||||||
|
call_py_method_unit(self.py_namespace.clone(), "namespace_exists", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_tables(
|
||||||
|
&self,
|
||||||
|
request: ListTablesRequest,
|
||||||
|
) -> lance_core::Result<ListTablesResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "list_tables", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn describe_table(
|
||||||
|
&self,
|
||||||
|
request: DescribeTableRequest,
|
||||||
|
) -> lance_core::Result<DescribeTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "describe_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn register_table(
|
||||||
|
&self,
|
||||||
|
request: RegisterTableRequest,
|
||||||
|
) -> lance_core::Result<RegisterTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "register_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn table_exists(&self, request: TableExistsRequest) -> lance_core::Result<()> {
|
||||||
|
call_py_method_unit(self.py_namespace.clone(), "table_exists", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn drop_table(&self, request: DropTableRequest) -> lance_core::Result<DropTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "drop_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn deregister_table(
|
||||||
|
&self,
|
||||||
|
request: DeregisterTableRequest,
|
||||||
|
) -> lance_core::Result<DeregisterTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "deregister_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn count_table_rows(&self, request: CountTableRowsRequest) -> lance_core::Result<i64> {
|
||||||
|
call_py_method_primitive(self.py_namespace.clone(), "count_table_rows", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_table(
|
||||||
|
&self,
|
||||||
|
request: CreateTableRequest,
|
||||||
|
request_data: Bytes,
|
||||||
|
) -> lance_core::Result<CreateTableResponse> {
|
||||||
|
call_py_method_with_data(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"create_table",
|
||||||
|
request,
|
||||||
|
request_data,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn declare_table(
|
||||||
|
&self,
|
||||||
|
request: DeclareTableRequest,
|
||||||
|
) -> lance_core::Result<DeclareTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "declare_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn insert_into_table(
|
||||||
|
&self,
|
||||||
|
request: InsertIntoTableRequest,
|
||||||
|
request_data: Bytes,
|
||||||
|
) -> lance_core::Result<InsertIntoTableResponse> {
|
||||||
|
call_py_method_with_data(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"insert_into_table",
|
||||||
|
request,
|
||||||
|
request_data,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn merge_insert_into_table(
|
||||||
|
&self,
|
||||||
|
request: MergeInsertIntoTableRequest,
|
||||||
|
request_data: Bytes,
|
||||||
|
) -> lance_core::Result<MergeInsertIntoTableResponse> {
|
||||||
|
call_py_method_with_data(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"merge_insert_into_table",
|
||||||
|
request,
|
||||||
|
request_data,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn update_table(
|
||||||
|
&self,
|
||||||
|
request: UpdateTableRequest,
|
||||||
|
) -> lance_core::Result<UpdateTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "update_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn delete_from_table(
|
||||||
|
&self,
|
||||||
|
request: DeleteFromTableRequest,
|
||||||
|
) -> lance_core::Result<DeleteFromTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "delete_from_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn query_table(&self, request: QueryTableRequest) -> lance_core::Result<Bytes> {
|
||||||
|
call_py_method_bytes(self.py_namespace.clone(), "query_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_table_index(
|
||||||
|
&self,
|
||||||
|
request: CreateTableIndexRequest,
|
||||||
|
) -> lance_core::Result<CreateTableIndexResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "create_table_index", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_table_indices(
|
||||||
|
&self,
|
||||||
|
request: ListTableIndicesRequest,
|
||||||
|
) -> lance_core::Result<ListTableIndicesResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "list_table_indices", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn describe_table_index_stats(
|
||||||
|
&self,
|
||||||
|
request: DescribeTableIndexStatsRequest,
|
||||||
|
) -> lance_core::Result<DescribeTableIndexStatsResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"describe_table_index_stats",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn describe_transaction(
|
||||||
|
&self,
|
||||||
|
request: DescribeTransactionRequest,
|
||||||
|
) -> lance_core::Result<DescribeTransactionResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "describe_transaction", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn alter_transaction(
|
||||||
|
&self,
|
||||||
|
request: AlterTransactionRequest,
|
||||||
|
) -> lance_core::Result<AlterTransactionResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "alter_transaction", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_table_scalar_index(
|
||||||
|
&self,
|
||||||
|
request: CreateTableIndexRequest,
|
||||||
|
) -> lance_core::Result<CreateTableScalarIndexResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"create_table_scalar_index",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn drop_table_index(
|
||||||
|
&self,
|
||||||
|
request: DropTableIndexRequest,
|
||||||
|
) -> lance_core::Result<DropTableIndexResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "drop_table_index", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_all_tables(
|
||||||
|
&self,
|
||||||
|
request: ListTablesRequest,
|
||||||
|
) -> lance_core::Result<ListTablesResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "list_all_tables", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn restore_table(
|
||||||
|
&self,
|
||||||
|
request: RestoreTableRequest,
|
||||||
|
) -> lance_core::Result<RestoreTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "restore_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn rename_table(
|
||||||
|
&self,
|
||||||
|
request: RenameTableRequest,
|
||||||
|
) -> lance_core::Result<RenameTableResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "rename_table", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_table_versions(
|
||||||
|
&self,
|
||||||
|
request: ListTableVersionsRequest,
|
||||||
|
) -> lance_core::Result<ListTableVersionsResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "list_table_versions", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_table_version(
|
||||||
|
&self,
|
||||||
|
request: CreateTableVersionRequest,
|
||||||
|
) -> lance_core::Result<CreateTableVersionResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "create_table_version", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn describe_table_version(
|
||||||
|
&self,
|
||||||
|
request: DescribeTableVersionRequest,
|
||||||
|
) -> lance_core::Result<DescribeTableVersionResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "describe_table_version", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn batch_delete_table_versions(
|
||||||
|
&self,
|
||||||
|
request: BatchDeleteTableVersionsRequest,
|
||||||
|
) -> lance_core::Result<BatchDeleteTableVersionsResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"batch_delete_table_versions",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn update_table_schema_metadata(
|
||||||
|
&self,
|
||||||
|
request: UpdateTableSchemaMetadataRequest,
|
||||||
|
) -> lance_core::Result<UpdateTableSchemaMetadataResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"update_table_schema_metadata",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_table_stats(
|
||||||
|
&self,
|
||||||
|
request: GetTableStatsRequest,
|
||||||
|
) -> lance_core::Result<GetTableStatsResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "get_table_stats", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn explain_table_query_plan(
|
||||||
|
&self,
|
||||||
|
request: ExplainTableQueryPlanRequest,
|
||||||
|
) -> lance_core::Result<String> {
|
||||||
|
call_py_method_primitive(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"explain_table_query_plan",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn analyze_table_query_plan(
|
||||||
|
&self,
|
||||||
|
request: AnalyzeTableQueryPlanRequest,
|
||||||
|
) -> lance_core::Result<String> {
|
||||||
|
call_py_method_primitive(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"analyze_table_query_plan",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn alter_table_add_columns(
|
||||||
|
&self,
|
||||||
|
request: AlterTableAddColumnsRequest,
|
||||||
|
) -> lance_core::Result<AlterTableAddColumnsResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"alter_table_add_columns",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn alter_table_alter_columns(
|
||||||
|
&self,
|
||||||
|
request: AlterTableAlterColumnsRequest,
|
||||||
|
) -> lance_core::Result<AlterTableAlterColumnsResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"alter_table_alter_columns",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn alter_table_drop_columns(
|
||||||
|
&self,
|
||||||
|
request: AlterTableDropColumnsRequest,
|
||||||
|
) -> lance_core::Result<AlterTableDropColumnsResponse> {
|
||||||
|
call_py_method(
|
||||||
|
self.py_namespace.clone(),
|
||||||
|
"alter_table_drop_columns",
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_table_tags(
|
||||||
|
&self,
|
||||||
|
request: ListTableTagsRequest,
|
||||||
|
) -> lance_core::Result<ListTableTagsResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "list_table_tags", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_table_tag(
|
||||||
|
&self,
|
||||||
|
request: CreateTableTagRequest,
|
||||||
|
) -> lance_core::Result<CreateTableTagResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "create_table_tag", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn delete_table_tag(
|
||||||
|
&self,
|
||||||
|
request: DeleteTableTagRequest,
|
||||||
|
) -> lance_core::Result<DeleteTableTagResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "delete_table_tag", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn update_table_tag(
|
||||||
|
&self,
|
||||||
|
request: UpdateTableTagRequest,
|
||||||
|
) -> lance_core::Result<UpdateTableTagResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "update_table_tag", request).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_table_tag_version(
|
||||||
|
&self,
|
||||||
|
request: GetTableTagVersionRequest,
|
||||||
|
) -> lance_core::Result<GetTableTagVersionResponse> {
|
||||||
|
call_py_method(self.py_namespace.clone(), "get_table_tag_version", request).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Convert Python dict to HashMap<String, String>
|
||||||
|
#[allow(dead_code)]
|
||||||
|
fn dict_to_hashmap(dict: &Bound<'_, PyDict>) -> PyResult<HashMap<String, String>> {
|
||||||
|
let mut map = HashMap::new();
|
||||||
|
for (key, value) in dict.iter() {
|
||||||
|
let key_str: String = key.extract()?;
|
||||||
|
let value_str: String = value.extract()?;
|
||||||
|
map.insert(key_str, value_str);
|
||||||
|
}
|
||||||
|
Ok(map)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Extract an Arc<dyn LanceNamespace> from a Python namespace object.
|
||||||
|
///
|
||||||
|
/// This function wraps any Python namespace object with PyLanceNamespace.
|
||||||
|
/// The PyLanceNamespace wrapper uses DictWithModelDump to pass requests,
|
||||||
|
/// which works with both:
|
||||||
|
/// - Native namespaces (DirectoryNamespace, RestNamespace) that use depythonize (expects dict)
|
||||||
|
/// - Custom Python implementations that call .model_dump() on the request
|
||||||
|
pub fn extract_namespace_arc(
|
||||||
|
py: Python<'_>,
|
||||||
|
ns: Py<PyAny>,
|
||||||
|
) -> PyResult<Arc<dyn LanceNamespaceTrait>> {
|
||||||
|
let ns_ref = ns.bind(py);
|
||||||
|
PyLanceNamespace::create_arc(py, ns_ref)
|
||||||
|
}
|
||||||
@@ -16,10 +16,10 @@ use lancedb::{
|
|||||||
query::Select,
|
query::Select,
|
||||||
};
|
};
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
Bound, PyAny, PyRef, PyRefMut, PyResult, Python,
|
||||||
exceptions::PyRuntimeError,
|
exceptions::PyRuntimeError,
|
||||||
pyclass, pymethods,
|
pyclass, pymethods,
|
||||||
types::{PyAnyMethods, PyDict, PyDictMethods, PyType},
|
types::{PyAnyMethods, PyDict, PyDictMethods, PyType},
|
||||||
Bound, PyAny, PyRef, PyRefMut, PyResult, Python,
|
|
||||||
};
|
};
|
||||||
use pyo3_async_runtimes::tokio::future_into_py;
|
use pyo3_async_runtimes::tokio::future_into_py;
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use arrow::array::make_array;
|
|
||||||
use arrow::array::Array;
|
use arrow::array::Array;
|
||||||
use arrow::array::ArrayData;
|
use arrow::array::ArrayData;
|
||||||
|
use arrow::array::make_array;
|
||||||
use arrow::pyarrow::FromPyArrow;
|
use arrow::pyarrow::FromPyArrow;
|
||||||
use arrow::pyarrow::IntoPyArrow;
|
use arrow::pyarrow::IntoPyArrow;
|
||||||
use arrow::pyarrow::ToPyArrow;
|
use arrow::pyarrow::ToPyArrow;
|
||||||
@@ -22,25 +22,23 @@ use lancedb::query::{
|
|||||||
VectorQuery as LanceDbVectorQuery,
|
VectorQuery as LanceDbVectorQuery,
|
||||||
};
|
};
|
||||||
use lancedb::table::AnyQuery;
|
use lancedb::table::AnyQuery;
|
||||||
use pyo3::prelude::{PyAnyMethods, PyDictMethods};
|
|
||||||
use pyo3::pyfunction;
|
|
||||||
use pyo3::pymethods;
|
|
||||||
use pyo3::types::PyList;
|
|
||||||
use pyo3::types::{PyDict, PyString};
|
|
||||||
use pyo3::Bound;
|
use pyo3::Bound;
|
||||||
use pyo3::IntoPyObject;
|
use pyo3::IntoPyObject;
|
||||||
use pyo3::PyAny;
|
use pyo3::PyAny;
|
||||||
use pyo3::PyRef;
|
use pyo3::PyRef;
|
||||||
use pyo3::PyResult;
|
use pyo3::PyResult;
|
||||||
use pyo3::Python;
|
use pyo3::Python;
|
||||||
use pyo3::{exceptions::PyRuntimeError, FromPyObject};
|
use pyo3::prelude::{PyAnyMethods, PyDictMethods};
|
||||||
use pyo3::{
|
use pyo3::pyfunction;
|
||||||
exceptions::{PyNotImplementedError, PyValueError},
|
use pyo3::pymethods;
|
||||||
intern,
|
use pyo3::types::PyList;
|
||||||
};
|
use pyo3::types::{PyDict, PyString};
|
||||||
use pyo3::{pyclass, PyErr};
|
use pyo3::{FromPyObject, exceptions::PyRuntimeError};
|
||||||
|
use pyo3::{PyErr, pyclass};
|
||||||
|
use pyo3::{exceptions::PyValueError, intern};
|
||||||
use pyo3_async_runtimes::tokio::future_into_py;
|
use pyo3_async_runtimes::tokio::future_into_py;
|
||||||
|
|
||||||
|
use crate::expr::PyExpr;
|
||||||
use crate::util::parse_distance_type;
|
use crate::util::parse_distance_type;
|
||||||
use crate::{arrow::RecordBatchStream, util::PyLanceDB};
|
use crate::{arrow::RecordBatchStream, util::PyLanceDB};
|
||||||
use crate::{error::PythonErrorExt, index::class_name};
|
use crate::{error::PythonErrorExt, index::class_name};
|
||||||
@@ -316,6 +314,19 @@ impl<'py> IntoPyObject<'py> for PySelect {
|
|||||||
Select::All => Ok(py.None().into_bound(py).into_any()),
|
Select::All => Ok(py.None().into_bound(py).into_any()),
|
||||||
Select::Columns(columns) => Ok(columns.into_pyobject(py)?.into_any()),
|
Select::Columns(columns) => Ok(columns.into_pyobject(py)?.into_any()),
|
||||||
Select::Dynamic(columns) => Ok(columns.into_pyobject(py)?.into_any()),
|
Select::Dynamic(columns) => Ok(columns.into_pyobject(py)?.into_any()),
|
||||||
|
Select::Expr(pairs) => {
|
||||||
|
// Serialize DataFusion Expr -> SQL string so Python sees the same
|
||||||
|
// format as Select::Dynamic: a list of (name, sql_string) tuples.
|
||||||
|
let sql_pairs: PyResult<Vec<(String, String)>> = pairs
|
||||||
|
.into_iter()
|
||||||
|
.map(|(name, expr)| {
|
||||||
|
lancedb::expr::expr_to_sql_string(&expr)
|
||||||
|
.map(|sql| (name, sql))
|
||||||
|
.map_err(|e| PyRuntimeError::new_err(e.to_string()))
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(sql_pairs?.into_pyobject(py)?.into_any())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -331,9 +342,13 @@ impl<'py> IntoPyObject<'py> for PyQueryFilter {
|
|||||||
|
|
||||||
fn into_pyobject(self, py: pyo3::Python<'py>) -> PyResult<Self::Output> {
|
fn into_pyobject(self, py: pyo3::Python<'py>) -> PyResult<Self::Output> {
|
||||||
match self.0 {
|
match self.0 {
|
||||||
QueryFilter::Datafusion(_) => Err(PyNotImplementedError::new_err(
|
QueryFilter::Datafusion(expr) => {
|
||||||
"Datafusion filter has no conversion to Python",
|
// Serialize the DataFusion expression to a SQL string so that
|
||||||
)),
|
// callers (e.g. remote tables) see the same format as Sql.
|
||||||
|
let sql = lancedb::expr::expr_to_sql_string(&expr)
|
||||||
|
.map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
|
||||||
|
Ok(sql.into_pyobject(py)?.into_any())
|
||||||
|
}
|
||||||
QueryFilter::Sql(sql) => Ok(sql.into_pyobject(py)?.into_any()),
|
QueryFilter::Sql(sql) => Ok(sql.into_pyobject(py)?.into_any()),
|
||||||
QueryFilter::Substrait(substrait) => Ok(substrait.into_pyobject(py)?.into_any()),
|
QueryFilter::Substrait(substrait) => Ok(substrait.into_pyobject(py)?.into_any()),
|
||||||
}
|
}
|
||||||
@@ -357,10 +372,20 @@ impl Query {
|
|||||||
self.inner = self.inner.clone().only_if(predicate);
|
self.inner = self.inner.clone().only_if(predicate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn where_expr(&mut self, expr: PyExpr) {
|
||||||
|
self.inner = self.inner.clone().only_if_expr(expr.0);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select(&mut self, columns: Vec<(String, String)>) {
|
pub fn select(&mut self, columns: Vec<(String, String)>) {
|
||||||
self.inner = self.inner.clone().select(Select::dynamic(&columns));
|
self.inner = self.inner.clone().select(Select::dynamic(&columns));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn select_expr(&mut self, columns: Vec<(String, PyExpr)>) {
|
||||||
|
let pairs: Vec<(String, lancedb::expr::DfExpr)> =
|
||||||
|
columns.into_iter().map(|(name, e)| (name, e.0)).collect();
|
||||||
|
self.inner = self.inner.clone().select(Select::Expr(pairs));
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select_columns(&mut self, columns: Vec<String>) {
|
pub fn select_columns(&mut self, columns: Vec<String>) {
|
||||||
self.inner = self.inner.clone().select(Select::columns(&columns));
|
self.inner = self.inner.clone().select(Select::columns(&columns));
|
||||||
}
|
}
|
||||||
@@ -594,10 +619,20 @@ impl FTSQuery {
|
|||||||
self.inner = self.inner.clone().only_if(predicate);
|
self.inner = self.inner.clone().only_if(predicate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn where_expr(&mut self, expr: PyExpr) {
|
||||||
|
self.inner = self.inner.clone().only_if_expr(expr.0);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select(&mut self, columns: Vec<(String, String)>) {
|
pub fn select(&mut self, columns: Vec<(String, String)>) {
|
||||||
self.inner = self.inner.clone().select(Select::dynamic(&columns));
|
self.inner = self.inner.clone().select(Select::dynamic(&columns));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn select_expr(&mut self, columns: Vec<(String, PyExpr)>) {
|
||||||
|
let pairs: Vec<(String, lancedb::expr::DfExpr)> =
|
||||||
|
columns.into_iter().map(|(name, e)| (name, e.0)).collect();
|
||||||
|
self.inner = self.inner.clone().select(Select::Expr(pairs));
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select_columns(&mut self, columns: Vec<String>) {
|
pub fn select_columns(&mut self, columns: Vec<String>) {
|
||||||
self.inner = self.inner.clone().select(Select::columns(&columns));
|
self.inner = self.inner.clone().select(Select::columns(&columns));
|
||||||
}
|
}
|
||||||
@@ -712,6 +747,10 @@ impl VectorQuery {
|
|||||||
self.inner = self.inner.clone().only_if(predicate);
|
self.inner = self.inner.clone().only_if(predicate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn where_expr(&mut self, expr: PyExpr) {
|
||||||
|
self.inner = self.inner.clone().only_if_expr(expr.0);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn add_query_vector(&mut self, vector: Bound<'_, PyAny>) -> PyResult<()> {
|
pub fn add_query_vector(&mut self, vector: Bound<'_, PyAny>) -> PyResult<()> {
|
||||||
let data: ArrayData = ArrayData::from_pyarrow_bound(&vector)?;
|
let data: ArrayData = ArrayData::from_pyarrow_bound(&vector)?;
|
||||||
let array = make_array(data);
|
let array = make_array(data);
|
||||||
@@ -723,6 +762,12 @@ impl VectorQuery {
|
|||||||
self.inner = self.inner.clone().select(Select::dynamic(&columns));
|
self.inner = self.inner.clone().select(Select::dynamic(&columns));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn select_expr(&mut self, columns: Vec<(String, PyExpr)>) {
|
||||||
|
let pairs: Vec<(String, lancedb::expr::DfExpr)> =
|
||||||
|
columns.into_iter().map(|(name, e)| (name, e.0)).collect();
|
||||||
|
self.inner = self.inner.clone().select(Select::Expr(pairs));
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select_columns(&mut self, columns: Vec<String>) {
|
pub fn select_columns(&mut self, columns: Vec<String>) {
|
||||||
self.inner = self.inner.clone().select(Select::columns(&columns));
|
self.inner = self.inner.clone().select(Select::columns(&columns));
|
||||||
}
|
}
|
||||||
@@ -877,11 +922,21 @@ impl HybridQuery {
|
|||||||
self.inner_fts.r#where(predicate);
|
self.inner_fts.r#where(predicate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn where_expr(&mut self, expr: PyExpr) {
|
||||||
|
self.inner_vec.where_expr(expr.clone());
|
||||||
|
self.inner_fts.where_expr(expr);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select(&mut self, columns: Vec<(String, String)>) {
|
pub fn select(&mut self, columns: Vec<(String, String)>) {
|
||||||
self.inner_vec.select(columns.clone());
|
self.inner_vec.select(columns.clone());
|
||||||
self.inner_fts.select(columns);
|
self.inner_fts.select(columns);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn select_expr(&mut self, columns: Vec<(String, PyExpr)>) {
|
||||||
|
self.inner_vec.select_expr(columns.clone());
|
||||||
|
self.inner_fts.select_expr(columns);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn select_columns(&mut self, columns: Vec<String>) {
|
pub fn select_columns(&mut self, columns: Vec<String>) {
|
||||||
self.inner_vec.select_columns(columns.clone());
|
self.inner_vec.select_columns(columns.clone());
|
||||||
self.inner_fts.select_columns(columns);
|
self.inner_fts.select_columns(columns);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use lancedb::{ObjectStoreRegistry, Session as LanceSession};
|
use lancedb::{ObjectStoreRegistry, Session as LanceSession};
|
||||||
use pyo3::{pyclass, pymethods, PyResult};
|
use pyo3::{PyResult, pyclass, pymethods};
|
||||||
|
|
||||||
/// A session for managing caches and object stores across LanceDB operations.
|
/// A session for managing caches and object stores across LanceDB operations.
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -66,13 +66,10 @@ impl StorageOptionsProvider for PyStorageOptionsProviderWrapper {
|
|||||||
.inner
|
.inner
|
||||||
.bind(py)
|
.bind(py)
|
||||||
.call_method0("fetch_storage_options")
|
.call_method0("fetch_storage_options")
|
||||||
.map_err(|e| lance_core::Error::IO {
|
.map_err(|e| lance_core::Error::io_source(Box::new(std::io::Error::other(format!(
|
||||||
source: Box::new(std::io::Error::other(format!(
|
"Failed to call fetch_storage_options: {}",
|
||||||
"Failed to call fetch_storage_options: {}",
|
e
|
||||||
e
|
)))))?;
|
||||||
))),
|
|
||||||
location: snafu::location!(),
|
|
||||||
})?;
|
|
||||||
|
|
||||||
// If result is None, return None
|
// If result is None, return None
|
||||||
if result.is_none() {
|
if result.is_none() {
|
||||||
@@ -81,26 +78,19 @@ impl StorageOptionsProvider for PyStorageOptionsProviderWrapper {
|
|||||||
|
|
||||||
// Extract the result dict - should be a flat Map<String, String>
|
// Extract the result dict - should be a flat Map<String, String>
|
||||||
let result_dict = result.downcast::<PyDict>().map_err(|_| {
|
let result_dict = result.downcast::<PyDict>().map_err(|_| {
|
||||||
lance_core::Error::InvalidInput {
|
lance_core::Error::invalid_input(
|
||||||
source: "fetch_storage_options() must return None or a dict of string key-value pairs".into(),
|
"fetch_storage_options() must return a dict of string key-value pairs or None",
|
||||||
location: snafu::location!(),
|
)
|
||||||
}
|
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
// Convert all entries to HashMap<String, String>
|
// Convert all entries to HashMap<String, String>
|
||||||
let mut storage_options = HashMap::new();
|
let mut storage_options = HashMap::new();
|
||||||
for (key, value) in result_dict.iter() {
|
for (key, value) in result_dict.iter() {
|
||||||
let key_str: String = key.extract().map_err(|e| {
|
let key_str: String = key.extract().map_err(|e| {
|
||||||
lance_core::Error::InvalidInput {
|
lance_core::Error::invalid_input(format!("Storage option key must be a string: {}", e))
|
||||||
source: format!("Storage option key must be a string: {}", e).into(),
|
|
||||||
location: snafu::location!(),
|
|
||||||
}
|
|
||||||
})?;
|
})?;
|
||||||
let value_str: String = value.extract().map_err(|e| {
|
let value_str: String = value.extract().map_err(|e| {
|
||||||
lance_core::Error::InvalidInput {
|
lance_core::Error::invalid_input(format!("Storage option value must be a string: {}", e))
|
||||||
source: format!("Storage option value must be a string: {}", e).into(),
|
|
||||||
location: snafu::location!(),
|
|
||||||
}
|
|
||||||
})?;
|
})?;
|
||||||
storage_options.insert(key_str, value_str);
|
storage_options.insert(key_str, value_str);
|
||||||
}
|
}
|
||||||
@@ -109,13 +99,10 @@ impl StorageOptionsProvider for PyStorageOptionsProviderWrapper {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.map_err(|e| lance_core::Error::IO {
|
.map_err(|e| lance_core::Error::io_source(Box::new(std::io::Error::other(format!(
|
||||||
source: Box::new(std::io::Error::other(format!(
|
"Task join error: {}",
|
||||||
"Task join error: {}",
|
e
|
||||||
e
|
)))))?
|
||||||
))),
|
|
||||||
location: snafu::location!(),
|
|
||||||
})?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn provider_id(&self) -> String {
|
fn provider_id(&self) -> String {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use std::{collections::HashMap, sync::Arc};
|
|||||||
use crate::{
|
use crate::{
|
||||||
connection::Connection,
|
connection::Connection,
|
||||||
error::PythonErrorExt,
|
error::PythonErrorExt,
|
||||||
index::{extract_index_params, IndexConfig},
|
index::{IndexConfig, extract_index_params},
|
||||||
query::{Query, TakeQuery},
|
query::{Query, TakeQuery},
|
||||||
table::scannable::PyScannable,
|
table::scannable::PyScannable,
|
||||||
};
|
};
|
||||||
@@ -19,10 +19,10 @@ use lancedb::table::{
|
|||||||
Table as LanceDbTable,
|
Table as LanceDbTable,
|
||||||
};
|
};
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
Bound, FromPyObject, Py, PyAny, PyRef, PyResult, Python,
|
||||||
exceptions::{PyKeyError, PyRuntimeError, PyValueError},
|
exceptions::{PyKeyError, PyRuntimeError, PyValueError},
|
||||||
pyclass, pymethods,
|
pyclass, pymethods,
|
||||||
types::{IntoPyDict, PyAnyMethods, PyDict, PyDictMethods},
|
types::{IntoPyDict, PyAnyMethods, PyDict, PyDictMethods},
|
||||||
Bound, FromPyObject, PyAny, PyRef, PyResult, Python,
|
|
||||||
};
|
};
|
||||||
use pyo3_async_runtimes::tokio::future_into_py;
|
use pyo3_async_runtimes::tokio::future_into_py;
|
||||||
|
|
||||||
@@ -112,19 +112,24 @@ impl From<lancedb::table::AddResult> for AddResult {
|
|||||||
#[pyclass(get_all)]
|
#[pyclass(get_all)]
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct DeleteResult {
|
pub struct DeleteResult {
|
||||||
|
pub num_deleted_rows: u64,
|
||||||
pub version: u64,
|
pub version: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[pymethods]
|
#[pymethods]
|
||||||
impl DeleteResult {
|
impl DeleteResult {
|
||||||
pub fn __repr__(&self) -> String {
|
pub fn __repr__(&self) -> String {
|
||||||
format!("DeleteResult(version={})", self.version)
|
format!(
|
||||||
|
"DeleteResult(num_deleted_rows={}, version={})",
|
||||||
|
self.num_deleted_rows, self.version
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
||||||
fn from(result: lancedb::table::DeleteResult) -> Self {
|
fn from(result: lancedb::table::DeleteResult) -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
num_deleted_rows: result.num_deleted_rows,
|
||||||
version: result.version,
|
version: result.version,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -294,10 +299,12 @@ impl Table {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[pyo3(signature = (data, mode, progress=None))]
|
||||||
pub fn add<'a>(
|
pub fn add<'a>(
|
||||||
self_: PyRef<'a, Self>,
|
self_: PyRef<'a, Self>,
|
||||||
data: PyScannable,
|
data: PyScannable,
|
||||||
mode: String,
|
mode: String,
|
||||||
|
progress: Option<Py<PyAny>>,
|
||||||
) -> PyResult<Bound<'a, PyAny>> {
|
) -> PyResult<Bound<'a, PyAny>> {
|
||||||
let mut op = self_.inner_ref()?.add(data);
|
let mut op = self_.inner_ref()?.add(data);
|
||||||
if mode == "append" {
|
if mode == "append" {
|
||||||
@@ -307,6 +314,81 @@ impl Table {
|
|||||||
} else {
|
} else {
|
||||||
return Err(PyValueError::new_err(format!("Invalid mode: {}", mode)));
|
return Err(PyValueError::new_err(format!("Invalid mode: {}", mode)));
|
||||||
}
|
}
|
||||||
|
if let Some(progress_obj) = progress {
|
||||||
|
let is_callable = Python::attach(|py| progress_obj.bind(py).is_callable());
|
||||||
|
if is_callable {
|
||||||
|
// Callback: call with a dict of progress info.
|
||||||
|
op = op.progress(move |p| {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let dict = PyDict::new(py);
|
||||||
|
if let Err(e) = dict
|
||||||
|
.set_item("output_rows", p.output_rows())
|
||||||
|
.and_then(|_| dict.set_item("output_bytes", p.output_bytes()))
|
||||||
|
.and_then(|_| dict.set_item("total_rows", p.total_rows()))
|
||||||
|
.and_then(|_| {
|
||||||
|
dict.set_item("elapsed_seconds", p.elapsed().as_secs_f64())
|
||||||
|
})
|
||||||
|
.and_then(|_| dict.set_item("active_tasks", p.active_tasks()))
|
||||||
|
.and_then(|_| dict.set_item("total_tasks", p.total_tasks()))
|
||||||
|
.and_then(|_| dict.set_item("done", p.done()))
|
||||||
|
{
|
||||||
|
log::warn!("progress dict error: {e}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if let Err(e) = progress_obj.call1(py, (dict,)) {
|
||||||
|
log::warn!("progress callback error: {e}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// tqdm-like: has update() method.
|
||||||
|
let mut last_rows: usize = 0;
|
||||||
|
let mut total_set = false;
|
||||||
|
op = op.progress(move |p| {
|
||||||
|
let current = p.output_rows();
|
||||||
|
let prev = last_rows;
|
||||||
|
last_rows = current;
|
||||||
|
Python::attach(|py| {
|
||||||
|
if let Some(total) = p.total_rows()
|
||||||
|
&& !total_set
|
||||||
|
{
|
||||||
|
if let Err(e) = progress_obj.setattr(py, "total", total) {
|
||||||
|
log::warn!("progress setattr error: {e}");
|
||||||
|
}
|
||||||
|
total_set = true;
|
||||||
|
}
|
||||||
|
let delta = current.saturating_sub(prev);
|
||||||
|
if delta > 0 {
|
||||||
|
if let Err(e) = progress_obj.call_method1(py, "update", (delta,)) {
|
||||||
|
log::warn!("progress update error: {e}");
|
||||||
|
}
|
||||||
|
// Show throughput and active workers in tqdm postfix.
|
||||||
|
let elapsed = p.elapsed().as_secs_f64();
|
||||||
|
if elapsed > 0.0 {
|
||||||
|
let mb_per_sec = p.output_bytes() as f64 / elapsed / 1_000_000.0;
|
||||||
|
let postfix = format!(
|
||||||
|
"{:.1} MB/s | {}/{} workers",
|
||||||
|
mb_per_sec,
|
||||||
|
p.active_tasks(),
|
||||||
|
p.total_tasks()
|
||||||
|
);
|
||||||
|
if let Err(e) =
|
||||||
|
progress_obj.call_method1(py, "set_postfix_str", (postfix,))
|
||||||
|
{
|
||||||
|
log::warn!("progress set_postfix_str error: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if p.done() {
|
||||||
|
// Force a final refresh so the bar shows completion.
|
||||||
|
if let Err(e) = progress_obj.call_method0(py, "refresh") {
|
||||||
|
log::warn!("progress refresh error: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
future_into_py(self_.py(), async move {
|
future_into_py(self_.py(), async move {
|
||||||
let result = op.execute().await.infer_error()?;
|
let result = op.execute().await.infer_error()?;
|
||||||
@@ -421,6 +503,17 @@ impl Table {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn prewarm_data(
|
||||||
|
self_: PyRef<'_, Self>,
|
||||||
|
columns: Option<Vec<String>>,
|
||||||
|
) -> PyResult<Bound<'_, PyAny>> {
|
||||||
|
let inner = self_.inner_ref()?.clone();
|
||||||
|
future_into_py(self_.py(), async move {
|
||||||
|
inner.prewarm_data(columns).await.infer_error()?;
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
pub fn list_indices(self_: PyRef<'_, Self>) -> PyResult<Bound<'_, PyAny>> {
|
pub fn list_indices(self_: PyRef<'_, Self>) -> PyResult<Bound<'_, PyAny>> {
|
||||||
let inner = self_.inner_ref()?.clone();
|
let inner = self_.inner_ref()?.clone();
|
||||||
future_into_py(self_.py(), async move {
|
future_into_py(self_.py(), async move {
|
||||||
@@ -537,7 +630,7 @@ impl Table {
|
|||||||
let inner = self_.inner_ref()?.clone();
|
let inner = self_.inner_ref()?.clone();
|
||||||
future_into_py(self_.py(), async move {
|
future_into_py(self_.py(), async move {
|
||||||
let versions = inner.list_versions().await.infer_error()?;
|
let versions = inner.list_versions().await.infer_error()?;
|
||||||
let versions_as_dict = Python::attach(|py| {
|
Python::attach(|py| {
|
||||||
versions
|
versions
|
||||||
.iter()
|
.iter()
|
||||||
.map(|v| {
|
.map(|v| {
|
||||||
@@ -554,9 +647,7 @@ impl Table {
|
|||||||
Ok(dict.unbind())
|
Ok(dict.unbind())
|
||||||
})
|
})
|
||||||
.collect::<PyResult<Vec<_>>>()
|
.collect::<PyResult<Vec<_>>>()
|
||||||
});
|
})
|
||||||
|
|
||||||
versions_as_dict
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ use arrow::{
|
|||||||
};
|
};
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use lancedb::{
|
use lancedb::{
|
||||||
|
Error,
|
||||||
arrow::{SendableRecordBatchStream, SimpleRecordBatchStream},
|
arrow::{SendableRecordBatchStream, SimpleRecordBatchStream},
|
||||||
data::scannable::Scannable,
|
data::scannable::Scannable,
|
||||||
Error,
|
|
||||||
};
|
};
|
||||||
use pyo3::{types::PyAnyMethods, FromPyObject, Py, PyAny, Python};
|
use pyo3::{FromPyObject, Py, PyAny, Python, types::PyAnyMethods};
|
||||||
|
|
||||||
/// Adapter that implements Scannable for a Python reader factory callable.
|
/// Adapter that implements Scannable for a Python reader factory callable.
|
||||||
///
|
///
|
||||||
@@ -99,15 +99,15 @@ impl Scannable for PyScannable {
|
|||||||
// Channel closed. Check if the task panicked — a panic
|
// Channel closed. Check if the task panicked — a panic
|
||||||
// drops the sender without sending an error, so without
|
// drops the sender without sending an error, so without
|
||||||
// this check we'd silently return a truncated stream.
|
// this check we'd silently return a truncated stream.
|
||||||
if let Some(handle) = join_handle {
|
if let Some(handle) = join_handle
|
||||||
if let Err(join_err) = handle.await {
|
&& let Err(join_err) = handle.await
|
||||||
return Some((
|
{
|
||||||
Err(Error::Runtime {
|
return Some((
|
||||||
message: format!("Reader task panicked: {}", join_err),
|
Err(Error::Runtime {
|
||||||
}),
|
message: format!("Reader task panicked: {}", join_err),
|
||||||
(rx, None),
|
}),
|
||||||
));
|
(rx, None),
|
||||||
}
|
));
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,9 @@ use std::sync::Mutex;
|
|||||||
|
|
||||||
use lancedb::DistanceType;
|
use lancedb::DistanceType;
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
PyResult,
|
||||||
exceptions::{PyRuntimeError, PyValueError},
|
exceptions::{PyRuntimeError, PyValueError},
|
||||||
pyfunction, PyResult,
|
pyfunction,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A wrapper around a rust builder
|
/// A wrapper around a rust builder
|
||||||
|
|||||||
387
python/tests/test_expr.py
Normal file
387
python/tests/test_expr.py
Normal file
@@ -0,0 +1,387 @@
|
|||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
"""Tests for the type-safe expression builder API."""
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
import pyarrow as pa
|
||||||
|
import lancedb
|
||||||
|
from lancedb.expr import Expr, col, lit, func
|
||||||
|
|
||||||
|
|
||||||
|
# ── unit tests for Expr construction ─────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprConstruction:
|
||||||
|
def test_col_returns_expr(self):
|
||||||
|
e = col("age")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
|
||||||
|
def test_lit_int(self):
|
||||||
|
e = lit(42)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
|
||||||
|
def test_lit_float(self):
|
||||||
|
e = lit(3.14)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
|
||||||
|
def test_lit_str(self):
|
||||||
|
e = lit("hello")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
|
||||||
|
def test_lit_bool(self):
|
||||||
|
e = lit(True)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
|
||||||
|
def test_lit_unsupported_type_raises(self):
|
||||||
|
with pytest.raises(Exception):
|
||||||
|
lit([1, 2, 3])
|
||||||
|
|
||||||
|
def test_func(self):
|
||||||
|
e = func("lower", col("name"))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "lower(name)"
|
||||||
|
|
||||||
|
def test_func_unknown_raises(self):
|
||||||
|
with pytest.raises(Exception):
|
||||||
|
func("not_a_real_function", col("x"))
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprOperators:
|
||||||
|
def test_eq_operator(self):
|
||||||
|
e = col("x") == lit(1)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(x = 1)"
|
||||||
|
|
||||||
|
def test_ne_operator(self):
|
||||||
|
e = col("x") != lit(1)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(x <> 1)"
|
||||||
|
|
||||||
|
def test_lt_operator(self):
|
||||||
|
e = col("age") < lit(18)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(age < 18)"
|
||||||
|
|
||||||
|
def test_le_operator(self):
|
||||||
|
e = col("age") <= lit(18)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(age <= 18)"
|
||||||
|
|
||||||
|
def test_gt_operator(self):
|
||||||
|
e = col("age") > lit(18)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(age > 18)"
|
||||||
|
|
||||||
|
def test_ge_operator(self):
|
||||||
|
e = col("age") >= lit(18)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(age >= 18)"
|
||||||
|
|
||||||
|
def test_and_operator(self):
|
||||||
|
e = (col("age") > lit(18)) & (col("status") == lit("active"))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "((age > 18) AND (status = 'active'))"
|
||||||
|
|
||||||
|
def test_or_operator(self):
|
||||||
|
e = (col("a") == lit(1)) | (col("b") == lit(2))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "((a = 1) OR (b = 2))"
|
||||||
|
|
||||||
|
def test_invert_operator(self):
|
||||||
|
e = ~(col("active") == lit(True))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "NOT (active = true)"
|
||||||
|
|
||||||
|
def test_add_operator(self):
|
||||||
|
e = col("x") + lit(1)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(x + 1)"
|
||||||
|
|
||||||
|
def test_sub_operator(self):
|
||||||
|
e = col("x") - lit(1)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(x - 1)"
|
||||||
|
|
||||||
|
def test_mul_operator(self):
|
||||||
|
e = col("price") * lit(1.1)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(price * 1.1)"
|
||||||
|
|
||||||
|
def test_div_operator(self):
|
||||||
|
e = col("total") / lit(2)
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(total / 2)"
|
||||||
|
|
||||||
|
def test_radd(self):
|
||||||
|
e = lit(1) + col("x")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(1 + x)"
|
||||||
|
|
||||||
|
def test_rmul(self):
|
||||||
|
e = lit(2) * col("x")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(2 * x)"
|
||||||
|
|
||||||
|
def test_coerce_plain_int(self):
|
||||||
|
# Operators should auto-wrap plain Python values via lit()
|
||||||
|
e = col("age") > 18
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(age > 18)"
|
||||||
|
|
||||||
|
def test_coerce_plain_str(self):
|
||||||
|
e = col("name") == "alice"
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(name = 'alice')"
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprStringMethods:
|
||||||
|
def test_lower(self):
|
||||||
|
e = col("name").lower()
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "lower(name)"
|
||||||
|
|
||||||
|
def test_upper(self):
|
||||||
|
e = col("name").upper()
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "upper(name)"
|
||||||
|
|
||||||
|
def test_contains(self):
|
||||||
|
e = col("text").contains(lit("hello"))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "contains(text, 'hello')"
|
||||||
|
|
||||||
|
def test_contains_with_str_coerce(self):
|
||||||
|
e = col("text").contains("hello")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "contains(text, 'hello')"
|
||||||
|
|
||||||
|
def test_chained_lower_eq(self):
|
||||||
|
e = col("name").lower() == lit("alice")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(lower(name) = 'alice')"
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprCast:
|
||||||
|
def test_cast_string(self):
|
||||||
|
e = col("id").cast("string")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "CAST(id AS VARCHAR)"
|
||||||
|
|
||||||
|
def test_cast_int32(self):
|
||||||
|
e = col("score").cast("int32")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "CAST(score AS INTEGER)"
|
||||||
|
|
||||||
|
def test_cast_float64(self):
|
||||||
|
e = col("val").cast("float64")
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "CAST(val AS DOUBLE)"
|
||||||
|
|
||||||
|
def test_cast_pyarrow_type(self):
|
||||||
|
e = col("score").cast(pa.int32())
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "CAST(score AS INTEGER)"
|
||||||
|
|
||||||
|
def test_cast_pyarrow_float64(self):
|
||||||
|
e = col("val").cast(pa.float64())
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "CAST(val AS DOUBLE)"
|
||||||
|
|
||||||
|
def test_cast_pyarrow_string(self):
|
||||||
|
e = col("id").cast(pa.string())
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "CAST(id AS VARCHAR)"
|
||||||
|
|
||||||
|
def test_cast_pyarrow_and_string_equivalent(self):
|
||||||
|
# pa.int32() and "int32" should produce equivalent SQL
|
||||||
|
sql_str = col("x").cast("int32").to_sql()
|
||||||
|
sql_pa = col("x").cast(pa.int32()).to_sql()
|
||||||
|
assert sql_str == sql_pa
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprNamedMethods:
|
||||||
|
def test_eq_method(self):
|
||||||
|
e = col("x").eq(lit(1))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(x = 1)"
|
||||||
|
|
||||||
|
def test_gt_method(self):
|
||||||
|
e = col("x").gt(lit(0))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "(x > 0)"
|
||||||
|
|
||||||
|
def test_and_method(self):
|
||||||
|
e = col("x").gt(lit(0)).and_(col("y").lt(lit(10)))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "((x > 0) AND (y < 10))"
|
||||||
|
|
||||||
|
def test_or_method(self):
|
||||||
|
e = col("x").eq(lit(1)).or_(col("x").eq(lit(2)))
|
||||||
|
assert isinstance(e, Expr)
|
||||||
|
assert e.to_sql() == "((x = 1) OR (x = 2))"
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprRepr:
|
||||||
|
def test_repr(self):
|
||||||
|
e = col("age") > lit(18)
|
||||||
|
assert repr(e) == "Expr((age > 18))"
|
||||||
|
|
||||||
|
def test_to_sql(self):
|
||||||
|
e = col("age") > 18
|
||||||
|
assert e.to_sql() == "(age > 18)"
|
||||||
|
|
||||||
|
def test_unhashable(self):
|
||||||
|
e = col("x")
|
||||||
|
with pytest.raises(TypeError):
|
||||||
|
{e: 1}
|
||||||
|
|
||||||
|
|
||||||
|
# ── integration tests: end-to-end query against a real table ─────────────────
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def simple_table(tmp_path):
|
||||||
|
db = lancedb.connect(str(tmp_path))
|
||||||
|
data = pa.table(
|
||||||
|
{
|
||||||
|
"id": [1, 2, 3, 4, 5],
|
||||||
|
"name": ["Alice", "Bob", "Charlie", "alice", "BOB"],
|
||||||
|
"age": [25, 17, 30, 22, 15],
|
||||||
|
"score": [1.5, 2.0, 3.5, 4.0, 0.5],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return db.create_table("test", data)
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprFilter:
|
||||||
|
def test_simple_gt_filter(self, simple_table):
|
||||||
|
result = simple_table.search().where(col("age") > lit(20)).to_arrow()
|
||||||
|
assert result.num_rows == 3 # ages 25, 30, 22
|
||||||
|
|
||||||
|
def test_compound_and_filter(self, simple_table):
|
||||||
|
result = (
|
||||||
|
simple_table.search()
|
||||||
|
.where((col("age") > lit(18)) & (col("score") > lit(2.0)))
|
||||||
|
.to_arrow()
|
||||||
|
)
|
||||||
|
assert result.num_rows == 2 # (30, 3.5) and (22, 4.0)
|
||||||
|
|
||||||
|
def test_string_equality_filter(self, simple_table):
|
||||||
|
result = simple_table.search().where(col("name") == lit("Bob")).to_arrow()
|
||||||
|
assert result.num_rows == 1
|
||||||
|
|
||||||
|
def test_or_filter(self, simple_table):
|
||||||
|
result = (
|
||||||
|
simple_table.search()
|
||||||
|
.where((col("age") < lit(18)) | (col("age") > lit(28)))
|
||||||
|
.to_arrow()
|
||||||
|
)
|
||||||
|
assert result.num_rows == 3 # ages 17, 30, 15
|
||||||
|
|
||||||
|
def test_coercion_no_lit(self, simple_table):
|
||||||
|
# Python values should be auto-coerced
|
||||||
|
result = simple_table.search().where(col("age") > 20).to_arrow()
|
||||||
|
assert result.num_rows == 3
|
||||||
|
|
||||||
|
def test_string_sql_still_works(self, simple_table):
|
||||||
|
# Backwards compatibility: plain strings still accepted
|
||||||
|
result = simple_table.search().where("age > 20").to_arrow()
|
||||||
|
assert result.num_rows == 3
|
||||||
|
|
||||||
|
|
||||||
|
class TestExprProjection:
|
||||||
|
def test_select_with_expr(self, simple_table):
|
||||||
|
result = (
|
||||||
|
simple_table.search()
|
||||||
|
.select({"double_score": col("score") * lit(2)})
|
||||||
|
.to_arrow()
|
||||||
|
)
|
||||||
|
assert "double_score" in result.schema.names
|
||||||
|
|
||||||
|
def test_select_mixed_str_and_expr(self, simple_table):
|
||||||
|
result = (
|
||||||
|
simple_table.search()
|
||||||
|
.select({"id": "id", "double_score": col("score") * lit(2)})
|
||||||
|
.to_arrow()
|
||||||
|
)
|
||||||
|
assert "id" in result.schema.names
|
||||||
|
assert "double_score" in result.schema.names
|
||||||
|
|
||||||
|
def test_select_list_of_columns(self, simple_table):
|
||||||
|
# Plain list of str still works
|
||||||
|
result = simple_table.search().select(["id", "name"]).to_arrow()
|
||||||
|
assert result.schema.names == ["id", "name"]
|
||||||
|
|
||||||
|
|
||||||
|
# ── column name edge cases ────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class TestColNaming:
|
||||||
|
"""Unit tests verifying that col() preserves identifiers exactly.
|
||||||
|
|
||||||
|
Identifiers that need quoting (camelCase, spaces, leading digits, unicode)
|
||||||
|
are wrapped in backticks to match the lance SQL parser's dialect.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def test_camel_case_preserved_in_sql(self):
|
||||||
|
# camelCase is quoted with backticks so the case round-trips correctly.
|
||||||
|
assert col("firstName").to_sql() == "`firstName`"
|
||||||
|
|
||||||
|
def test_camel_case_in_expression(self):
|
||||||
|
assert (col("firstName") > lit(18)).to_sql() == "(`firstName` > 18)"
|
||||||
|
|
||||||
|
def test_space_in_name_quoted(self):
|
||||||
|
assert col("first name").to_sql() == "`first name`"
|
||||||
|
|
||||||
|
def test_space_in_expression(self):
|
||||||
|
assert (col("first name") == lit("A")).to_sql() == "(`first name` = 'A')"
|
||||||
|
|
||||||
|
def test_leading_digit_quoted(self):
|
||||||
|
assert col("2fast").to_sql() == "`2fast`"
|
||||||
|
|
||||||
|
def test_unicode_quoted(self):
|
||||||
|
assert col("名前").to_sql() == "`名前`"
|
||||||
|
|
||||||
|
def test_snake_case_unquoted(self):
|
||||||
|
# Plain snake_case needs no quoting.
|
||||||
|
assert col("first_name").to_sql() == "first_name"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def special_col_table(tmp_path):
|
||||||
|
db = lancedb.connect(str(tmp_path))
|
||||||
|
data = pa.table(
|
||||||
|
{
|
||||||
|
"firstName": ["Alice", "Bob", "Charlie"],
|
||||||
|
"first name": ["A", "B", "C"],
|
||||||
|
"score": [10, 20, 30],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return db.create_table("special", data)
|
||||||
|
|
||||||
|
|
||||||
|
class TestColNamingIntegration:
|
||||||
|
def test_camel_case_filter(self, special_col_table):
|
||||||
|
result = (
|
||||||
|
special_col_table.search()
|
||||||
|
.where(col("firstName") == lit("Alice"))
|
||||||
|
.to_arrow()
|
||||||
|
)
|
||||||
|
assert result.num_rows == 1
|
||||||
|
assert result["firstName"][0].as_py() == "Alice"
|
||||||
|
|
||||||
|
def test_space_in_col_filter(self, special_col_table):
|
||||||
|
result = (
|
||||||
|
special_col_table.search().where(col("first name") == lit("B")).to_arrow()
|
||||||
|
)
|
||||||
|
assert result.num_rows == 1
|
||||||
|
|
||||||
|
def test_camel_case_projection(self, special_col_table):
|
||||||
|
result = (
|
||||||
|
special_col_table.search()
|
||||||
|
.select({"upper_name": col("firstName").upper()})
|
||||||
|
.to_arrow()
|
||||||
|
)
|
||||||
|
assert "upper_name" in result.schema.names
|
||||||
|
assert sorted(result["upper_name"].to_pylist()) == ["ALICE", "BOB", "CHARLIE"]
|
||||||
4
python/uv.lock
generated
4
python/uv.lock
generated
@@ -2006,7 +2006,7 @@ requires-dist = [
|
|||||||
{ name = "botocore", marker = "extra == 'embeddings'", specifier = ">=1.31.57" },
|
{ name = "botocore", marker = "extra == 'embeddings'", specifier = ">=1.31.57" },
|
||||||
{ name = "cohere", marker = "extra == 'embeddings'" },
|
{ name = "cohere", marker = "extra == 'embeddings'" },
|
||||||
{ name = "colpali-engine", marker = "extra == 'embeddings'", specifier = ">=0.3.10" },
|
{ name = "colpali-engine", marker = "extra == 'embeddings'", specifier = ">=0.3.10" },
|
||||||
{ name = "datafusion", marker = "extra == 'tests'" },
|
{ name = "datafusion", marker = "extra == 'tests'", specifier = "<52" },
|
||||||
{ name = "deprecation" },
|
{ name = "deprecation" },
|
||||||
{ name = "duckdb", marker = "extra == 'tests'" },
|
{ name = "duckdb", marker = "extra == 'tests'" },
|
||||||
{ name = "google-generativeai", marker = "extra == 'embeddings'" },
|
{ name = "google-generativeai", marker = "extra == 'embeddings'" },
|
||||||
@@ -2035,7 +2035,7 @@ requires-dist = [
|
|||||||
{ name = "pyarrow-stubs", marker = "extra == 'tests'" },
|
{ name = "pyarrow-stubs", marker = "extra == 'tests'" },
|
||||||
{ name = "pydantic", specifier = ">=1.10" },
|
{ name = "pydantic", specifier = ">=1.10" },
|
||||||
{ name = "pylance", marker = "extra == 'pylance'", specifier = ">=1.0.0b14" },
|
{ name = "pylance", marker = "extra == 'pylance'", specifier = ">=1.0.0b14" },
|
||||||
{ name = "pylance", marker = "extra == 'tests'", specifier = ">=1.0.0b14" },
|
{ name = "pylance", marker = "extra == 'tests'", specifier = ">=1.0.0b14,<3.0.0" },
|
||||||
{ name = "pyright", marker = "extra == 'dev'" },
|
{ name = "pyright", marker = "extra == 'dev'" },
|
||||||
{ name = "pytest", marker = "extra == 'tests'" },
|
{ name = "pytest", marker = "extra == 'tests'" },
|
||||||
{ name = "pytest-asyncio", marker = "extra == 'tests'" },
|
{ name = "pytest-asyncio", marker = "extra == 'tests'" },
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lancedb"
|
name = "lancedb"
|
||||||
version = "0.27.0-beta.2"
|
version = "0.27.2-beta.1"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
description = "LanceDB: A serverless, low-latency vector database for AI applications"
|
description = "LanceDB: A serverless, low-latency vector database for AI applications"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# LanceDB Rust
|
# LanceDB Rust SDK
|
||||||
|
|
||||||
<a href="https://crates.io/crates/vectordb"></a>
|
<a href="https://crates.io/crates/vectordb"></a>
|
||||||
<a href="https://docs.rs/vectordb/latest/vectordb/"></a>
|
<a href="https://docs.rs/vectordb/latest/vectordb/"></a>
|
||||||
|
|||||||
@@ -9,10 +9,9 @@ use aws_config::Region;
|
|||||||
use aws_sdk_bedrockruntime::Client;
|
use aws_sdk_bedrockruntime::Client;
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use lancedb::{
|
use lancedb::{
|
||||||
connect,
|
Result, connect,
|
||||||
embeddings::{bedrock::BedrockEmbeddingFunction, EmbeddingDefinition, EmbeddingFunction},
|
embeddings::{EmbeddingDefinition, EmbeddingFunction, bedrock::BedrockEmbeddingFunction},
|
||||||
query::{ExecutableQuery, QueryBase},
|
query::{ExecutableQuery, QueryBase},
|
||||||
Result,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ use futures::TryStreamExt;
|
|||||||
use lance_index::scalar::FullTextSearchQuery;
|
use lance_index::scalar::FullTextSearchQuery;
|
||||||
use lancedb::connection::Connection;
|
use lancedb::connection::Connection;
|
||||||
|
|
||||||
use lancedb::index::scalar::FtsIndexBuilder;
|
|
||||||
use lancedb::index::Index;
|
use lancedb::index::Index;
|
||||||
|
use lancedb::index::scalar::FtsIndexBuilder;
|
||||||
use lancedb::query::{ExecutableQuery, QueryBase};
|
use lancedb::query::{ExecutableQuery, QueryBase};
|
||||||
use lancedb::{connect, Result, Table};
|
use lancedb::{Result, Table, connect};
|
||||||
use rand::random;
|
use rand::random;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
@@ -46,19 +46,21 @@ fn create_some_records() -> Result<Box<dyn arrow_array::RecordBatchReader + Send
|
|||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
let n_terms = 3;
|
let n_terms = 3;
|
||||||
let batches = RecordBatchIterator::new(
|
let batches = RecordBatchIterator::new(
|
||||||
vec![RecordBatch::try_new(
|
vec![
|
||||||
schema.clone(),
|
RecordBatch::try_new(
|
||||||
vec![
|
schema.clone(),
|
||||||
Arc::new(Int32Array::from_iter_values(0..TOTAL as i32)),
|
vec![
|
||||||
Arc::new(StringArray::from_iter_values((0..TOTAL).map(|_| {
|
Arc::new(Int32Array::from_iter_values(0..TOTAL as i32)),
|
||||||
(0..n_terms)
|
Arc::new(StringArray::from_iter_values((0..TOTAL).map(|_| {
|
||||||
.map(|_| words[random::<u32>() as usize % words.len()])
|
(0..n_terms)
|
||||||
.collect::<Vec<_>>()
|
.map(|_| words[random::<u32>() as usize % words.len()])
|
||||||
.join(" ")
|
.collect::<Vec<_>>()
|
||||||
}))),
|
.join(" ")
|
||||||
],
|
}))),
|
||||||
)
|
],
|
||||||
.unwrap()]
|
)
|
||||||
|
.unwrap(),
|
||||||
|
]
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(Ok),
|
.map(Ok),
|
||||||
schema.clone(),
|
schema.clone(),
|
||||||
|
|||||||
@@ -5,16 +5,15 @@ use arrow_array::{RecordBatch, StringArray};
|
|||||||
use arrow_schema::{DataType, Field, Schema};
|
use arrow_schema::{DataType, Field, Schema};
|
||||||
use futures::TryStreamExt;
|
use futures::TryStreamExt;
|
||||||
use lance_index::scalar::FullTextSearchQuery;
|
use lance_index::scalar::FullTextSearchQuery;
|
||||||
use lancedb::index::scalar::FtsIndexBuilder;
|
|
||||||
use lancedb::index::Index;
|
use lancedb::index::Index;
|
||||||
|
use lancedb::index::scalar::FtsIndexBuilder;
|
||||||
use lancedb::{
|
use lancedb::{
|
||||||
connect,
|
Result, Table, connect,
|
||||||
embeddings::{
|
embeddings::{
|
||||||
sentence_transformers::SentenceTransformersEmbeddings, EmbeddingDefinition,
|
EmbeddingDefinition, EmbeddingFunction,
|
||||||
EmbeddingFunction,
|
sentence_transformers::SentenceTransformersEmbeddings,
|
||||||
},
|
},
|
||||||
query::{QueryBase, QueryExecutionOptions},
|
query::{QueryBase, QueryExecutionOptions},
|
||||||
Result, Table,
|
|
||||||
};
|
};
|
||||||
use std::{iter::once, sync::Arc};
|
use std::{iter::once, sync::Arc};
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ use arrow_schema::{DataType, Field, Schema};
|
|||||||
use futures::TryStreamExt;
|
use futures::TryStreamExt;
|
||||||
use lancedb::connection::Connection;
|
use lancedb::connection::Connection;
|
||||||
|
|
||||||
use lancedb::index::vector::IvfPqIndexBuilder;
|
|
||||||
use lancedb::index::Index;
|
use lancedb::index::Index;
|
||||||
|
use lancedb::index::vector::IvfPqIndexBuilder;
|
||||||
use lancedb::query::{ExecutableQuery, QueryBase};
|
use lancedb::query::{ExecutableQuery, QueryBase};
|
||||||
use lancedb::{connect, DistanceType, Result, Table};
|
use lancedb::{DistanceType, Result, Table, connect};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
@@ -51,19 +51,21 @@ fn create_some_records() -> Result<Box<dyn arrow_array::RecordBatchReader + Send
|
|||||||
|
|
||||||
// Create a RecordBatch stream.
|
// Create a RecordBatch stream.
|
||||||
let batches = RecordBatchIterator::new(
|
let batches = RecordBatchIterator::new(
|
||||||
vec![RecordBatch::try_new(
|
vec![
|
||||||
schema.clone(),
|
RecordBatch::try_new(
|
||||||
vec![
|
schema.clone(),
|
||||||
Arc::new(Int32Array::from_iter_values(0..TOTAL as i32)),
|
vec![
|
||||||
Arc::new(
|
Arc::new(Int32Array::from_iter_values(0..TOTAL as i32)),
|
||||||
FixedSizeListArray::from_iter_primitive::<Float32Type, _, _>(
|
Arc::new(
|
||||||
(0..TOTAL).map(|_| Some(vec![Some(1.0); DIM])),
|
FixedSizeListArray::from_iter_primitive::<Float32Type, _, _>(
|
||||||
DIM as i32,
|
(0..TOTAL).map(|_| Some(vec![Some(1.0); DIM])),
|
||||||
|
DIM as i32,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
)
|
||||||
)
|
.unwrap(),
|
||||||
.unwrap()]
|
]
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(Ok),
|
.map(Ok),
|
||||||
schema.clone(),
|
schema.clone(),
|
||||||
|
|||||||
@@ -8,10 +8,9 @@ use std::{iter::once, sync::Arc};
|
|||||||
use arrow_array::{RecordBatch, StringArray};
|
use arrow_array::{RecordBatch, StringArray};
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use lancedb::{
|
use lancedb::{
|
||||||
connect,
|
Result, connect,
|
||||||
embeddings::{openai::OpenAIEmbeddingFunction, EmbeddingDefinition, EmbeddingFunction},
|
embeddings::{EmbeddingDefinition, EmbeddingFunction, openai::OpenAIEmbeddingFunction},
|
||||||
query::{ExecutableQuery, QueryBase},
|
query::{ExecutableQuery, QueryBase},
|
||||||
Result,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// --8<-- [end:imports]
|
// --8<-- [end:imports]
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user