iolanta 2.0.8__py3-none-any.whl → 2.1.1__py3-none-any.whl

iolanta/cli/main.py

@@ -136,4 +136,4 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
         raise Exit(1)
 
     else:
-        Console().print(renderable)
+        print(renderable)

iolanta/data/graph-triples.yamlld

@@ -1,6 +1,6 @@
 "@context": context.yaml
-$id: python://iolanta.facets.textual_graph.GraphFacet
+$id: pkg:pypi/iolanta#textual-graph
 $: Graph Triples
 →: https://iolanta.tech/cli/textual
-⪯: python://iolanta.facets.textual_default.InverseProperties
+⪯: pkg:pypi/iolanta#textual-inverse-properties
 ↦: ASK WHERE { GRAPH $this { ?s ?p ?o } }

iolanta/data/textual-browser.yaml

@@ -30,6 +30,8 @@
     "@id": iolanta:is-preferred-over
 
   ↦: iolanta:matches
+  iolanta:hasDefaultFacet:
+    "@type": "@id"
 
 "@included":
   - $id: iolanta:icon
@@ -42,26 +44,25 @@
   - $id: https://iolanta.tech/datatypes/icon
     $: Icon
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.icon.IconFacet
+      $id: pkg:pypi/iolanta#icon
       →: https://iolanta.tech/datatypes/icon
 
   - $id: np:Nanopublication
     $: Nanopublication
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_nanopublication.NanopublicationFacet
+      $id: pkg:pypi/iolanta#textual-nanopublication
       $: Nanopublication
       →: https://iolanta.tech/cli/textual
       ⪯:
-        - python://iolanta.facets.textual_default.TextualDefaultFacet
-        - python://iolanta.facets.textual_graph.GraphFacet
+        - pkg:pypi/iolanta#textual-properties
+        - pkg:pypi/iolanta#textual-graph
 
   - $id: https://iolanta.tech/cli/interactive
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_browser.TextualBrowserFacet
+    iolanta:hasDefaultFacet: pkg:pypi/iolanta#textual-browser
 
-  - $id: python://iolanta.facets.textual_default.TextualDefaultFacet
+  - $id: pkg:pypi/iolanta#textual-properties
     $: Properties
-    ⪯: python://iolanta.facets.textual_default.InverseProperties
+    ⪯: pkg:pypi/iolanta#textual-inverse-properties
     →: https://iolanta.tech/cli/textual
     ↦: |
       ASK WHERE {
@@ -69,7 +70,7 @@
         FILTER (?graph != <iolanta://_meta>)
       }
 
-  - $id: python://iolanta.facets.textual_default.InverseProperties
+  - $id: pkg:pypi/iolanta#textual-inverse-properties
     $: Inverse Properties
     →: https://iolanta.tech/cli/textual
     ↦: |
@@ -80,54 +81,54 @@
 
   - $id: "urn:"
     iolanta:hasFacetByPrefix:
-      $id: python://iolanta.facets.textual_provenance.TextualProvenanceFacet
+      $id: pkg:pypi/iolanta#textual-provenance
       →: https://iolanta.tech/cli/textual
 
   - $id: https://iolanta.tech/cli/link
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_link.TextualLinkFacet
+      $id: pkg:pypi/iolanta#textual-link
 
   - $id: https://wikiba.se/ontology#Statement
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.wikibase_statement_title.WikibaseStatementTitle
+      $id: pkg:pypi/iolanta#wikibase-statement-title
       $: Title
       →: https://iolanta.tech/datatypes/title
 
   - $id: rdfs:Class
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_class.Class
+      $id: pkg:pypi/iolanta#textual-class
       $: Instances
       →: https://iolanta.tech/cli/textual
       ⪯:
-        - python://iolanta.facets.textual_browser.TextualBrowserFacet
-        - python://iolanta.facets.textual_default.InverseProperties
+        - pkg:pypi/iolanta#textual-browser
+        - pkg:pypi/iolanta#textual-inverse-properties
 
   - $id: owl:Ontology
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_ontology.OntologyFacet
+      $id: pkg:pypi/iolanta#textual-ontology
       $: Ontology
       →: https://iolanta.tech/cli/textual
-      ⪯: python://iolanta.facets.textual_default.TextualDefaultFacet
+      ⪯: pkg:pypi/iolanta#textual-properties
 
   - $id: https://iolanta.tech/datatypes/textual-graph-triples
     $: Graph Triples
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_graph_triples.GraphTriplesFacet
+      $id: pkg:pypi/iolanta#textual-graph-triples
       →: https://iolanta.tech/datatypes/textual-graph-triples
 
   - $id: https://iolanta.tech/qname
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.qname.QNameFacet
+      $id: pkg:pypi/iolanta#qname
 
-  - $id: python://iolanta.facets.textual_property_pairs_table.TextualPropertyPairsTableFacet
+  - $id: pkg:pypi/iolanta#textual-property-pairs
     $: Subjects → Objects
     →: https://iolanta.tech/cli/textual
     ↦: ASK WHERE { ?subject $this ?object }
 
-  - $id: python://iolanta.facets.textual_class.Class
+  - $id: pkg:pypi/iolanta#textual-class
     ↦:
       - ASK WHERE { ?instance a $this }
       - ASK WHERE { $this rdfs:subClassOf ?superclass }
 
   - $id: https://iolanta.tech/cli/textual
-    iolanta:when-no-facet-found: python://iolanta.facets.textual_no_facet_found.TextualNoFacetFound
+    iolanta:when-no-facet-found: pkg:pypi/iolanta#textual-no-facet-found

iolanta/facets/textual_browser/page_switcher.py

@@ -136,7 +136,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             for facet in other_facets
         ]
 
