Adding/fixing template-to-shape functionality

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
         entry: poetry run flake8 buildingmotif
 # can't poetry run becuase not present in repository https://github.com/pre-commit/mirrors-mypy
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
     -   id: mypy
         args: ["--install-types", "--non-interactive", "--ignore-missing-imports", "--follow-imports=skip", "--disable-error-code=import-untyped"]

buildingmotif/dataclasses/library.py

@@ -426,10 +426,10 @@ def _resolve_dependency(
                 return
             except Exception as e:
                 logging.debug(
-                    f"Could not find dependee {dep['template']} in library {imp}: {e}"
+                    f"{template.name} could not find dependee {dep['template']} in library {imp}: {e}"
                 )
         logging.warning(
-            f"Warning: could not find dependee {dep['template']} in libraries {self.graph_imports}"
+            f"Warning: {template.name} could not find dependee {dep['template']} in libraries {self.graph_imports}"
         )
 
     def _resolve_template_dependencies(

buildingmotif/dataclasses/model.py

@@ -2,7 +2,6 @@
 from typing import TYPE_CHECKING, Dict, List, Optional
 
 import rdflib
-import rfc3987
 from rdflib import URIRef
 
 from buildingmotif import get_building_motif
@@ -16,20 +15,13 @@
     shacl_inference,
     shacl_validate,
     skolemize_shapes,
+    validate_uri,
 )
 
 if TYPE_CHECKING:
     from buildingmotif import BuildingMOTIF
 
 
-def _validate_uri(uri: str):
-    parsed = rfc3987.parse(uri)
-    if not parsed["scheme"]:
-        raise ValueError(
-            f"{uri} does not look like a valid URI, trying to serialize this will break."
-        )
-
-
 @dataclass
 class Model:
     """This class mirrors :py:class:`database.tables.DBModel`."""
@@ -54,7 +46,7 @@ def create(cls, name: str, description: str = "") -> "Model":
         """
         bm = get_building_motif()
 
-        _validate_uri(name)
+        validate_uri(name)
         db_model = bm.table_connection.create_db_model(name, description)
 
         g = rdflib.Graph()

buildingmotif/dataclasses/template.py

@@ -17,6 +17,7 @@
 from buildingmotif.dataclasses.model import Model
 from buildingmotif.namespaces import bind_prefixes
 from buildingmotif.template_matcher import Mapping, TemplateMatcher
+from buildingmotif.template_to_shape import template_to_nodeshape
 from buildingmotif.utils import (
     PARAM,
     combine_graphs,
@@ -288,15 +289,21 @@ def inline_dependencies(self) -> "Template":
             name_prefix = dep.args.get("name")
             # for each parameter in the dependency...
             for param in deptempl.parameters:
+                # if param already starts with PARAM, then keep it as-is
+                if param.startswith(PARAM):
+                    rename_params[param] = param
                 # if it does *not* have a mapping in the dependency, then
                 # prefix the parameter with the value of the 'name' binding
                 # to scope it properly
                 if param not in dep.args and param != "name":
                     rename_params[param] = f"{name_prefix}-{param}"
-
             # replace the parameters in the dependency template
             replace_nodes(
-                deptempl.body, {PARAM[k]: PARAM[v] for k, v in rename_params.items()}
+                deptempl.body,
+                {
+                    PARAM[k]: PARAM[v] if not v.startswith(PARAM) else rdflib.URIRef(v)
+                    for k, v in rename_params.items()
+                },
             )
             # rename the optional_args in the dependency template too
             deptempl.optional_args = [
@@ -484,6 +491,17 @@ def find_subgraphs(
         for mapping, sg in matcher.building_mapping_subgraphs_iter():
             yield mapping, sg, matcher.remaining_template(mapping)
 
+    def to_nodeshape(self) -> rdflib.Graph:
+        """
+        Interprets the template body as a SHACL shape and returns the SHACL
+        shape in its own graph. See buildingmotif.template_to_shape.template_to_nodeshape
+        for the specific translation rules and implementation.
+
+        :return: a graph containing the NodeShape
+        :rtype: rdflib.Graph
+        """
+        return template_to_nodeshape(self)
+
     def generate_csv(self, path: Optional[PathLike] = None) -> Optional[StringIO]:
         """
         Generate a CSV for this template which contains a column for each template parameter.

buildingmotif/template_compilation.py

@@ -141,7 +141,7 @@ def bacnet(*args, **kwargs) -> rdflib.Graph:
         ref_name = rdflib.BNode()
         object_name = PARAM[param + "_object"]
         G.add((PARAM[param], REF.hasExternalReference, ref_name))
-        G.add((ref_name, BACNET["object-identifier"], rdflib.Literal(object_name)))
+        G.add((ref_name, BACNET["object-identifier"], object_name))
         G.add((ref_name, BACNET["objectOf"], PARAM["BACnet_device"]))
     return G