Skip to content

Separate embedding kwargs into init kwargs and encode kwargs #1555

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Separate embedding kwargs into init kwargs and encode kwargs #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
455861e
Separate embedding kwargs into init kwargs and encode kwargs
tomaarsen Jul 12, 2024
465f38d
move embedding tests into their own file
montanalow Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pgml-extension/examples/embedding.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
\timing on

SELECT pgml.embed('Alibaba-NLP/gte-base-en-v1.5', 'hi mom', '{"trust_remote_code": true}');
SELECT pgml.embed('Alibaba-NLP/gte-base-en-v1.5', 'hi mom', '{"device": "cuda", "trust_remote_code": true}');
SELECT pgml.embed('Alibaba-NLP/gte-base-en-v1.5', 'hi mom', '{"device": "cpu", "trust_remote_code": true}');
SELECT pgml.embed('hkunlp/instructor-xl', 'hi mom', '{"instruction": "Encode it with love"}');
SELECT pgml.embed('mixedbread-ai/mxbai-embed-large-v1', 'test', '{"prompt": "test prompt: "}');
2 changes: 1 addition & 1 deletion pgml-extension/examples/image_classification.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ SELECT * FROM pgml.train('Handwritten Digits', algorithm => 'xgboost', hyperpara

-- runtimes
SELECT * FROM pgml.train('Handwritten Digits', algorithm => 'linear', runtime => 'python');
SELECT * FROM pgml.train('Handwritten Digits', algorithm => 'linear', runtime => 'rust');
--SELECT * FROM pgml.train('Handwritten Digits', algorithm => 'linear', runtime => 'rust');

--SELECT * FROM pgml.train('Handwritten Digits', algorithm => 'xgboost', runtime => 'python', hyperparams => '{"n_estimators": 10}'); -- too slow
SELECT * FROM pgml.train('Handwritten Digits', algorithm => 'xgboost', runtime => 'rust', hyperparams => '{"n_estimators": 10}');
Expand Down
26 changes: 21 additions & 5 deletions pgml-extension/src/bindings/transformers/transformers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ def rank(transformer, query, documents, kwargs):
return rank_using(model, query, documents, kwargs)


def create_embedding(transformer):
return SentenceTransformer(transformer)
def create_embedding(transformer, kwargs):
return SentenceTransformer(transformer, **kwargs)


def embed_using(model, transformer, inputs, kwargs):
Expand All @@ -545,16 +545,32 @@ def embed_using(model, transformer, inputs, kwargs):

def embed(transformer, inputs, kwargs):
kwargs = orjson.loads(kwargs)

ensure_device(kwargs)

init_kwarg_keys = [
"device",
"trust_remote_code",
"revision",
"model_kwargs",
"tokenizer_kwargs",
"config_kwargs",
"truncate_dim",
"token",
]
init_kwargs = {
key: value for key, value in kwargs.items() if key in init_kwarg_keys
}
encode_kwargs = {
key: value for key, value in kwargs.items() if key not in init_kwarg_keys
}

if transformer not in __cache_sentence_transformer_by_name:
__cache_sentence_transformer_by_name[transformer] = create_embedding(
transformer
transformer, init_kwargs
)
model = __cache_sentence_transformer_by_name[transformer]

return embed_using(model, transformer, inputs, kwargs)
return embed_using(model, transformer, inputs, encode_kwargs)


def clear_gpu_cache(memory_usage: None):
Expand Down
1 change: 1 addition & 0 deletions pgml-extension/tests/test.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ SELECT pgml.load_dataset('wine');
\i examples/vectors.sql
\i examples/chunking.sql
\i examples/preprocessing.sql
\i examples/embedding.sql
-- transformers are generally too slow to run in the test suite
--\i examples/transformers.sql