iolanta 1.2.10__tar.gz → 2.0.0__tar.gz

{iolanta-1.2.10 → iolanta-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.10
+Version: 2.0.0
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -19,7 +19,6 @@ Requires-Dist: diskcache (>=5.6.3)
 Requires-Dist: documented (>=0.1.1)
 Requires-Dist: dominate (>=2.6.0)
 Requires-Dist: funcy (>=2.0)
-Requires-Dist: iolanta-tables (>=0.1.7,<0.2.0) ; extra == "all"
 Requires-Dist: loguru (>=0.7.3)
 Requires-Dist: more-itertools (>=9.0.0)
 Requires-Dist: nanopub (>=2.0.1)
@@ -33,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.5)
+Requires-Dist: yaml-ld (>=1.1.7)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown
 

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/cli/main.py

@@ -111,8 +111,8 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
         )
 
     try:
-        renderable, stack = iolanta.render(
-            node=node,
+        renderable = iolanta.render(
+            node=URIRef(node),
             as_datatype=URIRef(as_datatype),
         )
 

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/cyberspace/processor.py

@@ -465,9 +465,9 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         ))
 
     def _follow_is_visualized_with_links(self, uri: URIRef):
-        """Follow `iolanta:is-visualized-with` links."""
+        """Follow `dcterms:isReferencedBy` links."""
         self.logger.info(f'Following links for {uri}…')
-        triples = self.graph.triples((uri, IOLANTA['visualized-with'], None))
+        triples = self.graph.triples((uri, DCTERMS.isReferencedBy, None))
         for _, _, visualization in triples:
             if isinstance(visualization, URIRef):
                 self.load(visualization)
@@ -630,7 +630,7 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             quads = list(
                 parse_quads(
                     quads_document=ld_rdf,
-                    graph=source,  # type: ignore
+                    graph=source_uri,
                     blank_node_prefix=str(source),
                 ),
             )

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/facet.py

@@ -7,7 +7,6 @@ from typing import Any, Generic, Iterable, List, Optional, TypeVar, Union
 from rdflib.term import BNode, Literal, Node, URIRef
 
 from iolanta.models import NotLiteralNode, Triple, TripleTemplate
-from iolanta.stack import Stack
 from ldflex import LDFlex
 from ldflex.ldflex import QueryResult, SPARQLQueryArgument
 
@@ -21,7 +20,6 @@ class Facet(Generic[FacetOutput]):
     iri: NotLiteralNode
     iolanta: 'iolanta.Iolanta' = field(repr=False)
     as_datatype: Optional[NotLiteralNode] = None
-    stack_children: List[Stack] = field(default_factory=list, repr=False)
 
     @property
     def stored_queries_path(self) -> Path:
@@ -58,15 +56,11 @@ class Facet(Generic[FacetOutput]):
         as_datatype: NotLiteralNode,
     ) -> Any:
         """Shortcut to render something via iolanta."""
-        rendered, stack = self.iolanta.render(
+        return self.iolanta.render(
             node=node,
             as_datatype=as_datatype,
         )
 
-        self.stack_children.append(stack)
-
-        return rendered
-
     def render_all(
         self,
         node: Node,
@@ -92,19 +86,6 @@ class Facet(Generic[FacetOutput]):
         """Preferred language for Iolanta output."""
         return self.iolanta.language
 
-    @property
-    def stack(self):
-        """
-        Return stack.
-
-        FIXME: I have no idea. Maybe delete this nonsense.
-        """
-        return Stack(
-            node=self.iri,
-            facet=self,
-            children=self.stack_children,
-        )
-
     def find_triple(
         self,
         triple: TripleTemplate,

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/page_title.py

@@ -29,7 +29,7 @@ class PageTitle(IolantaWidgetMixin, Static):
         return self.iolanta.render(
             self.iri,
             as_datatype=DATATYPES.title,
-        )[0]
+        )
 
     def on_mount(self):
         """Initialize rendering of a title."""

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_browser/page_switcher.py

@@ -131,7 +131,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
                     self.iolanta.render,
                     facet,
                     as_datatype=DATATYPES.title,
-                )[0],
+                ),
             )
             for facet in other_facets
         ]

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_class/facets.py

@@ -103,7 +103,7 @@ class InstancesList(ListView):   # noqa: WPS214
                 self.app.iolanta.render(
                     instance_item.node,
                     as_datatype=DATATYPES.title,
-                )[0],
+                ),
             )
 
     def stream_instance_items_chunk(

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_default/widgets.py

@@ -60,7 +60,7 @@ 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)[0]
+        return self.app.iolanta.render(self.iri, DATATYPES.title)
 
     def render(self) -> RenderResult:
         """Render node title."""
