iolanta 2.1.1__tar.gz → 2.1.6__tar.gz

{iolanta-2.1.1 → iolanta-2.1.6}/PKG-INFO

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: iolanta
-Version: 2.1.1
+Version: 2.1.6
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
 Author-email: altaisoft@gmail.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: all
 Requires-Dist: boltons (>=24.0.0)
 Requires-Dist: classes (>=0.4.0)
@@ -18,10 +17,11 @@ Requires-Dist: deepmerge (>=0.1.1)
 Requires-Dist: diskcache (>=5.6.3)
 Requires-Dist: documented (>=0.1.1)
 Requires-Dist: dominate (>=2.6.0)
+Requires-Dist: fastmcp (>=2.12.4,<3.0.0)
 Requires-Dist: funcy (>=2.0)
 Requires-Dist: loguru (>=0.7.3)
 Requires-Dist: more-itertools (>=9.0.0)
-Requires-Dist: nanopub (>=2.0.1)
+Requires-Dist: nanopub (>=2.1.0,<3.0.0)
 Requires-Dist: owlrl (>=6.0.2)
 Requires-Dist: oxrdflib (>=0.4.0)
 Requires-Dist: packageurl-python (>=0.17.5)
@@ -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)
-Requires-Dist: yaml-ld (>=1.1.10)
+Requires-Dist: yaml-ld (>=1.1.14,<2.0.0)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown
 

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/cli/main.py

@@ -1,5 +1,6 @@
 import locale
 import logging
+import sys
 from pathlib import Path
 from typing import Annotated
 
@@ -9,7 +10,8 @@ from documented import DocumentedError
 from rdflib import Literal, URIRef
 from rich.console import Console
 from rich.markdown import Markdown
-from typer import Argument, Exit, Option, Typer
+from rich.table import Table
+from typer import Argument, Exit, Option, Typer, Context
 from yarl import URL
 
 from iolanta.cli.models import LogLevel
@@ -22,23 +24,7 @@ DEFAULT_LANGUAGE = locale.getlocale()[0].split('_')[0]
 console = Console()
 
 
-def construct_app() -> Typer:
-    """
-    Construct Typer app.
-
-    FIXME: Remove this function, just create the app on module level.
-    """
-    iolanta = Iolanta()
-
-    return Typer(
-        no_args_is_help=True,
-        context_settings={
-            'obj': iolanta,
-        },
-    )
-
-
-app = construct_app()
+app = Typer(no_args_is_help=True)
 
 
 def string_to_node(name: str) -> NotLiteralNode:
@@ -57,19 +43,17 @@ def string_to_node(name: str) -> NotLiteralNode:
     return URIRef(f'file://{path}')
 
 