-        facet_class = iolanta.facet_resolver[facet_iri]
+        facet_class = iolanta.facet_resolver.resolve(facet_iri)
 
         facet = facet_class(
             iri=self.iri,

iolanta/facets/title/facets.py

@@ -10,6 +10,7 @@ PRIORITIES = [   # noqa: WPS407
     'rdfs_label',
     'foaf_name',
     'literal_form',
+    'preferred_label',
 ]
 
 
@@ -20,7 +21,7 @@ class TitleFacet(Facet[str]):
         """Render title of a thing."""
         choices = self.stored_query(
             'title.sparql',
-            iri=self.iri,
+            iri=self.this,
             language=self.iolanta.language,
         )
 

iolanta/facets/title/sparql/title.sparql

@@ -28,4 +28,9 @@ SELECT * WHERE {
         $iri <https://www.w3.org/2008/05/skos-xl#literalForm> ?literal_form .
         FILTER (!lang(?literal_form) || lang(?literal_form) = $language)
     }
+
+    OPTIONAL {
+        $iri <https://www.w3.org/2004/02/skos/core#prefLabel> ?preferred_label .
+        FILTER (!lang(?preferred_label) || lang(?preferred_label) = $language)
+    }
 }

iolanta/iolanta.py

@@ -39,23 +39,17 @@ from iolanta.query_result import (
     SPARQLQueryArgument,
     format_query_bindings,
 )
+from iolanta.resolvers.base import Resolver
+from iolanta.resolvers.dispatch import SchemeDispatchResolver
+from iolanta.resolvers.pypi import PyPIResolver
 from iolanta.resolvers.python_import import PythonImportResolver
 from iolanta.sparqlspace.processor import normalize_term
 
 
 class LoggerProtocol(Protocol):
-    """
-    Abstract Logger interface.
+    """Abstract Logger interface that unites `loguru` & standard `logging`."""
 
-    Unites `loguru` & standard `logging`.
-    """
-
-    def info(   # noqa: WPS110
-        self,
-        message: str,
-        *args: Any,
-        **kwargs: Any,
-    ) -> None:
+    def info(self, message: str, *args: Any, **kwargs: Any) -> None:
         """Log an INFO message."""
 
     def error(self, message: str, *args: Any, **kwargs: Any) -> None:
@@ -85,8 +79,12 @@ class Iolanta:   # noqa: WPS214
     graph: ConjunctiveGraph = field(default_factory=_create_default_graph)
     force_plugins: List[Type[Plugin]] = field(default_factory=list)
 
-    facet_resolver: Mapping[URIRef, Type[Facet]] = field(
-        default_factory=PythonImportResolver,
+    facet_resolver: Resolver = field(
+        default_factory=functools.partial(
+            SchemeDispatchResolver,
+            python=PythonImportResolver,
+            pkg=PyPIResolver,
+        ),
     )
 
     logger: LoggerProtocol = loguru.logger
@@ -103,11 +101,7 @@ class Iolanta:   # noqa: WPS214
 
     @functools.cached_property
     def plugins(self) -> List[Plugin]:
-        """
-        Construct a list of installed plugin instances.
-
-        # FIXME: Get rid of those.
-        """
+        """Construct a list of installed plugin instances."""
         return [
             plugin_class(iolanta=self)
             for plugin_class in self.plugin_classes
@@ -118,28 +112,7 @@ class Iolanta:   # noqa: WPS214
         query_text: str,
         **kwargs: SPARQLQueryArgument,
     ) -> QueryResult:
-        """
-        Run a SPARQL `SELECT`, `CONSTRUCT`, or `ASK` query.
-
-        Args:
-            query_text: The SPARQL text;
-            **kwargs: bind variables in the query to values if necessary. For
-                example:
-
-                ```python
-                iolanta.query(
-                    'SELECT ?title WHERE { ?page rdfs:label ?title }',
-                    ?page=page_iri,
-                )
-                ```
-
-        Returns:
-            Results of the query:
-
-            - a graph for `CONSTRUCT`,
-            - a list of dicts for `SELECT`,
-            - or a boolean for `ASK`.
-        """
+        """Run a SPARQL `SELECT`, `CONSTRUCT`, or `ASK` query."""
         try:
             sparql_result: SPARQLResult = self.graph.query(
                 query_text,
@@ -231,11 +204,7 @@ class Iolanta:   # noqa: WPS214
         return self
 
     def infer(self, closure_class=None) -> 'Iolanta':
-        """
-        Apply inference.
-
-        TODO Remove this. Or use `reasonable`. Not sure.
-        """
+        """Apply inference."""
         return self
 
     def bind_namespaces(self):
@@ -258,11 +227,7 @@ class Iolanta:   # noqa: WPS214
 
     @functools.cached_property
     def context_paths(self) -> Iterable[Path]:
-        """
-        Compile list of context files.
-
-        FIXME: Get rid of those.
-        """
+        """Compile list of context files."""
         directory = Path(__file__).parent / 'data'
 
         yield directory / 'context.yaml'
@@ -272,11 +237,7 @@ class Iolanta:   # noqa: WPS214
                 yield path
 
     def add_files_from_plugins(self):
-        """
-        Load files from plugins.
-
-        FIXME: Get rid of plugins.
-        """
+        """Load files from plugins."""
         for plugin in self.plugins:
             try:
                 self.add(plugin.data_files)
@@ -285,14 +246,24 @@ class Iolanta:   # noqa: WPS214
                     f'Cannot load {plugin} plugin data files: {error}',
                 )
 
-    def __post_init__(self):
-        """
-        Load stuff from plugins.
+    @property
+    def facet_classes(self):
+        """Get all registered facet classes."""
+        return entry_points.plugins('iolanta.facets')
 
-        FIXME: Get rid of plugins.
-        """
+    def add_files_from_facets(self):
+        """Add files from all registered facets to the graph."""
+        for facet_class in self.facet_classes:
+            try:
+                self.add(facet_class.META)
+            except AttributeError:
+                pass
+
+    def __post_init__(self):
+        """Initialize after instance creation."""
         self.bind_namespaces()
         self.add_files_from_plugins()
+        self.add_files_from_facets()
         if self.project_root:
             self.add(self.project_root)
 
@@ -318,7 +289,7 @@ class Iolanta:   # noqa: WPS214
             as_datatype=as_datatype,
         ).facet_and_output_datatype
 
