Skip to content
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

Add "@container": "@set" and fix URIs in JSON LD #420

Merged
merged 2 commits into from
Nov 19, 2023
Merged

Add "@container": "@set" and fix URIs in JSON LD #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f453ec8
fix: Add `"@container": "@set"` when it is needed and predicate URI g…
Murloc6 Nov 9, 2023
97b8f18
fix: Remove unecessary Identifier cast
Murloc6 Nov 15, 2023
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
17 changes: 10 additions & 7 deletions aas_core_codegen/jsonld/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

def _property_uri(prop: intermediate.Property) -> Stripped:
"""Generate a JSON-LD URI corresponding to the property."""
property_vocab = rdf_shacl_naming.class_name(Identifier(prop.specified_for.name))
prop_uri_fragment = rdf_shacl_naming.property_name(Identifier(prop.name))
property_vocab = rdf_shacl_naming.class_name(prop.specified_for.name)
prop_uri_fragment = rdf_shacl_naming.property_name(prop.name)

return Stripped(f"aas:{property_vocab}/{prop_uri_fragment}")

Expand Down Expand Up @@ -126,16 +126,19 @@ def _generate_for_property(
# This is necessary for mypy.
assert name_set_of_exported_properties is not None

property_vocab = rdf_shacl_naming.class_name(Identifier(prop.specified_for.name))
prop_uri_fragment = rdf_shacl_naming.property_name(Identifier(prop.name))
property_vocab = rdf_shacl_naming.class_name(prop.specified_for.name)
prop_uri_fragment = rdf_shacl_naming.property_name(prop.name)

property_uri = f"aas:{property_vocab}/{prop_uri_fragment}"
rdfs_range = rdf_shacl_common.rdfs_range_for_type_annotation(
type_annotation=prop.type_annotation,
our_type_to_rdfs_range=our_type_to_rdfs_range,
)
property_json_ld_context: JsonLdType = {"@id": property_uri}
if isinstance(prop.type_annotation, intermediate.ListTypeAnnotation):
if isinstance(
intermediate.beneath_optional(prop.type_annotation),
intermediate.ListTypeAnnotation,
):
property_json_ld_context["@container"] = "@set"

underlying_atomic_type_annotation = _get_underlying_atomic_type(
Expand All @@ -144,7 +147,7 @@ def _generate_for_property(

if isinstance(underlying_atomic_type_annotation, intermediate.Enumeration):
enum_fragment = rdf_shacl_naming.class_name(
Identifier(underlying_atomic_type_annotation.name)
underlying_atomic_type_annotation.name
)
property_json_ld_context["@context"] = cast(
JsonLdType, {"@vocab": f"aas:{enum_fragment}/"}
Expand Down Expand Up @@ -254,7 +257,7 @@ def _generate_class_context(

class_context_definition: JsonLdType = {}
class_name = naming.json_model_type(cls.name)
uri_fragment = rdf_shacl_naming.class_name((Identifier(class_name)))
uri_fragment = rdf_shacl_naming.class_name(cls.name)
class_context_definition[class_name] = {
"@id": uri_fragment,
"@context": {
Expand Down
Loading
Loading