Clean up load_from_thrustcurve_api and improve test_load_from_thrustcurve_api with exception testing

Author: Monta120

rocketpy/motors/motor.py

@@ -1,4 +1,5 @@
 import base64
+import logging
 import re
 import tempfile
 import warnings
@@ -9,7 +10,7 @@
 
 import numpy as np
 import requests
-import logging
+
 from ..mathutils.function import Function, funcify_method
 from ..plots.motor_plots import _MotorPlots
 from ..prints.motor_prints import _MotorPrints
@@ -1918,7 +1919,7 @@ def load_from_rse_file(
             interpolation_method=interpolation_method,
             coordinate_system_orientation=coordinate_system_orientation,
         )
-    
+
     @staticmethod
     def load_from_thrustcurve_api(name: str, **kwargs):
         """
@@ -1964,7 +1965,7 @@ def load_from_thrustcurve_api(name: str, **kwargs):
         motor_id = motor_info.get("motorId")
         designation = motor_info.get("designation", "").replace("/", "-")
         manufacturer = motor_info.get("manufacturer", "")
-        # Logging the fact that the motor was found 
+        # Logging the fact that the motor was found
         logger.info(f"Motor found: {designation} ({manufacturer})")
 
         # Step 2. Download the .eng file
@@ -1976,11 +1977,15 @@ def load_from_thrustcurve_api(name: str, **kwargs):
         dl_data = dl_response.json()
 
         if not dl_data.get("results"):
-            raise ValueError(f"No .eng file found for motor '{name}' in the ThrustCurve API.")
+            raise ValueError(
+                f"No .eng file found for motor '{name}' in the ThrustCurve API."
+            )
 
         data_base64 = dl_data["results"][0].get("data")
         if not data_base64:
-            raise ValueError(f"Downloaded .eng data for motor '{name}' is empty or invalid.")
+            raise ValueError(
+                f"Downloaded .eng data for motor '{name}' is empty or invalid."
+            )
 
         data_bytes = base64.b64decode(data_base64)
 
@@ -1993,9 +1998,7 @@ def load_from_thrustcurve_api(name: str, **kwargs):
                 tmp_file.flush()
                 tmp_path = tmp_file.name
 
-        
-            motor_instance = GenericMotor.load_from_eng_file(tmp_path, **kwargs)
-            return motor_instance
+            return GenericMotor.load_from_eng_file(tmp_path, **kwargs)
         finally:
             # Ensuring the temporary file is removed
             if tmp_path and path.exists(tmp_path):

tests/unit/motors/test_genericmotor.py

@@ -1,9 +1,9 @@
+import base64
+
 import numpy as np
 import pytest
-import scipy.integrate
 import requests
-import base64
-
+import scipy.integrate
 
 from rocketpy import Function, Motor
 
@@ -215,6 +215,7 @@ def test_load_from_rse_file(generic_motor):
     assert thrust_curve[-1][0] == 2.2  # Last point of time
     assert thrust_curve[-1][1] == 0.0  # Last thrust point
 
+
 def test_load_from_thrustcurve_api(monkeypatch, generic_motor):
     """
     Tests the GenericMotor.load_from_thrustcurve_api method with mocked ThrustCurve API responses.
@@ -224,7 +225,7 @@ def test_load_from_thrustcurve_api(monkeypatch, generic_motor):
         The pytest monkeypatch fixture for mocking.
     generic_motor : rocketpy.GenericMotor
         The GenericMotor object to be used in the tests.
-        
+
     """
 
     class MockResponse:
@@ -299,3 +300,57 @@ def mock_get(url, params=None):
     assert motor.thrust.y_array == pytest.approx(
         Function(points, "Time (s)", "Thrust (N)", "linear", "zero").y_array
     )
+
+    # 1. No motor found
+    def mock_get_no_motor(url, params=None):
+        if "search.json" in url:
+            return MockResponse({"results": []})
+        return MockResponse({"results": []})
+
+    monkeypatch.setattr(requests, "get", mock_get_no_motor)
+    with pytest.raises(ValueError, match="No motor found"):
+        type(generic_motor).load_from_thrustcurve_api("NonexistentMotor")
+
+    # 2. No .eng file found
+    def mock_get_no_eng(url, params=None):
+        if "search.json" in url:
+            return MockResponse(
+                {
+                    "results": [
+                        {
+                            "motorId": "123",
+                            "designation": "Fake",
+                            "manufacturer": "Test",
+                        }
+                    ]
+                }
+            )
+        elif "download.json" in url:
+            return MockResponse({"results": []})
+        return MockResponse({})
+
+    monkeypatch.setattr(requests, "get", mock_get_no_eng)
+    with pytest.raises(ValueError, match="No .eng file found"):
+        type(generic_motor).load_from_thrustcurve_api("FakeMotor")
+
+    # 3. Empty .eng data
+    def mock_get_empty_data(url, params=None):
+        if "search.json" in url:
+            return MockResponse(
+                {
+                    "results": [
+                        {
+                            "motorId": "123",
+                            "designation": "Fake",
+                            "manufacturer": "Test",
+                        }
+                    ]
+                }
+            )
+        elif "download.json" in url:
+            return MockResponse({"results": [{"data": ""}]})
+        return MockResponse({})
+
+    monkeypatch.setattr(requests, "get", mock_get_empty_data)
+    with pytest.raises(ValueError, match="Downloaded .eng data"):
+        type(generic_motor).load_from_thrustcurve_api("FakeMotor")