iolanta 1.2.6__tar.gz → 1.2.7__tar.gz

{iolanta-1.2.6 → iolanta-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 1.2.6
+Version: 1.2.7
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov

{iolanta-1.2.6 → iolanta-1.2.7}/iolanta/cli/main.py

@@ -1,17 +1,20 @@
 import locale
 import logging
+from pathlib import Path
 from typing import Annotated
 
 import loguru
 import platformdirs
 from documented import DocumentedError
-from rdflib import Literal
+from rdflib import Literal, URIRef
 from rich.console import Console
 from rich.markdown import Markdown
 from typer import Argument, Exit, Option, Typer
+from yarl import URL
 
 from iolanta.cli.models import LogLevel
 from iolanta.iolanta import Iolanta
+from iolanta.models import NotLiteralNode
 
 DEFAULT_LANGUAGE = locale.getlocale()[0].split('_')[0]
 
@@ -38,8 +41,24 @@ def construct_app() -> Typer:
 app = construct_app()
 
 
+def string_to_node(name: str) -> NotLiteralNode:
+    """
+    Parse a string into a node identifier.
+
+    String might be:
+      * a URL,
+      * or a local disk path.
+    """
+    url = URL(name)
+    if url.scheme:
+        return URIRef(name)
+
+    path = Path(name).absolute()
+    return URIRef(f'file://{path}')
+
+
 @app.command(name='browse')
-def render_command(   # noqa: WPS231, WPS238
+def render_command(   # noqa: WPS231, WPS238, WPS210, C901
     url: Annotated[str, Argument()],
     as_datatype: Annotated[
         str, Option(
@@ -79,12 +98,18 @@ def render_command(   # noqa: WPS231, WPS238
         logger=logger,
     )
 
-    node = iolanta.string_to_node(url)
+    node_url = URL(url)
+    if node_url.scheme:
+        node = URIRef(url)
+    else:
+        path = Path(url).absolute()
+        node = URIRef(f'file://{path}')
+        iolanta.add(path)
 
     try:
         renderable, stack = iolanta.render(
             node=node,
-            as_datatype=iolanta.string_to_node(as_datatype),
+            as_datatype=URIRef(as_datatype),
         )
 
     except DocumentedError as documented_error:

{iolanta-1.2.6 → iolanta-1.2.7}/iolanta/cyberspace/processor.py

@@ -463,6 +463,8 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         )
         if existing_triple is not None:
             return Skipped()
+        else:
+            self.logger.warning(f'Existing triples not found for {source_uri}')
 
         # FIXME This is definitely inefficient. However, python-yaml-ld caches
         #   the document, so the performance overhead is not super high.
@@ -604,32 +606,13 @@ class GlobalSPARQLProcessor(Processor):  # noqa: WPS338, WPS214
         self.graph.addN(quad_tuples)
         self.graph.last_not_inferred_source = source
 
-        created_graphs = {
-            normalize_term(quad.graph)
+        into_graphs = ', '.join({
+            quad.graph
             for quad in quads
-            if quad.graph != source_uri
-        }
-        self.graph.addN(
-            itertools.chain.from_iterable(
-                [
-                    (
-                        source_uri,
-                        IOLANTA['has-sub-graph'],
-                        created_graph,
-                        source_uri,
-                    ),
-                    (
-                        created_graph,
-                        RDF.type,
-                        IOLANTA.Graph,
-                        source_uri,
-                    ),
-                ]
-                for created_graph in created_graphs
-            ),
+        })
+        self.logger.info(
+            f'{source} | loaded successfully into graphs: {into_graphs}',
         )
-
-        self.logger.info(f'{source} | loaded successfully.')
         return Loaded()
 
     def resolve_term(self, term: Node, bindings: dict[str, Node]):

{iolanta-1.2.6 → iolanta-1.2.7}/iolanta/iolanta.py

@@ -104,15 +104,6 @@ class Iolanta:   # noqa: WPS214
         init=False,
     )
 
-    @functools.cached_property
-    def loader(self) -> Loader[SourceType]:
-        """
-        Construct loader.
-
-        FIXME: Delete this.
-        """
-        return construct_root_loader(logger=self.logger)
-
     @property
     def plugin_classes(self) -> List[Type[Plugin]]:
         """Installed Iolanta plugins."""
@@ -162,19 +153,14 @@ class Iolanta:   # noqa: WPS214
         context: Optional[LDContext] = None,
         graph_iri: Optional[URIRef] = None,
     ) -> 'Iolanta':
-        """
-        Parse & load information from given URL into the graph.
-
-        FIXME:
-          * Maybe implement context.json/context.yaml files support.
-        """
+        """Parse & load information from given URL into the graph."""
         self.logger.info(f'Adding to graph: {source}')
         self.sources_added_not_yet_inferred.append(source)
 
         if not isinstance(source, Path):
             source = Path(source)
 
-        for source_file in source.rglob('*'):
+        for source_file in list(source.rglob('*')) or [source]:
             if source_file.is_dir():
                 continue
 
@@ -319,31 +305,6 @@ class Iolanta:   # noqa: WPS214
         self.bind_namespaces()
         self.add_files_from_plugins()
 
-    def string_to_node(self, name: str | Node) -> NotLiteralNode:
-        """
-        Parse a string into a node identifier.
-
-        String might be:
-          * a full IRI,
-          * a qname,
-          * a qname with implied `local:` part,
-          * or a blank node identifier.
-        """
-        if isinstance(name, Node):
-            return name
-
-        if ':' in name:
-            # This is either a full IRI, a qname, or a blank node identifier.
-            try:
-                # Trying to interpret this as QName.
-                return self.graph.namespace_manager.expand_curie(name)
-            except ValueError:
-                # If it is not a QName then it is an IRI, let's return it.
-                return URIRef(name)
-
-        # This string does not include an ":", so we imply `local:`.
-        return URIRef(f'local:{name}')
-
     def render(
         self,
         node: Node,

{iolanta-1.2.6 → iolanta-1.2.7}/iolanta/parse_quads.py

@@ -7,6 +7,7 @@ from rdflib.term import Node
 
 from iolanta.errors import UnresolvedIRI
 from iolanta.models import Quad
+from iolanta.namespaces import IOLANTA, RDF
 from iolanta.parsers.errors import SpaceInProperty
 
 
@@ -66,6 +67,20 @@ def parse_quads(
         else:
             graph_name = URIRef(graph_name)
 
+            yield Quad(
+                graph,
+                IOLANTA['has-sub-graph'],
+                graph_name,
+                graph,
+            )
+
+        yield Quad(
+            graph_name,
+            RDF.type,
+            IOLANTA.Graph,
+            IOLANTA.meta,
+        )
+
         for quad in quads:
             try:
                 yield Quad(

{iolanta-1.2.6 → iolanta-1.2.7}/pyproject.toml

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