iolanta 1.2.11__tar.gz → 2.0.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.11
+Version: 2.0.1
 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)

{iolanta-1.2.11 → iolanta-2.0.1}/iolanta/cli/formatters/choose.py

@@ -7,7 +7,7 @@ from iolanta.cli.formatters.json import print_json
 from iolanta.cli.formatters.pretty import pretty_print
 from iolanta.models import QueryResultsFormat
 from iolanta.node_to_qname import node_to_qname
-from ldflex.ldflex import SelectResult
+from iolanta.query_result import SelectResult
 
 
 # @cli_print.instance(SelectResult)

{iolanta-1.2.11 → iolanta-2.0.1}/iolanta/cli/formatters/csv.py

@@ -4,7 +4,7 @@ import sys
 from classes import typeclass
 from rdflib import Graph
 
-from ldflex.ldflex import QueryResult, SelectResult
+from iolanta.query_result import QueryResult, SelectResult
 
 
 @typeclass

{iolanta-1.2.11 → iolanta-2.0.1}/iolanta/cli/formatters/json.py

@@ -4,7 +4,7 @@ import sys
 from classes import typeclass
 from rdflib import Graph
 
-from ldflex.ldflex import QueryResult, SelectResult
+from iolanta.query_result import QueryResult, SelectResult
 
 
 @typeclass

{iolanta-1.2.11 → iolanta-2.0.1}/iolanta/cli/formatters/pretty.py

@@ -1,5 +1,4 @@
 import itertools
-from datetime import date
 from typing import Union
 
 from classes import typeclass
@@ -10,7 +9,7 @@ from rich.table import Table
 
 from iolanta.cli.pretty_print import render_literal_value
 from iolanta.models import ComputedQName
-from ldflex.ldflex import QueryResult, SelectResult
+from iolanta.query_result import QueryResult, SelectResult
 
 
 @typeclass

{iolanta-1.2.11 → iolanta-2.0.1}/iolanta/cli/main.py

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

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

@@ -2,14 +2,12 @@ import inspect
 from dataclasses import dataclass, field
 from functools import cached_property
 from pathlib import Path
-from typing import Any, Generic, Iterable, List, Optional, TypeVar, Union
+from typing import Any, Generic, Iterable, 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
+from iolanta.query_result import QueryResult, SPARQLQueryArgument
 
 FacetOutput = TypeVar('FacetOutput')
 
@@ -21,18 +19,12 @@ 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:
         """Construct directory for stored queries for this facet."""
         return Path(inspect.getfile(self.__class__)).parent / 'sparql'
 
-    @property
-    def ldflex(self) -> LDFlex:
-        """Extract LDFLex instance."""
-        return self.iolanta.ldflex
-
     @cached_property
     def uriref(self) -> NotLiteralNode:
         """Format as URIRef."""
@@ -47,7 +39,7 @@ class Facet(Generic[FacetOutput]):
         **kwargs: SPARQLQueryArgument,
     ) -> QueryResult:
         """SPARQL query."""
-        return self.ldflex.query(
+        return self.iolanta.query(
             query_text=query_text,
             **kwargs,
         )
@@ -58,15 +50,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 +80,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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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.11 → iolanta-2.0.1}/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-1.2.11 → iolanta-2.0.1}/iolanta/iolanta.py

@@ -18,8 +18,10 @@ from typing import (  # noqa: WPS235
 import funcy
 import loguru
 import yaml_ld
-from rdflib import ConjunctiveGraph, Literal, Namespace, URIRef
+from pyparsing import ParseException
+from rdflib import ConjunctiveGraph, Graph, Literal, Namespace, URIRef
 from rdflib.namespace import NamespaceManager
+from rdflib.plugins.sparql.processor import SPARQLResult
 from rdflib.term import Node
 from yaml_ld.document_loaders.content_types import ParserNotFound
 from yaml_ld.errors import YAMLLDError
@@ -44,9 +46,13 @@ from iolanta.node_to_qname import node_to_qname
 from iolanta.parse_quads import parse_quads
 from iolanta.parsers.yaml import YAML
 from iolanta.plugin import Plugin
+from iolanta.query_result import (
+    QueryResult,
+    SPARQLParseException,
+    SPARQLQueryArgument,
+    format_query_bindings,
+)
 from iolanta.resolvers.python_import import PythonImportResolver
-from iolanta.stack import Stack
-from ldflex import LDFlex
 
 
 class LoggerProtocol(Protocol):
@@ -125,14 +131,56 @@ class Iolanta:   # noqa: WPS214
             for plugin_class in self.plugin_classes
         ]
 
