Skip to content

Commit f491241

Browse files
authored
Add ruff rules for unused arguments (#574)
1 parent 2778872 commit f491241

File tree

26 files changed

+79
-40
lines changed

26 files changed

+79
-40
lines changed

libs/colbert/ragstack_colbert/colbert_embedding_model.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def __init__(
4343
query_maxlen: Optional[int] = None,
4444
verbose: Optional[int] = 3, # 3 is the default on ColBERT checkpoint
4545
chunk_batch_size: Optional[int] = 640,
46-
**kwargs,
4746
):
4847
"""
4948
Initializes a new instance of the ColbertEmbeddingModel class, setting up the

libs/colbert/ragstack_colbert/colbert_retriever.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from typing import Any, Dict, List, Optional, Set, Tuple
1717

1818
import torch
19+
from typing_extensions import override
1920

2021
from .base_database import BaseDatabase
2122
from .base_embedding_model import BaseEmbeddingModel
@@ -271,6 +272,7 @@ async def _get_chunk_data(
271272

272273
return results
273274

275+
@override
274276
async def atext_search(
275277
self,
276278
query_text: str,
@@ -310,6 +312,7 @@ async def atext_search(
310312
**kwargs,
311313
)
312314

315+
@override
313316
async def aembedding_search(
314317
self,
315318
query_embedding: Embedding,
@@ -322,10 +325,9 @@ async def aembedding_search(
322325
using semantic similarity as the criteria.
323326
324327
Parameters:
325-
query_text (str): The query text to search for relevant text chunks.
326-
k (Optional[int]): The number of top results to retrieve. Default 5.
327-
query_maxlen (Optional[int]): The maximum length of the query to consider.
328-
If None, the maxlen will be dynamically generated.
328+
query_embedding (Embedding): The query embedding to search for relevant
329+
text chunks.
330+
k (Optional[int]): The number of top results to retrieve.
329331
include_embedding (Optional[bool]): Optional (default False) flag to include
330332
the embedding vectors in the returned chunks
331333
**kwargs (Any): Additional parameters that implementations might require
@@ -373,6 +375,7 @@ async def aembedding_search(
373375

374376
return [(chunk, chunk_scores[chunk]) for chunk in chunks]
375377

378+
@override
376379
def text_search(
377380
self,
378381
query_text: str,
@@ -407,9 +410,11 @@ def text_search(
407410
k=k,
408411
query_maxlen=query_maxlen,
409412
include_embedding=include_embedding,
413+
**kwargs,
410414
)
411415
)
412416

417+
@override
413418
def embedding_search(
414419
self,
415420
query_embedding: Embedding,

libs/colbert/tests/integration_tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def get_astradb_test_store():
2020

2121

2222
@pytest.hookimpl()
23-
def pytest_sessionfinish(session, exitstatus):
23+
def pytest_sessionfinish():
2424
if (
2525
status["local_cassandra_test_store"]
2626
and status["local_cassandra_test_store"].docker_container

libs/e2e-tests/e2e_tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def set_current_test_info(test_name: str, test_info: str):
161161

162162

163163
@pytest.hookimpl()
164-
def pytest_sessionfinish(session, exitstatus):
164+
def pytest_sessionfinish():
165165
logging.info("All tests report:")
166166
logging.info("\n".join(all_report_lines))
167167
logging.info("Failed tests report:")

libs/e2e-tests/e2e_tests/langchain/test_cassandra_tool.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import uuid
22

33
import cassio
4+
import pytest
45
from langchain import hub
56
from langchain.agents import AgentExecutor, create_openai_tools_agent
67
from langchain_community.tools.cassandra_database.tool import (
@@ -12,7 +13,8 @@
1213
from langchain_openai import ChatOpenAI
1314

1415

15-
def test_tool_with_openai_tool(cassandra):
16+
@pytest.mark.usefixtures("cassandra")
17+
def test_tool_with_openai_tool():
1618
session = cassio.config.resolve_session()
1719
session.execute("DROP TABLE IF EXISTS default_keyspace.tool_table_users;")
1820

libs/e2e-tests/e2e_tests/langchain/test_compatibility_rag.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
ChatOpenAI,
2121
OpenAIEmbeddings,
2222
)
23+
from typing_extensions import override
2324
from vertexai.vision_models import Image, MultiModalEmbeddingModel
2425

2526
from e2e_tests.conftest import (
@@ -415,9 +416,11 @@ def test_multimodal(vector_store, embedding, llm, request, record_property):
415416
resolved_embedding, embedding_size = request.getfixturevalue(embedding)
416417

417418
class FakeEmbeddings(Embeddings):
419+
@override
418420
def embed_documents(self, texts: List[str]) -> List[List[float]]:
419421
return [[0.0] * embedding_size] * len(texts)
420422

423+
@override
421424
def embed_query(self, text: str) -> List[float]:
422425
return [0.0] * embedding_size
423426

libs/e2e-tests/e2e_tests/llama_index/test_astra.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,10 @@ def test_wrong_connection_parameters(environment: Environment):
128128
)
129129

130130

131-
def verify_document(document, expected_content, expected_metadata):
131+
def verify_document(document, expected_content):
132132
if isinstance(document, NodeWithScore):
133133
document = document.node
134134
assert document.text == expected_content
135-
# metadata is not returned by LlamaIndex
136-
# assert document.metadata == expected_metadata
137135
else:
138136
raise TypeError(
139137
"document is not of type NodeWithScore but of type " + str(type(document))
@@ -185,7 +183,6 @@ def test_vector_search_with_metadata(environment: Environment):
185183
verify_document(
186184
documents[0],
187185
"RAGStack is a framework to run LangChain in production",
188-
{"id": "http://mywebsite/intro", "source": "website", "context": "homepage"},
189186
)
190187

191188
documents = index.as_retriever().retrieve("RAGStack")

libs/e2e-tests/e2e_tests/llama_index/test_cassandra_tool.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import uuid
22

33
import cassio
4+
import pytest
45
from llama_index.agent.openai import OpenAIAgent
56
from llama_index.llms.openai import OpenAI
67
from llama_index.tools.cassandra.base import CassandraDatabaseToolSpec
@@ -9,7 +10,8 @@
910
)
1011

1112

12-
def test_tool_with_openai_tool(cassandra):
13+
@pytest.mark.usefixtures("cassandra")
14+
def test_tool_with_openai_tool():
1315
session = cassio.config.resolve_session()
1416
session.execute("DROP TABLE IF EXISTS default_keyspace.tool_table_users;")
1517

libs/knowledge-graph/ragstack_knowledge_graph/cassandra_graph_store.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from langchain_community.graphs.graph_store import GraphStore
77
from langchain_core.embeddings import Embeddings
88
from langchain_core.runnables import Runnable, RunnableLambda
9+
from typing_extensions import override
910

1011
from .knowledge_graph import CassandraKnowledgeGraph
1112
from .traverse import Node, Relation
@@ -47,24 +48,29 @@ def __init__(
4748
keyspace=keyspace,
4849
)
4950

51+
@override
5052
def add_graph_documents(
5153
self, graph_documents: List[GraphDocument], include_source: bool = False
5254
) -> None:
5355
# TODO: Include source.
5456
self.graph.insert(_elements(graph_documents))
5557

5658
# TODO: should this include the types of each node?
59+
@override
5760
def query(self, query: str, params: dict = {}) -> List[Dict[str, Any]]: # noqa: B006
5861
raise ValueError("Querying Cassandra should use `as_runnable`.")
5962

63+
@override
6064
@property
6165
def get_schema(self) -> str:
6266
raise NotImplementedError
6367

6468
@property
69+
@override
6570
def get_structured_schema(self) -> Dict[str, Any]:
6671
raise NotImplementedError
6772

73+
@override
6874
def refresh_schema(self) -> None:
6975
raise NotImplementedError
7076

libs/langchain/ragstack_langchain/colbert/colbert_retriever.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from langchain_core.documents import Document
88
from langchain_core.retrievers import BaseRetriever
99
from ragstack_colbert.base_retriever import BaseRetriever as ColbertBaseRetriever
10+
from typing_extensions import override
1011

1112
if TYPE_CHECKING:
1213
from ragstack_colbert import Chunk
@@ -47,6 +48,7 @@ def __init__(
4748
self.k = k
4849
self.query_maxlen = query_maxlen
4950

51+
@override
5052
def _get_relevant_documents(
5153
self,
5254
query: str,
@@ -69,6 +71,7 @@ def _get_relevant_documents(
6971
for (c, _) in chunk_scores
7072
]
7173

74+
@override
7275
async def _aget_relevant_documents(
7376
self,
7477
query: str,

0 commit comments

Comments
 (0)