iolanta 1.2.9__py3-none-any.whl → 1.2.11__py3-none-any.whl

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/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/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/facets/textual_ontology/sparql/visualization-vocab.sparql

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

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

@@ -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.dist-info → iolanta-1.2.11.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=-VS9B8kEBgJI6dl4W1cT4mZzWkANnMG1M6JnlXpdSKk,3126
+iolanta/cli/main.py,sha256=93pfYqhXsldasyh1vnJin8Tt6EkUiCsVrwA4v4f6Ibc,3134
 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,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=04_aMktZfThOKq6FmbSsruzcaAp5TUcRKXu_JXv4ZKo,20927
+iolanta/cyberspace/processor.py,sha256=rxO5MaZEoXD2Kzknq7eRH3yuv8kQ5UILy8qkJxramMY,21828
 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
@@ -85,7 +85,7 @@ iolanta/facets/textual_nanopublication/term_widget.py,sha256=uI5msCTSIYumAIS3I8n
 iolanta/facets/textual_ontology/__init__.py,sha256=3H6bfYaEbXFr90C6ZpGWC4O-24uaO18tnTXx7mckQSA,94
 iolanta/facets/textual_ontology/facets.py,sha256=60g8ANmePb9_i_-d4ui-FdtNwg9aktrOKXHkTQtLp1w,3338
 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_ontology/sparql/visualization-vocab.sparql,sha256=q9TmU15deL0da28mpo_8W8fgMSEcENfYeqLyM0zVbTg,65
 iolanta/facets/textual_provenance/__init__.py,sha256=k5-_iK8Lrdwr5ZEJaDxq-UhGYe4G_adXVqGfOA5DAP8,114
 iolanta/facets/textual_provenance/facets.py,sha256=vv3UQsI2duB36DW5Zkw3sqgAXBPmK_xAo7cU0O7jF8g,3767
 iolanta/facets/textual_provenance/sparql/graphs.sparql,sha256=B45uKFd-1vrBuMDSbTURjUUEjHt51vAbqdL4tUcgMvk,103
@@ -96,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=kSMYvDmyjpSDgqLppeI835fHRl1YOVfuwiodIrVlUwo,12954
+iolanta/iolanta.py,sha256=cIfhM9zhositho4C6jZ2th2oB3d50BSlYsRRozS4tP4,12911
 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
@@ -109,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=yOI154hGRCNv4UjEuhicP0cQWNWid_52mE86VWYfH8w,2833
+iolanta/parse_quads.py,sha256=nQeX9zSjDoITH1lmd25xhKq44bFTqcayFbAguXfFyh4,2790
 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
@@ -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.9.dist-info/METADATA,sha256=5hu-_eus5cPDpyWqMlB0_SzvWrtEvl4gYrqeI9Kfkmo,2294
-iolanta-1.2.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-iolanta-1.2.9.dist-info/entry_points.txt,sha256=fIp9g4kzjSNcTsTSjUCk4BIG3laHd3b3hUZlkjgFAGU,179
-iolanta-1.2.9.dist-info/RECORD,,
+iolanta-1.2.11.dist-info/METADATA,sha256=2wGXN9mncu09r8MrbLUvMM_VYavsuM6u7dkQTEbLNsc,2295
+iolanta-1.2.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+iolanta-1.2.11.dist-info/entry_points.txt,sha256=fIp9g4kzjSNcTsTSjUCk4BIG3laHd3b3hUZlkjgFAGU,179
+iolanta-1.2.11.dist-info/RECORD,,