-    @property
-    def ldflex(self) -> LDFlex:
+    def query(
+        self,
+        query_text: str,
+        **kwargs: SPARQLQueryArgument,
+    ) -> QueryResult:
         """
-        Create ldflex instance.
+        Run a SPARQL `SELECT`, `CONSTRUCT`, or `ASK` query.
 
-        FIXME: Get rid of it.
+        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`.
         """
-        return LDFlex(self.graph)
+        try:
+            sparql_result: SPARQLResult = self.graph.query(
+                query_text,
+                processor='cyberspace',
+                initBindings=kwargs,
+            )
+        except ParseException as err:
+            raise SPARQLParseException(
+                error=err,
+                query=query_text,
+            ) from err
+
+        if sparql_result.askAnswer is not None:
+            return sparql_result.askAnswer
+
+        if sparql_result.graph is not None:
+            graph: Graph = sparql_result.graph
+            for prefix, namespace in self.graph.namespaces():
+                graph.bind(prefix, namespace)
+
+            return graph
+
+        return format_query_bindings(sparql_result.bindings)
 
     @functools.cached_property
     def namespaces_to_bind(self) -> Dict[str, Namespace]:
@@ -254,12 +302,6 @@ class Iolanta:   # noqa: WPS214
         self.graph.bind(prefix='dcterms', namespace=namespaces.DCTERMS)
         self.graph.bind(prefix='rdfg', namespace=namespaces.RDFG)
 
