seer-pas-sdk 1.1.1__py3-none-any.whl → 1.2.1__py3-none-any.whl

seer_pas_sdk/core/sdk.py

@@ -7,7 +7,6 @@ import requests
 import urllib.request
 import ssl
 
-
 from typing import List as _List, Tuple as _Tuple
 
 from ..common import *
@@ -15,8 +14,6 @@ from ..auth import Auth
 from ..objects.volcanoplot import VolcanoPlotBuilder
 from ..objects.headers import *
 
-import warnings
-
 
 class SeerSDK:
     """
@@ -31,31 +28,57 @@ class SeerSDK:
     >>> seer_sdk = SeerSDK(USERNAME, PASSWORD, INSTANCE)
     """
 
-    def __init__(self, username, password, instance="US", tenant=None):
+    def __init__(
+        self,
+        username: str,
+        password: str,
+        instance: str = "US",
+        tenant: str = None,
+        tenant_id: str = None,
+    ):
         try:
             self._auth = Auth(username, password, instance)
 
             self._auth._login()
             print(f"User '{username}' logged in.\n")
+        except Exception as e:
+            raise ValueError(
+                f"Could not log in.\nPlease check your credentials and/or instance: {e}."
+            )
 
-            if not tenant:
-                tenant = self._auth.active_tenant_id
-            try:
-                self.switch_tenant(tenant)
-            except Exception as e:
+        # direct logged in user to the specified tenant
+        tenant_data = pd.DataFrame(
+            self.get_user_tenant(index=False),
+            columns=["institution", "tenantId"],
+        ).rename(
+            columns={"institution": "Tenant name", "tenantId": "Tenant ID"}
+        )
+        tenant_names = tenant_data["Tenant name"].tolist()
+        tenant_ids = tenant_data["Tenant ID"].tolist()
+
+        # precondition: None is not a valid tenant_name or tenant_id.
+        if tenant_id is None and tenant is None:
+            self.logout()
+            if None in tenant_names:
                 print(
-                    f"Encountered an error directing you to tenant {tenant}: {e}."
+                    "Warning: You have access to a tenant with no name. Please either provide a tenant name in the PAS website or specify a tenant_id to access that tenant."
                 )
-                print("Logging into home tenant...")
-                # If an error occurs while directing the user to a tenant, default to home tenant.
-                print(f"You are now active in {self.get_active_tenant_name()}")
-        except ServerError as e:
-            raise e
-        except Exception as e:
             raise ValueError(
-                f"Could not log in.\nPlease check your credentials and/or instance: {e}."
+                f"Either tenant or tenant_id must be provided. Please indicate one of the following tenants: \n{tenant_data.to_string(index=False)}"
             )
 
