Skip to content

adapter: Allow optional contentType in Blob and File #572

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 2 commits into from
Jun 29, 2026
Merged

adapter: Allow optional contentType in Blob and File #572

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
114f42f
adapter: Allow optional contentType in Blob and File
paul-gerber-svg Jun 15, 2026
e45618f
adapting two occurences to fit codestyle
paul-gerber-svg Jun 25, 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
6 changes: 4 additions & 2 deletions sdk/basyx/aas/adapter/json/json_deserialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,18 +692,20 @@ def _construct_submodel_element_list(cls, dct: Dict[str, object], object_class=m

@classmethod
def _construct_blob(cls, dct: Dict[str, object], object_class=model.Blob) -> model.Blob:
content_type = _get_ts(dct, "contentType", str) if 'contentType' in dct else None
ret = object_class(id_short=None,
content_type=_get_ts(dct, "contentType", str))
content_type=content_type)
Comment thread
s-heppner marked this conversation as resolved.
Outdated
cls._amend_abstract_attributes(ret, dct)
if 'value' in dct:
ret.value = base64.b64decode(_get_ts(dct, 'value', str))
return ret

@classmethod
def _construct_file(cls, dct: Dict[str, object], object_class=model.File) -> model.File:
content_type = _get_ts(dct, "contentType", str) if 'contentType' in dct else None
ret = object_class(id_short=None,
value=None,
content_type=_get_ts(dct, "contentType", str))
content_type=content_type)
cls._amend_abstract_attributes(ret, dct)
if 'value' in dct and dct['value'] is not None:
ret.value = _get_ts(dct, 'value', str)
Expand Down
4 changes: 2 additions & 2 deletions sdk/basyx/aas/adapter/xml/xml_deserialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ def construct_basic_event_element(cls, element: etree._Element, object_class=mod
def construct_blob(cls, element: etree._Element, object_class=model.Blob, **_kwargs: Any) -> model.Blob:
blob = object_class(
None,
_child_text_mandatory(element, NS_AAS + "contentType")
_get_text_or_none(element.find(NS_AAS + "contentType"))
)
value = _get_text_or_none(element.find(NS_AAS + "value"))
if value is not None:
Expand Down Expand Up @@ -851,7 +851,7 @@ def construct_entity(cls, element: etree._Element, object_class=model.Entity, **
def construct_file(cls, element: etree._Element, object_class=model.File, **_kwargs: Any) -> model.File:
file = object_class(
None,
_child_text_mandatory(element, NS_AAS + "contentType")
_get_text_or_none(element.find(NS_AAS + "contentType"))
)
value = _get_text_or_none(element.find(NS_AAS + "value"))
if value is not None:
Expand Down
Loading