Add ignores to agents pkg for ruff

Author: tsmith023

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
   hooks:
     # Run the linter.
     - id: ruff
-      args: [ weaviate, integration, test, mock_tests, journey_tests, --select, F401, --select, I, --fix ]
+      args: [ weaviate, integration, test, mock_tests, journey_tests, --fix ]
     # Run the formatter.
     - id: ruff-format
       args: [ weaviate, integration, test, mock_tests, journey_tests ]

integration/test_collection_aggregate.py

@@ -199,7 +199,7 @@ def test_over_all_with_filters_ref(collection_factory: CollectionFactory) -> Non
     assert res.properties["text"].count == 1
     assert res.properties["text"].top_occurrences[0].value == "two"
 
-    query = lambda: collection.aggregate.over_all(
+    query = lambda: collection.aggregate.over_all(  # noqa: E731
         filters=Filter.by_ref("ref").by_property("text").equal("one"),
         return_metrics=[Metrics("text").text(count=True, top_occurrences_value=True)],
     )
@@ -361,7 +361,7 @@ def test_hybrid_aggregation_group_by(
     collection.data.insert({"text": text_1})
     collection.data.insert({"text": text_2})
 
-    querier = lambda: collection.aggregate.hybrid(
+    querier = lambda: collection.aggregate.hybrid(  # noqa: E731
         "text",
         alpha=0,
         query_properties=["text"],
@@ -398,7 +398,7 @@ def test_hybrid_aggregation_group_by_with_named_vectors(
     collection.data.insert({"text": text_1})
     collection.data.insert({"text": text_2})
 
-    querier = lambda: collection.aggregate.hybrid(
+    querier = lambda: collection.aggregate.hybrid(  # noqa: E731
         "text",
         alpha=0,
         query_properties=["text"],
@@ -432,7 +432,7 @@ def test_hybrid_aggregation_group_by_with_named_vectors(
 def test_near_vector_aggregation(
     collection_factory: CollectionFactory, option: dict, expected_len: int
 ) -> None:
-    collection_maker = lambda: collection_factory(
+    collection_maker = lambda: collection_factory(  # noqa: E731
         properties=[Property(name="text", data_type=DataType.TEXT)],
         vectorizer_config=Configure.Vectorizer.text2vec_contextionary(
             vectorize_collection_name=False

integration/test_collection_openai.py

@@ -644,9 +644,7 @@ def test_queries_with_rerank_and_generative(collection_factory: CollectionFactor
             0
         ].metadata.rerank_score > [
             obj for obj in objects if "another" not in obj.properties["text"]
-        ][
-            0
-        ].metadata.rerank_score
+        ][0].metadata.rerank_score
 
 
 @pytest.mark.parametrize(
@@ -698,7 +696,7 @@ def test_near_text_generate_with_dynamic_rag(
         ]
     )
 
-    query = lambda: collection.generate.near_text(
+    query = lambda: collection.generate.near_text(  # noqa: E731
         query="small fruit",
         single_prompt=single,
         grouped_task=grouped,

tools/stubs_regen.sh

@@ -3,7 +3,7 @@
 echo "Regenerating stubs..."
 
 python3 -m tools.stubs
-ruff check ./weaviate --select F401 --select I --fix
+ruff check ./weaviate --select F401 --select I --fix # only fix unused/sorted imports
 ruff format ./weaviate
 
 echo "done"

weaviate/agents/__init__.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents import *
+    from weaviate_agents import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/agents/base.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents.base import *
+    from weaviate_agents.base import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/agents/classes/__init__.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents.classes import *
+    from weaviate_agents.classes import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/agents/personalization/__init__.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents.personalization import *
+    from weaviate_agents.personalization import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/agents/query/__init__.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents.query import *
+    from weaviate_agents.query import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/agents/transformation/__init__.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents.transformation import *
+    from weaviate_agents.transformation import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/agents/utils.pyi

@@ -1,6 +1,6 @@
 from weaviate.exceptions import WeaviateAgentsNotInstalledError
 
 try:
-    from weaviate_agents.utils import *
+    from weaviate_agents.utils import *  # noqa: F403
 except ImportError:
     raise WeaviateAgentsNotInstalledError

weaviate/client.pyi

@@ -4,9 +4,11 @@ Client class definition.
 
 from typing import Any, Dict, Optional, Tuple, Union
 
+from weaviate.client_executor import _WeaviateClientExecutor
 from weaviate.collections.classes.internal import _RawGQLReturn
 from weaviate.collections.collections.async_ import _CollectionsAsync
 from weaviate.collections.collections.sync import _Collections
+from weaviate.connect.v4 import ConnectionAsync, ConnectionSync
 from weaviate.users.async_ import _UsersAsync
 from weaviate.users.sync import _Users
 
@@ -19,9 +21,6 @@ from .types import NUMBER
 
 TIMEOUT_TYPE = Union[Tuple[NUMBER, NUMBER], NUMBER]
 
-from weaviate.client_executor import _WeaviateClientExecutor
-from weaviate.connect.v4 import ConnectionAsync, ConnectionSync
-
 class WeaviateAsyncClient(_WeaviateClientExecutor[ConnectionAsync]):
     _connection: ConnectionAsync
     backup: _BackupAsync