+        if tenant_id not in tenant_ids:
+            if tenant in tenant_names:
+                # if multiple tenants exist for the same institution name, fall back on multiple tenant error in switch_tenant.
+                self.switch_tenant(tenant)
+            else:
+                self.logout()
+                raise ValueError(
+                    f"Invalid tenant or tenant_id provided. Please indicate one of the following tenants: \n{tenant_data.to_string(index=False)}"
+                )
+        else:
+            self.switch_tenant(tenant_id)
+
     def logout(self):
         """
         Perform a logout operation for the current user of the SDK instance.
@@ -115,7 +138,7 @@ class SeerSDK:
             response = s.get(f"{self._auth.url}api/v1/usertenants")
 
             if response.status_code != 200:
-                raise ValueError(
+                raise ServerError(
                     "Invalid request. Please check your parameters."
                 )
 
@@ -1202,8 +1225,8 @@ class SeerSDK:
 
         >>> seer_sdk.get_msruns(sample_ids)
         >>> [
-            {"id": "SAMPLE_ID_1_HERE" ... },
-            {"id": "SAMPLE_ID_2_HERE" ... }
+            {"id": "MSRUN_ID_1_HERE" ... },
+            {"id": "MSRUN_ID_2_HERE" ... }
         ]
 
         >>> seer_sdk.get_msruns(sample_ids, as_df=True)
@@ -1269,8 +1292,8 @@ class SeerSDK:
 
         >>> seer_sdk.find_msruns(sample_ids)
         >>> [
-            {"id": "SAMPLE_ID_1_HERE" ... },
-            {"id": "SAMPLE_ID_2_HERE" ... }
+            {"id": "MSRUN_ID_1_HERE" ... },
+            {"id": "MSRUN_ID_2_HERE" ... }
         ]
 
         >>> seer_sdk.find_msruns(sample_ids, as_df=True)
@@ -1284,25 +1307,34 @@ class SeerSDK:
         URL = f"{self._auth.url}api/v1/msdatas/items"
 
         res = []
-        for sample_id in sample_ids:
 
-            with self._get_auth_session("findmsdatas") as s:
+        params = {"all": "true"}
 
-                msdatas = s.post(URL, json={"sampleId": sample_id})
+        with self._get_auth_session("findmsdatas") as s:
 
-                if msdatas.status_code != 200 or not msdatas.json()["data"]:
-                    raise ValueError(
-                        f"Failed to fetch MS data for sample ID={sample_id}."
-                    )
+            msdatas = s.post(
+                URL, json={"sampleId": ",".join(sample_ids)}, params=params
+            )
 
-                res += [x for x in msdatas.json()["data"]]
+            if msdatas.status_code != 200 or not msdatas.json()["data"]:
+                raise ValueError(
+                    f"Failed to fetch MS data for sample IDs={sample_ids}."
+                )
+
+            res += [x for x in msdatas.json()["data"]]
 
         spaces = {x["id"]: x["usergroup_name"] for x in self.get_spaces()}
+
+        def filepath_to_msrunid(filepath):
+            return os.path.basename(filepath).split(".")[0]
+
         for entry in res:
             if "tenant_id" in entry:
                 del entry["tenant_id"]
 
             if "raw_file_path" in entry:
+                # Provide a human-readable MS run id
+                entry["Run"] = filepath_to_msrunid(entry["raw_file_path"])
                 # Simple lambda function to find the third occurrence of '/' in the raw file path
                 location = lambda s: len(s) - len(s.split("/", 3)[-1])
                 # Slicing the string from the location
@@ -1313,6 +1345,13 @@ class SeerSDK:
                 entry["space"] = spaces.get(entry["user_group"], "General")
                 del entry["user_group"]
 
+            # Rename the key sample_id to sample_uuid
+            if "sample_id" in entry:
+                entry["sample_uuid"] = entry.pop("sample_id")
+            # Rename the key sample_id_tracking to sample_id
+            if "sample_id_tracking" in entry:
+                entry["sample_id"] = entry.pop("sample_id_tracking")
+
         if not res and as_df:
             return pd.DataFrame(columns=MSRUN_COLUMNS)
         return res if not as_df else dict_to_df(res)
@@ -1471,7 +1510,7 @@ class SeerSDK:
                             analysis_protocol_engine=res["analysis_engine"],
                         )
                     )
-                except:
+                except Exception:
                     res["fasta"] = ""
                 return res
         else:
@@ -1590,10 +1629,7 @@ class SeerSDK:
                 try:
                     res[entry]["fasta"] = ",".join(
                         self._get_analysis_protocol_fasta_filenames(
-                            analysis_protocol_id=res[entry]["id"],
-                            analysis_protocol_engine=res[entry].get(
-                                "analysis_engine", None
-                            ),
+                            analysis_protocol_id=res[entry]["id"]
                         )
                     )
                 except:
@@ -1821,22 +1857,16 @@ class SeerSDK:
                 if not res.get("is_folder") and res.get(
                     "analysis_protocol_id"
                 ):
-                    analysis_protocol = self.get_analysis_protocol(
-                        analysis_protocol_id=res.get("analysis_protocol_id")
-                    )
                     try:
                         res["fasta"] = ",".join(
                             self._get_analysis_protocol_fasta_filenames(
                                 analysis_protocol_id=res.get(
                                     "analysis_protocol_id"
-                                ),
-                                analysis_protocol_engine=analysis_protocol.get(
-                                    "analysis_engine", None
-                                ),
+                                )
                             )
                         )
                     except Exception as e:
-                        print("Warning: Could not fetch fasta files.")
+                        print("Error: Could not fetch fasta files.")
                         res["fasta"] = None
                 else:
                     res["fasta"] = None
@@ -1854,49 +1884,60 @@ class SeerSDK:
             else:
                 return res[0]
 
+    def _lookup_analysis_folders(self):
+        """
+        Helper function to map analysis folder ids to names.
+        """
+        with self._get_auth_session("getanalysisfolders") as s:
+            URL = f"{self._auth.url}api/v1/analyses"
+            params = {"all": "true", "folderonly": "true"}
+            folders = s.get(URL, params=params)
+            if folders.status_code != 200:
+                raise ValueError(
+                    "Failed to fetch analysis folders. Please check your connection."
+                )
+            res = folders.json()["data"]
+            return res
+
     def find_analyses(
         self,
         analysis_id: str = None,
+        analysis_name: str = None,
         folder_id: str = None,
-        show_folders: bool = True,
-        analysis_only: bool = True,
+        folder_name: str = None,
         project_id: str = None,
+        project_name: str = None,
         plate_name: str = None,
         as_df=False,
-        **kwargs,
     ):
         """