-    @property
-    def query(self):
-        """Make a SPARQL query."""
-        self.maybe_infer()
-        return self.ldflex.query
-
     @functools.cached_property
     def context_paths(self) -> Iterable[Path]:
         """
@@ -318,7 +360,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)
 
@@ -345,7 +387,7 @@ class Iolanta:   # noqa: WPS214
         )
 
         try:
-            return facet.show(), facet.stack
+            return facet.show()
 
         except Exception as err:
             raise FacetError(

iolanta-2.0.1/iolanta/query_result.py

@@ -0,0 +1,73 @@
+from dataclasses import dataclass
+from typing import Dict, List, Mapping, Optional, Union
+
+from documented import DocumentedError
+from frozendict import frozendict
+from pyparsing import ParseException
+from rdflib import Graph
+from rdflib.term import Identifier, Node, Variable
+
+SelectRow = Mapping[str, Node]
+
+
+class SelectResult(List[SelectRow]):
+    """Result of a SPARQL SELECT."""
+
+    @property
+    def first(self) -> Optional[SelectRow]:
+        """Return first element of the list."""
+        return self[0] if self else None
+
+
+SPARQLQueryArgument = Optional[Union[Node, str, int, float]]
+
+
+QueryResult = Union[
+    SelectResult,   # SELECT
+    Graph,          # CONSTRUCT
+    bool,           # ASK
+]
+
+
+def format_query_bindings(
+    bindings: List[Dict[Variable, Identifier]],
+) -> SelectResult:
+    """
+    Format bindings before returning them.
+
+    Converts Variable to str for ease of addressing.
+    """
+    return SelectResult([
+        frozendict({
+            str(variable_name): rdf_value
+            for variable_name, rdf_value   # noqa: WPS361
+            in row.items()
+        })
+        for row in bindings
+    ])
+
+
+@dataclass
+class SPARQLParseException(DocumentedError):
+    """
+    SPARQL query is invalid.
+
+    Error:
+
+    ```
+    {self.error}
+    ```
+
+    Query:
+    ```sparql hl_lines="{self.highlight_code}"
+    {self.query}
+    ```
+    """  # noqa: D412
+
+    error: ParseException
+    query: str
+
+    @property
+    def highlight_code(self):
+        """Define lines to highlight."""
+        return self.error.lineno

{iolanta-1.2.11 → iolanta-2.0.1}/pyproject.toml

@@ -1,16 +1,11 @@
 [tool.poetry]
 name = "iolanta"
-version = "1.2.11"
+version = "2.0.1"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"
 readme = "README.md"
 
-packages = [
-  { include = "ldflex" },
-  { include = "iolanta" },
-]
-
 [tool.poetry.dependencies]
 python = ">=3.10,<4.0"
 rdflib = "<8.0"
@@ -26,7 +21,6 @@ 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.7"

iolanta-1.2.11/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)

iolanta-1.2.11/ldflex/__init__.py

@@ -1 +0,0 @@
-from ldflex.ldflex import LDFlex

iolanta-1.2.11/ldflex/ldflex.py

@@ -1,138 +0,0 @@
-from dataclasses import dataclass
-from typing import Dict, List, Mapping, Optional, Union
-
-from documented import DocumentedError
-from frozendict import frozendict
-from pyparsing import ParseException
-from rdflib import Graph
-from rdflib.plugins.sparql.processor import SPARQLResult
-from rdflib.term import Identifier, Node, Variable
-
-from iolanta.cyberspace.processor import GlobalSPARQLProcessor
-
-SelectRow = Mapping[str, Node]
-
-
-class SelectResult(List[SelectRow]):
-    """Result of a SPARQL SELECT."""
-
-    @property
-    def first(self) -> Optional[SelectRow]:
-        """Return first element of the list."""
-        return self[0] if self else None
-
-
-SPARQLQueryArgument = Optional[Union[Node, str, int, float]]
-
-
-QueryResult = Union[
-    SelectResult,   # SELECT
-    Graph,          # CONSTRUCT
-    bool,           # ASK
-]
-
-
-def _format_query_bindings(
-    bindings: List[Dict[Variable, Identifier]],
-) -> SelectResult:
-    """
-    Format bindings before returning them.
-
-    Converts Variable to str for ease of addressing.
-    """
-    return SelectResult([
-        frozendict({
-            str(variable_name): rdf_value
-            for variable_name, rdf_value
-            in row.items()
-        })
-        for row in bindings
-    ])
-
-
-@dataclass
-class SPARQLParseException(DocumentedError):
-    """
-    SPARQL query is invalid.
-
-    Error:
-
-    ```
-    {self.error}
-    ```
-
-    Query:
-    ```sparql hl_lines="{self.highlight_code}"
-    {self.query}
-    ```
-    """
-
-    error: ParseException
-    query: str
-
-    @property
-    def highlight_code(self):
-        """Define lines to highlight."""
-        return self.error.lineno
-
-
-@dataclass
-class LDFlex:
-    """Fluent interface to a semantic graph."""
-
-    graph: Graph
-
-    def query(
-        self,
-        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
-                ldflex.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`.
-        """
-        try:
-            sparql_result: SPARQLResult = self.graph.query(
-                query_text,
-                processor='cyberspace',
-                initBindings=kwargs,
-            )
-        except ParseException as err:
-            raise SPARQLParseException(
-                error=err,
-                query=query_text,
-            ) from err
-
-        if sparql_result.askAnswer is not None:
-            return sparql_result.askAnswer
-
-        if sparql_result.graph is not None:
-            graph: Graph = sparql_result.graph
-            for prefix, namespace in self.graph.namespaces():
-                graph.bind(prefix, namespace)
-
-            return graph
-
-        return _format_query_bindings(sparql_result.bindings)
-
-    def update(self, sparql_query: str):
-        """Apply the given SPARQL INSERT query."""
-        self.graph.update(sparql_query)