[Test] Fix grpc integration tests

.github/actions/cleanup-all/action.yml

@@ -12,7 +12,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
 
 runs:
   using: 'composite'

.github/actions/create-index-legacy/action.yml

@@ -26,7 +26,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
 
 runs:
   using: 'composite'

.github/actions/create-index/action.yml

@@ -28,7 +28,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
 
 
 outputs:

.github/actions/delete-index/action.yml

@@ -11,7 +11,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
 
 
 runs:

.github/actions/test-data-asyncio/action.yaml

@@ -18,7 +18,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
   python_version:
     description: 'The version of Python to use'
     required: false
@@ -42,7 +42,7 @@ runs:
     - name: Run data plane tests
       id: data-plane-asyncio-tests
       shell: bash
-      run: poetry run pytest tests/integration/data_asyncio --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+      run: poetry run pytest tests/integration/data_asyncio --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
         PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}

.github/actions/test-data-plane/action.yaml

@@ -21,7 +21,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
   python_version:
     description: 'The version of Python to use'
     required: false
@@ -56,7 +56,7 @@ runs:
     - name: Run data plane tests
       id: data-plane-tests
       shell: bash
-      run: poetry run pytest tests/integration/data --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+      run: poetry run pytest tests/integration/data --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
         PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}

.github/actions/test-dependency-asyncio-rest/action.yaml

@@ -8,7 +8,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
   index_name:
     description: 'The name of the index'
     required: true

.github/actions/test-dependency-grpc/action.yaml

@@ -8,7 +8,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
   index_name:
     description: 'The name of the index'
     required: true

.github/actions/test-dependency-rest/action.yaml

@@ -8,7 +8,7 @@ inputs:
   PINECONE_ADDITIONAL_HEADERS:
     description: 'Additional headers to send with the request'
     required: false
-    default: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+    default: '{"sdk-test-suite": "pinecone-python-client"}'
   index_name:
     description: 'The name of the index'
     required: true

.github/workflows/testing-dependency-asyncio.yaml

@@ -27,5 +27,5 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           aiohttp_version: '${{ matrix.aiohttp_version }}'

.github/workflows/testing-dependency-grpc.yaml

@@ -53,7 +53,7 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           grpcio_version: '${{ matrix.grpcio_version }}'
           lz4_version: '${{ matrix.lz4_version }}'
           protobuf_version: '${{ matrix.protobuf_version }}'
@@ -87,7 +87,7 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           grpcio_version: '${{ matrix.grpcio_version }}'
           lz4_version: '${{ matrix.lz4_version }}'
           protobuf_version: '${{ matrix.protobuf_version }}'
@@ -120,7 +120,7 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           grpcio_version: '${{ matrix.grpcio_version }}'
           lz4_version: '${{ matrix.lz4_version }}'
           protobuf_version: '${{ matrix.protobuf_version }}'

.github/workflows/testing-dependency-rest.yaml

@@ -30,7 +30,7 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           urllib3_version: '${{ matrix.urllib3_version }}'
 
 
@@ -54,7 +54,7 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           urllib3_version: '${{ matrix.urllib3_version }}'
 
   dependency-matrix-rest-313:
@@ -77,5 +77,5 @@ jobs:
           python_version: '${{ matrix.python_version }}'
           index_name: '${{ inputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           urllib3_version: '${{ matrix.urllib3_version }}'

.github/workflows/testing-dependency.yaml

@@ -19,7 +19,7 @@ jobs:
           name_prefix: depstest-${{ github.run_number }}
           dimension: 2
           PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }}
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
 
   dependency-test-rest:
     uses: './.github/workflows/testing-dependency-rest.yaml'
@@ -56,4 +56,4 @@ jobs:
         with:
           index_name: '${{ needs.deps-test-setup.outputs.index_name }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'

.github/workflows/testing-integration-asyncio.yaml

@@ -26,10 +26,10 @@ jobs:
       - name: Run data plane tests
         id: data-plane-asyncio-tests
         shell: bash
-        run: poetry run pytest tests/integration/data_asyncio --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+        run: poetry run pytest tests/integration/data_asyncio --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
             PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }}
-            PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+            PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
 
   db-control-asyncio:
     name: db_control asyncio
@@ -52,7 +52,7 @@ jobs:
           include_asyncio: true
           include_dev: true
       - name: 'db_control asyncio'