-        Returns a list of analyses objects for the authenticated user. If no id is provided, returns all analyses for the authenticated user.
-        Search parameters may be passed in as keyword arguments to filter the results. Acceptable values are 'analysis_name', 'folder_name', 'description', 'notes', or 'number_msdatafile'.
-        Only search on a single field is supported.
+        Returns a list of analyses objects for the authenticated user. If None is provided for all query arguments, returns all analyses for the authenticated user.
 
         Parameters
         ----------
         analysis_id : str, optional
             ID of the analysis to be fetched, defaulted to None.
 
+        analysis_name : str, optional
+            Name of the analysis to be fetched, defaulted to None. Results will be matched on substring basis.
+
         folder_id : str, optional
-            ID of the folder to be fetched, defaulted to None.
+            Unique ID of an analysis folder to filter results, defaulted to None.
 
-        show_folders : bool, optional
-            Mark True if folder contents are to be returned in the response, i.e. recursive search, defaulted to True.
-            Will be disabled if an analysis id is provided.
-
-        analysis_only : bool, optional
-            Mark True if only analyses objects are to be returned in the response, defaulted to True.
-            If marked false, folder objects will also be included in the response.
+        folder_name : str, optional
+            Name of an analysis folder to filter results, defaulted to None.
 
         project_id : str, optional
-            ID of the project to be fetched, defaulted to None.
+            Unique ID of an analysis folder to filter results, defaulted to None.
+
+        project_name : str, optional
+            Name of a project to filter results, defaulted to None.
 
         plate_name : str, optional
-            Name of the plate to be fetched, defaulted to None.
+            Name of a plate to filter results, defaulted to None.
 
         as_df : bool, optional
-            whether the result should be converted to a DataFrame, defaulted to False.
-
-        **kwargs : dict, optional
-            Search keyword parameters to be passed in. Acceptable values are 'analysis_name', 'folder_name', 'analysis_protocol_name', 'description', 'notes', or 'number_msdatafile'.
+            Whether the result should be converted to a DataFrame, defaulted to False.
 
         Returns
         -------
@@ -1930,51 +1971,44 @@ class SeerSDK:
         URL = f"{self._auth.url}api/v1/analyses"
         res = []
 
-        search_field = None
-        search_item = None
-        if kwargs:
-            if len(kwargs.keys()) > 1:
-                raise ValueError("Please include only one search parameter.")
-            search_field = list(kwargs.keys())[0]
-            search_item = kwargs[search_field]
-
-            if not search_item:
-                raise ValueError(
-                    f"Please provide a non null value for {search_field}"
-                )
-
-        if search_field and search_field not in [
-            "analysis_name",
-            "folder_name",
-            "analysis_protocol_name",
-            "description",
-            "notes",
-            "number_msdatafile",
-        ]:
-            raise ValueError(
-                "Invalid search field. Please choose between 'analysis_name', 'folder_name', 'analysis_protocol_name', 'description', 'notes', or 'number_msdatafile'."
-            )
-
         if analysis_id:
             try:
                 return [self.get_analysis(analysis_id=analysis_id)]
-            except:
+            except Exception:
                 return []
 
+        analysis_folders = self._lookup_analysis_folders()
+        analysis_folder_id_to_name = {
+            x["id"]: x["analysis_name"] for x in analysis_folders
+        }
+        analysis_folder_name_to_id = {
+            v: k for k, v in analysis_folder_id_to_name.items()
+        }
+
+        if folder_name and not folder_id:
+            folder_id = analysis_folder_name_to_id.get(folder_name, None)
+            if not folder_id:
+                raise ValueError(f"No folder found with name '{folder_name}'.")
+
+        if project_name and not project_id:
+            project = self.get_project(project_name=project_name)
+            if not project:
+                raise ValueError(
+                    f"No project found with name '{project_name}'."
+                )
+            project_id = project["id"]
+
         with self._get_auth_session("findanalyses") as s:
 
