iolanta 2.0.7__tar.gz → 2.1.1__tar.gz

{iolanta-2.0.7 → iolanta-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 2.0.7
+Version: 2.1.1
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -24,6 +24,7 @@ Requires-Dist: more-itertools (>=9.0.0)
 Requires-Dist: nanopub (>=2.0.1)
 Requires-Dist: owlrl (>=6.0.2)
 Requires-Dist: oxrdflib (>=0.4.0)
+Requires-Dist: packageurl-python (>=0.17.5)
 Requires-Dist: python-frontmatter (>=0.5.0)
 Requires-Dist: rdflib (<8.0)
 Requires-Dist: reasonable (>=0.2.6)
@@ -31,8 +32,8 @@ Requires-Dist: requests (>=2.25.1)
 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.9)
+Requires-Dist: watchfiles (>=1.0.4)
+Requires-Dist: yaml-ld (>=1.1.10)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown
 

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/cli/main.py

@@ -136,4 +136,4 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
         raise Exit(1)
 
     else:
-        Console().print(renderable)
+        print(renderable)

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/data/graph-triples.yamlld

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

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/data/textual-browser.yaml

@@ -30,6 +30,8 @@
     "@id": iolanta:is-preferred-over
 
   ↦: iolanta:matches
+  iolanta:hasDefaultFacet:
+    "@type": "@id"
 
 "@included":
   - $id: iolanta:icon
@@ -42,26 +44,25 @@
   - $id: https://iolanta.tech/datatypes/icon
     $: Icon
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.icon.IconFacet
+      $id: pkg:pypi/iolanta#icon
       →: https://iolanta.tech/datatypes/icon
 
   - $id: np:Nanopublication
     $: Nanopublication
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_nanopublication.NanopublicationFacet
+      $id: pkg:pypi/iolanta#textual-nanopublication
       $: Nanopublication
       →: https://iolanta.tech/cli/textual
       ⪯:
-        - python://iolanta.facets.textual_default.TextualDefaultFacet
-        - python://iolanta.facets.textual_graph.GraphFacet
+        - pkg:pypi/iolanta#textual-properties
+        - pkg:pypi/iolanta#textual-graph
 
   - $id: https://iolanta.tech/cli/interactive
-    iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_browser.TextualBrowserFacet
+    iolanta:hasDefaultFacet: pkg:pypi/iolanta#textual-browser
 
-  - $id: python://iolanta.facets.textual_default.TextualDefaultFacet
+  - $id: pkg:pypi/iolanta#textual-properties
     $: Properties
