iolanta 2.0.1__tar.gz → 2.0.5__tar.gz

{iolanta-2.0.1 → iolanta-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 2.0.1
+Version: 2.0.5
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov

{iolanta-2.0.1 → iolanta-2.0.5}/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-2.0.5/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-2.0.5/iolanta/data/textual-browser.yaml

@@ -0,0 +1,127 @@
+"@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#
+  np: https://www.nanopub.org/nschema#
+  dcterms: https://purl.org/dc/terms/
+  xsd: https://www.w3.org/2001/XMLSchema#
+
+  iolanta:outputs:
+    "@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
+    $: Icon
+    ⊆: xsd:string
+
+  - $id: dcterms:creator
+    iolanta:icon: ©️
+
+  - $id: https://iolanta.tech/datatypes/icon
+    $: Icon
+    iolanta:hasDefaultFacet:
+      $id: python://iolanta.facets.icon.IconFacet
+      →: https://iolanta.tech/datatypes/icon
+
+  - $id: np:Nanopublication
+    $: Nanopublication
+    iolanta:hasInstanceFacet:
+      $id: python://iolanta.facets.textual_nanopublication.NanopublicationFacet
+      $: 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: 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
+      →: https://iolanta.tech/cli/textual
+
+  - $id: https://iolanta.tech/cli/link
+    iolanta:hasDefaultFacet:
+      $id: python://iolanta.facets.textual_link.TextualLinkFacet
+
+  - $id: https://wikiba.se/ontology#Statement
+    iolanta:hasInstanceFacet:
+      $id: python://iolanta.facets.wikibase_statement_title.WikibaseStatementTitle
+      $: Title
+      →: https://iolanta.tech/datatypes/title
+
+  - $id: rdfs:Class
+    iolanta:hasInstanceFacet:
+      $id: python://iolanta.facets.textual_class.Class
+      $: 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
+      $: Ontology
+      →: https://iolanta.tech/cli/textual
+      ⪯: python://iolanta.facets.textual_default.TextualDefaultFacet
+
+  - $id: https://iolanta.tech/datatypes/textual-graph-triples
+    $: Graph Triples
+    iolanta:hasDefaultFacet:
+      $id: python://iolanta.facets.textual_graph_triples.GraphTriplesFacet
+      →: 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
+    $: 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 }

{iolanta-2.0.1 → iolanta-2.0.5}/iolanta/facets/facet.py

@@ -20,6 +20,11 @@ class Facet(Generic[FacetOutput]):
     iolanta: 'iolanta.Iolanta' = field(repr=False)
     as_datatype: Optional[NotLiteralNode] = None
 
+    @property
+    def this(self) -> NotLiteralNode:
+        """This node."""
+        return self.iri
+
     @property
     def stored_queries_path(self) -> Path:
         """Construct directory for stored queries for this facet."""

{iolanta-2.0.1 → iolanta-2.0.5}/iolanta/facets/locator.py

@@ -15,7 +15,16 @@ class FoundRow(TypedDict):
     """Facet and datatype to render an IRI."""
 
     facet: NotLiteralNode
-    as_datatype: NotLiteralNode
+    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
@@ -103,6 +112,27 @@ class FacetFinder:   # noqa: WPS214
             key=self.row_sorter_by_output_datatype,
         )
 
