diff --git a/hvpy/api_groups/movies/get_movie_status.py b/hvpy/api_groups/movies/get_movie_status.py index f51e493..e0c6303 100644 --- a/hvpy/api_groups/movies/get_movie_status.py +++ b/hvpy/api_groups/movies/get_movie_status.py @@ -33,7 +33,7 @@ class getMovieStatusInputParameters(HvpyParameters): id: str format: str - verbose: Optional[bool] = False + verbose: bool = False callback: Optional[str] = None token: Optional[str] = None diff --git a/hvpy/api_groups/movies/queue_movie.py b/hvpy/api_groups/movies/queue_movie.py index 551c07d..ac8b68f 100644 --- a/hvpy/api_groups/movies/queue_movie.py +++ b/hvpy/api_groups/movies/queue_movie.py @@ -112,15 +112,15 @@ class queueMovieInputParameters(HvpyParameters): events: str eventsLabels: bool imageScale: float - format: Optional[str] = "mp4" - frameRate: Optional[str] = "15" + format: str = "mp4" + frameRate: str = "15" maxFrames: Optional[str] = None scale: Optional[bool] = None scaleType: Optional[str] = None scaleX: Optional[float] = None scaleY: Optional[float] = None movieLength: Optional[float] = None - watermark: Optional[bool] = True + watermark: bool = True width: Optional[str] = None height: Optional[str] = None x0: Optional[str] = None @@ -130,7 +130,7 @@ class queueMovieInputParameters(HvpyParameters): x2: Optional[str] = None y2: Optional[str] = None callback: Optional[str] = None - size: Optional[int] = 0 + size: int = 0 movieIcons: Optional[int] = None followViewport: Optional[int] = None reqObservationDate: Optional[datetime] = None diff --git a/hvpy/api_groups/movies/re_queue_movie.py b/hvpy/api_groups/movies/re_queue_movie.py index ef003f6..0736767 100644 --- a/hvpy/api_groups/movies/re_queue_movie.py +++ b/hvpy/api_groups/movies/re_queue_movie.py @@ -1,5 +1,3 @@ -from typing import Optional - from hvpy.io import HvpyParameters, OutputType @@ -24,7 +22,7 @@ class reQueueMovieInputParameters(HvpyParameters): """ id: str - force: Optional[bool] = False + force: bool = False def get_output_type(self) -> OutputType: """ diff --git a/hvpy/api_groups/official_clients/get_data_sources.py b/hvpy/api_groups/official_clients/get_data_sources.py index 121c5d3..8b3c299 100644 --- a/hvpy/api_groups/official_clients/get_data_sources.py +++ b/hvpy/api_groups/official_clients/get_data_sources.py @@ -27,7 +27,7 @@ class getDataSourcesInputParameters(HvpyParameters): .. {Shared} """ - verbose: Optional[bool] = False + verbose: bool = False enable: Optional[str] = None callback: Optional[str] = None diff --git a/hvpy/api_groups/screenshots/take_screenshot.py b/hvpy/api_groups/screenshots/take_screenshot.py index fc68eee..ece50e1 100644 --- a/hvpy/api_groups/screenshots/take_screenshot.py +++ b/hvpy/api_groups/screenshots/take_screenshot.py @@ -93,8 +93,8 @@ class takeScreenshotInputParameters(HvpyParameters): imageScale: float layers: str events: Optional[str] = None - eventLabels: Optional[bool] = False - scale: Optional[bool] = False + eventLabels: bool = False + scale: bool = False scaleType: Optional[str] = None scaleX: Optional[int] = None scaleY: Optional[int] = None @@ -106,8 +106,8 @@ class takeScreenshotInputParameters(HvpyParameters): y1: Optional[str] = None x2: Optional[str] = None y2: Optional[str] = None - display: Optional[bool] = False - watermark: Optional[bool] = False + display: bool = False + watermark: bool = False callback: Optional[str] = None _date_vaidator = validator("date", allow_reuse=True)(convert_date_to_isoformat) diff --git a/hvpy/facade.py b/hvpy/facade.py index 781aa26..6d6c5a7 100644 --- a/hvpy/facade.py +++ b/hvpy/facade.py @@ -202,7 +202,7 @@ def getClosestImage( @_add_shared_docstring(getDataSourcesInputParameters) def getDataSources( - verbose: Optional[bool] = False, + verbose: bool = False, enable: Optional[str] = None, callback: Optional[str] = None, ) -> Union[bytes, str, Dict[str, Any]]: @@ -232,8 +232,8 @@ def takeScreenshot( imageScale: float, layers: str, events: Optional[str] = None, - eventLabels: Optional[bool] = False, - scale: Optional[bool] = False, + eventLabels: bool = False, + scale: bool = False, scaleType: Optional[str] = None, scaleX: Optional[int] = None, scaleY: Optional[int] = None, @@ -245,8 +245,8 @@ def takeScreenshot( y1: Optional[str] = None, x2: Optional[str] = None, y2: Optional[str] = None, - display: Optional[bool] = False, - watermark: Optional[bool] = False, + display: bool = False, + watermark: bool = False, callback: Optional[str] = None, ): """ @@ -322,15 +322,15 @@ def queueMovie( events: str, eventsLabels: bool, imageScale: float, - format: Optional[str] = "mp4", - frameRate: Optional[str] = "15", + format: str = "mp4", + frameRate: str = "15", maxFrames: Optional[str] = None, scale: Optional[bool] = None, scaleType: Optional[str] = None, scaleX: Optional[float] = None, scaleY: Optional[float] = None, movieLength: Optional[float] = None, - watermark: Optional[bool] = True, + watermark: bool = True, width: Optional[str] = None, height: Optional[str] = None, x0: Optional[str] = None, @@ -340,7 +340,7 @@ def queueMovie( x2: Optional[str] = None, y2: Optional[str] = None, callback: Optional[str] = None, - size: Optional[int] = None, + size: int = 0, movieIcons: Optional[int] = None, followViewport: Optional[int] = None, reqObservationDate: Optional[datetime] = None, @@ -401,7 +401,7 @@ def queueMovie( @_add_shared_docstring(reQueueMovieInputParameters) def reQueueMovie( id: str, - force: Optional[bool] = False, + force: bool = False, ) -> Union[bytes, str, Dict[str, Any]]: """ Re-generate a custom movie that is no longer cached on the server. @@ -426,7 +426,7 @@ def reQueueMovie( def getMovieStatus( id: str, format: str, - verbose: Optional[bool] = False, + verbose: bool = False, callback: Optional[str] = None, token: Optional[str] = None, ) -> Union[bytes, str, Dict[str, Any]]: diff --git a/hvpy/helpers.py b/hvpy/helpers.py index a9e0136..389cea2 100644 --- a/hvpy/helpers.py +++ b/hvpy/helpers.py @@ -20,15 +20,15 @@ def createMovie( events: str, eventsLabels: bool, imageScale: float, - format: Optional[str] = "mp4", - frameRate: Optional[str] = "15", + format: str = "mp4", + frameRate: str = "15", maxFrames: Optional[str] = None, scale: Optional[bool] = None, scaleType: Optional[str] = None, scaleX: Optional[float] = None, scaleY: Optional[float] = None, movieLength: Optional[float] = None, - watermark: Optional[bool] = True, + watermark: bool = True, width: Optional[str] = None, height: Optional[str] = None, x0: Optional[str] = None, @@ -37,12 +37,12 @@ def createMovie( y1: Optional[str] = None, x2: Optional[str] = None, y2: Optional[str] = None, - size: Optional[int] = None, + size: int = 0, movieIcons: Optional[int] = None, followViewport: Optional[int] = None, reqObservationDate: Optional[datetime] = None, overwrite: bool = False, - filename: Union[str, Path] = None, + filename: Optional[Union[str, Path]] = None, hq: bool = False, timeout: float = 5, ) -> Path: @@ -87,10 +87,10 @@ def createMovie( input_params = locals() # These are used later on but we want to avoid passing # them into queueMovie. - input_params.pop("overwrite") - input_params.pop("filename") - input_params.pop("hq") - input_params.pop("timeout") + overwrite = input_params.pop("overwrite") + filename = input_params.pop("filename") + hq = input_params.pop("hq") + timeout = input_params.pop("timeout") res = queueMovie(**input_params) if res.get("error"): raise RuntimeError(res["error"]) diff --git a/hvpy/tests/test_helper.py b/hvpy/tests/test_helper.py index 96a1188..06a80c7 100644 --- a/hvpy/tests/test_helper.py +++ b/hvpy/tests/test_helper.py @@ -49,7 +49,7 @@ def test_createMovie_with_none_filename(start_time, end_time): ) assert isinstance(result, Path) assert result.exists() - result.unlink() # clean up + result.unlink() def test_createMovie_timeout(start_time, end_time, tmp_path):