Skip to content

Commit a6f072a

Browse files
author
Nabil Freij
authored
remove optional (#78)
1 parent c0e70a6 commit a6f072a

File tree

8 files changed

+32
-34
lines changed

8 files changed

+32
-34
lines changed

‎hvpy/api_groups/movies/get_movie_status.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class getMovieStatusInputParameters(HvpyParameters):
3333

3434
id: str
3535
format: str
36-
verbose: Optional[bool] = False
36+
verbose: bool = False
3737
callback: Optional[str] = None
3838
token: Optional[str] = None
3939

‎hvpy/api_groups/movies/queue_movie.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ class queueMovieInputParameters(HvpyParameters):
112112
events: str
113113
eventsLabels: bool
114114
imageScale: float
115-
format: Optional[str] = "mp4"
116-
frameRate: Optional[str] = "15"
115+
format: str = "mp4"
116+
frameRate: str = "15"
117117
maxFrames: Optional[str] = None
118118
scale: Optional[bool] = None
119119
scaleType: Optional[str] = None
120120
scaleX: Optional[float] = None
121121
scaleY: Optional[float] = None
122122
movieLength: Optional[float] = None
123-
watermark: Optional[bool] = True
123+
watermark: bool = True
124124
width: Optional[str] = None
125125
height: Optional[str] = None
126126
x0: Optional[str] = None
@@ -130,7 +130,7 @@ class queueMovieInputParameters(HvpyParameters):
130130
x2: Optional[str] = None
131131
y2: Optional[str] = None
132132
callback: Optional[str] = None
133-
size: Optional[int] = 0
133+
size: int = 0
134134
movieIcons: Optional[int] = None
135135
followViewport: Optional[int] = None
136136
reqObservationDate: Optional[datetime] = None

‎hvpy/api_groups/movies/re_queue_movie.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Optional
2-
31
from hvpy.io import HvpyParameters, OutputType
42

53

@@ -24,7 +22,7 @@ class reQueueMovieInputParameters(HvpyParameters):
2422
"""
2523

2624
id: str
27-
force: Optional[bool] = False
25+
force: bool = False
2826

2927
def get_output_type(self) -> OutputType:
3028
"""

‎hvpy/api_groups/official_clients/get_data_sources.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class getDataSourcesInputParameters(HvpyParameters):
2727
.. {Shared}
2828
"""
2929

30-
verbose: Optional[bool] = False
30+
verbose: bool = False
3131
enable: Optional[str] = None
3232
callback: Optional[str] = None
3333

‎hvpy/api_groups/screenshots/take_screenshot.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ class takeScreenshotInputParameters(HvpyParameters):
9393
imageScale: float
9494
layers: str
9595
events: Optional[str] = None
96-
eventLabels: Optional[bool] = False
97-
scale: Optional[bool] = False
96+
eventLabels: bool = False
97+
scale: bool = False
9898
scaleType: Optional[str] = None
9999
scaleX: Optional[int] = None
100100
scaleY: Optional[int] = None
@@ -106,8 +106,8 @@ class takeScreenshotInputParameters(HvpyParameters):
106106
y1: Optional[str] = None
107107
x2: Optional[str] = None
108108
y2: Optional[str] = None
109-
display: Optional[bool] = False
110-
watermark: Optional[bool] = False
109+
display: bool = False
110+
watermark: bool = False
111111
callback: Optional[str] = None
112112
_date_vaidator = validator("date", allow_reuse=True)(convert_date_to_isoformat)
113113

‎hvpy/facade.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def getClosestImage(
202202

203203
@_add_shared_docstring(getDataSourcesInputParameters)
204204
def getDataSources(
205-
verbose: Optional[bool] = False,
205+
verbose: bool = False,
206206
enable: Optional[str] = None,
207207
callback: Optional[str] = None,
208208
) -> Union[bytes, str, Dict[str, Any]]:
@@ -232,8 +232,8 @@ def takeScreenshot(
232232
imageScale: float,
233233
layers: str,
234234
events: Optional[str] = None,
235-
eventLabels: Optional[bool] = False,
236-
scale: Optional[bool] = False,
235+
eventLabels: bool = False,
236+
scale: bool = False,
237237
scaleType: Optional[str] = None,
238238
scaleX: Optional[int] = None,
239239
scaleY: Optional[int] = None,
@@ -245,8 +245,8 @@ def takeScreenshot(
245245
y1: Optional[str] = None,
246246
x2: Optional[str] = None,
247247
y2: Optional[str] = None,
248-
display: Optional[bool] = False,
249-
watermark: Optional[bool] = False,
248+
display: bool = False,
249+
watermark: bool = False,
250250
callback: Optional[str] = None,
251251
):
252252
"""
@@ -322,15 +322,15 @@ def queueMovie(
322322
events: str,
323323
eventsLabels: bool,
324324
imageScale: float,
325-
format: Optional[str] = "mp4",
326-
frameRate: Optional[str] = "15",
325+
format: str = "mp4",
326+
frameRate: str = "15",
327327
maxFrames: Optional[str] = None,
328328
scale: Optional[bool] = None,
329329
scaleType: Optional[str] = None,
330330
scaleX: Optional[float] = None,
331331
scaleY: Optional[float] = None,
332332
movieLength: Optional[float] = None,
333-
watermark: Optional[bool] = True,
333+
watermark: bool = True,
334334
width: Optional[str] = None,
335335
height: Optional[str] = None,
336336
x0: Optional[str] = None,
@@ -340,7 +340,7 @@ def queueMovie(
340340
x2: Optional[str] = None,
341341
y2: Optional[str] = None,
342342
callback: Optional[str] = None,
343-
size: Optional[int] = None,
343+
size: int = 0,
344344
movieIcons: Optional[int] = None,
345345
followViewport: Optional[int] = None,
346346
reqObservationDate: Optional[datetime] = None,
@@ -401,7 +401,7 @@ def queueMovie(
401401
@_add_shared_docstring(reQueueMovieInputParameters)
402402
def reQueueMovie(
403403
id: str,
404-
force: Optional[bool] = False,
404+
force: bool = False,
405405
) -> Union[bytes, str, Dict[str, Any]]:
406406
"""
407407
Re-generate a custom movie that is no longer cached on the server.
@@ -426,7 +426,7 @@ def reQueueMovie(
426426
def getMovieStatus(
427427
id: str,
428428
format: str,
429-
verbose: Optional[bool] = False,
429+
verbose: bool = False,
430430
callback: Optional[str] = None,
431431
token: Optional[str] = None,
432432
) -> Union[bytes, str, Dict[str, Any]]:

‎hvpy/helpers.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ def createMovie(
2020
events: str,
2121
eventsLabels: bool,
2222
imageScale: float,
23-
format: Optional[str] = "mp4",
24-
frameRate: Optional[str] = "15",
23+
format: str = "mp4",
24+
frameRate: str = "15",
2525
maxFrames: Optional[str] = None,
2626
scale: Optional[bool] = None,
2727
scaleType: Optional[str] = None,
2828
scaleX: Optional[float] = None,
2929
scaleY: Optional[float] = None,
3030
movieLength: Optional[float] = None,
31-
watermark: Optional[bool] = True,
31+
watermark: bool = True,
3232
width: Optional[str] = None,
3333
height: Optional[str] = None,
3434
x0: Optional[str] = None,
@@ -37,12 +37,12 @@ def createMovie(
3737
y1: Optional[str] = None,
3838
x2: Optional[str] = None,
3939
y2: Optional[str] = None,
40-
size: Optional[int] = None,
40+
size: int = 0,
4141
movieIcons: Optional[int] = None,
4242
followViewport: Optional[int] = None,
4343
reqObservationDate: Optional[datetime] = None,
4444
overwrite: bool = False,
45-
filename: Union[str, Path] = None,
45+
filename: Optional[Union[str, Path]] = None,
4646
hq: bool = False,
4747
timeout: float = 5,
4848
) -> Path:
@@ -87,10 +87,10 @@ def createMovie(
8787
input_params = locals()
8888
# These are used later on but we want to avoid passing
8989
# them into queueMovie.
90-
input_params.pop("overwrite")
91-
input_params.pop("filename")
92-
input_params.pop("hq")
93-
input_params.pop("timeout")
90+
overwrite = input_params.pop("overwrite")
91+
filename = input_params.pop("filename")
92+
hq = input_params.pop("hq")
93+
timeout = input_params.pop("timeout")
9494
res = queueMovie(**input_params)
9595
if res.get("error"):
9696
raise RuntimeError(res["error"])

‎hvpy/tests/test_helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_createMovie_with_none_filename(start_time, end_time):
4949
)
5050
assert isinstance(result, Path)
5151
assert result.exists()
52-
result.unlink() # clean up
52+
result.unlink()
5353

5454

5555
def test_createMovie_timeout(start_time, end_time, tmp_path):

0 commit comments

Comments
 (0)