|
23 | 23 | from basyx.aas import model |
24 | 24 | from basyx.aas.adapter import aasx |
25 | 25 | from app.util.converters import IdentifierToBase64URLConverter, IdShortPathConverter, base64url_decode |
26 | | -from .base import ObjectStoreWSGIApp, APIResponse, is_stripped_request, HTTPApiDecoder, T |
| 26 | +from app.interfaces.base import ObjectStoreWSGIApp, APIResponse, is_stripped_request, HTTPApiDecoder, T |
27 | 27 |
|
28 | 28 |
|
29 | 29 | class WSGIApp(ObjectStoreWSGIApp): |
@@ -167,14 +167,14 @@ def __call__(self, environ, start_response) -> Iterable[bytes]: |
167 | 167 | response: Response = self.handle_request(Request(environ)) |
168 | 168 | return response(environ, start_response) |
169 | 169 |
|
170 | | - def _get_obj_ts(self, identifier: model.Identifier, type_: Type[model.provider._IDENTIFIABLE]) \ |
171 | | - -> model.provider._IDENTIFIABLE: |
| 170 | + def _get_obj_ts(self, identifier: model.Identifier, type_: Type[model.Identifiable]) \ |
| 171 | + -> model.Identifiable: |
172 | 172 | identifiable = self.object_store.get(identifier) |
173 | 173 | if not isinstance(identifiable, type_): |
174 | 174 | raise NotFound(f"No {type_.__name__} with {identifier} found!") |
175 | 175 | return identifiable |
176 | 176 |
|
177 | | - def _get_all_obj_of_type(self, type_: Type[model.provider._IDENTIFIABLE]) -> Iterator[model.provider._IDENTIFIABLE]: |
| 177 | + def _get_all_obj_of_type(self, type_: Type[model.Identifiable]) -> Iterator[model.Identifiable]: |
178 | 178 | for obj in self.object_store: |
179 | 179 | if isinstance(obj, type_): |
180 | 180 | yield obj |
|
0 commit comments