-    ⪯: python://iolanta.facets.textual_default.InverseProperties
+    ⪯: pkg:pypi/iolanta#textual-inverse-properties
     →: https://iolanta.tech/cli/textual
     ↦: |
       ASK WHERE {
@@ -69,7 +70,7 @@
         FILTER (?graph != <iolanta://_meta>)
       }
 
-  - $id: python://iolanta.facets.textual_default.InverseProperties
+  - $id: pkg:pypi/iolanta#textual-inverse-properties
     $: Inverse Properties
     →: https://iolanta.tech/cli/textual
     ↦: |
@@ -80,54 +81,54 @@
 
   - $id: "urn:"
     iolanta:hasFacetByPrefix:
-      $id: python://iolanta.facets.textual_provenance.TextualProvenanceFacet
+      $id: pkg:pypi/iolanta#textual-provenance
       →: https://iolanta.tech/cli/textual
 
   - $id: https://iolanta.tech/cli/link
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_link.TextualLinkFacet
+      $id: pkg:pypi/iolanta#textual-link
 
   - $id: https://wikiba.se/ontology#Statement
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.wikibase_statement_title.WikibaseStatementTitle
+      $id: pkg:pypi/iolanta#wikibase-statement-title
       $: Title
       →: https://iolanta.tech/datatypes/title
 
   - $id: rdfs:Class
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_class.Class
+      $id: pkg:pypi/iolanta#textual-class
       $: Instances
       →: https://iolanta.tech/cli/textual
       ⪯:
-        - python://iolanta.facets.textual_browser.TextualBrowserFacet
-        - python://iolanta.facets.textual_default.InverseProperties
+        - pkg:pypi/iolanta#textual-browser
+        - pkg:pypi/iolanta#textual-inverse-properties
 
   - $id: owl:Ontology
     iolanta:hasInstanceFacet:
-      $id: python://iolanta.facets.textual_ontology.OntologyFacet
+      $id: pkg:pypi/iolanta#textual-ontology
       $: Ontology
       →: https://iolanta.tech/cli/textual
-      ⪯: python://iolanta.facets.textual_default.TextualDefaultFacet
+      ⪯: pkg:pypi/iolanta#textual-properties
 
   - $id: https://iolanta.tech/datatypes/textual-graph-triples
     $: Graph Triples
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.textual_graph_triples.GraphTriplesFacet
+      $id: pkg:pypi/iolanta#textual-graph-triples
       →: https://iolanta.tech/datatypes/textual-graph-triples
 
   - $id: https://iolanta.tech/qname
     iolanta:hasDefaultFacet:
-      $id: python://iolanta.facets.qname.QNameFacet
+      $id: pkg:pypi/iolanta#qname
 
-  - $id: python://iolanta.facets.textual_property_pairs_table.TextualPropertyPairsTableFacet
+  - $id: pkg:pypi/iolanta#textual-property-pairs
     $: Subjects → Objects
     →: https://iolanta.tech/cli/textual
     ↦: ASK WHERE { ?subject $this ?object }
 
-  - $id: python://iolanta.facets.textual_class.Class
+  - $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: python://iolanta.facets.textual_no_facet_found.TextualNoFacetFound
+    iolanta:when-no-facet-found: pkg:pypi/iolanta#textual-no-facet-found

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/facets/textual_browser/page_switcher.py

@@ -136,7 +136,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             for facet in other_facets
         ]
 
-        facet_class = iolanta.facet_resolver[facet_iri]
+        facet_class = iolanta.facet_resolver.resolve(facet_iri)
 
         facet = facet_class(
             iri=self.iri,

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/facets/textual_default/widgets.py

@@ -291,7 +291,7 @@ class LiteralPropertyValue(Widget, can_focus=True, inherit_bindings=False):
         self.property_iri = property_iri
         super().__init__()
         self.renderable = Text(   # noqa: WPS601
-            str(property_value.value),
+            str(property_value),
             style='#696969',
         )
 

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/facets/title/facets.py

@@ -9,6 +9,8 @@ PRIORITIES = [   # noqa: WPS407
     'schema_name',
     'rdfs_label',
     'foaf_name',
+    'literal_form',
+    'preferred_label',
 ]
 
 
@@ -19,7 +21,7 @@ class TitleFacet(Facet[str]):
         """Render title of a thing."""
         choices = self.stored_query(
             'title.sparql',
-            iri=self.iri,
+            iri=self.this,
             language=self.iolanta.language,
         )
 

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/facets/title/sparql/title.sparql

@@ -23,4 +23,14 @@ SELECT * WHERE {
         $iri <https://xmlns.com/foaf/0.1/name> ?foaf_name .
         FILTER (!lang(?foaf_name) || lang(?foaf_name) = $language)
     }
-}
+
+    OPTIONAL {
+        $iri <https://www.w3.org/2008/05/skos-xl#literalForm> ?literal_form .
+        FILTER (!lang(?literal_form) || lang(?literal_form) = $language)
+    }
+
+    OPTIONAL {
+        $iri <https://www.w3.org/2004/02/skos/core#prefLabel> ?preferred_label .
+        FILTER (!lang(?preferred_label) || lang(?preferred_label) = $language)
+    }
+}

{iolanta-2.0.7 → iolanta-2.1.1}/iolanta/iolanta.py

