iolanta 2.1.12__py3-none-any.whl → 2.1.13__py3-none-any.whl

iolanta/cli/main.py

@@ -7,18 +7,25 @@ from typing import Annotated
 import loguru
 import platformdirs
 from documented import DocumentedError
-from rdflib import Literal, URIRef
+from rdflib import Graph, Literal, URIRef
 from rich.console import Console
 from rich.markdown import Markdown
 from rich.table import Table
-from typer import Argument, Context, Exit, Option, Typer
+from typer import Argument, Exit, Option, Typer
 from yarl import URL
 
 from iolanta.cli.models import LogLevel
+from iolanta.facets.errors import FacetNotFound
 from iolanta.iolanta import Iolanta
 from iolanta.models import NotLiteralNode
+from iolanta.namespaces import DATATYPES
+from iolanta.query_result import (
+    QueryResult,
+    SPARQLParseException,
+    SelectResult,
+)
 
-DEFAULT_LANGUAGE = locale.getlocale()[0].split('_')[0]
+DEFAULT_LANGUAGE = locale.getlocale()[0].split("_")[0]
 
 
 console = Console()
@@ -40,23 +47,18 @@ def string_to_node(name: str) -> NotLiteralNode:
         return URIRef(name)
 
     path = Path(name).absolute()
-    return URIRef(f'file://{path}')
+    return URIRef(f"file://{path}")
 
 
 def decode_datatype(datatype: str) -> URIRef:
-    if datatype.startswith('http'):
+    if datatype.startswith("http"):
         return URIRef(datatype)
 
