iolanta 2.1.7__tar.gz → 2.1.8__tar.gz

{iolanta-2.1.7 → iolanta-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iolanta
-Version: 2.1.7
+Version: 2.1.8
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/cli/main.py

@@ -11,7 +11,7 @@ from rdflib import Literal, URIRef
 from rich.console import Console
 from rich.markdown import Markdown
 from rich.table import Table
-from typer import Argument, Exit, Option, Typer, Context
+from typer import Argument, Context, Exit, Option, Typer
 from yarl import URL
 
 from iolanta.cli.models import LogLevel

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/data/context.yaml

@@ -1,13 +1,13 @@
 "@context":
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
-  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
   iolanta: https://iolanta.tech/
-  owl: https://www.w3.org/2002/07/owl#
+  owl: http://www.w3.org/2002/07/owl#
   schema: https://schema.org/
-  xsd: https://www.w3.org/2001/XMLSchema#
-  skos: https://www.w3.org/2004/02/skos/core#
-  foaf: https://xmlns.com/foaf/0.1/
-  vann: https://purl.org/vocab/vann/
+  xsd: http://www.w3.org/2001/XMLSchema#
+  skos: http://www.w3.org/2004/02/skos/core#
+  foaf: http://xmlns.com/foaf/0.1/
+  vann: http://purl.org/vocab/vann/
 
   "@vocab": "local:"
   "@base": "local:"

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/data/iolanta.yaml

@@ -5,7 +5,7 @@
   owl: https://www.w3.org/2002/07/owl#
   iolanta: https://iolanta.tech/
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
-  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
 
 $included:
   - $id: iolanta:Facet

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/data/textual-browser.yaml

@@ -1,14 +1,14 @@
 "@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#
+  vann: http://purl.org/vocab/vann/
+  foaf: http://xmlns.com/foaf/0.1/
+  owl: http://www.w3.org/2002/07/owl#
   iolanta: https://iolanta.tech/
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
-  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  rdf: http://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#
+  dcterms: http://purl.org/dc/terms/
+  xsd: http://www.w3.org/2001/XMLSchema#
 
   iolanta:outputs:
     "@type": "@id"
@@ -88,15 +88,6 @@
     iolanta:hasDefaultFacet:
       $id: pkg:pypi/iolanta#textual-link
 
-  - $id: rdfs:Class
-    iolanta:hasInstanceFacet:
-      $id: pkg:pypi/iolanta#textual-class
-      $: Instances
-      →: https://iolanta.tech/cli/textual
-      ⪯:
-        - pkg:pypi/iolanta#textual-browser
-        - pkg:pypi/iolanta#textual-inverse-properties
-
   - $id: owl:Ontology
     iolanta:hasInstanceFacet:
       $id: pkg:pypi/iolanta#textual-ontology
@@ -119,10 +110,5 @@
     →: https://iolanta.tech/cli/textual
     ↦: ASK WHERE { ?subject $this ?object }
 
-  - $id: pkg:pypi/iolanta#textual-class
-    ↦:
-      - ASK WHERE { ?instance a $this }
-      - ASK WHERE { $this rdfs:subClassOf ?superclass }
-
   - $id: https://iolanta.tech/cli/textual
     iolanta:when-no-facet-found: pkg:pypi/iolanta#textual-no-facet-found

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/declension/data/declension.yamlld

@@ -1,13 +1,13 @@
 "@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#
+  vann: http://purl.org/vocab/vann/
+  foaf: http://xmlns.com/foaf/0.1/
+  owl: http://www.w3.org/2002/07/owl#
   iolanta: https://iolanta.tech/
   rdfs: "http://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/
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
+  dcterms: http://purl.org/dc/terms/
+  dcam: http://purl.org/dc/dcam/
 
   iolanta:outputs:
     "@type": "@id"

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/facet.py

@@ -20,6 +20,10 @@ class Facet(Generic[FacetOutput]):
     iolanta: 'iolanta.Iolanta' = field(repr=False)
     as_datatype: Optional[NotLiteralNode] = None
 
+    def __post_init__(self):
+        if type(self.this) == str:
+            raise ValueError(f'Facet {self.__class__.__name__} received a string as this: {self.this}')
+
     @property
     def stored_queries_path(self) -> Path:
         """Construct directory for stored queries for this facet."""

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/mkdocs_material_insiders_markdown/__init__.py

@@ -1,4 +1,6 @@
-from iolanta.facets.mkdocs_material_insiders_markdown.facet import MkDocsMaterialInsidersMarkdownFacet
+from iolanta.facets.mkdocs_material_insiders_markdown.facet import (
+    MkDocsMaterialInsidersMarkdownFacet,
+)
 
 __all__ = ['MkDocsMaterialInsidersMarkdownFacet']
 

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/mkdocs_material_insiders_markdown/data/mkdocs_material_insiders_markdown.yamlld

@@ -1,7 +1,7 @@
 "@context":
   "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
-  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
   iolanta: https://iolanta.tech/
 
   $: rdfs:label

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_browser/location.py

@@ -2,11 +2,13 @@ from dataclasses import dataclass
 
 from rdflib import URIRef
 
+from iolanta.models import NotLiteralNode
+
 
 @dataclass
 class Location:
     """Unique ID and IRI associated with it."""
 
     page_id: str
-    url: str
+    url: NotLiteralNode
     facet_iri: URIRef | None = None

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_browser/page_switcher.py

@@ -217,6 +217,9 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def action_reload(self):
         """Reset Iolanta graph and re-render current view."""
+        if self.history.current is None:
+            return
+        
         self.iolanta.reset()
 
         self.run_worker(
@@ -271,6 +274,13 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         facet_iri: str | None = None,
     ):
         """Go to an IRI."""
+        # Convert string to URIRef if needed.
+        # This happens when called via Textual action strings (from keyboard bindings
+        # in page.py line 24), which serialize URIRefs to strings in f-strings.
+        # Direct calls (like line 77) pass URIRef objects directly.
+        if isinstance(this, str):
+            this = URIRef(this)
+        
         self.run_worker(
             functools.partial(
                 self.render_iri,

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_class/facets.py

@@ -1,5 +1,6 @@
 import functools
 import itertools
+from pathlib import Path
 from typing import ClassVar, Iterable
 
 import funcy
@@ -186,6 +187,8 @@ class InstancesBody(Vertical):
 class Class(Facet[Widget]):
     """Render instances of a class."""
 
+    META = Path(__file__).parent / 'textual-class.yamlld'
+
     def stream_instances(self) -> Iterable[NotLiteralNode]:
         """
         Query and stream class instances lazily.

iolanta-2.1.8/iolanta/facets/textual_class/textual-class.yamlld

@@ -0,0 +1,25 @@
+"@context":
+  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
+  iolanta: https://iolanta.tech/
+  rdfs: "http://www.w3.org/2000/01/rdf-schema#"
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
+
+  $: rdfs:label
+  →:
+    "@type": "@id"
+    "@id": iolanta:outputs
+  ⪯:
+    "@type": "@id"
+    "@id": iolanta:is-preferred-over
+  ↦: iolanta:matches
+
+$id: pkg:pypi/iolanta#textual-class
+
+$: Instances
+→: https://iolanta.tech/cli/textual
+
+⪯:
+  - pkg:pypi/iolanta#textual-browser
+  - pkg:pypi/iolanta#textual-inverse-properties
+
+↦: ASK WHERE { ?instance a $this }

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_default/facets.py

@@ -4,7 +4,7 @@ from xml.dom import minidom  # noqa: S408
 import funcy
 from rdflib.term import Literal, Node
 from rich.syntax import Syntax
-from textual.containers import VerticalScroll
+from textual.containers import Vertical, VerticalScroll
 from textual.widget import Widget
 from textual.widgets import Static
 
@@ -22,17 +22,28 @@ from iolanta.models import NotLiteralNode
 from iolanta.namespaces import DC, RDFS, SDO
 
 
+class Description(Static):
+    """Static widget with padding for descriptions."""
+
+    DEFAULT_CSS = """
+    Description {
+        padding: 1;
+    }
+    """
+
+
 class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
     """Default rendering engine."""
 
     query_file_name = 'properties.sparql'
+    properties_on_the_right = False
 
     @functools.cached_property
     def grouped_properties(self) -> dict[NotLiteralNode, list[Node]]:
         """Properties of current node & their values."""
         property_rows = self.stored_query(
             self.query_file_name,
-            iri=self.this,
+            this=self.this,
         )
 
         property_pairs = [
@@ -75,10 +86,18 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
                 for property_value in property_values
             ]
 
-            yield PropertyRow(
-                property_name,
-                PropertyValues(*property_values),
-            )
+            if self.properties_on_the_right:
+                # Property name on the right (last column), values on the left (first column)
+                yield PropertyRow(
+                    PropertyValues(*property_values),
+                    property_name,
+                )
+            else:
+                # Property name on the left (first column), values on the right (last column)
+                yield PropertyRow(
+                    property_name,
+                    PropertyValues(*property_values),
+                )
 
     @functools.cached_property
     def description(self) -> str | Syntax | None:
@@ -134,22 +153,38 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
 
     def show(self) -> Widget:
         """Render the content."""
-        return VerticalScroll(
-            PageTitle(self.this),
-            Static(self.description or ''),
-            self.properties,
-        )
 
+        widgets = [PageTitle(self.this)]
+
+        if self.description:
+            widgets.append(Description(self.description))
+        
+        widgets.append(self.properties)
+
+        return VerticalScroll(*widgets)
+
+
+class PageFooter(PageTitle):
+    """Page footer."""
+
+    DEFAULT_CSS = """
+    PageFooter {
+        dock: bottom;
+        background: darkmagenta;
+    }
+    """
 
 class InverseProperties(TextualDefaultFacet):
     """Inverse properties view."""
 
     query_file_name = 'inverse-properties.sparql'
+    properties_on_the_right = True
 
     def show(self) -> Widget:
         """Render the content."""
-        return VerticalScroll(
-            PageTitle(self.this, extra='[i]& its inverse RDF properties[/i]'),
-            Static(self.description or ''),
-            self.properties,
+        return Vertical(
+            VerticalScroll(
+                self.properties,
+            ),
+            PageFooter(self.this, extra='[i]& its inverse RDF properties[/i]'),
         )

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_default/sparql/inverse-properties.sparql

@@ -1,3 +1,3 @@
 SELECT ?object ?property WHERE {
-    ?object ?property $iri .
+    ?object ?property $this .
 }

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_default/sparql/properties.sparql

@@ -1,9 +1,9 @@
 SELECT ?property ?object WHERE {
-    $iri ?property ?object .
+    $this ?property ?object .
 
     # Exclude non-informative tautologies.
     FILTER (!(
-        ?object = $iri
+        ?object = $this
         && ?property IN (
             owl:sameAs,
             owl:equivalentClass,

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/facets/textual_default/widgets.py

@@ -25,6 +25,7 @@ class PropertyName(Widget, can_focus=True, inherit_bindings=False):
         width: 15%;
         height: auto;
         margin-right: 1;
+        text-style: bold;
     }
 
     PropertyName:hover {
@@ -60,7 +61,8 @@ class PropertyName(Widget, can_focus=True, inherit_bindings=False):
 
     def render_title(self):
         """Render title in a separate thread."""
-        return self.app.iolanta.render(self.iri, DATATYPES.title)
+        title = self.app.iolanta.render(self.iri, DATATYPES.title)
+        return f'⤚{title}→'
 
     def render(self) -> RenderResult:
         """Render node title."""
@@ -147,6 +149,13 @@ class PropertyValue(Widget, can_focus=True, inherit_bindings=False):
         """Return the property IRI for compatibility."""
         return self.property_value
 
+    def render_title(self):
+        """Render title in a separate thread."""
+        return self.app.iolanta.render(
+            self.iri,
+            as_datatype=DATATYPES.title,
+        )
+
     def on_worker_state_changed(self, event: Worker.StateChanged):
         """Show the title after it has been rendered."""
         match event.state:
@@ -191,7 +200,9 @@ class PropertiesContainer(Vertical):
     DEFAULT_CSS = """
     PropertiesContainer {
         height: auto;
-    }"""
+        padding: 1;
+    }
+    """
 
     def render_all_properties(self):
         """Render all property names & values."""
@@ -199,10 +210,7 @@ class PropertiesContainer(Vertical):
 
         widget: PropertyName | PropertyValue
         for widget in widgets:
-            widget.renderable = self.app.iolanta.render(
-                widget.iri,
-                as_datatype=DATATYPES.title,
-            )
+            widget.renderable = widget.render_title()
 
     def on_mount(self):
         """Initiate rendering in the background."""

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/iolanta.py

@@ -308,44 +308,6 @@ class Iolanta:   # noqa: WPS214
                 error=err,
             ) from err
 
-    def render_all(
-        self,
-        node: Node,
-        as_datatype: NotLiteralNode,
-    ) -> Iterable[Any]:
-        """Find all possible Iolanta facets for a node and render them."""
-        choices = list(
-            FacetFinder(
-                iolanta=self,
-                node=node,
-                as_datatype=as_datatype,
-            ).choices(),
-        )
-
-        pairs = [
-            (self.facet_resolver[row['facet']], row['output_datatype'])
-            for row in choices
-        ]
-
-        facet_instances = [
-            facet_class(
-                this=node,
-                iolanta=self,
-                as_datatype=output_datatype,
-            )
-            for facet_class, output_datatype in pairs
-        ]
-
-        for facet in facet_instances:
-            try:
-                yield facet.show()
-            except Exception as err:
-                raise FacetError(
-                    node=node,
-                    facet_iri=None,
-                    error=err,
-                ) from err
-
     def node_as_qname(self, node: Node):
         """Render node as a QName if possible."""
         qname = node_to_qname(node, self.graph)

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/labeled_triple_set/data/labeled_triple_set.yamlld

@@ -1,13 +1,13 @@
 "@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#
+  vann: http://purl.org/vocab/vann/
+  foaf: http://xmlns.com/foaf/0.1/
+  owl: http://www.w3.org/2002/07/owl#
   iolanta: https://iolanta.tech/
   rdfs: "http://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/
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
+  dcterms: http://purl.org/dc/terms/
+  dcam: http://purl.org/dc/dcam/
 
   iolanta:outputs:
     "@type": "@id"

{iolanta-2.1.7 → iolanta-2.1.8}/iolanta/mcp/cli.py

@@ -1,6 +1,7 @@
+from pathlib import Path
 from typing import Annotated
+
 from fastmcp import FastMCP
-from pathlib import Path
 
 from iolanta.cli.main import render_and_return
 
@@ -10,7 +11,7 @@ mcp = FastMCP("Iolanta MCP Server")
 @mcp.tool()
 def render_uri(
     uri: Annotated[str, 'URL, or file system path, to render'],
-    as_format: Annotated[str, 'Format to render as. Examples: `labeled-triple-set`, `mermaid`']
+    as_format: Annotated[str, 'Format to render as. Examples: `labeled-triple-set`, `mermaid`'],
 ) -> str:
     """Render a URI."""
     result = render_and_return(uri, as_format)

{iolanta-2.1.7 → iolanta-2.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iolanta"
-version = "2.1.7"
+version = "2.1.8"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"