@@ -39,23 +39,17 @@ from iolanta.query_result import (
     SPARQLQueryArgument,
     format_query_bindings,
 )
+from iolanta.resolvers.base import Resolver
+from iolanta.resolvers.dispatch import SchemeDispatchResolver
+from iolanta.resolvers.pypi import PyPIResolver
 from iolanta.resolvers.python_import import PythonImportResolver
 from iolanta.sparqlspace.processor import normalize_term
 
 
 class LoggerProtocol(Protocol):
-    """
-    Abstract Logger interface.
+    """Abstract Logger interface that unites `loguru` & standard `logging`."""
 
-    Unites `loguru` & standard `logging`.
-    """
-
-    def info(   # noqa: WPS110
-        self,
-        message: str,
-        *args: Any,
-        **kwargs: Any,
-    ) -> None:
+    def info(self, message: str, *args: Any, **kwargs: Any) -> None:
         """Log an INFO message."""
 
     def error(self, message: str, *args: Any, **kwargs: Any) -> None:
@@ -85,8 +79,12 @@ class Iolanta:   # noqa: WPS214
     graph: ConjunctiveGraph = field(default_factory=_create_default_graph)
     force_plugins: List[Type[Plugin]] = field(default_factory=list)
 
-    facet_resolver: Mapping[URIRef, Type[Facet]] = field(
-        default_factory=PythonImportResolver,
+    facet_resolver: Resolver = field(
+        default_factory=functools.partial(
+            SchemeDispatchResolver,
+            python=PythonImportResolver,
+            pkg=PyPIResolver,
+        ),
     )
 
     logger: LoggerProtocol = loguru.logger
@@ -103,11 +101,7 @@ class Iolanta:   # noqa: WPS214
 
     @functools.cached_property
     def plugins(self) -> List[Plugin]:
-        """
-        Construct a list of installed plugin instances.
-
-        # FIXME: Get rid of those.
-        """
+        """Construct a list of installed plugin instances."""
         return [
             plugin_class(iolanta=self)
             for plugin_class in self.plugin_classes
@@ -118,28 +112,7 @@ class Iolanta:   # noqa: WPS214
         query_text: str,
         **kwargs: SPARQLQueryArgument,
     ) -> QueryResult:
-        """
-        Run a SPARQL `SELECT`, `CONSTRUCT`, or `ASK` query.
-
-        Args:
-            query_text: The SPARQL text;
-            **kwargs: bind variables in the query to values if necessary. For
-                example:
-
-                ```python
-                iolanta.query(
-                    'SELECT ?title WHERE { ?page rdfs:label ?title }',
-                    ?page=page_iri,
-                )
-                ```
-
-        Returns:
-            Results of the query:
-
-            - a graph for `CONSTRUCT`,
-            - a list of dicts for `SELECT`,
-            - or a boolean for `ASK`.
-        """
+        """Run a SPARQL `SELECT`, `CONSTRUCT`, or `ASK` query."""
         try:
             sparql_result: SPARQLResult = self.graph.query(
                 query_text,
@@ -231,11 +204,7 @@ class Iolanta:   # noqa: WPS214
         return self
 
     def infer(self, closure_class=None) -> 'Iolanta':
-        """
-        Apply inference.
-
-        TODO Remove this. Or use `reasonable`. Not sure.
-        """
+        """Apply inference."""
         return self
 
     def bind_namespaces(self):
@@ -258,11 +227,7 @@ class Iolanta:   # noqa: WPS214
 
     @functools.cached_property
     def context_paths(self) -> Iterable[Path]:
-        """
-        Compile list of context files.
-
-        FIXME: Get rid of those.
-        """
+        """Compile list of context files."""
         directory = Path(__file__).parent / 'data'
 
         yield directory / 'context.yaml'
@@ -272,11 +237,7 @@ class Iolanta:   # noqa: WPS214
                 yield path
 
     def add_files_from_plugins(self):
-        """
-        Load files from plugins.
-
-        FIXME: Get rid of plugins.
-        """
+        """Load files from plugins."""
         for plugin in self.plugins:
             try:
                 self.add(plugin.data_files)
@@ -285,14 +246,24 @@ class Iolanta:   # noqa: WPS214
                     f'Cannot load {plugin} plugin data files: {error}',
                 )
 
-    def __post_init__(self):
-        """
-        Load stuff from plugins.
+    @property
+    def facet_classes(self):
+        """Get all registered facet classes."""
+        return entry_points.plugins('iolanta.facets')
 
-        FIXME: Get rid of plugins.
-        """
+    def add_files_from_facets(self):
+        """Add files from all registered facets to the graph."""
+        for facet_class in self.facet_classes:
+            try:
+                self.add(facet_class.META)
+            except AttributeError:
+                pass
+
+    def __post_init__(self):
+        """Initialize after instance creation."""
         self.bind_namespaces()
         self.add_files_from_plugins()
+        self.add_files_from_facets()
         if self.project_root:
             self.add(self.project_root)
 
@@ -318,7 +289,7 @@ class Iolanta:   # noqa: WPS214
             as_datatype=as_datatype,
         ).facet_and_output_datatype
 
