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

iolanta/facets/textual_browser/page_switcher.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 from typing import Any
 
 import watchfiles
-from rdflib import BNode, URIRef
+from rdflib import BNode, Node, URIRef
 from textual.widgets import ContentSwitcher, RichLog
 from textual.worker import Worker, WorkerState
 
@@ -74,7 +74,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def on_mount(self):
         """Navigate to the initial page."""
-        self.action_goto(self.app.iri)
+        self.action_goto(self.app.this)
         if self.iolanta.project_root:
             self.run_worker(
                 self._watch_files,
@@ -94,24 +94,24 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def render_iri(   # noqa: WPS210
         self,
-        destination: NotLiteralNode,
+        this: NotLiteralNode,
         facet_iri: URIRef | None,
         is_reload: bool,
     ) -> RenderResult:
         """Render an IRI in a thread."""
-        self.iri = destination
+        self.this = this
         iolanta: Iolanta = self.iolanta
 
         as_datatype = URIRef('https://iolanta.tech/cli/textual')
         choices = FacetFinder(
             iolanta=self.iolanta,
-            node=destination,
+            node=this,
             as_datatype=as_datatype,
         ).choices()
 
         if not choices:
             raise FacetNotFound(
-                node=self.iri,
+                node=self.this,
                 as_datatype=as_datatype,
                 node_types=[],
             )
@@ -136,10 +136,10 @@ 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,
+            this=self.this,
             iolanta=iolanta,
             as_datatype=URIRef('https://iolanta.tech/cli/textual'),
         )
