iolanta 2.0.2__py3-none-any.whl → 2.0.6__py3-none-any.whl

iolanta/cli/main.py

@@ -94,7 +94,7 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
     )
 
     node_url = URL(url)
-    if node_url.scheme:
+    if node_url.scheme and node_url.scheme != 'file':
         node = URIRef(url)
 
         iolanta: Iolanta = Iolanta(
@@ -102,7 +102,7 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
             logger=logger,
         )
     else:
-        path = Path(url).absolute()
+        path = Path(node_url.path).absolute()
         node = URIRef(f'file://{path}')
         iolanta: Iolanta = Iolanta(
             language=Literal(language),

iolanta/data/context.yaml

@@ -59,3 +59,18 @@
 
   rdf:type:
     "@type": "@id"
+
+  $: rdfs:label
+  →:
+    "@type": "@id"
+    "@id": iolanta:outputs
+
+  ⊆:
+    "@type": "@id"
+    "@id": rdfs:subClassOf
+
+  ⪯:
+    "@type": "@id"
+    "@id": iolanta:is-preferred-over
+
+  ↦: iolanta:matches

iolanta/data/graph-triples.yamlld

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

iolanta/data/textual-browser.yaml

@@ -13,57 +13,75 @@
   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
 
 "@included":
   - $id: iolanta:icon
-    rdfs:label: Icon
-    rdfs:subClassOf:
-      $id: xsd:string
+    $: Icon
+    ⊆: xsd:string
 
   - $id: dcterms:creator
     iolanta:icon: ©️
 
   - $id: https://iolanta.tech/datatypes/icon
-    rdfs:label: Icon
+    $: Icon
     iolanta:hasDefaultFacet:
       $id: python://iolanta.facets.icon.IconFacet
-      iolanta:outputs:
-        $id: https://iolanta.tech/datatypes/icon
+      →: https://iolanta.tech/datatypes/icon
 
   - $id: np:Nanopublication
-    rdfs:label: Nanopublication
+    $: Nanopublication
     iolanta:hasInstanceFacet:
       $id: python://iolanta.facets.textual_nanopublication.NanopublicationFacet
-      rdfs:label: Nanopublication
-      iolanta:outputs:
-        $id: https://iolanta.tech/cli/textual
-      iolanta:is-preferred-over:
-        $id: python://iolanta.facets.textual_default.TextualDefaultFacet
+      $: Nanopublication
+      →: https://iolanta.tech/cli/textual
+      ⪯:
+        - python://iolanta.facets.textual_default.TextualDefaultFacet
+        - python://iolanta.facets.textual_graph.GraphFacet
 
   - $id: https://iolanta.tech/cli/interactive
     iolanta:hasDefaultFacet:
       $id: python://iolanta.facets.textual_browser.TextualBrowserFacet
 
-  - $id: https://iolanta.tech/cli/textual
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_default.TextualDefaultFacet
-      rdfs:label: Properties
-      iolanta:is-preferred-over:
-        $id: python://iolanta.facets.textual_default.InverseProperties
-
-  - $id: https://iolanta.tech/cli/textual
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_default.InverseProperties
-      rdfs:label: Inverse Properties
-      iolanta:is-preferred-over:
-        $id: python://iolanta.facets.textual_graph.GraphFacet
+  - $id: python://iolanta.facets.textual_default.TextualDefaultFacet
+    $: Properties
+    ⪯: python://iolanta.facets.textual_default.InverseProperties
+    →: https://iolanta.tech/cli/textual
+    ↦: |
+      ASK WHERE {
+        GRAPH ?graph { $this ?property ?value }
+        FILTER (?graph != <iolanta://_meta>)
+      }
+
+  - $id: python://iolanta.facets.textual_default.InverseProperties
+    $: Inverse Properties
+    →: https://iolanta.tech/cli/textual
+    ↦: |
+      ASK WHERE {
+        GRAPH ?graph { ?something ?property $this }
+        FILTER (?graph != <iolanta://_meta>)
+      }
 
   - $id: "urn:"
     iolanta:hasFacetByPrefix:
       $id: python://iolanta.facets.textual_provenance.TextualProvenanceFacet
-      iolanta:outputs:
-        $id: https://iolanta.tech/cli/textual
+      →: https://iolanta.tech/cli/textual
 
   - $id: https://iolanta.tech/cli/link
     iolanta:hasDefaultFacet:
@@ -72,47 +90,44 @@
   - $id: https://wikiba.se/ontology#Statement
     iolanta:hasInstanceFacet:
       $id: python://iolanta.facets.wikibase_statement_title.WikibaseStatementTitle
-      rdfs:label: Title
-      iolanta:outputs:
-        $id: https://iolanta.tech/datatypes/title
+      $: Title
+      →: https://iolanta.tech/datatypes/title
 
   - $id: rdfs:Class
     iolanta:hasInstanceFacet:
       $id: python://iolanta.facets.textual_class.Class
-      rdfs:label: Instances
-      iolanta:outputs:
-        $id: https://iolanta.tech/cli/textual
-      iolanta:is-preferred-over:
-        - $id: python://iolanta.facets.textual_browser.TextualBrowserFacet
-        - $id: python://iolanta.facets.textual_default.InverseProperties
+      $: Instances
+      →: https://iolanta.tech/cli/textual
+      ⪯:
+        - python://iolanta.facets.textual_browser.TextualBrowserFacet
+        - python://iolanta.facets.textual_default.InverseProperties
 
   - $id: owl:Ontology
     iolanta:hasInstanceFacet:
       $id: python://iolanta.facets.textual_ontology.OntologyFacet
-      rdfs:label: Ontology
-      iolanta:outputs:
-        $id: https://iolanta.tech/cli/textual
-      iolanta:is-preferred-over:
-        - $id: python://iolanta.facets.textual_default.TextualDefaultFacet
-
-  - $id: iolanta:Graph
-    iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_graph.GraphFacet
-      rdfs:label: Graph Triples
-      iolanta:outputs:
-        $id: https://iolanta.tech/cli/textual
+      $: Ontology
+      →: https://iolanta.tech/cli/textual
+      ⪯: python://iolanta.facets.textual_default.TextualDefaultFacet
 
   - $id: https://iolanta.tech/datatypes/textual-graph-triples
-    rdfs:label: Graph Triples
+    $: Graph Triples
     iolanta:hasDefaultFacet:
       $id: python://iolanta.facets.textual_graph_triples.GraphTriplesFacet
-      iolanta:outputs:
-        $id: https://iolanta.tech/datatypes/textual-graph-triples
+      →: https://iolanta.tech/datatypes/textual-graph-triples
 
   - $id: https://iolanta.tech/qname
     iolanta:hasDefaultFacet:
       $id: python://iolanta.facets.qname.QNameFacet
 
   - $id: python://iolanta.facets.textual_property_pairs_table.TextualPropertyPairsTableFacet
-    iolanta:outputs: https://iolanta.tech/cli/textual
     $: Subjects → Objects
+    →: https://iolanta.tech/cli/textual
+    ↦: ASK WHERE { ?subject $this ?object }
+
+  - $id: python://iolanta.facets.textual_class.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/facets/locator.py

@@ -18,6 +18,15 @@ class FoundRow(TypedDict):
     output_datatype: NotLiteralNode
 
 
+GET_QUERY_TO_FACET = """
+SELECT ?facet ?match WHERE {
+    ?facet
+        iolanta:matches ?match ;
+        iolanta:outputs $as_datatype .
+}
+"""
+
+
 def reorder_rows_by_facet_preferences(   # noqa: WPS214, WPS210
     rows: list[FoundRow],
     ordering: set[tuple[URIRef, URIRef]],
@@ -108,16 +117,14 @@ class FacetFinder:   # noqa: WPS214
         if not isinstance(self.node, URIRef):
             return
 
-        if self.as_datatype != URIRef('https://iolanta.tech/cli/textual'):
-            return
+        rows = self.iolanta.query(
+            GET_QUERY_TO_FACET,
+            as_datatype=self.as_datatype,
+        )
 
-        # TODO: Retrieve queries from the graph
-        # TODO: Verify datatype for which we are visualizing $this
         query_to_facet = {
-            'ASK WHERE { ?subject $this ?object }': URIRef(
-                'python://iolanta.facets.textual_property_pairs_table'
-                '.TextualPropertyPairsTableFacet',
-            ),
+            row['match']: row['facet']
+            for row in rows
         }
 
         for query, facet in query_to_facet.items():
@@ -233,6 +240,22 @@ class FacetFinder:   # noqa: WPS214
             for row in rows
         ]
 
+    def by_facet_not_found(self) -> Iterable[FoundRow]:
+        """What facet to show if no facets are found?"""
+        rows = self.iolanta.query(  # noqa: WPS462
+            """
+            SELECT ?facet ?output_datatype WHERE {
+              $output_datatype iolanta:when-no-facet-found ?facet .
+            }
+            """,
+            output_datatype=self.as_datatype,
+        )
+
+        return [
+            FoundRow(facet=row['facet'], output_datatype=row['output_datatype'])
+            for row in rows
+        ]
+
     def retrieve_facets_preference_ordering(self) -> set[tuple[URIRef, URIRef]]:
         """
         Construct partial ordering on the set of facets.
@@ -256,6 +279,9 @@ class FacetFinder:   # noqa: WPS214
         """Return all suitable facets."""
         rows = list(self._found_facets())
 
+        if not rows:
+            rows = self.by_facet_not_found()
+
         if len(rows) == 1:
             # Nothing to order.
             return rows

iolanta/facets/textual_class/facets.py

@@ -6,7 +6,7 @@ import funcy
 from rich.console import RenderResult
 from rich.text import Text
 from textual.binding import Binding, BindingType
-from textual.containers import Vertical
+from textual.containers import Vertical  # removed unused VerticalScroll (F401)
 from textual.reactive import Reactive
 from textual.widget import Widget
 from textual.widgets import Label, ListItem, ListView
@@ -70,10 +70,8 @@ class InstancesList(ListView):   # noqa: WPS214
 
     DEFAULT_CSS = """
     InstancesList {
-        height: auto;
-        
+        height: 1fr;
         layout: vertical;
-        overflow-x: hidden;
         overflow-y: auto;
     }
     """
@@ -121,31 +119,6 @@ class InstancesList(ListView):   # noqa: WPS214
                 parent_class=self.parent_class,
             )
 
-    def on_list_view_highlighted(self):
-        """
-        Find out whether the last item of the list is highlighted.
-
-        If yes then add more elements.
-        """
-        if not self._nodes or (self.index >= len(self._nodes) - 1):
-            new_instance_items = list(self.stream_instance_items_chunk())
-            self.run_worker(
-                functools.partial(
-                    self.render_newly_added_instances,
-                    new_instance_items,
-                ),
-                thread=True,
-            )
-
-            # #126 `extend()` here will lead to freeze in some situations
-            for new_item in new_instance_items:
-                self.append(new_item)
-
-    def on_list_item__child_clicked(self) -> None:   # noqa: WPS116
-        """Navigate on click."""
-        # FIXME if we call `action_goto()` here we'll navigate to the item that
-        #   was selected _prior_ to this click.
-
     def action_goto(self):
         """Navigate."""
         self.app.action_goto(self.highlighted_child.node)
@@ -160,6 +133,32 @@ class InstancesList(ListView):   # noqa: WPS214
             ),
         )
 
+    def compose(self):
+        """Fill in the instances."""
+        for instance in self.instances:   # noqa: WPS526
+            yield InstanceItem(
+                node=instance,
+                parent_class=self.parent_class,
+            )
+
+    def render_instances(self):
+        """Render all instances."""
+        for instance_item in self.children:
+            self.app.call_from_thread(
+                instance_item.update,
+                self.app.iolanta.render(
+                    instance_item.node,
+                    as_datatype=DATATYPES.title,
+                ),
+            )
+
+    def on_mount(self):
+        """Render the first chunk of instances."""
+        self.run_worker(
+            self.render_instances,
+            thread=True,
+        )
+
 
 class Bottom(Label):
     """Label below the instances list."""
@@ -198,29 +197,19 @@ class Class(Facet[Widget]):
         We have to stop if a subsequent attempt returns no results. That's why
         we can't use `funcy.distinct()` or something similar.
         """
-        known_instances: set[NotLiteralNode] = set()
-        while True:
-            instances = set(
-                funcy.pluck(
-                    'instance',
-                    self.stored_query('instances.sparql', iri=self.iri),
-                ),
-            ).difference(known_instances)
-
-            if not instances:
-                return
-
-            yield from instances
-
-            known_instances.update(instances)
+        return set(
+            funcy.pluck(
+                'instance',
+                self.stored_query('instances.sparql', iri=self.iri),
+            ),
+        )
 
     def show(self) -> Widget:
         """Render the instances list."""
         return InstancesBody(
             PageTitle(self.iri),
             InstancesList(
-                instances=self.stream_instances(),
+                instances=list(self.stream_instances()),
                 parent_class=self.iri,
             ),
-            Bottom('Select the last element to try loading more instances.'),
         )

iolanta/facets/textual_class/sparql/instances.sparql

@@ -1,5 +1,5 @@
 SELECT ?instance WHERE {
-    ?instance rdf:type $iri .
+    ?instance a $iri .
 
     FILTER(!isLiteral(?instance)) .
 } ORDER BY ?instance

iolanta/facets/textual_no_facet_found.py

@@ -0,0 +1,68 @@
+from pathlib import Path
+
+from rich.markdown import Markdown
+from textual.containers import Vertical
+from yarl import URL
+
+from iolanta import Facet
+from iolanta.facets.page_title import PageTitle
+from iolanta.widgets.description import Description
+
+TEXT = """
+**😕 Iolanta is unable to visualize this resource**
+
+* The URI might be incorrect;
+* Or, no edges might exist which involve it;
+* Or maybe Iolanta does not know of such edges.
+{content}
+**What can you do?**
+
+* If you feel this might indicate a bug 🐛, please do let us know at GitHub
+issues: https://github.com/iolanta.tech/iolanta/issues
+"""
+
+CONTENT_TEMPLATE = """
+**File content**
+
+```{type}
+{content}
+```
+"""
+
+
+class TextualNoFacetFound(Facet):
+    """Facet to handle the case when no facet is found."""
+
+    @property
+    def raw_content(self):
+        """Content of the file, if applicable."""
+        url = URL(self.uriref)
+        if url.scheme != 'file':
+            return None
+
+        path = Path(url.path)
+        if not path.is_relative_to(self.iolanta.project_root):
+            return None
+
+        if not path.exists():
+            return None
+
+        if path.is_dir():
+            return None
+
+        file_content = path.read_text()
+        return CONTENT_TEMPLATE.format(
+            content=file_content,
+            type={
+                '.yamlld': 'yaml',
+            }.get(path.suffix, ''),
+        )
+
+    def show(self):
+        """Compose the page."""
+        return Vertical(
+            PageTitle(self.this),
+            Description(
+                Markdown(TEXT.format(content=self.raw_content or '')),
+            ),
+        )

iolanta/iolanta.py

@@ -28,7 +28,6 @@ from yaml_ld.errors import YAMLLDError
 
 from iolanta import entry_points, namespaces
 from iolanta.conversions import path_to_iri
-from iolanta.cyberspace.processor import normalize_term
 from iolanta.errors import UnresolvedIRI
 from iolanta.facets.errors import FacetError
 from iolanta.facets.facet import Facet
@@ -53,6 +52,7 @@ from iolanta.query_result import (
     format_query_bindings,
 )
 from iolanta.resolvers.python_import import PythonImportResolver
+from iolanta.sparqlspace.processor import normalize_term
 
 
 class LoggerProtocol(Protocol):
@@ -161,7 +161,7 @@ class Iolanta:   # noqa: WPS214
         try:
             sparql_result: SPARQLResult = self.graph.query(
                 query_text,
-                processor='cyberspace',
+                processor='sparqlspace',
                 initBindings=kwargs,
             )
         except ParseException as err:
@@ -259,7 +259,7 @@ class Iolanta:   # noqa: WPS214
                 )
 
             if not quads:
-                self.logger.warning(f'{source_file} | No data found')
+                self.logger.info(f'{source_file} | No data found')
                 continue
 
             quad_tuples = [

iolanta/parse_quads.py

@@ -73,13 +73,6 @@ def parse_quads(
                 graph,
             )
 
-        yield Quad(
-            graph_name,
-            RDF.type,
-            IOLANTA.Graph,
-            IOLANTA.meta,
-        )
-
         for quad in quads:
             try:
                 yield Quad(

iolanta/sparqlspace/cli.py

@@ -0,0 +1,64 @@
+from enum import StrEnum
+from typing import Annotated
+
+import rich
+from rdflib import Node
+from rdflib.query import Result
+from rich.table import Table
+from typer import Option, Typer
+
+from iolanta.sparqlspace.sparqlspace import SPARQLSpace
+
+app = Typer()
+
+
+class OutputFormat(StrEnum):
+    """Output formats for the query command."""
+
+    CSV = 'csv'      # noqa: WPS115
+    JSON = 'json'    # noqa: WPS115
+    TABLE = 'table'  # noqa: WPS115
+
+
+def _format_node(node: Node):
+    return node
+
+
+def _format_result(query_result: Result, output_format: OutputFormat):
+    match output_format:
+        case OutputFormat.CSV:
+            return query_result.serialize(format='csv').decode()
+
+        case OutputFormat.JSON:
+            return query_result.serialize(format='json').decode()
+
+        case OutputFormat.TABLE:
+            table = Table(*query_result.vars)
+            for row in query_result:
+                table.add_row(
+                    *[
+                        _format_node(node)
+                        for node in row
+                    ],
+                )
+            return table
+
+    raise NotImplementedError(f'Output format {output_format} not implemented.')
+
+
+@app.command(name='query')
+def query_command(
+    query: str,
+    output_format: Annotated[
+        OutputFormat,
+        Option(help='Output format.'),
+    ] = OutputFormat.TABLE,
+):
+    """Execute a SPARQL query."""
+    query_result = SPARQLSpace().query(query)
+    rich.print(
+        _format_result(
+            query_result=query_result,
+            output_format=output_format,
+        ),
+    )

iolanta/{cyberspace → sparqlspace}/processor.py

@@ -1,6 +1,5 @@
 import dataclasses
 import datetime
-import itertools
 import re
 import time
 from pathlib import Path
@@ -13,9 +12,11 @@ import funcy
 import loguru
 import platformdirs
 import reasonable
+import requests
 import yaml_ld
 from nanopub import NanopubClient
-from rdflib import ConjunctiveGraph, Namespace, URIRef, Variable
+from rdflib import ConjunctiveGraph, Dataset, Namespace, URIRef, Variable
+from rdflib.namespace import RDF as original_RDF
 from rdflib.plugins.sparql.algebra import translateQuery
 from rdflib.plugins.sparql.evaluate import evalQuery
 from rdflib.plugins.sparql.parser import parseQuery
@@ -23,6 +24,7 @@ from rdflib.plugins.sparql.parserutils import CompValue
 from rdflib.plugins.sparql.sparql import Query
 from rdflib.query import Processor
 from rdflib.term import BNode, Literal, Node
+from requests import HTTPError
 from requests.exceptions import ConnectionError
 from yaml_ld.document_loaders.content_types import ParserNotFound
 from yaml_ld.errors import NotFound, YAMLLDError
@@ -97,13 +99,16 @@ def find_retractions_for(nanopublication: URIRef) -> set[URIRef]:
     )
     client.grlc_urls = [use_server]
 
-    retractions = client.find_retractions_of(
-        str(nanopublication).replace(
-            'https://',
-            'http://',
-        ),
+    http_url = str(nanopublication).replace(
+        'https://',
+        'http://',
     )
 
+    try:
+        retractions = client.find_retractions_of(http_url)
+    except HTTPError:
+        return set()
+
     return {URIRef(retraction) for retraction in retractions}
 
 
@@ -293,6 +298,79 @@ def apply_redirect(source: URIRef) -> URIRef:
     return source
 
 
+def extract_triples(algebra: CompValue) -> Iterable[tuple[Node, Node, Node]]:
+    """Extract triples from a SPARQL query algebra instance."""
+    if isinstance(algebra, CompValue):
+        for key, value in algebra.items():  # noqa: WPS110
+            if key == 'triples':
+                yield from value
+
+            else:
+                yield from extract_triples(value)
+
+
+@dataclasses.dataclass(frozen=True)
+class NanopubQueryPlugin:
+    """Import additional information from Nanopublications Registry."""
+
+    graph: Dataset
+
+    def __call__(self, query: Query, bindings: dict[str, Any]):
+        """Get stuff from Nanopub Registry, if it makes sense."""
+        class_uris = resolve_variables(
+            set(self._find_classes(query.algebra)),
+            bindings,
+        )
+        for class_uri in class_uris:
+            if self._is_from_nanopubs(class_uri):
+                self._load_instances(class_uri)
+
+    def _find_classes(self, algebra: CompValue) -> Iterable[URIRef]:
+        triples = extract_triples(algebra)
+        for _subject, potential_type, potential_class in triples:
+            if potential_type == original_RDF.type:
+                yield potential_class
+
+    @funcy.retry(errors=HTTPError, tries=3, timeout=3)
+    def _load_instances(self, class_uri: URIRef):
+        """
+        Load instances from Nanopub Registry.
+
+        FIXME: Can we cache this?
+        """
+        response = requests.post(   # noqa: S113
+            'https://query.knowledgepixels.com/repo/full',
+            data={
+                'query': 'CONSTRUCT WHERE { ?instance a <%s> }' % class_uri,
+            },
+            headers={
+                'Accept': 'application/ld+json',
+            },
+        )
+
+        response.raise_for_status()
+
+        self.graph.get_context(BNode()).parse(
+            data=response.text,
+            format='json-ld',
+        )
+
+    def _is_from_nanopubs(self, class_uri: URIRef) -> bool:
+        if not isinstance(class_uri, URIRef):
+            raise ValueError(f'Not a URIRef: {class_uri}')
+
+        return self.graph.query(   # noqa: WPS462
+            """
+            ASK WHERE {
+                ?_whatever <https://purl.org/nanopub/x/introduces> $class
+            }
+            """,
+            initBindings={
+                'class': class_uri,
+            },
+        ).askAnswer
+
+
 @dataclasses.dataclass(frozen=True)
 class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
     """
@@ -401,25 +479,27 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             parse_tree = parseQuery(strOrQuery)
             query = translateQuery(parse_tree, base, initNs)
 
-            self.load_retracting_nanopublications_by_query(
-                query=query,
-                bindings=initBindings,
-                base=base,
-                namespaces=initNs,
-            )
+        self.load_retracting_nanopublications_by_query(
+            query=query,
+            bindings=initBindings,
+            base=base,
+            namespaces=initNs,
+        )
 
-            query, urls = extract_mentioned_urls_from_query(
-                query=query,
-                bindings=initBindings,
-                base=base,
-                namespaces=initNs,
-            )
+        query, urls = extract_mentioned_urls_from_query(
+            query=query,
+            bindings=initBindings,
+            base=base,
+            namespaces=initNs,
+        )
 
-            for url in urls:
-                try:
-                    self.load(url)
-                except Exception as err:
-                    self.logger.error(f'Failed to load {url}: {err}', url, err)
+        for url in urls:
+            try:
+                self.load(url)
+            except Exception as err:
+                self.logger.error(f'Failed to load {url}: {err}', url, err)
+
+        NanopubQueryPlugin(graph=self.graph)(query, bindings=initBindings)
 
         self.maybe_apply_inference()
 
@@ -542,12 +622,6 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 path=not_found.path,
             )
 
-            self.graph.add((
-                source_uri,
-                RDF.type,
-                IOLANTA.Graph,
-            ))
-
             self.graph.add((
                 source_uri,
                 RDF.type,
@@ -555,38 +629,18 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 source_uri,
             ))
 
-            self.graph.add((
-                IOLANTA.Graph,
-                RDF.type,
-                RDFS.Class,
-            ))
-
             self._mark_as_loaded(source_uri)
 
             return Loaded()
 
         except Exception as err:
             self.logger.info(f'{source} | Failed: {err}')
-
-            self.graph.add((
-                source_uri,
-                RDF.type,
-                IOLANTA.Graph,
-            ))
-
             self.graph.add((
                 URIRef(source),
                 RDF.type,
                 IOLANTA['failed'],
                 source_uri,
             ))
-
-            self.graph.add((
-                IOLANTA.Graph,
-                RDF.type,
-                RDFS.Class,
-            ))
-
             self._mark_as_loaded(source_uri)
 
             return Loaded()
@@ -601,18 +655,6 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 ))
                 source = _resolved_source
 
-        self.graph.add((
-            source_uri,
-            RDF.type,
-            IOLANTA.Graph,
-        ))
-
-        self.graph.add((
-            IOLANTA.Graph,
-            RDF.type,
-            RDFS.Class,
-        ))
-
         self._mark_as_loaded(source_uri)
 
         try:  # noqa: WPS225
@@ -647,13 +689,7 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             )
 
         if not quads:
-            self.logger.warning('{source} | No data found', source=source)
-            self.graph.addN([(
-                source_uri,
-                RDF.type,
-                IOLANTA.Graph,
-                source_uri,
-            )])
+            self.logger.info('{source} | No data found', source=source)
             return Loaded()
 
         quad_tuples = [

iolanta/sparqlspace/sparqlspace.py

@@ -0,0 +1,32 @@
+import functools
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Annotated
+
+import rdflib
+from rdflib.plugins.sparql.sparql import Query
+from rdflib.query import Result
+
+
+@dataclass
+class SPARQLSpace:
+    """SPARQL interface to the Web of Data."""
+
+    graph: rdflib.Dataset = field(
+        default_factory=functools.partial(
+            rdflib.Dataset,
+            default_union=True,
+        ),
+    )
+    path: Annotated[
+        Path | None,
+        'Local directory to load into the graph.',
+    ] = None
+
+    def query(self, query: str | Query, **bindings) -> Result:
+        """Execute a SPARQL query."""
+        return self.graph.query(
+            query_object=query,
+            processor='sparqlspace',
+            initBindings=bindings,
+        )

iolanta/widgets/description.py

@@ -0,0 +1,12 @@
+from textual.widgets import Label
+
+
+class Description(Label):
+    """Free form textual description."""
+
+    DEFAULT_CSS = """
+    Description {
+      padding: 1;
+      padding-left: 4;
+    }
+    """  # noqa: WPS115

{iolanta-2.0.2.dist-info → iolanta-2.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 2.0.2
+Version: 2.0.6
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -32,7 +32,7 @@ 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: yaml-ld (>=1.1.7)
+Requires-Dist: yaml-ld (>=1.1.9)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown
 

{iolanta-2.0.2.dist-info → iolanta-2.0.6.dist-info}/RECORD

@@ -6,20 +6,17 @@ 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=exDWPljllufn7DiGC9lS1pvojFX9YZJciQ2RPCedKMU,3127
+iolanta/cli/main.py,sha256=W1SoQK9kncaSUsy4X5yMrzu8lQUlu-eE6YyIu4dNnec,3167
 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/cyberspace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iolanta/cyberspace/inference/wikibase-claim.sparql,sha256=JSawj3VTc9ZPoU9mvh1w1AMYb3cWyZ3x1rEYWUsKZ6A,209
-iolanta/cyberspace/inference/wikibase-statement-property.sparql,sha256=SkSHZZlxWVDwBM3aLo0Q7hLuOj9BsIQnXtcuAuwaxqU,240
-iolanta/cyberspace/processor.py,sha256=USGe54XuNMNYYl-Hed1bKxeqZLUhrb1jNRUDbWpay4A,21990
 iolanta/data/cli.yaml,sha256=TsnldYXoY5GIzoNuPDvwBKGw8eAEForZW1FCKqKI0Kg,1029
-iolanta/data/context.yaml,sha256=OULEeDkSqshabaXF_gMujgwFLDJvt9eQn_9FftUlSUw,1424
+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/iolanta.yaml,sha256=xubIFBNU02lmFXhgOSuyQwUcZD3xCqVfeVAZMvOxKbI,1433
-iolanta/data/textual-browser.yaml,sha256=8aGKLN_xnSX5o3dpBLsh8kPMfEsiysOd2QX-pn0Vfd4,4031
+iolanta/data/textual-browser.yaml,sha256=SajFDOdqISVLsBVneS3uh3s8vuYAUIuC0nWvVqIWMZ0,4141
 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
@@ -45,7 +42,7 @@ iolanta/facets/html/base.py,sha256=JcpK7YM_QQE9vwH5w5F_EgPkPv-XRzOrcZlVSy4LhIs,1
 iolanta/facets/html/code_literal.py,sha256=qCddzBrg6Y5XMIKohFQ52Tf9GPOcU7bj83tfAU1FLLU,394
 iolanta/facets/html/default.py,sha256=Dmf_kYiL2M954iigyYsiWrMstwZ1nvxKetuR6aW3xYY,647
 iolanta/facets/icon.py,sha256=ddZcolx1Q5_wo3w0jqiCzcc5Lsru6-jA7s7oAd1T8Og,494
-iolanta/facets/locator.py,sha256=0FNISVG_Q4Mk8j6ZX0tmIM-YfnewdKJSf7BYQIwb-lc,8636
+iolanta/facets/locator.py,sha256=b9TEK5_5SklTfEc6lUt7DJt1mKXsiL_urA2zxMk59EY,9152
 iolanta/facets/page_title.py,sha256=TwgZK2g_e5UoWYjKNgDzzkmq1EI3cY58680iC8N9kZI,1407
 iolanta/facets/qname.py,sha256=ztyBbjjcW8dNZzuiNMqhcWfAUxk-gSjbseVGrQE7kVY,531
 iolanta/facets/textual_browser/__init__.py,sha256=sKgDvXOwib9n9d63kdtKCEv26-FoL0VN6zxDmfcheZ8,104
@@ -58,8 +55,8 @@ iolanta/facets/textual_browser/models.py,sha256=DqTBjhkkTt5mNwqr4DzNbPSqzV-QtNqf
 iolanta/facets/textual_browser/page.py,sha256=NkcQ5rSKZRbp63C8ozgsR_iVhcKHGv_SytUCQyGa7ss,786
 iolanta/facets/textual_browser/page_switcher.py,sha256=WOsFY9hSFEnuf3za1eCUhPaQ6uTaeBuMPIAHjHhnvDY,9950
 iolanta/facets/textual_class/__init__.py,sha256=tiL0p-3JspGcBRj4qa3rmoBFAuadk71l2ja2lJN6CEs,75
-iolanta/facets/textual_class/facets.py,sha256=qDljrtu7poPuvwRFwtmOlLccsIMhAKrzIQ5_OHeXQZE,6493
-iolanta/facets/textual_class/sparql/instances.sparql,sha256=tmG4tuYrROKo3A7idjOEblAeNPXiiExHxc6k3fhalSM,113
+iolanta/facets/textual_class/facets.py,sha256=tascZiue3tbYfpIsnP8yY2dgXQIQzoQ_HPzU7DbVbao,5999
+iolanta/facets/textual_class/sparql/instances.sparql,sha256=EW4BmuNxiRDA8djuEtvZpLLJlNSIshvId4ExlaYPcZE,106
 iolanta/facets/textual_default/__init__.py,sha256=snxA0FEY9qfAxNv3MlZLrJsXugD4dvs5hLStZWV7soM,158
 iolanta/facets/textual_default/facets.py,sha256=Pf5GttQ7EG0ZodjwwVXzYMffHus3MAZdJUIcbddcYtw,4738
 iolanta/facets/textual_default/sparql/inverse-properties.sparql,sha256=daHNdhmh92Q77CSf7ULbhxg57CuYsRFfMnXQz4VYEug,64
@@ -82,6 +79,7 @@ iolanta/facets/textual_nanopublication/models.py,sha256=MphggSvKmYac6v866GOKW5lc
 iolanta/facets/textual_nanopublication/nanopublication_widget.py,sha256=sQPgEx25XJ15VqB5zjZuz2q2bf_B5GWXEp32FAufxQ4,2387
 iolanta/facets/textual_nanopublication/term_list_widget.py,sha256=NZNATKjFmgI2sE5R0ebyQh5Qk2g-kf-MT4YZ-Vw78M4,992
 iolanta/facets/textual_nanopublication/term_widget.py,sha256=uI5msCTSIYumAIS3I8nBfUz57_vRzvCKkouevrS3Qwk,3536
+iolanta/facets/textual_no_facet_found.py,sha256=gYRSAYDX0t6EHln0S8msLZE27Svfef8iPVfZQ3Vf8Ns,1625
 iolanta/facets/textual_ontology/__init__.py,sha256=3H6bfYaEbXFr90C6ZpGWC4O-24uaO18tnTXx7mckQSA,94
 iolanta/facets/textual_ontology/facets.py,sha256=60g8ANmePb9_i_-d4ui-FdtNwg9aktrOKXHkTQtLp1w,3338
 iolanta/facets/textual_ontology/sparql/terms.sparql,sha256=oVLxN452nqog_95qRaTWnvar6rxPNxPrRonSo7oFFTg,324
@@ -97,7 +95,7 @@ iolanta/facets/title/sparql/title.sparql,sha256=4rz47tjwX2OJavWMzftaYKil1-ZHB76Z
 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=ZZ5hBXuVci4v-36xYLeaqDjgo85kEnnYCA07eJMo9ME,14230
+iolanta/iolanta.py,sha256=wCt_7aUz9TOvZTJvpJQ-qVWkOpmM531uyxIk9l3n-lk,14229
 iolanta/loaders/__init__.py,sha256=QTiKCsQc1BTS-IlY2CQsN9iVpEIPqYFvI9ERMYVZCbU,99
 iolanta/loaders/base.py,sha256=-DxYwqG1bfDXB2p_S-mKpkc_3Sh14OHhePbe65Iq3-s,3381
 iolanta/loaders/data_type_choice.py,sha256=zRUXBIzjvuW28P_dhMDVevE9C8EFEIx2_X39WydWrtM,1982
@@ -110,7 +108,7 @@ iolanta/loaders/scheme_choice.py,sha256=GHA4JAD-Qq3uNdej4vs_bCrN1WMRshVRvOMxaYyP
 iolanta/models.py,sha256=L0iFaga4-PCaWP18WmT03NLK_oT7q49V0WMTQskoffI,2824
 iolanta/namespaces.py,sha256=fyWDCGPwU8Cs8d-Vmci4H0-fuIe7BMSevvEKFvG7Gf4,1153
 iolanta/node_to_qname.py,sha256=a82_qpgT87cbekY_76tTkl4Z-6Rz6am4UGIQChUf9Y0,794
-iolanta/parse_quads.py,sha256=nQeX9zSjDoITH1lmd25xhKq44bFTqcayFbAguXfFyh4,2790
+iolanta/parse_quads.py,sha256=2UydATeDassOrpjWfjwWnMjnSS5RZw5KBFIeKHGJ36M,2660
 iolanta/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/parsers/base.py,sha256=ZFjj0BLzW4985BdC6PwbngenhMuSYW5mNLpprZRWjhA,1048
 iolanta/parsers/dict_parser.py,sha256=t_OK2meUh49DqSaOYkSgEwxMKUNNgjJY8rZAyL4NQKI,4546
@@ -125,9 +123,16 @@ iolanta/resolvers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 iolanta/resolvers/base.py,sha256=cc9bcrVZ0wTwn85I-IYCwcIRU5Lwaph8D00C0dwSOm8,302
 iolanta/resolvers/python_import.py,sha256=kDOhApBDFfxnrDgK9M7ztMkqXfcny81Zo86FgPFb-LI,1301
 iolanta/shortcuts.py,sha256=j8b0E_yeoas8GumsPOfxO2v2jO0noqpmKJ6LFxFfsu4,1892
+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
+iolanta/sparqlspace/inference/wikibase-statement-property.sparql,sha256=SkSHZZlxWVDwBM3aLo0Q7hLuOj9BsIQnXtcuAuwaxqU,240
+iolanta/sparqlspace/processor.py,sha256=CXxdi7ORpddXxPh0UlnRG7oqNT9q-WdSPMxqB4CgOis,23570
+iolanta/sparqlspace/sparqlspace.py,sha256=Y8_ZPXwuGEXbEes6XQjaQWA2Zv9y8SWxMPDFdqVBGFo,796
 iolanta/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+iolanta/widgets/description.py,sha256=Qj5R2wgxJzlAHU0LHyKIoZSCkGk4VBuImWIyiUallhs,215
 iolanta/widgets/mixin.py,sha256=nDRCOc-gizCf1a5DAcYs4hW8eZEd6pHBPFsfm0ncv7E,251
-iolanta-2.0.2.dist-info/METADATA,sha256=BMCrSsOvKpNz7vzyS1iFXXWffpee_tGU1Rtvf_BF4Xc,2230
-iolanta-2.0.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-iolanta-2.0.2.dist-info/entry_points.txt,sha256=fIp9g4kzjSNcTsTSjUCk4BIG3laHd3b3hUZlkjgFAGU,179
-iolanta-2.0.2.dist-info/RECORD,,
+iolanta-2.0.6.dist-info/METADATA,sha256=zqVS0cP1WoIfWm-4NCgDrrryi5uxKwILIyquK8khpGA,2230
+iolanta-2.0.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+iolanta-2.0.6.dist-info/entry_points.txt,sha256=z9RPLmGuz3tYGPV7Qf4nNjuSJYdTUS9enC4595poe-M,221
+iolanta-2.0.6.dist-info/RECORD,,

{iolanta-2.0.2.dist-info → iolanta-2.0.6.dist-info}/entry_points.txt

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