Lint fixes for tests

Author: jhamon

codegen/build-oas.sh

@@ -71,7 +71,7 @@ generate_client() {
 
 	oas_file="codegen/apis/_build/${version}/${module_name}_${version}.oas.yaml"
 	package_name="pinecone.${py_module_name}.openapi.${module_name}"
-	
+
 	verify_file_exists $oas_file
 	verify_directory_exists $template_dir
 
@@ -106,9 +106,9 @@ extract_shared_classes() {
 	# Define the list of shared source files
 	sharedFiles=(
 		"api_client"
-		"configuration" 
-		"exceptions" 
-		"model_utils" 
+		"configuration"
+		"exceptions"
+		"model_utils"
 		"rest"
 	)
 
@@ -127,7 +127,7 @@ extract_shared_classes() {
 		done
 	done
 
-	# Remove the docstring headers that aren't really correct in the 
+	# Remove the docstring headers that aren't really correct in the
 	# context of this new shared package structure
 	find "$target_directory" -name "*.py" -print0 | xargs -0 -I {} sh -c 'sed -i "" "/^\"\"\"/,/^\"\"\"/d" "{}"'
 
@@ -166,4 +166,4 @@ done
 extract_shared_classes
 
 # Format generated files
-poetry run black "${destination}"
+poetry run ruff format "${destination}"

pinecone/config/config.py

@@ -3,9 +3,7 @@
 
 from pinecone.exceptions.exceptions import PineconeConfigurationError
 from pinecone.config.openapi import OpenApiConfigFactory
-from pinecone.core.openapi.shared.configuration import (
-    Configuration as OpenApiConfiguration,
-)
+from pinecone.core.openapi.shared.configuration import Configuration as OpenApiConfiguration
 from pinecone.utils import normalize_host
 from pinecone.utils.constants import SOURCE_TAG
 
@@ -72,15 +70,11 @@ def build(
 
     @staticmethod
     def build_openapi_config(
-        config: Config,
-        openapi_config: Optional[OpenApiConfiguration] = None,
-        **kwargs,
+        config: Config, openapi_config: Optional[OpenApiConfiguration] = None, **kwargs
     ) -> OpenApiConfiguration:
         if openapi_config:
             openapi_config = OpenApiConfigFactory.copy(
-                openapi_config=openapi_config,
-                api_key=config.api_key,
-                host=config.host,
+                openapi_config=openapi_config, api_key=config.api_key, host=config.host
             )
         elif openapi_config is None:
             openapi_config = OpenApiConfigFactory.build(api_key=config.api_key, host=config.host)

pinecone/config/openapi.py

@@ -7,9 +7,7 @@
 
 from urllib3.connection import HTTPConnection
 
-from pinecone.core.openapi.shared.configuration import (
-    Configuration as OpenApiConfiguration,
-)
+from pinecone.core.openapi.shared.configuration import Configuration as OpenApiConfiguration
 
 TCP_KEEPINTVL = 60  # Sec
 TCP_KEEPIDLE = 300  # Sec
@@ -29,7 +27,9 @@ def build(cls, api_key: str, host: Optional[str] = None, **kwargs):
         return openapi_config
 
     @classmethod
-    def copy(cls, openapi_config: OpenApiConfiguration, api_key: str, host: str) -> OpenApiConfiguration:
+    def copy(
+        cls, openapi_config: OpenApiConfiguration, api_key: str, host: str
+    ) -> OpenApiConfiguration:
         """
         Copy a user-supplied openapi configuration and update it with the user's api key and host.
         If they have not specified other socket configuration, we will use the default values.
@@ -88,13 +88,7 @@ def _get_socket_options(
             and hasattr(socket, "TCP_KEEPCNT")
         ):
             socket_params += [(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, keep_alive_idle_sec)]
-            socket_params += [
-                (
-                    socket.IPPROTO_TCP,
-                    socket.TCP_KEEPINTVL,
-                    keep_alive_interval_sec,
-                )
-            ]
+            socket_params += [(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, keep_alive_interval_sec)]
             socket_params += [(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, keep_alive_tries)]
 
         # TCP Keep Alive Probes for Windows OS

pinecone/config/pinecone_config.py

@@ -17,7 +17,12 @@ def build(
         additional_headers: Optional[Dict[str, str]] = {},
         **kwargs,
     ) -> Config:
-        host = host or kwargs.get("host") or os.getenv("PINECONE_CONTROLLER_HOST") or DEFAULT_CONTROLLER_HOST
+        host = (
+            host
+            or kwargs.get("host")
+            or os.getenv("PINECONE_CONTROLLER_HOST")
+            or DEFAULT_CONTROLLER_HOST
+        )
         headers_json = os.getenv("PINECONE_ADDITIONAL_HEADERS")
         if headers_json:
             try:
@@ -27,8 +32,5 @@ def build(
                 logger.warn(f"Ignoring PINECONE_ADDITIONAL_HEADERS: {e}")
 
         return ConfigBuilder.build(
-            api_key=api_key,
-            host=host,
-            additional_headers=additional_headers,
-            **kwargs,
+            api_key=api_key, host=host, additional_headers=additional_headers, **kwargs
         )

pinecone/control/pinecone.py

@@ -6,16 +6,11 @@
 
 from pinecone.config import PineconeConfig, Config, ConfigBuilder
 
-from pinecone.core.openapi.control.api.manage_indexes_api import (
-    ManageIndexesApi,
-)
+from pinecone.core.openapi.control.api.manage_indexes_api import ManageIndexesApi
 from pinecone.core.openapi.shared.api_client import ApiClient
 
-from pinecone.utils import (
-    normalize_host,
-    setup_openapi_client,
-    build_plugin_setup_client,
-)
+
+from pinecone.utils import normalize_host, setup_openapi_client, build_plugin_setup_client
 from pinecone.core.openapi.control.models import (
     CreateCollectionRequest,
     CreateIndexRequest,
@@ -214,7 +209,7 @@ def __init__(
 
         if kwargs.get("openapi_config", None):
             raise Exception(
-                "Passing openapi_config is no longer supported. Please pass settings such as proxy_url, proxy_headers, ssl_ca_certs, and ssl_verify directly to the Pinecone constructor as keyword arguments. See the README at https://github.com/pinecone-io/pinecone-python-client for examples.",
+                "Passing openapi_config is no longer supported. Please pass settings such as proxy_url, proxy_headers, ssl_ca_certs, and ssl_verify directly to the Pinecone constructor as keyword arguments. See the README at https://github.com/pinecone-io/pinecone-python-client for examples."
             )
 
         self.openapi_config = ConfigBuilder.build_openapi_config(self.config, **kwargs)
@@ -353,10 +348,7 @@ def _parse_non_empty_args(args: List[Tuple[str, Any]]) -> Dict[str, Any]:
                 raise ValueError("spec must contain either 'serverless' or 'pod' key")
         elif isinstance(spec, ServerlessSpec):
             index_spec = IndexSpec(
-                serverless=ServerlessSpecModel(
-                    cloud=spec.cloud,
-                    region=spec.region,
-                )
+                serverless=ServerlessSpecModel(cloud=spec.cloud, region=spec.region)
             )
         elif isinstance(spec, PodSpec):
             args_dict = _parse_non_empty_args(
@@ -368,14 +360,12 @@ def _parse_non_empty_args(args: List[Tuple[str, Any]]) -> Dict[str, Any]:
                 ]
             )
             if spec.metadata_config:
-                args_dict["metadata_config"] = PodSpecMetadataConfig(indexed=spec.metadata_config.get("indexed", None))
+                args_dict["metadata_config"] = PodSpecMetadataConfig(
+                    indexed=spec.metadata_config.get("indexed", None)
+                )
 
             index_spec = IndexSpec(
-                pod=PodSpecModel(
-                    environment=spec.environment,
-                    pod_type=spec.pod_type,
-                    **args_dict,
-                )
+                pod=PodSpecModel(environment=spec.environment, pod_type=spec.pod_type, **args_dict)
             )
         else:
             raise TypeError("spec must be of type dict, ServerlessSpec, or PodSpec")
@@ -387,7 +377,7 @@ def _parse_non_empty_args(args: List[Tuple[str, Any]]) -> Dict[str, Any]:
                 metric=metric,
                 spec=index_spec,
                 deletion_protection=dp,
-            ),
+            )
         )
 
         def is_ready():
@@ -630,7 +620,9 @@ def create_collection(self, name: str, source: str):
         :param source: Name of the source index
         """
         api_instance = self.index_api
-        api_instance.create_collection(create_collection_request=CreateCollectionRequest(name=name, source=source))
+        api_instance.create_collection(
+            create_collection_request=CreateCollectionRequest(name=name, source=source)
+        )
 
     def list_collections(self) -> CollectionList:
         """List all collections

pinecone/data/errors.py

@@ -40,5 +40,7 @@ def __init__(self, sparse_values_dict):
 
 class MetadataDictionaryExpectedError(ValueError, TypeError):
     def __init__(self, item):
-        message = f"Column `metadata` is expected to be a dictionary, found {type(item['metadata'])}"
+        message = (
+            f"Column `metadata` is expected to be a dictionary, found {type(item['metadata'])}"
+        )
         super().__init__(message)

pinecone/data/features/bulk_import.py

@@ -26,10 +26,10 @@
 
 class ImportFeatureMixin:
     def __init__(self, **kwargs):
-        config = ConfigBuilder.build(
-            **kwargs,
+        config = ConfigBuilder.build(**kwargs)
+        openapi_config = ConfigBuilder.build_openapi_config(
+            config, kwargs.get("openapi_config", None)
         )
-        openapi_config = ConfigBuilder.build_openapi_config(config, kwargs.get("openapi_config", None))
 
         if kwargs.get("__import_operations_api", None):
             self.__import_operations_api = kwargs.get("__import_operations_api")
@@ -123,10 +123,7 @@ def list_imports(self, **kwargs) -> Iterator[List[ImportModel]]:
                 done = True
 
     def list_imports_paginated(
-        self,
-        limit: Optional[int] = None,
-        pagination_token: Optional[str] = None,
-        **kwargs,
+        self, limit: Optional[int] = None, pagination_token: Optional[str] = None, **kwargs
     ) -> ImportListResponse:
         """
         The list_imports_paginated operation returns information about import operations.
@@ -158,12 +155,7 @@ def list_imports_paginated(
         Returns: ImportListResponse object which contains the list of operations as ImportModel objects, pagination information,
             and usage showing the number of read_units consumed.
         """
-        args_dict = parse_non_empty_args(
-            [
-                ("limit", limit),
-                ("pagination_token", pagination_token),
-            ]
-        )
+        args_dict = parse_non_empty_args([("limit", limit), ("pagination_token", pagination_token)])
         return self.__import_operations_api.list_imports(**args_dict)
 
     def describe_import(self, id: str) -> ImportModel: