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

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()
 
@@ -432,6 +445,34 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         query_result['bindings'] = bindings
         return query_result
 
+    def _is_loaded(self, uri: URIRef) -> bool:
+        """Find out if this URI in the graph already."""
+        return funcy.first(
+            self.graph.quads((
+                uri,
+                IOLANTA['last-loaded-time'],
+                None,
+                URIRef('iolanta://_meta'),
+            )),
+        ) is not None
+
+    def _mark_as_loaded(self, uri: URIRef):
+        self.graph.add((
+            uri,
+            IOLANTA['last-loaded-time'],
+            Literal(datetime.datetime.now()),
+            URIRef('iolanta://_meta'),
+        ))
+
+    def _follow_is_visualized_with_links(self, uri: URIRef):
+        """Follow `iolanta:is-visualized-with` links."""
+        self.logger.info(f'Following links for {uri}…')
+        triples = self.graph.triples((uri, IOLANTA['visualized-with'], 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,
@@ -448,25 +489,30 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             #   fails.
             return Skipped()
 
-        new_source = self._apply_redirect(source)
+        if url.fragment:
+            # Fragment on an HTML page resolves to that same page. Let us remove
+            # this ambiguity, then.
+            # TODO: It works differently for JSON-LD documents AFAIK. Need to
+            #   double check that.
+            url = url.with_fragment(None)
+            source = URIRef(str(f'{url}#'))
+
+        self._follow_is_visualized_with_links(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)
-        existing_triple = funcy.first(
-            self.graph.quads(
-                (
-                    None,
-                    None,
-                    None,
-                    source_uri,
-                ),
-            ),
-        )
-        if existing_triple is not None:
+        if self._is_loaded(source_uri):
             return Skipped()
         else:
-            self.logger.info(f'Existing triples not found for {source_uri}')
+            self.logger.info(f'{source_uri} is not loaded yet')
 
         # FIXME This is definitely inefficient. However, python-yaml-ld caches
         #   the document, so the performance overhead is not super high.
@@ -510,6 +556,8 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 RDFS.Class,
             ))
 
+            self._mark_as_loaded(source_uri)
+
             return Loaded()
 
         except Exception as err:
@@ -533,6 +581,9 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 RDF.type,
                 RDFS.Class,
             ))
+
+            self._mark_as_loaded(source_uri)
+
             return Loaded()
 
         if _resolved_source:
@@ -557,6 +608,8 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             RDFS.Class,
         ))
 
+        self._mark_as_loaded(source_uri)
+
         try:  # noqa: WPS225
             ld_rdf = yaml_ld.to_rdf(source)
         except ConnectionError as name_resolution_error:

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/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.8.dist-info → iolanta-1.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.8
+Version: 1.2.10
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -33,12 +33,38 @@ 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: yaml-ld (>=1.1.5)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown
 
-# iolanta
+# iolanta | Linked Data browser
 
-Stub repo for the iolanta browser.
+---
 
+[![Build Status](https://github.com/iolanta-tech/iolanta/workflows/test/badge.svg?branch=master&event=push)](https://github.com/iolanta-tech/iolanta/actions?query=workflow%3Atest)
+[![codecov](https://codecov.io/gh/iolanta-tech/iolanta/branch/master/graph/badge.svg)](https://codecov.io/gh/iolanta-tech/iolanta)
+[![Python Version](https://img.shields.io/pypi/pyversions/iolanta.svg)](https://pypi.org/project/iolanta/)
+[![wemake-python-styleguide](https://img.shields.io/badge/style-wemake-000000.svg)](https://github.com/wemake-services/wemake-python-styleguide)
+
+![Iolanta cover image](docs/assets/cover.webp)
+
+## 📦 Install with `pip`
+
+```shell
+pip install iolanta
+```
+
+## Try it out!
+
+Explore a Nanopublication:
+
+```shell
+iolanta https://w3id.org/np/RA7OYmnx-3ln_AY233lElN01wSDJWDOXPz061Ah93EQ2I
+```
+
+⇒
+
+![](docs/screenshots/w3id.org.np.ra7oymnx-3ln_ay233leln01wsdjwdoxpz061ah93eq2i.svg)
+
+See more [in the docs](https://iolanta.tech).
 

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

@@ -14,7 +14,7 @@ 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=G740tg93-vkSrOgPm8ll8dA18UwbZEgtlg0eXt49wes,20153
+iolanta/cyberspace/processor.py,sha256=QlQM93JxXU33IqGpe2jTQfpxDpu12cRVHxBrnhjjRPQ,21848
 iolanta/data/cli.yaml,sha256=TsnldYXoY5GIzoNuPDvwBKGw8eAEForZW1FCKqKI0Kg,1029
 iolanta/data/context.yaml,sha256=OULEeDkSqshabaXF_gMujgwFLDJvt9eQn_9FftUlSUw,1424
 iolanta/data/html.yaml,sha256=hVFdLWLy8FMY8xpOrJMYc-tE3S0Nq83xuxVkjRW_7rI,517
@@ -46,7 +46,7 @@ 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=s70A9w39O7J9Di3ni2ufRGsNctAW-eTzPTuP_wzWAtI,1446
+iolanta/facets/page_title.py,sha256=CI2V8f7zSSrwbQginhyycZttNoAZTHq34SiO8Ql59bQ,1410
 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=6-cmEkwRqj9UptVvXKVNIxT3PcDDOZP1OLpv8gPmB_Q,3202
@@ -56,7 +56,7 @@ iolanta/facets/textual_browser/home.py,sha256=GfDD1G2HiwdLkPkNdcYRqVIxDl5tWH9few
 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=Rbfa7HjGMw-OFOUfq8J8A3pIlrY0iP3ZJQrWl_US5tQ,9693
+iolanta/facets/textual_browser/page_switcher.py,sha256=1-mWI56n2gLDThPBjfqHLun3utkUYdOkKSzejCIziEk,9953
 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
@@ -128,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.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-1.2.10.dist-info/METADATA,sha256=lIe4h7C7wwGdKHlxNuq07vOGeT3M5-AXhiVUflo0KWw,2295
+iolanta-1.2.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+iolanta-1.2.10.dist-info/entry_points.txt,sha256=fIp9g4kzjSNcTsTSjUCk4BIG3laHd3b3hUZlkjgFAGU,179
+iolanta-1.2.10.dist-info/RECORD,,