iolanta 2.0.2__tar.gz → 2.0.6__tar.gz

{iolanta-2.0.2 → iolanta-2.0.6}/PKG-INFO

@@ -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 → iolanta-2.0.6}/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-2.0.2 → iolanta-2.0.6}/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.6/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.2 → iolanta-2.0.6}/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-2.0.2 → iolanta-2.0.6}/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-2.0.2 → iolanta-2.0.6}/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.2 → iolanta-2.0.6}/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.6/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-2.0.2 → iolanta-2.0.6}/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.2 → iolanta-2.0.6}/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.6/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,
+        ),
+    )