@@ -149,13 +149,13 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
         except Exception as err:
             raise FacetError(
-                node=self.iri,
+                node=self.this,
                 facet_iri=facet_iri,
                 error=err,
             ) from err
 
         return RenderResult(
-            iri=destination,
+            iri=this,
             renderable=renderable,
             flip_options=flip_options,
             facet_iri=facet_iri,
@@ -222,7 +222,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         self.run_worker(
             functools.partial(
                 self.render_iri,
-                destination=self.history.current.url,
+                this=self.history.current.url,
                 facet_iri=self.history.current.facet_iri,
                 is_reload=True,
             ),
@@ -267,19 +267,14 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def action_goto(
         self,
-        destination: str,
+        this: Node,
         facet_iri: str | None = None,
     ):
         """Go to an IRI."""
-        if destination.startswith('_:'):
-            iri = BNode(destination)
-        else:
-            iri = URIRef(destination)
-
         self.run_worker(
             functools.partial(
                 self.render_iri,
-                destination=iri,
+                this=this,
                 facet_iri=facet_iri and URIRef(facet_iri),
                 is_reload=False,
             ),

iolanta/facets/textual_class/facets.py

@@ -200,16 +200,16 @@ class Class(Facet[Widget]):
         return set(
             funcy.pluck(
                 'instance',
-                self.stored_query('instances.sparql', iri=self.iri),
+                self.stored_query('instances.sparql', this=self.this),
             ),
         )
 
     def show(self) -> Widget:
         """Render the instances list."""
         return InstancesBody(
-            PageTitle(self.iri),
+            PageTitle(self.this),
             InstancesList(
                 instances=list(self.stream_instances()),
-                parent_class=self.iri,
+                parent_class=self.this,
             ),
         )

iolanta/facets/textual_class/sparql/instances.sparql

@@ -1,5 +1,8 @@
+# Remember we are HTTPS-izing all URIs in Iolanta graph
+PREFIX rdf: <https://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
 SELECT ?instance WHERE {
-    ?instance a $iri .
+    ?instance rdf:type $this .
 
     FILTER(!isLiteral(?instance)) .
 } ORDER BY ?instance

iolanta/facets/textual_default/facets.py

@@ -32,7 +32,7 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
         """Properties of current node & their values."""
         property_rows = self.stored_query(
             self.query_file_name,
-            iri=self.iri,
+            iri=self.this,
         )
 
         property_pairs = [
@@ -64,11 +64,11 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
             property_values = [
                 LiteralPropertyValue(
                     property_value=property_value,
-                    subject=self.iri,
+                    subject=self.this,
                     property_iri=property_iri,
                 ) if isinstance(property_value, Literal) else PropertyValue(
                     property_value=property_value,
-                    subject=self.iri,
+                    subject=self.this,
                     property_iri=property_iri,
                     property_qname=self.iolanta.node_as_qname(property_iri),
                 )
@@ -135,7 +135,7 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
     def show(self) -> Widget:
         """Render the content."""
         return VerticalScroll(
-            PageTitle(self.iri),
+            PageTitle(self.this),
             Static(self.description or ''),
             self.properties,
         )
@@ -149,7 +149,7 @@ class InverseProperties(TextualDefaultFacet):
     def show(self) -> Widget:
         """Render the content."""
         return VerticalScroll(
-            PageTitle(self.iri, extra='[i]& its inverse RDF properties[/i]'),
+            PageTitle(self.this, extra='[i]& its inverse RDF properties[/i]'),
             Static(self.description or ''),
             self.properties,
         )

iolanta/facets/textual_default/widgets.py

@@ -138,7 +138,7 @@ class PropertyValue(Widget, can_focus=True, inherit_bindings=False):
         self.property_iri = property_iri
         super().__init__()
         self.renderable = Text(  # noqa: WPS601
-            f'⏳ {property_qname}',
+            f'⏳ {property_value}',
             style='#696969',
         )
 

iolanta/facets/textual_graph/facets.py

@@ -14,17 +14,17 @@ class GraphFacet(Facet[Widget]):
         """Show the widget."""
         triples = [
             Triple(triple['subject'], triple['predicate'], triple['object'])
-            for triple in self.stored_query('triples.sparql', graph=self.iri)
+            for triple in self.stored_query('triples.sparql', graph=self.this)
         ]
 
         triple_count = len(triples)
 
         triples_view = self.iolanta.render(
-            self.iri,
+            self.this,
             as_datatype=DATATYPES['textual-graph-triples'],
         )
 
         return VerticalScroll(
-            PageTitle(self.iri, extra=f'({triple_count} triples)'),
+            PageTitle(self.this, extra=f'({triple_count} triples)'),
             triples_view,
         )

iolanta/facets/textual_graph_triples.py

@@ -138,7 +138,7 @@ class GraphTriplesFacet(Facet[Widget]):
             }
             ORDER BY ?subject ?predicate ?object
             """,
-            graph=self.iri,
+            graph=self.this,
         )
 
         triples = [

iolanta/facets/textual_link/facet.py

@@ -11,13 +11,13 @@ class TextualLinkFacet(Facet[str | Text]):
 
     def show(self) -> str | Text:
         """Render the link, or literal text, whatever."""
-        if isinstance(self.iri, Literal):
-            return f'[b grey37]{self.iri}[/b grey37]'
+        if isinstance(self.this, Literal):
+            return f'[b grey37]{self.this}[/b grey37]'
 
         label = self.render(
-            self.iri,
+            self.this,
             as_datatype=DATATYPES.title,
         )
 
-        invocation = f"app.goto('{self.iri}')"
+        invocation = f"app.goto('{self.this}')"
         return f'[@click="{invocation}"]{label}[/]'

iolanta/facets/textual_nanopublication/facet.py

@@ -11,4 +11,4 @@ class NanopublicationFacet(Facet[Widget]):
 
     def show(self) -> Widget:
         """Render a nanopublication."""
-        return NanopublicationScreen(uri=self.iri)
+        return NanopublicationScreen(uri=self.this)

iolanta/facets/textual_no_facet_found.py

@@ -12,6 +12,7 @@ from iolanta.widgets.description import Description
 TEXT = """
 **😕 Iolanta is unable to visualize this resource**
 
+* The reference type ({reference_type}) might be incorrect;
 * The URI might be incorrect;
 * Or, no edges might exist which involve it;
 * Or maybe Iolanta does not know of such edges.
@@ -44,7 +45,7 @@ class TextualNoFacetFound(Facet):
     @property
     def raw_content(self):
         """Content of the file, if applicable."""
-        url = URL(self.uriref)
+        url = URL(self.this)
         if url.scheme != 'file':
             return None
 
@@ -94,6 +95,7 @@ class TextualNoFacetFound(Facet):
                     TEXT.format(
                         content=self.raw_content or '',
                         subgraphs=self.subgraphs_description or '',
+                        reference_type=type(self.this).__name__,
                     ),
                 ),
             ),

iolanta/facets/textual_ontology/facets.py

@@ -48,7 +48,7 @@ class OntologyFacet(Facet[Widget]):
     @cached_property
     def grouped_terms(self) -> dict[NotLiteralNode | None, list[TermAndStatus]]:
         """Group terms by VANN categories."""
-        rows = self.stored_query('terms.sparql', iri=self.iri)
+        rows = self.stored_query('terms.sparql', iri=self.this)
         grouped = [
             (
                 row.get('group'),
@@ -80,7 +80,7 @@ class OntologyFacet(Facet[Widget]):
 
         vocabs = funcy.lpluck(
             'vocab',
-            self.stored_query('visualization-vocab.sparql', iri=self.iri),
+            self.stored_query('visualization-vocab.sparql', iri=self.this),
         )
 
         for vocab in vocabs:
@@ -94,7 +94,7 @@ class OntologyFacet(Facet[Widget]):
             )
 
         return Vertical(
-            PageTitle(self.iri),
+            PageTitle(self.this),
             TermsContent(
                 Static(
                     Columns(

iolanta/facets/textual_provenance/facets.py

@@ -109,7 +109,7 @@ class TextualProvenanceFacet(Facet[Widget]):
 
     def show(self) -> Widget:
         """Obtain & render provenance info."""
-        uri = TripleURIRef(self.iri)
+        uri = TripleURIRef(self.this)
         triple = uri.as_triple()
 
         graphs = funcy.lpluck(

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,
         )
 
@@ -30,7 +31,4 @@ class TitleFacet(Facet[str]):
                 if label := row.get(alternative):
                     return str(label)
 
-        return self.render(
-            self.iri,
-            as_datatype=URIRef('https://iolanta.tech/qname'),
-        )
+        return str(self.this)

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/facets/wikibase_statement_title/facets.py

@@ -12,14 +12,14 @@ class WikibaseStatementTitle(Facet[str]):
         """Render the title."""
         rows = self.stored_query(
             'statement-title.sparql',
-            statement=self.iri,
+            statement=self.this,
             language=self.language,
         )
 
         row = funcy.first(rows)
         if not row:
             return self.render(
-                self.iri,
+                self.this,
                 as_datatype=URIRef('https://iolanta.tech/qname'),
             )
 

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,10 +289,10 @@ 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,
+            this=node,
             iolanta=self,
             as_datatype=found['output_datatype'],
         )
@@ -357,7 +328,7 @@ class Iolanta:   # noqa: WPS214
 
         facet_instances = [
             facet_class(
-                iri=node,
+                this=node,
                 iolanta=self,
                 as_datatype=output_datatype,
             )
@@ -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/labeled_triple_set/data/labeled_triple_set.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#labeled-triple-set
+$: Labeled Triple Set
+→:
+  $id: https://iolanta.tech/datatypes/labeled-triple-set
+  $: Labeled Triple Set
+↦:
+  - ASK WHERE { GRAPH $this { ?s ?p ?o } }
+  - ASK WHERE { $this <https://iolanta.tech/has-sub-graph> ?subgraph }