Pass x-environment header

Author: jhamon

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

@@ -9,6 +9,10 @@ inputs:
     description: 'Delete all indexes and collections'
     required: false
     default: 'false'
+  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"}'
 
 runs:
   using: 'composite'
@@ -25,3 +29,4 @@ runs:
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
         DELETE_ALL: ${{ inputs.DELETE_ALL }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}

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

@@ -23,6 +23,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
 
 runs:
   using: 'composite'
@@ -36,14 +40,15 @@ runs:
       shell: bash
       run: |
         pip install pinecone-client==${{ inputs.pinecone_client_version }}
-    
+
     - name: Create index
       id: create-index
       shell: bash
       run: ./python3 scripts/create-index-legacy.py
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
         PINECONE_ENVIRONMENT: ${{ inputs.PINECONE_ENVIRONMENT }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}
         INDEX_NAME: ${{ inputs.index_name }}
         DIMENSION: ${{ inputs.dimension }}
         METRIC: ${{ inputs.metric }

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

@@ -25,6 +25,11 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
+
 
 outputs:
   index_name:
@@ -48,6 +53,7 @@ runs:
       run: poetry run python3 scripts/create.py
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}
         NAME_PREFIX: ${{ inputs.name_prefix }}
         REGION: ${{ inputs.region }}
         CLOUD: ${{ inputs.cloud }}

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

@@ -8,6 +8,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
 
 
 runs:
@@ -26,4 +30,5 @@ runs:
       run: poetry run python3 scripts/delete.py
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
-        INDEX_NAME: ${{ inputs.index_name }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}
+        INDEX_NAME: ${{ inputs.index_name }}

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

@@ -15,6 +15,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
   python_version:
     description: 'The version of Python to use'
     required: false
@@ -41,6 +45,7 @@ runs:
       run: poetry run pytest tests/integration/data_asyncio --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}
         USE_GRPC: ${{ inputs.use_grpc }}
         SPEC: ${{ inputs.spec }}
         FRESHNESS_TIMEOUT_SECONDS: ${{ inputs.freshness_timeout_seconds }}

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

@@ -18,6 +18,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
   python_version:
     description: 'The version of Python to use'
     required: false
@@ -55,6 +59,7 @@ runs:
       run: poetry run pytest tests/integration/data --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}
         USE_GRPC: ${{ inputs.use_grpc }}
         METRIC: ${{ inputs.metric }}
         SPEC: ${{ inputs.spec }}

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

@@ -5,6 +5,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
   index_name:
     description: 'The name of the index'
     required: true
@@ -43,4 +47,5 @@ runs:
         command: poetry run pytest tests/dependency/asyncio-rest -s -v
       env:
         PINECONE_API_KEY: '${{ inputs.PINECONE_API_KEY }}'
+        PINECONE_ADDITIONAL_HEADERS: '${{ inputs.PINECONE_ADDITIONAL_HEADERS }}'
         INDEX_NAME: '${{ inputs.index_name }}'

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

@@ -5,6 +5,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
   index_name:
     description: 'The name of the index'
     required: true
@@ -63,4 +67,5 @@ runs:
         command: poetry run pytest tests/dependency/grpc -s -v
       env:
         PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
+        PINECONE_ADDITIONAL_HEADERS: ${{ inputs.PINECONE_ADDITIONAL_HEADERS }}
         INDEX_NAME: ${{ inputs.index_name }}

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

@@ -5,6 +5,10 @@ inputs:
   PINECONE_API_KEY:
     description: 'The Pinecone API key'
     required: true
+  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"}'
   index_name:
     description: 'The name of the index'
     required: true
@@ -42,4 +46,5 @@ runs:
         command: poetry run pytest tests/dependency/rest -s -v
       env:
         PINECONE_API_KEY: '${{ inputs.PINECONE_API_KEY }}'
+        PINECONE_ADDITIONAL_HEADERS: '${{ inputs.PINECONE_ADDITIONAL_HEADERS }}'
         INDEX_NAME: '${{ inputs.index_name }}'

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

@@ -27,4 +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"}'
           aiohttp_version: '${{ matrix.aiohttp_version }}'

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

