From a593a3518253c8f35d6b90f5f20277deba0a8916 Mon Sep 17 00:00:00 2001 From: thomasht86 Date: Fri, 22 Nov 2024 09:58:26 +0100 Subject: [PATCH 1/7] upda vector integration test --- .../test_integration_vespa_cloud_vector_search.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/integration/test_integration_vespa_cloud_vector_search.py b/tests/integration/test_integration_vespa_cloud_vector_search.py index 38ee5510..045da837 100644 --- a/tests/integration/test_integration_vespa_cloud_vector_search.py +++ b/tests/integration/test_integration_vespa_cloud_vector_search.py @@ -93,7 +93,7 @@ def test_vector_indexing_and_query(self): from datasets import load_dataset - sample_size = 1000 + sample_size = 100 # streaming=True pages the data from S3. This is needed to avoid memory issues when loading the dataset. dataset = load_dataset( "KShivendu/dbpedia-entities-openai-1M", split="train", streaming=True @@ -164,9 +164,7 @@ def callback(response: VespaResponse, id: str): ok = 0 callbacks = 0 start_time = time.time() - dataset = load_dataset( - "KShivendu/dbpedia-entities-openai-1M", split="train", streaming=True - ).take(100) + feed_with_wrong_field = dataset.map( lambda x: { "id": x["_id"], @@ -186,9 +184,7 @@ def callback(response: VespaResponse, id: str): self.assertEqual(callbacks, 100) ok = 0 - dataset = load_dataset( - "KShivendu/dbpedia-entities-openai-1M", split="train", streaming=True - ).take(sample_size) + # Run update - assign all docs with a meta field updates = dataset.map(lambda x: {"id": x["_id"], "fields": {"meta": "stuff"}}) @@ -239,7 +235,7 @@ def tearDown(self) -> None: class TestProdDeploymentFromDisk(unittest.TestCase): - def setUp(self) -> None: + def test_setup(self) -> None: self.app_package = create_vector_ada_application_package() prod_region = "aws-us-east-1c" self.app_package.clusters = [ From 084f4785e146212696eb27db8a633f552c9f3d7a Mon Sep 17 00:00:00 2001 From: thomasht86 Date: Fri, 22 Nov 2024 09:59:09 +0100 Subject: [PATCH 2/7] update workflow --- .github/workflows/integration-cloud.yml | 81 ++++++++++++++++++++----- 1 file changed, 66 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration-cloud.yml b/.github/workflows/integration-cloud.yml index 3f028465..cff2868e 100644 --- a/.github/workflows/integration-cloud.yml +++ b/.github/workflows/integration-cloud.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - thomasht86/fix-integrationtest-vectorsearch schedule: - cron: "0 11 * * 0" @@ -13,20 +14,58 @@ concurrency: cancel-in-progress: false jobs: + setup-environment: + runs-on: ubuntu-latest + outputs: + python-cache-key: ${{ steps.cache-python.outputs.cache-hit }} + steps: + - uses: actions/checkout@v4 + + - name: Set up Python + id: setup-python + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Cache dependencies + id: cache-python + uses: actions/cache@v3 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }} + + - name: Install dependencies + if: steps.cache-python.outputs.cache-hit != 'true' + run: | + pip install -e .[dev] + + - name: Upload Python environment + uses: actions/upload-artifact@v3 + with: + name: python-environment + path: ~/.cache/pip + integration-cloud: runs-on: ubuntu-latest + needs: setup-environment steps: - uses: actions/checkout@v4 + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.9" - cache: "pip" - cache-dependency-path: | - pyproject.toml + python-version: "3.10" + + - name: Download Python environment + uses: actions/download-artifact@v3 + with: + name: python-environment + path: ~/.cache/pip + - name: Install dependencies run: | pip install -e .[dev] + - name: Run integration tests env: VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }} @@ -35,42 +74,54 @@ jobs: integration-cloud-token: runs-on: ubuntu-latest - needs: integration-cloud + needs: setup-environment steps: - uses: actions/checkout@v4 + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.9" - cache: "pip" - cache-dependency-path: | - pyproject.toml + python-version: "3.10" + + - name: Download Python environment + uses: actions/download-artifact@v3 + with: + name: python-environment + path: ~/.cache/pip + - name: Install dependencies run: | pip install -e .[dev] + - name: Run integration tests env: VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }} VESPA_CLOUD_SECRET_TOKEN: ${{ secrets.VESPA_CLOUD_SECRET_TOKEN }} - VESPA_CLIENT_TOKEN_ID: ${{ secrets.VESPA_CLIENT_TOKEN_ID}} + VESPA_CLIENT_TOKEN_ID: ${{ secrets.VESPA_CLIENT_TOKEN_ID }} run: | pytest tests/integration/test_integration_vespa_cloud_token.py -s -v integration-cloud-vector-search: runs-on: ubuntu-latest - needs: integration-cloud-token + needs: setup-environment steps: - uses: actions/checkout@v4 + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.9" - cache: "pip" - cache-dependency-path: | - pyproject.toml + python-version: "3.10" + + - name: Download Python environment + uses: actions/download-artifact@v3 + with: + name: python-environment + path: ~/.cache/pip + - name: Install dependencies run: | pip install -e .[dev] + - name: Run integration tests env: VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }} From 48c8bd472404a3050a046ea1cd3695f6829bfd4b Mon Sep 17 00:00:00 2001 From: thomasht86 Date: Fri, 22 Nov 2024 11:10:31 +0100 Subject: [PATCH 3/7] comment, not skip --- ...t_integration_vespa_cloud_vector_search.py | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/integration/test_integration_vespa_cloud_vector_search.py b/tests/integration/test_integration_vespa_cloud_vector_search.py index 045da837..9b73ac3f 100644 --- a/tests/integration/test_integration_vespa_cloud_vector_search.py +++ b/tests/integration/test_integration_vespa_cloud_vector_search.py @@ -21,7 +21,6 @@ ContainerCluster, Nodes, DeploymentConfiguration, - EmptyDeploymentConfiguration, Validation, ValidationID, ) @@ -298,32 +297,33 @@ def test_application_status(self): def test_vector_indexing_and_query(self): super().test_vector_indexing_and_query() - @unittest.skip("Do not run when not waiting for deployment.") - def tearDown(self) -> None: - self.app.delete_all_docs( - content_cluster_name="vector_content", - schema="vector", - namespace="benchmark", - ) - time.sleep(5) - with self.app.syncio() as sync_session: - response: VespaResponse = sync_session.query( - {"yql": "select id from sources * where true", "hits": 10} - ) - self.assertEqual(response.get_status_code(), 200) - self.assertEqual(len(response.hits), 0) - print(response.get_json()) + # DO NOT skip tearDown-method, as test will not exit. + # @unittest.skip("Do not run when not waiting for deployment.") + # def tearDown(self) -> None: + # self.app.delete_all_docs( + # content_cluster_name="vector_content", + # schema="vector", + # namespace="benchmark", + # ) + # time.sleep(5) + # with self.app.syncio() as sync_session: + # response: VespaResponse = sync_session.query( + # {"yql": "select id from sources * where true", "hits": 10} + # ) + # self.assertEqual(response.get_status_code(), 200) + # self.assertEqual(len(response.hits), 0) + # print(response.get_json()) - # Deployment is deleted by deploying with an empty deployment.xml file. - self.app_package.deployment_config = EmptyDeploymentConfiguration() + # # Deployment is deleted by deploying with an empty deployment.xml file. + # self.app_package.deployment_config = EmptyDeploymentConfiguration() - # Vespa won't push the deleted deployment.xml file unless we add a validation override - tomorrow = datetime.now() + timedelta(days=1) - formatted_date = tomorrow.strftime("%Y-%m-%d") - self.app_package.validations = [ - Validation(ValidationID("deployment-removal"), formatted_date) - ] - self.app_package.to_files(self.application_root) - # This will delete the deployment - self.vespa_cloud._start_prod_deployment(self.application_root) - shutil.rmtree(self.application_root, ignore_errors=True) + # # Vespa won't push the deleted deployment.xml file unless we add a validation override + # tomorrow = datetime.now() + timedelta(days=1) + # formatted_date = tomorrow.strftime("%Y-%m-%d") + # self.app_package.validations = [ + # Validation(ValidationID("deployment-removal"), formatted_date) + # ] + # self.app_package.to_files(self.application_root) + # # This will delete the deployment + # self.vespa_cloud._start_prod_deployment(self.application_root) + # shutil.rmtree(self.application_root, ignore_errors=True) From 82186d2b5e079167f705f97e1997a114200fbc1e Mon Sep 17 00:00:00 2001 From: thomasht86 Date: Fri, 22 Nov 2024 11:34:22 +0100 Subject: [PATCH 4/7] remove run on branch --- .github/workflows/integration-cloud.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integration-cloud.yml b/.github/workflows/integration-cloud.yml index cff2868e..9061abe0 100644 --- a/.github/workflows/integration-cloud.yml +++ b/.github/workflows/integration-cloud.yml @@ -5,7 +5,6 @@ on: push: branches: - master - - thomasht86/fix-integrationtest-vectorsearch schedule: - cron: "0 11 * * 0" From bd295007d3220ee1980fff2c51a7b4e9f85f9ff7 Mon Sep 17 00:00:00 2001 From: thomasht86 Date: Fri, 22 Nov 2024 13:09:51 +0100 Subject: [PATCH 5/7] only setup-python cache --- .github/workflows/integration-cloud.yml | 65 ++++--------------------- 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/.github/workflows/integration-cloud.yml b/.github/workflows/integration-cloud.yml index 9061abe0..139f98a8 100644 --- a/.github/workflows/integration-cloud.yml +++ b/.github/workflows/integration-cloud.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - thomasht86/fix-integrationtest-vectorsearch schedule: - cron: "0 11 * * 0" @@ -13,54 +14,18 @@ concurrency: cancel-in-progress: false jobs: - setup-environment: - runs-on: ubuntu-latest - outputs: - python-cache-key: ${{ steps.cache-python.outputs.cache-hit }} - steps: - - uses: actions/checkout@v4 - - - name: Set up Python - id: setup-python - uses: actions/setup-python@v5 - with: - python-version: "3.10" - - - name: Cache dependencies - id: cache-python - uses: actions/cache@v3 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }} - - - name: Install dependencies - if: steps.cache-python.outputs.cache-hit != 'true' - run: | - pip install -e .[dev] - - - name: Upload Python environment - uses: actions/upload-artifact@v3 - with: - name: python-environment - path: ~/.cache/pip - integration-cloud: runs-on: ubuntu-latest - needs: setup-environment steps: - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 + id: setup-python with: python-version: "3.10" - - - name: Download Python environment - uses: actions/download-artifact@v3 - with: - name: python-environment - path: ~/.cache/pip - + cache: "pip" + - run: echo '${{ steps.setup-python.outputs.cache-hit }}' # true if cache-hit occurred on the primary key - name: Install dependencies run: | pip install -e .[dev] @@ -73,21 +38,16 @@ jobs: integration-cloud-token: runs-on: ubuntu-latest - needs: setup-environment steps: - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 + id: setup-python with: python-version: "3.10" - - - name: Download Python environment - uses: actions/download-artifact@v3 - with: - name: python-environment - path: ~/.cache/pip - + cache: "pip" + - run: echo '${{ steps.setup-python.outputs.cache-hit }}' # true if cache-hit occurred on the primary key - name: Install dependencies run: | pip install -e .[dev] @@ -102,21 +62,16 @@ jobs: integration-cloud-vector-search: runs-on: ubuntu-latest - needs: setup-environment steps: - uses: actions/checkout@v4 - name: Set up Python + id: setup-python uses: actions/setup-python@v5 with: python-version: "3.10" - - - name: Download Python environment - uses: actions/download-artifact@v3 - with: - name: python-environment - path: ~/.cache/pip - + cache: "pip" + - run: echo '${{ steps.setup-python.outputs.cache-hit }}' # true if cache-hit occurred on the primary key - name: Install dependencies run: | pip install -e .[dev] From d9fde8d690f86a418954b1a25512caa86e9b2034 Mon Sep 17 00:00:00 2001 From: thomasht86 Date: Fri, 22 Nov 2024 13:18:18 +0100 Subject: [PATCH 6/7] simplify test --- .../test_integration_vespa_cloud_vector_search.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/integration/test_integration_vespa_cloud_vector_search.py b/tests/integration/test_integration_vespa_cloud_vector_search.py index 9b73ac3f..3797eb42 100644 --- a/tests/integration/test_integration_vespa_cloud_vector_search.py +++ b/tests/integration/test_integration_vespa_cloud_vector_search.py @@ -108,6 +108,10 @@ def test_vector_indexing_and_query(self): docs = list( pyvespa_feed_format ) # we have enough memory to page everything into memory with list() + # seems like we sometimes can get more than sample_size docs + if len(docs) > sample_size: + docs = docs[:sample_size] + self.assertEqual(len(docs), sample_size) ok = 0 callbacks = 0 start_time = time.time() @@ -126,9 +130,6 @@ def callback(response: VespaResponse, id: str): schema="vector", namespace="benchmark", callback=callback, - max_workers=48, - max_connections=48, - max_queue_size=4000, ) self.assertEqual(ok, sample_size) duration = time.time() - start @@ -171,13 +172,14 @@ def callback(response: VespaResponse, id: str): } ) faulty_docs = list(feed_with_wrong_field) + if len(faulty_docs) > sample_size: + faulty_docs = faulty_docs[:sample_size] + self.assertEqual(len(faulty_docs), sample_size) self.app.feed_iterable( iter=faulty_docs, schema="vector", namespace="benchmark", callback=callback, - max_workers=48, - max_connections=48, ) self.assertEqual(ok, 0) self.assertEqual(callbacks, 100) From 40995d303a4a3b03b4397a030dd1118c6dfc1f6f Mon Sep 17 00:00:00 2001 From: Thomas Hjelde Thoresen Date: Fri, 22 Nov 2024 15:36:53 +0100 Subject: [PATCH 7/7] Update .github/workflows/integration-cloud.yml Amazing! Learned a new trick today as well :D Co-authored-by: Marlon (Esolitos) Saglia --- .github/workflows/integration-cloud.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-cloud.yml b/.github/workflows/integration-cloud.yml index 139f98a8..6e9b3cac 100644 --- a/.github/workflows/integration-cloud.yml +++ b/.github/workflows/integration-cloud.yml @@ -5,7 +5,8 @@ on: push: branches: - master - - thomasht86/fix-integrationtest-vectorsearch + pull_request: + paths: [".github/workflows/integration-cloud.yml"] schedule: - cron: "0 11 * * 0"