Merge pull request #623 from praekeltfoundation/update-urls

update new aaq urls
praekeltfoundation · Sep 4, 2024 · 32dad4d · 32dad4d
2 parents 54d613c + 2bc4c18
commit 32dad4d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/aaq/tasks.py b/aaq/tasks.py
@@ -50,15 +50,15 @@ def send_feedback_task_v2(feedback_secret_key, query_id, content_id=None, **kwar
         "query_id": query_id,
     }
 
-    path = "/response-feedback"
+    path = "api/response-feedback"
 
     if "feedback_sentiment" in kwargs:
         data["feedback_sentiment"] = kwargs["feedback_sentiment"]
     if "feedback_text" in kwargs:
         data["feedback_text"] = kwargs["feedback_text"]
     if content_id:
         data["content_id"] = content_id
-        path = "/content-feedback"
+        path = "api/content-feedback"
 
     url = urljoin(settings.AAQ_V2_API_URL, path)
     headers = {

diff --git a/aaq/tests/test_tasks.py b/aaq/tests/test_tasks.py
@@ -76,7 +76,7 @@ def test_response_feedback_task(self):
 
         responses.add(
             responses.POST,
-            "http://aaq_v2/response-feedback",
+            "http://aaq_v2/api/response-feedback",
             json={},
             status=200,
         )
@@ -92,5 +92,5 @@ def test_response_feedback_task(self):
 
         [request] = responses.calls
 
-        self.assertEqual(request.request.url, "http://aaq_v2/response-feedback")
+        self.assertEqual(request.request.url, "http://aaq_v2/api/response-feedback")
         self.assertEqual(json.loads(request.request.body), data)
diff --git a/aaq/tests/test_utils.py b/aaq/tests/test_utils.py
@@ -18,15 +18,15 @@ def test_search_function(self):
         fakeAaqApi = FakeAaqApi()
         responses.add_callback(
             responses.POST,
-            "http://aaq_v2/search",
+            "http://aaq_v2/api/search",
             callback=fakeAaqApi.post_search,
             content_type="application/json",
         )
 
         fakeAaqUdV2Api = FakeAaqUdV2Api()
         responses.add_callback(
             responses.POST,
-            "http://aaq_v2/check-urgency",
+            "http://aaq_v2/api/check-urgency",
             callback=fakeAaqUdV2Api.post_urgency_detect_return_true,
             content_type="application/json",
         )
@@ -80,7 +80,7 @@ def test_urgency_check(self):
         fakeAaqUdV2Api = FakeAaqUdV2Api()
         responses.add_callback(
             responses.POST,
-            "http://aaq_v2/check-urgency",
+            "http://aaq_v2/api/check-urgency",
             callback=fakeAaqUdV2Api.post_urgency_detect_return_true,
             content_type="application/json",
         )
@@ -119,7 +119,7 @@ def test_search_gibberish(self):
         fakeAaqApi = FakeAaqApi()
         responses.add_callback(
             responses.POST,
-            "http://aaq_v2/search",
+            "http://aaq_v2/api/search",
             callback=fakeAaqApi.post_search_return_empty,
             content_type="application/json",
         )

diff --git a/aaq/tests/test_views.py b/aaq/tests/test_views.py
@@ -363,15 +363,15 @@ def test_search(self):
         fakeAaqApi = FakeAaqApi()
         responses.add_callback(
             responses.POST,
-            "http://aaq_v2/search",
+            "http://aaq_v2/api/search",
             callback=fakeAaqApi.post_search,
             content_type="application/json",
         )
 
         fakeAaqUdV2Api = FakeAaqUdV2Api()
         responses.add_callback(
             responses.POST,
-            "http://aaq_v2/check-urgency",
+            "http://aaq_v2/api/check-urgency",
             callback=fakeAaqUdV2Api.post_urgency_detect_return_true,
             content_type="application/json",
         )

diff --git a/aaq/utils.py b/aaq/utils.py
@@ -7,7 +7,7 @@
 
 
 def check_urgency_v2(message_text):
-    url = urllib.parse.urljoin(settings.AAQ_V2_API_URL, "check-urgency")
+    url = urllib.parse.urljoin(settings.AAQ_V2_API_URL, "api/check-urgency")
     headers = {
         "Authorization": f"Bearer {settings.AAQ_V2_AUTH}",
         "Content-Type": "application/json",
@@ -20,7 +20,7 @@ def check_urgency_v2(message_text):
 
 
 def search(query_text, generate_llm_response, query_metadata):
-    url = urllib.parse.urljoin(settings.AAQ_V2_API_URL, "search")
+    url = urllib.parse.urljoin(settings.AAQ_V2_API_URL, "api/search")
     payload = {
         "query_text": query_text,
         "generate_llm_response": generate_llm_response,