From a6359d6b272c6fc83f570e32c34979dea47d31b2 Mon Sep 17 00:00:00 2001
From: Fernanda Ponce <ponce.anafernanda@gmail.com>
Date: Tue, 30 Jul 2024 17:27:03 +0200
Subject: [PATCH 1/3] curl -> request for metadata

---
 src/ibc_api/metadata.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/ibc_api/metadata.py b/src/ibc_api/metadata.py
index 8e97c98..a952188 100644
--- a/src/ibc_api/metadata.py
+++ b/src/ibc_api/metadata.py
@@ -3,6 +3,8 @@
 import json
 import os
 
+import requests
+
 REMOTE_ROOT = "https://api.github.com/repos/individual-brain-charting/api/contents/src/ibc_api/data"
 
 LOCAL_ROOT = os.path.join(os.path.dirname(__file__), "data")
@@ -103,11 +105,7 @@ def _find_latest_version(dataset):
     return latest_version_index
 
 
-def fetch_remote_file(
-    file,
-    remote_root=REMOTE_ROOT,
-    local_root=LOCAL_ROOT,
-):
+def fecth_remote_file(file, remote_root=REMOTE_ROOT, local_root=LOCAL_ROOT):
     """Fetch a file from the IBC docs repo
 
     Parameters
@@ -124,17 +122,17 @@ def fetch_remote_file(
     str
         full path of the fetched file
     """
-    # Link to the json file on the IBC docs repo
-    remote_file = f"{remote_root}/{file}"
+    # Link to the file on the IBC docs repo
+    r = requests.get(f"{remote_root}/{file}")
     # save the file locally
-    save_as = os.path.join(local_root, file)
-    # use curl with github api to download the file
-    os.system(
-        f"curl -s -S -L -H 'Accept: application/vnd.github.v4.raw' -H 'X-GitHub-Api-Version: 2022-11-28' {remote_file} -o '{save_as}'"
-    )
+    f = open(os.path.join(local_root, file), "wb")
+    for chunk in r.iter_content(chunk_size=512):
+        if chunk:
+            f.write(chunk)
+    f.close()
 
     # Return the data
-    return save_as
+    return f.name
 
 
 def fetch_metadata(file="datasets.json"):

From 35d6b7dcd715bf3c6fe03700b351f6ad91d9ca83 Mon Sep 17 00:00:00 2001
From: Fernanda Ponce <ponce.anafernanda@gmail.com>
Date: Wed, 31 Jul 2024 10:18:34 +0200
Subject: [PATCH 2/3] formatting of request function

---
 src/ibc_api/metadata.py | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/ibc_api/metadata.py b/src/ibc_api/metadata.py
index a952188..c49f542 100644
--- a/src/ibc_api/metadata.py
+++ b/src/ibc_api/metadata.py
@@ -5,7 +5,7 @@
 
 import requests
 
-REMOTE_ROOT = "https://api.github.com/repos/individual-brain-charting/api/contents/src/ibc_api/data"
+REMOTE_ROOT = "https://raw.githubusercontent.com/individual-brain-charting/api/main/src/ibc_api/data/"
 
 LOCAL_ROOT = os.path.join(os.path.dirname(__file__), "data")
 os.makedirs(LOCAL_ROOT, exist_ok=True)
@@ -105,7 +105,7 @@ def _find_latest_version(dataset):
     return latest_version_index
 
 
-def fecth_remote_file(file, remote_root=REMOTE_ROOT, local_root=LOCAL_ROOT):
+def fetch_remote_file(file, remote_root=REMOTE_ROOT, local_root=LOCAL_ROOT):
     """Fetch a file from the IBC docs repo
 
     Parameters
@@ -122,17 +122,25 @@ def fecth_remote_file(file, remote_root=REMOTE_ROOT, local_root=LOCAL_ROOT):
     str
         full path of the fetched file
     """
-    # Link to the file on the IBC docs repo
-    r = requests.get(f"{remote_root}/{file}")
-    # save the file locally
-    f = open(os.path.join(local_root, file), "wb")
-    for chunk in r.iter_content(chunk_size=512):
-        if chunk:
-            f.write(chunk)
-    f.close()
-
-    # Return the data
-    return f.name
+    # Construct the url
+    url = f"{remote_root}/{file}"
+
+    try:
+        r = requests.get(url)
+        r.raise_for_status()
+
+        # Save the file locally
+        local_file = os.path.join(local_root, file)
+        with open(local_file, "wb") as f:
+            for chunk in r.iter_content(chunk_size=512):
+                if chunk:
+                    f.write(chunk)
+
+        return local_file
+
+    except requests.exceptions.HTTPError as err:
+        print(f"Error fetching {file}: {err}")
+        return None
 
 
 def fetch_metadata(file="datasets.json"):

From 5c15a44d62f31187b0e83a2db2a9a703bc3ecb6e Mon Sep 17 00:00:00 2001
From: Fernanda Ponce <ana.ponce-martinez@inria.fr>
Date: Wed, 31 Jul 2024 13:55:06 +0200
Subject: [PATCH 3/3] raising error instead of just printing

Co-authored-by: Himanshu Aggarwal <himanshuaggarwal1997@gmail.com>
---
 src/ibc_api/metadata.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ibc_api/metadata.py b/src/ibc_api/metadata.py
index c49f542..43d0e29 100644
--- a/src/ibc_api/metadata.py
+++ b/src/ibc_api/metadata.py
@@ -139,8 +139,7 @@ def fetch_remote_file(file, remote_root=REMOTE_ROOT, local_root=LOCAL_ROOT):
         return local_file
 
     except requests.exceptions.HTTPError as err:
-        print(f"Error fetching {file}: {err}")
-        return None
+        raise(f"Error fetching {file}: {err}")
 
 
 def fetch_metadata(file="datasets.json"):