pylode 3.5.2__tar.gz → 3.6.0__tar.gz

{pylode-3.5.2 → pylode-3.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pylode
-Version: 3.5.2
+Version: 3.6.0
 Summary: An OWL ontology documentation tool using Python, based on LODE.
 Author: Nicholas Car
 Author-email: Nicholas Car <nick@kurrawong.ai>
@@ -15,7 +15,7 @@ Requires-Dist: dominate>=2.9.1,<3
 Requires-Dist: html5lib>=1.1,<2
 Requires-Dist: httpx>=0.25.0,<1.0.0
 Requires-Dist: tqdm>=4.67.3
-Requires-Dist: kurra>=2.3.5
+Requires-Dist: kurra>=3.0.5
 Requires-Dist: bs4>=0.0.2 ; extra == 'server'
 Requires-Dist: falcon>=4.2.0 ; extra == 'server'
 Requires-Dist: validators>=0.35.0 ; extra == 'server'
@@ -81,7 +81,7 @@ The tool can be used in multiple ways:
 ### Command line arguments
 
 ```text
-usage: pylode [-h] [-v] [-o OUTPUTFILE] [-c {true,false}] [-s] [-p {ontpub,vocpub,supermodel}] [-l {error,warning,info,debug}] input
+usage: pylode [-h] [-v] [-o OUTPUTFILE] [-c {true,false}] [-s {true,false}] [-p {ontpub,valpub,vocpub,supermodel}] [-l {error,warning,info,debug}] input
 
 positional arguments:
   input                 Input file location or URL
@@ -93,9 +93,11 @@ options:
                         A name you wish to assign to the output file. Will be postfixed with .html if not already added. If no output file is given, output will be printed to screen
   -c, --css {true,false}
                         Whether (true) or not (false) to include CSS within an output HTML file.
-  -s, --sort            Enables sorting of the subjects in the ontology in the output
-  -p, --profile {ontpub,vocpub,supermodel}
-                        Which profile to use to generate HTML. Must be one of 'ontpub' (https://linked.data.gov.au/def/ontpub) - for ontologies, 'vocpub' (https://linked.data.gov.au/def/vocpub) - for SKOS vocabularies, 'supermodel' - for profiles of profiles
+  -s, --sort {true,false}
+                        Whether (true) or not (false) to sort ontology subjects in the output.
+  -p, --profile {ontpub,valpub,vocpub,supermodel}
+                        Which profile to use to generate HTML. Must be one of 'ontpub' (https://linked.data.gov.au/def/ontpub) - for ontologies, 'valpub' (https://linked.data.gov.au/def/valpub) - for SHACL
+                        Shapes Graphs, 'vocpub' (https://linked.data.gov.au/def/vocpub) - for SKOS vocabularies, 'supermodel' - for profiles of profiles. If omitted, the profile is inferred from the input RDF.
   -l, --loglevel {error,warning,info,debug}
                         Set the logging level
 ```
@@ -108,7 +110,13 @@ options:
 python pylode examples/ontpub/minimal.ttl -o minimal.html
 ```
 
-for a SKOS vocabulary, indicate the `vocpub` profile:
+for a SKOS vocabulary:
+
+```bash
+python pylode examples/vocpub/GeologicSpecimenMaterialTypes.ttl -o GeologicSpecimenMaterialTypes.html
+```
+
+for the same SKOS vocabulary with the `vocpub` being forciply selected:
 
 ```bash
 python pylode examples/vocpub/GeologicSpecimenMaterialTypes.ttl -o GeologicSpecimenMaterialTypes.html -p vocpub
@@ -118,14 +126,11 @@ python pylode examples/vocpub/GeologicSpecimenMaterialTypes.ttl -o GeologicSpeci
 
 ```bash
 docker build -t pylode:latest .
-```
 
-```bash
-docker run --mount 'type=bind,src=<ttl_directory>,target=/app/pylode/data' \
-  pylode:latest python3.10 pylode/cli.py data/<ttl_file> -o data/<html_file>
+docker run --rm -v <ttl_directory>:/data pylode:latest <ttl_file> -o <html_file>
 ```
 
-> Note: `<ttl_directory>` must be absolute
+> Note: `<ttl_directory>` must be absolute; `<ttl_file>` and `<html_file>` are relative to it
 
 #### Via a stand-alone server
 
@@ -141,14 +146,15 @@ The active endpoint accepts the following querystring parameters:
 * `url` for the absolute URL of the ontology document that you wish to render. The server hosting that ontology document must be capable of responding to Content Negotiation,
 i.e. it must supply RDF according to an HTTP `Accept` request for `text/turtle`, `application/rdf+xml` etc.
 * `profile` for the profile to use to generate HTML. Must be one of:
-    * `ontpub` (https://linked.data.gov.au/def/ontpub) for ontologies. This is the default if no ``profile`` is provided.
-    * `vocpub` (https://linked.data.gov.au/def/vocpub) for SKOS vocabularies
+    * [`ontpub`](https://linked.data.gov.au/def/ontpub) for ontologies. This is the default if no ``profile`` is provided.
+    * [`vocpub`](https://linked.data.gov.au/def/vocpub) for SKOS vocabularies
+    * [`valpub`](https://linked.data.gov.au/def/valupub) for [SHACL](https://www.w3.org/TR/shacl/) ShapesGraphs
     * `supermodel` for profiles of profiles
 * `sort` to indicate whether subjects should be sorted in the rendered output. Must be one of:
     * `true` to sort the subjects (this is the default)
     * `false` to NOT sort the subjects
 
-Here's an example of use with the [AGIF Ontology](https://linked.data.gov.au/def/agrif) using the source in this repository:
+Here's an example of use with the [AGRIF Ontology](https://linked.data.gov.au/def/agrif) using the source in this repository:
 
 ```bash
 http://localhost:8000/pylode?url=https://raw.githubusercontent.com/RDFLib/pyLODE/refs/heads/master/examples/ontpub/agrif.ttl
@@ -158,7 +164,7 @@ The LODE responses generated by the server can be globally customised by setting
 
 * `CSS_URL` can be set to the absolute URL of a CSS stylesheet hosted elsewhere that should be referenced by pyLODE documents
 * `FAVICON_URL` can be set to the absolute URL of a favicon image hosted elsewhere that should be referenced by pyLODE documents
-* `FAVICON_MIME` should be set to the MIME type of the resource at ``FAVICON_URL`` if that has been configured (e.g. ``image/png`)
+* `FAVICON_MIME` should be set to the MIME type of the resource at ``FAVICON_URL`` if that has been configured (e.g. ``image/png``)
 * `GTAGID` can be set to a Google Analytics Tag ID that you would like to use for tracking requests to your server.
 
 **Launch the pyLODE server standalone from your local directory:**
@@ -224,11 +230,9 @@ Rendered examples:
 
 ## What pyLODE understands
 
-pyLODE understands definitional ontologies (`owl:Ontology`), classes, and properties.
-
-Supported properties can be found in `rdf_elements.py`.
+pyLODE understands definitional ontologies (`owl:Ontology`), classes, properties & axioms, vocabularies (`skos:ConceptScheme`), concepts and collections and SHACL Shapes Graphs (`sh:ShapesGraph` or `owl:Ontology` when containing shapes), Node and Property Shapes. 
 
-pyLODE deliberately does **not** translate everything in RDF to HTML, enforcing a conventional ontology documentation style. Support for new patterns can be requested via the [issue tracker](https://github.com/RDFLib/pyLODE/issues).
+pyLODE will try and render all ontology/vocab annotation elements, in an order starting with those listed per type of element in `rdf_elements.py` and then anything else it finds.
 
 ### Notes on Agents
 

{pylode-3.5.2 → pylode-3.6.0}/README.md

@@ -52,7 +52,7 @@ The tool can be used in multiple ways:
 ### Command line arguments
 
 ```text
-usage: pylode [-h] [-v] [-o OUTPUTFILE] [-c {true,false}] [-s] [-p {ontpub,vocpub,supermodel}] [-l {error,warning,info,debug}] input
+usage: pylode [-h] [-v] [-o OUTPUTFILE] [-c {true,false}] [-s {true,false}] [-p {ontpub,valpub,vocpub,supermodel}] [-l {error,warning,info,debug}] input
 
 positional arguments:
   input                 Input file location or URL
@@ -64,9 +64,11 @@ options:
                         A name you wish to assign to the output file. Will be postfixed with .html if not already added. If no output file is given, output will be printed to screen
   -c, --css {true,false}
                         Whether (true) or not (false) to include CSS within an output HTML file.
-  -s, --sort            Enables sorting of the subjects in the ontology in the output
-  -p, --profile {ontpub,vocpub,supermodel}
-                        Which profile to use to generate HTML. Must be one of 'ontpub' (https://linked.data.gov.au/def/ontpub) - for ontologies, 'vocpub' (https://linked.data.gov.au/def/vocpub) - for SKOS vocabularies, 'supermodel' - for profiles of profiles
+  -s, --sort {true,false}
+                        Whether (true) or not (false) to sort ontology subjects in the output.
+  -p, --profile {ontpub,valpub,vocpub,supermodel}
+                        Which profile to use to generate HTML. Must be one of 'ontpub' (https://linked.data.gov.au/def/ontpub) - for ontologies, 'valpub' (https://linked.data.gov.au/def/valpub) - for SHACL
+                        Shapes Graphs, 'vocpub' (https://linked.data.gov.au/def/vocpub) - for SKOS vocabularies, 'supermodel' - for profiles of profiles. If omitted, the profile is inferred from the input RDF.
   -l, --loglevel {error,warning,info,debug}
                         Set the logging level
 ```
@@ -79,7 +81,13 @@ options:
 python pylode examples/ontpub/minimal.ttl -o minimal.html
 ```
 
-for a SKOS vocabulary, indicate the `vocpub` profile:
+for a SKOS vocabulary:
+
+```bash
+python pylode examples/vocpub/GeologicSpecimenMaterialTypes.ttl -o GeologicSpecimenMaterialTypes.html
+```
+
+for the same SKOS vocabulary with the `vocpub` being forciply selected:
 
 ```bash
 python pylode examples/vocpub/GeologicSpecimenMaterialTypes.ttl -o GeologicSpecimenMaterialTypes.html -p vocpub
@@ -89,14 +97,11 @@ python pylode examples/vocpub/GeologicSpecimenMaterialTypes.ttl -o GeologicSpeci
 
 ```bash
 docker build -t pylode:latest .
-```
 
-```bash
-docker run --mount 'type=bind,src=<ttl_directory>,target=/app/pylode/data' \
-  pylode:latest python3.10 pylode/cli.py data/<ttl_file> -o data/<html_file>
+docker run --rm -v <ttl_directory>:/data pylode:latest <ttl_file> -o <html_file>
 ```
 
-> Note: `<ttl_directory>` must be absolute
+> Note: `<ttl_directory>` must be absolute; `<ttl_file>` and `<html_file>` are relative to it
 
 #### Via a stand-alone server
 
@@ -112,14 +117,15 @@ The active endpoint accepts the following querystring parameters:
 * `url` for the absolute URL of the ontology document that you wish to render. The server hosting that ontology document must be capable of responding to Content Negotiation,
 i.e. it must supply RDF according to an HTTP `Accept` request for `text/turtle`, `application/rdf+xml` etc.
 * `profile` for the profile to use to generate HTML. Must be one of:
-    * `ontpub` (https://linked.data.gov.au/def/ontpub) for ontologies. This is the default if no ``profile`` is provided.
-    * `vocpub` (https://linked.data.gov.au/def/vocpub) for SKOS vocabularies
+    * [`ontpub`](https://linked.data.gov.au/def/ontpub) for ontologies. This is the default if no ``profile`` is provided.
+    * [`vocpub`](https://linked.data.gov.au/def/vocpub) for SKOS vocabularies
+    * [`valpub`](https://linked.data.gov.au/def/valupub) for [SHACL](https://www.w3.org/TR/shacl/) ShapesGraphs
     * `supermodel` for profiles of profiles
 * `sort` to indicate whether subjects should be sorted in the rendered output. Must be one of:
     * `true` to sort the subjects (this is the default)
     * `false` to NOT sort the subjects
 
-Here's an example of use with the [AGIF Ontology](https://linked.data.gov.au/def/agrif) using the source in this repository:
+Here's an example of use with the [AGRIF Ontology](https://linked.data.gov.au/def/agrif) using the source in this repository:
 
 ```bash
 http://localhost:8000/pylode?url=https://raw.githubusercontent.com/RDFLib/pyLODE/refs/heads/master/examples/ontpub/agrif.ttl
@@ -129,7 +135,7 @@ The LODE responses generated by the server can be globally customised by setting
 
 * `CSS_URL` can be set to the absolute URL of a CSS stylesheet hosted elsewhere that should be referenced by pyLODE documents
 * `FAVICON_URL` can be set to the absolute URL of a favicon image hosted elsewhere that should be referenced by pyLODE documents
-* `FAVICON_MIME` should be set to the MIME type of the resource at ``FAVICON_URL`` if that has been configured (e.g. ``image/png`)
+* `FAVICON_MIME` should be set to the MIME type of the resource at ``FAVICON_URL`` if that has been configured (e.g. ``image/png``)
 * `GTAGID` can be set to a Google Analytics Tag ID that you would like to use for tracking requests to your server.
 
 **Launch the pyLODE server standalone from your local directory:**
@@ -195,11 +201,9 @@ Rendered examples:
 
 ## What pyLODE understands
 
-pyLODE understands definitional ontologies (`owl:Ontology`), classes, and properties.
-
-Supported properties can be found in `rdf_elements.py`.
+pyLODE understands definitional ontologies (`owl:Ontology`), classes, properties & axioms, vocabularies (`skos:ConceptScheme`), concepts and collections and SHACL Shapes Graphs (`sh:ShapesGraph` or `owl:Ontology` when containing shapes), Node and Property Shapes. 
 
-pyLODE deliberately does **not** translate everything in RDF to HTML, enforcing a conventional ontology documentation style. Support for new patterns can be requested via the [issue tracker](https://github.com/RDFLib/pyLODE/issues).
+pyLODE will try and render all ontology/vocab annotation elements, in an order starting with those listed per type of element in `rdf_elements.py` and then anything else it finds.
 
 ### Notes on Agents
 

{pylode-3.5.2 → pylode-3.6.0}/pylode/cli.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).absolute().parent.parent))
 from pylode import OntPub, PylodeError, Supermodel, ValPub, VocPub, __version__
+from pylode.utils import select_profile
 
 parser = argparse.ArgumentParser()
 
@@ -37,8 +38,9 @@ parser.add_argument(
 parser.add_argument(
     "-s",
     "--sort",
-    help="Enables sorting of the subjects in the ontology in the output",
-    action="store_true",
+    help="Whether (true) or not (false) to sort ontology subjects in the output.",
+    choices=["true", "false"],
+    default="true",
 )
 
 parser.add_argument(
@@ -48,9 +50,10 @@ parser.add_argument(
     "'ontpub' (https://linked.data.gov.au/def/ontpub) - for ontologies, "
     "'valpub' (https://linked.data.gov.au/def/valpub) - for SHACL Shapes Graphs, "
     "'vocpub' (https://linked.data.gov.au/def/vocpub) - for SKOS vocabularies, "
-    "'supermodel' - for profiles of profiles",
+    "'supermodel' - for profiles of profiles. If omitted, the profile is "
+    "inferred from the input RDF.",
     choices=["ontpub", "valpub", "vocpub", "supermodel"],
-    default="ontpub",
+    default=None,
 )
 
 parser.add_argument(
@@ -77,17 +80,18 @@ def main():
         logger.setLevel(level=logging.DEBUG)
 
     try:
-        sort_subjects = args.sort
-        if args.profile == "ontpub":
+        sort_subjects = args.sort == "true"
+        profile = args.profile or select_profile(args.input)
+        if profile == "ontpub":
             html = OntPub(args.input, sort_subjects=sort_subjects)
-        elif args.profile == "valpub":
+        elif profile == "valpub":
             html = ValPub(args.input, sort_subjects=sort_subjects)
-        elif args.profile == "vocpub":
+        elif profile == "vocpub":
             html = VocPub(args.input, sort_subjects=sort_subjects)
-        elif args.profile == "supermodel":
+        elif profile == "supermodel":
             html = Supermodel(args.input, sort_subjects=sort_subjects)
         else:
-            raise ValueError(f"Unexpected profile type '{args.profile}'")
+            raise ValueError(f"Unexpected profile type '{profile}'")
     except PylodeError as e:
         print("ERROR: " + str(e))
         exit(1)

{pylode-3.5.2 → pylode-3.6.0}/pylode/profiles/ontpub.py

@@ -16,6 +16,7 @@ class OntPub:
     """
 
     def __init__(self, ontology: Union[Graph, Path, str], sort_subjects: bool = False):
+        self.sort_subjects = sort_subjects
         self.ont = load_ontology(ontology)
         if sort_subjects:
             self.ont = sort_ontology(self.ont)
@@ -73,14 +74,10 @@ class OntPub:
         for s_ in g.subjects(RDF.type, RDFS.Class):
             g.add((s_, RDF.type, OWL.Class))
 
-        # # property types
-        # for s_ in chain(
-        #     g.subjects(RDF.type, OWL.ObjectProperty),
-        #     g.subjects(RDF.type, OWL.FunctionalProperty),
-        #     g.subjects(RDF.type, OWL.DatatypeProperty),
-        #     g.subjects(RDF.type, OWL.AnnotationProperty),
-        # ):
-        #     g.add((s_, RDF.type, RDF.Property))
+        # property types
+        for prop_type in OBJECT_PROPERTY_SUBCLASSES:
+            for s_ in g.subjects(RDF.type, prop_type):
+                g.add((s_, RDF.type, OWL.ObjectProperty))
 
         # name
         for s_, o in chain(
@@ -224,6 +221,7 @@ class OntPub:
                 href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC40lEQVRYhe2UT0hUQRzHp6Iss1B3VZKIDbbdfW9mnoi4f3zzjkJQeOgS0SEIb1EWBGGlLLu460zQPQM1unUIIjA6rfpm6ZAhHjoIRVQUFUlEbG+euTsdXG1d3VL3bVD4g+9h+L35fT/8fvN7ADgY9aHY5fpIvK82HO9ysu66wxWOzbkjcekKx0a2ALYA/n2AGi3a6ArFezcidziecQygNhhrcUficjP6PwBqtGijKxy/thnVBePHywYoDsFhl53GV8SEcsTx4usCMLUewTVpc23BNvEzm6Neyf1+KcG2vwqwUjgrOJq2JmHftwmkVBRGTvncFodnbI7vChO/FRznCmHsNM7aHM9Yk7Df5iqsLMw9sMNOK2g+jS4IEz0UJv4iuJZb2RltWnB4UZqH6ioGAgAAGe5vtiZhtzDx7OoRadLmeM7m6IRjhnLMW2Vx1bA5GhAmnhIcz6/xNj4Ujsky8UspwfayjDPjsF2Y6L7N8Vzx/BfP+KPg6LbgSqd8DnfJW2CnbaLhfH5ephpqygJYvQU4Z3P82TLRsDDhUTnmrSq+Y3N0Mg+Xldy/zwEAnLMWZ3pHpNExmfLs/t0dOdVcbT0JeKxUwFP2VljjqiE47Jp53LTXNxhsUZjerTByXWX6VZWRs/4bIQ2ACv+UAomgDzLCISNZxAxZKMhIDjLy1JfsaK+I+eGBUBNk5E2x8RogX/PdcDZUqieWTSh5D6nOVKqfhoycUmlHFFIyu5RXqf7AcQDISCpv/tqbMBqK883RtmpISRoxQyJKPgGn3wNk5NEigDFa6hslqV/Kj+FdBQD0bshIDlKSLlVcoWQo36UhR80BAMB73lulMn0EMpJTqD6qJiOt3mho/8GbkT2BZNgDB/V+RI0fkOrT3kRIVQbaDizJm2hdNbINBxwk5xAj3yEjuV9rZ1iIkgxixkLBA83mz8uCjLwoGwAx0vOnFSy5mtR4VTaAQvVORMnwZgSpzkrV/QmdE2tKe46+MQAAAABJRU5ErkJggg==",
             )
             meta(http_equiv="Content-Type", content="text/html; charset=utf-8")
+            meta(name="viewport", content="width=device-width, initial-scale=1")
             script(
                 raw("\n" + schema_org.serialize(format="json-ld") + "\n\t"),
                 type="application/ld+json",
@@ -250,30 +248,35 @@ class OntPub:
             self.ont.subjects(predicate=RDF.type, object=PROF.Profile),
         ):
             iri = s_
-            for p_, o in self.ont.predicate_objects(s_):
-                if p_ in ONTOLOGY_PROPS:
-                    this_onts_props[p_].append(o)
+            for p_, objects in ordered_subject_properties(self.ont, s_, ONTOLOGY_PROPS):
+                this_onts_props[p_].extend(objects)
 
         # make HTML for all props in order of ONT_PROPS
         sec = div(h1(this_onts_props[DCTERMS.title]), id="metadata", _class="section")
         sec.appendChild(h2("Metadata"))
         d = dl(div(dt(strong("IRI")), dd(code(str(iri)))))
-        for prop in ONTOLOGY_PROPS:
-            if prop in this_onts_props.keys():
-                d.appendChild(
-                    prop_obj_pair_html(
-                        self.ont,
-                        self.back_onts,
-                        self.ns,
-                        "dl",
-                        prop,
-                        self.props_labeled[prop]["title"],
-                        self.props_labeled[prop]["description"],
-                        self.props_labeled[prop]["ont_title"],
-                        self.fids,
-                        this_onts_props[prop],
-                    )
+        ordered_props = [p for p in ONTOLOGY_PROPS if p in this_onts_props]
+        ordered_props.extend(
+            sorted((p for p in this_onts_props if p not in ONTOLOGY_PROPS), key=str)
+        )
+        for prop in ordered_props:
+            details = property_details(
+                prop, self.ont, self.back_onts, self.props_labeled
+            )
+            d.appendChild(
+                prop_obj_pair_html(
+                    self.ont,
+                    self.back_onts,
+                    self.ns,
+                    "dl",
+                    prop,
+                    details["title"],
+                    details["description"],
+                    details["ont_title"],
+                    self.fids,
+                    this_onts_props[prop],
                 )
+            )
         sec.appendChild(d)
         self.content.appendChild(sec)
 
@@ -515,6 +518,10 @@ class OntPub:
                         self.toc["namespaces"].append(("#" + prefix, prefix))
 
     def _make_toc(self):
+        def toc_entries(key):
+            entries = self.toc[key]
+            return sorted(entries) if self.sort_subjects else entries
+
         with self.doc:
             with div(id="toc"):
                 h3("Table of Contents")
@@ -542,7 +549,7 @@ class OntPub:
                                 )
                             )
                             with ul(_class="second"):
-                                for c in sorted(self.toc["classes"]):
+                                for c in toc_entries("classes"):
                                     li(a(c[1], href=c[0]), style="margin-left:10px;")
 
                     if (
@@ -552,7 +559,7 @@ class OntPub:
                         with li():
                             h4(a("Properties", href="#properties"))
                             with ul(_class="second"):
-                                for c in sorted(self.toc["properties"]):
+                                for c in toc_entries("properties"):
                                     li(a(c[1], href=c[0]))
 
                     if (
@@ -576,7 +583,7 @@ class OntPub:
                                 )
                             )
                             with ul(_class="second"):
-                                for c in sorted(self.toc["objectproperties"]):
+                                for c in toc_entries("objectproperties"):
                                     li(a(c[1], href=c[0]), style="margin-left:10px;")
 
                     if (
@@ -586,7 +593,7 @@ class OntPub:
                         with li():
                             h4(a("Datatype Properties", href="#datatypeproperties"))
                             with ul(_class="second"):
-                                for c in sorted(self.toc["datatypeproperties"]):
+                                for c in toc_entries("datatypeproperties"):
                                     li(a(c[1], href=c[0]))
 
                     if (
@@ -596,7 +603,7 @@ class OntPub:
                         with li():
                             h4(a("Annotation Properties", href="#annotationproperties"))
                             with ul(_class="second"):
-                                for c in sorted(self.toc["annotationproperties"]):
+                                for c in toc_entries("annotationproperties"):
                                     li(a(c[1], href=c[0]))
 
                     if (
@@ -606,7 +613,7 @@ class OntPub:
                         with li():
                             h4(a("Functional Properties", href="#functionalproperties"))
                             with ul(_class="second"):
-                                for c in sorted(self.toc["functionalproperties"]):
+                                for c in toc_entries("functionalproperties"):
                                     li(a(c[1], href=c[0]))
 
                     if (
@@ -616,7 +623,7 @@ class OntPub:
                         with li():
                             h4(a("Custom Datatypes", href="#datatypes"))
                             with ul(_class="second"):
-                                for c in sorted(self.toc["datatypes"]):
+                                for c in toc_entries("datatypes"):
                                     li(a(c[1], href=c[0]))
 
                     with li():

{pylode-3.5.2 → pylode-3.6.0}/pylode/profiles/supermodel/dataset.py

@@ -12,7 +12,7 @@ class Dataset(_Dataset):
     ) -> Graph:
         """Add a graph to dataset with correct context set.
 
-        If we use self.add_graph(graph), it doesn't add the context correctly. Then if we
+        If we use self.add_graph(graph), it doesn't add the context correctly. Then, if we
         try and query the default graph like, self.objects(None, None), it returns nothing.
 
         This function fixes the above issue.
@@ -27,6 +27,7 @@ class Dataset(_Dataset):
             _graph = Graph(identifier=identifier)
             _graph.__iadd__(g)
             super().add_graph(_graph)
+
         for s, p, o in tqdm(g, desc="Adding triples", unit="triple"):
             self.add((s, p, o, _graph))
 

{pylode-3.5.2 → pylode-3.6.0}/pylode/profiles/supermodel/html.py

@@ -57,6 +57,7 @@ from pylode.profiles.supermodel.query import Query
 from pylode.utils import (
     PylodeError,
     load_ontology,
+    render_svg_image,
     sort_ontology,
 )
 
@@ -418,6 +419,9 @@ class Supermodel:
                 with div(_class="paragraph"):
                     p(cls.description)
 
+            for image in cls.images:
+                div(render_svg_image(image), _class="imageblock text-center")
+
             if cls.notes:
                 for note in cls.notes:
                     with div(_class="admonitionblock note"):
@@ -474,6 +478,33 @@ class Supermodel:
                                         else:
                                             external_link(subclass.name, subclass.iri)
 
+            if cls.equivalent_classes:
+                h5("Equivalent to")
+                with div(_class="sect5"):
+                    with div(_class="ulist"):
+                        with ul():
+                            for equivalent_class in cls.equivalent_classes:
+                                with li():
+                                    with p():
+                                        if (
+                                            equivalent_class.iri
+                                            in self.query.class_index
+                                        ):
+                                            fragment = make_html_fragment(
+                                                CLASS_STRING.format(
+                                                    equivalent_class.iri
+                                                )
+                                            )
+                                            a(
+                                                equivalent_class.name,
+                                                href=f"#{fragment}",
+                                            )
+                                        else:
+                                            external_link(
+                                                equivalent_class.name,
+                                                equivalent_class.iri,
+                                            )
+
             if cls.properties:
                 h5("Properties")
                 self._make_component_model_class_properties(cls.properties)
@@ -495,6 +526,9 @@ class Supermodel:
                 with div(_class="paragraph"):
                     p(prop.description)
 
+            for image in prop.images:
+                div(render_svg_image(image), _class="imageblock text-center")
+
             if prop.notes:
                 for note in prop.notes:
                     with div(_class="admonitionblock note"):
@@ -1000,6 +1034,7 @@ class Supermodel:
                 href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC40lEQVRYhe2UT0hUQRzHp6Iss1B3VZKIDbbdfW9mnoi4f3zzjkJQeOgS0SEIb1EWBGGlLLu460zQPQM1unUIIjA6rfpm6ZAhHjoIRVQUFUlEbG+euTsdXG1d3VL3bVD4g+9h+L35fT/8fvN7ADgY9aHY5fpIvK82HO9ysu66wxWOzbkjcekKx0a2ALYA/n2AGi3a6ArFezcidziecQygNhhrcUficjP6PwBqtGijKxy/thnVBePHywYoDsFhl53GV8SEcsTx4usCMLUewTVpc23BNvEzm6Neyf1+KcG2vwqwUjgrOJq2JmHftwmkVBRGTvncFodnbI7vChO/FRznCmHsNM7aHM9Yk7Df5iqsLMw9sMNOK2g+jS4IEz0UJv4iuJZb2RltWnB4UZqH6ioGAgAAGe5vtiZhtzDx7OoRadLmeM7m6IRjhnLMW2Vx1bA5GhAmnhIcz6/xNj4Ujsky8UspwfayjDPjsF2Y6L7N8Vzx/BfP+KPg6LbgSqd8DnfJW2CnbaLhfH5ephpqygJYvQU4Z3P82TLRsDDhUTnmrSq+Y3N0Mg+Xldy/zwEAnLMWZ3pHpNExmfLs/t0dOdVcbT0JeKxUwFP2VljjqiE47Jp53LTXNxhsUZjerTByXWX6VZWRs/4bIQ2ACv+UAomgDzLCISNZxAxZKMhIDjLy1JfsaK+I+eGBUBNk5E2x8RogX/PdcDZUqieWTSh5D6nOVKqfhoycUmlHFFIyu5RXqf7AcQDISCpv/tqbMBqK883RtmpISRoxQyJKPgGn3wNk5NEigDFa6hslqV/Kj+FdBQD0bshIDlKSLlVcoWQo36UhR80BAMB73lulMn0EMpJTqD6qJiOt3mho/8GbkT2BZNgDB/V+RI0fkOrT3kRIVQbaDizJm2hdNbINBxwk5xAj3yEjuV9rZ1iIkgxixkLBA83mz8uCjLwoGwAx0vOnFSy5mtR4VTaAQvVORMnwZgSpzkrV/QmdE2tKe46+MQAAAABJRU5ErkJggg==",
             )
             meta(http_equiv="Content-Type", content="text/html; charset=utf-8")
+            meta(name="viewport", content="width=device-width, initial-scale=1")
             script(
                 raw("\n" + schema_org.serialize(format="json-ld") + "\n\t"),
                 type="application/ld+json",

{pylode-3.5.2 → pylode-3.6.0}/pylode/profiles/supermodel/model.py

@@ -171,10 +171,12 @@ class Class:
     description: str = None
     subclasses: list["Class"] = field(default_factory=list)
     superclasses: list["Class"] = field(default_factory=list)
+    equivalent_classes: list["Class"] = field(default_factory=list)
     properties: dict[str, list[Property]] = field(default_factory=dict)
     examples: list[MediaObject] = field(default_factory=list)
     notes: list[Note] = field(default_factory=list)
     is_defined_by: "Ontology" = None
+    images: list[Literal] = field(default_factory=list)
 
     def __eq__(self, other):
         if not isinstance(other, Class):
@@ -193,6 +195,7 @@ class RDFProperty:
     super_properties: list["RDFProperty"] = field(default_factory=list)
     domain_includes: list[Class] = field(default_factory=list)
     range_includes: list[Class] = field(default_factory=list)
+    images: list[Literal] = field(default_factory=list)
 
 
 @dataclass