-            params = {"all": "true"}
+            params = {"all": "true", "analysisonly": "true"}
             if folder_id:
                 params["folder"] = folder_id
 
-            if search_field:
-                params["searchFields"] = search_field
-                params["searchItem"] = search_item
+            if analysis_name:
+                params["searchFields"] = "analysis_name"
+                params["searchItem"] = analysis_name
                 del params["all"]
 
-                if search_field == "folder_name":
-                    params["searchFields"] = "analysis_name"
-
             if project_id:
                 params["projectId"] = project_id
 
@@ -1989,9 +2023,8 @@ class SeerSDK:
                 )
             res = analyses.json()["data"]
 
-            folders = []
             spaces = {x["id"]: x["usergroup_name"] for x in self.get_spaces()}
-            protocol_to_engine_map = dict()
+            protocol_to_fasta = {}
             for entry in range(len(res)):
                 if "tenant_id" in res[entry]:
                     del res[entry]["tenant_id"]
@@ -2005,11 +2038,14 @@ class SeerSDK:
                     ][location(res[entry]["parameter_file_path"]) :]
 
                 if (
-                    show_folders
-                    and not analysis_id
-                    and res[entry]["is_folder"]
+                    "folder_id" in res[entry]
+                    and res[entry]["folder_id"] is not None
                 ):
