Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ exclude = [
]

[[tool.mypy.overrides]]
module="google.auth.*"
module = [

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this PR changes import modules of mypy, I guess some change to .github/workflows/lint.yml is needed, you can manually run mypy to see what went wrong.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@loeng2023 Mypy seems to work locally and I've removed the extra changes to the import modules. The workflows still seem to be failing

"google.auth.*",
"requests.*",
"pymysql.*"
]
ignore_missing_imports = true


21 changes: 14 additions & 7 deletions src/langchain_google_cloud_sql_mysql/vectorstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from __future__ import annotations

import json
from typing import Any, Iterable, List, Optional, Tuple, Type, Union
from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union

import numpy as np
from langchain_core.documents import Document
Expand Down Expand Up @@ -227,11 +227,17 @@ def delete(
if not ids:
return False

id_list = ", ".join([f"'{id}'" for id in ids])
bind_params: Dict[str, Any] = {}
param_names: List[str] = []
for i, id_val in enumerate(ids):
param_name = f"id_{i}"
bind_params[param_name] = id_val
param_names.append(f":{param_name}")
id_list = ", ".join(param_names)
query = (
f"DELETE FROM `{self.table_name}` WHERE `{self.id_column}` in ({id_list})"
)
self.engine._execute(query)
self.engine._execute(query, bind_params)
return True

def apply_vector_index(self, vector_index: VectorIndex):
Expand Down Expand Up @@ -659,23 +665,24 @@ def _query_collection(
if query_options.distance_measure != DistanceMeasure.DOT_PRODUCT
else query_options.distance_measure.value
)
bind_params: Dict[str, Any] = {"embedding": str(embedding)}
if query_options.search_type == SearchType.KNN:
filter = f"WHERE {filter}" if filter else ""
stmt = f"SELECT {column_query}, {distance_function}({self.embedding_column}, string_to_vector('{embedding}')) AS distance FROM `{self.table_name}` {filter} ORDER BY distance LIMIT {k};"
stmt = f"SELECT {column_query}, {distance_function}({self.embedding_column}, string_to_vector(:embedding)) AS distance FROM `{self.table_name}` {filter} ORDER BY distance LIMIT {k};"
else:
filter = f"AND {filter}" if filter else ""
num_partitions = (
f",num_partitions={query_options.num_partitions}"
if query_options.num_partitions
else ""
)
stmt = f"SELECT {column_query}, {distance_function}({self.embedding_column}, string_to_vector('{embedding}')) AS distance FROM `{self.table_name}` WHERE NEAREST({self.embedding_column}) TO (string_to_vector('{embedding}'), 'num_neighbors={k}{num_partitions}') {filter} ORDER BY distance;"
stmt = f"SELECT {column_query}, {distance_function}({self.embedding_column}, string_to_vector(:embedding)) AS distance FROM `{self.table_name}` WHERE NEAREST({self.embedding_column}) TO (string_to_vector(:embedding), 'num_neighbors={k}{num_partitions}') {filter} ORDER BY distance;"

# return self.engine._fetch(stmt)
if map_results:
return self.engine._fetch(stmt)
return self.engine._fetch(stmt, bind_params)
else:
return self.engine._fetch_rows(stmt)
return self.engine._fetch_rows(stmt, bind_params)


### The following is copied from langchain-community until it's moved into core
Expand Down
Loading