mirror of
https://github.com/lancedb/lancedb.git
synced 2026-03-28 11:30:39 +00:00
Compare commits
59 Commits
python-v0.
...
python-v0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
aeb1c3ee6a | ||
|
|
f9ae46c0e7 | ||
|
|
84bf022fb1 | ||
|
|
310967eceb | ||
|
|
154dbeee2a | ||
|
|
c9c08ac8b9 | ||
|
|
e253f5d9b6 | ||
|
|
05b4fb0990 | ||
|
|
613b9c1099 | ||
|
|
d5948576b9 | ||
|
|
0d3fc7860a | ||
|
|
531cec075c | ||
|
|
0e486511fa | ||
|
|
367262662d | ||
|
|
11efaf46ae | ||
|
|
1ea22ee5ef | ||
|
|
8cef8806e9 | ||
|
|
a3cd7fce69 | ||
|
|
48ddc833dd | ||
|
|
2802764092 | ||
|
|
37bbb0dba1 | ||
|
|
155ec16161 | ||
|
|
636b8b5bbd | ||
|
|
715b81c86b | ||
|
|
7e1616376e | ||
|
|
d5ac5b949a | ||
|
|
7be6f45e0b |
@@ -1,5 +1,5 @@
|
|||||||
[tool.bumpversion]
|
[tool.bumpversion]
|
||||||
current_version = "0.26.2"
|
current_version = "0.27.0-beta.5"
|
||||||
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*)\\.
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ runs:
|
|||||||
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 +45,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:
|
||||||
|
|||||||
22
.github/workflows/nodejs.yml
vendored
22
.github/workflows/nodejs.yml
vendored
@@ -7,7 +7,9 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- Cargo.toml
|
- Cargo.toml
|
||||||
|
- Cargo.lock
|
||||||
- nodejs/**
|
- nodejs/**
|
||||||
|
- rust/**
|
||||||
- docs/src/js/**
|
- docs/src/js/**
|
||||||
- .github/workflows/nodejs.yml
|
- .github/workflows/nodejs.yml
|
||||||
- docker-compose.yml
|
- docker-compose.yml
|
||||||
@@ -36,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'
|
||||||
@@ -76,9 +78,12 @@ 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
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node-version }}
|
# @napi-rs/cli v3 requires Node >= 20.12 (via @inquirer/prompts@8).
|
||||||
|
# Build always on Node 20; tests run on the matrix version below.
|
||||||
|
node-version: 20
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
cache-dependency-path: nodejs/package-lock.json
|
cache-dependency-path: nodejs/package-lock.json
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
@@ -86,12 +91,16 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install -y protobuf-compiler libssl-dev
|
sudo apt install -y protobuf-compiler libssl-dev
|
||||||
npm install -g @napi-rs/cli
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
npm ci --include=optional
|
npm ci --include=optional
|
||||||
npm run build:debug -- --profile ci
|
npm run build:debug -- --profile ci
|
||||||
npm run tsc
|
- uses: actions/setup-node@v4
|
||||||
|
name: Setup Node.js ${{ matrix.node-version }} for test
|
||||||
|
with:
|
||||||
|
node-version: ${{ matrix.node-version }}
|
||||||
|
- name: Compile TypeScript
|
||||||
|
run: npm run tsc
|
||||||
- name: Setup localstack
|
- name: Setup localstack
|
||||||
working-directory: .
|
working-directory: .
|
||||||
run: docker compose up --detach --wait
|
run: docker compose up --detach --wait
|
||||||
@@ -135,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'
|
||||||
@@ -144,7 +153,6 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
brew install protobuf
|
brew install protobuf
|
||||||
npm install -g @napi-rs/cli
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
npm ci --include=optional
|
npm ci --include=optional
|
||||||
|
|||||||
61
.github/workflows/npm-publish.yml
vendored
61
.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,20 +125,22 @@ 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
|
||||||
# https://github.com/napi-rs/napi-rs/blob/main/alpine.Dockerfile
|
|
||||||
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
|
|
||||||
features: fp16kernels
|
features: fp16kernels
|
||||||
pre_build: |-
|
pre_build: |-
|
||||||
set -e &&
|
set -e &&
|
||||||
apk add protobuf-dev curl &&
|
sudo apt-get update &&
|
||||||
ln -s /usr/lib/gcc/x86_64-alpine-linux-musl/14.2.0/crtbeginS.o /usr/lib/crtbeginS.o &&
|
sudo apt-get install -y protobuf-compiler pkg-config &&
|
||||||
ln -s /usr/lib/libgcc_s.so /usr/lib/libgcc.so &&
|
rustup target add x86_64-unknown-linux-musl &&
|
||||||
CC=gcc &&
|
export EXTRA_ARGS="-x"
|
||||||
CXX=g++
|
|
||||||
- target: aarch64-unknown-linux-gnu
|
- target: aarch64-unknown-linux-gnu
|
||||||
host: ubuntu-2404-8x-x64
|
host: ubuntu-2404-8x-x64
|
||||||
# https://github.com/napi-rs/napi-rs/blob/main/debian-aarch64.Dockerfile
|
# https://github.com/napi-rs/napi-rs/blob/main/debian-aarch64.Dockerfile
|
||||||
@@ -147,21 +150,20 @@ 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
|
||||||
# https://github.com/napi-rs/napi-rs/blob/main/alpine.Dockerfile
|
|
||||||
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
|
|
||||||
features: ","
|
features: ","
|
||||||
pre_build: |-
|
pre_build: |-
|
||||||
set -e &&
|
set -e &&
|
||||||
apk add protobuf-dev &&
|
sudo apt-get update &&
|
||||||
|
sudo apt-get install -y protobuf-compiler &&
|
||||||
rustup target add aarch64-unknown-linux-musl &&
|
rustup target add aarch64-unknown-linux-musl &&
|
||||||
export CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc &&
|
export EXTRA_ARGS="-x"
|
||||||
export CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++
|
|
||||||
name: build - ${{ matrix.settings.target }}
|
name: build - ${{ matrix.settings.target }}
|
||||||
runs-on: ${{ matrix.settings.host }}
|
runs-on: ${{ matrix.settings.host }}
|
||||||
defaults:
|
defaults:
|
||||||
@@ -192,12 +194,18 @@ jobs:
|
|||||||
.cargo-cache
|
.cargo-cache
|
||||||
target/
|
target/
|
||||||
key: nodejs-${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
|
key: nodejs-${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
|
||||||
- name: Setup toolchain
|
|
||||||
run: ${{ matrix.settings.setup }}
|
|
||||||
if: ${{ matrix.settings.setup }}
|
|
||||||
shell: bash
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
- name: Install Zig
|
||||||
|
uses: mlugg/setup-zig@v2
|
||||||
|
if: ${{ contains(matrix.settings.target, 'musl') }}
|
||||||
|
with:
|
||||||
|
version: 0.14.1
|
||||||
|
- name: Install cargo-zigbuild
|
||||||
|
uses: taiki-e/install-action@v2
|
||||||
|
if: ${{ contains(matrix.settings.target, 'musl') }}
|
||||||
|
with:
|
||||||
|
tool: cargo-zigbuild
|
||||||
- name: Build in docker
|
- name: Build in docker
|
||||||
uses: addnab/docker-run-action@v3
|
uses: addnab/docker-run-action@v3
|
||||||
if: ${{ matrix.settings.docker }}
|
if: ${{ matrix.settings.docker }}
|
||||||
@@ -210,24 +218,24 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
${{ matrix.settings.pre_build }}
|
${{ matrix.settings.pre_build }}
|
||||||
npx napi build --platform --release --no-const-enum \
|
npx napi build --platform --release \
|
||||||
--features ${{ matrix.settings.features }} \
|
--features ${{ matrix.settings.features }} \
|
||||||
--target ${{ matrix.settings.target }} \
|
--target ${{ matrix.settings.target }} \
|
||||||
--dts ../lancedb/native.d.ts \
|
--dts ../lancedb/native.d.ts \
|
||||||
--js ../lancedb/native.js \
|
--js ../lancedb/native.js \
|
||||||
--strip \
|
--strip \
|
||||||
dist/
|
--output-dir dist/
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
${{ matrix.settings.pre_build }}
|
${{ matrix.settings.pre_build }}
|
||||||
npx napi build --platform --release --no-const-enum \
|
npx napi build --platform --release \
|
||||||
--features ${{ matrix.settings.features }} \
|
--features ${{ matrix.settings.features }} \
|
||||||
--target ${{ matrix.settings.target }} \
|
--target ${{ matrix.settings.target }} \
|
||||||
--dts ../lancedb/native.d.ts \
|
--dts ../lancedb/native.d.ts \
|
||||||
--js ../lancedb/native.js \
|
--js ../lancedb/native.js \
|
||||||
--strip \
|
--strip \
|
||||||
$EXTRA_ARGS \
|
$EXTRA_ARGS \
|
||||||
dist/
|
--output-dir dist/
|
||||||
if: ${{ !matrix.settings.docker }}
|
if: ${{ !matrix.settings.docker }}
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
@@ -265,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 }}
|
||||||
@@ -355,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/"
|
||||||
|
|||||||
6
.github/workflows/python.yml
vendored
6
.github/workflows/python.yml
vendored
@@ -7,8 +7,14 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- Cargo.toml
|
- Cargo.toml
|
||||||
|
- Cargo.lock
|
||||||
- python/**
|
- python/**
|
||||||
|
- 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 }}
|
||||||
|
|||||||
7
.github/workflows/rust.yml
vendored
7
.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
|
||||||
|
|
||||||
@@ -100,7 +101,9 @@ jobs:
|
|||||||
lfs: true
|
lfs: true
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: sudo apt install -y protobuf-compiler libssl-dev
|
run: |
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install -y protobuf-compiler libssl-dev
|
||||||
- uses: rui314/setup-mold@v1
|
- uses: rui314/setup-mold@v1
|
||||||
- name: Make Swap
|
- name: Make Swap
|
||||||
run: |
|
run: |
|
||||||
@@ -183,7 +186,7 @@ jobs:
|
|||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
msrv: ["1.88.0"] # This should match up with rust-version in Cargo.toml
|
msrv: ["1.91.0"] # This should match up with rust-version in Cargo.toml
|
||||||
env:
|
env:
|
||||||
# Need up-to-date compilers for kernels
|
# Need up-to-date compilers for kernels
|
||||||
CC: clang-18
|
CC: clang-18
|
||||||
|
|||||||
1190
Cargo.lock
generated
1190
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
48
Cargo.toml
48
Cargo.toml
@@ -5,30 +5,30 @@ 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"
|
||||||
description = "Serverless, low-latency vector database for AI applications"
|
description = "Serverless, low-latency vector database for AI applications"
|
||||||
keywords = ["lancedb", "lance", "database", "vector", "search"]
|
keywords = ["lancedb", "lance", "database", "vector", "search"]
|
||||||
categories = ["database-implementations"]
|
categories = ["database-implementations"]
|
||||||
rust-version = "1.88.0"
|
rust-version = "1.91.0"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
lance = { "version" = "=2.0.1", default-features = false }
|
lance = { version = "=3.0.0", default-features = false }
|
||||||
lance-core = "=2.0.1"
|
lance-core = { version = "=3.0.0" }
|
||||||
lance-datagen = "=2.0.1"
|
lance-datagen = { version = "=3.0.0" }
|
||||||
lance-file = "=2.0.1"
|
lance-file = { version = "=3.0.0" }
|
||||||
lance-io = { "version" = "=2.0.1", default-features = false }
|
lance-io = { version = "=3.0.0", default-features = false }
|
||||||
lance-index = "=2.0.1"
|
lance-index = { version = "=3.0.0" }
|
||||||
lance-linalg = "=2.0.1"
|
lance-linalg = { version = "=3.0.0" }
|
||||||
lance-namespace = "=2.0.1"
|
lance-namespace = { version = "=3.0.0" }
|
||||||
lance-namespace-impls = { "version" = "=2.0.1", default-features = false }
|
lance-namespace-impls = { version = "=3.0.0", default-features = false }
|
||||||
lance-table = "=2.0.1"
|
lance-table = { version = "=3.0.0" }
|
||||||
lance-testing = "=2.0.1"
|
lance-testing = { version = "=3.0.0" }
|
||||||
lance-datafusion = "=2.0.1"
|
lance-datafusion = { version = "=3.0.0" }
|
||||||
lance-encoding = "=2.0.1"
|
lance-encoding = { version = "=3.0.0" }
|
||||||
lance-arrow = "=2.0.1"
|
lance-arrow = { version = "=3.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 }
|
||||||
@@ -40,13 +40,15 @@ arrow-schema = "57.2"
|
|||||||
arrow-select = "57.2"
|
arrow-select = "57.2"
|
||||||
arrow-cast = "57.2"
|
arrow-cast = "57.2"
|
||||||
async-trait = "0"
|
async-trait = "0"
|
||||||
datafusion = { version = "51.0", default-features = false }
|
datafusion = { version = "52.1", default-features = false }
|
||||||
datafusion-catalog = "51.0"
|
datafusion-catalog = "52.1"
|
||||||
datafusion-common = { version = "51.0", default-features = false }
|
datafusion-common = { version = "52.1", default-features = false }
|
||||||
datafusion-execution = "51.0"
|
datafusion-execution = "52.1"
|
||||||
datafusion-expr = "51.0"
|
datafusion-expr = "52.1"
|
||||||
datafusion-physical-plan = "51.0"
|
datafusion-functions = "52.1"
|
||||||
datafusion-physical-expr = "51.0"
|
datafusion-physical-plan = "52.1"
|
||||||
|
datafusion-physical-expr = "52.1"
|
||||||
|
datafusion-sql = "52.1"
|
||||||
env_logger = "0.11"
|
env_logger = "0.11"
|
||||||
half = { "version" = "2.7.1", default-features = false, features = [
|
half = { "version" = "2.7.1", default-features = false, features = [
|
||||||
"num-traits",
|
"num-traits",
|
||||||
|
|||||||
@@ -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.5.3
|
||||||
mkdocs-jupyter==0.24.1
|
mkdocs-jupyter==0.24.1
|
||||||
mkdocs-material==9.5.3
|
mkdocs-material==9.5.3
|
||||||
mkdocs-autorefs<=1.0
|
mkdocs-autorefs>=0.5,<=1.0
|
||||||
mkdocstrings[python]==0.25.2
|
mkdocstrings[python]==0.25.2
|
||||||
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.26.2</version>
|
<version>0.27.0-beta.5</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.
|
||||||
|
|||||||
@@ -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.26.2-final.0</version>
|
<version>0.27.0-beta.5</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.26.2-final.0</version>
|
<version>0.27.0-beta.5</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>2.0.1</lance-core.version>
|
<lance-core.version>3.1.0-beta.2</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.26.2"
|
version = "0.27.0-beta.5"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
description.workspace = true
|
description.workspace = true
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
@@ -19,21 +19,21 @@ arrow-schema.workspace = true
|
|||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
futures.workspace = true
|
futures.workspace = true
|
||||||
lancedb = { path = "../rust/lancedb", default-features = false }
|
lancedb = { path = "../rust/lancedb", default-features = false }
|
||||||
napi = { version = "2.16.8", default-features = false, features = [
|
napi = { version = "3.8.3", default-features = false, features = [
|
||||||
"napi9",
|
"napi9",
|
||||||
"async"
|
"async"
|
||||||
] }
|
] }
|
||||||
napi-derive = "2.16.4"
|
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.1"
|
napi-build = "2.3.1"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["remote", "lancedb/aws", "lancedb/gcs", "lancedb/azure", "lancedb/dynamodb", "lancedb/oss", "lancedb/huggingface"]
|
default = ["remote", "lancedb/aws", "lancedb/gcs", "lancedb/azure", "lancedb/dynamodb", "lancedb/oss", "lancedb/huggingface"]
|
||||||
|
|||||||
@@ -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);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
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,
|
||||||
@@ -529,7 +533,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 +593,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 +758,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 +852,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[][]);
|
||||||
|
|||||||
@@ -273,7 +273,9 @@ export async function connect(
|
|||||||
let nativeProvider: NativeJsHeaderProvider | undefined;
|
let nativeProvider: NativeJsHeaderProvider | undefined;
|
||||||
if (finalHeaderProvider) {
|
if (finalHeaderProvider) {
|
||||||
if (typeof finalHeaderProvider === "function") {
|
if (typeof finalHeaderProvider === "function") {
|
||||||
nativeProvider = new NativeJsHeaderProvider(finalHeaderProvider);
|
nativeProvider = new NativeJsHeaderProvider(async () =>
|
||||||
|
finalHeaderProvider(),
|
||||||
|
);
|
||||||
} else if (
|
} else if (
|
||||||
finalHeaderProvider &&
|
finalHeaderProvider &&
|
||||||
typeof finalHeaderProvider.getHeaders === "function"
|
typeof finalHeaderProvider.getHeaders === "function"
|
||||||
|
|||||||
@@ -684,19 +684,17 @@ export class VectorQuery extends StandardQueryBase<NativeVectorQuery> {
|
|||||||
|
|
||||||
rerank(reranker: Reranker): VectorQuery {
|
rerank(reranker: Reranker): VectorQuery {
|
||||||
super.doCall((inner) =>
|
super.doCall((inner) =>
|
||||||
inner.rerank({
|
inner.rerank(async (args) => {
|
||||||
rerankHybrid: async (_, args) => {
|
const vecResults = await fromBufferToRecordBatch(args.vecResults);
|
||||||
const vecResults = await fromBufferToRecordBatch(args.vecResults);
|
const ftsResults = await fromBufferToRecordBatch(args.ftsResults);
|
||||||
const ftsResults = await fromBufferToRecordBatch(args.ftsResults);
|
const result = await reranker.rerankHybrid(
|
||||||
const result = await reranker.rerankHybrid(
|
args.query,
|
||||||
args.query,
|
vecResults as RecordBatch,
|
||||||
vecResults as RecordBatch,
|
ftsResults as RecordBatch,
|
||||||
ftsResults as RecordBatch,
|
);
|
||||||
);
|
|
||||||
|
|
||||||
const buffer = fromRecordBatchToBuffer(result);
|
const buffer = fromRecordBatchToBuffer(result);
|
||||||
return buffer;
|
return buffer;
|
||||||
},
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"os": [
|
"os": [
|
||||||
"win32"
|
"win32"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@lancedb/lancedb-win32-x64-msvc",
|
"name": "@lancedb/lancedb-win32-x64-msvc",
|
||||||
"version": "0.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"os": ["win32"],
|
"os": ["win32"],
|
||||||
"cpu": ["x64"],
|
"cpu": ["x64"],
|
||||||
"main": "lancedb.win32-x64-msvc.node",
|
"main": "lancedb.win32-x64-msvc.node",
|
||||||
|
|||||||
6014
nodejs/package-lock.json
generated
6014
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.26.2",
|
"version": "0.27.0-beta.5",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"exports": {
|
"exports": {
|
||||||
".": "./dist/index.js",
|
".": "./dist/index.js",
|
||||||
@@ -21,19 +21,16 @@
|
|||||||
},
|
},
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
"napi": {
|
"napi": {
|
||||||
"name": "lancedb",
|
"binaryName": "lancedb",
|
||||||
"triples": {
|
"targets": [
|
||||||
"defaults": false,
|
"aarch64-apple-darwin",
|
||||||
"additional": [
|
"x86_64-unknown-linux-gnu",
|
||||||
"aarch64-apple-darwin",
|
"aarch64-unknown-linux-gnu",
|
||||||
"x86_64-unknown-linux-gnu",
|
"x86_64-unknown-linux-musl",
|
||||||
"aarch64-unknown-linux-gnu",
|
"aarch64-unknown-linux-musl",
|
||||||
"x86_64-unknown-linux-musl",
|
"x86_64-pc-windows-msvc",
|
||||||
"aarch64-unknown-linux-musl",
|
"aarch64-pc-windows-msvc"
|
||||||
"x86_64-pc-windows-msvc",
|
]
|
||||||
"aarch64-pc-windows-msvc"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
@@ -46,7 +43,7 @@
|
|||||||
"@aws-sdk/client-s3": "^3.33.0",
|
"@aws-sdk/client-s3": "^3.33.0",
|
||||||
"@biomejs/biome": "^1.7.3",
|
"@biomejs/biome": "^1.7.3",
|
||||||
"@jest/globals": "^29.7.0",
|
"@jest/globals": "^29.7.0",
|
||||||
"@napi-rs/cli": "^2.18.3",
|
"@napi-rs/cli": "^3.5.1",
|
||||||
"@types/axios": "^0.14.0",
|
"@types/axios": "^0.14.0",
|
||||||
"@types/jest": "^29.1.2",
|
"@types/jest": "^29.1.2",
|
||||||
"@types/node": "^22.7.4",
|
"@types/node": "^22.7.4",
|
||||||
@@ -75,9 +72,9 @@
|
|||||||
"os": ["darwin", "linux", "win32"],
|
"os": ["darwin", "linux", "win32"],
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"artifacts": "napi artifacts",
|
"artifacts": "napi artifacts",
|
||||||
"build:debug": "napi build --platform --no-const-enum --dts ../lancedb/native.d.ts --js ../lancedb/native.js lancedb",
|
"build:debug": "napi build --platform --dts ../lancedb/native.d.ts --js ../lancedb/native.js --output-dir lancedb",
|
||||||
"postbuild:debug": "shx mkdir -p dist && shx cp lancedb/*.node dist/",
|
"postbuild:debug": "shx mkdir -p dist && shx cp lancedb/*.node dist/",
|
||||||
"build:release": "napi build --platform --no-const-enum --release --dts ../lancedb/native.d.ts --js ../lancedb/native.js dist/",
|
"build:release": "napi build --platform --release --dts ../lancedb/native.d.ts --js ../lancedb/native.js --output-dir dist",
|
||||||
"postbuild:release": "shx mkdir -p dist && shx cp lancedb/*.node dist/",
|
"postbuild:release": "shx mkdir -p dist && shx cp lancedb/*.node dist/",
|
||||||
"build": "npm run build:debug && npm run tsc",
|
"build": "npm run build:debug && npm run tsc",
|
||||||
"build-release": "npm run build:release && npm run tsc",
|
"build-release": "npm run build:release && npm run tsc",
|
||||||
@@ -91,7 +88,7 @@
|
|||||||
"prepublishOnly": "napi prepublish -t npm",
|
"prepublishOnly": "napi prepublish -t npm",
|
||||||
"test": "jest --verbose",
|
"test": "jest --verbose",
|
||||||
"integration": "S3_TEST=1 npm run test",
|
"integration": "S3_TEST=1 npm run test",
|
||||||
"universal": "napi universal",
|
"universal": "napi universalize",
|
||||||
"version": "napi version"
|
"version": "napi version"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -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};
|
||||||
|
|||||||
@@ -1,20 +1,19 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
use napi::{
|
use napi::{bindgen_prelude::*, threadsafe_function::ThreadsafeFunction};
|
||||||
bindgen_prelude::*,
|
|
||||||
threadsafe_function::{ErrorStrategy, ThreadsafeFunction},
|
|
||||||
};
|
|
||||||
use napi_derive::napi;
|
use napi_derive::napi;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
type GetHeadersFn = ThreadsafeFunction<(), Promise<HashMap<String, String>>, (), Status, false>;
|
||||||
|
|
||||||
/// JavaScript HeaderProvider implementation that wraps a JavaScript callback.
|
/// JavaScript HeaderProvider implementation that wraps a JavaScript callback.
|
||||||
/// This is the only native header provider - all header provider implementations
|
/// This is the only native header provider - all header provider implementations
|
||||||
/// should provide a JavaScript function that returns headers.
|
/// should provide a JavaScript function that returns headers.
|
||||||
#[napi]
|
#[napi]
|
||||||
pub struct JsHeaderProvider {
|
pub struct JsHeaderProvider {
|
||||||
get_headers_fn: Arc<ThreadsafeFunction<(), ErrorStrategy::CalleeHandled>>,
|
get_headers_fn: Arc<GetHeadersFn>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Clone for JsHeaderProvider {
|
impl Clone for JsHeaderProvider {
|
||||||
@@ -29,9 +28,12 @@ impl Clone for JsHeaderProvider {
|
|||||||
impl JsHeaderProvider {
|
impl JsHeaderProvider {
|
||||||
/// Create a new JsHeaderProvider from a JavaScript callback
|
/// Create a new JsHeaderProvider from a JavaScript callback
|
||||||
#[napi(constructor)]
|
#[napi(constructor)]
|
||||||
pub fn new(get_headers_callback: JsFunction) -> Result<Self> {
|
pub fn new(
|
||||||
|
get_headers_callback: Function<(), Promise<HashMap<String, String>>>,
|
||||||
|
) -> Result<Self> {
|
||||||
let get_headers_fn = get_headers_callback
|
let get_headers_fn = get_headers_callback
|
||||||
.create_threadsafe_function(0, |ctx| Ok(vec![ctx.value]))
|
.build_threadsafe_function()
|
||||||
|
.build()
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
Error::new(
|
Error::new(
|
||||||
Status::GenericFailure,
|
Status::GenericFailure,
|
||||||
@@ -51,7 +53,7 @@ impl lancedb::remote::HeaderProvider for JsHeaderProvider {
|
|||||||
async fn get_headers(&self) -> lancedb::error::Result<HashMap<String, String>> {
|
async fn get_headers(&self) -> lancedb::error::Result<HashMap<String, String>> {
|
||||||
// Call the JavaScript function asynchronously
|
// Call the JavaScript function asynchronously
|
||||||
let promise: Promise<HashMap<String, String>> =
|
let promise: Promise<HashMap<String, String>> =
|
||||||
self.get_headers_fn.call_async(Ok(())).await.map_err(|e| {
|
self.get_headers_fn.call_async(()).await.map_err(|e| {
|
||||||
lancedb::error::Error::Runtime {
|
lancedb::error::Error::Runtime {
|
||||||
message: format!("Failed to call JavaScript get_headers: {}", e),
|
message: format!("Failed to call JavaScript get_headers: {}", e),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ pub struct OpenTableOptions {
|
|||||||
pub storage_options: Option<HashMap<String, String>>,
|
pub storage_options: Option<HashMap<String, String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[napi::module_init]
|
#[napi_derive::module_init]
|
||||||
fn init() {
|
fn init() {
|
||||||
let env = Env::new()
|
let env = Env::new()
|
||||||
.filter_or("LANCEDB_LOG", "warn")
|
.filter_or("LANCEDB_LOG", "warn")
|
||||||
|
|||||||
@@ -17,11 +17,11 @@ 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::Reranker;
|
use crate::rerankers::Reranker;
|
||||||
use crate::rerankers::RerankerCallbacks;
|
|
||||||
use crate::util::{parse_distance_type, schema_to_buffer};
|
use crate::util::{parse_distance_type, schema_to_buffer};
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
@@ -42,7 +42,7 @@ impl Query {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
pub fn full_text_search(&mut self, query: napi::JsObject) -> napi::Result<()> {
|
pub fn full_text_search(&mut self, query: Object) -> napi::Result<()> {
|
||||||
let query = parse_fts_query(query)?;
|
let query = parse_fts_query(query)?;
|
||||||
self.inner = self.inner.clone().full_text_search(query);
|
self.inner = self.inner.clone().full_text_search(query);
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -235,7 +235,7 @@ impl VectorQuery {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
pub fn full_text_search(&mut self, query: napi::JsObject) -> napi::Result<()> {
|
pub fn full_text_search(&mut self, query: Object) -> napi::Result<()> {
|
||||||
let query = parse_fts_query(query)?;
|
let query = parse_fts_query(query)?;
|
||||||
self.inner = self.inner.clone().full_text_search(query);
|
self.inner = self.inner.clone().full_text_search(query);
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -272,11 +272,13 @@ impl VectorQuery {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[napi]
|
#[napi]
|
||||||
pub fn rerank(&mut self, callbacks: RerankerCallbacks) {
|
pub fn rerank(
|
||||||
self.inner = self
|
&mut self,
|
||||||
.inner
|
rerank_hybrid: Function<RerankHybridCallbackArgs, Promise<Buffer>>,
|
||||||
.clone()
|
) -> napi::Result<()> {
|
||||||
.rerank(Arc::new(Reranker::new(callbacks)));
|
let reranker = Reranker::new(rerank_hybrid)?;
|
||||||
|
self.inner = self.inner.clone().rerank(Arc::new(reranker));
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[napi(catch_unwind)]
|
#[napi(catch_unwind)]
|
||||||
@@ -523,12 +525,12 @@ impl JsFullTextQuery {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_fts_query(query: napi::JsObject) -> napi::Result<FullTextSearchQuery> {
|
fn parse_fts_query(query: Object) -> napi::Result<FullTextSearchQuery> {
|
||||||
if let Ok(Some(query)) = query.get::<_, &JsFullTextQuery>("query") {
|
if let Ok(Some(query)) = query.get::<&JsFullTextQuery>("query") {
|
||||||
Ok(FullTextSearchQuery::new_query(query.inner.clone()))
|
Ok(FullTextSearchQuery::new_query(query.inner.clone()))
|
||||||
} else if let Ok(Some(query_text)) = query.get::<_, String>("query") {
|
} else if let Ok(Some(query_text)) = query.get::<String>("query") {
|
||||||
let mut query_text = query_text;
|
let mut query_text = query_text;
|
||||||
let columns = query.get::<_, Option<Vec<String>>>("columns")?.flatten();
|
let columns = query.get::<Option<Vec<String>>>("columns")?.flatten();
|
||||||
|
|
||||||
let is_phrase =
|
let is_phrase =
|
||||||
query_text.len() >= 2 && query_text.starts_with('"') && query_text.ends_with('"');
|
query_text.len() >= 2 && query_text.starts_with('"') && query_text.ends_with('"');
|
||||||
@@ -549,15 +551,12 @@ fn parse_fts_query(query: napi::JsObject) -> 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 {
|
||||||
|
|||||||
@@ -3,10 +3,7 @@
|
|||||||
|
|
||||||
use arrow_array::RecordBatch;
|
use arrow_array::RecordBatch;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use napi::{
|
use napi::{bindgen_prelude::*, threadsafe_function::ThreadsafeFunction};
|
||||||
bindgen_prelude::*,
|
|
||||||
threadsafe_function::{ErrorStrategy, ThreadsafeFunction},
|
|
||||||
};
|
|
||||||
use napi_derive::napi;
|
use napi_derive::napi;
|
||||||
|
|
||||||
use lancedb::ipc::batches_to_ipc_file;
|
use lancedb::ipc::batches_to_ipc_file;
|
||||||
@@ -15,27 +12,28 @@ use lancedb::{error::Error, ipc::ipc_file_to_batches};
|
|||||||
|
|
||||||
use crate::error::NapiErrorExt;
|
use crate::error::NapiErrorExt;
|
||||||
|
|
||||||
|
type RerankHybridFn = ThreadsafeFunction<
|
||||||
|
RerankHybridCallbackArgs,
|
||||||
|
Promise<Buffer>,
|
||||||
|
RerankHybridCallbackArgs,
|
||||||
|
Status,
|
||||||
|
false,
|
||||||
|
>;
|
||||||
|
|
||||||
/// Reranker implementation that "wraps" a NodeJS Reranker implementation.
|
/// Reranker implementation that "wraps" a NodeJS Reranker implementation.
|
||||||
/// This contains references to the callbacks that can be used to invoke the
|
/// This contains references to the callbacks that can be used to invoke the
|
||||||
/// reranking methods on the NodeJS implementation and handles serializing the
|
/// reranking methods on the NodeJS implementation and handles serializing the
|
||||||
/// record batches to Arrow IPC buffers.
|
/// record batches to Arrow IPC buffers.
|
||||||
#[napi]
|
|
||||||
pub struct Reranker {
|
pub struct Reranker {
|
||||||
/// callback to the Javascript which will call the rerankHybrid method of
|
rerank_hybrid: RerankHybridFn,
|
||||||
/// some Reranker implementation
|
|
||||||
rerank_hybrid: ThreadsafeFunction<RerankHybridCallbackArgs, ErrorStrategy::CalleeHandled>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[napi]
|
|
||||||
impl Reranker {
|
impl Reranker {
|
||||||
#[napi]
|
pub fn new(
|
||||||
pub fn new(callbacks: RerankerCallbacks) -> Self {
|
rerank_hybrid: Function<RerankHybridCallbackArgs, Promise<Buffer>>,
|
||||||
let rerank_hybrid = callbacks
|
) -> napi::Result<Self> {
|
||||||
.rerank_hybrid
|
let rerank_hybrid = rerank_hybrid.build_threadsafe_function().build()?;
|
||||||
.create_threadsafe_function(0, move |ctx| Ok(vec![ctx.value]))
|
Ok(Self { rerank_hybrid })
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
Self { rerank_hybrid }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,16 +47,16 @@ impl lancedb::rerankers::Reranker for Reranker {
|
|||||||
) -> lancedb::error::Result<RecordBatch> {
|
) -> lancedb::error::Result<RecordBatch> {
|
||||||
let callback_args = RerankHybridCallbackArgs {
|
let callback_args = RerankHybridCallbackArgs {
|
||||||
query: query.to_string(),
|
query: query.to_string(),
|
||||||
vec_results: batches_to_ipc_file(&[vector_results])?,
|
vec_results: Buffer::from(batches_to_ipc_file(&[vector_results])?.as_ref()),
|
||||||
fts_results: batches_to_ipc_file(&[fts_results])?,
|
fts_results: Buffer::from(batches_to_ipc_file(&[fts_results])?.as_ref()),
|
||||||
};
|
};
|
||||||
let promised_buffer: Promise<Buffer> = self
|
let promised_buffer: Promise<Buffer> = self
|
||||||
.rerank_hybrid
|
.rerank_hybrid
|
||||||
.call_async(Ok(callback_args))
|
.call_async(callback_args)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| Error::Runtime {
|
.map_err(|e| Error::Runtime {
|
||||||
message: format!("napi error status={}, reason={}", e.status, e.reason),
|
message: format!("napi error status={}, reason={}", e.status, e.reason),
|
||||||
})?;
|
})?;
|
||||||
let buffer = promised_buffer.await.map_err(|e| Error::Runtime {
|
let buffer = promised_buffer.await.map_err(|e| Error::Runtime {
|
||||||
message: format!("napi error status={}, reason={}", e.status, e.reason),
|
message: format!("napi error status={}, reason={}", e.status, e.reason),
|
||||||
})?;
|
})?;
|
||||||
@@ -77,16 +75,11 @@ impl std::fmt::Debug for Reranker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[napi(object)]
|
|
||||||
pub struct RerankerCallbacks {
|
|
||||||
pub rerank_hybrid: JsFunction,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[napi(object)]
|
#[napi(object)]
|
||||||
pub struct RerankHybridCallbackArgs {
|
pub struct RerankHybridCallbackArgs {
|
||||||
pub query: String,
|
pub query: String,
|
||||||
pub vec_results: Vec<u8>,
|
pub vec_results: Buffer,
|
||||||
pub fts_results: Vec<u8>,
|
pub fts_results: Buffer,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn buffer_to_record_batch(buffer: Buffer) -> Result<RecordBatch> {
|
fn buffer_to_record_batch(buffer: Buffer) -> Result<RecordBatch> {
|
||||||
|
|||||||
@@ -95,8 +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)? };
|
||||||
let copy = object.clone();
|
Ok((*object).clone())
|
||||||
Ok(copy)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,
|
||||||
@@ -71,6 +71,17 @@ impl Table {
|
|||||||
pub async fn add(&self, buf: Buffer, mode: String) -> napi::Result<AddResult> {
|
pub async fn add(&self, buf: Buffer, mode: String) -> napi::Result<AddResult> {
|
||||||
let batches = ipc_file_to_batches(buf.to_vec())
|
let batches = ipc_file_to_batches(buf.to_vec())
|
||||||
.map_err(|e| napi::Error::from_reason(format!("Failed to read IPC file: {}", e)))?;
|
.map_err(|e| napi::Error::from_reason(format!("Failed to read IPC file: {}", e)))?;
|
||||||
|
let batches = batches
|
||||||
|
.into_iter()
|
||||||
|
.map(|batch| {
|
||||||
|
batch.map_err(|e| {
|
||||||
|
napi::Error::from_reason(format!(
|
||||||
|
"Failed to read record batch from IPC file: {}",
|
||||||
|
e
|
||||||
|
))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect::<Result<Vec<_>>>()?;
|
||||||
let mut op = self.inner_ref()?.add(batches);
|
let mut op = self.inner_ref()?.add(batches);
|
||||||
|
|
||||||
op = if mode == "append" {
|
op = if mode == "append" {
|
||||||
@@ -268,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,
|
||||||
@@ -742,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.0"
|
current_version = "0.30.0"
|
||||||
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*)\\.
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lancedb-python"
|
name = "lancedb-python"
|
||||||
version = "0.30.0-beta.0"
|
version = "0.30.0"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
description = "Python bindings for LanceDB"
|
description = "Python bindings for LanceDB"
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
repository.workspace = true
|
repository.workspace = true
|
||||||
keywords.workspace = true
|
keywords.workspace = true
|
||||||
categories.workspace = true
|
categories.workspace = true
|
||||||
rust-version = "1.88.0"
|
rust-version = "1.91.0"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "_lancedb"
|
name = "_lancedb"
|
||||||
@@ -16,9 +16,11 @@ 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
|
||||||
pyo3 = { version = "0.26", features = ["extension-module", "abi3-py39"] }
|
pyo3 = { version = "0.26", features = ["extension-module", "abi3-py39"] }
|
||||||
@@ -28,6 +30,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",
|
"pylance>=4.0.0b7",
|
||||||
"requests",
|
"requests>=2.31.0",
|
||||||
"datafusion",
|
"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"]
|
||||||
|
|
||||||
|
|||||||
@@ -166,6 +166,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: ...
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
from functools import singledispatch
|
||||||
from typing import List, Optional, Tuple, Union
|
from typing import List, Optional, Tuple, Union
|
||||||
|
|
||||||
|
from lancedb.pydantic import LanceModel, model_to_dict
|
||||||
import pyarrow as pa
|
import pyarrow as pa
|
||||||
|
|
||||||
from ._lancedb import RecordBatchStream
|
from ._lancedb import RecordBatchStream
|
||||||
@@ -80,3 +82,32 @@ def peek_reader(
|
|||||||
yield from reader
|
yield from reader
|
||||||
|
|
||||||
return batch, pa.RecordBatchReader.from_batches(batch.schema, all_batches())
|
return batch, pa.RecordBatchReader.from_batches(batch.schema, all_batches())
|
||||||
|
|
||||||
|
|
||||||
|
@singledispatch
|
||||||
|
def to_arrow(data) -> pa.Table:
|
||||||
|
"""Convert a single data object to a pa.Table."""
|
||||||
|
raise NotImplementedError(f"to_arrow not implemented for type {type(data)}")
|
||||||
|
|
||||||
|
|
||||||
|
@to_arrow.register(pa.RecordBatch)
|
||||||
|
def _arrow_from_batch(data: pa.RecordBatch) -> pa.Table:
|
||||||
|
return pa.Table.from_batches([data])
|
||||||
|
|
||||||
|
|
||||||
|
@to_arrow.register(pa.Table)
|
||||||
|
def _arrow_from_table(data: pa.Table) -> pa.Table:
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
@to_arrow.register(list)
|
||||||
|
def _arrow_from_list(data: list) -> pa.Table:
|
||||||
|
if not data:
|
||||||
|
raise ValueError("Cannot create table from empty list without a schema")
|
||||||
|
|
||||||
|
if isinstance(data[0], LanceModel):
|
||||||
|
schema = data[0].__class__.to_arrow_schema()
|
||||||
|
dicts = [model_to_dict(d) for d in data]
|
||||||
|
return pa.Table.from_pylist(dicts, schema=schema)
|
||||||
|
|
||||||
|
return pa.Table.from_pylist(data)
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
|
||||||
|
import warnings
|
||||||
from typing import List, Union
|
from typing import List, Union
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
@@ -15,6 +16,8 @@ from .utils import weak_lru
|
|||||||
@register("gte-text")
|
@register("gte-text")
|
||||||
class GteEmbeddings(TextEmbeddingFunction):
|
class GteEmbeddings(TextEmbeddingFunction):
|
||||||
"""
|
"""
|
||||||
|
Deprecated: GTE embeddings should be used through sentence-transformers.
|
||||||
|
|
||||||
An embedding function that uses GTE-LARGE MLX format(for Apple silicon devices only)
|
An embedding function that uses GTE-LARGE MLX format(for Apple silicon devices only)
|
||||||
as well as the standard cpu/gpu version from: https://huggingface.co/thenlper/gte-large.
|
as well as the standard cpu/gpu version from: https://huggingface.co/thenlper/gte-large.
|
||||||
|
|
||||||
@@ -61,6 +64,13 @@ class GteEmbeddings(TextEmbeddingFunction):
|
|||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
warnings.warn(
|
||||||
|
"GTE embeddings as a standalone embedding function are deprecated. "
|
||||||
|
"Use the 'sentence-transformers' embedding function with a GTE model "
|
||||||
|
"instead.",
|
||||||
|
DeprecationWarning,
|
||||||
|
stacklevel=3,
|
||||||
|
)
|
||||||
self._ndims = None
|
self._ndims = None
|
||||||
if kwargs:
|
if kwargs:
|
||||||
self.mlx = kwargs.get("mlx", False)
|
self.mlx = kwargs.get("mlx", False)
|
||||||
|
|||||||
@@ -110,6 +110,9 @@ class OpenAIEmbeddings(TextEmbeddingFunction):
|
|||||||
valid_embeddings = {
|
valid_embeddings = {
|
||||||
idx: v.embedding for v, idx in zip(rs.data, valid_indices)
|
idx: v.embedding for v, idx in zip(rs.data, valid_indices)
|
||||||
}
|
}
|
||||||
|
except openai.AuthenticationError:
|
||||||
|
logging.error("Authentication failed: Invalid API key provided")
|
||||||
|
raise
|
||||||
except openai.BadRequestError:
|
except openai.BadRequestError:
|
||||||
logging.exception("Bad request: %s", texts)
|
logging.exception("Bad request: %s", texts)
|
||||||
return [None] * len(texts)
|
return [None] * len(texts)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import io
|
|||||||
import os
|
import os
|
||||||
from typing import TYPE_CHECKING, List, Union
|
from typing import TYPE_CHECKING, List, Union
|
||||||
import urllib.parse as urlparse
|
import urllib.parse as urlparse
|
||||||
|
import warnings
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import pyarrow as pa
|
import pyarrow as pa
|
||||||
@@ -24,6 +25,7 @@ if TYPE_CHECKING:
|
|||||||
|
|
||||||
@register("siglip")
|
@register("siglip")
|
||||||
class SigLipEmbeddings(EmbeddingFunction):
|
class SigLipEmbeddings(EmbeddingFunction):
|
||||||
|
# Deprecated: prefer CLIP embeddings via `open-clip`.
|
||||||
model_name: str = "google/siglip-base-patch16-224"
|
model_name: str = "google/siglip-base-patch16-224"
|
||||||
device: str = "cpu"
|
device: str = "cpu"
|
||||||
batch_size: int = 64
|
batch_size: int = 64
|
||||||
@@ -36,6 +38,12 @@ class SigLipEmbeddings(EmbeddingFunction):
|
|||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
warnings.warn(
|
||||||
|
"SigLip embeddings are deprecated. Use CLIP embeddings via the "
|
||||||
|
"'open-clip' embedding function instead.",
|
||||||
|
DeprecationWarning,
|
||||||
|
stacklevel=3,
|
||||||
|
)
|
||||||
transformers = attempt_import_or_raise("transformers")
|
transformers = attempt_import_or_raise("transformers")
|
||||||
self._torch = attempt_import_or_raise("torch")
|
self._torch = attempt_import_or_raise("torch")
|
||||||
|
|
||||||
|
|||||||
@@ -269,6 +269,11 @@ def retry_with_exponential_backoff(
|
|||||||
# and say that it is assumed that if this portion errors out, it's due
|
# and say that it is assumed that if this portion errors out, it's due
|
||||||
# to rate limit but the user should check the error message to be sure.
|
# to rate limit but the user should check the error message to be sure.
|
||||||
except Exception as e: # noqa: PERF203
|
except Exception as e: # noqa: PERF203
|
||||||
|
# Don't retry on authentication errors (e.g., OpenAI 401)
|
||||||
|
# These are permanent failures that won't be fixed by retrying
|
||||||
|
if _is_non_retryable_error(e):
|
||||||
|
raise
|
||||||
|
|
||||||
num_retries += 1
|
num_retries += 1
|
||||||
|
|
||||||
if num_retries > max_retries:
|
if num_retries > max_retries:
|
||||||
@@ -289,6 +294,29 @@ def retry_with_exponential_backoff(
|
|||||||
return wrapper
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
|
def _is_non_retryable_error(error: Exception) -> bool:
|
||||||
|
"""Check if an error should not be retried.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
error: The exception to check
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if the error should not be retried, False otherwise
|
||||||
|
"""
|
||||||
|
# Check for OpenAI authentication errors
|
||||||
|
error_type = type(error).__name__
|
||||||
|
if error_type == "AuthenticationError":
|
||||||
|
return True
|
||||||
|
|
||||||
|
# Check for other common non-retryable HTTP status codes
|
||||||
|
# 401 Unauthorized, 403 Forbidden
|
||||||
|
if hasattr(error, "status_code"):
|
||||||
|
if error.status_code in (401, 403):
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def url_retrieve(url: str):
|
def url_retrieve(url: str):
|
||||||
"""
|
"""
|
||||||
Parameters
|
Parameters
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -44,7 +44,7 @@ from lance_namespace import (
|
|||||||
ListNamespacesRequest,
|
ListNamespacesRequest,
|
||||||
CreateNamespaceRequest,
|
CreateNamespaceRequest,
|
||||||
DropNamespaceRequest,
|
DropNamespaceRequest,
|
||||||
CreateEmptyTableRequest,
|
DeclareTableRequest,
|
||||||
)
|
)
|
||||||
from lancedb.table import AsyncTable, LanceTable, Table
|
from lancedb.table import AsyncTable, LanceTable, Table
|
||||||
from lancedb.util import validate_table_name
|
from lancedb.util import validate_table_name
|
||||||
@@ -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:
|
||||||
@@ -318,20 +320,20 @@ class LanceNamespaceDBConnection(DBConnection):
|
|||||||
|
|
||||||
if location is None:
|
if location is None:
|
||||||
# Table doesn't exist or mode is "create", reserve a new location
|
# Table doesn't exist or mode is "create", reserve a new location
|
||||||
create_empty_request = CreateEmptyTableRequest(
|
declare_request = DeclareTableRequest(
|
||||||
id=table_id,
|
id=table_id,
|
||||||
location=None,
|
location=None,
|
||||||
properties=self.storage_options if self.storage_options else None,
|
properties=self.storage_options if self.storage_options else None,
|
||||||
)
|
)
|
||||||
create_empty_response = self._ns.create_empty_table(create_empty_request)
|
declare_response = self._namespace_client.declare_table(declare_request)
|
||||||
|
|
||||||
if not create_empty_response.location:
|
if not declare_response.location:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"Table location is missing from create_empty_table response"
|
"Table location is missing from declare_table response"
|
||||||
)
|
)
|
||||||
|
|
||||||
location = create_empty_response.location
|
location = declare_response.location
|
||||||
namespace_storage_options = create_empty_response.storage_options
|
namespace_storage_options = declare_response.storage_options
|
||||||
|
|
||||||
# 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)
|
||||||
@@ -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:
|
||||||
@@ -759,20 +776,20 @@ class AsyncLanceNamespaceDBConnection:
|
|||||||
|
|
||||||
if location is None:
|
if location is None:
|
||||||
# Table doesn't exist or mode is "create", reserve a new location
|
# Table doesn't exist or mode is "create", reserve a new location
|
||||||
create_empty_request = CreateEmptyTableRequest(
|
declare_request = DeclareTableRequest(
|
||||||
id=table_id,
|
id=table_id,
|
||||||
location=None,
|
location=None,
|
||||||
properties=self.storage_options if self.storage_options else None,
|
properties=self.storage_options if self.storage_options else None,
|
||||||
)
|
)
|
||||||
create_empty_response = self._ns.create_empty_table(create_empty_request)
|
declare_response = self._namespace_client.declare_table(declare_request)
|
||||||
|
|
||||||
if not create_empty_response.location:
|
if not declare_response.location:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"Table location is missing from create_empty_table response"
|
"Table location is missing from declare_table response"
|
||||||
)
|
)
|
||||||
|
|
||||||
location = create_empty_response.location
|
location = declare_response.location
|
||||||
namespace_storage_options = create_empty_response.storage_options
|
namespace_storage_options = declare_response.storage_options
|
||||||
|
|
||||||
# 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)
|
||||||
@@ -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,
|
||||||
|
|||||||
@@ -606,6 +606,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):
|
||||||
@@ -1456,12 +1457,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 = 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
|
||||||
@@ -1483,6 +1486,19 @@ class LanceFtsQueryBuilder(LanceQueryBuilder):
|
|||||||
self._phrase_query = phrase_query
|
self._phrase_query = phrase_query
|
||||||
return self
|
return self
|
||||||
|
|
||||||
|
def fast_search(self) -> LanceFtsQueryBuilder:
|
||||||
|
"""
|
||||||
|
Skip a flat search of unindexed data. This will improve
|
||||||
|
search performance but search results will not include unindexed data.
|
||||||
|
|
||||||
|
Returns
|
||||||
|
-------
|
||||||
|
LanceFtsQueryBuilder
|
||||||
|
The LanceFtsQueryBuilder object.
|
||||||
|
"""
|
||||||
|
self._fast_search = True
|
||||||
|
return self
|
||||||
|
|
||||||
def to_query_object(self) -> Query:
|
def to_query_object(self) -> Query:
|
||||||
return Query(
|
return Query(
|
||||||
columns=self._columns,
|
columns=self._columns,
|
||||||
@@ -1494,6 +1510,7 @@ class LanceFtsQueryBuilder(LanceQueryBuilder):
|
|||||||
query=self._query, columns=self._fts_columns
|
query=self._query, columns=self._fts_columns
|
||||||
),
|
),
|
||||||
offset=self._offset,
|
offset=self._offset,
|
||||||
|
fast_search=self._fast_search,
|
||||||
)
|
)
|
||||||
|
|
||||||
def output_schema(self) -> pa.Schema:
|
def output_schema(self) -> pa.Schema:
|
||||||
@@ -1782,6 +1799,26 @@ class LanceHybridQueryBuilder(LanceQueryBuilder):
|
|||||||
vector_results = LanceHybridQueryBuilder._rank(vector_results, "_distance")
|
vector_results = LanceHybridQueryBuilder._rank(vector_results, "_distance")
|
||||||
fts_results = LanceHybridQueryBuilder._rank(fts_results, "_score")
|
fts_results = LanceHybridQueryBuilder._rank(fts_results, "_score")
|
||||||
|
|
||||||
|
# If both result sets are empty (e.g. after hard filtering),
|
||||||
|
# return early to avoid errors in reranking or score restoration.
|
||||||
|
if vector_results.num_rows == 0 and fts_results.num_rows == 0:
|
||||||
|
# Build a minimal empty table with the _relevance_score column
|
||||||
|
combined_schema = pa.unify_schemas(
|
||||||
|
[vector_results.schema, fts_results.schema],
|
||||||
|
)
|
||||||
|
empty = pa.table(
|
||||||
|
{
|
||||||
|
col: pa.array([], type=combined_schema.field(col).type)
|
||||||
|
for col in combined_schema.names
|
||||||
|
}
|
||||||
|
)
|
||||||
|
empty = empty.append_column(
|
||||||
|
"_relevance_score", pa.array([], type=pa.float32())
|
||||||
|
)
|
||||||
|
if not with_row_ids and "_rowid" in empty.column_names:
|
||||||
|
empty = empty.drop(["_rowid"])
|
||||||
|
return empty
|
||||||
|
|
||||||
original_distances = None
|
original_distances = None
|
||||||
original_scores = None
|
original_scores = None
|
||||||
original_distance_row_ids = None
|
original_distance_row_ids = None
|
||||||
|
|||||||
@@ -218,8 +218,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 +248,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."
|
||||||
@@ -647,6 +640,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)
|
||||||
):
|
):
|
||||||
|
|||||||
214
python/python/lancedb/scannable.py
Normal file
214
python/python/lancedb/scannable.py
Normal file
@@ -0,0 +1,214 @@
|
|||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from functools import singledispatch
|
||||||
|
import sys
|
||||||
|
from typing import Callable, Iterator, Optional
|
||||||
|
from lancedb.arrow import to_arrow
|
||||||
|
import pyarrow as pa
|
||||||
|
import pyarrow.dataset as ds
|
||||||
|
|
||||||
|
from .pydantic import LanceModel
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Scannable:
|
||||||
|
schema: pa.Schema
|
||||||
|
num_rows: Optional[int]
|
||||||
|
# Factory function to create a new reader each time (supports re-scanning)
|
||||||
|
reader: Callable[[], pa.RecordBatchReader]
|
||||||
|
# Whether reader can be called more than once. For example, an iterator can
|
||||||
|
# only be consumed once, while a DataFrame can be converted to a new reader
|
||||||
|
# each time.
|
||||||
|
rescannable: bool = True
|
||||||
|
|
||||||
|
|
||||||
|
@singledispatch
|
||||||
|
def to_scannable(data) -> Scannable:
|
||||||
|
# Fallback: try iterable protocol
|
||||||
|
if hasattr(data, "__iter__"):
|
||||||
|
return _from_iterable(iter(data))
|
||||||
|
raise NotImplementedError(f"to_scannable not implemented for type {type(data)}")
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(pa.RecordBatchReader)
|
||||||
|
def _from_reader(data: pa.RecordBatchReader) -> Scannable:
|
||||||
|
# RecordBatchReader can only be consumed once - not rescannable
|
||||||
|
return Scannable(
|
||||||
|
schema=data.schema, num_rows=None, reader=lambda: data, rescannable=False
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(pa.RecordBatch)
|
||||||
|
def _from_batch(data: pa.RecordBatch) -> Scannable:
|
||||||
|
return Scannable(
|
||||||
|
schema=data.schema,
|
||||||
|
num_rows=data.num_rows,
|
||||||
|
reader=lambda: pa.RecordBatchReader.from_batches(data.schema, [data]),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(pa.Table)
|
||||||
|
def _from_table(data: pa.Table) -> Scannable:
|
||||||
|
return Scannable(schema=data.schema, num_rows=data.num_rows, reader=data.to_reader)
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(ds.Dataset)
|
||||||
|
def _from_dataset(data: ds.Dataset) -> Scannable:
|
||||||
|
return Scannable(
|
||||||
|
schema=data.schema,
|
||||||
|
num_rows=data.count_rows(),
|
||||||
|
reader=lambda: data.scanner().to_reader(),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(ds.Scanner)
|
||||||
|
def _from_scanner(data: ds.Scanner) -> Scannable:
|
||||||
|
# Scanner can only be consumed once - not rescannable
|
||||||
|
return Scannable(
|
||||||
|
schema=data.projected_schema,
|
||||||
|
num_rows=None,
|
||||||
|
reader=data.to_reader,
|
||||||
|
rescannable=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(list)
|
||||||
|
def _from_list(data: list) -> Scannable:
|
||||||
|
if not data:
|
||||||
|
raise ValueError("Cannot create table from empty list without a schema")
|
||||||
|
table = to_arrow(data)
|
||||||
|
return Scannable(
|
||||||
|
schema=table.schema, num_rows=table.num_rows, reader=table.to_reader
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(dict)
|
||||||
|
def _from_dict(data: dict) -> Scannable:
|
||||||
|
raise ValueError("Cannot add a single dictionary to a table. Use a list.")
|
||||||
|
|
||||||
|
|
||||||
|
@to_scannable.register(LanceModel)
|
||||||
|
def _from_lance_model(data: LanceModel) -> Scannable:
|
||||||
|
raise ValueError("Cannot add a single LanceModel to a table. Use a list.")
|
||||||
|
|
||||||
|
|
||||||
|
def _from_iterable(data: Iterator) -> Scannable:
|
||||||
|
first_item = next(data, None)
|
||||||
|
if first_item is None:
|
||||||
|
raise ValueError("Cannot create table from empty iterator")
|
||||||
|
first = to_arrow(first_item)
|
||||||
|
schema = first.schema
|
||||||
|
|
||||||
|
def iter():
|
||||||
|
yield from first.to_batches()
|
||||||
|
for item in data:
|
||||||
|
batch = to_arrow(item)
|
||||||
|
if batch.schema != schema:
|
||||||
|
try:
|
||||||
|
batch = batch.cast(schema)
|
||||||
|
except pa.lib.ArrowInvalid:
|
||||||
|
raise ValueError(
|
||||||
|
f"Input iterator yielded a batch with schema that "
|
||||||
|
f"does not match the schema of other batches.\n"
|
||||||
|
f"Expected:\n{schema}\nGot:\n{batch.schema}"
|
||||||
|
)
|
||||||
|
yield from batch.to_batches()
|
||||||
|
|
||||||
|
reader = pa.RecordBatchReader.from_batches(schema, iter())
|
||||||
|
return to_scannable(reader)
|
||||||
|
|
||||||
|
|
||||||
|
_registered_modules: set[str] = set()
|
||||||
|
|
||||||
|
|
||||||
|
def _register_optional_converters():
|
||||||
|
"""Register converters for optional dependencies that are already imported."""
|
||||||
|
|
||||||
|
if "pandas" in sys.modules and "pandas" not in _registered_modules:
|
||||||
|
_registered_modules.add("pandas")
|
||||||
|
import pandas as pd
|
||||||
|
|
||||||
|
@to_arrow.register(pd.DataFrame)
|
||||||
|
def _arrow_from_pandas(data: pd.DataFrame) -> pa.Table:
|
||||||
|
table = pa.Table.from_pandas(data, preserve_index=False)
|
||||||
|
return table.replace_schema_metadata(None)
|
||||||
|
|
||||||
|
@to_scannable.register(pd.DataFrame)
|
||||||
|
def _from_pandas(data: pd.DataFrame) -> Scannable:
|
||||||
|
return to_scannable(_arrow_from_pandas(data))
|
||||||
|
|
||||||
|
if "polars" in sys.modules and "polars" not in _registered_modules:
|
||||||
|
_registered_modules.add("polars")
|
||||||
|
import polars as pl
|
||||||
|
|
||||||
|
@to_arrow.register(pl.DataFrame)
|
||||||
|
def _arrow_from_polars(data: pl.DataFrame) -> pa.Table:
|
||||||
|
return data.to_arrow()
|
||||||
|
|
||||||
|
@to_scannable.register(pl.DataFrame)
|
||||||
|
def _from_polars(data: pl.DataFrame) -> Scannable:
|
||||||
|
arrow = data.to_arrow()
|
||||||
|
return Scannable(
|
||||||
|
schema=arrow.schema, num_rows=len(data), reader=arrow.to_reader
|
||||||
|
)
|
||||||
|
|
||||||
|
@to_scannable.register(pl.LazyFrame)
|
||||||
|
def _from_polars_lazy(data: pl.LazyFrame) -> Scannable:
|
||||||
|
arrow = data.collect().to_arrow()
|
||||||
|
return Scannable(
|
||||||
|
schema=arrow.schema, num_rows=arrow.num_rows, reader=arrow.to_reader
|
||||||
|
)
|
||||||
|
|
||||||
|
if "datasets" in sys.modules and "datasets" not in _registered_modules:
|
||||||
|
_registered_modules.add("datasets")
|
||||||
|
from datasets import Dataset as HFDataset
|
||||||
|
from datasets import DatasetDict as HFDatasetDict
|
||||||
|
|
||||||
|
@to_scannable.register(HFDataset)
|
||||||
|
def _from_hf_dataset(data: HFDataset) -> Scannable:
|
||||||
|
table = data.data.table # Access underlying Arrow table
|
||||||
|
return Scannable(
|
||||||
|
schema=table.schema, num_rows=len(data), reader=table.to_reader
|
||||||
|
)
|
||||||
|
|
||||||
|
@to_scannable.register(HFDatasetDict)
|
||||||
|
def _from_hf_dataset_dict(data: HFDatasetDict) -> Scannable:
|
||||||
|
# HuggingFace DatasetDict: combine all splits with a 'split' column
|
||||||
|
schema = data[list(data.keys())[0]].features.arrow_schema
|
||||||
|
if "split" not in schema.names:
|
||||||
|
schema = schema.append(pa.field("split", pa.string()))
|
||||||
|
|
||||||
|
def gen():
|
||||||
|
for split_name, dataset in data.items():
|
||||||
|
for batch in dataset.data.to_batches():
|
||||||
|
split_arr = pa.array(
|
||||||
|
[split_name] * len(batch), type=pa.string()
|
||||||
|
)
|
||||||
|
yield pa.RecordBatch.from_arrays(
|
||||||
|
list(batch.columns) + [split_arr], schema=schema
|
||||||
|
)
|
||||||
|
|
||||||
|
total_rows = sum(len(dataset) for dataset in data.values())
|
||||||
|
return Scannable(
|
||||||
|
schema=schema,
|
||||||
|
num_rows=total_rows,
|
||||||
|
reader=lambda: pa.RecordBatchReader.from_batches(schema, gen()),
|
||||||
|
)
|
||||||
|
|
||||||
|
if "lance" in sys.modules and "lance" not in _registered_modules:
|
||||||
|
_registered_modules.add("lance")
|
||||||
|
import lance
|
||||||
|
|
||||||
|
@to_scannable.register(lance.LanceDataset)
|
||||||
|
def _from_lance(data: lance.LanceDataset) -> Scannable:
|
||||||
|
return Scannable(
|
||||||
|
schema=data.schema,
|
||||||
|
num_rows=data.count_rows(),
|
||||||
|
reader=lambda: data.scanner().to_reader(),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# Register on module load
|
||||||
|
_register_optional_converters()
|
||||||
@@ -25,6 +25,8 @@ from typing import (
|
|||||||
)
|
)
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
from lancedb.scannable import _register_optional_converters, to_scannable
|
||||||
|
|
||||||
from . import __version__
|
from . import __version__
|
||||||
from lancedb.arrow import peek_reader
|
from lancedb.arrow import peek_reader
|
||||||
from lancedb.background_loop import LOOP
|
from lancedb.background_loop import LOOP
|
||||||
@@ -1329,7 +1331,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]
|
||||||
@@ -1343,7 +1345,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]
|
||||||
@@ -1504,22 +1506,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
|
||||||
@@ -1744,6 +1741,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:
|
||||||
@@ -1751,6 +1750,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:
|
||||||
@@ -1762,6 +1762,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,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1804,6 +1806,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 = []
|
||||||
@@ -1815,6 +1819,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
|
||||||
@@ -1846,6 +1852,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,
|
||||||
@@ -2198,12 +2214,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
|
||||||
----------
|
----------
|
||||||
@@ -2212,6 +2234,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:
|
||||||
@@ -2711,6 +2756,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.
|
||||||
@@ -2771,6 +2817,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(
|
||||||
@@ -2995,22 +3042,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
|
||||||
@@ -3611,19 +3653,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:
|
||||||
@@ -3727,18 +3797,31 @@ class AsyncTable:
|
|||||||
on_bad_vectors = "error"
|
on_bad_vectors = "error"
|
||||||
if fill_value is None:
|
if fill_value is None:
|
||||||
fill_value = 0.0
|
fill_value = 0.0
|
||||||
data = _sanitize_data(
|
|
||||||
data,
|
|
||||||
schema,
|
|
||||||
metadata=schema.metadata,
|
|
||||||
on_bad_vectors=on_bad_vectors,
|
|
||||||
fill_value=fill_value,
|
|
||||||
allow_subschema=True,
|
|
||||||
)
|
|
||||||
if isinstance(data, pa.Table):
|
|
||||||
data = data.to_reader()
|
|
||||||
|
|
||||||
return await self._inner.add(data, mode or "append")
|
# _santitize_data is an old code path, but we will use it until the
|
||||||
|
# new code path is ready.
|
||||||
|
if on_bad_vectors != "error" or (
|
||||||
|
schema.metadata is not None and b"embedding_functions" in schema.metadata
|
||||||
|
):
|
||||||
|
data = _sanitize_data(
|
||||||
|
data,
|
||||||
|
schema,
|
||||||
|
metadata=schema.metadata,
|
||||||
|
on_bad_vectors=on_bad_vectors,
|
||||||
|
fill_value=fill_value,
|
||||||
|
allow_subschema=True,
|
||||||
|
)
|
||||||
|
_register_optional_converters()
|
||||||
|
data = to_scannable(data)
|
||||||
|
try:
|
||||||
|
return await self._inner.add(data, mode or "append")
|
||||||
|
except RuntimeError as e:
|
||||||
|
if "Cast error" in str(e):
|
||||||
|
raise ValueError(e)
|
||||||
|
elif "Vector column contains NaN" in str(e):
|
||||||
|
raise ValueError(e)
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
def merge_insert(self, on: Union[str, Iterable[str]]) -> LanceMergeInsertBuilder:
|
def merge_insert(self, on: Union[str, Iterable[str]]) -> LanceMergeInsertBuilder:
|
||||||
"""
|
"""
|
||||||
@@ -4200,7 +4283,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]
|
||||||
@@ -4214,7 +4297,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]
|
||||||
@@ -4537,22 +4620,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
|
||||||
|
|||||||
@@ -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())
|
||||||
|
|||||||
@@ -515,3 +515,34 @@ def test_openai_propagates_api_key(monkeypatch):
|
|||||||
query = "greetings"
|
query = "greetings"
|
||||||
actual = table.search(query).limit(1).to_pydantic(Words)[0]
|
actual = table.search(query).limit(1).to_pydantic(Words)[0]
|
||||||
assert len(actual.text) > 0
|
assert len(actual.text) > 0
|
||||||
|
|
||||||
|
|
||||||
|
@patch("time.sleep")
|
||||||
|
def test_openai_no_retry_on_401(mock_sleep):
|
||||||
|
"""
|
||||||
|
Test that OpenAI embedding function does not retry on 401 authentication
|
||||||
|
errors.
|
||||||
|
"""
|
||||||
|
from lancedb.embeddings.utils import retry_with_exponential_backoff
|
||||||
|
|
||||||
|
# Create a mock that raises an AuthenticationError
|
||||||
|
class MockAuthenticationError(Exception):
|
||||||
|
"""Mock OpenAI AuthenticationError"""
|
||||||
|
|
||||||
|
pass
|
||||||
|
|
||||||
|
MockAuthenticationError.__name__ = "AuthenticationError"
|
||||||
|
|
||||||
|
mock_func = MagicMock(side_effect=MockAuthenticationError("Invalid API key"))
|
||||||
|
|
||||||
|
# Wrap the function with retry logic
|
||||||
|
wrapped_func = retry_with_exponential_backoff(mock_func, max_retries=3)
|
||||||
|
|
||||||
|
# Should raise without retrying
|
||||||
|
with pytest.raises(MockAuthenticationError):
|
||||||
|
wrapped_func()
|
||||||
|
|
||||||
|
# Verify that the function was only called once (no retries)
|
||||||
|
assert mock_func.call_count == 1
|
||||||
|
# Verify that sleep was never called (no retries)
|
||||||
|
assert mock_sleep.call_count == 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
|
||||||
@@ -882,3 +883,109 @@ def test_fts_query_to_json():
|
|||||||
'"must_not":[]}}'
|
'"must_not":[]}}'
|
||||||
)
|
)
|
||||||
assert json_str == expected
|
assert json_str == expected
|
||||||
|
|
||||||
|
|
||||||
|
def test_fts_fast_search(table):
|
||||||
|
table.create_fts_index("text", use_tantivy=False)
|
||||||
|
|
||||||
|
# Insert some unindexed data
|
||||||
|
table.add(
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"text": "xyz",
|
||||||
|
"vector": [0 for _ in range(128)],
|
||||||
|
"id": 101,
|
||||||
|
"text2": "xyz",
|
||||||
|
"nested": {"text": "xyz"},
|
||||||
|
"count": 10,
|
||||||
|
}
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
# Without fast_search, the query object should not have fast_search set
|
||||||
|
builder = table.search("xyz", query_type="fts").limit(10)
|
||||||
|
query = builder.to_query_object()
|
||||||
|
assert query.fast_search is None
|
||||||
|
|
||||||
|
# With fast_search, the query object should have fast_search=True
|
||||||
|
builder = table.search("xyz", query_type="fts").fast_search().limit(10)
|
||||||
|
query = builder.to_query_object()
|
||||||
|
assert query.fast_search is True
|
||||||
|
|
||||||
|
# fast_search should be chainable with other methods
|
||||||
|
builder = (
|
||||||
|
table.search("xyz", query_type="fts").fast_search().select(["text"]).limit(5)
|
||||||
|
)
|
||||||
|
query = builder.to_query_object()
|
||||||
|
assert query.fast_search is True
|
||||||
|
assert query.limit == 5
|
||||||
|
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
|
||||||
|
results = table.search("xyz", query_type="fts").fast_search().limit(5).to_list()
|
||||||
|
assert len(results) == 0
|
||||||
|
|
||||||
|
# Update index and verify it returns results
|
||||||
|
table.optimize()
|
||||||
|
results = table.search("xyz", query_type="fts").fast_search().limit(5).to_list()
|
||||||
|
assert len(results) > 0
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_fts_fast_search_async(async_table):
|
||||||
|
await async_table.create_index("text", config=FTS())
|
||||||
|
|
||||||
|
# Insert some unindexed data
|
||||||
|
await async_table.add(
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"text": "xyz",
|
||||||
|
"vector": [0 for _ in range(128)],
|
||||||
|
"id": 101,
|
||||||
|
"text2": "xyz",
|
||||||
|
"nested": {"text": "xyz"},
|
||||||
|
"count": 10,
|
||||||
|
}
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
# Without fast_search, should return results
|
||||||
|
results = await async_table.query().nearest_to_text("xyz").limit(5).to_list()
|
||||||
|
assert len(results) > 0
|
||||||
|
|
||||||
|
# With fast_search, should return no results data unindexed
|
||||||
|
fast_results = (
|
||||||
|
await async_table.query()
|
||||||
|
.nearest_to_text("xyz")
|
||||||
|
.fast_search()
|
||||||
|
.limit(5)
|
||||||
|
.to_list()
|
||||||
|
)
|
||||||
|
assert len(fast_results) == 0
|
||||||
|
|
||||||
|
# Update index and verify it returns results
|
||||||
|
await async_table.optimize()
|
||||||
|
|
||||||
|
fast_results = (
|
||||||
|
await async_table.query()
|
||||||
|
.nearest_to_text("xyz")
|
||||||
|
.fast_search()
|
||||||
|
.limit(5)
|
||||||
|
.to_list()
|
||||||
|
)
|
||||||
|
assert len(fast_results) > 0
|
||||||
|
|
||||||
|
# fast_search should be chainable with other methods
|
||||||
|
results = (
|
||||||
|
await async_table.query()
|
||||||
|
.nearest_to_text("xyz")
|
||||||
|
.fast_search()
|
||||||
|
.select(["text"])
|
||||||
|
.limit(5)
|
||||||
|
.to_list()
|
||||||
|
)
|
||||||
|
assert len(results) > 0
|
||||||
|
|||||||
@@ -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}"
|
||||||
|
|||||||
@@ -531,6 +531,78 @@ def test_empty_result_reranker():
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_empty_hybrid_result_reranker():
|
||||||
|
"""Test that hybrid search with empty results after filtering doesn't crash.
|
||||||
|
|
||||||
|
Regression test for https://github.com/lancedb/lancedb/issues/2425
|
||||||
|
"""
|
||||||
|
from lancedb.query import LanceHybridQueryBuilder
|
||||||
|
|
||||||
|
# Simulate empty vector and FTS results with the expected schema
|
||||||
|
vector_schema = pa.schema(
|
||||||
|
[
|
||||||
|
("text", pa.string()),
|
||||||
|
("vector", pa.list_(pa.float32(), 4)),
|
||||||
|
("_rowid", pa.uint64()),
|
||||||
|
("_distance", pa.float32()),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
fts_schema = pa.schema(
|
||||||
|
[
|
||||||
|
("text", pa.string()),
|
||||||
|
("vector", pa.list_(pa.float32(), 4)),
|
||||||
|
("_rowid", pa.uint64()),
|
||||||
|
("_score", pa.float32()),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
empty_vector = pa.table(
|
||||||
|
{
|
||||||
|
"text": pa.array([], type=pa.string()),
|
||||||
|
"vector": pa.array([], type=pa.list_(pa.float32(), 4)),
|
||||||
|
"_rowid": pa.array([], type=pa.uint64()),
|
||||||
|
"_distance": pa.array([], type=pa.float32()),
|
||||||
|
},
|
||||||
|
schema=vector_schema,
|
||||||
|
)
|
||||||
|
empty_fts = pa.table(
|
||||||
|
{
|
||||||
|
"text": pa.array([], type=pa.string()),
|
||||||
|
"vector": pa.array([], type=pa.list_(pa.float32(), 4)),
|
||||||
|
"_rowid": pa.array([], type=pa.uint64()),
|
||||||
|
"_score": pa.array([], type=pa.float32()),
|
||||||
|
},
|
||||||
|
schema=fts_schema,
|
||||||
|
)
|
||||||
|
|
||||||
|
for reranker in [LinearCombinationReranker(), RRFReranker()]:
|
||||||
|
result = LanceHybridQueryBuilder._combine_hybrid_results(
|
||||||
|
fts_results=empty_fts,
|
||||||
|
vector_results=empty_vector,
|
||||||
|
norm="score",
|
||||||
|
fts_query="nonexistent query",
|
||||||
|
reranker=reranker,
|
||||||
|
limit=10,
|
||||||
|
with_row_ids=False,
|
||||||
|
)
|
||||||
|
assert len(result) == 0
|
||||||
|
assert "_relevance_score" in result.column_names
|
||||||
|
assert "_rowid" not in result.column_names
|
||||||
|
|
||||||
|
# Also test with with_row_ids=True
|
||||||
|
result = LanceHybridQueryBuilder._combine_hybrid_results(
|
||||||
|
fts_results=empty_fts,
|
||||||
|
vector_results=empty_vector,
|
||||||
|
norm="score",
|
||||||
|
fts_query="nonexistent query",
|
||||||
|
reranker=LinearCombinationReranker(),
|
||||||
|
limit=10,
|
||||||
|
with_row_ids=True,
|
||||||
|
)
|
||||||
|
assert len(result) == 0
|
||||||
|
assert "_relevance_score" in result.column_names
|
||||||
|
assert "_rowid" in result.column_names
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("use_tantivy", [True, False])
|
@pytest.mark.parametrize("use_tantivy", [True, False])
|
||||||
def test_cross_encoder_reranker_return_all(tmp_path, use_tantivy):
|
def test_cross_encoder_reranker_return_all(tmp_path, use_tantivy):
|
||||||
pytest.importorskip("sentence_transformers")
|
pytest.importorskip("sentence_transformers")
|
||||||
|
|||||||
@@ -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(
|
||||||
@@ -810,7 +828,7 @@ def test_create_index_name_and_train_parameters(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_add_with_nans(mem_db: DBConnection):
|
def test_create_with_nans(mem_db: DBConnection):
|
||||||
# by default we raise an error on bad input vectors
|
# by default we raise an error on bad input vectors
|
||||||
bad_data = [
|
bad_data = [
|
||||||
{"vector": [np.nan], "item": "bar", "price": 20.0},
|
{"vector": [np.nan], "item": "bar", "price": 20.0},
|
||||||
@@ -854,6 +872,57 @@ def test_add_with_nans(mem_db: DBConnection):
|
|||||||
assert np.allclose(v, np.array([0.0, 0.0]))
|
assert np.allclose(v, np.array([0.0, 0.0]))
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_with_nans(mem_db: DBConnection):
|
||||||
|
schema = pa.schema(
|
||||||
|
[
|
||||||
|
pa.field("vector", pa.list_(pa.float32(), 2), nullable=True),
|
||||||
|
pa.field("item", pa.string(), nullable=True),
|
||||||
|
pa.field("price", pa.float64(), nullable=False),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
table = mem_db.create_table("test", schema=schema)
|
||||||
|
# by default we raise an error on bad input vectors
|
||||||
|
bad_data = [
|
||||||
|
{"vector": [np.nan], "item": "bar", "price": 20.0},
|
||||||
|
{"vector": [5], "item": "bar", "price": 20.0},
|
||||||
|
{"vector": [np.nan, np.nan], "item": "bar", "price": 20.0},
|
||||||
|
{"vector": [np.nan, 5.0], "item": "bar", "price": 20.0},
|
||||||
|
]
|
||||||
|
for row in bad_data:
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
table.add(
|
||||||
|
data=[row],
|
||||||
|
)
|
||||||
|
|
||||||
|
table.add(
|
||||||
|
[
|
||||||
|
{"vector": [3.1, 4.1], "item": "foo", "price": 10.0},
|
||||||
|
{"vector": [2.1, 4.1], "item": "foo", "price": 9.0},
|
||||||
|
{"vector": [np.nan], "item": "bar", "price": 20.0},
|
||||||
|
{"vector": [5], "item": "bar", "price": 20.0},
|
||||||
|
{"vector": [np.nan, np.nan], "item": "bar", "price": 20.0},
|
||||||
|
],
|
||||||
|
on_bad_vectors="drop",
|
||||||
|
)
|
||||||
|
assert len(table) == 2
|
||||||
|
table.delete("true")
|
||||||
|
|
||||||
|
# We can fill bad input with some value
|
||||||
|
table.add(
|
||||||
|
data=[
|
||||||
|
{"vector": [3.1, 4.1], "item": "foo", "price": 10.0},
|
||||||
|
{"vector": [np.nan], "item": "bar", "price": 20.0},
|
||||||
|
{"vector": [np.nan, np.nan], "item": "bar", "price": 20.0},
|
||||||
|
],
|
||||||
|
on_bad_vectors="fill",
|
||||||
|
fill_value=0.0,
|
||||||
|
)
|
||||||
|
assert len(table) == 3
|
||||||
|
arrow_tbl = table.search().where("item == 'bar'").to_arrow()
|
||||||
|
v = arrow_tbl["vector"].to_pylist()[0]
|
||||||
|
assert np.allclose(v, np.array([0.0, 0.0]))
|
||||||
|
|
||||||
|
|
||||||
def test_restore(mem_db: DBConnection):
|
def test_restore(mem_db: DBConnection):
|
||||||
table = mem_db.create_table(
|
table = mem_db.create_table(
|
||||||
"my_table",
|
"my_table",
|
||||||
|
|||||||
@@ -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)
|
||||||
@@ -292,18 +318,14 @@ class TestModel(lancedb.pydantic.LanceModel):
|
|||||||
lambda: pa.table({"a": [1], "b": [2]}),
|
lambda: pa.table({"a": [1], "b": [2]}),
|
||||||
lambda: pa.table({"a": [1], "b": [2]}).to_reader(),
|
lambda: pa.table({"a": [1], "b": [2]}).to_reader(),
|
||||||
lambda: iter(pa.table({"a": [1], "b": [2]}).to_batches()),
|
lambda: iter(pa.table({"a": [1], "b": [2]}).to_batches()),
|
||||||
lambda: (
|
lambda: lance.write_dataset(
|
||||||
lance.write_dataset(
|
pa.table({"a": [1], "b": [2]}),
|
||||||
pa.table({"a": [1], "b": [2]}),
|
"memory://test",
|
||||||
"memory://test",
|
|
||||||
)
|
|
||||||
),
|
|
||||||
lambda: (
|
|
||||||
lance.write_dataset(
|
|
||||||
pa.table({"a": [1], "b": [2]}),
|
|
||||||
"memory://test",
|
|
||||||
).scanner()
|
|
||||||
),
|
),
|
||||||
|
lambda: lance.write_dataset(
|
||||||
|
pa.table({"a": [1], "b": [2]}),
|
||||||
|
"memory://test",
|
||||||
|
).scanner(),
|
||||||
lambda: pd.DataFrame({"a": [1], "b": [2]}),
|
lambda: pd.DataFrame({"a": [1], "b": [2]}),
|
||||||
lambda: pl.DataFrame({"a": [1], "b": [2]}),
|
lambda: pl.DataFrame({"a": [1], "b": [2]}),
|
||||||
lambda: pl.LazyFrame({"a": [1], "b": [2]}),
|
lambda: pl.LazyFrame({"a": [1], "b": [2]}),
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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,14 @@
|
|||||||
// 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 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;
|
||||||
@@ -23,6 +23,7 @@ pub mod connection;
|
|||||||
pub mod error;
|
pub mod error;
|
||||||
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;
|
||||||
|
|||||||
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,17 +16,32 @@ 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;
|
||||||
|
|
||||||
|
fn table_from_py<'a>(table: Bound<'a, PyAny>) -> PyResult<Bound<'a, Table>> {
|
||||||
|
if table.hasattr("_inner")? {
|
||||||
|
Ok(table.getattr("_inner")?.downcast_into::<Table>()?)
|
||||||
|
} else if table.hasattr("_table")? {
|
||||||
|
Ok(table
|
||||||
|
.getattr("_table")?
|
||||||
|
.getattr("_inner")?
|
||||||
|
.downcast_into::<Table>()?)
|
||||||
|
} else {
|
||||||
|
Err(PyRuntimeError::new_err(
|
||||||
|
"Provided table does not appear to be a Table or RemoteTable instance",
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Create a permutation builder for the given table
|
/// Create a permutation builder for the given table
|
||||||
#[pyo3::pyfunction]
|
#[pyo3::pyfunction]
|
||||||
pub fn async_permutation_builder(table: Bound<'_, PyAny>) -> PyResult<PyAsyncPermutationBuilder> {
|
pub fn async_permutation_builder(table: Bound<'_, PyAny>) -> PyResult<PyAsyncPermutationBuilder> {
|
||||||
let table = table.getattr("_inner")?.downcast_into::<Table>()?;
|
let table = table_from_py(table)?;
|
||||||
let inner_table = table.borrow().inner_ref()?.clone();
|
let inner_table = table.borrow().inner_ref()?.clone();
|
||||||
let inner_builder = LancePermutationBuilder::new(inner_table);
|
let inner_builder = LancePermutationBuilder::new(inner_table);
|
||||||
|
|
||||||
@@ -250,10 +265,8 @@ impl PyPermutationReader {
|
|||||||
permutation_table: Option<Bound<'py, PyAny>>,
|
permutation_table: Option<Bound<'py, PyAny>>,
|
||||||
split: u64,
|
split: u64,
|
||||||
) -> PyResult<Bound<'py, PyAny>> {
|
) -> PyResult<Bound<'py, PyAny>> {
|
||||||
let base_table = base_table.getattr("_inner")?.downcast_into::<Table>()?;
|
let base_table = table_from_py(base_table)?;
|
||||||
let permutation_table = permutation_table
|
let permutation_table = permutation_table.map(table_from_py).transpose()?;
|
||||||
.map(|p| PyResult::Ok(p.getattr("_inner")?.downcast_into::<Table>()?))
|
|
||||||
.transpose()?;
|
|
||||||
|
|
||||||
let base_table = base_table.borrow().inner_ref()?.base_table().clone();
|
let base_table = base_table.borrow().inner_ref()?.base_table().clone();
|
||||||
let permutation_table = permutation_table
|
let permutation_table = permutation_table
|
||||||
|
|||||||
@@ -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,23 +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::pyfunction;
|
||||||
|
use pyo3::pymethods;
|
||||||
|
use pyo3::types::PyList;
|
||||||
|
use pyo3::types::{PyDict, PyString};
|
||||||
|
use pyo3::{FromPyObject, exceptions::PyRuntimeError};
|
||||||
|
use pyo3::{PyErr, pyclass};
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
exceptions::{PyNotImplementedError, PyValueError},
|
exceptions::{PyNotImplementedError, PyValueError},
|
||||||
intern,
|
intern,
|
||||||
};
|
};
|
||||||
use pyo3::{pyclass, PyErr};
|
|
||||||
use pyo3_async_runtimes::tokio::future_into_py;
|
use pyo3_async_runtimes::tokio::future_into_py;
|
||||||
|
|
||||||
use crate::util::parse_distance_type;
|
use crate::util::parse_distance_type;
|
||||||
@@ -316,6 +316,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())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,8 +5,9 @@ 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,
|
||||||
};
|
};
|
||||||
use arrow::{
|
use arrow::{
|
||||||
datatypes::{DataType, Schema},
|
datatypes::{DataType, Schema},
|
||||||
@@ -18,13 +19,15 @@ use lancedb::table::{
|
|||||||
Table as LanceDbTable,
|
Table as LanceDbTable,
|
||||||
};
|
};
|
||||||
use pyo3::{
|
use pyo3::{
|
||||||
|
Bound, FromPyObject, 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;
|
||||||
|
|
||||||
|
mod scannable;
|
||||||
|
|
||||||
/// Statistics about a compaction operation.
|
/// Statistics about a compaction operation.
|
||||||
#[pyclass(get_all)]
|
#[pyclass(get_all)]
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
@@ -109,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,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -293,12 +301,10 @@ impl Table {
|
|||||||
|
|
||||||
pub fn add<'a>(
|
pub fn add<'a>(
|
||||||
self_: PyRef<'a, Self>,
|
self_: PyRef<'a, Self>,
|
||||||
data: Bound<'_, PyAny>,
|
data: PyScannable,
|
||||||
mode: String,
|
mode: String,
|
||||||
) -> PyResult<Bound<'a, PyAny>> {
|
) -> PyResult<Bound<'a, PyAny>> {
|
||||||
let batches: Box<dyn arrow::array::RecordBatchReader + Send> =
|
let mut op = self_.inner_ref()?.add(data);
|
||||||
Box::new(ArrowArrayStreamReader::from_pyarrow_bound(&data)?);
|
|
||||||
let mut op = self_.inner_ref()?.add(batches);
|
|
||||||
if mode == "append" {
|
if mode == "append" {
|
||||||
op = op.mode(AddDataMode::Append);
|
op = op.mode(AddDataMode::Append);
|
||||||
} else if mode == "overwrite" {
|
} else if mode == "overwrite" {
|
||||||
@@ -420,6 +426,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 {
|
||||||
@@ -536,7 +553,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| {
|
||||||
@@ -553,9 +570,7 @@ impl Table {
|
|||||||
Ok(dict.unbind())
|
Ok(dict.unbind())
|
||||||
})
|
})
|
||||||
.collect::<PyResult<Vec<_>>>()
|
.collect::<PyResult<Vec<_>>>()
|
||||||
});
|
})
|
||||||
|
|
||||||
versions_as_dict
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
145
python/src/table/scannable.rs
Normal file
145
python/src/table/scannable.rs
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
// SPDX-FileCopyrightText: Copyright The LanceDB Authors
|
||||||
|
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use arrow::{
|
||||||
|
datatypes::{Schema, SchemaRef},
|
||||||
|
ffi_stream::ArrowArrayStreamReader,
|
||||||
|
pyarrow::{FromPyArrow, PyArrowType},
|
||||||
|
};
|
||||||
|
use futures::StreamExt;
|
||||||
|
use lancedb::{
|
||||||
|
Error,
|
||||||
|
arrow::{SendableRecordBatchStream, SimpleRecordBatchStream},
|
||||||
|
data::scannable::Scannable,
|
||||||
|
};
|
||||||
|
use pyo3::{FromPyObject, Py, PyAny, Python, types::PyAnyMethods};
|
||||||
|
|
||||||
|
/// Adapter that implements Scannable for a Python reader factory callable.
|
||||||
|
///
|
||||||
|
/// This holds a Python callable that returns a RecordBatchReader when called.
|
||||||
|
/// For rescannable sources, the callable can be invoked multiple times to
|
||||||
|
/// get fresh readers.
|
||||||
|
pub struct PyScannable {
|
||||||
|
/// Python callable that returns a RecordBatchReader
|
||||||
|
reader_factory: Py<PyAny>,
|
||||||
|
schema: SchemaRef,
|
||||||
|
num_rows: Option<usize>,
|
||||||
|
rescannable: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for PyScannable {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.debug_struct("PyScannable")
|
||||||
|
.field("schema", &self.schema)
|
||||||
|
.field("num_rows", &self.num_rows)
|
||||||
|
.field("rescannable", &self.rescannable)
|
||||||
|
.finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Scannable for PyScannable {
|
||||||
|
fn schema(&self) -> SchemaRef {
|
||||||
|
self.schema.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn scan_as_stream(&mut self) -> SendableRecordBatchStream {
|
||||||
|
let reader: Result<ArrowArrayStreamReader, Error> = {
|
||||||
|
Python::attach(|py| {
|
||||||
|
let result =
|
||||||
|
self.reader_factory
|
||||||
|
.call0(py)
|
||||||
|
.map_err(|e| lancedb::Error::Runtime {
|
||||||
|
message: format!("Python reader factory failed: {}", e),
|
||||||
|
})?;
|
||||||
|
ArrowArrayStreamReader::from_pyarrow_bound(result.bind(py)).map_err(|e| {
|
||||||
|
lancedb::Error::Runtime {
|
||||||
|
message: format!("Failed to create Arrow reader from Python: {}", e),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
// Reader is blocking but stream is non-blocking, so we need to spawn a task to pull.
|
||||||
|
let (tx, rx) = tokio::sync::mpsc::channel(1);
|
||||||
|
|
||||||
|
let join_handle = tokio::task::spawn_blocking(move || {
|
||||||
|
let reader = match reader {
|
||||||
|
Ok(reader) => reader,
|
||||||
|
Err(e) => {
|
||||||
|
let _ = tx.blocking_send(Err(e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
for batch in reader {
|
||||||
|
match batch {
|
||||||
|
Ok(batch) => {
|
||||||
|
if tx.blocking_send(Ok(batch)).is_err() {
|
||||||
|
// Receiver dropped, stop processing
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(source) => {
|
||||||
|
let _ = tx.blocking_send(Err(Error::Arrow { source }));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let schema = self.schema.clone();
|
||||||
|
let stream = futures::stream::unfold(
|
||||||
|
(rx, Some(join_handle)),
|
||||||
|
|(mut rx, join_handle)| async move {
|
||||||
|
match rx.recv().await {
|
||||||
|
Some(Ok(batch)) => Some((Ok(batch), (rx, join_handle))),
|
||||||
|
Some(Err(e)) => Some((Err(e), (rx, join_handle))),
|
||||||
|
None => {
|
||||||
|
// Channel closed. Check if the task panicked — a panic
|
||||||
|
// drops the sender without sending an error, so without
|
||||||
|
// this check we'd silently return a truncated stream.
|
||||||
|
if let Some(handle) = join_handle
|
||||||
|
&& let Err(join_err) = handle.await
|
||||||
|
{
|
||||||
|
return Some((
|
||||||
|
Err(Error::Runtime {
|
||||||
|
message: format!("Reader task panicked: {}", join_err),
|
||||||
|
}),
|
||||||
|
(rx, None),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Box::pin(SimpleRecordBatchStream::new(stream.fuse(), schema))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn num_rows(&self) -> Option<usize> {
|
||||||
|
self.num_rows
|
||||||
|
}
|
||||||
|
|
||||||
|
fn rescannable(&self) -> bool {
|
||||||
|
self.rescannable
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'py> FromPyObject<'py> for PyScannable {
|
||||||
|
fn extract_bound(ob: &pyo3::Bound<'py, PyAny>) -> pyo3::PyResult<Self> {
|
||||||
|
// Convert from Scannable dataclass.
|
||||||
|
let schema: PyArrowType<Schema> = ob.getattr("schema")?.extract()?;
|
||||||
|
let schema = Arc::new(schema.0);
|
||||||
|
let num_rows: Option<usize> = ob.getattr("num_rows")?.extract()?;
|
||||||
|
let rescannable: bool = ob.getattr("rescannable")?.extract()?;
|
||||||
|
let reader_factory: Py<PyAny> = ob.getattr("reader")?.unbind();
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
schema,
|
||||||
|
reader_factory,
|
||||||
|
num_rows,
|
||||||
|
rescannable,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
|||||||
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,2 +1,2 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "1.90.0"
|
channel = "1.91.0"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lancedb"
|
name = "lancedb"
|
||||||
version = "0.26.2"
|
version = "0.27.0-beta.5"
|
||||||
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
|
||||||
@@ -25,7 +25,9 @@ datafusion-catalog.workspace = true
|
|||||||
datafusion-common.workspace = true
|
datafusion-common.workspace = true
|
||||||
datafusion-execution.workspace = true
|
datafusion-execution.workspace = true
|
||||||
datafusion-expr.workspace = true
|
datafusion-expr.workspace = true
|
||||||
|
datafusion-functions.workspace = true
|
||||||
datafusion-physical-expr.workspace = true
|
datafusion-physical-expr.workspace = true
|
||||||
|
datafusion-sql.workspace = true
|
||||||
datafusion-physical-plan.workspace = true
|
datafusion-physical-plan.workspace = true
|
||||||
datafusion.workspace = true
|
datafusion.workspace = true
|
||||||
object_store = { workspace = true }
|
object_store = { 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]
|
||||||
|
|||||||
@@ -7,13 +7,12 @@ use arrow_array::{RecordBatch, StringArray};
|
|||||||
use arrow_schema::{DataType, Field, Schema};
|
use arrow_schema::{DataType, Field, Schema};
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use lancedb::{
|
use lancedb::{
|
||||||
connect,
|
Result, connect,
|
||||||
embeddings::{
|
embeddings::{
|
||||||
sentence_transformers::SentenceTransformersEmbeddings, EmbeddingDefinition,
|
EmbeddingDefinition, EmbeddingFunction,
|
||||||
EmbeddingFunction,
|
sentence_transformers::SentenceTransformersEmbeddings,
|
||||||
},
|
},
|
||||||
query::{ExecutableQuery, QueryBase},
|
query::{ExecutableQuery, QueryBase},
|
||||||
Result,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ use futures::TryStreamExt;
|
|||||||
use lancedb::connection::Connection;
|
use lancedb::connection::Connection;
|
||||||
use lancedb::index::Index;
|
use lancedb::index::Index;
|
||||||
use lancedb::query::{ExecutableQuery, QueryBase};
|
use lancedb::query::{ExecutableQuery, QueryBase};
|
||||||
use lancedb::{connect, Result, Table as LanceDbTable};
|
use lancedb::{Result, Table as LanceDbTable, connect};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ use lance_datagen::{BatchCount, BatchGeneratorBuilder, RowCount};
|
|||||||
#[cfg(feature = "polars")]
|
#[cfg(feature = "polars")]
|
||||||
use {crate::polars_arrow_convertors, polars::frame::ArrowChunk, polars::prelude::DataFrame};
|
use {crate::polars_arrow_convertors, polars::frame::ArrowChunk, polars::prelude::DataFrame};
|
||||||
|
|
||||||
use crate::{error::Result, Error};
|
use crate::{Error, error::Result};
|
||||||
|
|
||||||
/// An iterator of batches that also has a schema
|
/// An iterator of batches that also has a schema
|
||||||
pub trait RecordBatchReader: Iterator<Item = Result<arrow_array::RecordBatch>> {
|
pub trait RecordBatchReader: Iterator<Item = Result<arrow_array::RecordBatch>> {
|
||||||
@@ -155,9 +155,7 @@ impl IntoArrowStream for SendableRecordBatchStream {
|
|||||||
impl IntoArrowStream for datafusion_physical_plan::SendableRecordBatchStream {
|
impl IntoArrowStream for datafusion_physical_plan::SendableRecordBatchStream {
|
||||||
fn into_arrow(self) -> Result<SendableRecordBatchStream> {
|
fn into_arrow(self) -> Result<SendableRecordBatchStream> {
|
||||||
let schema = self.schema();
|
let schema = self.schema();
|
||||||
let stream = self.map_err(|df_err| Error::Runtime {
|
let stream = self.map_err(|df_err| df_err.into());
|
||||||
message: df_err.to_string(),
|
|
||||||
});
|
|
||||||
Ok(Box::pin(SimpleRecordBatchStream::new(stream, schema)))
|
Ok(Box::pin(SimpleRecordBatchStream::new(stream, schema)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ use lance_namespace::models::{
|
|||||||
#[cfg(feature = "aws")]
|
#[cfg(feature = "aws")]
|
||||||
use object_store::aws::AwsCredential;
|
use object_store::aws::AwsCredential;
|
||||||
|
|
||||||
|
use crate::Table;
|
||||||
use crate::connection::create_table::CreateTableBuilder;
|
use crate::connection::create_table::CreateTableBuilder;
|
||||||
use crate::data::scannable::Scannable;
|
use crate::data::scannable::Scannable;
|
||||||
use crate::database::listing::ListingDatabase;
|
use crate::database::listing::ListingDatabase;
|
||||||
@@ -31,7 +32,6 @@ use crate::remote::{
|
|||||||
client::ClientConfig,
|
client::ClientConfig,
|
||||||
db::{OPT_REMOTE_API_KEY, OPT_REMOTE_HOST_OVERRIDE, OPT_REMOTE_REGION},
|
db::{OPT_REMOTE_API_KEY, OPT_REMOTE_HOST_OVERRIDE, OPT_REMOTE_REGION},
|
||||||
};
|
};
|
||||||
use crate::Table;
|
|
||||||
use lance::io::ObjectStoreParams;
|
use lance::io::ObjectStoreParams;
|
||||||
pub use lance_encoding::version::LanceFileVersion;
|
pub use lance_encoding::version::LanceFileVersion;
|
||||||
#[cfg(feature = "remote")]
|
#[cfg(feature = "remote")]
|
||||||
@@ -136,6 +136,7 @@ impl OpenTableBuilder {
|
|||||||
lance_read_params: None,
|
lance_read_params: None,
|
||||||
location: None,
|
location: None,
|
||||||
namespace_client: None,
|
namespace_client: None,
|
||||||
|
managed_versioning: None,
|
||||||
},
|
},
|
||||||
embedding_registry,
|
embedding_registry,
|
||||||
}
|
}
|
||||||
@@ -235,6 +236,29 @@ impl OpenTableBuilder {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Set a namespace client for managed versioning support.
|
||||||
|
///
|
||||||
|
/// When a namespace client is provided and the table has `managed_versioning` enabled,
|
||||||
|
/// the table will use the namespace's commit handler to notify the namespace of
|
||||||
|
/// version changes. This enables features like event emission for table modifications.
|
||||||
|
pub fn namespace_client(mut self, client: Arc<dyn lance_namespace::LanceNamespace>) -> Self {
|
||||||
|
self.request.namespace_client = Some(client);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set whether managed versioning is enabled for this table.
|
||||||
|
///
|
||||||
|
/// When set to `Some(true)`, the table will use namespace-managed commits.
|
||||||
|
/// When set to `Some(false)`, the table will use local commits even if namespace_client is set.
|
||||||
|
/// When set to `None` (default), the value will be fetched from the namespace if namespace_client is set.
|
||||||
|
///
|
||||||
|
/// This is typically set when the caller has already queried the namespace and knows the
|
||||||
|
/// managed_versioning status, avoiding a redundant describe_table call.
|
||||||
|
pub fn managed_versioning(mut self, enabled: bool) -> Self {
|
||||||
|
self.request.managed_versioning = Some(enabled);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
/// Open the table
|
/// Open the table
|
||||||
pub async fn execute(self) -> Result<Table> {
|
pub async fn execute(self) -> Result<Table> {
|
||||||
let table = self.parent.open_table(self.request).await?;
|
let table = self.parent.open_table(self.request).await?;
|
||||||
@@ -294,6 +318,12 @@ impl CloneTableBuilder {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Set a namespace client for managed versioning support.
|
||||||
|
pub fn namespace_client(mut self, client: Arc<dyn lance_namespace::LanceNamespace>) -> Self {
|
||||||
|
self.request.namespace_client = Some(client);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
/// Execute the clone operation
|
/// Execute the clone operation
|
||||||
pub async fn execute(self) -> Result<Table> {
|
pub async fn execute(self) -> Result<Table> {
|
||||||
let parent = self.parent.clone();
|
let parent = self.parent.clone();
|
||||||
@@ -566,8 +596,11 @@ pub struct ConnectBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "remote")]
|
#[cfg(feature = "remote")]
|
||||||
const ENV_VARS_TO_STORAGE_OPTS: [(&str, &str); 1] =
|
const ENV_VARS_TO_STORAGE_OPTS: [(&str, &str); 3] = [
|
||||||
[("AZURE_STORAGE_ACCOUNT_NAME", "azure_storage_account_name")];
|
("AZURE_STORAGE_ACCOUNT_NAME", "azure_storage_account_name"),
|
||||||
|
("AZURE_CLIENT_ID", "azure_client_id"),
|
||||||
|
("AZURE_TENANT_ID", "azure_tenant_id"),
|
||||||
|
];
|
||||||
|
|
||||||
impl ConnectBuilder {
|
impl ConnectBuilder {
|
||||||
/// Create a new [`ConnectOptions`] with the given database URI.
|
/// Create a new [`ConnectOptions`] with the given database URI.
|
||||||
@@ -758,10 +791,10 @@ impl ConnectBuilder {
|
|||||||
options: &mut HashMap<String, String>,
|
options: &mut HashMap<String, String>,
|
||||||
) {
|
) {
|
||||||
for (env_key, opt_key) in env_var_to_remote_storage_option {
|
for (env_key, opt_key) in env_var_to_remote_storage_option {
|
||||||
if let Ok(env_value) = std::env::var(env_key) {
|
if let Ok(env_value) = std::env::var(env_key)
|
||||||
if !options.contains_key(*opt_key) {
|
&& !options.contains_key(*opt_key)
|
||||||
options.insert((*opt_key).to_string(), env_value);
|
{
|
||||||
}
|
options.insert((*opt_key).to_string(), env_value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1011,14 +1044,13 @@ mod tests {
|
|||||||
#[cfg(feature = "remote")]
|
#[cfg(feature = "remote")]
|
||||||
#[test]
|
#[test]
|
||||||
fn test_apply_env_defaults() {
|
fn test_apply_env_defaults() {
|
||||||
let env_key = "TEST_APPLY_ENV_DEFAULTS_ENVIRONMENT_VARIABLE_ENV_KEY";
|
let env_key = "PATH";
|
||||||
let env_val = "TEST_APPLY_ENV_DEFAULTS_ENVIRONMENT_VARIABLE_ENV_VAL";
|
let env_val = std::env::var(env_key).expect("PATH should be set in test environment");
|
||||||
let opts_key = "test_apply_env_defaults_environment_variable_opts_key";
|
let opts_key = "test_apply_env_defaults_environment_variable_opts_key";
|
||||||
std::env::set_var(env_key, env_val);
|
|
||||||
|
|
||||||
let mut options = HashMap::new();
|
let mut options = HashMap::new();
|
||||||
ConnectBuilder::apply_env_defaults(&[(env_key, opts_key)], &mut options);
|
ConnectBuilder::apply_env_defaults(&[(env_key, opts_key)], &mut options);
|
||||||
assert_eq!(Some(&env_val.to_string()), options.get(opts_key));
|
assert_eq!(Some(&env_val), options.get(opts_key));
|
||||||
|
|
||||||
options.insert(opts_key.to_string(), "EXPLICIT-VALUE".to_string());
|
options.insert(opts_key.to_string(), "EXPLICIT-VALUE".to_string());
|
||||||
ConnectBuilder::apply_env_defaults(&[(env_key, opts_key)], &mut options);
|
ConnectBuilder::apply_env_defaults(&[(env_key, opts_key)], &mut options);
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ use std::sync::Arc;
|
|||||||
use lance_io::object_store::StorageOptionsProvider;
|
use lance_io::object_store::StorageOptionsProvider;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
|
Error, Result, Table,
|
||||||
connection::{merge_storage_options, set_storage_options_provider},
|
connection::{merge_storage_options, set_storage_options_provider},
|
||||||
data::scannable::{Scannable, WithEmbeddingsScannable},
|
data::scannable::{Scannable, WithEmbeddingsScannable},
|
||||||
database::{CreateTableMode, CreateTableRequest, Database},
|
database::{CreateTableMode, CreateTableRequest, Database},
|
||||||
embeddings::{EmbeddingDefinition, EmbeddingFunction, EmbeddingRegistry},
|
embeddings::{EmbeddingDefinition, EmbeddingFunction, EmbeddingRegistry},
|
||||||
table::WriteOptions,
|
table::WriteOptions,
|
||||||
Error, Result, Table,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pub struct CreateTableBuilder {
|
pub struct CreateTableBuilder {
|
||||||
@@ -167,7 +167,7 @@ impl CreateTableBuilder {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use arrow_array::{
|
use arrow_array::{
|
||||||
record_batch, Array, FixedSizeListArray, Float32Array, RecordBatch, RecordBatchIterator,
|
Array, FixedSizeListArray, Float32Array, RecordBatch, RecordBatchIterator, record_batch,
|
||||||
};
|
};
|
||||||
use arrow_schema::{ArrowError, DataType, Field, Schema};
|
use arrow_schema::{ArrowError, DataType, Field, Schema};
|
||||||
use futures::TryStreamExt;
|
use futures::TryStreamExt;
|
||||||
@@ -380,11 +380,12 @@ mod tests {
|
|||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let other_schema = Arc::new(Schema::new(vec![Field::new("y", DataType::Int32, false)]));
|
let other_schema = Arc::new(Schema::new(vec![Field::new("y", DataType::Int32, false)]));
|
||||||
assert!(db
|
assert!(
|
||||||
.create_empty_table("test", other_schema.clone())
|
db.create_empty_table("test", other_schema.clone())
|
||||||
.execute()
|
.execute()
|
||||||
.await
|
.await
|
||||||
.is_err()); // TODO: assert what this error is
|
.is_err()
|
||||||
|
); // TODO: assert what this error is
|
||||||
let overwritten = db
|
let overwritten = db
|
||||||
.create_empty_table("test", other_schema.clone())
|
.create_empty_table("test", other_schema.clone())
|
||||||
.mode(CreateTableMode::Overwrite)
|
.mode(CreateTableMode::Overwrite)
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ use std::collections::HashMap;
|
|||||||
|
|
||||||
use arrow::compute::kernels::{aggregate::bool_and, length::length};
|
use arrow::compute::kernels::{aggregate::bool_and, length::length};
|
||||||
use arrow_array::{
|
use arrow_array::{
|
||||||
|
Array, GenericListArray, OffsetSizeTrait, PrimitiveArray, RecordBatchReader,
|
||||||
cast::AsArray,
|
cast::AsArray,
|
||||||
types::{ArrowPrimitiveType, Int32Type, Int64Type},
|
types::{ArrowPrimitiveType, Int32Type, Int64Type},
|
||||||
Array, GenericListArray, OffsetSizeTrait, PrimitiveArray, RecordBatchReader,
|
|
||||||
};
|
};
|
||||||
use arrow_ord::cmp::eq;
|
use arrow_ord::cmp::eq;
|
||||||
use arrow_schema::DataType;
|
use arrow_schema::DataType;
|
||||||
@@ -78,7 +78,7 @@ pub fn infer_vector_columns(
|
|||||||
_ => {
|
_ => {
|
||||||
return Err(Error::Schema {
|
return Err(Error::Schema {
|
||||||
message: format!("Column {} is not a list", col_name),
|
message: format!("Column {} is not a list", col_name),
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
} {
|
} {
|
||||||
if let Some(Some(prev_dim)) = columns_to_infer.get(&col_name) {
|
if let Some(Some(prev_dim)) = columns_to_infer.get(&col_name) {
|
||||||
@@ -102,8 +102,8 @@ mod tests {
|
|||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
use arrow_array::{
|
use arrow_array::{
|
||||||
types::{Float32Type, Float64Type},
|
|
||||||
FixedSizeListArray, Float32Array, ListArray, RecordBatch, RecordBatchIterator, StringArray,
|
FixedSizeListArray, Float32Array, ListArray, RecordBatch, RecordBatchIterator, StringArray,
|
||||||
|
types::{Float32Type, Float64Type},
|
||||||
};
|
};
|
||||||
use arrow_schema::{DataType, Field, Schema};
|
use arrow_schema::{DataType, Field, Schema};
|
||||||
use std::{sync::Arc, vec};
|
use std::{sync::Arc, vec};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user