-@app.command(name='browse')
-def render_command(   # noqa: WPS231, WPS238, WPS210, C901
-    url: Annotated[str, Argument()],
-    as_datatype: Annotated[
-        str, Option(
-            '--as',
-        ),
-    ] = 'https://iolanta.tech/cli/interactive',
-    language: Annotated[
-        str, Option(
-            help='Data language to prefer.',
-        ),
-    ] = DEFAULT_LANGUAGE,
+def decode_datatype(datatype: str) -> URIRef:
+    if datatype.startswith('http'):
+        return URIRef(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."""
@@ -85,14 +69,32 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
         ensure_exists=True,
     ) / 'iolanta.log'
 
-    logger = loguru.logger
-    logger.add(
+    # Get the level name first
+    level_name = {
+        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,
+        level=level_name,
         format='{time} {level} {message}',
         enqueue=True,
     )
-
+    loguru.logger.add(
+        sys.stderr,
+        level=level_name,
+        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)
@@ -101,6 +103,7 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
             language=Literal(language),
             logger=logger,
         )
+        
     else:
         path = Path(node_url.path).absolute()
         node = URIRef(f'file://{path}')
@@ -110,14 +113,39 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
             project_root=path,
         )
 
-    try:
-        renderable = iolanta.render(
-            node=URIRef(node),
-            as_datatype=URIRef(as_datatype),
-        )
+    return iolanta.render(
+        node=URIRef(node),
+        as_datatype=decode_datatype(as_datatype),
+    )
+
 
+@app.command(name='render')
+def render_command(   # noqa: WPS231, WPS238, WPS210, C901
+    url: Annotated[str, Argument()],
+    as_datatype: Annotated[
+        str, Option(
+            '--as',
+        ),
+    ] = 'https://iolanta.tech/cli/interactive',
+    language: Annotated[
+        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:
-        if iolanta.logger.level in {logging.DEBUG, logging.INFO}:
+        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(
@@ -129,11 +157,23 @@ def render_command(   # noqa: WPS231, WPS238, WPS210, C901
         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))
         raise Exit(1)
-
     else:
-        print(renderable)
+        # FIXME: An intermediary Literal can be used to dispatch rendering.
+        match renderable:
+            case Table() as table:
+                console.print(table)
+
+            case unknown:
+                print(unknown)

iolanta-2.1.6/iolanta/declension/data/declension.yamlld

@@ -0,0 +1,39 @@
+"@context":
+  "@import": https://json-ld.org/contexts/dollar-convenience.jsonld
+  vann: https://purl.org/vocab/vann/
+  foaf: https://xmlns.com/foaf/0.1/
+  owl: https://www.w3.org/2002/07/owl#
+  iolanta: https://iolanta.tech/
+  rdfs: "https://www.w3.org/2000/01/rdf-schema#"
+  rdf: https://www.w3.org/1999/02/22-rdf-syntax-ns#
+  dcterms: https://purl.org/dc/terms/
+  dcam: https://purl.org/dc/dcam/
+
+  iolanta:outputs:
+    "@type": "@id"
+
+  iolanta:when-no-facet-found:
+    "@type": "@id"
+
+  $: rdfs:label
+  →:
+    "@type": "@id"
+    "@id": iolanta:outputs
+
+  ⊆:
+    "@type": "@id"
+    "@id": rdfs:subClassOf
+
+  ⪯:
+    "@type": "@id"
+    "@id": iolanta:is-preferred-over
+
+  ↦: iolanta:matches
+  iolanta:hasDefaultFacet:
+    "@type": "@id"
+
+$id: https://w3id.org/np/RASSJ01s2tPPJfFVx__m9gHtY4ct1YSd1ntL3R1OaQfLI/EasternArmenianPersonalPronoun
+iolanta:facet:
+  $id: pkg:pypi/iolanta#rich-declension-table
+  $: Declension Table
+  →: https://iolanta.tech/datatypes/rich

iolanta-2.1.6/iolanta/declension/facet.py

@@ -0,0 +1,44 @@
+from pathlib import Path
+
+import funcy
+from docutils.nodes import row
+from rdflib import Literal, Namespace
+from rich.table import Table
+
+from iolanta import Facet
+from iolanta.namespaces import DATATYPES, LOCAL
+
+LEXINFO = Namespace('https://www.lexinfo.net/ontology/2.0/lexinfo#')
+
+
+class RichDeclensionTable(Facet[Table]):
+    """Declension forms of something."""
+
+    META = Path(__file__).parent / 'data' / 'declension.yamlld'
+
+    def show(self) -> Table:
+        """Render declension forms of something."""
+        rows = self.stored_query('declension.sparql', this=self.this)
+        form_by_number_and_person = [
+            ((row['number'], row['person']), self.render(row['declension'], as_datatype=DATATYPES.title))
+            for row in rows
+        ]
+
+        declensions = funcy.group_values(form_by_number_and_person)
+
+        table = Table('', 'Singular', 'Plural', title='Declension')
+
+        table_rows = [
+            [
+                ', '.join(declensions[number, person])
+                for number in [LEXINFO.singular, LEXINFO.plural]
+            ]
+            for person in [LEXINFO.firstPerson, LEXINFO.secondPerson, LEXINFO.thirdPerson]
+        ]
+
+        row_titles = ['1st', '2nd', '3rd']
+
+        for title, table_row in zip(row_titles, table_rows):
+            table.add_row(title, *table_row)
+
+        return table

iolanta-2.1.6/iolanta/declension/sparql/declension.sparql

@@ -0,0 +1,8 @@
+PREFIX lexinfo: <https://www.lexinfo.net/ontology/2.0/lexinfo#>
+
+SELECT * WHERE {
+    ?declension
+      rdf:type $this ;
+      lexinfo:person ?person ;
+      lexinfo:number ?number .
+}

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/cli/record.py

@@ -17,9 +17,9 @@ class Record(RichFacet):
 
     def show(self) -> Renderable:
         return "RECORD"
-        rows = self.stored_query('record.sparql', node=self.iri)
+        rows = self.stored_query('record.sparql', node=self.this)
 
-        caption = self.render(self.iri, as_datatype=IOLANTA['cli/title'])
+        caption = self.render(self.this, as_datatype=IOLANTA['cli/title'])
 
         table = Table(
             show_header=False,

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/facet.py

@@ -16,28 +16,15 @@ FacetOutput = TypeVar('FacetOutput')
 class Facet(Generic[FacetOutput]):
     """Base facet class."""
 
-    iri: NotLiteralNode
+    this: Node
     iolanta: 'iolanta.Iolanta' = field(repr=False)
     as_datatype: Optional[NotLiteralNode] = None
 
-    @property
-    def this(self) -> NotLiteralNode:
-        """This node."""
-        return self.iri
-
     @property
     def stored_queries_path(self) -> Path:
         """Construct directory for stored queries for this facet."""
         return Path(inspect.getfile(self.__class__)).parent / 'sparql'
 
-    @cached_property
-    def uriref(self) -> NotLiteralNode:
-        """Format as URIRef."""
-        if isinstance(self.iri, BNode):
-            return self.iri
-
-        return URIRef(self.iri)
-
     def query(
         self,
         query_text: str,
@@ -60,14 +47,6 @@ class Facet(Generic[FacetOutput]):
             as_datatype=as_datatype,
         )
 
-    def render_all(
-        self,
-        node: Node,
-        as_datatype: NotLiteralNode,
-    ) -> Iterable[Any]:
-        """Render all we can."""
-        return self.iolanta.render_all(node=node, as_datatype=as_datatype)
-
     def stored_query(self, file_name: str, **kwargs: SPARQLQueryArgument):
         """Execute a stored SPARQL query."""
         query_text = (self.stored_queries_path / file_name).read_text()

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/foaf_person_title/facet.py

@@ -9,12 +9,12 @@ class FOAFPersonTitle(Facet[str]):
 
     def show(self) -> str:
         """Render full name of a person."""
-        row = funcy.first(self.stored_query('names.sparql', person=self.iri))
+        row = funcy.first(self.stored_query('names.sparql', person=self.this))
 
         if row is None:
             # Render default title.
             return self.render(
-                self.iri,
+                self.this,
                 as_datatype=DATATYPES['fallback-title'],
             )
 

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/generic/bool_literal.py

@@ -9,9 +9,9 @@ class BoolLiteral(Facet):
 
     def show(self):
         """Render as icon."""
-        if not isinstance(self.iri, Literal):
+        if not isinstance(self.this, Literal):
             raise NotALiteral(
-                node=self.iri,
+                node=self.this,
             )
 
-        return '✔️' if self.iri.value else '❌'
+        return '✔️' if self.this.value else '❌'

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/generic/date_literal.py

@@ -11,7 +11,7 @@ class DateLiteral(Facet):
 
     def show(self):
         """Render date or datetime as a date."""
-        literal = cast(Literal, self.iri)
+        literal = cast(Literal, self.this)
 
         date_value = literal.value
 

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/generic/default.py

@@ -27,7 +27,7 @@ class DefaultMixin(Facet[FacetOutput]):
     def description(self) -> Description:
         return Description(
             **funcy.first(
-                self.stored_query('default.sparql', iri=self.iri),
+                self.stored_query('default.sparql', iri=self.this),
             ),
         )
 
@@ -59,7 +59,7 @@ class DefaultMixin(Facet[FacetOutput]):
         return label
 
     def render_fallback(self) -> str:
-        string_iri = str(self.iri)
+        string_iri = str(self.this)
 
         if string_iri.startswith('local:'):
             string_iri = string_iri.removeprefix(

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/html/code_literal.py

@@ -9,9 +9,9 @@ class CodeLiteral(Facet):
 
     def show(self):
         """Render as icon."""
-        if not isinstance(self.iri, Literal):
+        if not isinstance(self.this, Literal):
             raise NotALiteral(
-                node=self.iri,
+                node=self.this,
             )
 
-        return f'<code>{self.iri.value}</code>'
+        return f'<code>{self.this.value}</code>'

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/icon.py

@@ -15,7 +15,7 @@ class IconFacet(Facet[str]):
                     $iri iolanta:icon ?icon .
                 }
                 """,
-                iri=self.iri,
+                iri=self.this,
             ),
         )
 

