iolanta 2.1.14__tar.gz → 2.1.16__tar.gz

{iolanta-2.1.14 → iolanta-2.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iolanta
-Version: 2.1.14
+Version: 2.1.16
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -20,6 +20,7 @@ Requires-Dist: documented (>=0.1.1)
 Requires-Dist: dominate (>=2.6.0)
 Requires-Dist: fastmcp (>=2.12.4,<3.0.0)
 Requires-Dist: funcy (>=2.0)
+Requires-Dist: jinja2 (>=3.1.0)
 Requires-Dist: loguru (>=0.7.3)
 Requires-Dist: more-itertools (>=9.0.0)
 Requires-Dist: nanopub (>=2.1.0,<3.0.0)

iolanta-2.1.16/iolanta/entry_points.py

@@ -0,0 +1,15 @@
+import sys
+from typing import List, TypeVar
+
+PluginClass = TypeVar("PluginClass")
+
+
+if sys.version_info < (3, 10):  # pragma: no cover
+    from importlib_metadata import entry_points
+else:  # pragma: no cover
+    from importlib.metadata import entry_points
+
+
+def plugins(group_name: str) -> List[PluginClass]:
+    """List of plugin classes by group name."""
+    return [entry_point.load() for entry_point in entry_points(group=group_name)]

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/errors.py

@@ -1,11 +1,16 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from documented import DocumentedError
 from rdflib.term import Node
 
 from iolanta.models import LDContext
 
+if TYPE_CHECKING:
+    from iolanta.iolanta import Iolanta
+
 
 @dataclass
 class InsufficientDataForRender(DocumentedError):
@@ -14,7 +19,7 @@ class InsufficientDataForRender(DocumentedError):
     """
 
     node: Node
-    iolanta: 'iolanta.Iolanta'
+    iolanta: Iolanta
 
     @property
     def is_hopeless(self) -> bool:
@@ -22,9 +27,9 @@ class InsufficientDataForRender(DocumentedError):
 
         if hopeless:
             self.iolanta.logger.error(
-                '%s could not be rendered, we could not retrieve describing '
-                'data '
-                'from the Web.',
+                "%s could not be rendered, we could not retrieve describing "
+                "data "
+                "from the Web.",
                 self.node,
             )
 
@@ -52,5 +57,5 @@ class UnresolvedIRI(DocumentedError):
 
     iri: str
     prefix: str
-    file: Optional[str] = None    # noqa: WPS110
+    file: Optional[str] = None  # noqa: WPS110
     context: Optional[LDContext] = None

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/facets/facet.py

@@ -1,14 +1,19 @@
+from __future__ import annotations
+
 import inspect
 from dataclasses import dataclass, field
 from functools import cached_property
 from pathlib import Path
-from typing import Any, Generic, Optional, TypeVar, Union
+from typing import TYPE_CHECKING, Generic, Optional, TypeVar, Union
 
 from rdflib.term import Literal, Node
 
 from iolanta.models import NotLiteralNode
 from iolanta.query_result import QueryResult, SPARQLQueryArgument
 
+if TYPE_CHECKING:
+    from iolanta.iolanta import Iolanta
+
 FacetOutput = TypeVar("FacetOutput")
 
 
@@ -17,17 +22,9 @@ class Facet(Generic[FacetOutput]):  # noqa: WPS214
     """Base facet class."""
 
     this: Node
-    iolanta: "iolanta.Iolanta" = field(repr=False)
+    iolanta: Iolanta = field(repr=False)
     as_datatype: Optional[NotLiteralNode] = None
 
-    def __post_init__(self):
-        if not isinstance(self.this, Node):
-            facet_name = self.__class__.__name__
-            this_type = type(self.this).__name__
-            raise ValueError(
-                f"Facet {facet_name} received a non-Node as this: {self.this} (type: {this_type})"
-            )
-
     @property
     def stored_queries_path(self) -> Path:
         """Construct directory for stored queries for this facet."""
@@ -50,7 +47,7 @@ class Facet(Generic[FacetOutput]):  # noqa: WPS214
         self,
         node: Union[str, Node],
         as_datatype: NotLiteralNode,
-    ) -> Any:
+    ) -> object:
         """Shortcut to render something via iolanta."""
         return self.iolanta.render(
             node=node,

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/facets/textual_browser/app.py

@@ -1,5 +1,6 @@
 import logging
 from concurrent.futures import ThreadPoolExecutor
+from typing import Any, cast
 
 from rdflib.term import Node
 from rich.console import RenderableType
@@ -14,7 +15,7 @@ from iolanta.facets.textual_browser.page_switcher import (
 )
 from iolanta.iolanta import Iolanta
 
-POPUP_TIMEOUT = 30   # seconds
+POPUP_TIMEOUT = 30  # seconds
 
 
 class DevConsoleHandler(logging.Handler):
@@ -31,9 +32,10 @@ class DevConsoleHandler(logging.Handler):
         self.console.write(message)
 
 
-def _log_message_to_dev_console(app: App):
+def _log_message_to_dev_console(app: App[None]):
     """Log a message to the dev console."""
-    def log_message_to_dev_console(message: str):   # noqa: WPS430
+
+    def log_message_to_dev_console(message: str):  # noqa: WPS430
         try:
             app.query_one(DevConsole).write(message)
         except NoMatches:
@@ -42,7 +44,7 @@ def _log_message_to_dev_console(app: App):
     return log_message_to_dev_console
 
 
-class IolantaBrowser(App):  # noqa: WPS214, WPS230
+class IolantaBrowser(App[None]):  # noqa: WPS214, WPS230
     """Browse Linked Data."""
 
     def __init__(self, iolanta: Iolanta, this: Node):
@@ -53,19 +55,18 @@ class IolantaBrowser(App):  # noqa: WPS214, WPS230
         super().__init__()
 
     BINDINGS = [  # noqa: WPS115
-        ('t', 'toggle_dark', 'Toggle Dark Mode'),
-        ('q', 'quit', 'Quit'),
+        ("q", "quit", "Quit"),
     ]
 
     def compose(self) -> ComposeResult:
         """Compose widgets."""
-        yield Header(icon='👁️')
+        yield Header(icon="👁️")
         yield Footer()
-        yield ConsoleSwitcher()
+        yield ConsoleSwitcher()  # type: ignore[no-untyped-call]
 
     def on_mount(self):
         """Set title."""
-        self.title = 'Iolanta'
+        self.title = "Iolanta"
 
         logging.basicConfig(
             level=logging.INFO,
@@ -79,38 +80,36 @@ class IolantaBrowser(App):  # noqa: WPS214, WPS230
         )
 
         # Disable stderr logging, to not break the TUI.
-        # Remove only the stderr handler, keep file handler
-        for handler_id in list(self.iolanta.logger._core.handlers.keys()):
-            handler = self.iolanta.logger._core.handlers[handler_id]
-            if hasattr(handler, 'sink') and str(handler.sink) == '<stderr>':
-                self.iolanta.logger.remove(handler_id)
+        # Remove only the stderr handler, keep file handler (loguru API)
+        loguru_logger = cast(Any, self.iolanta.logger)
+        logger_core = loguru_logger._core
+        for handler_id in list(logger_core.handlers.keys()):
+            log_handler = logger_core.handlers[handler_id]
+            if hasattr(log_handler, "sink") and str(log_handler.sink) == "<stderr>":
+                loguru_logger.remove(handler_id)
 
         # Log to the dev console.
-        self.iolanta.logger.add(
+        loguru_logger.add(
             _log_message_to_dev_console(self),
-            level='INFO',
-            format='{time} {level} {message}',
+            level="INFO",
+            format="{time} {level} {message}",
         )
 
-        self.iolanta.logger.add(
+        loguru_logger.add(
             lambda msg: self.notify(
                 msg,
-                severity='warning',
+                severity="warning",
                 timeout=POPUP_TIMEOUT,
             ),
-            level='WARNING',
-            format='{message}',
+            level="WARNING",
+            format="{message}",
         )
 
-    def action_toggle_dark(self) -> None:
-        """Toggle dark mode."""
-        self.dark = not self.dark
-
     def action_goto(
         self,
-        destination: str,
+        destination: Node | str,
         facet_iri: str | None = None,
-    ):
+    ) -> None:
         """Go to an IRI."""
         self.query_one(PageSwitcher).action_goto(destination, facet_iri)
 

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/facets/textual_browser/history.py

@@ -2,16 +2,16 @@ from collections import deque
 from dataclasses import dataclass, field
 from typing import Generic, TypeVar
 
-LocationType = TypeVar('LocationType')
+LocationType = TypeVar("LocationType")
 
 
 @dataclass
 class NavigationHistory(Generic[LocationType]):
     """Navigation history."""
 
-    past: deque = field(default_factory=deque)
+    past: deque[LocationType] = field(default_factory=deque)
     current: LocationType | None = None
-    future: deque = field(default_factory=deque)
+    future: deque[LocationType] = field(default_factory=deque)
 
     def goto(self, location: LocationType) -> LocationType:
         """Go to a location."""

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/facets/textual_browser/page_switcher.py

@@ -1,3 +1,4 @@
+# noqa: WPS201
 import functools
 import threading
 import uuid
@@ -21,6 +22,8 @@ from iolanta.models import NotLiteralNode
 from iolanta.namespaces import DATATYPES
 from iolanta.widgets.mixin import IolantaWidgetMixin
 
+RENDER_IRI_WORKER_NAME = "render_iri"
+
 
 @dataclass
 class RenderResult:
@@ -37,7 +40,7 @@ class RenderResult:
     is_reload: bool
 
 
-class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
+class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214, WPS338
     """
     Container for open pages.
 
@@ -157,7 +160,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             renderable=renderable,
             flip_options=flip_options,
             facet_iri=facet_iri,
-            is_reload=is_reload,
+            is_reload=is_reload,git
         )
 
     def on_worker_state_changed(  # noqa: WPS210
@@ -208,7 +211,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     def is_loading(self) -> bool:
         """Determine if the app is presently loading something."""
         for worker in self.workers:
-            if worker.name == "render_iri":
+            if worker.name == RENDER_IRI_WORKER_NAME:
                 return True
 
         return False
@@ -229,7 +232,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             ),
             thread=True,
             exclusive=True,