-                    folders.append(res[entry]["id"])
+                    res[entry]["folder_name"] = analysis_folder_id_to_name.get(
+                        res[entry]["folder_id"], None
+                    )
+                    res[entry]["folder_uuid"] = res[entry]["folder_id"]
+                    del res[entry]["folder_id"]
 
                 if "user_group" in res[entry]:
                     res[entry]["space"] = spaces.get(
@@ -2020,51 +2056,34 @@ class SeerSDK:
                 if (not res[entry].get("is_folder")) and res[entry].get(
                     "analysis_protocol_id"
                 ):
-                    if (
-                        res[entry]["analysis_protocol_id"]
-                        in protocol_to_engine_map
-                    ):
-                        analysis_protocol_engine = protocol_to_engine_map[
-                            res[entry]["analysis_protocol_id"]
+                    # analysis_protocol_id for this result row
+                    local_analysis_protocol_id = res[entry].get(
+                        "analysis_protocol_id"
+                    )
+                    if local_analysis_protocol_id in protocol_to_fasta:
+                        res[entry]["fasta"] = protocol_to_fasta[
+                            local_analysis_protocol_id
                         ]
                     else:
                         try:
-                            analysis_protocol = self.get_analysis_protocol(
-                                analysis_protocol_id=res[entry].get(
-                                    "analysis_protocol_id"
+                            res[entry]["fasta"] = ",".join(
+                                self._get_analysis_protocol_fasta_filenames(
+                                    local_analysis_protocol_id,
+                                    analysis_protocol_engine=res[entry].get(
+                                        "analysis_engine"
+                                    ),
                                 )
                             )
-                            analysis_protocol_engine = analysis_protocol.get(
-                                "analysis_engine", None
+                            protocol_to_fasta[local_analysis_protocol_id] = (
+                                res[entry]["fasta"]
                             )
-                            protocol_to_engine_map[
-                                res[entry]["analysis_protocol_id"]
-                            ] = analysis_protocol_engine
                         except:
-                            analysis_protocol_engine = None
-                    try:
-                        res[entry]["fasta"] = ",".join(
-                            self._get_analysis_protocol_fasta_filenames(
-                                res[entry]["analysis_protocol_id"],
-                                analysis_protocol_engine=analysis_protocol_engine,
+                            print(
+                                f"Error: Could not fetch fasta files for analysis {res[entry].get('analysis_name')}."
                             )
-                        )
-                    except:
-                        print(
-                            f"Warning: Could not fetch fasta files for analysis {res[entry].get('analysis_name')}."
-                        )
-                        res[entry]["fasta"] = None
                 else:
                     res[entry]["fasta"] = None
 
-            # recursive solution to get analyses in folders
-            for folder in folders:
-                res += self.find_analyses(folder_id=folder)
-
-            if analysis_only:
-                res = [
-                    analysis for analysis in res if not analysis["is_folder"]
-                ]
             if not res and as_df:
                 return pd.DataFrame(columns=ANALYSIS_COLUMNS)
             return res if not as_df else dict_to_df(res)
@@ -2376,7 +2395,11 @@ class SeerSDK:
             return files
 
     def get_search_result(
-        self, analysis_id: str, analyte_type: str, rollup: str
+        self,
+        analysis_id: str,
+        analyte_type: str,
+        rollup: str,
+        columns: _List[str] = None,
     ):
         """
         Load one of the files available via the "Download result files" button on the PAS UI.
@@ -2417,6 +2440,7 @@ class SeerSDK:
                         "npLink"
                     ]["url"],
                     dtype=dtype,
+                    usecols=columns,
                 )
             elif rollup == "panel":
                 return download_df(
@@ -2424,6 +2448,7 @@ class SeerSDK:
                         "panelLink"
                     ]["url"],
                     dtype=dtype,
+                    usecols=columns,
                 )
         elif analyte_type == "peptide":
             if rollup == "np":
@@ -2432,6 +2457,7 @@ class SeerSDK:
                         "npLink"
                     ]["url"],
                     dtype=dtype,
+                    usecols=columns,
                 )
             elif rollup == "panel":
                 return download_df(
@@ -2439,12 +2465,14 @@ class SeerSDK:
                         "panelLink"
                     ]["url"],
                     dtype=dtype,
+                    usecols=columns,
                 )
         else:
             return download_df(
                 self.get_search_result_file_url(
                     analysis_id, filename="report.tsv"
-                )["url"]
+                )["url"],
+                usecols=columns,
             )
 
     def download_search_output_file(
@@ -4059,7 +4087,7 @@ class SeerSDK:
                 print(f"Downloaded file to {download_path}/{file}")
 
     def _get_analysis_protocol_fasta_filenames(
-        self, analysis_protocol_id: str, analysis_protocol_engine: str
+        self, analysis_protocol_id: str, analysis_protocol_engine: str = None
     ):
         """
         Helper function - Get the fasta file name(s) associated with a given analysis protocol and engine.
@@ -4069,6 +4097,14 @@ class SeerSDK:
             Returns:
                 list[str]: A list of fasta file names associated with the analysis protocol.
         """
+        if not analysis_protocol_engine:
+            analysis_protocol_engine = self.get_analysis_protocol(
+                analysis_protocol_id=analysis_protocol_id
+            ).get("analysis_engine")
+            if not analysis_protocol_engine:
+                raise ValueError(
+                    f"Could not retrieve analysis protocol engine for analysis protocol {analysis_protocol_id}."
+                )
         analysis_protocol_engine = analysis_protocol_engine.lower()
         if analysis_protocol_engine == "diann":
             URL = f"{self._auth.url}api/v1/analysisProtocols/editableParameters/diann/{analysis_protocol_id}"
@@ -4108,8 +4144,35 @@ class SeerSDK:
                 raise ServerError("No fasta file name returned from server.")
             return fasta_filenames
 
-    def get_analysis_protocol_fasta_link(
-        self, analysis_protocol_id=None, analysis_id=None, analysis_name=None
+    def _get_analysis_protocol_fasta_url(
+        self, analysis_protocol_fasta_name: str
+    ):
+        """
+        Helper function - Get the download link for a given fasta file name.
+
+        Args:
+            analysis_protocol_fasta_name (str): Name of the fasta file.
+
+        Returns:
+            str: The URL to download the fasta file.
+        """
+        URL = f"{self._auth.url}api/v1/analysisProtocolFiles/getUrl"
+        with self._get_auth_session("getanalysisprotocolfilesurl") as s:
+            response = s.post(
+                URL, json={"filepath": analysis_protocol_fasta_name}
+            )
+            if response.status_code != 200:
+                raise ServerError(
+                    f"Could not retrieve download link for {analysis_protocol_fasta_name}."
+                )
+            url = response.json()["url"]
+            return url
+
+    def get_analysis_protocol_fasta_urls(
+        self,
+        analysis_protocol_id=None,
+        analysis_id=None,
+        analysis_name=None,
     ):
         """Get the download link(s) for the fasta file(s) associated with a given analysis protocol.
         Args:
@@ -4120,52 +4183,31 @@ class SeerSDK:
         Returns:
             list[dict]: A list of dictionaries containing the 'filename' and the 'url' to download the fasta file.
         """
-        if analysis_name and (not analysis_id):
-            analyses = self.find_analyses(analysis_name=analysis_name)
-            if len(analyses) > 1:
-                raise ValueError(
-                    f"Multiple analyses found with name {analysis_name}. Please provide an analysis ID instead."
-                )
-            elif len(analyses) == 0:
-                raise ValueError(
-                    f"No analyses found with name {analysis_name}."
-                )
-            else:
-                analysis_id = analyses[0]["id"]
-
-        if not (bool(analysis_protocol_id) ^ bool(analysis_id)):
-            raise ValueError(
-                "Please provide either an analysis ID or an analysis protocol ID."
-            )
-
         if not analysis_protocol_id:
-            try:
-                analysis_protocol_id = self.get_analysis(
-                    analysis_id=analysis_id
-                )["analysis_protocol_id"]
-            except KeyError:
-                raise ValueError(f"Could not parse server response.")
+            analysis = self.get_analysis(
+                analysis_id=analysis_id,
+                analysis_name=analysis_name,
+            )
+            analysis_protocol_id = analysis.get("analysis_protocol_id")
 
-        engine = self.get_analysis_protocol(
-            analysis_protocol_id=analysis_protocol_id
-        ).get("analysis_engine", None)
         fasta_filenames = self._get_analysis_protocol_fasta_filenames(
-            analysis_protocol_id=analysis_protocol_id,
-            analysis_protocol_engine=engine,
+            analysis_protocol_id=analysis_protocol_id
         )
-        URL = f"{self._auth.url}api/v1/analysisProtocolFiles/getUrl"
-        links = []
-        for file in fasta_filenames:
-            with self._get_auth_session("getanalysisprotocolfilesurl") as s:
-                filename = os.path.basename(file)
-                response = s.post(URL, json={"filepath": file})
-                if response.status_code != 200:
-                    print(
-                        f"ERROR: Could not retrieve download link for {filename}."
-                    )
-                    continue
-                url = response.json()["url"]
-                links.append({"filename": filename, "url": url})
+
+        links = {}
+        for filepath in fasta_filenames:
+            filename = os.path.basename(filepath)
+            try:
+                url = self._get_analysis_protocol_fasta_url(
+                    analysis_protocol_fasta_name=filepath
+                )
+            except ServerError:
+                print(
+                    f"ERROR: Could not retrieve download link for {filename}."
+                )
+                continue
+
+            links[filename] = url
         return links
 
     def download_analysis_protocol_fasta(
@@ -4186,20 +4228,28 @@ class SeerSDK:
         Returns:
             list[str] : The path to the downloaded fasta file(s).
         """
-
-        links = [
-            (x["filename"], x["url"])
-            for x in self.get_analysis_protocol_fasta_link(
-                analysis_protocol_id=analysis_protocol_id,
-                analysis_id=analysis_id,
-                analysis_name=analysis_name,
+        if not analysis_protocol_id:
+            analysis = self.get_analysis(
+                analysis_id=analysis_id, analysis_name=analysis_name
             )
-        ]
+            analysis_protocol_id = analysis.get("analysis_protocol_id")
+
+        filepaths = self._get_analysis_protocol_fasta_filenames(
+            analysis_protocol_id=analysis_protocol_id
+        )
         if not download_path:
             download_path = os.getcwd()
 
         downloads = []
-        for filename, url in links:
+        for filepath in filepaths:
+            # run sequentially to avoid signed url expiration
+            url = self._get_analysis_protocol_fasta_url(
+                analysis_protocol_fasta_name=filepath
+            )
+            filename = os.path.basename(filepath)
+
+            # relative path of the file after download
+            local_filename = f"{download_path}/{filename}"
             print(f"Downloading {filename}")
             for _ in range(2):
                 try:
@@ -4215,7 +4265,7 @@ class SeerSDK:
                         )
                         urllib.request.urlretrieve(
                             url,
-                            f"{download_path}/{filename}",
+                            local_filename,
                             reporthook=download_hook(t),
                             data=None,
                         )
@@ -4224,5 +4274,5 @@ class SeerSDK:
                     if not os.path.isdir(f"{download_path}"):
                         os.makedirs(f"{download_path}")
 
-            downloads.append(f"{download_path}/{filename}")
+            downloads.append(local_filename)
         return downloads