@@ -202,7 +202,7 @@ class PropertiesContainer(Vertical):
             widget.renderable = self.app.iolanta.render(
                 widget.iri,
                 as_datatype=DATATYPES.title,
-            )[0]
+            )
 
     def on_mount(self):
         """Initiate rendering in the background."""

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_graph/facets.py

@@ -22,7 +22,7 @@ class GraphFacet(Facet[Widget]):
         triples_view = self.iolanta.render(
             self.iri,
             as_datatype=DATATYPES['textual-graph-triples'],
-        )[0]
+        )
 
         return VerticalScroll(
             PageTitle(self.iri, extra=f'({triple_count} triples)'),

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_graph_triples.py

@@ -121,7 +121,7 @@ class TriplesView(IolantaWidgetMixin, Vertical):
                 term_view.renderable = self.iolanta.render(
                     term_view.uri,
                     as_datatype=term_view.as_datatype,
-                )[0]
+                )
 
 
 class GraphTriplesFacet(Facet[Widget]):

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_nanopublication/nanopublication_widget.py

@@ -61,7 +61,7 @@ class NanopublicationScreen(IolantaWidgetMixin, VerticalScroll):
         yield self.iolanta.render(
             row['assertion'],
             as_datatype=DATATYPES['textual-graph-triples'],
-        )[0]
+        )
 
         provenance = []
         if row.get('author'):

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/facets/textual_nanopublication/term_list_widget.py

@@ -36,4 +36,4 @@ class TermList(IolantaWidgetMixin, Horizontal):
             child.renderable = self.iolanta.render(
                 child.uri,
                 as_datatype=child.as_datatype,
-            )[0]
+            )

iolanta-2.0.0/iolanta/facets/textual_ontology/sparql/visualization-vocab.sparql

@@ -0,0 +1,3 @@
+SELECT ?vocab WHERE {
+    ?iri dcterms:isReferencedBy ?vocab .
+}

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/iolanta.py

@@ -45,7 +45,6 @@ from iolanta.parse_quads import parse_quads
 from iolanta.parsers.yaml import YAML
 from iolanta.plugin import Plugin
 from iolanta.resolvers.python_import import PythonImportResolver
-from iolanta.stack import Stack
 from ldflex import LDFlex
 
 
@@ -300,9 +299,7 @@ class Iolanta:   # noqa: WPS214
                 self.add(plugin.data_files)
             except Exception as error:
                 self.logger.error(
-                    'Cannot load %s plugin data files: %s',
-                    plugin,
-                    error,
+                    f'Cannot load {plugin} plugin data files: {error}',
                 )
 
     def __post_init__(self):
@@ -320,7 +317,7 @@ class Iolanta:   # noqa: WPS214
         self,
         node: Node,
         as_datatype: NotLiteralNode,
-    ) -> Tuple[Any, Stack]:
+    ) -> Any:
         """Find an Iolanta facet for a node and render it."""
         node = normalize_term(node)
 
@@ -347,7 +344,7 @@ class Iolanta:   # noqa: WPS214
         )
 
         try:
-            return facet.show(), facet.stack
+            return facet.show()
 
         except Exception as err:
             raise FacetError(

{iolanta-1.2.10 → iolanta-2.0.0}/iolanta/parse_quads.py

@@ -23,7 +23,6 @@ def parse_term(   # noqa: C901
     term_value = term['value']
 
     if term_type == 'IRI':
-        raise_if_term_is_qname(term_value)
         return URIRef(term_value)
 
     if term_type == 'literal':

{iolanta-1.2.10 → iolanta-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iolanta"
-version = "1.2.10"
+version = "2.0.0"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"
@@ -26,10 +26,9 @@ owlrl = ">=6.0.2"
 funcy = ">=2.0"
 rich = ">=13.3.1"
 textual = ">=0.83.0"
-iolanta-tables = {version = "^0.1.7", optional = true}
 yarl = ">=1.9.4"
 boltons = ">=24.0.0"
-yaml-ld = ">=1.1.5"
+yaml-ld = ">=1.1.7"
 reasonable = ">=0.2.6"
 oxrdflib = ">=0.4.0"
 loguru = ">=0.7.3"

iolanta-1.2.10/iolanta/facets/textual_ontology/sparql/visualization-vocab.sparql

@@ -1,3 +0,0 @@
-SELECT ?vocab WHERE {
-    ?iri iolanta:visualized-with ?vocab .
-}

iolanta-1.2.10/iolanta/stack.py

@@ -1,11 +0,0 @@
-from dataclasses import dataclass, field
-from typing import List
-
-from rdflib.term import Node
-
-
-@dataclass
-class Stack:
-    node: Node
-    facet: 'iolanta.facets.facet.Facet'
-    children: List['Stack'] = field(default_factory=list)