-            name="render_iri",
+            name=RENDER_IRI_WORKER_NAME,
         )
         self.refresh_bindings()
 
@@ -241,7 +244,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         )
 
         for worker in self.workers:
-            if worker.name == "render_iri":
+            if worker.name == RENDER_IRI_WORKER_NAME:
                 worker.cancel()
                 break
 
@@ -268,9 +271,9 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def action_goto(
         self,
-        this: Node,
+        this: Node | str,
         facet_iri: str | None = None,
-    ):
+    ) -> None:
         """Go to an IRI."""
         # Convert string to Node if needed.
         # This happens when called via Textual action strings (from keyboard bindings
@@ -293,21 +296,23 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             ),
             thread=True,
             exclusive=True,
-            name="render_iri",
+            name=RENDER_IRI_WORKER_NAME,
         )
         self.refresh_bindings()
 
     def action_back(self):
         """Go backward."""
         self.current = self.history.back().page_id
-        if page := self.visible_content:
+        page = self.visible_content
+        if page:
             page.focus()
 
     def action_forward(self):
         """Go forward."""
         self.current = self.history.forward().page_id
         self.focus()
-        if page := self.visible_content:
+        page = self.visible_content
+        if page:
             page.focus()
 
 
@@ -330,7 +335,7 @@ class ConsoleSwitcher(ContentSwitcher):
 class DevConsole(RichLog):
     """Development console."""
 
