Also count node shapes for the execution report

Author: muddymudskipper

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/)
 
+## [Unreleased]
+
+### Changed
+
+- Also count node shapes for the execution report
 
 ## [2.0.0] 2025-02-10
 

cmem_plugin_shapes/plugin_shapes.py

@@ -160,6 +160,7 @@ def format_prefixes(prefixes: dict, formatted_prefixes: dict | None = None) -> d
             formatted_prefixes = {}
         for prefix, namespace in prefixes.items():
             formatted_prefixes.setdefault(namespace, []).append(prefix + ":")
+
         return formatted_prefixes
 
     def get_prefixes(self) -> dict:
@@ -180,7 +181,6 @@ def get_prefixes(self) -> dict:
         if not prefixes_cc or not self.prefix_cc:
             with (Path(__path__[0]) / "prefix_cc.json").open("r", encoding="utf-8") as json_file:
                 prefixes_cc = json.load(json_file)
-
         if prefixes_cc:
             prefixes = self.format_prefixes(prefixes_cc, prefixes)
 
@@ -214,13 +214,11 @@ def get_name(self, iri: str) -> str:
                     except IndexError as exc:
                         raise IndexError(f"{title_json['title']} {prefixes}") from exc
             title += f" ({prefix})"
-
         return title
 
     def init_shapes_graph(self) -> Graph:
         """Initialize SHACL shapes graph"""
-        shapes_graph = Graph()
-        shapes_graph.add((URIRef(self.shapes_graph_iri), RDF.type, SHUI.ShapeCatalog))
+        shapes_graph = Graph().add((URIRef(self.shapes_graph_iri), RDF.type, SHUI.ShapeCatalog))
         shapes_graph.add(
             (
                 URIRef(self.shapes_graph_iri),
@@ -240,6 +238,7 @@ def iri_list_to_filter(iris: list[str], name: str = "property", filter_: str = "
         if not iris:
             return ""
         iris_quoted = [f"<{_}>" for _ in iris]
+
         return f"FILTER (?{name} {filter_} ({', '.join(iris_quoted)}))"
 
     def get_class_dict(self) -> dict:
@@ -292,6 +291,7 @@ def create_shapes(self, shapes_graph: Graph) -> tuple[Graph, int]:
             node_shape_uri = URIRef(f"{format_namespace(self.shapes_graph_iri)}{class_uuid}")
 
             if class_uuid not in class_uuids:
+                shapes_count += 1
                 shapes_graph.add((node_shape_uri, RDF.type, SH.NodeShape))
                 shapes_graph.add((node_shape_uri, SH.targetClass, URIRef(cls)))
                 name = self.get_name(cls)
@@ -304,7 +304,6 @@ def create_shapes(self, shapes_graph: Graph) -> tuple[Graph, int]:
                     NAMESPACE_URL, f"{prop['property']}{'inverse' if prop['inverse'] else ''}"
                 )
                 property_shape_uri = URIRef(f"{format_namespace(self.shapes_graph_iri)}{prop_uuid}")
-
                 if prop_uuid not in prop_uuids:
                     shapes_count += 1
                     name = self.get_name(prop["property"])
@@ -332,7 +331,6 @@ def create_shapes(self, shapes_graph: Graph) -> tuple[Graph, int]:
                     shapes_graph.add((property_shape_uri, SH.name, Literal(name, lang="en")))
                     shapes_graph.add((property_shape_uri, RDFS.label, Literal(name, lang="en")))
                     prop_uuids.add(prop_uuid)
-
                 shapes_graph.add((node_shape_uri, SH.property, property_shape_uri))
 
         return shapes_graph, shapes_count

cmem_plugin_shapes/prefix_cc.json

@@ -622,6 +622,7 @@
   "ddl": "http://purl.org/vocab/riro/ddl#",
   "ddpheno": "http://purl.obolibrary.org/obo/DDPHENO_",
   "dead": "http://utpl.edu.ec/sbc/data/",
+  "debias": "http://data.europa.eu/c4p/data/",
   "decision": "https://decision-ontology.googlecode.com/svn/trunk/decision.owl#",
   "decl": "http://www.linkedmodel.org/1.0/schema/decl#",
   "decprov": "http://promsns.org/def/decprov#",
@@ -1784,6 +1785,7 @@
   "nsg": "https://neuroshapes.org/",
   "nsl": "http://purl.org/ontology/storyline/",
   "nsogi": "http://prefix.cc/nsogi:",
+  "nsprov": "http://www.w3.org/ns/prov#",
   "nt": "http://ns.inria.fr/nicetag/2010/09/09/voc#",
   "ntag": "http://ns.inria.fr/nicetag/2010/09/09/voc#",
   "ntp": "https://schema.finto.fi/ntp#",
@@ -2560,7 +2562,7 @@
   "sct": "http://snomed.info/id/",
   "scufl2": "http://ns.taverna.org.uk/2010/scufl2#",
   "scv": "http://purl.org/NET/scovo#",
-  "sd": "https://w3id.org/okn/o/sd#",
+  "sd": "http://www.w3.org/ns/sparql-service-description#",
   "sdgp": "http://stats.data-gov.ie/property/",
   "sdl": "http://purl.org/vocab/riro/sdl#",
   "sdm": "https://w3id.org/okn/o/sdm#",
@@ -3215,6 +3217,7 @@
   "vr": "https://www.w3.org/2018/credentials/v1/",
   "vra": "http://purl.org/vra/",
   "vrank": "http://purl.org/voc/vrank#",
+  "vrti": "https://www.w3id.org/virtual-treasury/ontology#",
   "vs": "http://www.w3.org/2003/06/sw-vocab-status/ns#",
   "vsao": "http://purl.obolibrary.org/obo/VSAO_",
   "vsearch": "http://vocab.sti2.at/vsearch#",