Merge pull request #619 from vespa-engine/jobergum/option_to_not_rais…

…e_on_404

Jobergum/option to not raise on 404

vespa/application.py

@@ -2,6 +2,7 @@
 
 import sys
 import ssl
+from xmlrpc.client import Boolean
 import aiohttp
 import asyncio
 import requests
@@ -35,13 +36,14 @@
 
 VESPA_CLOUD_SECRET_TOKEN: str = "VESPA_CLOUD_SECRET_TOKEN"
 
-def raise_for_status(response: Response) -> None:
+def raise_for_status(response: Response, ignore_not_found:bool=False) -> None:
     """
     Raises an appropriate error if necessary.
 
     If the response contains an error message, VespaError is raised along with HTTPError to provide more details.
 
     :param response: Response object from Vespa API.
+    :param ignore_not_found: If True, ignore 404 status code.
     :raises HTTPError: If status_code is between 400 and 599.
     :raises VespaError: If the response JSON contains an error message.
     """
@@ -50,6 +52,8 @@ def raise_for_status(response: Response) -> None:
     except HTTPError as http_error:
         try:
             response_json = response.json()
+            if response.status_code == 404 and ignore_not_found:
+                return
         except JSONDecodeError:
             raise http_error
         errors = response_json.get("root", {}).get("errors", [])
@@ -782,7 +786,7 @@ def get_data(
             self.app.end_point, namespace, schema, str(data_id)
         )
         response = self.http_session.get(end_point, params=kwargs)
-        raise_for_status(response) # This is questionable, since it will throw on 404 as well. 
+        raise_for_status(response,ignore_not_found=True) 
         return VespaResponse(
             json=response.json(),
             status_code=response.status_code,

vespa/test_integration_vespa_cloud.py

@@ -63,12 +63,15 @@ def test_key_cert_arguments(self):
             },
             self.app.get_data(data_id="1").json,
         )
+        self.assertEqual(self.app.get_data(data_id="1").is_successfull(), False)
 
+
     def tearDown(self) -> None:
         self.app.delete_all_docs(
             content_cluster_name="msmarco_content", schema="msmarco"
         )
         shutil.rmtree(self.disk_folder, ignore_errors=True)
+        #self.vespa_cloud.delete()
 
 
 class TestMsmarcoApplication(TestApplicationCommon):

vespa/test_integration_vespa_cloud_token.py

@@ -4,6 +4,8 @@
 import asyncio
 import shutil
 import unittest
+import pytest
+from requests import HTTPError
 from vespa.application import Vespa
 from vespa.package import AuthClient, Parameter
 from vespa.deployment import VespaCloud
@@ -48,20 +50,22 @@ def test_right_endpoint_used_with_token(self):
         # The token is used to access the application status endpoint.  
         print("Endpoint used " + self.app.url)      
         self.app.wait_for_application_up(max_wait=APP_INIT_TIMEOUT)
-        self.assertEqual(200, self.app.get_application_status().status_code)
         self.assertDictEqual(
             {
                 "pathId": "/document/v1/msmarco/msmarco/docid/1",
                 "id": "id:msmarco:msmarco::1",
             },
             self.app.get_data(data_id="1").json,
         )
+        self.assertEqual(self.app.get_data(data_id="1").is_successfull(), False)
+
 
     def tearDown(self) -> None:
         self.app.delete_all_docs(
             content_cluster_name="msmarco_content", schema="msmarco"
         )
         shutil.rmtree(self.disk_folder, ignore_errors=True)
+        #self.vespa_cloud.delete()
 
 
 class TestMsmarcoApplicationWithTokenAuth(TestApplicationCommon):

vespa/test_integration_vespa_cloud_vector_search.py

@@ -2,8 +2,6 @@
 
 import os
 import shutil
-import asyncio
-from typing import Iterable
 import unittest
 from vespa.application import Vespa, ApplicationPackage
 from vespa.package import Schema, Document, Field, HNSW, RankProfile
@@ -163,5 +161,6 @@ def tearDown(self) -> None:
             self.assertEqual(len(response.hits), 0)
             print(response.get_json())
         shutil.rmtree(self.disk_folder, ignore_errors=True)
+        #self.vespa_cloud.delete()