Skip to content

fix: pass paging_metadata kwarg correctly in get_aas_submodel_refs and get_concept_description_all #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-heppner merged 6 commits into from
May 13, 2026
+7 −6
Merged

fix: pass paging_metadata kwarg correctly in get_aas_submodel_refs and get_concept_description_all #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78a2d0e
fix: pass paging_metadata kwarg correctly in get_aas_submodel_refs an…
zrgt May 12, 2026
ece6a85
fix: fix paging_metadata kwarg in discovery and registry handlers
zrgt May 12, 2026
a534a86
Merge branch 'develop' into fix/submodel-refs-concept-desc-paging-met…
s-heppner May 13, 2026
71c6c2a
Resolve merge conflicts in discovery.py
zrgt May 13, 2026
4729d56
Rename cursor to paging_metadata for consistency in registry and repo…
zrgt May 13, 2026
7499ac4
Fix E501 line too long in get_concept_description_all
zrgt May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/app/interfaces/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ def get_all_submodel_descriptors_through_superpath(
self, request: Request, url_args: Dict, response_t: Type[APIResponse], **_kwargs
) -> Response:
aas_descriptor = self._get_aas_descriptor(url_args)
submodel_descriptors, cursor = self._get_slice(request, aas_descriptor.submodel_descriptors)
return response_t(list(submodel_descriptors), cursor=cursor)
submodel_descriptors, paging_metadata = self._get_slice(request, aas_descriptor.submodel_descriptors)
return response_t(list(submodel_descriptors), paging_metadata=paging_metadata)

def get_submodel_descriptor_by_id_through_superpath(
self, request: Request, url_args: Dict, response_t: Type[APIResponse], **_kwargs
Expand Down
9 changes: 5 additions & 4 deletions server/app/interfaces/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,8 @@ def get_aas_submodel_refs(
aas = self._get_shell(url_args)
submodel_refs: Iterator[model.ModelReference[model.Submodel]]
sorted_submodel_refs = sorted(aas.submodel, key=lambda ref: ref.key[0].value)
submodel_refs, cursor = self._get_slice(request, sorted_submodel_refs)
return response_t(list(submodel_refs), cursor=cursor)
submodel_refs, paging_metadata = self._get_slice(request, sorted_submodel_refs)
return response_t(list(submodel_refs), paging_metadata=paging_metadata)

def post_aas_submodel_refs(self, request: Request, url_args: Dict, response_t: Type[APIResponse],
map_adapter: MapAdapter, **_kwargs) -> Response:
Expand Down Expand Up @@ -947,8 +947,9 @@ def get_concept_description_all(
self, request: Request, url_args: Dict, response_t: Type[APIResponse], **_kwargs
) -> Response:
concept_descriptions: Iterator[model.ConceptDescription] = self._get_all_obj_of_type(model.ConceptDescription)
concept_descriptions, cursor = self._get_slice(request, concept_descriptions)
return response_t(list(concept_descriptions), cursor=cursor, stripped=is_stripped_request(request))
concept_descriptions, paging_metadata = self._get_slice(request, concept_descriptions)
return response_t(list(concept_descriptions), paging_metadata=paging_metadata,
stripped=is_stripped_request(request))

def post_concept_description(
self, request: Request, url_args: Dict, response_t: Type[APIResponse], map_adapter: MapAdapter
Expand Down
Loading