+    def by_sparql(self) -> Iterable[FoundRow]:
+        """Determine facet by SHACL shape of the data."""
+        if not isinstance(self.node, URIRef):
+            return
+
+        rows = self.iolanta.query(
+            GET_QUERY_TO_FACET,
+            as_datatype=self.as_datatype,
+        )
+
+        query_to_facet = {
+            row['match']: row['facet']
+            for row in rows
+        }
+
+        for query, facet in query_to_facet.items():
+            # TODO: Verify that `query` is an ASK query
+            is_matching = self.iolanta.query(query, this=self.node)
+            if is_matching:
+                yield FoundRow(facet=facet, output_datatype=self.as_datatype)
+
     def by_prefix(self) -> Iterable[FoundRow]:
         """Determine facet by URL prefix.
 
@@ -254,6 +284,7 @@ class FacetFinder:   # noqa: WPS214
 
     def _found_facets(self) -> Iterable[FoundRow]:
         """Compose a stream of all possible facet choices."""
+        yield from self.by_sparql()
         yield from self.by_prefix()
         yield from self.by_datatype()
         yield from self.by_facet()

{iolanta-2.0.1 → iolanta-2.0.5}/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-2.0.1 → iolanta-2.0.5}/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-2.0.5/iolanta/facets/textual_property_pairs_table.py

@@ -0,0 +1,133 @@
+from collections import defaultdict
+from typing import Iterable
+
+import funcy
+from rdflib import Literal, Node
+from rich.style import Style
+from rich.text import Text
+from textual.containers import Vertical
+from textual.coordinate import Coordinate
+from textual.widgets import DataTable
+
+from iolanta import Facet
+from iolanta.facets.page_title import PageTitle
+from iolanta.models import NotLiteralNode
+from iolanta.namespaces import DATATYPES
+from iolanta.widgets.mixin import IolantaWidgetMixin
+
+PAIRS_QUERY = """
+SELECT ?subject ?object WHERE {
+    ?subject $this ?object .
+} ORDER BY ?subject ?object
+"""
+
+
+class PairsTable(IolantaWidgetMixin, DataTable):
+    """Render subject → object properties as a table with two columns."""
+
+    BINDINGS = [
+        ('enter', 'goto', 'Goto'),
+    ]
+
+    def __init__(self, pairs: Iterable[tuple[NotLiteralNode, Node]]):
+        """Construct."""
+        super().__init__(show_header=False, cell_padding=1)
+        self.pairs = list(pairs)
+
+    def render_human_readable_cells(self):
+        """Replace the cells with their human readable titles."""
+        terms_and_coordinates = sorted(
+            self.node_to_coordinates.items(),
+            key=lambda node_and_coordinates_pair: len(
+                node_and_coordinates_pair[1],
+            ),
+            reverse=True,
+        )
+
+        for term, coordinates in terms_and_coordinates:
+            title = self.iolanta.render(term, as_datatype=DATATYPES.title)
+            for coordinate in coordinates:
+                self.app.call_from_thread(
+                    self.update_cell_at,
+                    coordinate,
+                    value=Text(title, no_wrap=False),
+                    update_width=False,
+                )
+
+    @funcy.cached_property
+    @funcy.post_processing(dict)
+    def coordinate_to_node(self):
+        """Return a mapping of coordinates to their corresponding nodes."""
+        for row_number, (subject, object_term) in enumerate(self.pairs):
+            yield Coordinate(row_number, 0), subject
+            yield Coordinate(row_number, 1), object_term
+
+    @funcy.cached_property
+    def node_to_coordinates(self) -> defaultdict[Node, list[Coordinate]]:
+        """Map node to coordinates where it appears."""
+        node_to_coordinate = [
+            (node, coordinate)
+            for coordinate, node in self.coordinate_to_node.items()
+        ]
+        return funcy.group_values(node_to_coordinate)
+
+    def format_as_loading(self, node: Node) -> Text:
+        """Intermediate version of a value while it is loading."""
+        if isinstance(node, Literal):
+            node_text = f'⌛ {node}'
+        else:
+            node_text = self.iolanta.node_as_qname(node)
+            node_text = f'⌛ {node_text}'
+
+        return Text(
+            node_text,
+            style=Style(dim=True),
+            no_wrap=False,
+        )
+
+    def on_mount(self):
+        """Fill the table and start rendering."""
+        self.add_columns('Subject', 'Object')
+        self.cell_padding = 1
+
+        for subject, object_term in self.pairs:
+            self.add_row(
+                self.format_as_loading(subject),
+                self.format_as_loading(object_term),
+            )
+
+        self.run_worker(
+            self.render_human_readable_cells,
+            thread=True,
+        )
+
+    def action_goto(self):
+        """Navigate to the selected node."""
+        if self.cursor_coordinate:
+            node = self.coordinate_to_node.get(self.cursor_coordinate)
+            if node is not None:
+                self.app.action_goto(node)
+
+
+class TextualPropertyPairsTableFacet(Facet):
+    """Render a table of subject → object pairs for a property."""
+
+    def show(self):
+        """Construct the table."""
+        rows = self.query(
+            PAIRS_QUERY,
+            this=self.this,
+        )
+
+        return Vertical(
+            PageTitle(
+                self.this,
+                extra='— Subjects & Objects connected by this property',
+            ),
+            PairsTable(
+                [
+                    (row['subject'], row['object'])
+                    for row in rows
+                ],
+            ),
+        )

{iolanta-2.0.1 → iolanta-2.0.5}/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-2.0.1 → iolanta-2.0.5}/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-2.0.5/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,
+        ),
+    )