iolanta-2.1.6/iolanta/facets/locator/sparql/get-query-to-facet.sparql

@@ -0,0 +1,5 @@
+SELECT ?facet ?match WHERE {
+    ?facet
+        iolanta:matches ?match ;
+        iolanta:outputs $as_datatype .
+}

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/locator.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from functools import cached_property
 from graphlib import TopologicalSorter
+from pathlib import Path
 from typing import Iterable, List, TypedDict
 
 import funcy
@@ -18,13 +19,9 @@ class FoundRow(TypedDict):
     output_datatype: NotLiteralNode
 
 
-GET_QUERY_TO_FACET = """
-SELECT ?facet ?match WHERE {
-    ?facet
-        iolanta:matches ?match ;
-        iolanta:outputs $as_datatype .
-}
-"""
+GET_QUERY_TO_FACET = (
+    Path(__file__).parent / 'locator' / 'sparql' / 'get-query-to-facet.sparql'
+).read_text()
 
 
 def reorder_rows_by_facet_preferences(   # noqa: WPS214, WPS210
@@ -114,9 +111,6 @@ class FacetFinder:   # noqa: WPS214
 
     def by_sparql(self) -> Iterable[FoundRow]:
         """Determine facet by SHACL shape of the data."""
-        if not isinstance(self.node, URIRef):
-            return
-
         rows = self.iolanta.query(
             GET_QUERY_TO_FACET,
             as_datatype=self.as_datatype,
@@ -138,7 +132,7 @@ class FacetFinder:   # noqa: WPS214
 
         TODO fix this to allow arbitrary prefixes.
         """
-        scheme = URL(self.node).scheme
+        scheme = URL(str(self.node)).scheme
         if scheme != 'urn':
             return []
 

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/qname.py

@@ -9,11 +9,11 @@ class QNameFacet(Facet[str]):
     def show(self) -> str:
         """Return a qname."""
         qname: ComputedQName | NotLiteralNode = node_to_qname(
-            self.iri,
+            self.this,
             self.iolanta.graph,
         )
 
         if isinstance(qname, ComputedQName):
             return f'{qname.namespace_name}:{qname.term}'
 
-        return str(self.iri)
+        return str(self.this)

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/textual_browser/app.py

@@ -45,10 +45,10 @@ def _log_message_to_dev_console(app: App):
 class IolantaBrowser(App):  # noqa: WPS214, WPS230
     """Browse Linked Data."""
 
-    def __init__(self, iolanta: Iolanta, iri: Node):
+    def __init__(self, iolanta: Iolanta, this: Node):
         """Set up parameters for the browser."""
         self.iolanta = iolanta
-        self.iri = iri
+        self.this = this
         self.renderers = ThreadPoolExecutor()
         super().__init__()
 
@@ -79,7 +79,11 @@ class IolantaBrowser(App):  # noqa: WPS214, WPS230
         )
 
         # Disable stderr logging, to not break the TUI.
-        self.iolanta.logger.remove(0)
+        # Remove only the stderr handler, keep file handler
+        for handler_id in list(self.iolanta.logger._core.handlers.keys()):
+            handler = self.iolanta.logger._core.handlers[handler_id]
+            if hasattr(handler, 'sink') and str(handler.sink) == '<stderr>':
+                self.iolanta.logger.remove(handler_id)
 
         # Log to the dev console.
         self.iolanta.logger.add(

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/textual_browser/facet.py

@@ -20,7 +20,7 @@ class TextualBrowserFacet(Facet[ReturnType | None]):
 
         app = IolantaBrowser(
             iolanta=self.iolanta,
-            iri=self.iri,
+            this=self.this,
         )
         try:
             app.run()

{iolanta-2.1.1 → iolanta-2.1.6}/iolanta/facets/textual_browser/page_switcher.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 from typing import Any
 
 import watchfiles
-from rdflib import BNode, URIRef
+from rdflib import BNode, Node, URIRef
 from textual.widgets import ContentSwitcher, RichLog
 from textual.worker import Worker, WorkerState
 
@@ -74,7 +74,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def on_mount(self):
         """Navigate to the initial page."""
-        self.action_goto(self.app.iri)
+        self.action_goto(self.app.this)
         if self.iolanta.project_root:
             self.run_worker(
                 self._watch_files,
@@ -94,24 +94,24 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def render_iri(   # noqa: WPS210
         self,
-        destination: NotLiteralNode,
+        this: NotLiteralNode,
         facet_iri: URIRef | None,
         is_reload: bool,
     ) -> RenderResult:
         """Render an IRI in a thread."""
-        self.iri = destination
+        self.this = this
         iolanta: Iolanta = self.iolanta
 
         as_datatype = URIRef('https://iolanta.tech/cli/textual')
         choices = FacetFinder(
             iolanta=self.iolanta,
-            node=destination,
+            node=this,
             as_datatype=as_datatype,
         ).choices()
 
         if not choices:
             raise FacetNotFound(
-                node=self.iri,
+                node=self.this,
                 as_datatype=as_datatype,
                 node_types=[],
             )
@@ -139,7 +139,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         facet_class = iolanta.facet_resolver.resolve(facet_iri)
 
         facet = facet_class(
-            iri=self.iri,
+            this=self.this,
             iolanta=iolanta,
             as_datatype=URIRef('https://iolanta.tech/cli/textual'),
         )
@@ -149,13 +149,13 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
         except Exception as err:
             raise FacetError(
-                node=self.iri,
+                node=self.this,
                 facet_iri=facet_iri,
                 error=err,
             ) from err
 
         return RenderResult(
-            iri=destination,
+            iri=this,
             renderable=renderable,
             flip_options=flip_options,
             facet_iri=facet_iri,
@@ -222,7 +222,7 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
         self.run_worker(
             functools.partial(
                 self.render_iri,
-                destination=self.history.current.url,
+                this=self.history.current.url,
                 facet_iri=self.history.current.facet_iri,
                 is_reload=True,
             ),
@@ -267,19 +267,14 @@ class PageSwitcher(IolantaWidgetMixin, ContentSwitcher):  # noqa: WPS214
 
     def action_goto(
         self,
-        destination: str,
+        this: Node,
         facet_iri: str | None = None,
     ):
         """Go to an IRI."""
-        if destination.startswith('_:'):
-            iri = BNode(destination)
-        else:
-            iri = URIRef(destination)
-
         self.run_worker(
             functools.partial(
                 self.render_iri,
-                destination=iri,
+                this=this,
                 facet_iri=facet_iri and URIRef(facet_iri),
                 is_reload=False,
             ),
@@ -328,7 +323,7 @@ class DevConsole(RichLog):
 
     def __init__(self):
         """Set default props for console."""
-        super().__init__(highlight=True, markup=True, id='console')
+        super().__init__(highlight=False, markup=False, id='console')
 
     def action_close(self):
         """Close the dev console."""