-        facet_class = self.facet_resolver[found['facet']]
+        facet_class = self.facet_resolver.resolve(found['facet'])
 
         facet = facet_class(
             iri=node,
@@ -375,11 +346,7 @@ class Iolanta:   # noqa: WPS214
                 ) from err
 
     def node_as_qname(self, node: Node):
-        """
-        Render node as a QName if possible.
-
-        Return the node as is, if it is not.
-        """
+        """Render node as a QName if possible."""
         qname = node_to_qname(node, self.graph)
         return f'{qname.namespace_name}:{qname.term}' if isinstance(
             qname,

iolanta/mermaid/facet.py

@@ -0,0 +1,127 @@
+import functools
+from pathlib import Path
+from typing import Iterable
+
+import boltons
+import cachetools
+import funcy
+from boltons.cacheutils import cached, cachedmethod
+from pydantic import AnyUrl
+from rdflib import BNode, Literal, Node, URIRef
+
+from iolanta import Facet
+from iolanta.mermaid.models import (
+    Diagram,
+    MermaidBlankNode,
+    MermaidEdge,
+    MermaidLiteral,
+    MermaidScalar,
+    MermaidSubgraph,
+    MermaidURINode,
+)
+from iolanta.models import NotLiteralNode
+from iolanta.namespaces import DATATYPES
+
+
+def filter_edges(edges: Iterable[MermaidEdge]) -> Iterable[MermaidEdge]:
+    for edge in edges:
+        if isinstance(edge.target, MermaidLiteral) and edge.source.title == edge.target.title:
+            continue
+
+        yield edge
+
+
+def filter_nodes(edges: Iterable[MermaidEdge], except_uris: Iterable[NotLiteralNode]) -> Iterable[MermaidURINode | MermaidLiteral | MermaidBlankNode]:
+    nodes = [
+        node
+        for edge in edges
+        for node in edge.nodes
+    ]
+
+    literals_in_edges = {edge.target for edge in edges if isinstance(edge.target, MermaidLiteral)}
+    for node in nodes:
+        if isinstance(node, MermaidLiteral) and node not in literals_in_edges:
+            continue
+
+        if isinstance(node, MermaidURINode) and node.uri in except_uris:
+            continue
+
+        if isinstance(node, MermaidBlankNode) and node.node in except_uris:
+            continue
+
+        if isinstance(node, MermaidSubgraph):
+            continue
+
+        yield node
+
+
+class Mermaid(Facet[str]):
+    """Mermaid diagram."""
+
+    META = Path(__file__).parent / 'mermaid.yamlld'
+
+    def as_mermaid(self, node: Node):
+        match node:
+            case URIRef() as uri:
+                if uri in self.subgraph_uris:
+                    return MermaidSubgraph(children=[], uri=uri, title=self.render(uri, as_datatype=DATATYPES.title))
+
+                return MermaidURINode(uri=uri, url=AnyUrl(uri), title=self.render(uri, as_datatype=DATATYPES.title))
+            case Literal() as literal:
+                return MermaidLiteral(literal=literal)
+            case BNode() as bnode:
+                return MermaidBlankNode(node=bnode, title=self.render(bnode, as_datatype=DATATYPES.title))
+            case unknown:
+                unknown_type = type(unknown)
+                raise ValueError(f'Unknown something: {unknown} ({unknown_type})')
+
+    def construct_mermaid_for_graph(self, graph: URIRef) -> Iterable[MermaidScalar]:
+        """Render graph as mermaid."""
+        rows = self.stored_query('graph.sparql', this=graph)
+        edges = [
+            MermaidEdge(
+                source=self.as_mermaid(row['s']),
+                target=self.as_mermaid(row['o']),
+                title=self.render(row['p'], as_datatype=DATATYPES.title),
+                predicate=row['p'],
+            ) for row in rows
+        ]
+
+        edges = list(filter_edges(edges))
+        nodes = list(
+            filter_nodes(
+                edges=edges,
+                except_uris=self.subgraph_uris,
+            ),
+        )
+
+        return *nodes, *edges
+
+    @functools.cached_property
+    def subgraph_uris(self) -> set[NotLiteralNode]:
+        return set(
+            funcy.pluck(
+                'subgraph',
+                self.stored_query('subgraphs.sparql', this=self.this),
+            ),
+        )
+
+    def construct_mermaid_subgraphs(self) -> Iterable[MermaidSubgraph]:
+        for subgraph_uri in self.subgraph_uris:
+            children = list(self.construct_mermaid_for_graph(subgraph_uri))
+            if children:
+                title = self.render(subgraph_uri, as_datatype=DATATYPES.title)
+                yield MermaidSubgraph(
+                    children=children,
+                    uri=subgraph_uri,
+                    title=title,
+                )
+
+    def show(self) -> str:
+        """Render mermaid diagram."""
+        direct_children = self.construct_mermaid_for_graph(self.this)
+        subgraphs = self.construct_mermaid_subgraphs()
+        return str(Diagram(children=[*direct_children, *subgraphs]))
+
+
+

iolanta/mermaid/mermaid.yamlld

@@ -0,0 +1,42 @@
+"@context":
+  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
+  vann: https://purl.org/vocab/vann/
+  foaf: https://xmlns.com/foaf/0.1/
+  owl: https://www.w3.org/2002/07/owl#
+  iolanta: https://iolanta.tech/
+  rdfs: "https://www.w3.org/2000/01/rdf-schema#"
+  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  dcterms: https://purl.org/dc/terms/
+  dcam: https://purl.org/dc/dcam/
+
+  iolanta:outputs:
+    "@type": "@id"
+
+  iolanta:when-no-facet-found:
+    "@type": "@id"
+
+  $: rdfs:label
+  →:
+    "@type": "@id"
+    "@id": iolanta:outputs
+
+  ⊆:
+    "@type": "@id"
+    "@id": rdfs:subClassOf
+
+  ⪯:
+    "@type": "@id"
+    "@id": iolanta:is-preferred-over
+
+  ↦: iolanta:matches
+  iolanta:hasDefaultFacet:
+    "@type": "@id"
+
+$id: pkg:pypi/iolanta#mermaid-graph
+$: Mermaid Graph
+→:
+  $id: https://iolanta.tech/datatypes/mermaid
+  $: Mermaid
+↦:
+  - ASK WHERE { GRAPH $this { ?s ?p ?o } }
+  - ASK WHERE { $this iolanta:has-sub-graph ?subgraph }

iolanta/mermaid/models.py

@@ -0,0 +1,129 @@
+import enum
+import hashlib
+import textwrap
+import urllib.parse
+
+from documented import Documented
+from pydantic import AnyUrl, BaseModel
+from rdflib import BNode, Literal, URIRef
+
+from iolanta.models import NotLiteralNode
+
+
+class Direction(enum.StrEnum):
+    """Mermaid diagram direction."""
+
+    TB = 'TB'
+    LR = 'LR'
+
+
+class MermaidURINode(Documented, BaseModel, arbitrary_types_allowed=True, frozen=True):
+    """
+    {self.id}{self.maybe_title}
+    click {self.id} "{self.url}"
+    """
+
+    uri: URIRef
+    url: AnyUrl
+    title: str = ''
+
+    @property
+    def maybe_title(self):
+        return self.title and f'({self.title})'
+
+    @property
+    def id(self):
+        return urllib.parse.unquote(str(self.url)).strip('/').replace(':', '_').replace('/', '_').replace('.', '_').replace('#', '_')
+
+
+class MermaidLiteral(Documented, BaseModel, arbitrary_types_allowed=True, frozen=True):
+    """{self.id}[[{self.title}]]"""
+
+    literal: Literal
+
+    @property
+    def title(self) -> str:
+        return str(self.literal) or 'EMPTY'
+
+    @property
+    def id(self) -> str:
+        value_hash = hashlib.md5(str(self.literal.value).encode()).hexdigest()
+        return f'Literal-{value_hash}'
+
+
+class MermaidBlankNode(Documented, BaseModel, arbitrary_types_allowed=True):
+    """{self.id}({self.title})"""
+
+    node: BNode
+    title: str
+
+    @property
+    def id(self) -> str:
+        return self.node.replace('_:', '')
+
+
+class MermaidEdge(Documented, BaseModel, arbitrary_types_allowed=True):
+    """
+    {self.source.id} --- {self.id}(["{self.title}"])--> {self.target.id}
+    click {self.id} "{self.predicate}"
+    class {self.id} predicate
+    """
+
+    source: 'MermaidURINode | MermaidBlankNode | MermaidSubgraph'
+    target: 'MermaidURINode | MermaidLiteral | MermaidBlankNode | MermaidSubgraph'
+    predicate: URIRef
+    title: str
+
+    @property
+    def id(self) -> str:
+        return hashlib.md5(f'{self.source.id}{self.predicate}{self.target.id}'.encode()).hexdigest()
+
+    @property
+    def nodes(self):
+        return [self.source, self.target]
+
+
+MermaidScalar = MermaidLiteral | MermaidBlankNode | MermaidURINode | MermaidEdge
+
+
+class MermaidSubgraph(Documented, BaseModel, arbitrary_types_allowed=True, frozen=True):
+    """
+    subgraph {self.id}["{self.title}"]
+      direction {self.direction}
+      {self.formatted_body}
+    end
+    """
+    children: list[MermaidScalar]
+    uri: NotLiteralNode
+    title: str
+    direction: Direction = Direction.LR
+
+    @property
+    def id(self):
+        uri_hash = hashlib.md5(str(self.uri).encode()).hexdigest()
+        return f'subgraph_{uri_hash}'
+
+    @property
+    def formatted_body(self):
+        return textwrap.indent(
+            '\n'.join(map(str, self.children)),
+            prefix='  ',
+        )
+
+
+class Diagram(Documented, BaseModel):
+    """
+    graph {self.direction}
+    {self.formatted_body}
+      classDef predicate fill:none,stroke:none,stroke-width:0px;
+    """
+
+    children: list[MermaidScalar | MermaidSubgraph]
+    direction: Direction = Direction.LR
+
+    @property
+    def formatted_body(self):
+        return textwrap.indent(
+            '\n'.join(map(str, self.children)),
+            prefix='  ',
+        )

iolanta/mermaid/sparql/graph.sparql

@@ -0,0 +1,5 @@
+SELECT * WHERE {
+    GRAPH $this {
+        ?s ?p ?o .
+    }
+}

iolanta/mermaid/sparql/subgraphs.sparql

@@ -0,0 +1,3 @@
+SELECT ?subgraph WHERE {
+    $this iolanta:has-sub-graph ?subgraph .
+}

iolanta/namespaces.py

@@ -3,7 +3,7 @@ import rdflib
 LOCAL = rdflib.Namespace('local:')
 IOLANTA = rdflib.Namespace('https://iolanta.tech/')
 DATATYPES = rdflib.Namespace('https://iolanta.tech/datatypes/')
-PYTHON = rdflib.Namespace('python://')
+IOLANTA_FACETS = rdflib.Namespace('pkg:pypi/iolanta#')
 NP = rdflib.Namespace('https://www.nanopub.org/nschema#')
 RDFG = rdflib.Namespace('https://www.w3.org/2004/03/trix/rdfg-1/')
 SDO = rdflib.SDO

iolanta/resolvers/base.py

@@ -8,6 +8,7 @@ from iolanta.facets.facet import Facet
 
 class Resolver:
     """Resolve facet IRIs into classes."""
+
     @abstractmethod
-    def __getitem__(self, facet_iri: URIRef) -> Type[Facet]:
+    def resolve(self, uri: URIRef) -> Type[Facet]:
         """Find a resolver by IRI."""

iolanta/resolvers/dispatch.py

@@ -0,0 +1,41 @@
+from typing import Type
+
+from rdflib import URIRef
+from yarl import URL
+
+from iolanta import Facet
+from iolanta.resolvers.base import Resolver
+
+
+class SchemeDispatchResolver(Resolver):
+    """
+    A resolver that dispatches to other resolvers based on URI scheme.
+
+    For example, 'pkg:' URIs are handled by PyPIResolver, while
+    'python:' URIs are handled by PythonImportResolver.
+    """
+
+    def __init__(self, **resolver_by_scheme: Type[Resolver]):
+        """
+        Initialize with a mapping of URI schemes to resolver classes.
+
+        Args:
+            **resolver_by_scheme: Mapping of URI schemes to resolver classes.
+                For example: python=PythonImportResolver.
+        """
+        self.resolver_by_scheme = resolver_by_scheme
+
+    def resolve(self, uri: URIRef) -> Type[Facet]:
+        """
+        Find a resolver by IRI, dispatching to the appropriate scheme handler.
+
+        Args:
+            uri: The URI to resolve.
+
+        Returns:
+            Facet class resolved by the appropriate scheme handler.
+        """
+        url = URL(uri)
+        resolver_class = self.resolver_by_scheme[url.scheme]
+        resolver = resolver_class()
+        return resolver.resolve(uri)

iolanta/resolvers/pypi.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+import re
+from importlib import metadata
+from typing import Type
+
+from packageurl import PackageURL
+from rdflib import URIRef
+
+from iolanta import Facet
+from iolanta.resolvers.base import Resolver
+
+ENTRY_POINT_GROUP = 'iolanta.facets'
+
+
+def _norm(name: str) -> str:
+    """Normalize package name by replacing common separators with dashes."""
+    return re.sub('[-_.]+', '-', name).lower()
+
+
+class MissingFacetError(RuntimeError):
+    """Raised when a required facet is not found in the installed packages."""
+
+
+class PyPIResolver(Resolver):
+    """Resolve facet IRIs into classes from PyPI packages."""
+
+    def resolve(self, uri: URIRef) -> Type[Facet]:
+        """Find and load a Facet class from a PyPI package."""
+        dist_name, facet_name = self._get_package_info(uri)
+        dist = self._get_distribution(dist_name, facet_name)
+        entry_point = self._find_facet_entry_point(dist, facet_name)
+        facet_class = entry_point.load()
+        self._validate_facet_class(
+            facet_class=facet_class,
+            facet_name=facet_name,
+            dist_name=dist.metadata['Name'],
+        )
+        return facet_class
+
+    def _get_package_info(self, uri: URIRef) -> tuple[str, str]:
+        """Extract and validate package information from URI."""
+        package_url = PackageURL.from_string(str(uri))
+        if package_url.type != 'pypi':
+            raise NotImplementedError(f'{package_url.type} is not supported')
+
+        dist_name = _norm(package_url.name or '')
+        facet_name = package_url.subpath
+
+        if not dist_name or not facet_name:
+            raise ValueError('PURL must be pkg:pypi/<dist>#<FacetName>')
+
+        return dist_name, facet_name
+
+    def _get_distribution(
+        self,
+        dist_name: str,
+        facet_name: str,
+    ) -> metadata.Distribution:
+        """Get package distribution and verify it exists."""
+        try:
+            return metadata.distribution(dist_name)
+        except metadata.PackageNotFoundError as exc:
+            raise MissingFacetError(
+                f'This page requires `{dist_name}` (facet `{facet_name}`). '
+                f'Install with: pip install "{dist_name}"',
+            ) from exc
+
+    def _find_facet_entry_point(
+        self,
+        dist: metadata.Distribution,
+        facet_name: str,
+    ) -> metadata.EntryPoint:
+        """Find the facet entry point in the distribution."""
+        matching_entry_points = [
+            entry_point
+            for entry_point in dist.entry_points
+            if (
+                entry_point.group == ENTRY_POINT_GROUP
+                and entry_point.name == facet_name
+            )
+        ]
+
+        if not matching_entry_points:
+            dist_name = dist.metadata['Name']
+            msg = (
+                f'Facet `{facet_name}` not found in `{dist_name}` '
+                f'{dist.version}. Ensure it exposes entry point '
+                f'`{ENTRY_POINT_GROUP}` named `{facet_name}`.'
+            )
+            raise MissingFacetError(msg)
+
+        return matching_entry_points[0]
+
+    def _validate_facet_class(
+        self,
+        facet_class: Type[Facet],
+        facet_name: str,
+        dist_name: str,
+    ) -> None:
+        """Validate that the loaded class is a Facet subclass."""
+        if not issubclass(facet_class, Facet):
+            raise TypeError(
+                f'Entry point `{facet_name}` in `{dist_name}` '
+                'is not a subclass of iolanta.Facet',
+            )

iolanta/resolvers/python_import.py

@@ -1,40 +1,17 @@
-import pydoc
-from typing import Type, cast
+from typing import Type
 
 from rdflib import URIRef
 
-from iolanta.facets.errors import FacetNotCallable
 from iolanta.facets.facet import Facet
 from iolanta.resolvers.base import Resolver
 
 
 class PythonImportResolver(Resolver):
-    def __getitem__(self, item: URIRef) -> Type[Facet]:
-        url = str(item)
-
-        if not url.startswith('python://'):
-            raise Exception(
-                'Iolanta only supports facets which are importable Python '
-                'callables. The URLs of such facets must start with '
-                '`python://`, '
-                'which {url} does not comply to.'.format(
-                    url=url,
-                ),
-            )
-
-        # It is impossible to use `yarl` for this operation because it (or,
-        # rather, one of upper classes from `urllib` that `yarl` depends
-        # upon)
-        # will lowercase the URL when parsing it - which means, irreversibly. We
-        # have to resort to plain string manipulation.
-        import_path = url.replace('python://', '').strip('/')
-
-        facet = cast(Type['iolanta.Facet'], pydoc.locate(import_path))
-
-        if not callable(facet):
-            raise FacetNotCallable(
-                path=import_path,
-                facet=facet,
-            )
-
-        return facet
+    """Resolve facet IRIs into classes by importing Python modules."""
+
+    def resolve(self, uri: URIRef) -> Type[Facet]:
+        """Find a resolver by IRI in python:<module>.<class> format."""
+        raise NotImplementedError(
+            f'{uri} URL for facet import is unsupported anymore '
+            f'due to security reasons.',
+        )

{iolanta-2.0.8.dist-info → iolanta-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 2.0.8
+Version: 2.1.1
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -24,6 +24,7 @@ Requires-Dist: more-itertools (>=9.0.0)
 Requires-Dist: nanopub (>=2.0.1)
 Requires-Dist: owlrl (>=6.0.2)
 Requires-Dist: oxrdflib (>=0.4.0)
+Requires-Dist: packageurl-python (>=0.17.5)
 Requires-Dist: python-frontmatter (>=0.5.0)
 Requires-Dist: rdflib (<8.0)
 Requires-Dist: reasonable (>=0.2.6)
@@ -31,7 +32,7 @@ Requires-Dist: requests (>=2.25.1)
 Requires-Dist: rich (>=13.3.1)
 Requires-Dist: textual (>=0.83.0)
 Requires-Dist: typer (>=0.9.0)
-Requires-Dist: watchfiles (>=1.0.4,<2.0.0)
+Requires-Dist: watchfiles (>=1.0.4)
 Requires-Dist: yaml-ld (>=1.1.10)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown

{iolanta-2.0.8.dist-info → iolanta-2.1.1.dist-info}/RECORD

@@ -6,17 +6,15 @@ iolanta/cli/formatters/choose.py,sha256=LWzsO_9IBSSgYNIyLlItkp8TNvpW3v6YCQ8-6kbI
 iolanta/cli/formatters/csv.py,sha256=ceJ_DTz0beqeK-d6FPBQqqjXrziEfF0FRSLoGZCt_fs,760
 iolanta/cli/formatters/json.py,sha256=Og5B9UrSM_0NWqW5Afpsy6WH8ZfYgPMVXYvT3i-43Jc,748
 iolanta/cli/formatters/pretty.py,sha256=IypZRAr2vNqcXFY6NOIc75mpyfpFWh56aCBlOPDDieQ,2901
-iolanta/cli/main.py,sha256=W1SoQK9kncaSUsy4X5yMrzu8lQUlu-eE6YyIu4dNnec,3167
+iolanta/cli/main.py,sha256=GVtdBQjAOs6VlsE_uztTXHbmRXUk_S6gN4LWqACJGS8,3157
 iolanta/cli/models.py,sha256=cjbpowdzI4wAP0DUk3qoVHyimk6AZwlXi9CGmusZTuM,159
 iolanta/cli/pretty_print.py,sha256=M6E3TmhzA6JY5GeUVmDZLmOh5u70-393PVit4voFKDI,977
 iolanta/context.py,sha256=bZR-tbZIrDQ-Vby01PMDZ6ifxM-0YMK68RJvAsyqCTs,507
 iolanta/conversions.py,sha256=hbLwRF1bAbOxy17eMWLHhYksbdCWN-v4-0y0wn3XSSg,1185
-iolanta/data/cli.yaml,sha256=TsnldYXoY5GIzoNuPDvwBKGw8eAEForZW1FCKqKI0Kg,1029
 iolanta/data/context.yaml,sha256=LUBasiBKgQeGAYjYV_T5XvgPlrdzACeKaZwY_rKzjtI,1636
-iolanta/data/graph-triples.yamlld,sha256=oACKRwqWcMp6TBobXMG6gbbnaauyd6wlK-gH2vVkPps,241
-iolanta/data/html.yaml,sha256=hVFdLWLy8FMY8xpOrJMYc-tE3S0Nq83xuxVkjRW_7rI,517
+iolanta/data/graph-triples.yamlld,sha256=rtn-HfbijaqbmjCrKv-2pVV_aaJhB_9_OqXA_yLznCs,209
 iolanta/data/iolanta.yaml,sha256=xubIFBNU02lmFXhgOSuyQwUcZD3xCqVfeVAZMvOxKbI,1433
-iolanta/data/textual-browser.yaml,sha256=SajFDOdqISVLsBVneS3uh3s8vuYAUIuC0nWvVqIWMZ0,4141
+iolanta/data/textual-browser.yaml,sha256=nJbDS0B3G-emM9vCu2DIlWZBhzmWbO3zrWkt_Rmv5uA,3700
 iolanta/ensure_is_context.py,sha256=9aok8asyEx7KPesOR28VBDb3Ch9kfc3eoCpQSJwj07U,717
 iolanta/entry_points.py,sha256=DZbf-udlEwELFGqeWENj0M2BOUPOWlmGJdqyaEtnot0,504
 iolanta/errors.py,sha256=t_RltahnoEvcytVa1BOq2MADgHps3JNd_h5-SFu7_wM,1250
@@ -53,7 +51,7 @@ iolanta/facets/textual_browser/home.py,sha256=GfDD1G2HiwdLkPkNdcYRqVIxDl5tWH9few
 iolanta/facets/textual_browser/location.py,sha256=w0La8bVTpJiVo1_hFTDQeIUdDdqfhYnoihuZW-f130c,205
 iolanta/facets/textual_browser/models.py,sha256=DqTBjhkkTt5mNwqr4DzNbPSqzV-QtNqfKj7wpn6T3ao,173
 iolanta/facets/textual_browser/page.py,sha256=NkcQ5rSKZRbp63C8ozgsR_iVhcKHGv_SytUCQyGa7ss,786
-iolanta/facets/textual_browser/page_switcher.py,sha256=WOsFY9hSFEnuf3za1eCUhPaQ6uTaeBuMPIAHjHhnvDY,9950
+iolanta/facets/textual_browser/page_switcher.py,sha256=hZT9FFMXJf7t8V2ztsqsNNCmGY8CPx39mlEKJjhRsPA,9958
 iolanta/facets/textual_class/__init__.py,sha256=tiL0p-3JspGcBRj4qa3rmoBFAuadk71l2ja2lJN6CEs,75
 iolanta/facets/textual_class/facets.py,sha256=tascZiue3tbYfpIsnP8yY2dgXQIQzoQ_HPzU7DbVbao,5999
 iolanta/facets/textual_class/sparql/instances.sparql,sha256=EW4BmuNxiRDA8djuEtvZpLLJlNSIshvId4ExlaYPcZE,106
@@ -90,22 +88,30 @@ iolanta/facets/textual_provenance/facets.py,sha256=vv3UQsI2duB36DW5Zkw3sqgAXBPmK
 iolanta/facets/textual_provenance/sparql/graphs.sparql,sha256=B45uKFd-1vrBuMDSbTURjUUEjHt51vAbqdL4tUcgMvk,103
 iolanta/facets/textual_provenance/sparql/triples.sparql,sha256=V-EdVuWbGHY3MspbJIMpwxPQautLDqJJV-AmihDjSHc,53
 iolanta/facets/title/__init__.py,sha256=fxpkG-YvHDp6eiVL3o7BbwhPMZZe-1R2Qi6S36QCTf8,77
-iolanta/facets/title/facets.py,sha256=kxZv-lRpqVz1-tRoqU1iqvzVcOjM0ebEs-wpR3Lc2eQ,812
-iolanta/facets/title/sparql/title.sparql,sha256=_bm6KQrUB97EOc0CtAD3456qUzpKrY9eqhzrV4iRUqk,920
+iolanta/facets/title/facets.py,sha256=41cWNdisyb9dPJowSgTIQa-rmFCI4WUb-EYSFDr3GI0,836
+iolanta/facets/title/sparql/title.sparql,sha256=VKHeE9NvV6sFgVGvsLQD9z__J4APj8TDHLT4Rk-Ascc,1102
 iolanta/facets/wikibase_statement_title/__init__.py,sha256=_yk1akxgSJOiUBJIc8QGrD2vovvmx_iw_vJDuv1rD7M,91
 iolanta/facets/wikibase_statement_title/facets.py,sha256=mUH7twlAgoeX7DgLQuRBQv4ORT6GWbN-0eJ1aliSfiQ,724
 iolanta/facets/wikibase_statement_title/sparql/statement-title.sparql,sha256=n07DQWxKqB5c3CA4kacq2HSN0R0dLgnMnLP1AxMo5YA,320
-iolanta/iolanta.py,sha256=y95nu0BbllQqWIBv19FUAbS-l4-qNFA4LWcbZdseTyU,11330
+iolanta/iolanta.py,sha256=uM5vmK96Q_GsqXM-bBpQXoxwqs25K-YGYrZvWWFTsDA,11072
+iolanta/mermaid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+iolanta/mermaid/facet.py,sha256=0SMzwkjtB3xjCQRW-XwOB5P7zVJdUCDv8c_XmanvqP0,4068
+iolanta/mermaid/mermaid.yamlld,sha256=j5yQ6A1M_Fn4cq5WYISz8MfWw6skYdoB0lvcI68ahyw,968
+iolanta/mermaid/models.py,sha256=v0loPqJYKpylVBaq89yFdk8iNxyzvN9Ih_ozAbhD4pk,3197
+iolanta/mermaid/sparql/graph.sparql,sha256=mDGf05od3CUFhzI6rcqt5ZMVy-gSKDu-WxmV_zpIsVI,62
+iolanta/mermaid/sparql/subgraphs.sparql,sha256=VuoOYr_ZtKXXRrBpAEJek0mBRzR9EV-KnKENgAbkzCs,71
 iolanta/models.py,sha256=M-1dTxPwjTyUgQ4VCOiH6Q7ltNJiDPG0l1XQH430Omo,3250
-iolanta/namespaces.py,sha256=VJ3BLTji3UmqD3N1Om2voAoyYPtF4o-8FXN2Uq_4sPc,1194
+iolanta/namespaces.py,sha256=H_qYyxCqbIGMOczpT9vUBHumTW9QJ-Y6qXHbJgFwFP8,1210
 iolanta/node_to_qname.py,sha256=a82_qpgT87cbekY_76tTkl4Z-6Rz6am4UGIQChUf9Y0,794
 iolanta/parse_quads.py,sha256=nKUGS_OVpCA6PFA5rOd6Qa5ik_eQhCL-Mlv1zDXk_Co,4541
 iolanta/plugin.py,sha256=MSxpuOIx93AgBahfS8bYh31MEgcwtUSQhj4Js7fgdSI,1096
 iolanta/query_result.py,sha256=VLLBkewUEymtzfB0jeIeRE3Np6pAgo959RPgNsEmiq8,1545
 iolanta/reformat_blank_nodes.py,sha256=MAVcXusUioKzAoTEHAMume5Gt9vBEpxJGrngqFzmkJI,712
 iolanta/resolvers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iolanta/resolvers/base.py,sha256=cc9bcrVZ0wTwn85I-IYCwcIRU5Lwaph8D00C0dwSOm8,302
-iolanta/resolvers/python_import.py,sha256=kDOhApBDFfxnrDgK9M7ztMkqXfcny81Zo86FgPFb-LI,1301
+iolanta/resolvers/base.py,sha256=gkPHP85xRawmvZZtkZzFM0JjDRbZUKaTM_Zg2cdZWHk,293
+iolanta/resolvers/dispatch.py,sha256=L2-ZQfusUgi-VuFdn0UA19ecEG1bZzV9PD2z2QJye1s,1204
+iolanta/resolvers/pypi.py,sha256=BJA7PGPaFFIxisCp-1-pjWZYNTDRVA5am5Nn8O2WddM,3498
+iolanta/resolvers/python_import.py,sha256=hFs2Fi7BDjdKllgrGJhTaqjfcT7Vaj0j1b45CJt21B0,522
 iolanta/sparqlspace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/sparqlspace/cli.py,sha256=pb6q03lzrU8OaZ4A3QAQEmaFYcQ_-sHUrPhRs6GE88w,1590
 iolanta/sparqlspace/inference/wikibase-claim.sparql,sha256=JSawj3VTc9ZPoU9mvh1w1AMYb3cWyZ3x1rEYWUsKZ6A,209
@@ -115,7 +121,7 @@ iolanta/sparqlspace/sparqlspace.py,sha256=Y8_ZPXwuGEXbEes6XQjaQWA2Zv9y8SWxMPDFdq
 iolanta/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/widgets/description.py,sha256=98Qd3FwT9r8sYqKjl9ZEptaVX9jJ2ULWf0uy3j52p5o,800
 iolanta/widgets/mixin.py,sha256=nDRCOc-gizCf1a5DAcYs4hW8eZEd6pHBPFsfm0ncv7E,251
-iolanta-2.0.8.dist-info/METADATA,sha256=K8cM_R2W4mlmyhFEMVh1J1LYjQg09-uJcSdRJXqTQg4,2231
-iolanta-2.0.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-iolanta-2.0.8.dist-info/entry_points.txt,sha256=z9RPLmGuz3tYGPV7Qf4nNjuSJYdTUS9enC4595poe-M,221
-iolanta-2.0.8.dist-info/RECORD,,
+iolanta-2.1.1.dist-info/METADATA,sha256=PC0tU9wgfi3BMHGEcI19gFVTUpQaIWxoGz2PcAoVx_8,2268
+iolanta-2.1.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+iolanta-2.1.1.dist-info/entry_points.txt,sha256=H2bCnnscOwzl0QMoI86ifQ6hm1NhyYnrGQbMd0Kp6dA,1445
+iolanta-2.1.1.dist-info/RECORD,,

iolanta-2.1.1.dist-info/entry_points.txt

@@ -0,0 +1,31 @@
+[console_scripts]
+iolanta=iolanta.cli:app
+sparqlspace=iolanta.sparqlspace.cli:app
+
+[iolanta.facets]
+boolean=iolanta.facets.generic:BoolLiteral
+icon=iolanta.facets.icon:IconFacet
+mermaid-graph=iolanta.mermaid.facet:Mermaid
+qname=iolanta.facets.qname:QNameFacet
+textual-browser=iolanta.facets.textual_browser:TextualBrowserFacet
+textual-class=iolanta.facets.textual_class:Class
+textual-graph=iolanta.facets.textual_graph:GraphFacet
+textual-graph-triples=iolanta.facets.textual_graph_triples:GraphTriplesFacet
+textual-inverse-properties=iolanta.facets.textual_default:InverseProperties
+textual-link=iolanta.facets.textual_link:TextualLinkFacet
+textual-nanopublication=iolanta.facets.textual_nanopublication:NanopublicationFacet
+textual-no-facet-found=iolanta.facets.textual_no_facet_found:TextualNoFacetFound
+textual-ontology=iolanta.facets.textual_ontology:OntologyFacet
+textual-properties=iolanta.facets.textual_default:TextualDefaultFacet
+textual-property-pairs=iolanta.facets.textual_property_pairs_table:TextualPropertyPairsTableFacet
+textual-provenance=iolanta.facets.textual_provenance:TextualProvenanceFacet
+title=iolanta.facets.title:TitleFacet
+title-foaf-person=iolanta.facets.foaf_person_title:FOAFPersonTitle
+wikibase-statement-title=iolanta.facets.wikibase_statement_title:WikibaseStatementTitle
+
+[iolanta.plugins]
+base=iolanta:IolantaBase
+
+[rdf.plugins.queryprocessor]
+sparqlspace=iolanta.sparqlspace.processor:GlobalSPARQLProcessor
+

iolanta/data/cli.yaml

@@ -1,30 +0,0 @@
-"@context":
-  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
-  vann: https://purl.org/vocab/vann/
-  foaf: https://xmlns.com/foaf/0.1/
-  owl: https://www.w3.org/2002/07/owl#
-  iolanta: https://iolanta.tech/
-  rdfs: "https://www.w3.org/2000/01/rdf-schema#"
-  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
-
-$included:
-  - $id: python://iolanta.facets.cli.Default
-    rdfs:label: For the CLI, display a link to the node or (at least) its human readable label.
-
-  - $id: iolanta:cli
-    $type: iolanta:OutputDatatype
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.cli.Record
-      rdfs:label: Show properties of a node
-
-  - $id: https://iolanta.tech/cli/record/title
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.cli.Default
-
-  - $id: https://iolanta.tech/cli/record/property
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.cli.Default
-
-  - $id: https://iolanta.tech/cli/record/value
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.cli.Default

iolanta/data/html.yaml

@@ -1,15 +0,0 @@
-"@context":
-  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
-  vann: https://purl.org/vocab/vann/
-  foaf: https://xmlns.com/foaf/0.1/
-  owl: https://www.w3.org/2002/07/owl#
-  iolanta: https://iolanta.tech/
-  rdfs: "https://www.w3.org/2000/01/rdf-schema#"
-  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
-
-$included:
-  - $id: iolanta:html
-    $type: iolanta:OutputDatatype
-    owl:sameAs:
-      $id: https://html.spec.whatwg.org/
-    iolanta:hasDefaultFacet: python://iolanta.facets.html.Default

iolanta-2.0.8.dist-info/entry_points.txt

@@ -1,10 +0,0 @@
-[console_scripts]
-iolanta=iolanta.cli:app
-sparqlspace=iolanta.sparqlspace.cli:app
-
-[iolanta.plugins]
-base=iolanta:IolantaBase
-
-[rdf.plugins.queryprocessor]
-sparqlspace=iolanta.sparqlspace.processor:GlobalSPARQLProcessor
-