-        facet_class = self.facet_resolver[found['facet']]
+        facet_class = self.facet_resolver.resolve(found['facet'])
 
         facet = facet_class(
             iri=node,
@@ -375,11 +346,7 @@ class Iolanta:   # noqa: WPS214
                 ) from err
 
     def node_as_qname(self, node: Node):
-        """
-        Render node as a QName if possible.
-
-        Return the node as is, if it is not.
-        """
+        """Render node as a QName if possible."""
         qname = node_to_qname(node, self.graph)
         return f'{qname.namespace_name}:{qname.term}' if isinstance(
             qname,

iolanta-2.1.1/iolanta/mermaid/facet.py

@@ -0,0 +1,127 @@
+import functools
+from pathlib import Path
+from typing import Iterable
+
+import boltons
+import cachetools
+import funcy
+from boltons.cacheutils import cached, cachedmethod
+from pydantic import AnyUrl
+from rdflib import BNode, Literal, Node, URIRef
+
+from iolanta import Facet
+from iolanta.mermaid.models import (
+    Diagram,
+    MermaidBlankNode,
+    MermaidEdge,
+    MermaidLiteral,
+    MermaidScalar,
+    MermaidSubgraph,
+    MermaidURINode,
+)
+from iolanta.models import NotLiteralNode
+from iolanta.namespaces import DATATYPES
+
+
+def filter_edges(edges: Iterable[MermaidEdge]) -> Iterable[MermaidEdge]:
+    for edge in edges:
+        if isinstance(edge.target, MermaidLiteral) and edge.source.title == edge.target.title:
+            continue
+
+        yield edge
+
+
+def filter_nodes(edges: Iterable[MermaidEdge], except_uris: Iterable[NotLiteralNode]) -> Iterable[MermaidURINode | MermaidLiteral | MermaidBlankNode]:
+    nodes = [
+        node
+        for edge in edges
+        for node in edge.nodes
+    ]
+
+    literals_in_edges = {edge.target for edge in edges if isinstance(edge.target, MermaidLiteral)}
+    for node in nodes:
+        if isinstance(node, MermaidLiteral) and node not in literals_in_edges:
+            continue
+
+        if isinstance(node, MermaidURINode) and node.uri in except_uris:
+            continue
+
+        if isinstance(node, MermaidBlankNode) and node.node in except_uris:
+            continue
+
+        if isinstance(node, MermaidSubgraph):
+            continue
+
+        yield node
+
+
+class Mermaid(Facet[str]):
+    """Mermaid diagram."""
+
+    META = Path(__file__).parent / 'mermaid.yamlld'
+
+    def as_mermaid(self, node: Node):
+        match node:
+            case URIRef() as uri:
+                if uri in self.subgraph_uris:
+                    return MermaidSubgraph(children=[], uri=uri, title=self.render(uri, as_datatype=DATATYPES.title))
+
+                return MermaidURINode(uri=uri, url=AnyUrl(uri), title=self.render(uri, as_datatype=DATATYPES.title))
+            case Literal() as literal:
+                return MermaidLiteral(literal=literal)
+            case BNode() as bnode:
+                return MermaidBlankNode(node=bnode, title=self.render(bnode, as_datatype=DATATYPES.title))
+            case unknown:
+                unknown_type = type(unknown)
+                raise ValueError(f'Unknown something: {unknown} ({unknown_type})')
+
+    def construct_mermaid_for_graph(self, graph: URIRef) -> Iterable[MermaidScalar]:
+        """Render graph as mermaid."""
+        rows = self.stored_query('graph.sparql', this=graph)
+        edges = [
+            MermaidEdge(
+                source=self.as_mermaid(row['s']),
+                target=self.as_mermaid(row['o']),
+                title=self.render(row['p'], as_datatype=DATATYPES.title),
+                predicate=row['p'],
+            ) for row in rows
+        ]
+
+        edges = list(filter_edges(edges))
+        nodes = list(
+            filter_nodes(
+                edges=edges,
+                except_uris=self.subgraph_uris,
+            ),
+        )
+
+        return *nodes, *edges
+
+    @functools.cached_property
+    def subgraph_uris(self) -> set[NotLiteralNode]:
+        return set(
+            funcy.pluck(
+                'subgraph',
+                self.stored_query('subgraphs.sparql', this=self.this),
+            ),
+        )
+
+    def construct_mermaid_subgraphs(self) -> Iterable[MermaidSubgraph]:
+        for subgraph_uri in self.subgraph_uris:
+            children = list(self.construct_mermaid_for_graph(subgraph_uri))
+            if children:
+                title = self.render(subgraph_uri, as_datatype=DATATYPES.title)
+                yield MermaidSubgraph(
+                    children=children,
+                    uri=subgraph_uri,
+                    title=title,
+                )
+
+    def show(self) -> str:
+        """Render mermaid diagram."""
+        direct_children = self.construct_mermaid_for_graph(self.this)
+        subgraphs = self.construct_mermaid_subgraphs()
+        return str(Diagram(children=[*direct_children, *subgraphs]))
+
+
+

iolanta-2.1.1/iolanta/mermaid/mermaid.yamlld

@@ -0,0 +1,42 @@
+"@context":
+  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
+  vann: https://purl.org/vocab/vann/
+  foaf: https://xmlns.com/foaf/0.1/
+  owl: https://www.w3.org/2002/07/owl#
+  iolanta: https://iolanta.tech/
+  rdfs: "https://www.w3.org/2000/01/rdf-schema#"
+  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  dcterms: https://purl.org/dc/terms/
+  dcam: https://purl.org/dc/dcam/
+
+  iolanta:outputs:
+    "@type": "@id"
+
+  iolanta:when-no-facet-found:
+    "@type": "@id"
+
+  $: rdfs:label
+  →:
+    "@type": "@id"
+    "@id": iolanta:outputs
+
+  ⊆:
+    "@type": "@id"
+    "@id": rdfs:subClassOf
+
+  ⪯:
+    "@type": "@id"
+    "@id": iolanta:is-preferred-over
+
+  ↦: iolanta:matches
+  iolanta:hasDefaultFacet:
+    "@type": "@id"
+
+$id: pkg:pypi/iolanta#mermaid-graph
+$: Mermaid Graph
+→:
+  $id: https://iolanta.tech/datatypes/mermaid
+  $: Mermaid
+↦:
+  - ASK WHERE { GRAPH $this { ?s ?p ?o } }
+  - ASK WHERE { $this iolanta:has-sub-graph ?subgraph }