iolanta 2.1.13__tar.gz → 2.1.14__tar.gz

{iolanta-2.1.13 → iolanta-2.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iolanta
-Version: 2.1.13
+Version: 2.1.14
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov

{iolanta-2.1.13 → iolanta-2.1.14}/iolanta/facets/textual_browser/page_switcher.py

@@ -45,22 +45,22 @@ 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'),
+        ("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')
+        super().__init__(id="page_switcher", initial="home")
         self.stop_file_watcher_event = threading.Event()
 
     def action_console(self):
         """Open dev console."""
         console_switcher = self.app.query_one(ConsoleSwitcher)
-        console_switcher.current = 'console'
+        console_switcher.current = "console"
         console_switcher.query_one(DevConsole).focus()
 
     @functools.cached_property
@@ -70,7 +70,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def compose(self):
         """Home is the first page to open."""
-        yield Home(id='home')
+        yield Home(id="home")
 
     def on_mount(self):
         """Navigate to the initial page."""
@@ -86,13 +86,13 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         self.stop_file_watcher_event.set()
 
     def _watch_files(self):
-        for _ in watchfiles.watch(   # noqa: WPS352
+        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
+    def render_iri(  # noqa: WPS210
         self,
         this: NotLiteralNode,
         facet_iri: URIRef | None,
@@ -102,7 +102,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         self.this = this
         iolanta: Iolanta = self.iolanta
 
-        as_datatype = URIRef('https://iolanta.tech/cli/textual')
+        as_datatype = URIRef("https://iolanta.tech/cli/textual")
         choices = FacetFinder(
             iolanta=self.iolanta,
             node=this,
@@ -117,12 +117,10 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             )
 
         if facet_iri is None:
-            facet_iri = choices[0]['facet']
+            facet_iri = choices[0]["facet"]
 
         other_facets = [
-            choice['facet']
-            for choice in choices
-            if choice['facet'] != facet_iri
+            choice["facet"] for choice in choices if choice["facet"] != facet_iri
         ]
         flip_options = [
             FlipOption(
@@ -141,7 +139,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         facet = facet_class(
             this=self.this,
             iolanta=iolanta,
-            as_datatype=URIRef('https://iolanta.tech/cli/textual'),
+            as_datatype=URIRef("https://iolanta.tech/cli/textual"),
         )
 
         try:
@@ -162,7 +160,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             is_reload=is_reload,
         )
 
-    def on_worker_state_changed(   # noqa: WPS210
+    def on_worker_state_changed(  # noqa: WPS210
         self,
         event: Worker.StateChanged,
     ):
@@ -173,7 +171,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
                 if render_result.is_reload:
                     # We are reloading the current page.
-                    current_page = self.query_one(f'#{self.current}', Page)
+                    current_page = self.query_one(f"#{self.current}", Page)
                     current_page.remove_children()
                     current_page.mount(render_result.renderable)
 
@@ -184,7 +182,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
                 else:
                     # We are navigating to a new page.
                     page_uid = uuid.uuid4().hex
-                    page_id = f'page_{page_uid}'
+                    page_id = f"page_{page_uid}"
                     page = Page(
                         render_result.renderable,
                         iri=render_result.iri,
@@ -210,7 +208,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     def is_loading(self) -> bool:
         """Determine if the app is presently loading something."""
         for worker in self.workers:
-            if worker.name == 'render_iri':
+            if worker.name == "render_iri":
                 return True
 
         return False
@@ -219,31 +217,31 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         """Reset Iolanta graph and re-render current view."""
         if self.history.current is None:
             return
-        
+
         self.iolanta.reset()
 
         self.run_worker(
             functools.partial(
                 self.render_iri,
                 this=self.history.current.url,
-                facet_iri=self.history.current.facet_iri,
+                facet_iri=None,  # Re-resolve facet after reload so parse errors use TextualNoFacetFound
                 is_reload=True,
             ),
             thread=True,
             exclusive=True,
-            name='render_iri',
+            name="render_iri",
         )
         self.refresh_bindings()
 
     def action_abort(self):
         """Abort loading."""
         self.notify(
-            'Aborted.',
-            severity='warning',
+            "Aborted.",
+            severity="warning",
         )
 
         for worker in self.workers:
-            if worker.name == 'render_iri':
+            if worker.name == "render_iri":
                 worker.cancel()
                 break
 
@@ -252,18 +250,18 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
     def check_action(
         self,
         action: str,
-        parameters: tuple[object, ...],   # noqa: WPS110
+        parameters: tuple[object, ...],  # noqa: WPS110
     ) -> bool | None:
         """Check if action is available."""
         is_loading = self.is_loading
         match action:
-            case 'reload':
+            case "reload":
                 return not is_loading
-            case 'abort':
+            case "abort":
                 return is_loading
-            case 'back':
+            case "back":
                 return bool(self.history.past)
-            case 'forward':
+            case "forward":
                 return bool(self.history.future)
 
         return True
@@ -280,12 +278,12 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         # Direct calls (like line 77) pass Node objects directly.
         if isinstance(this, str):
             # Check if string represents a blank node (starts with "_:")
-            if this.startswith('_:'):
+            if this.startswith("_:"):
                 # Create a BNode with the full string (including the "_:")
                 this = BNode(this)
             else:
                 this = URIRef(this)
-        
+
         self.run_worker(
             functools.partial(
                 self.render_iri,
@@ -295,7 +293,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
             ),
             thread=True,
             exclusive=True,
-            name='render_iri',
+            name="render_iri",
         )
         self.refresh_bindings()
 
@@ -319,8 +317,8 @@ class ConsoleSwitcher(ContentSwitcher):
     def __init__(self):
         """Specify initial params."""
         super().__init__(
-            id='console_switcher',
-            initial='page_switcher',
+            id="console_switcher",
+            initial="page_switcher",
         )
 
     def compose(self):
@@ -333,17 +331,17 @@ class DevConsole(RichLog):
     """Development console."""
 
     BINDINGS = [
-        ('f12,escape', 'close', 'Close Console'),
+        ("f12,escape", "close", "Close Console"),
     ]
 
     def __init__(self):
         """Set default props for console."""
-        super().__init__(highlight=False, markup=False, id='console')
+        super().__init__(highlight=False, markup=False, id="console")
 
     def action_close(self):
         """Close the dev console."""
         console_switcher = self.app.query_one(ConsoleSwitcher)
-        console_switcher.current = 'page_switcher'
+        console_switcher.current = "page_switcher"
 
         page_switcher = console_switcher.query_one(PageSwitcher)
         page_switcher.visible_content.focus()

iolanta-2.1.14/iolanta/facets/textual_class/sparql/instances.sparql

@@ -0,0 +1,6 @@
+SELECT ?instance WHERE {
+    ?instance a $this .
+
+    # Overcome what RDFLib does
+    FILTER(!isLiteral(?instance)) .
+} ORDER BY ?instance

{iolanta-2.1.13 → iolanta-2.1.14}/iolanta/facets/textual_no_facet_found.py

@@ -24,6 +24,14 @@ TEXT = """
 issues: https://github.com/iolanta.tech/iolanta/issues
 """
 
+PARSE_ERROR_TEMPLATE = """
+**Parse error**
+
+```
+{message}
+```
+"""
+
 CONTENT_TEMPLATE = """
 **File content**
 
@@ -46,7 +54,7 @@ class TextualNoFacetFound(Facet):
     def raw_content(self):
         """Content of the file, if applicable."""
         url = URL(self.this)
-        if url.scheme != 'file':
+        if url.scheme != "file":
             return None
 
         path = Path(url.path)
@@ -59,32 +67,50 @@ class TextualNoFacetFound(Facet):
         if path.is_dir():
             return None
 
+        parse_error_msg = self._parse_error_message()
         file_content = path.read_text()
-        return CONTENT_TEMPLATE.format(
+        content = CONTENT_TEMPLATE.format(
             content=file_content,
             type={
-                '.yamlld': 'yaml',
-                '.jsonld': 'json',
-            }.get(path.suffix, ''),
+                ".yamlld": "yaml",
+                ".jsonld": "json",
+                ".ttl": "turtle",
+            }.get(path.suffix, ""),
         )
+        if parse_error_msg:
+            content = PARSE_ERROR_TEMPLATE.format(message=parse_error_msg) + content
+        return content
+
+    def _parse_error_message(self) -> str | None:
+        """Return parse error message for this node if it failed to load."""
+        rows = self.query(
+            """
+            SELECT ?msg WHERE {
+                GRAPH <iolanta://_meta> { $this iolanta:parse-error ?msg }
+            }
+            """,
+            this=self.this,
+        )
+        if row := funcy.first(rows):
+            return str(row["msg"])
+        return None
 
     @property
     def subgraphs_description(self) -> str:
         """Return a formatted description of subgraphs, if any exist."""
         rows = self.query(
-            'SELECT ?subgraph WHERE { $this iolanta:has-sub-graph ?subgraph }',
+            "SELECT ?subgraph WHERE { $this iolanta:has-sub-graph ?subgraph }",
             this=self.this,
         )
-        subgraphs = funcy.lpluck('subgraph', rows)
+        subgraphs = funcy.lpluck("subgraph", rows)
         if subgraphs:
             return SUBGRAPHS_TEMPLATE.format(
-                formatted_subgraphs='\n'.join([
-                    f'- {subgraph}'
-                    for subgraph in subgraphs
-                ]),
+                formatted_subgraphs="\n".join(
+                    [f"- {subgraph}" for subgraph in subgraphs]
+                ),
             )
 
-        return ''
+        return ""
 
     def show(self):
         """Compose the page."""
@@ -93,8 +119,8 @@ class TextualNoFacetFound(Facet):
             Description(
                 Markdown(
                     TEXT.format(
-                        content=self.raw_content or '',
-                        subgraphs=self.subgraphs_description or '',
+                        content=self.raw_content or "",
+                        subgraphs=self.subgraphs_description or "",
                         reference_type=type(self.this).__name__,
                     ),
                 ),

{iolanta-2.1.13 → iolanta-2.1.14}/iolanta/iolanta.py

@@ -17,6 +17,7 @@ import yaml_ld
 from pyparsing import ParseException
 from rdflib import ConjunctiveGraph, Graph, Literal, URIRef
 from rdflib.namespace import NamespaceManager
+from rdflib.plugins.parsers.notation3 import BadSyntax
 from rdflib.plugins.sparql.processor import SPARQLResult
 from rdflib.term import Node
 from yaml_ld.document_loaders.content_types import ParserNotFound
@@ -256,10 +257,20 @@ class Iolanta:  # noqa: WPS214, WPS338
             except ParserNotFound as parser_not_found:
                 self.logger.error(f"{source} | {parser_not_found}")
                 continue
-            except YAMLLDError as yaml_ld_error:
-                # .add() only processes local files, so errors should be raised
-                self.logger.error(f"{source_file} | {yaml_ld_error}")
-                raise
+            except (YAMLLDError, BadSyntax) as parse_error:
+                self.logger.warning("%s | parse error: %s", source_file, parse_error)
+                file_iri = path_to_iri(source_file)
+                self.graph.addN(
+                    [
+                        (
+                            file_iri,
+                            namespaces.IOLANTA["parse-error"],
+                            Literal(str(parse_error)),
+                            namespaces.META,
+                        ),
+                    ]
+                )
+                continue
             except ValueError as value_error:
                 self.logger.error(f"{source} | {value_error}")
                 continue
@@ -362,7 +373,6 @@ class Iolanta:  # noqa: WPS214, WPS338
     ) -> Any:
         """Find an Iolanta facet for a node and render it."""
         node = normalize_term(node)
-
         if not as_datatype:
             raise ValueError(
                 f"Please provide the datatype to render {node} as.",

{iolanta-2.1.13 → iolanta-2.1.14}/iolanta/sparqlspace/processor.py

@@ -557,15 +557,6 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
                 path=not_found.path,
             )
 
-            self.graph.add(
-                (
-                    source_uri,
-                    RDF.type,
-                    IOLANTA["not-found"],
-                    source_uri,
-                )
-            )
-
             self._mark_as_loaded(source_uri)
 
             return Loaded()

iolanta-2.1.14/iolanta/sparqlspace/redirects.py

@@ -0,0 +1,58 @@
+import re
+from types import MappingProxyType
+
+from rdflib import URIRef
+
+# All entries are (pattern, replacement) strings; pattern may be regex with $ for exact match.
+REDIRECTS = MappingProxyType(
+    {
+        # FIXME This is presently hardcoded; we need to
+        #   - either find a way to resolve these URLs automatically,
+        #   - or create a repository of those redirects online.
+        r"http://purl\.org/vocab/vann/$": "https://vocab.org/vann/vann-vocab-20100607.rdf",
+        r"https://purl\.org/dc/elements/1\.1/$": "https://purl.org/dc/terms/",
+        r"http://www\.w3\.org/1999/02/22-rdf-syntax-ns#$": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+        r"http://www\.w3\.org/2000/01/rdf-schema#$": "http://www.w3.org/2000/01/rdf-schema#",
+        r"http://www\.w3\.org/2002/07/owl#$": "http://www.w3.org/2002/07/owl#",
+        # Add # fragment to OWL and RDFS when URI has no fragment (pattern $ = no fragment)
+        # (fixes bug reported at https://stackoverflow.com/q/78934864/1245471)
+        r"http://www\.w3\.org/2002/07/owl$": "http://www.w3.org/2002/07/owl#",
+        r"http://www\.w3\.org/2000/01/rdf-schema$": "http://www.w3.org/2000/01/rdf-schema#",
+        # Redirect FOAF namespace to GitHub mirror
+        r"https?://xmlns\.com/foaf/0\.1/.+": "https://raw.githubusercontent.com/foaf/foaf/refs/heads/master/xmlns.com/htdocs/foaf/0.1/index.rdf",
+        r"https://www\.nanopub\.org/nschema$": "https://www.nanopub.net/nschema#",
+        r"https://nanopub\.org/nschema$": "https://nanopub.net/nschema#",
+        # Convert lexvo.org/id URLs to lexvo.org/data URLs
+        r"http://lexvo\.org/id/(.+)": r"http://lexvo.org/data/\1",
+        r"https://lexvo\.org/id/(.+)": r"http://lexvo.org/data/\1",
+        r"https://www\.lexinfo\.net/(.+)": r"http://www.lexinfo.net/\1",
+        # Convert Wikidata https:// to http:// (Wikidata JSON-LD uses http:// URIs)
+        r"https://www\.wikidata\.org/entity/(.+)": r"http://www.wikidata.org/entity/\1",
+    }
+)
+
+
+def apply_redirect(source: URIRef) -> URIRef:  # noqa: WPS210
+    """
+    Rewrite the URL using regex patterns and group substitutions.
+
+    For each pattern in REDIRECTS:
+    - If the pattern matches the source URI
+    - Replace the source with the destination, substituting any regex groups
+    """
+    source_str = str(source)
+
+    for pattern, destination in REDIRECTS.items():
+        pattern_str = str(pattern)
+        destination_str = str(destination)
+
+        if re.match(pattern_str, source_str):
+            # Replace any group references in the destination (e.g. \1)
+            redirected_uri = re.sub(
+                pattern_str,
+                destination_str,
+                source_str,
+            )
+            return URIRef(redirected_uri)
+
+    return source

{iolanta-2.1.13 → iolanta-2.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iolanta"
-version = "2.1.13"
+version = "2.1.14"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"

iolanta-2.1.13/iolanta/facets/textual_class/sparql/instances.sparql

@@ -1,8 +0,0 @@
-# Remember we are HTTPS-izing all URIs in Iolanta graph
-PREFIX rdf: <https://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT ?instance WHERE {
-    ?instance rdf:type $this .
-
-    FILTER(!isLiteral(?instance)) .
-} ORDER BY ?instance

iolanta-2.1.13/iolanta/sparqlspace/redirects.py

@@ -1,79 +0,0 @@
-import re
-from types import MappingProxyType
-
-from rdflib import URIRef
-
-from iolanta.namespaces import (
-    DC,
-    DCTERMS,
-    FOAF,
-    OWL,
-    PROV,
-    RDF,
-    RDFS,
-    VANN,
-)
-
-REDIRECTS = MappingProxyType({
-    # FIXME This is presently hardcoded; we need to
-    #   - either find a way to resolve these URLs automatically,
-    #   - or create a repository of those redirects online.
-    'http://purl.org/vocab/vann/': URIRef(
-        'https://vocab.org/vann/vann-vocab-20100607.rdf',
-    ),
-    URIRef(str(DC)): URIRef(str(DCTERMS)),
-    URIRef(str(RDF)): URIRef(str(RDF)),
-    URIRef(str(RDFS)): URIRef(str(RDFS)),
-    URIRef(str(OWL)): URIRef(str(OWL)),
-
-    # Add # fragment to OWL and RDFS namespace URIs
-    # (fixes bug reported at https://stackoverflow.com/q/78934864/1245471)
-    URIRef('http://www.w3.org/2002/07/owl'): URIRef('http://www.w3.org/2002/07/owl#'),
-    URIRef('http://www.w3.org/2000/01/rdf-schema'): URIRef('http://www.w3.org/2000/01/rdf-schema#'),
-
-    # Redirect FOAF namespace to GitHub mirror
-    URIRef('https?://xmlns.com/foaf/0.1/.+'): URIRef(
-        'https://raw.githubusercontent.com/foaf/foaf/refs/heads/master/xmlns.com/htdocs/foaf/0.1/index.rdf',
-    ),
-    URIRef('https://www.nanopub.org/nschema'): URIRef(
-        'https://www.nanopub.net/nschema#',
-    ),
-    URIRef('https://nanopub.org/nschema'): URIRef(
-        'https://nanopub.net/nschema#',
-    ),
-
-    # Convert lexvo.org/id URLs to lexvo.org/data URLs
-    r'http://lexvo\.org/id/(.+)': r'http://lexvo.org/data/\1',
-    r'https://lexvo\.org/id/(.+)': r'http://lexvo.org/data/\1',
-    r'https://www\.lexinfo\.net/(.+)': r'http://www.lexinfo.net/\1',
-    # Convert Wikidata https:// to http:// (Wikidata JSON-LD uses http:// URIs)
-    r'https://www\.wikidata\.org/entity/(.+)': r'http://www.wikidata.org/entity/\1',
-})
-
-
-def apply_redirect(source: URIRef) -> URIRef:   # noqa: WPS210
-    """
-    Rewrite the URL using regex patterns and group substitutions.
-
-    For each pattern in REDIRECTS:
-    - If the pattern matches the source URI
-    - Replace the source with the destination, substituting any regex groups
-    """
-    source_str = str(source)
-
-    for pattern, destination in REDIRECTS.items():
-        pattern_str = str(pattern)
-        destination_str = str(destination)
-
-        match = re.match(pattern_str, source_str)
-        if match:
-            # Replace any group references in the destination
-            # (like \1, \2, etc.)
-            redirected_uri = re.sub(
-                pattern_str,
-                destination_str,
-                source_str,
-            )
-            return URIRef(redirected_uri)
-
-    return source