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

iolanta/cyberspace/processor.py

@@ -432,6 +432,25 @@ 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 load(   # noqa: C901, WPS210, WPS212, WPS213, WPS231
         self,
         source: URIRef,
@@ -448,25 +467,23 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
             #   fails.
             return Skipped()
 
+        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(url))
+
         new_source = self._apply_redirect(source)
         if new_source != 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 +527,8 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 RDFS.Class,
             ))
 
+            self._mark_as_loaded(source_uri)
+
             return Loaded()
 
         except Exception as err:
@@ -533,6 +552,9 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 RDF.type,
                 RDFS.Class,
             ))
+
+            self._mark_as_loaded(source_uri)
+
             return Loaded()
 
         if _resolved_source:
@@ -557,6 +579,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-1.2.8.dist-info → iolanta-1.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.8
+Version: 1.2.9
 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.4)
 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.9.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=04_aMktZfThOKq6FmbSsruzcaAp5TUcRKXu_JXv4ZKo,20927
 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
@@ -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.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,,