iolanta 1.2.9__tar.gz → 1.2.11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.9
+Version: 1.2.11
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -33,7 +33,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.4)
+Requires-Dist: yaml-ld (>=1.1.7)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown
 

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

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

{iolanta-1.2.9 → iolanta-1.2.11}/iolanta/cyberspace/processor.py

@@ -50,6 +50,9 @@ NORMALIZE_TERMS_MAP = MappingProxyType({
 
 REASONING_ENABLED = True
 OWL_REASONING_ENABLED = False
+INDICES = [
+    URIRef('https://iolanta.tech/visualizations/index.yaml'),
+]
 
 
 REDIRECTS = MappingProxyType({
@@ -67,7 +70,10 @@ REDIRECTS = MappingProxyType({
     # This one does not answer via HTTPS :(
     URIRef('https://xmlns.com/foaf/0.1/'): URIRef('http://xmlns.com/foaf/0.1/'),
     URIRef('https://www.nanopub.org/nschema'): URIRef(
-        'https://www.nanopub.net/nschema',
+        'https://www.nanopub.net/nschema#',
+    ),
+    URIRef('https://nanopub.org/nschema'): URIRef(
+        'https://nanopub.net/nschema#',
     ),
     URIRef(PROV): URIRef('https://www.w3.org/ns/prov-o'),
 })
@@ -278,6 +284,15 @@ def _extract_nanopublication_uris(
             )
 
 
+def apply_redirect(source: URIRef) -> URIRef:
+    """Rewrite the URL."""
+    for pattern, destination in REDIRECTS.items():
+        if source.startswith(pattern):
+            return destination
+
+    return source
+
+
 @dataclasses.dataclass(frozen=True)
 class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
     """
@@ -294,6 +309,7 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
     def __post_init__(self):
         """Note that we do not presently need OWL inference."""
         self.graph.last_not_inferred_source = None
+        self.graph._indices_loaded = False
 
     def _infer_with_sparql(self):
         """
@@ -353,17 +369,12 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         ]
         self.graph.addN(inferred_quads)
 
-    def _apply_redirect(self, source: URIRef) -> URIRef:
-        for pattern, destination in REDIRECTS.items():
-            if source.startswith(pattern):
-                self.logger.info(
-                    'Rewriting: {source} → {destination}',
-                    source=source,
-                    destination=destination,
-                )
-                return destination
+    def _maybe_load_indices(self):
+        if not self.graph._indices_loaded:
+            for index in INDICES:
+                self.load(index)
 
-        return source
+            self.graph._indices_loaded = True
 
     def query(   # noqa: WPS211, WPS210, WPS231, C901
         self,
@@ -378,6 +389,8 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         namespaces. The given base is used to resolve relative URIs in
         the query and will be overridden by any BASE given in the query.
         """
+        self._maybe_load_indices()
+
         initBindings = initBindings or {}
         initNs = initNs or {}
 
@@ -406,7 +419,7 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 try:
                     self.load(url)
                 except Exception as err:
-                    self.logger.error('Failed to load %s: %s', url, err)
+                    self.logger.error(f'Failed to load {url}: {err}', url, err)
 
         self.maybe_apply_inference()
 
@@ -451,6 +464,15 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             URIRef('iolanta://_meta'),
         ))
 
+    def _follow_is_visualized_with_links(self, uri: URIRef):
+        """Follow `dcterms:isReferencedBy` links."""
+        self.logger.info(f'Following links for {uri}…')
+        triples = self.graph.triples((uri, DCTERMS.isReferencedBy, None))
+        for _, _, visualization in triples:
+            if isinstance(visualization, URIRef):
+                self.load(visualization)
+        self.logger.info('Links followed.')
+
     def load(   # noqa: C901, WPS210, WPS212, WPS213, WPS231
         self,
         source: URIRef,
@@ -473,10 +495,17 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             # TODO: It works differently for JSON-LD documents AFAIK. Need to
             #   double check that.
             url = url.with_fragment(None)
-            source = URIRef(str(url))
+            source = URIRef(str(f'{url}#'))
+
+        self._follow_is_visualized_with_links(source)
 
-        new_source = self._apply_redirect(source)
+        new_source = apply_redirect(source)
         if new_source != source:
+            self.logger.info(
+                'Rewriting: {source} → {new_source}',
+                source=source,
+                new_source=new_source,
+            )
             return self.load(new_source)
 
         source_uri = normalize_term(source)
@@ -601,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.9 → iolanta-1.2.11}/iolanta/facets/page_title.py

@@ -45,8 +45,7 @@ class PageTitle(IolantaWidgetMixin, Static):
                 title = event.worker.result
                 if self.extra:
                     title = f'{title} {self.extra}'
-                self.renderable = title
-                self.refresh()
+                self.update(title)
 
             case WorkerState.ERROR:
                 raise ValueError(event)

{iolanta-1.2.9 → iolanta-1.2.11}/iolanta/facets/textual_browser/page_switcher.py

@@ -258,6 +258,10 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
                 return not is_loading
             case 'abort':
                 return is_loading
+            case 'back':
+                return bool(self.history.past)
+            case 'forward':
+                return bool(self.history.future)
 
         return True
 
@@ -288,12 +292,15 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     def action_back(self):
         """Go backward."""
         self.current = self.history.back().page_id
-        self.focus()
+        if page := self.visible_content:
+            page.focus()
 
     def action_forward(self):
         """Go forward."""
         self.current = self.history.forward().page_id
         self.focus()
+        if page := self.visible_content:
+            page.focus()
 
 
 class ConsoleSwitcher(ContentSwitcher):

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

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

{iolanta-1.2.9 → iolanta-1.2.11}/iolanta/iolanta.py

@@ -300,9 +300,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):

{iolanta-1.2.9 → iolanta-1.2.11}/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.9 → iolanta-1.2.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iolanta"
-version = "1.2.9"
+version = "1.2.11"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"
@@ -29,7 +29,7 @@ textual = ">=0.83.0"
 iolanta-tables = {version = "^0.1.7", optional = true}
 yarl = ">=1.9.4"
 boltons = ">=24.0.0"
-yaml-ld = ">=1.1.4"
+yaml-ld = ">=1.1.7"
 reasonable = ">=0.2.6"
 oxrdflib = ">=0.4.0"
 loguru = ">=0.7.3"

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

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