Fix staging result content

chatnoir-eu · Jan 11, 2023 · 6e62a5d · 6e62a5d
1 parent b4d6aef
commit 6e62a5d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -116,15 +116,15 @@ from chatnoir_api import cache_contents, Index, ShortUUID
 contents = cache_contents(
     ShortUUID("6svePe3PXteDeGPk1XqTLA"),
     Index.ClueWeb22,
-    base_url="https://chatnoir.web.webis.de/"
+    staging=True,
 )
 print(contents)
 
 plain_contents = cache_contents(
     ShortUUID("6svePe3PXteDeGPk1XqTLA"),
     Index.ClueWeb22,
     plain=True,
-    base_url="https://chatnoir.web.webis.de/"
+    staging=True,
 )
 print(plain_contents)
 ```

diff --git a/chatnoir_api/cache.py b/chatnoir_api/cache.py
@@ -4,22 +4,23 @@
 
 from requests import get, Response
 
-from chatnoir_api.constants import BASE_URL
+from chatnoir_api.constants import BASE_URL, BASE_URL_STAGING
 from chatnoir_api.model import Index
 
 
 def cache_contents(
         uuid_or_document_id: Union[UUID, str],
         index: Index,
         plain: bool = False,
-        base_url: str = BASE_URL,
+        staging: bool = False,
 ) -> str:
     uuid: UUID
     if isinstance(uuid_or_document_id, str):
         uuid = uuid5(NAMESPACE_URL, f"{index.prefix}:{uuid_or_document_id}")
     else:
         uuid = uuid_or_document_id
 
+    base_url = BASE_URL_STAGING if staging else BASE_URL
     response: Response = get(
         urljoin(base_url, "cache"),
         params={

diff --git a/chatnoir_api/model/result.py b/chatnoir_api/model/result.py
@@ -47,7 +47,7 @@ class MinimalResultStaging(MinimalResult, ABC):
     title: HighlightedText
 
     def cache_contents(self, plain: bool = False) -> str:
-        return cache_contents(self.uuid, self.index, plain)
+        return cache_contents(self.uuid, self.index, plain, staging=True)
 
 
 class ExplainedMinimalResultStaging(

diff --git a/examples/cache.py b/examples/cache.py
@@ -31,14 +31,14 @@
 contents = cache_contents(
     ShortUUID("MzOlTIayX9ub7c13GLPr_g"),
     Index.ClueWeb22,
-    base_url="https://chatnoir.web.webis.de/"
+    staging=True,
 )
 print(contents)
 
 plain_contents = cache_contents(
     ShortUUID("MzOlTIayX9ub7c13GLPr_g"),
     Index.ClueWeb22,
     plain=True,
-    base_url="https://chatnoir.web.webis.de/"
+    staging=True,
 )
 print(plain_contents)
diff --git a/tests/test_cache.py b/tests/test_cache.py
@@ -53,7 +53,7 @@ def test_html_contents_short_uuid():
     contents = cache_contents(
         ShortUUID("f6J0lMPmVfWs19jJNQkHKA"),
         Index.ClueWeb22,
-        base_url="https://chatnoir.web.webis.de/"
+        staging=True,
     )
 
     assert contents is not None
@@ -67,7 +67,7 @@ def test_html_contents_plain_short_uuid():
         ShortUUID("f6J0lMPmVfWs19jJNQkHKA"),
         Index.ClueWeb22,
         plain=True,
-        base_url="https://chatnoir.web.webis.de/"
+        staging=True,
     )
 
     assert contents is not None