-    return URIRef(f'https://iolanta.tech/datatypes/{datatype}')
+    return URIRef(f"https://iolanta.tech/datatypes/{datatype}")
 
 
-def render_and_return(
-    url: str,
-    as_datatype: str,
-    language: str = DEFAULT_LANGUAGE,
-    log_level: LogLevel = LogLevel.ERROR,
-):
-    """Render a given URL."""
+def setup_logging(log_level: LogLevel):
+    """Configure and return logger."""
     level = {
         LogLevel.DEBUG: logging.DEBUG,
         LogLevel.INFO: logging.INFO,
@@ -64,111 +66,229 @@ def render_and_return(
         LogLevel.ERROR: logging.ERROR,
     }[log_level]
 
-    log_file_path = platformdirs.user_log_path(
-        'iolanta',
-        ensure_exists=True,
-    ) / 'iolanta.log'
+    log_file_path = (
+        platformdirs.user_log_path(
+            "iolanta",
+            ensure_exists=True,
+        )
+        / "iolanta.log"
+    )
 
-    # Get the level name first
     level_name = {
-        logging.DEBUG: 'DEBUG',
-        logging.INFO: 'INFO', 
-        logging.WARNING: 'WARNING',
-        logging.ERROR: 'ERROR',
+        logging.DEBUG: "DEBUG",
+        logging.INFO: "INFO",
+        logging.WARNING: "WARNING",
+        logging.ERROR: "ERROR",
     }[level]
-    
-    # Configure global loguru logger BEFORE creating Iolanta instance
+
     loguru.logger.remove()
     loguru.logger.add(
         log_file_path,
         level=level_name,
-        format='{time} {level} {message}',
+        format="{time} {level} {message}",
         enqueue=True,
     )
     loguru.logger.add(
         sys.stderr,
         level=level_name,
-        format='{time} | {level:<8} | {name}:{function}:{line} - {message}',
+        format="{time} | {level:<8} | {name}:{function}:{line} - {message}",
     )
     loguru.logger.level(level_name)
-    
-    # Use the global logger
-    logger = loguru.logger
-    
-    node_url = URL(url)
-    if node_url.scheme and node_url.scheme != 'file':
-        node = URIRef(url)
 
-        iolanta: Iolanta = Iolanta(
-            language=Literal(language),
-            logger=logger,
+    return loguru.logger
+
+
+def handle_error(
+    error: Exception,
+    log_level: LogLevel,
+    use_markdown: bool = True,
+) -> None:
+    """
+    Handle an error by checking log level and printing appropriately.
+
+    If log level is DEBUG or INFO, re-raise the error.
+    Otherwise, print it and exit with code 1.
+    """
+    level = {
+        LogLevel.DEBUG: logging.DEBUG,
+        LogLevel.INFO: logging.INFO,
+        LogLevel.WARNING: logging.WARNING,
+        LogLevel.ERROR: logging.ERROR,
+    }[log_level]
+
+    if level in {logging.DEBUG, logging.INFO}:
+        raise error
+
+    if use_markdown:
+        console.print(
+            Markdown(
+                str(error),
+                justify="left",
+            ),
         )
-        
     else:
-        path = Path(node_url.path).absolute()
-        node = URIRef(f'file://{path}')
+        console.print(str(error))
+
+    raise Exit(1)
+
+
+def create_query_node(query_result: QueryResult) -> Literal:
+    """
+    Create a Literal node from a query result.
+
+    Converts QueryResult (SelectResult, Graph, or bool) into a Literal
+    with the appropriate datatype for facet rendering.
+    """
+    match query_result:
+        case SelectResult():
+            return Literal(
+                query_result,
+                datatype=DATATYPES["sparql-select-result"],
+            )
+        case Graph():
+            return Literal(
+                query_result,
+                datatype=DATATYPES["sparql-construct-result"],
+            )
+        case bool():
+            return Literal(
+                query_result,
+                datatype=DATATYPES["sparql-ask-result"],
+            )
+
+
+def render_and_return(
+    node: Literal | URIRef,
+    as_datatype: str,
+    language: str = DEFAULT_LANGUAGE,
+    log_level: LogLevel = LogLevel.ERROR,
+):
+    """
+    Render a node.
+
+    The node must be either a URIRef (for URLs) or a Literal (for query results).
+    """
+    logger = setup_logging(log_level)
+
+    # Determine Iolanta instance based on node type
+    if isinstance(node, Literal):
+        # Literal nodes (e.g., from query results) are used directly
+        # Use current directory as project_root for query results
         iolanta: Iolanta = Iolanta(
             language=Literal(language),
             logger=logger,
-            project_root=path,
+            project_root=Path.cwd(),
         )
+    elif isinstance(node, URIRef):
+        # URIRef - determine project_root if it's a file:// URI
+        if str(node).startswith("file://"):
+            path = Path(str(node).replace("file://", ""))
+            iolanta: Iolanta = Iolanta(
+                language=Literal(language),
+                logger=logger,
+                project_root=path,
+            )
+        else:
+            iolanta: Iolanta = Iolanta(
+                language=Literal(language),
+                logger=logger,
+            )
+    else:
+        # This should never happen due to type checking, but kept for safety
+        raise TypeError(f"Expected Literal or URIRef, got {type(node)}")
 
     return iolanta.render(
-        node=URIRef(node),
+        node=node,
         as_datatype=decode_datatype(as_datatype),
     )
 
 
-@app.command(name='render')
-def render_command(   # noqa: WPS231, WPS238, WPS210, C901
-    url: Annotated[str, Argument()],
+@app.command(name="render")
+def render_command(  # noqa: WPS231, WPS238, WPS210, C901
+    url: Annotated[str | None, Argument()] = None,
+    query: Annotated[
+        str | None,
+        Option(
+            "--query",
+            help="SPARQL query to execute.",
+        ),
+    ] = None,
     as_datatype: Annotated[
-        str, Option(
-            '--as',
+        str | None,
+        Option(
+            "--as",
         ),
-    ] = 'https://iolanta.tech/cli/interactive',
+    ] = None,
     language: Annotated[
-        str, Option(
-            help='Data language to prefer.',
+        str,
+        Option(
+            help="Data language to prefer.",
         ),
     ] = DEFAULT_LANGUAGE,
     log_level: LogLevel = LogLevel.ERROR,
 ):
     """Render a given URL."""
-    try:
-        renderable = render_and_return(url, as_datatype, language, log_level)
-    except DocumentedError as documented_error:
-        level = {
-            LogLevel.DEBUG: logging.DEBUG,
-            LogLevel.INFO: logging.INFO,
-            LogLevel.WARNING: logging.WARNING,
-            LogLevel.ERROR: logging.ERROR,
-        }[log_level]
-        
-        if level in {logging.DEBUG, logging.INFO}:
-            raise
+    if query is not None:
+        # For queries, default to 'table' format
+        if as_datatype is None:
+            as_datatype = "table"
 
-        console.print(
-            Markdown(
-                str(documented_error),
-                justify='left',
-            ),
+        # Setup logging and create Iolanta instance (unlikely to raise)
+        logger = setup_logging(log_level)
+        iolanta: Iolanta = Iolanta(
+            language=Literal(language),
+            logger=logger,
+            project_root=Path.cwd(),
         )
-        raise Exit(1)
 
-    except Exception as err:
-        level = {
-            LogLevel.DEBUG: logging.DEBUG,
-            LogLevel.INFO: logging.INFO,
-            LogLevel.WARNING: logging.WARNING,
-            LogLevel.ERROR: logging.ERROR,
-        }[log_level]
-        
-        if level in {logging.DEBUG, logging.INFO}:
-            raise
-
-        console.print(str(err))
+        try:
+            renderable = render_and_return(
+                node=create_query_node(iolanta.query(query)),
+                as_datatype=as_datatype,
+                language=language,
+                log_level=log_level,
+            )
+        except (SPARQLParseException, DocumentedError, FacetNotFound) as error:
+            handle_error(error, log_level, use_markdown=True)
+        except Exception as error:
+            handle_error(error, log_level, use_markdown=False)
+        else:
+            # FIXME: An intermediary Literal can be used to dispatch rendering.
+            match renderable:
+                case Table() as table:
+                    console.print(table)
+
+                case unknown:
+                    console.print(unknown)
+        return
+
+    if url is None:
+        console.print("Error: Either URL or --query must be provided")
         raise Exit(1)
+
+    # For URLs, default to interactive mode
+    if as_datatype is None:
+        as_datatype = "https://iolanta.tech/cli/interactive"
+
+    # Parse string URL to URIRef (URL() is permissive and won't raise)
+    node_url = URL(url)
+    if node_url.scheme and node_url.scheme != "file":
+        node = URIRef(url)
+    else:
+        path = Path(node_url.path).absolute()
+        node = URIRef(f"file://{path}")
+
+    try:
+        renderable = render_and_return(
+            node=node,
+            as_datatype=as_datatype,
+            language=language,
+            log_level=log_level,
+        )
+    except DocumentedError as error:
+        handle_error(error, log_level, use_markdown=True)
+    except Exception as error:
+        handle_error(error, log_level, use_markdown=False)
     else:
         # FIXME: An intermediary Literal can be used to dispatch rendering.
         match renderable:
@@ -176,4 +296,4 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
                 console.print(table)
 
             case unknown:
-                print(unknown)
+                console.print(unknown)

iolanta/facets/query/ask_result_csv.py

@@ -0,0 +1,23 @@
+from pathlib import Path
+
+from rdflib import Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class AskResultCsvFacet(RichFacet):
+    """Render ASK query results as CSV."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render bool (ASK result) as CSV."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        query_result = self.this.value
+
+        return "result\n" + str(query_result).lower()

iolanta/facets/query/ask_result_json.py

@@ -0,0 +1,24 @@
+import json
+from pathlib import Path
+
+from rdflib import Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class AskResultJsonFacet(RichFacet):
+    """Render ASK query results as JSON."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render bool (ASK result) as JSON."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        query_result = self.this.value
+
+        return json.dumps(query_result)

iolanta/facets/query/ask_result_table.py

@@ -0,0 +1,23 @@
+from pathlib import Path
+
+from rdflib import Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class AskResultTableFacet(RichFacet):
+    """Render ASK query results as table/text."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render bool (ASK result) as text."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        query_result = self.this.value
+
+        return "✅ `True`" if query_result else "❌ `False`"

iolanta/facets/query/construct_result_csv.py

@@ -0,0 +1,34 @@
+import csv
+import io
+from pathlib import Path
+from typing import cast
+
+from rdflib import Graph, Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class ConstructResultCsvFacet(RichFacet):
+    """Render CONSTRUCT query results as CSV."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render Graph (CONSTRUCT result) as CSV."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        graph = cast(Graph, self.this.value)
+
+        if not graph:
+            return ""
+
+        output = io.StringIO()
+        writer = csv.writer(output)
+        writer.writerow(('subject', 'predicate', 'object'))
+        writer.writerows(graph)
+
+        return output.getvalue()

iolanta/facets/query/construct_result_json.py

@@ -0,0 +1,32 @@
+import json
+from pathlib import Path
+from typing import cast
+
+from rdflib import Graph, Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class ConstructResultJsonFacet(RichFacet):
+    """Render CONSTRUCT query results as JSON."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render Graph (CONSTRUCT result) as JSON."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        graph = cast(Graph, self.this.value)
+        fieldnames = ('subject', 'predicate', 'object')
+        return json.dumps(
+            [
+                dict(zip(fieldnames, triple))
+                for triple in graph
+            ],
+            indent=2,
+            default=str,
+        )

iolanta/facets/query/construct_result_table.py

@@ -0,0 +1,55 @@
+from pathlib import Path
+from typing import cast
+
+from more_itertools import consume
+from rdflib import Graph, Literal
+from rich.table import Table
+
+from iolanta.cli.formatters.pretty import pretty_print_value
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class ConstructResultTableFacet(RichFacet):
+    """Render CONSTRUCT query results as table."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render Graph (CONSTRUCT result) as table."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        graph = cast(Graph, self.this.value)
+
+        if not graph:
+            table = Table(
+                'Subject',
+                'Predicate',
+                'Object',
+                show_header=True,
+                header_style="bold magenta",
+            )
+            return table
+
+        table = Table(
+            'Subject',
+            'Predicate',
+            'Object',
+            show_header=True,
+            header_style="bold magenta",
+        )
+
+        consume(
+            table.add_row(
+                *[
+                    str(pretty_print_value(value))
+                    for value in triple
+                ],
+            )
+            for triple in graph
+        )
+
+        return table

iolanta/facets/query/data/query_result.yamlld

@@ -0,0 +1,102 @@
+"@context":
+  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
+  iolanta: https://iolanta.tech/
+  rdfs: "http://www.w3.org/2000/01/rdf-schema#"
+  rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
+  owl: http://www.w3.org/2002/07/owl#
+
+  $: rdfs:label
+  →:
+    "@type": "@id"
+    "@id": iolanta:outputs
+  ⊆:
+    "@type": "@id"
+    "@id": rdfs:subClassOf
+  iolanta:hasDatatypeFacet:
+    "@type": "@id"
+
+$included:
+  # Define the three SPARQL result datatypes
+  - $id: https://iolanta.tech/datatypes/sparql-select-result
+    $type: owl:Class
+    ⊆: rdfs:Datatype
+    $: SPARQL SELECT Result
+    rdfs:comment: Datatype for SPARQL SELECT query results (variable bindings)
+
+  - $id: https://iolanta.tech/datatypes/sparql-construct-result
+    $type: owl:Class
+    ⊆: rdfs:Datatype
+    $: SPARQL CONSTRUCT Result
+    rdfs:comment: Datatype for SPARQL CONSTRUCT query results (RDF graph)
+
+  - $id: https://iolanta.tech/datatypes/sparql-ask-result
+    $type: owl:Class
+    ⊆: rdfs:Datatype
+    $: SPARQL ASK Result
+    rdfs:comment: Datatype for SPARQL ASK query results (boolean)
+
+  # Register SelectResult facets for each output format
+  - $id: pkg:pypi/iolanta#select-result-table-facet
+    $type: iolanta:Facet
+    $: SPARQL SELECT Result Table Facet
+    →: https://iolanta.tech/datatypes/table
+
+  - $id: pkg:pypi/iolanta#select-result-json-facet
+    $type: iolanta:Facet
+    $: SPARQL SELECT Result JSON Facet
+    →: https://iolanta.tech/datatypes/json
+
+  - $id: pkg:pypi/iolanta#select-result-csv-facet
+    $type: iolanta:Facet
+    $: SPARQL SELECT Result CSV Facet
+    →: https://iolanta.tech/datatypes/csv
+
+  - $id: https://iolanta.tech/datatypes/sparql-select-result
+    iolanta:hasDatatypeFacet:
+      - pkg:pypi/iolanta#select-result-table-facet
+      - pkg:pypi/iolanta#select-result-json-facet
+      - pkg:pypi/iolanta#select-result-csv-facet
+
+  # Register ConstructResult facets for each output format
+  - $id: pkg:pypi/iolanta#construct-result-table-facet
+    $type: iolanta:Facet
+    $: SPARQL CONSTRUCT Result Table Facet
+    →: https://iolanta.tech/datatypes/table
+
+  - $id: pkg:pypi/iolanta#construct-result-json-facet
+    $type: iolanta:Facet
+    $: SPARQL CONSTRUCT Result JSON Facet
+    →: https://iolanta.tech/datatypes/json
+
+  - $id: pkg:pypi/iolanta#construct-result-csv-facet
+    $type: iolanta:Facet
+    $: SPARQL CONSTRUCT Result CSV Facet
+    →: https://iolanta.tech/datatypes/csv
+
+  - $id: https://iolanta.tech/datatypes/sparql-construct-result
+    iolanta:hasDatatypeFacet:
+      - pkg:pypi/iolanta#construct-result-table-facet
+      - pkg:pypi/iolanta#construct-result-json-facet
+      - pkg:pypi/iolanta#construct-result-csv-facet
+
+  # Register AskResult facets for each output format
+  - $id: pkg:pypi/iolanta#ask-result-table-facet
+    $type: iolanta:Facet
+    $: SPARQL ASK Result Table Facet
+    →: https://iolanta.tech/datatypes/table
+
+  - $id: pkg:pypi/iolanta#ask-result-json-facet
+    $type: iolanta:Facet
+    $: SPARQL ASK Result JSON Facet
+    →: https://iolanta.tech/datatypes/json
+
+  - $id: pkg:pypi/iolanta#ask-result-csv-facet
+    $type: iolanta:Facet
+    $: SPARQL ASK Result CSV Facet
+    →: https://iolanta.tech/datatypes/csv
+
+  - $id: https://iolanta.tech/datatypes/sparql-ask-result
+    iolanta:hasDatatypeFacet:
+      - pkg:pypi/iolanta#ask-result-table-facet
+      - pkg:pypi/iolanta#ask-result-json-facet
+      - pkg:pypi/iolanta#ask-result-csv-facet

iolanta/facets/query/select_result_csv.py

@@ -0,0 +1,36 @@
+import csv
+import io
+from pathlib import Path
+
+from rdflib import Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class SelectResultCsvFacet(RichFacet):
+    """Render SELECT query results as CSV."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render SelectResult as CSV."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        query_result = self.this.value
+
+        if not query_result:
+            return ""
+
+        output = io.StringIO()
+        first_row = query_result[0]
+        fieldnames = first_row.keys()
+
+        writer = csv.DictWriter(output, fieldnames=fieldnames)
+        writer.writeheader()
+        writer.writerows(query_result)
+
+        return output.getvalue()

iolanta/facets/query/select_result_json.py

@@ -0,0 +1,24 @@
+import json
+from pathlib import Path
+
+from rdflib import Literal
+
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class SelectResultJsonFacet(RichFacet):
+    """Render SELECT query results as JSON."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render SelectResult as JSON."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        query_result = self.this.value
+
+        return json.dumps(query_result, indent=2, default=str)

iolanta/facets/query/select_result_table.py

@@ -0,0 +1,48 @@
+from pathlib import Path
+
+from more_itertools import consume, first
+from rdflib import Literal
+from rich.table import Table
+
+from iolanta.cli.formatters.pretty import pretty_print_value
+from iolanta.facets.cli.base import Renderable, RichFacet
+from iolanta.facets.errors import NotALiteral
+
+META = Path(__file__).parent / 'data' / 'query_result.yamlld'
+
+
+class SelectResultTableFacet(RichFacet):
+    """Render SELECT query results as table."""
+
+    META = META
+
+    def show(self) -> Renderable:
+        """Render SelectResult as table."""
+        if not isinstance(self.this, Literal):
+            raise NotALiteral(node=self.this)
+
+        query_result = self.this.value
+
+        if not query_result:
+            table = Table(show_header=True, header_style="bold magenta")
+            return table
+
+        columns = first(query_result).keys()
+
+        table = Table(
+            *columns,
+            show_header=True,
+            header_style="bold magenta",
+        )
+
+        consume(
+            table.add_row(
+                *[
+                    str(pretty_print_value(value))
+                    for value in row.values()
+                ],
+            )
+            for row in query_result
+        )
+
+        return table

iolanta/mcp/cli.py

@@ -1,6 +1,9 @@
+from pathlib import Path
 from typing import Annotated
 
 from fastmcp import FastMCP
+from rdflib import URIRef
+from yarl import URL
 
 from iolanta.cli.main import render_and_return
 
@@ -9,11 +12,21 @@ mcp = FastMCP("Iolanta MCP Server")
 
 @mcp.tool()
 def render_uri(
-    uri: Annotated[str, 'URL, or file system path, to render'],
-    as_format: Annotated[str, 'Format to render as. Examples: `labeled-triple-set`, `mermaid`'],
+    uri: Annotated[str, "URL, or file system path, to render"],
+    as_format: Annotated[
+        str, "Format to render as. Examples: `labeled-triple-set`, `mermaid`"
+    ],
 ) -> str:
     """Render a URI."""
-    return str(render_and_return(uri, as_format))
+    # Parse string URL to URIRef
+    node_url = URL(uri)
+    if node_url.scheme and node_url.scheme != "file":
+        node = URIRef(uri)
+    else:
+        path = Path(node_url.path).absolute()
+        node = URIRef(f"file://{path}")
+
+    return str(render_and_return(node=node, as_datatype=as_format))
 
 
 def app():

iolanta/mermaid/models.py

@@ -12,7 +12,10 @@ from iolanta.models import NotLiteralNode  # noqa: WPS202
 
 
 def escape_label(label: str) -> str:
-    """Escape a label to prevent Mermaid from interpreting URLs as markdown links and handle quotes.
+    """Escape a label and return it wrapped in appropriate quotes.
+
+    Returns the label with URLs stripped, quotes escaped, and wrapped in quotes.
+    Uses single quotes if label contains double quotes to avoid escaping issues.
 
     Escapes quotes in labels that will be wrapped in quotes in Mermaid syntax.
     """
@@ -20,8 +23,15 @@ def escape_label(label: str) -> str:
     safe_label = (
         label.replace("https://", "").replace("http://", "").replace("www.", "")
     )
-    # Escape quotes for use inside quoted strings in Mermaid
-    return safe_label.replace('"', r'\"')
+    # Use single quotes if label contains double quotes to avoid escaping issues
+    use_single = '"' in safe_label
+    quote_char = "'" if use_single else '"'
+    # Escape the quote character that will be used for wrapping
+    if use_single:
+        escaped_label = safe_label.replace("'", r"\'")
+    else:
+        escaped_label = safe_label.replace('"', r"\"")
+    return f"{quote_char}{escaped_label}{quote_char}"
 
 
 class Direction(enum.StrEnum):
@@ -54,14 +64,13 @@ class MermaidURINode(MermaidScalar, frozen=True):
     def maybe_title(self):
         if not self.title:
             return ""
-        # Escape URLs to prevent Mermaid from interpreting them as markdown links
-        safe_title = escape_label(self.title)
-        return f'("{safe_title}")'
+        quoted_title = escape_label(self.title)
+        return f"({quoted_title})"
 
     @property
     def id(self):
         return re.sub(
-            r"[:\/\.#()]", "_", urllib_parse.unquote(str(self.url)).strip("/")
+            r"[:\/\.#()?=&+]", "_", urllib_parse.unquote(str(self.url)).strip("/")
         )
 
 
@@ -85,7 +94,7 @@ class MermaidLiteral(MermaidScalar, frozen=True):
 
 
 class MermaidBlankNode(MermaidScalar):
-    """{self.id}("{self.escaped_title}")"""
+    """{self.id}({self.escaped_title})"""
 
     node: BNode
     title: str
@@ -102,7 +111,7 @@ class MermaidBlankNode(MermaidScalar):
 
 class MermaidEdge(MermaidScalar):
     """
-    {self.source.id} --- {self.id}(["{self.escaped_title}"])--> {self.target.id}
+    {self.source.id} --- {self.id}([{self.escaped_title}])--> {self.target.id}
     click {self.id} "{self.predicate}"
     class {self.id} predicate
     """
@@ -130,7 +139,7 @@ class MermaidEdge(MermaidScalar):
 
 class MermaidSubgraph(Documented, BaseModel, arbitrary_types_allowed=True, frozen=True):
     """
-    subgraph {self.id}["{self.escaped_title}"]
+    subgraph {self.id}[{self.escaped_title}]
       direction {self.direction}
       {self.formatted_body}
     end

{iolanta-2.1.12.dist-info → iolanta-2.1.13.dist-info}/METADATA

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

{iolanta-2.1.12.dist-info → iolanta-2.1.13.dist-info}/RECORD

@@ -6,7 +6,7 @@ iolanta/cli/formatters/choose.py,sha256=LWzsO_9IBSSgYNIyLlItkp8TNvpW3v6YCQ8-6kbI
 iolanta/cli/formatters/csv.py,sha256=ceJ_DTz0beqeK-d6FPBQqqjXrziEfF0FRSLoGZCt_fs,760
 iolanta/cli/formatters/json.py,sha256=Og5B9UrSM_0NWqW5Afpsy6WH8ZfYgPMVXYvT3i-43Jc,748
 iolanta/cli/formatters/pretty.py,sha256=IypZRAr2vNqcXFY6NOIc75mpyfpFWh56aCBlOPDDieQ,2901
-iolanta/cli/main.py,sha256=CZ22-DQY3xHvvUiq1o9XDrpC2an4429yQNOE8LytDkg,4524
+iolanta/cli/main.py,sha256=T1l1ilWp818pF3oR6VJIlPQ_ElicN7ECGlcJm5XiUqo,8170
 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
@@ -61,6 +61,17 @@ iolanta/facets/mkdocs_material_insiders_markdown/facet.py,sha256=EY-H4gR5YgiDVt2
 iolanta/facets/mkdocs_material_insiders_markdown/templates/datatype.jinja2.md,sha256=k9GSdy27mAY3eRL899pk6ZCYr4ZpEY1EuM5RY-OApYM,551
 iolanta/facets/page_title.py,sha256=TwgZK2g_e5UoWYjKNgDzzkmq1EI3cY58680iC8N9kZI,1407
 iolanta/facets/qname.py,sha256=Z2wjDWV90Z4vuwLj31MSf5EBGTb0dxzjlKl-Iv4dPao,533
+iolanta/facets/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+iolanta/facets/query/ask_result_csv.py,sha256=oDuk_a8RiTsyXZuPraUSKswC7dLTCjSFJU8tyRaLALY,589
+iolanta/facets/query/ask_result_json.py,sha256=qXKIg1AdVPixd3SDY_nyXleJ7y4Q94kPFnanzsCmcTM,590
+iolanta/facets/query/ask_result_table.py,sha256=QdmrhKofca7ZOca9SN7GA3Riite1NPOsrKdLvW0xXkU,608
+iolanta/facets/query/construct_result_csv.py,sha256=70KYP9aSnGSm_Gxk6Wjcik4YkvsdmAlO5EwNVOE59Nc,850
+iolanta/facets/query/construct_result_json.py,sha256=mdaxGReivhHGtK_0OCMky6BcQ7EGth0-nEUMNy4XnpE,856
+iolanta/facets/query/construct_result_table.py,sha256=bCUHj0eW086Rx7g6gW432j8Js4vFNCNceH_AJhnJ7po,1398
+iolanta/facets/query/data/query_result.yamlld,sha256=uutBc4XEYh3LSVeYdvrs5uVsdDU7e9TQ2TQEtDfzaks,3440
+iolanta/facets/query/select_result_csv.py,sha256=Js5h_MJ-DgWGJbhypuLoJ0UiW7wsS8rG23aMCAOGdd0,880
+iolanta/facets/query/select_result_json.py,sha256=gajYXgROSWphYeimfO0W1xumsMLdpy_d57QgYQEI3a4,614
+iolanta/facets/query/select_result_table.py,sha256=ePeUydu4bV7MZciZriPreIKgshrtfd8qn9qQC59hsBg,1236
 iolanta/facets/textual_browser/__init__.py,sha256=sKgDvXOwib9n9d63kdtKCEv26-FoL0VN6zxDmfcheZ8,104
 iolanta/facets/textual_browser/app.py,sha256=rF34KbWi0L-Mozwzm-wzBS-3OqCcwbaXl0GZCl4YpAg,3503
 iolanta/facets/textual_browser/facet.py,sha256=5mX1l6P-Ga7buzXmItxSpta6G_D4Fvwv8H6mU8-3g80,742
@@ -124,11 +135,11 @@ iolanta/labeled_triple_set/data/labeled_triple_set.yamlld,sha256=P3oAPSPsirpbcRX
 iolanta/labeled_triple_set/labeled_triple_set.py,sha256=o4IgvTvPd0mzBtpgHYd4n1xpujYdAvWBr6gIYwp5vnA,4061
 iolanta/labeled_triple_set/sparql/triples.sparql,sha256=VsCmYN5AX7jSIiFm-SqLcRcOvUVj8yyZI4PSzKROtQw,82
 iolanta/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iolanta/mcp/cli.py,sha256=wlDandYo_VoMIg9oDGPJsIsMmiPo4j4-RBytIKWDtEI,484
+iolanta/mcp/cli.py,sha256=QRHrkGnfxXNZx_iUwTbXz4zZwvp5N_ceKoB8ae_fLzY,823
 iolanta/mermaid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/mermaid/facet.py,sha256=8mLOBrzlY84jiWhtJNY5BkXPDpRhL2OB1LUwwwNS1X0,4065
 iolanta/mermaid/mermaid.yamlld,sha256=G_8lqNfs6S7pz9koDC8xAaic4EaHsYnFLgexDVyMuCU,552
-iolanta/mermaid/models.py,sha256=5lvIu_M3FtoM2tAU7dL6WOMzHwr1ix0BdfOKtiU7Y-Q,4969
+iolanta/mermaid/models.py,sha256=OzY54DZbxmOCqlfyfin2h8NR3EytdgwlNhbpnY_PH7Y,5330
 iolanta/mermaid/sparql/ask-has-triples.sparql,sha256=mOYJ_rutEG_15PKTCHSv2GqzbkAawIn1U2kjkIr_Me0,41
 iolanta/mermaid/sparql/graph.sparql,sha256=mDGf05od3CUFhzI6rcqt5ZMVy-gSKDu-WxmV_zpIsVI,62
 iolanta/mermaid/sparql/subgraphs.sparql,sha256=VuoOYr_ZtKXXRrBpAEJek0mBRzR9EV-KnKENgAbkzCs,71
@@ -154,7 +165,7 @@ iolanta/sparqlspace/sparqlspace.py,sha256=Y8_ZPXwuGEXbEes6XQjaQWA2Zv9y8SWxMPDFdq
 iolanta/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iolanta/widgets/description.py,sha256=98Qd3FwT9r8sYqKjl9ZEptaVX9jJ2ULWf0uy3j52p5o,800
 iolanta/widgets/mixin.py,sha256=nDRCOc-gizCf1a5DAcYs4hW8eZEd6pHBPFsfm0ncv7E,251
-iolanta-2.1.12.dist-info/METADATA,sha256=T4Ee-_-SCeBpfvtXKzAmtNRG3Af_EoWeHGYu1uaUYYE,2317
-iolanta-2.1.12.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-iolanta-2.1.12.dist-info/entry_points.txt,sha256=2WLr6410ZI7lwzxevIn74trs3U_y4Rx8aK3N3NT_YPw,1786
-iolanta-2.1.12.dist-info/RECORD,,
+iolanta-2.1.13.dist-info/METADATA,sha256=9qsxicf-PrUK46WZ45pVAIpxd9d66ZgSNXkcncdfeFU,2317
+iolanta-2.1.13.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+iolanta-2.1.13.dist-info/entry_points.txt,sha256=Z1f3OaNruE2a6eprkiLgcPw-lZCah_cRT-PTlDD-Y1s,2569
+iolanta-2.1.13.dist-info/RECORD,,

{iolanta-2.1.12.dist-info → iolanta-2.1.13.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
+Generator: poetry-core 2.3.0
 Root-Is-Purelib: true
 Tag: py3-none-any

{iolanta-2.1.12.dist-info → iolanta-2.1.13.dist-info}/entry_points.txt

@@ -4,7 +4,13 @@ iolanta-mcp=iolanta.mcp.cli:app
 sparqlspace=iolanta.sparqlspace.cli:app
 
 [iolanta.facets]
+ask-result-csv-facet=iolanta.facets.query.ask_result_csv:AskResultCsvFacet
+ask-result-json-facet=iolanta.facets.query.ask_result_json:AskResultJsonFacet
+ask-result-table-facet=iolanta.facets.query.ask_result_table:AskResultTableFacet
 boolean=iolanta.facets.generic:BoolLiteral
+construct-result-csv-facet=iolanta.facets.query.construct_result_csv:ConstructResultCsvFacet
+construct-result-json-facet=iolanta.facets.query.construct_result_json:ConstructResultJsonFacet
+construct-result-table-facet=iolanta.facets.query.construct_result_table:ConstructResultTableFacet
 icon=iolanta.facets.icon:IconFacet
 labeled-triple-set=iolanta.labeled_triple_set.labeled_triple_set:LabeledTripleSet
 mermaid-graph=iolanta.mermaid.facet:Mermaid
@@ -12,6 +18,9 @@ mermaid-roadmap=iolanta.facets.mermaid_roadmap.facet:MermaidRoadmap
 mkdocs-material-insiders-markdown-datatype=iolanta.facets.mkdocs_material_insiders_markdown:MkDocsMaterialInsidersMarkdownFacet
 qname=iolanta.facets.qname:QNameFacet
 rich-declension-table=iolanta.declension.facet:RichDeclensionTable
+select-result-csv-facet=iolanta.facets.query.select_result_csv:SelectResultCsvFacet
+select-result-json-facet=iolanta.facets.query.select_result_json:SelectResultJsonFacet
+select-result-table-facet=iolanta.facets.query.select_result_table:SelectResultTableFacet
 textual-browser=iolanta.facets.textual_browser:TextualBrowserFacet
 textual-class=iolanta.facets.textual_class:Class
 textual-graph=iolanta.facets.textual_graph:GraphFacet