REF: Fix more mypy warnings

Author: cjdsellers

databento/common/metadata.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any, Callable, Dict
 
 from databento.common.parsing import int_to_compression, int_to_schema, int_to_stype
 from dbz_python import decode_metadata
@@ -25,7 +25,7 @@ def decode_to_json(raw_metadata: bytes) -> Dict[str, Any]:
 
         """
 
-        def enum_value(fn):
+        def enum_value(fn: Callable) -> Any:
             return lambda x: fn(x).value
 
         metadata = decode_metadata(raw_metadata)

databento/common/symbology.py

@@ -1,6 +1,8 @@
 import datetime as dt
+from dataclasses import dataclass
 
 
+@dataclass(frozen=True)
 class ProductIdMappingInterval:
     """
     Represents a product ID to native symbol mapping over a start and end date
@@ -18,23 +20,7 @@ class ProductIdMappingInterval:
         The product ID value.
     """
 
-    def __init__(
-        self,
-        start_date: dt.date,
-        end_date: dt.date,
-        native: str,
-        product_id: int,
-    ):
-        self.start_date = start_date
-        self.end_date = end_date
-        self.native = native
-        self.product_id = product_id
-
-    def __repr__(self):
-        return (
-            f"{type(self).__name__}("
-            f"start_date={self.start_date}, "
-            f"end_date={self.end_date}, "
-            f"native='{self.native}', "
-            f"product_id={self.product_id})"
-        )
+    start_date: dt.date
+    end_date: dt.date
+    native: str
+    product_id: int

databento/historical/api/batch.py

@@ -26,7 +26,7 @@ class BatchHttpAPI(BentoHttpAPI):
     Provides request methods for the batch HTTP API endpoints.
     """
 
-    def __init__(self, key, gateway):
+    def __init__(self, key: str, gateway: str) -> None:
         super().__init__(key=key, gateway=gateway)
         self._base_url = gateway + f"/v{API_VERSION}/batch"
 

databento/historical/api/metadata.py

@@ -21,7 +21,7 @@ class MetadataHttpAPI(BentoHttpAPI):
     Provides request methods for the metadata HTTP API endpoints.
     """
 
-    def __init__(self, key, gateway):
+    def __init__(self, key: str, gateway: str) -> None:
         super().__init__(key=key, gateway=gateway)
         self._base_url = gateway + f"/v{API_VERSION}/metadata"
 

databento/historical/api/symbology.py

@@ -14,7 +14,7 @@ class SymbologyHttpAPI(BentoHttpAPI):
     Provides request methods for the symbology HTTP API endpoints.
     """
 
-    def __init__(self, key, gateway):
+    def __init__(self, key: str, gateway: str) -> None:
         super().__init__(key=key, gateway=gateway)
         self._base_url = gateway + f"/v{API_VERSION}/symbology"
 

databento/historical/api/timeseries.py

@@ -15,7 +15,7 @@ class TimeSeriesHttpAPI(BentoHttpAPI):
     Provides request methods for the time series HTTP API endpoints.
     """
 
-    def __init__(self, key, gateway):
+    def __init__(self, key: str, gateway: str) -> None:
         super().__init__(key=key, gateway=gateway)
         self._base_url = gateway + f"/v{API_VERSION}/timeseries"
 

databento/historical/error.py

@@ -1,3 +1,6 @@
+from typing import Any, Dict, Optional, Union
+
+
 class BentoError(Exception):
     """
     Represents a Databento specific error.
@@ -13,18 +16,18 @@ class BentoHttpError(BentoError):
 
     def __init__(
         self,
-        http_status=None,
-        http_body=None,
-        json_body=None,
-        message=None,
-        headers=None,
-    ):
+        http_status: int,
+        http_body: Optional[Union[bytes, str]] = None,
+        json_body: Optional[Dict[str, Any]] = None,
+        message: Optional[str] = None,
+        headers: Optional[Any] = None,
+    ) -> None:
         super(BentoHttpError, self).__init__(message)
 
-        if http_body and hasattr(http_body, "decode"):
+        if http_body and isinstance(http_body, bytes):
             try:
                 http_body = http_body.decode("utf-8")
-            except BaseException:
+            except UnicodeDecodeError:
                 http_body = (
                     "<Could not decode body as utf-8. "
                     "Please report to [email protected]>"
@@ -37,15 +40,15 @@ def __init__(
         self.headers = headers or {}
         self.request_id = self.headers.get("request-id", None)
 
-    def __str__(self):
+    def __str__(self) -> str:
         msg = self.message or "<empty message>"
         msg = f"{self.http_status} {msg}"
         if self.request_id is not None:
             return f"Request {self.request_id}: {msg}"
         else:
             return msg
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return (
             f"{type(self).__name__}("
             f"request_id={self.request_id}, "
@@ -61,15 +64,15 @@ class BentoServerError(BentoHttpError):
 
     def __init__(
         self,
-        http_status=None,
-        http_body=None,
-        json_body=None,
-        message=None,
-        headers=None,
-    ):
+        http_status: int,
+        http_body: Optional[Union[bytes, str]] = None,
+        json_body: Optional[Dict[str, Any]] = None,
+        message: Optional[str] = None,
+        headers: Optional[Any] = None,
+    ) -> None:
         super().__init__(
-            http_body=http_body,
             http_status=http_status,
+            http_body=http_body,
             json_body=json_body,
             message=message,
             headers=headers,
@@ -83,15 +86,15 @@ class BentoClientError(BentoHttpError):
 
     def __init__(
         self,
-        http_status=None,
-        http_body=None,
-        json_body=None,
-        message=None,
-        headers=None,
-    ):
+        http_status: int,
+        http_body: Optional[Union[bytes, str]] = None,
+        json_body: Optional[Dict[str, Any]] = None,
+        message: Optional[str] = None,
+        headers: Optional[Any] = None,
+    ) -> None:
         super().__init__(
-            http_body=http_body,
             http_status=http_status,
+            http_body=http_body,
             json_body=json_body,
             message=message,
             headers=headers,