-        run: poetry run pytest tests/integration/control_asyncio/*.py --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+        run: poetry run pytest tests/integration/control_asyncio/*.py --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'

.github/workflows/testing-integration.yaml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-      PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+      PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
     strategy:
       fail-fast: false
       matrix:
@@ -51,10 +51,10 @@ jobs:
         with:
           include_asyncio: true
       - name: 'Run integration tests'
-        run: poetry run pytest tests/integration/inference --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+        run: poetry run pytest tests/integration/inference --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
 
   plugins:
     name: Plugin installation
@@ -76,7 +76,7 @@ jobs:
         run: poetry run pytest tests/integration/plugins --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
 
 
 
@@ -107,7 +107,7 @@ jobs:
           metric: 'cosine'
           spec: '{ "serverless": { "region": "us-west-2", "cloud": "aws" }}'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           freshness_timeout_seconds: 600
           skip_weird_id_tests: 'true'
 
@@ -169,9 +169,9 @@ jobs:
       - name: Setup Poetry
         uses: ./.github/actions/setup-poetry
       - name: 'Run integration tests (REST)'
-        run: poetry run pytest tests/integration/control/serverless --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+        run: poetry run pytest tests/integration/control/serverless --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
           SERVERLESS_CLOUD: '${{ matrix.testConfig.serverless.cloud }}'
           SERVERLESS_REGION: '${{ matrix.testConfig.serverless.region }}'

.github/workflows/testing-unit.yaml

@@ -58,7 +58,7 @@ jobs:
           include_asyncio: true
 
       - name: Run unit tests (REST)
-        run: poetry run pytest --cov=pinecone --timeout=120 tests/unit --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+        run: poetry run pytest --cov=pinecone --timeout=120 tests/unit --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG
       - name: Run unit tests (GRPC)
         if: ${{ matrix.use_grpc == true }}
-        run: poetry run pytest --cov=pinecone/grpc --timeout=120 tests/unit_grpc --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
+        run: poetry run pytest --cov=pinecone/grpc --timeout=120 tests/unit_grpc --retries 2 --retry-delay 35 -s -vv --log-cli-level=DEBUG

pinecone/__init__.py

@@ -41,7 +41,7 @@
     "QueryResponse": ("pinecone.db_data.models", "QueryResponse"),
     "UpsertResponse": ("pinecone.db_data.models", "UpsertResponse"),
     "UpdateRequest": ("pinecone.db_data.models", "UpdateRequest"),
-    "ImportErrorMode": ("pinecone.core.openapi.db_data.models", "ImportErrorMode"),
+    "ImportErrorMode": ("pinecone.db_data.resources.sync.bulk_import", "ImportErrorMode"),
     "VectorDictionaryMissingKeysError": (
         "pinecone.db_data.errors",
         "VectorDictionaryMissingKeysError",

pinecone/__init__.pyi

@@ -29,7 +29,7 @@ from pinecone.db_data.models import (
     UpsertResponse,
     UpdateRequest,
 )
-from pinecone.core.openapi.db_data.models import ImportErrorMode
+from pinecone.db_data.resources.sync.bulk_import import ImportErrorMode
 from pinecone.db_data.errors import (
     VectorDictionaryMissingKeysError,
     VectorDictionaryExcessKeysError,

pinecone/data/__init__.py

@@ -1,7 +1,5 @@
 import warnings
 
-from pinecone.db_data import *
-
 warnings.warn(
     "The module at `pinecone.data` has moved to `pinecone.db_data`. "
     "Please update your imports. "

pinecone/data/features/__init__.py

@@ -1,10 +1,11 @@
 import warnings
 
-from pinecone.db_data.features import *
+from .bulk_imports import *
+from .inference import *
+
 
 warnings.warn(
-    "The module at `pinecone.data.features` has moved to `pinecone.db_data.features`. "
-    "Please update your imports. "
+    "The module at `pinecone.data.features` has been removed. Code has been refactored and integrated into other parts of the client. "
     "This warning will become an error in a future version of the Pinecone Python SDK.",
     DeprecationWarning,
 )

pinecone/data/features/bulk_imports/__init__.py

@@ -1,6 +1,9 @@
 import warnings
 
-from pinecone.db_data.features.bulk_import import *
+from pinecone.db_data.resources.asyncio.bulk_import_asyncio import *
+from pinecone.db_data.resources.sync.bulk_import import *
+from pinecone.db_data.resources.sync.bulk_import_request_factory import *
+
 
 warnings.warn(
     "The module at `pinecone.data.features.bulk_import` has moved to `pinecone.db_data.features.bulk_import`. "

pinecone/db_data/__init__.py

@@ -25,7 +25,7 @@
     MetadataDictionaryExpectedError,
 )
 
-from .features.bulk_import import ImportErrorMode
+from .resources.sync.bulk_import import ImportErrorMode
 
 
 import warnings