Skip to content

Commit 4c4b204

Browse files
committed
Tweak storage typings
1 parent 2462f1e commit 4c4b204

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

yamcs-client/src/yamcs/storage/model.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import datetime
2-
from typing import IO, List, Mapping, Optional, Union
2+
from typing import IO, TYPE_CHECKING, List, Mapping, Optional, Union
33

44
from yamcs.core.helpers import parse_server_time
55

6+
if TYPE_CHECKING:
7+
from yamcs.storage.client import StorageClient
8+
69

710
class Bucket:
8-
def __init__(self, proto, storage_client):
11+
def __init__(self, proto, storage_client: "StorageClient"):
912
self._proto = proto
1013
self._storage_client = storage_client
1114

@@ -15,13 +18,11 @@ def name(self) -> str:
1518
return self._proto.name
1619

1720
@property
18-
def created(self) -> Optional[datetime.datetime]:
21+
def created(self) -> datetime.datetime:
1922
"""
2023
When this bucket was created.
2124
"""
22-
if self._proto.HasField("created"):
23-
return parse_server_time(self._proto.created)
24-
return None
25+
return parse_server_time(self._proto.created)
2526

2627
@property
2728
def object_count(self) -> int:
@@ -161,13 +162,11 @@ def size(self) -> int:
161162
return self._proto.size
162163

163164
@property
164-
def created(self) -> Optional[datetime.datetime]:
165+
def created(self) -> datetime.datetime:
165166
"""
166167
Return when this object was created (or re-created).
167168
"""
168-
if self._proto.HasField("created"):
169-
return parse_server_time(self._proto.created)
170-
return None
169+
return parse_server_time(self._proto.created)
171170

172171
def delete(self):
173172
"""

yamcs-client/src/yamcs/tmtc/model.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,9 +1070,7 @@ def link(self) -> str:
10701070
10711071
.. versionadded:: 1.9.1
10721072
"""
1073-
if self._proto.HasField("link"):
1074-
return self._proto.link
1075-
return None
1073+
return self._proto.link
10761074

10771075
@property
10781076
def binary(self) -> bytes:

0 commit comments

Comments
 (0)