PyPI - iolanta - Versions diffs - 2.0.7__tar.gz → 2.0.8__tar.gz - Mend

@@ -72,6 +72,10 @@ REDIRECTS = MappingProxyType({
         'https://nanopub.net/nschema#',
     ),
     URIRef(PROV): URIRef('https://www.w3.org/ns/prov-o'),
+    # Convert lexvo.org/id URLs to lexvo.org/data URLs
+    r'https://lexvo\.org/id/(.+)': r'http://lexvo.org/data/\1',
+    r'https://www\.lexinfo\.net/(.+)': r'http://www.lexinfo.net/\1',
 })
@@ -281,11 +285,30 @@ def _extract_nanopublication_uris(
             )
-def apply_redirect(source: URIRef) -> URIRef:
-    """Rewrite the URL."""
+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():
-        if source.startswith(pattern):
-            return destination
+        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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iolanta
-Version: 2.0.7
+Version: 2.0.8
 Summary: Semantic Web browser
 License: MIT
 Author: Anatoly Scherbakov
@@ -32,7 +32,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,<2.0.0)
-Requires-Dist: yaml-ld (>=1.1.9)
+Requires-Dist: yaml-ld (>=1.1.10)
 Requires-Dist: yarl (>=1.9.4)
 Description-Content-Type: text/markdown

@@ -291,7 +291,7 @@ class LiteralPropertyValue(Widget, can_focus=True, inherit_bindings=False):
         self.property_iri = property_iri
         super().__init__()
         self.renderable = Text(   # noqa: WPS601
-            str(property_value.value),
+            str(property_value),
             style='#696969',
         )

@@ -9,6 +9,7 @@ PRIORITIES = [   # noqa: WPS407
     'schema_name',
     'rdfs_label',
     'foaf_name',
+    'literal_form',
 ]

@@ -23,4 +23,9 @@ SELECT * WHERE {
         $iri <https://xmlns.com/foaf/0.1/name> ?foaf_name .
         FILTER (!lang(?foaf_name) || lang(?foaf_name) = $language)
     }
-}
+    OPTIONAL {
+        $iri <https://www.w3.org/2008/05/skos-xl#literalForm> ?literal_form .
+        FILTER (!lang(?literal_form) || lang(?literal_form) = $language)
+    }
+}

@@ -2,6 +2,7 @@ import dataclasses
 import hashlib
 from types import MappingProxyType
 from typing import Iterable, Optional
+from urllib.parse import unquote
 from documented import DocumentedError
 from rdflib import BNode, Literal, URIRef
@@ -29,7 +30,7 @@ def parse_term(   # noqa: C901
     term_value = term['value']
     if term_type == 'IRI':
-        return URIRef(term_value)
+        return URIRef(unquote(term_value))
     if term_type == 'literal':
         language = term.get('language')

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iolanta"
-version = "2.0.7"
+version = "2.0.8"
 description = "Semantic Web browser"
 authors = ["Anatoly Scherbakov <altaisoft@gmail.com>"]
 license = "MIT"
@@ -23,7 +23,7 @@ rich = ">=13.3.1"
 textual = ">=0.83.0"
 yarl = ">=1.9.4"
 boltons = ">=24.0.0"
-yaml-ld = ">=1.1.9"
+yaml-ld = ">=1.1.10"
 reasonable = ">=0.2.6"
 oxrdflib = ">=0.4.0"
 loguru = ">=0.7.3"

iolanta 2.0.7__tar.gz → 2.0.8__tar.gz