-    BINDINGS = [
+    BINDINGS = [  # noqa: WPS115
         ("f12,escape", "close", "Close Console"),
     ]
 

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/node_to_qname.py

@@ -22,16 +22,16 @@ def _object_to_qname(node: URIRef, graph: Graph):
 @node_to_qname.instance(URIRef)
 def _uriref_to_qname(node: URIRef, graph: Graph):
     try:
-        qname = ComputedQName(*graph.compute_qname(node))   # type: ignore
+        qname = ComputedQName(*graph.compute_qname(node))
 
     except ValueError:
         return node
 
     except NameError as err:
-        logger.exception(f'NameError! On: {node} Error: {err}')
+        logger.exception(f"NameError! On: {node} Error: {err}")
         return node
 
-    if qname.namespace_name.startswith('ns'):
+    if qname.namespace_name.startswith("ns"):
         return node
 
     return qname

{iolanta-2.1.14 → iolanta-2.1.16}/iolanta/plugin.py

@@ -1,43 +1,44 @@
+from __future__ import annotations
+
 import inspect
 from abc import ABC
 from dataclasses import dataclass, field
 from logging import Logger
 from pathlib import Path
-from typing import List, Optional
-
-from rdflib.term import Node
-from typer import Typer
+from typing import TYPE_CHECKING, Optional
 
 from iolanta.models import TripleTemplate
 
+if TYPE_CHECKING:
+    from typer import Typer  # noqa: F401
+
+    from iolanta.iolanta import Iolanta
+
 
 @dataclass
 class Plugin(ABC):
     """Base Iolanta plugin."""
 
-    iolanta: 'iolanta.Iolanta' = field(repr=False)
+    iolanta: Iolanta = field(repr=False)
 
     @property
     def logger(self) -> Logger:
         return self.iolanta.logger
 
-    @property
-    def typer_app(self) -> Optional[Typer]:
-        """Typer app for this plugin's CLI."""
-        return None
-
     @property
     def files_directory(self) -> Path:
-        return Path(inspect.getfile(self.__class__)).parent / 'data'
+        return Path(inspect.getfile(self.__class__)).parent / "data"
 
     @property
     def context_path(self) -> Optional[Path]:
-        if (context_path := self.files_directory / 'context.yaml').is_file():
+        context_path = self.files_directory / "context.yaml"
+        if context_path.is_file():
             return context_path
 
     @property
-    def data_files(self):
+    def data_files(self) -> Path:
+        """Directory containing plugin data files."""
         return self.files_directory
 
-    def retrieve_triple(self, triple_template: TripleTemplate):
+    def retrieve_triple(self, triple_template: TripleTemplate) -> None:
         """Save datasets which might describe the given node into project."""

{iolanta-2.1.14 → iolanta-2.1.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iolanta"
-version = "2.1.14"
+version = "2.1.16"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"
@@ -8,6 +8,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">=3.12,<4.0"
+jinja2 = ">=3.1.0"
 rdflib = "<8.0"
 python-frontmatter = ">=0.5.0"
 requests = ">=2.25.1"

iolanta-2.1.14/iolanta/entry_points.py

@@ -1,18 +0,0 @@
-import sys
-from typing import List, Type, TypeVar
-
-PluginClass = TypeVar('PluginClass')
-
-
-if sys.version_info < (3, 10):    # pragma: no cover
-    from importlib_metadata import entry_points
-else:    # pragma: no cover
-    from importlib.metadata import entry_points
-
-
-def plugins(group_name: str) -> List[PluginClass]:
-    """List of plugin classes by group name."""
-    return [
-        entry_point.load()  # type: ignore
-        for entry_point in entry_points(group=group_name)  # type: ignore
-    ]