bug: fix typing.Unpack in py3.10

src/imap_mag/SDC.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 
 import pandas as pd
+from typing_extensions import Unpack
 
 from .sdcApiClient import ISDCApiClient
 from .time import Time
@@ -46,7 +47,7 @@ def __init__(self, data_access: ISDCApiClient) -> None:
 
         self.__data_access = data_access
 
-    def QueryAndDownload(self, **options: typing.Unpack[SDCOptions]) -> list[Path]:
+    def QueryAndDownload(self, **options: Unpack[SDCOptions]) -> list[Path]:
         """Retrieve SDC data."""
 
         downloaded = []
@@ -114,7 +115,7 @@ def __check_download_needed(
         self,
         details: dict,
         date: datetime,
-        **options: typing.Unpack[SDCOptions],
+        **options: Unpack[SDCOptions],
     ) -> bool:
         """Check if files need to be downloaded."""
 

src/imap_mag/sdcApiClient.py

@@ -7,6 +7,7 @@
 from datetime import datetime
 
 import imap_data_access
+from typing_extensions import Unpack
 
 
 class FileOptions(typing.TypedDict):
@@ -41,7 +42,7 @@ class ISDCApiClient(abc.ABC):
 
     @staticmethod
     @abc.abstractmethod
-    def get_file_path(**options: typing.Unpack[FileOptions]) -> tuple[str, str]:
+    def get_file_path(**options: Unpack[FileOptions]) -> tuple[str, str]:
         """Get file path for data from imap-data-access."""
         pass
 
@@ -52,19 +53,19 @@ def upload(self, file_name: str) -> None:
 
     @abc.abstractmethod
     def unique_version(
-        self, **options: typing.Unpack[VersionOptions]
+        self, **options: Unpack[VersionOptions]
     ) -> tuple[str, str | None]:
         """Determine a unique version for the data by querying imap_data_access."""
         pass
 
     @abc.abstractmethod
-    def query(self, **options: typing.Unpack[QueryOptions]) -> list[dict[str, str]]:
+    def query(self, **options: Unpack[QueryOptions]) -> list[dict[str, str]]:
         """Download data from imap-data-access."""
         pass
 
     @abc.abstractmethod
     def get_filename(
-        self, **options: typing.Unpack[FileOptions]
+        self, **options: Unpack[FileOptions]
     ) -> list[dict[str, str]] | None:
         """Wait for file to be available in imap-data-access."""
         pass
@@ -82,7 +83,7 @@ def __init__(self, data_dir: str) -> None:
         imap_data_access.config["DATA_DIR"] = pathlib.Path(data_dir)
 
     @staticmethod
-    def get_file_path(**options: typing.Unpack[FileOptions]) -> tuple[str, str]:
+    def get_file_path(**options: Unpack[FileOptions]) -> tuple[str, str]:
         """Get file path for data from imap-data-access."""
 
         science_file = imap_data_access.ScienceFilePath.generate_from_inputs(
@@ -106,7 +107,7 @@ def upload(self, file_name: str) -> None:
             logging.warn(f"Upload failed: {e}")
 
     def unique_version(
-        self, **options: typing.Unpack[VersionOptions]
+        self, **options: Unpack[VersionOptions]
     ) -> tuple[str, str | None]:
         """Determine a unique version for the data by querying imap_data_access."""
 
@@ -132,7 +133,7 @@ def unique_version(
 
         return (unique_version, max_version)
 
-    def query(self, **options: typing.Unpack[QueryOptions]) -> list[dict[str, str]]:
+    def query(self, **options: Unpack[QueryOptions]) -> list[dict[str, str]]:
         """Download data from imap-data-access."""
 
         return imap_data_access.query(
@@ -152,7 +153,7 @@ def query(self, **options: typing.Unpack[QueryOptions]) -> list[dict[str, str]]:
         )
 
     def get_filename(
-        self, **options: typing.Unpack[FileOptions]
+        self, **options: Unpack[FileOptions]
     ) -> list[dict[str, str]] | None:
         science_file = imap_data_access.ScienceFilePath.generate_from_inputs(
             instrument="mag",