Skip to content

Commit 3093a45

Browse files
committed
Make cursor optional everywhere
Previously, the `server.app.interfaces.base._get_slice()` method was adapted to return an `Optional[int]` cursor. However, the useages of this method were not adapted, leading to failing static analysis. This adapts the type hints of the usages of the `_get_slice()` method.
1 parent 6daa75c commit 3093a45

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

server/app/interfaces/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def __call__(self, environ, start_response) -> Iterable[bytes]:
262262
return response(environ, start_response)
263263

264264
@classmethod
265-
def _get_slice(cls, request: Request, iterator: Iterable[T]) -> Tuple[Iterator[T], int]:
265+
def _get_slice(cls, request: Request, iterator: Iterable[T]) -> Tuple[Iterator[T], Optional[int]]:
266266
limit_str = request.args.get('limit', default="10")
267267
cursor_str = request.args.get('cursor', default="1")
268268
try:

server/app/interfaces/repository.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def _get_submodel_reference(cls, aas: model.AssetAdministrationShell, submodel_i
247247
return ref
248248
raise NotFound(f"The AAS {aas!r} doesn't have a submodel reference to {submodel_id!r}!")
249249

250-
def _get_shells(self, request: Request) -> Tuple[Iterator[model.AssetAdministrationShell], int]:
250+
def _get_shells(self, request: Request) -> Tuple[Iterator[model.AssetAdministrationShell], Optional[int]]:
251251
aas: Iterator[model.AssetAdministrationShell] = self._get_all_obj_of_type(model.AssetAdministrationShell)
252252

253253
id_short = request.args.get("idShort")
@@ -287,7 +287,7 @@ def _get_shells(self, request: Request) -> Tuple[Iterator[model.AssetAdministrat
287287
def _get_shell(self, url_args: Dict) -> model.AssetAdministrationShell:
288288
return self._get_obj_ts(url_args["aas_id"], model.AssetAdministrationShell)
289289

290-
def _get_submodels(self, request: Request) -> Tuple[Iterator[model.Submodel], int]:
290+
def _get_submodels(self, request: Request) -> Tuple[Iterator[model.Submodel], Optional[int]]:
291291
submodels: Iterator[model.Submodel] = self._get_all_obj_of_type(model.Submodel)
292292
id_short = request.args.get("idShort")
293293
if id_short is not None:
@@ -304,7 +304,7 @@ def _get_submodel(self, url_args: Dict) -> model.Submodel:
304304
return self._get_obj_ts(url_args["submodel_id"], model.Submodel)
305305

306306
def _get_submodel_submodel_elements(self, request: Request, url_args: Dict) -> \
307-
Tuple[Iterator[model.SubmodelElement], int]:
307+
Tuple[Iterator[model.SubmodelElement], Optional[int]]:
308308
submodel = self._get_submodel(url_args)
309309
paginated_submodel_elements: Iterator[model.SubmodelElement]
310310
paginated_submodel_elements, end_index = self._get_slice(request, submodel.submodel_element)

0 commit comments

Comments
 (0)