iolanta 1.2.6__py3-none-any.whl → 1.2.8__py3-none-any.whl

iolanta/cli/main.py

@@ -1,17 +1,20 @@
 import locale
 import logging
+from pathlib import Path
 from typing import Annotated
 
 import loguru
 import platformdirs
 from documented import DocumentedError
-from rdflib import Literal
+from rdflib import Literal, URIRef
 from rich.console import Console
 from rich.markdown import Markdown
 from typer import Argument, Exit, Option, Typer
+from yarl import URL
 
 from iolanta.cli.models import LogLevel
 from iolanta.iolanta import Iolanta
+from iolanta.models import NotLiteralNode
 
 DEFAULT_LANGUAGE = locale.getlocale()[0].split('_')[0]
 
@@ -38,8 +41,24 @@ def construct_app() -> Typer:
 app = construct_app()
 
 
+def string_to_node(name: str) -> NotLiteralNode:
+    """
+    Parse a string into a node identifier.
+
+    String might be:
+      * a URL,
+      * or a local disk path.
+    """
+    url = URL(name)
+    if url.scheme:
+        return URIRef(name)
+
+    path = Path(name).absolute()
+    return URIRef(f'file://{path}')
+
+
 @app.command(name='browse')
-def render_command(   # noqa: WPS231, WPS238
+def render_command(   # noqa: WPS231, WPS238, WPS210, C901
     url: Annotated[str, Argument()],
     as_datatype: Annotated[
         str, Option(
@@ -74,17 +93,27 @@ def render_command(   # noqa: WPS231, WPS238
         enqueue=True,
     )
 
-    iolanta: Iolanta = Iolanta(
-        language=Literal(language),
-        logger=logger,
-    )
+    node_url = URL(url)
+    if node_url.scheme:
+        node = URIRef(url)
 
-    node = iolanta.string_to_node(url)
+        iolanta: Iolanta = Iolanta(
+            language=Literal(language),
+            logger=logger,
+        )
+    else:
+        path = Path(url).absolute()
+        node = URIRef(f'file://{path}')
+        iolanta: Iolanta = Iolanta(
+            language=Literal(language),
+            logger=logger,
+            project_root=path,
+        )
 
     try:
         renderable, stack = iolanta.render(
             node=node,
-            as_datatype=iolanta.string_to_node(as_datatype),
+            as_datatype=URIRef(as_datatype),
         )
 
     except DocumentedError as documented_error:

iolanta/cyberspace/processor.py

@@ -131,6 +131,10 @@ def _extract_from_mapping(  # noqa: WPS213
             yield from extract_mentioned_urls(algebra['p2'])
             yield from extract_mentioned_urls(algebra['expr'])
 
+        case 'Join':
+            yield from extract_mentioned_urls(algebra['p1'])
+            yield from extract_mentioned_urls(algebra['p2'])
+
         case 'ConditionalOrExpression' | 'ConditionalAndExpression':
             yield from extract_mentioned_urls(algebra['expr'])
             yield from extract_mentioned_urls(algebra['other'])
@@ -149,10 +153,8 @@ def _extract_from_mapping(  # noqa: WPS213
         case unknown_name:
             formatted_keys = ', '.join(algebra.keys())
             loguru.logger.error(
-                'Unknown SPARQL expression %s(%s): %s',
-                unknown_name,
-                formatted_keys,
-                algebra,
+                'Unknown SPARQL expression '
+                f'{unknown_name}({formatted_keys}): {algebra}',
             )
             return
 
@@ -422,7 +424,7 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                         and isinstance(self.load(maybe_iri), Loaded)
                     ):
                         is_anything_loaded = True   # noqa: WPS220
-                        self.logger.warning(   # noqa: WPS220
+                        self.logger.info(   # noqa: WPS220
                             'Newly loaded: {uri}',
                             uri=maybe_iri,
                         )
@@ -463,6 +465,8 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         )
         if existing_triple is not None:
             return Skipped()
+        else:
+            self.logger.info(f'Existing triples not found for {source_uri}')
 
         # FIXME This is definitely inefficient. However, python-yaml-ld caches
         #   the document, so the performance overhead is not super high.
@@ -563,10 +567,10 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             )
             return Loaded()
         except ParserNotFound as parser_not_found:
-            self.logger.info('%s | %s', source, str(parser_not_found))
+            self.logger.info(f'{source} | {parser_not_found}')
             return Loaded()
         except YAMLLDError as yaml_ld_error:
-            self.logger.error('%s | %s', source, str(yaml_ld_error))
+            self.logger.error(f'{source} | {yaml_ld_error}')
             return Loaded()
 
         try:
@@ -604,32 +608,13 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         self.graph.addN(quad_tuples)
         self.graph.last_not_inferred_source = source
 
-        created_graphs = {
-            normalize_term(quad.graph)
+        into_graphs = ', '.join({
+            quad.graph
             for quad in quads
-            if quad.graph != source_uri
-        }
-        self.graph.addN(
-            itertools.chain.from_iterable(
-                [
-                    (
-                        source_uri,
-                        IOLANTA['has-sub-graph'],
-                        created_graph,
-                        source_uri,
-                    ),
-                    (
-                        created_graph,
-                        RDF.type,
-                        IOLANTA.Graph,
-                        source_uri,
-                    ),
-                ]
-                for created_graph in created_graphs
-            ),
+        })
+        self.logger.info(
+            f'{source} | loaded successfully into graphs: {into_graphs}',
         )
-
-        self.logger.info(f'{source} | loaded successfully.')
         return Loaded()
 
     def resolve_term(self, term: Node, bindings: dict[str, Node]):

iolanta/facets/page_title.py

@@ -22,8 +22,7 @@ class PageTitle(IolantaWidgetMixin, Static):
         """Initialize."""
         self.iri = iri
         self.extra = extra
-        qname = self.iolanta.node_as_qname(iri)
-        super().__init__(qname)
+        super().__init__(iri)
 
     def construct_title(self):
         """Render the title via Iolanta in a thread."""

iolanta/facets/textual_browser/app.py

@@ -4,6 +4,7 @@ from concurrent.futures import ThreadPoolExecutor
 from rdflib.term import Node
 from rich.console import RenderableType
 from textual.app import App, ComposeResult
+from textual.css.query import NoMatches
 from textual.widgets import Footer, Header
 
 from iolanta.facets.textual_browser.page_switcher import (
@@ -13,6 +14,8 @@ from iolanta.facets.textual_browser.page_switcher import (
 )
 from iolanta.iolanta import Iolanta
 
+POPUP_TIMEOUT = 30   # seconds
+
 
 class DevConsoleHandler(logging.Handler):
     """Pipe log output → dev console."""
@@ -28,6 +31,17 @@ class DevConsoleHandler(logging.Handler):
         self.console.write(message)
 
 
+def _log_message_to_dev_console(app: App):
+    """Log a message to the dev console."""
+    def log_message_to_dev_console(message: str):   # noqa: WPS430
+        try:
+            app.query_one(DevConsole).write(message)
+        except NoMatches:
+            return
+
+    return log_message_to_dev_console
+
+
 class IolantaBrowser(App):  # noqa: WPS214, WPS230
     """Browse Linked Data."""
 
@@ -69,11 +83,21 @@ class IolantaBrowser(App):  # noqa: WPS214, WPS230
 
         # Log to the dev console.
         self.iolanta.logger.add(
-            lambda msg: self.query_one(DevConsole).write(msg),
+            _log_message_to_dev_console(self),
             level='INFO',
             format='{time} {level} {message}',
         )
 
+        self.iolanta.logger.add(
+            lambda msg: self.notify(
+                msg,
+                severity='warning',
+                timeout=POPUP_TIMEOUT,
+            ),
+            level='WARNING',
+            format='{message}',
+        )
+
     def action_toggle_dark(self) -> None:
         """Toggle dark mode."""
         self.dark = not self.dark

iolanta/facets/textual_browser/location.py

@@ -1,5 +1,7 @@
 from dataclasses import dataclass
 
+from rdflib import URIRef
+
 
 @dataclass
 class Location:
@@ -7,3 +9,4 @@ class Location:
 
     page_id: str
     url: str
+    facet_iri: URIRef | None = None

iolanta/facets/textual_browser/page_switcher.py

@@ -1,6 +1,10 @@
 import functools
+import threading
 import uuid
+from dataclasses import dataclass
+from typing import Any
 
+import watchfiles
 from rdflib import BNode, URIRef
 from textual.widgets import ContentSwitcher, RichLog
 from textual.worker import Worker, WorkerState
@@ -18,6 +22,21 @@ from iolanta.namespaces import DATATYPES
 from iolanta.widgets.mixin import IolantaWidgetMixin
 
 
+@dataclass
+class RenderResult:
+    """
+    We asked a thread to render something for us.
+
+    This is what did we get back.
+    """
+
+    iri: NotLiteralNode
+    renderable: Any
+    flip_options: list[FlipOption]
+    facet_iri: URIRef
+    is_reload: bool
+
+
 class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     """
     Container for open pages.
@@ -28,12 +47,15 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     BINDINGS = [  # noqa: WPS115
         ('alt+left', 'back', 'Back'),
         ('alt+right', 'forward', 'Fwd'),
+        ('f5', 'reload', '🔄 Reload'),
+        ('escape', 'abort', '🛑 Abort'),
         ('f12', 'console', 'Console'),
     ]
 
     def __init__(self):
         """Set Home as first tab."""
         super().__init__(id='page_switcher', initial='home')
+        self.stop_file_watcher_event = threading.Event()
 
     def action_console(self):
         """Open dev console."""
@@ -53,22 +75,39 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     def on_mount(self):
         """Navigate to the initial page."""
         self.action_goto(self.app.iri)
+        if self.iolanta.project_root:
+            self.run_worker(
+                self._watch_files,
+                thread=True,
+            )
+
+    def on_unmount(self) -> None:
+        """Stop watching files."""
+        self.stop_file_watcher_event.set()
+
+    def _watch_files(self):
+        for _ in watchfiles.watch(   # noqa: WPS352
+            self.iolanta.project_root,
+            stop_event=self.stop_file_watcher_event,
+        ):
+            self.app.call_from_thread(self.action_reload)
 
     def render_iri(   # noqa: WPS210
-        self, destination: NotLiteralNode, facet_iri: URIRef | None,
-    ):
+        self,
+        destination: NotLiteralNode,
+        facet_iri: URIRef | None,
+        is_reload: bool,
+    ) -> RenderResult:
         """Render an IRI in a thread."""
         self.iri = destination
         iolanta: Iolanta = self.iolanta
 
         as_datatype = URIRef('https://iolanta.tech/cli/textual')
-        choices = self.app.call_from_thread(
-            FacetFinder(
-                iolanta=self.iolanta,
-                node=destination,
-                as_datatype=as_datatype,
-            ).choices,
-        )
+        choices = FacetFinder(
+            iolanta=self.iolanta,
+            node=destination,
+            as_datatype=as_datatype,
+        ).choices()
 
         if not choices:
             raise FacetNotFound(
@@ -106,11 +145,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         )
 
         try:
-            return (
-                destination,
-                self.app.call_from_thread(facet.show),
-                flip_options,
-            )
+            renderable = facet.show()
 
         except Exception as err:
             raise FacetError(
@@ -119,6 +154,14 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
                 error=err,
             ) from err
 
+        return RenderResult(
+            iri=destination,
+            renderable=renderable,
+            flip_options=flip_options,
+            facet_iri=facet_iri,
+            is_reload=is_reload,
+        )
+
     def on_worker_state_changed(   # noqa: WPS210
         self,
         event: Worker.StateChanged,
@@ -126,24 +169,98 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         """Render a page as soon as it is ready."""
         match event.state:
             case WorkerState.SUCCESS:
-                iri, renderable, flip_options = event.worker.result
-                page_uid = uuid.uuid4().hex
-                page_id = f'page_{page_uid}'
-                page = Page(
-                    renderable,
-                    iri=iri,
-                    page_id=page_id,
-                    flip_options=flip_options,
-                )
-                self.mount(page)
-                self.current = page_id
-                page.focus()
-                self.history.goto(Location(page_id, iri))
-                self.app.sub_title = iri
+                render_result: RenderResult = event.worker.result
+
+                if render_result.is_reload:
+                    # We are reloading the current page.
+                    current_page = self.query_one(f'#{self.current}', Page)
+                    current_page.remove_children()
+                    current_page.mount(render_result.renderable)
+
+                    # FIXME: This does not actually change the flip options,
+                    #   but maybe that's okay
+                    current_page.flip_options = render_result.flip_options
+
+                else:
+                    # We are navigating to a new page.
+                    page_uid = uuid.uuid4().hex
+                    page_id = f'page_{page_uid}'
+                    page = Page(
+                        render_result.renderable,
+                        iri=render_result.iri,
+                        page_id=page_id,
+                        flip_options=render_result.flip_options,
+                    )
+                    self.mount(page)
+                    self.current = page_id
+                    page.focus()
+                    self.history.goto(
+                        Location(
+                            page_id,
+                            url=render_result.iri,
+                            facet_iri=render_result.facet_iri,
+                        ),
+                    )
+                    self.app.sub_title = render_result.iri
 
             case WorkerState.ERROR:
                 raise ValueError(event)
 
+    @property
+    def is_loading(self) -> bool:
+        """Determine if the app is presently loading something."""
+        for worker in self.workers:
+            if worker.name == 'render_iri':
+                return True
+
+        return False
+
+    def action_reload(self):
+        """Reset Iolanta graph and re-render current view."""
+        self.iolanta.reset()
+
+        self.run_worker(
+            functools.partial(
+                self.render_iri,
+                destination=self.history.current.url,
+                facet_iri=self.history.current.facet_iri,
+                is_reload=True,
+            ),
+            thread=True,
+            exclusive=True,
+            name='render_iri',
+        )
+        self.refresh_bindings()
+
+    def action_abort(self):
+        """Abort loading."""
+        self.notify(
+            'Aborted.',
+            severity='warning',
+        )
+
+        for worker in self.workers:
+            if worker.name == 'render_iri':
+                worker.cancel()
+                break
+
+        self.refresh_bindings()
+
+    def check_action(
+        self,
+        action: str,
+        parameters: tuple[object, ...],   # noqa: WPS110
+    ) -> bool | None:
+        """Check if action is available."""
+        is_loading = self.is_loading
+        match action:
+            case 'reload':
+                return not is_loading
+            case 'abort':
+                return is_loading
+
+        return True
+
     def action_goto(
         self,
         destination: str,
@@ -158,19 +275,25 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         self.run_worker(
             functools.partial(
                 self.render_iri,
-                iri,
-                facet_iri and URIRef(facet_iri),
+                destination=iri,
+                facet_iri=facet_iri and URIRef(facet_iri),
+                is_reload=False,
             ),
             thread=True,
+            exclusive=True,
+            name='render_iri',
         )
+        self.refresh_bindings()
 
     def action_back(self):
         """Go backward."""
         self.current = self.history.back().page_id
+        self.focus()
 
     def action_forward(self):
         """Go forward."""
         self.current = self.history.forward().page_id
+        self.focus()
 
 
 class ConsoleSwitcher(ContentSwitcher):

iolanta/facets/textual_default/facets.py

@@ -58,6 +58,7 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
         for property_iri, property_values in self.grouped_properties.items():
             property_name = PropertyName(
                 iri=property_iri,
+                qname=self.iolanta.node_as_qname(property_iri),
             )
 
             property_values = [
@@ -69,6 +70,7 @@ class TextualDefaultFacet(Facet[Widget]):   # noqa: WPS214
                     property_value=property_value,
                     subject=self.iri,
                     property_iri=property_iri,
+                    property_qname=self.iolanta.node_as_qname(property_iri),
                 )
                 for property_value in property_values
             ]

iolanta/facets/textual_default/widgets.py

@@ -48,11 +48,11 @@ class PropertyName(Widget, can_focus=True, inherit_bindings=False):
     def __init__(
         self,
         iri: NotLiteralNode,
+        qname: str,
     ):
         """Set the IRI."""
         self.iri = iri
         super().__init__()
-        qname = self.app.iolanta.node_as_qname(iri)
         self.renderable = Text(  # noqa: WPS601
             f'⏳ {qname}',
             style='#696969',
@@ -130,17 +130,15 @@ class PropertyValue(Widget, can_focus=True, inherit_bindings=False):
         property_value: Node,
         subject: NotLiteralNode,
         property_iri: NotLiteralNode,
+        property_qname: str,
     ):
         """Initialize parameters for rendering, navigation, & provenance."""
         self.property_value = property_value
         self.subject = subject
         self.property_iri = property_iri
         super().__init__()
-        qname = self.app.iolanta.node_as_qname(  # noqa: WPS601
-            property_value,
-        )
         self.renderable = Text(  # noqa: WPS601
-            f'⏳ {qname}',
+            f'⏳ {property_qname}',
             style='#696969',
         )
 

iolanta/facets/textual_provenance/facets.py

@@ -80,18 +80,19 @@ class ProvenanceView(Vertical):
         """Build page structure."""
         yield Title('Provenan©e for a triple')
 
+        # TODO: Calculate QNames somehow.
         yield PropertyRow(
-            PropertyName(RDF.subject),
+            PropertyName(RDF.subject, qname=str(RDF.subject)),
             RDFTermView(self.triple.subject),
         )
 
         yield PropertyRow(
-            PropertyName(RDF.predicate),
+            PropertyName(RDF.predicate, qname=str(RDF.predicate)),
             RDFTermView(self.triple.predicate),
         )
 
         yield PropertyRow(
-            PropertyName(RDF.object),
+            PropertyName(RDF.object, qname=str(RDF.object)),
             RDFTermView(self.triple.object),
         )
 

iolanta/iolanta.py

@@ -2,6 +2,7 @@ import functools
 from dataclasses import dataclass, field, replace
 from pathlib import Path
 from typing import (  # noqa: WPS235
+    Annotated,
     Any,
     Dict,
     Iterable,
@@ -30,7 +31,6 @@ from iolanta.errors import UnresolvedIRI
 from iolanta.facets.errors import FacetError
 from iolanta.facets.facet import Facet
 from iolanta.facets.locator import FacetFinder
-from iolanta.loaders import Loader
 from iolanta.loaders.base import SourceType
 from iolanta.loaders.local_directory import merge_contexts
 from iolanta.models import (
@@ -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.shortcuts import construct_root_loader
 from iolanta.stack import Stack
 from ldflex import LDFlex
 
@@ -72,19 +71,24 @@ class LoggerProtocol(Protocol):
         """Log a WARNING message."""
 
 
+def _create_default_graph():
+    return ConjunctiveGraph(identifier=namespaces.LOCAL.term('_inference'))
+
+
 @dataclass
 class Iolanta:   # noqa: WPS214
     """Iolanta is a Semantic web browser."""
 
     language: Literal = Literal('en')
 
-    retrieval_directory: Optional[Path] = None
-    graph: ConjunctiveGraph = field(
-        default_factory=functools.partial(
-            ConjunctiveGraph,
-            identifier=namespaces.LOCAL.term('_inference'),
+    project_root: Annotated[
+        Path | None,
+        (
+            'File or directory the contents of which '
+            'Iolanta will automatically load into the graph.'
         ),
-    )
+    ] = None
+    graph: ConjunctiveGraph = field(default_factory=_create_default_graph)
     force_plugins: List[Type[Plugin]] = field(default_factory=list)
 
     facet_resolver: Mapping[URIRef, Type[Facet]] = field(
@@ -104,15 +108,6 @@ class Iolanta:   # noqa: WPS214
         init=False,
     )
 
-    @functools.cached_property
-    def loader(self) -> Loader[SourceType]:
-        """
-        Construct loader.
-
-        FIXME: Delete this.
-        """
-        return construct_root_loader(logger=self.logger)
-
     @property
     def plugin_classes(self) -> List[Type[Plugin]]:
         """Installed Iolanta plugins."""
@@ -130,7 +125,7 @@ class Iolanta:   # noqa: WPS214
             for plugin_class in self.plugin_classes
         ]
 
-    @functools.cached_property
+    @property
     def ldflex(self) -> LDFlex:
         """
         Create ldflex instance.
@@ -156,45 +151,45 @@ class Iolanta:   # noqa: WPS214
             )
         }
 
-    def add(  # noqa: C901, WPS231, WPS210
+    def reset(self):
+        """Reset Iolanta graph."""
+        self.graph = _create_default_graph()   # noqa: WPS601
+        self.__post_init__()
+
+    def add(  # noqa: C901, WPS231, WPS210, WPS213
         self,
         source: Path,
         context: Optional[LDContext] = None,
         graph_iri: Optional[URIRef] = None,
     ) -> 'Iolanta':
-        """
-        Parse & load information from given URL into the graph.
-
-        FIXME:
-          * Maybe implement context.json/context.yaml files support.
-        """
+        """Parse & load information from given URL into the graph."""
         self.logger.info(f'Adding to graph: {source}')
         self.sources_added_not_yet_inferred.append(source)
 
         if not isinstance(source, Path):
             source = Path(source)
 
-        for source_file in source.rglob('*'):
+        for source_file in list(source.rglob('*')) or [source]:
             if source_file.is_dir():
                 continue
 
             try:  # noqa: WPS225
                 ld_rdf = yaml_ld.to_rdf(source_file)
             except ConnectionError as name_resolution_error:
-                self.logger.info(
+                self.logger.warning(
                     '%s | name resolution error: %s',
                     source_file,
                     str(name_resolution_error),
                 )
                 continue
             except ParserNotFound as parser_not_found:
-                self.logger.info(f'{source} | {parser_not_found}')
+                self.logger.error(f'{source} | {parser_not_found}')
                 continue
             except YAMLLDError as yaml_ld_error:
-                self.logger.info(f'{source} | {yaml_ld_error}')
+                self.logger.error(f'{source} | {yaml_ld_error}')
                 continue
             except ValueError as value_error:
-                self.logger.info(f'{source} | {value_error}')
+                self.logger.error(f'{source} | {value_error}')
                 continue
 
             self.logger.info(f'{source_file} is loaded.')
@@ -318,31 +313,8 @@ class Iolanta:   # noqa: WPS214
         """
         self.bind_namespaces()
         self.add_files_from_plugins()
-
-    def string_to_node(self, name: str | Node) -> NotLiteralNode:
-        """
-        Parse a string into a node identifier.
-
-        String might be:
-          * a full IRI,
-          * a qname,
-          * a qname with implied `local:` part,
-          * or a blank node identifier.
-        """
-        if isinstance(name, Node):
-            return name
-
-        if ':' in name:
-            # This is either a full IRI, a qname, or a blank node identifier.
-            try:
-                # Trying to interpret this as QName.
-                return self.graph.namespace_manager.expand_curie(name)
-            except ValueError:
-                # If it is not a QName then it is an IRI, let's return it.
-                return URIRef(name)
-
-        # This string does not include an ":", so we imply `local:`.
-        return URIRef(f'local:{name}')
+        if self.project_root:
+            self.add(self.project_root)
 
     def render(
         self,

iolanta/parse_quads.py

@@ -7,6 +7,7 @@ from rdflib.term import Node
 
 from iolanta.errors import UnresolvedIRI
 from iolanta.models import Quad
+from iolanta.namespaces import IOLANTA, RDF
 from iolanta.parsers.errors import SpaceInProperty
 
 
@@ -66,6 +67,20 @@ def parse_quads(
         else:
             graph_name = URIRef(graph_name)
 
+            yield Quad(
+                graph,
+                IOLANTA['has-sub-graph'],
+                graph_name,
+                graph,
+            )
+
+        yield Quad(
+            graph_name,
+            RDF.type,
+            IOLANTA.Graph,
+            IOLANTA.meta,
+        )
+
         for quad in quads:
             try:
                 yield Quad(

{iolanta-1.2.6.dist-info → iolanta-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.6
+Version: 1.2.8
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -32,6 +32,7 @@ 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.3)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown

{iolanta-1.2.6.dist-info → iolanta-1.2.8.dist-info}/RECORD

@@ -6,7 +6,7 @@ iolanta/cli/formatters/choose.py,sha256=Ac4hNoptvnhuJB77K9KOn5oMF7j2RxmNuaLko28W
 iolanta/cli/formatters/csv.py,sha256=OVucZxhcMjihUli0wkbSOKo500-i7DNV0Zdf6oIougU,753
 iolanta/cli/formatters/json.py,sha256=jkNldFApSWw0kcMkeIPvI2Vt4JTE-Rvx5mWqKJb3Sj4,741
 iolanta/cli/formatters/pretty.py,sha256=Ik75CR5GMBDJCvES9eF0bQPj64ZJD40iFDSSZH0s9aA,2920
-iolanta/cli/main.py,sha256=xuVm5kVYEvx_BbfRbIODoikHdum-g6BK_c0dvlV3HZ4,2436
+iolanta/cli/main.py,sha256=-VS9B8kEBgJI6dl4W1cT4mZzWkANnMG1M6JnlXpdSKk,3126
 iolanta/cli/models.py,sha256=cjbpowdzI4wAP0DUk3qoVHyimk6AZwlXi9CGmusZTuM,159
 iolanta/cli/pretty_print.py,sha256=M6E3TmhzA6JY5GeUVmDZLmOh5u70-393PVit4voFKDI,977
 iolanta/context.py,sha256=bZR-tbZIrDQ-Vby01PMDZ6ifxM-0YMK68RJvAsyqCTs,507
@@ -14,13 +14,11 @@ iolanta/conversions.py,sha256=hbLwRF1bAbOxy17eMWLHhYksbdCWN-v4-0y0wn3XSSg,1185
 iolanta/cyberspace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/cyberspace/inference/wikibase-claim.sparql,sha256=JSawj3VTc9ZPoU9mvh1w1AMYb3cWyZ3x1rEYWUsKZ6A,209
 iolanta/cyberspace/inference/wikibase-statement-property.sparql,sha256=SkSHZZlxWVDwBM3aLo0Q7hLuOj9BsIQnXtcuAuwaxqU,240
-iolanta/cyberspace/processor.py,sha256=B6tmkZ9SFvEI7q0fy-VpdPHTKBZ1X3cKHS3CFYwWvGc,20551
+iolanta/cyberspace/processor.py,sha256=G740tg93-vkSrOgPm8ll8dA18UwbZEgtlg0eXt49wes,20153
 iolanta/data/cli.yaml,sha256=TsnldYXoY5GIzoNuPDvwBKGw8eAEForZW1FCKqKI0Kg,1029
 iolanta/data/context.yaml,sha256=OULEeDkSqshabaXF_gMujgwFLDJvt9eQn_9FftUlSUw,1424
-iolanta/data/foaf-meta.yaml,sha256=BhRTFY_uue5FsJEDJnSgnA8hCr927RHnET9ZrQnFpdU,2647
 iolanta/data/html.yaml,sha256=hVFdLWLy8FMY8xpOrJMYc-tE3S0Nq83xuxVkjRW_7rI,517
 iolanta/data/iolanta.yaml,sha256=xubIFBNU02lmFXhgOSuyQwUcZD3xCqVfeVAZMvOxKbI,1433
-iolanta/data/ontologies-meta.yaml,sha256=nM6ROkZbk_CiMVOBcbUjXvA1noVsyIuhtXFgU4fQBbk,1374
 iolanta/data/textual-browser.yaml,sha256=ViMQJLiqa3CHdXluv9Fk3bEtyYC2ezNoHO7kQEp_N7w,3799
 iolanta/ensure_is_context.py,sha256=9aok8asyEx7KPesOR28VBDb3Ch9kfc3eoCpQSJwj07U,717
 iolanta/entry_points.py,sha256=DZbf-udlEwELFGqeWENj0M2BOUPOWlmGJdqyaEtnot0,504
@@ -48,22 +46,22 @@ iolanta/facets/html/code_literal.py,sha256=qCddzBrg6Y5XMIKohFQ52Tf9GPOcU7bj83tfA
 iolanta/facets/html/default.py,sha256=Dmf_kYiL2M954iigyYsiWrMstwZ1nvxKetuR6aW3xYY,647
 iolanta/facets/icon.py,sha256=ddZcolx1Q5_wo3w0jqiCzcc5Lsru6-jA7s7oAd1T8Og,494
 iolanta/facets/locator.py,sha256=tFwxGT4ujwEjwkgTevK6gwWfj3_1lU9Q305IU7a-I3Y,7697
-iolanta/facets/page_title.py,sha256=UQYgvKxS2OCfL49QRrO8WU4EIDAjbJ1-7vdkw3aaxyk,1496
+iolanta/facets/page_title.py,sha256=s70A9w39O7J9Di3ni2ufRGsNctAW-eTzPTuP_wzWAtI,1446
 iolanta/facets/qname.py,sha256=ztyBbjjcW8dNZzuiNMqhcWfAUxk-gSjbseVGrQE7kVY,531
 iolanta/facets/textual_browser/__init__.py,sha256=sKgDvXOwib9n9d63kdtKCEv26-FoL0VN6zxDmfcheZ8,104
-iolanta/facets/textual_browser/app.py,sha256=c_3YdEbHsJfTLl72c-W51uJnZ5DsIIjRXptsuZIvWA0,2587
+iolanta/facets/textual_browser/app.py,sha256=6-cmEkwRqj9UptVvXKVNIxT3PcDDOZP1OLpv8gPmB_Q,3202
 iolanta/facets/textual_browser/facet.py,sha256=zFynpMWr0iYaem-imbft5-2tjbkrDQEndYfHDlqqHUQ,740
 iolanta/facets/textual_browser/history.py,sha256=b3jTwVkVe0ZBcYkHGJ_zKIV4MSMScDdabmLQIjOZfes,1087
 iolanta/facets/textual_browser/home.py,sha256=GfDD1G2HiwdLkPkNdcYRqVIxDl5tWH9fewh_FJb8G-I,384
-iolanta/facets/textual_browser/location.py,sha256=pPnRjgG4yWvo5xOxuqHEM6O8QKL5pkCCioSkwi3K7XA,142
+iolanta/facets/textual_browser/location.py,sha256=w0La8bVTpJiVo1_hFTDQeIUdDdqfhYnoihuZW-f130c,205
 iolanta/facets/textual_browser/models.py,sha256=DqTBjhkkTt5mNwqr4DzNbPSqzV-QtNqfKj7wpn6T3ao,173
 iolanta/facets/textual_browser/page.py,sha256=NkcQ5rSKZRbp63C8ozgsR_iVhcKHGv_SytUCQyGa7ss,786
-iolanta/facets/textual_browser/page_switcher.py,sha256=wbpZpqnPaJ0AmsehhFZADrP2Ptqa9JlxHLkvItRUr9I,6096
+iolanta/facets/textual_browser/page_switcher.py,sha256=Rbfa7HjGMw-OFOUfq8J8A3pIlrY0iP3ZJQrWl_US5tQ,9693
 iolanta/facets/textual_class/__init__.py,sha256=tiL0p-3JspGcBRj4qa3rmoBFAuadk71l2ja2lJN6CEs,75
 iolanta/facets/textual_class/facets.py,sha256=W3-N7bekk-bKwrb2rTPwmySGF42-uV7aqLPAiHwFSU4,6496
 iolanta/facets/textual_class/sparql/instances.sparql,sha256=tmG4tuYrROKo3A7idjOEblAeNPXiiExHxc6k3fhalSM,113
 iolanta/facets/textual_default/__init__.py,sha256=snxA0FEY9qfAxNv3MlZLrJsXugD4dvs5hLStZWV7soM,158
-iolanta/facets/textual_default/facets.py,sha256=tQasa4p7oIKUqYjXKcRe886_ZiA8fHAaA8y0UMezeMs,4597
+iolanta/facets/textual_default/facets.py,sha256=Pf5GttQ7EG0ZodjwwVXzYMffHus3MAZdJUIcbddcYtw,4738
 iolanta/facets/textual_default/sparql/inverse-properties.sparql,sha256=daHNdhmh92Q77CSf7ULbhxg57CuYsRFfMnXQz4VYEug,64
 iolanta/facets/textual_default/sparql/label.sparql,sha256=IWAkkgMKtIZ7Zpg8LUJ5fDZ9tiI8fiRYZo-zT61Fong,121
 iolanta/facets/textual_default/sparql/nodes-for-property.sparql,sha256=J9vg0Pz2HXDlPCeZ6IS2C0wODrpYDuNeD6DYT6UdNsU,68
@@ -71,7 +69,7 @@ iolanta/facets/textual_default/sparql/properties.sparql,sha256=stDbvFP4g6YKYphpN
 iolanta/facets/textual_default/tcss/default.tcss,sha256=v6k6LvZMndRW4t9Iq-7QF59U_LJTdohRsyavwTY5ruI,69
 iolanta/facets/textual_default/templates/default.md,sha256=CuD5lISsE2eAVnm2z6kfNff-vEgrNG95Wi5LTgkieWY,21
 iolanta/facets/textual_default/triple_uri_ref.py,sha256=XfuNPaAe-YxH8IyrdrHQ641aWh5zVMVs0L0WC3D6A4M,1279
-iolanta/facets/textual_default/widgets.py,sha256=JEES6ogGP8JvUa0Zx-cf20zJrrDbNx6e9r-5xo5nmn4,9285
+iolanta/facets/textual_default/widgets.py,sha256=yOw3qJlwXYNqz3HuuRiVM0IZ-YSto_IeI2Hgv6n1BxU,9189
 iolanta/facets/textual_graph/__init__.py,sha256=DWd2gljzL8SiyYKQdBH78HouF1EMqgCH-w0K5OEmL2I,59
 iolanta/facets/textual_graph/facets.py,sha256=ZjWEEjzYGHRODvTUPiTFjKEjFQx59Bq-1v_RXU54M9k,876
 iolanta/facets/textual_graph/sparql/triples.sparql,sha256=5rFVGcvZzEHZj2opQQp0YlxJLpEdl-r1RjkPwo8j7t0,145
@@ -89,7 +87,7 @@ iolanta/facets/textual_ontology/facets.py,sha256=60g8ANmePb9_i_-d4ui-FdtNwg9aktr
 iolanta/facets/textual_ontology/sparql/terms.sparql,sha256=oVLxN452nqog_95qRaTWnvar6rxPNxPrRonSo7oFFTg,324
 iolanta/facets/textual_ontology/sparql/visualization-vocab.sparql,sha256=UNbU2Qt5C1Vq-CvdVhok7wecnu6p_IDtw7A8n_g6lBs,66
 iolanta/facets/textual_provenance/__init__.py,sha256=k5-_iK8Lrdwr5ZEJaDxq-UhGYe4G_adXVqGfOA5DAP8,114
-iolanta/facets/textual_provenance/facets.py,sha256=wKv_MFRuVDDlhar81wBCA5yOYpqydfK-ujwWQrkWs0U,3652
+iolanta/facets/textual_provenance/facets.py,sha256=vv3UQsI2duB36DW5Zkw3sqgAXBPmK_xAo7cU0O7jF8g,3767
 iolanta/facets/textual_provenance/sparql/graphs.sparql,sha256=B45uKFd-1vrBuMDSbTURjUUEjHt51vAbqdL4tUcgMvk,103
 iolanta/facets/textual_provenance/sparql/triples.sparql,sha256=V-EdVuWbGHY3MspbJIMpwxPQautLDqJJV-AmihDjSHc,53
 iolanta/facets/title/__init__.py,sha256=fxpkG-YvHDp6eiVL3o7BbwhPMZZe-1R2Qi6S36QCTf8,77
@@ -98,7 +96,7 @@ iolanta/facets/title/sparql/title.sparql,sha256=4rz47tjwX2OJavWMzftaYKil1-ZHB76Z
 iolanta/facets/wikibase_statement_title/__init__.py,sha256=_yk1akxgSJOiUBJIc8QGrD2vovvmx_iw_vJDuv1rD7M,91
 iolanta/facets/wikibase_statement_title/facets.py,sha256=mUH7twlAgoeX7DgLQuRBQv4ORT6GWbN-0eJ1aliSfiQ,724
 iolanta/facets/wikibase_statement_title/sparql/statement-title.sparql,sha256=n07DQWxKqB5c3CA4kacq2HSN0R0dLgnMnLP1AxMo5YA,320
-iolanta/iolanta.py,sha256=nCDhbolzqYVCvi9ld8uaVOSD3NfvNnwpxyIsXOX34q0,13810
+iolanta/iolanta.py,sha256=kSMYvDmyjpSDgqLppeI835fHRl1YOVfuwiodIrVlUwo,12954
 iolanta/loaders/__init__.py,sha256=QTiKCsQc1BTS-IlY2CQsN9iVpEIPqYFvI9ERMYVZCbU,99
 iolanta/loaders/base.py,sha256=-DxYwqG1bfDXB2p_S-mKpkc_3Sh14OHhePbe65Iq3-s,3381
 iolanta/loaders/data_type_choice.py,sha256=zRUXBIzjvuW28P_dhMDVevE9C8EFEIx2_X39WydWrtM,1982
@@ -111,7 +109,7 @@ iolanta/loaders/scheme_choice.py,sha256=GHA4JAD-Qq3uNdej4vs_bCrN1WMRshVRvOMxaYyP
 iolanta/models.py,sha256=L0iFaga4-PCaWP18WmT03NLK_oT7q49V0WMTQskoffI,2824
 iolanta/namespaces.py,sha256=fyWDCGPwU8Cs8d-Vmci4H0-fuIe7BMSevvEKFvG7Gf4,1153
 iolanta/node_to_qname.py,sha256=a82_qpgT87cbekY_76tTkl4Z-6Rz6am4UGIQChUf9Y0,794
-iolanta/parse_quads.py,sha256=rIzpy6zt-ad63pvT5nX0CG6v89HgUzPFDl31jklHkOw,2504
+iolanta/parse_quads.py,sha256=yOI154hGRCNv4UjEuhicP0cQWNWid_52mE86VWYfH8w,2833
 iolanta/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/parsers/base.py,sha256=ZFjj0BLzW4985BdC6PwbngenhMuSYW5mNLpprZRWjhA,1048
 iolanta/parsers/dict_parser.py,sha256=t_OK2meUh49DqSaOYkSgEwxMKUNNgjJY8rZAyL4NQKI,4546
@@ -130,7 +128,7 @@ iolanta/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/widgets/mixin.py,sha256=nDRCOc-gizCf1a5DAcYs4hW8eZEd6pHBPFsfm0ncv7E,251
 ldflex/__init__.py,sha256=8IELqR55CQXuI0BafjobXSK7_kOc-qKVTrEtEwXnZRA,33
 ldflex/ldflex.py,sha256=omKmOo5PUyn8Evw4q_lqKCJOq6yqVOcLAYxnYkdwOUs,3332
-iolanta-1.2.6.dist-info/METADATA,sha256=7ROfDFtkzsElhs28PrBNQswCichRGATx3f8LB9gs9Bk,1318
-iolanta-1.2.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-iolanta-1.2.6.dist-info/entry_points.txt,sha256=fIp9g4kzjSNcTsTSjUCk4BIG3laHd3b3hUZlkjgFAGU,179
-iolanta-1.2.6.dist-info/RECORD,,
+iolanta-1.2.8.dist-info/METADATA,sha256=ZuobBaJiRgngoHBJuRTNrI8CZbn0KT_vPtHZP9QfkQ0,1361
+iolanta-1.2.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+iolanta-1.2.8.dist-info/entry_points.txt,sha256=fIp9g4kzjSNcTsTSjUCk4BIG3laHd3b3hUZlkjgFAGU,179
+iolanta-1.2.8.dist-info/RECORD,,

iolanta/data/foaf-meta.yaml

@@ -1,113 +0,0 @@
-"@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#
-
-$id: "foaf:"
-$type: owl:Ontology
-vann:termGroup:
-  - rdfs:label: Core Classes
-    $reverse:
-      rdf:type:
-        - foaf:Person
-        - foaf:Organization
-        - foaf:Group
-        - foaf:Agent
-
-  - rdfs:label: Docs & Images
-    $reverse:
-      rdf:type:
-        - foaf:Document
-        - foaf:Image
-        - foaf:img
-        - foaf:depiction
-        - foaf:page
-        - foaf:topic
-        - foaf:PersonalProfileDocument
-        - foaf:primaryTopic
-        - foaf:isPrimaryTopicOf
-        - foaf:sha1
-
-  - rdfs:label: Personal
-    $reverse:
-      rdf:type:
-        - foaf:name
-        - foaf:lastName
-        - foaf:title
-        - foaf:surname
-        - foaf:familyName
-        - foaf:givenName
-        - foaf:family_name
-        - foaf:firstName
-        - foaf:gender
-        - foaf:birthday
-        - foaf:age
-        - foaf:status
-        - foaf:myersBriggs
-        - foaf:dnaChecksum
-        - foaf:nick
-        - foaf:topic_interest
-        - foaf:publications
-        - foaf:workInfoHomepage
-
-  - rdfs:label: Online Presence
-    $reverse:
-      rdf:type:
-        - foaf:mbox
-        - foaf:phone
-        - foaf:OnlineAccount
-        - foaf:OnlineEcommerceAccount
-        - foaf:OnlineGamingAccount
-        - foaf:OnlineChatAccount
-        - foaf:account
-        - foaf:accountServiceHomepage
-        - foaf:accountName
-        - foaf:aimChatID
-        - foaf:jabberID
-        - foaf:skypeID
-        - foaf:msnChatID
-        - foaf:yahooChatID
-        - foaf:openid
-        - foaf:homepage
-        - foaf:weblog
-        - foaf:geekcode
-        - foaf:workplaceHomepage
-        - foaf:schoolHomepage
-        - foaf:icqChatID
-        - foaf:mbox_sha1sum
-
-  - rdfs:label: Social
-    $reverse:
-      rdf:type:
-        - foaf:knows
-        - foaf:friendOf
-        - foaf:member
-        - foaf:membershipClass
-        - foaf:depiction
-        - foaf:depicts
-        - foaf:thumbnail
-        - foaf:based_near
-
-  - rdfs:label: Activities & Projects
-    $reverse:
-      rdf:type:
-        - foaf:Project
-        - foaf:fundedBy
-        - foaf:interest
-        - foaf:currentProject
-        - foaf:pastProject
-        - foaf:logo
-        - foaf:maker
-        - foaf:made
-        - foaf:plan
-        - foaf:tipjar
-
-  - rdfs:label: Meta
-    $reverse:
-      rdf:type:
-        - foaf:LabelProperty
-        - foaf:focus

iolanta/data/ontologies-meta.yaml

@@ -1,57 +0,0 @@
-"@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#
-
-$included:
-  - $id: "owl:"
-    $type: owl:Ontology
-
-  - $id: "https://purl.org/dc/terms/"
-    $type: owl:Ontology
-
-  - $id: "rdf:"
-    vann:termGroup:
-      - rdfs:label: Properties
-        $reverse:
-          rdf:type:
-            - rdf:Property
-            - rdf:type
-
-      - rdfs:label: Triples
-        $reverse:
-          rdf:type:
-            - rdf:subject
-            - rdf:predicate
-            - rdf:object
-            - rdf:Statement
-      - rdfs:label: Containers
-        $reverse:
-          rdf:type:
-            - rdf:first
-            - rdf:rest
-            - rdf:List
-            - rdf:nil
-            - rdf:Bag
-            - rdf:Seq
-            - rdf:Alt
-      - rdfs:label: Language
-        $reverse:
-          rdf:type:
-            - rdf:langString
-            - rdf:language
-
-      - $id: rdfs:Datatype
-      - rdfs:label: Compound Literal
-        $reverse:
-          rdf:type:
-            - rdf:CompoundLiteral
-            - rdf:direction
-      - rdfs:label: Value
-        $reverse:
-          rdf:type:
-            - rdf:value