Appease mypy

Author: marc-sift

python/lib/sift_py/data_import/_parquet_test.py

@@ -5,7 +5,9 @@
 
 from sift_py.data_import.config import ParquetConfig
 from sift_py.data_import.parquet import ParquetUploadService, _extract_parquet_footer
+from sift_py.data_import.parquet_complex_types import ParquetComplexTypesImportModeType
 from sift_py.data_import.status import DataImportService
+from sift_py.data_import.time_format import TimeFormatType
 from sift_py.rest import SiftRestConfig
 
 
@@ -81,10 +83,7 @@ def test_upload_config_request_failed(mocker: MockFixture, parquet_config):
 
 def test_upload_invalid_config_response(mocker: MockFixture, parquet_config):
     mock_requests_post = mocker.patch("sift_py.rest.requests.Session.post")
-    mock_requests_post.return_value = MockResponse(status_code=200, text="not json")
-    mock_requests_post.return_value.json = lambda: (_ for _ in ()).throw(
-        Exception("Invalid response")
-    )
+    mock_requests_post.return_value = MockResponse(status_code=200, json_data=None)
     svc = ParquetUploadService(rest_config)
     with pytest.raises(Exception, match="Invalid response"):
         svc.upload("file.parquet", parquet_config)
@@ -142,10 +141,7 @@ def test_upload_from_url_failed(mocker: MockFixture, parquet_config):
 
 def test_upload_from_url_invalid_response(mocker: MockFixture, parquet_config):
     mock_requests_post = mocker.patch("sift_py.rest.requests.Session.post")
-    mock_requests_post.return_value = MockResponse(status_code=200, text="not json")
-    mock_requests_post.return_value.json = lambda: (_ for _ in ()).throw(
-        Exception("Invalid response")
-    )
+    mock_requests_post.return_value = MockResponse(status_code=200, json_data=None)
     svc = ParquetUploadService(rest_config)
     with pytest.raises(Exception, match="Invalid response"):
         svc.upload_from_url("http://file.parquet", parquet_config)
@@ -269,8 +265,8 @@ def test_flat_dataset_upload_overrides_success(mocker: MockFixture, parquet_conf
         "asset",
         "file.parquet",
         "time",
-        time_format="TIME_FORMAT_RELATIVE_SECONDS",
-        complex_types_import_mode="PARQUET_COMPLEX_TYPES_IMPORT_MODE_BYTES",
+        time_format=TimeFormatType.RELATIVE_SECONDS,
+        complex_types_import_mode=ParquetComplexTypesImportModeType.BYTES,
         run_id="run_42",
         relative_start_time="2024-01-01T00:00:00Z",
     )
@@ -388,8 +384,7 @@ def test_detect_config_flat_dataset_invalid_json(mocker: MockFixture):
         "sift_py.data_import.parquet._extract_parquet_footer", return_value=(b"footerbytes", 123)
     )
     mock_post = mocker.patch("sift_py.rest.requests.Session.post")
-    mock_post.return_value = MockResponse(status_code=200, text="not json")
-    mock_post.return_value.json = lambda: (_ for _ in ()).throw(Exception("Invalid response"))
+    mock_post.return_value = MockResponse(status_code=200, json_data=None)
     svc = ParquetUploadService(rest_config)
     svc._detect_config_uri = "http://detect.com"
     with pytest.raises(Exception, match="Invalid response"):

python/lib/sift_py/data_import/_utils.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Callable, List, Optional, Tuple, Union
 
-from alive_progress import alive_bar
+from alive_progress import alive_bar  # type: ignore
 
 
 def mime_and_content_type_from_path(path: Path) -> Tuple[str, Optional[str], Optional[str]]:
@@ -32,7 +32,7 @@ def validate_file_type(path: Union[str, Path], valid_file_types: List[str]) -> O
     return content_encoding
 
 
-def convert_keys_to_snake_case(obj):
+def convert_keys_to_snake_case(obj: dict) -> dict:
     """Recursively convert all dict keys from camelCase to snake_case."""
 
     def camel_to_snake(name: str) -> str:

python/lib/sift_py/data_import/parquet.py

@@ -45,7 +45,7 @@ def upload(
             parquet_config: The Parquet config.
             show_progress: Whether to show the status bar or not.
         """
-        if not path.endswith(".parquet"):
+        if not str(path).endswith(".parquet"):
             raise Exception("Must use an uncompressed parquet file")
 
         response = self._session.post(
@@ -154,7 +154,7 @@ def flat_dataset_upload(
         Override `run_id` to specify the id of the run to add this data to. Default is None.
         Override `relative_start_time` if a relative time format is used. Default is None.
         """
-        if not path.endswith(".parquet"):
+        if not str(path).endswith(".parquet"):
             raise Exception("Must use an uncompressed parquet file")
 
         config_info = self._detect_config_flat_dataset(path)

python/lib/sift_py/data_import/status.py

@@ -42,8 +42,8 @@ class DataImport(BaseModel):
     source_url: str = ""
     status: Union[str, DataImportStatusType]
     error_message: str = ""
-    csv_config: Optional[dict]
-    parquet_config: Optional[dict]
+    csv_config: Optional[dict] = None
+    parquet_config: Optional[dict] = None
 
     @field_validator("status", mode="before")
     @classmethod

python/lib/sift_py/file_attachment/_internal/upload.py

@@ -1,11 +1,11 @@
-import mimetypes
 from pathlib import Path
-from typing import Any, Dict, Optional, Tuple, Union
+from typing import Any, Dict, Optional, Union
 from urllib.parse import urljoin
 
 from requests_toolbelt import MultipartEncoder
 
 from sift_py._internal.convert.json import to_json
+from sift_py.data_import._utils import mime_and_content_type_from_path
 from sift_py.file_attachment.entity import Entity
 from sift_py.file_attachment.metadata import Metadata
 from sift_py.rest import SiftRestConfig, _RestService
@@ -41,9 +41,7 @@ def upload_attachment(
         if not posix_path.is_file():
             raise Exception(f"Provided path, '{path}', does not point to a regular file.")
 
-        file_name, mimetype, content_encoding = self.__class__._mime_and_content_type_from_path(
-            posix_path
-        )
+        file_name, mimetype, content_encoding = mime_and_content_type_from_path(posix_path)
 
         if not mimetype:
             raise Exception(f"The MIME-type of '{posix_path}' could not be computed.")
@@ -93,9 +91,3 @@ def upload_attachment(
                 )
 
             return response.json().get("remoteFile").get("remoteFileId")
-
-    @staticmethod
-    def _mime_and_content_type_from_path(path: Path) -> Tuple[str, Optional[str], Optional[str]]:
-        file_name = path.name
-        mime, encoding = mimetypes.guess_type(path)
-        return file_name, mime, encoding