remove 'extracts' from base_url

ipums · Apr 30, 2024 · 1c7ad2d · 1c7ad2d
1 parent dc6457b
commit 1c7ad2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/ipumspy/api/core.py b/src/ipumspy/api/core.py
@@ -75,7 +75,7 @@ class IpumsApiClient:
     def __init__(
         self,
         api_key: str,
-        base_url: str = "https://api.ipums.org/extracts",
+        base_url: str = "https://api.ipums.org",
         api_version: str = 2,
         num_retries: int = 3,
         session: Optional[requests.Session] = None,
@@ -176,7 +176,7 @@ def submit_extract(
         if extract.api_version is None:
             extract.api_version = self.api_version
         response = self.post(
-            self.base_url,
+            f"{self.base_url}/extracts",
             params={"collection": extract.collection, "version": extract.api_version},
             json=extract.build(),
         )
@@ -210,7 +210,7 @@ def extract_status(
 
         try:
             response = self.get(
-                f"{self.base_url}/{extract_id}",
+                f"{self.base_url}/extracts/{extract_id}",
                 params={"collection": collection, "version": self.api_version},
             )
         except IpumsNotFound:
@@ -277,7 +277,7 @@ def download_extract(
             )
 
         response = self.get(
-            f"{self.base_url}/{extract_id}",
+            f"{self.base_url}/extracts/{extract_id}",
             params={"collection": collection, "version": self.api_version},
         )
 
@@ -393,7 +393,7 @@ def get_previous_extracts(self, collection: str, limit: int = 10) -> List[Dict]:
         """
         # TODO: Wrap results in Extract objects.
         output = self.get(
-            self.base_url,
+            f"{self.base_url}/extracts",
             params={
                 "collection": collection,
                 "pageSize": limit,
@@ -425,7 +425,7 @@ def get_extract_info(
             return extract._info
         else:
             extract_info = self.get(
-                f"{self.base_url}/{extract_id}",
+                f"{self.base_url}/extracts/{extract_id}",
                 params={"collection": collection, "version": self.api_version},
             ).json()
             new_line = "\n"
@@ -500,7 +500,7 @@ def _get_pages(
         # made this a private method looking forward to making this a more
         # general purpose generator for non-extract endpoints
         first_page = self.get(
-            self.base_url,
+            f"{self.base_url}/extracts",
             params={
                 "collection": collection,
                 "version": self.api_version,

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -46,7 +46,7 @@ def mock_api() -> str:
     )
     time.sleep(1)  # Give it enough time to warm up
     try:
-        yield "http://127.0.0.1:8989/extracts"
+        yield "http://127.0.0.1:8989"
     finally:
         p.kill()
 

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -25,7 +25,7 @@ def mock_api() -> str:
     )
     time.sleep(1)  # Give it enough time to warm up
     try:
-        yield "http://127.0.0.1:9898/extracts"
+        yield "http://127.0.0.1:9898"
     finally:
         p.kill()