fix: improve error handling in NotionExtractor data fetching

Signed-off-by: -LAN- <laipz8200@outlook.com>
langgenius · Dec 28, 2024 · 2b1b148 · 2b1b148
1 parent 901028f
commit 2b1b148
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/api/core/rag/extractor/notion_extractor.py b/api/core/rag/extractor/notion_extractor.py
@@ -138,17 +138,24 @@ def _get_notion_block_data(self, page_id: str) -> list[str]:
         block_url = BLOCK_CHILD_URL_TMPL.format(block_id=page_id)
         while True:
             query_dict: dict[str, Any] = {} if not start_cursor else {"start_cursor": start_cursor}
-            res = requests.request(
-                "GET",
-                block_url,
-                headers={
-                    "Authorization": "Bearer " + self._notion_access_token,
-                    "Content-Type": "application/json",
-                    "Notion-Version": "2022-06-28",
-                },
-                params=query_dict,
-            )
-            data = res.json()
+            try:
+                res = requests.request(
+                    "GET",
+                    block_url,
+                    headers={
+                        "Authorization": "Bearer " + self._notion_access_token,
+                        "Content-Type": "application/json",
+                        "Notion-Version": "2022-06-28",
+                    },
+                    params=query_dict,
+                )
+                if res.status_code != 200:
+                    raise ValueError(f"Error fetching Notion block data: {res.text}")
+                data = res.json()
+            except requests.RequestException as e:
+                raise ValueError("Error fetching Notion block data") from e
+            if "results" not in data or not isinstance(data["results"], list):
+                raise ValueError("Error fetching Notion block data")
             for result in data["results"]:
                 result_type = result["type"]
                 result_obj = result[result_type]