@@ -53,6 +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"}'
           grpcio_version: '${{ matrix.grpcio_version }}'
           lz4_version: '${{ matrix.lz4_version }}'
           protobuf_version: '${{ matrix.protobuf_version }}'
@@ -86,6 +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"}'
           grpcio_version: '${{ matrix.grpcio_version }}'
           lz4_version: '${{ matrix.lz4_version }}'
           protobuf_version: '${{ matrix.protobuf_version }}'
@@ -118,6 +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"}'
           grpcio_version: '${{ matrix.grpcio_version }}'
           lz4_version: '${{ matrix.lz4_version }}'
           protobuf_version: '${{ matrix.protobuf_version }}'

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

@@ -30,6 +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"}'
           urllib3_version: '${{ matrix.urllib3_version }}'
 
 
@@ -53,6 +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"}'
           urllib3_version: '${{ matrix.urllib3_version }}'
 
   dependency-matrix-rest-313:
@@ -75,4 +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"}'
           urllib3_version: '${{ matrix.urllib3_version }}'

.github/workflows/testing-dependency.yaml

@@ -19,6 +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"}'
 
   dependency-test-rest:
     uses: './.github/workflows/testing-dependency-rest.yaml'
@@ -55,3 +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"}'

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

@@ -29,6 +29,7 @@ jobs:
         run: poetry run pytest tests/integration/data_asyncio --retries 5 --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"}'
 
   db-control-asyncio:
     name: db_control asyncio
@@ -54,3 +55,4 @@ jobs:
         run: poetry run pytest tests/integration/control_asyncio/*.py --retries 5 --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"}'

.github/workflows/testing-integration.yaml

@@ -7,9 +7,8 @@ jobs:
     name: Reorg tests
     runs-on: ubuntu-latest
     env:
-      PINECONE_DEBUG_CURL: 'false'
       PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
-      PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client"}'
+      PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
     strategy:
       fail-fast: false
       matrix:
@@ -54,8 +53,8 @@ jobs:
       - name: 'Run integration tests'
         run: poetry run pytest tests/integration/inference --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
-          PINECONE_DEBUG_CURL: 'true'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
 
 
   dependency-test-asyncio:
@@ -84,6 +83,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"}'
           freshness_timeout_seconds: 600
           skip_weird_id_tests: 'true'
 
@@ -146,7 +146,7 @@ jobs:
       - name: 'Run integration tests (REST)'
         run: poetry run pytest tests/integration/control/serverless --retries 5 --retry-delay 35 -s -vv --log-cli-level=DEBUG
         env:
-          PINECONE_DEBUG_CURL: 'true'
           PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
+          PINECONE_ADDITIONAL_HEADERS: '{"sdk-test-suite": "pinecone-python-client", "x-environment": "preprod-aws-0"}'
           SERVERLESS_CLOUD: '${{ matrix.testConfig.serverless.cloud }}'
           SERVERLESS_REGION: '${{ matrix.testConfig.serverless.region }}'

tests/integration/control/pod/conftest.py

@@ -7,10 +7,7 @@
 
 @pytest.fixture()
 def client():
-    api_key = get_environment_var("PINECONE_API_KEY")
-    return Pinecone(
-        api_key=api_key, additional_headers={"sdk-test-suite": "pinecone-python-client"}
-    )
+    return Pinecone()
 
 
 @pytest.fixture()
@@ -66,10 +63,7 @@ def notready_index(client, index_name, create_index_params):
 
 @pytest.fixture(scope="session")
 def reusable_collection():
-    pc = Pinecone(
-        api_key=get_environment_var("PINECONE_API_KEY"),
-        additional_headers={"sdk-test-suite": "pinecone-python-client"},
-    )
+    pc = Pinecone()
     index_name = generate_index_name("temp-index")
     dimension = int(get_environment_var("DIMENSION"))
     print(f"Creating index {index_name} to prepare a collection...")

tests/integration/control/serverless/conftest.py

@@ -11,10 +11,7 @@
 
 @pytest.fixture()
 def client():
-    api_key = get_environment_var("PINECONE_API_KEY")
-    return Pinecone(
-        api_key=api_key, additional_headers={"sdk-test-suite": "pinecone-python-client"}
-    )
+    return Pinecone()
 
 
 @pytest.fixture()