PyLD 3.1.0__tar.gz → 3.2.0__tar.gz

{pyld-3.1.0 → pyld-3.2.0}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # pyld ChangeLog
 
+## 3.2.0 - 2026-08-17
+
+### Added
+- `*Options` TypedDict types and a `Context` type alias in `pyld.options` for JSON-LD API option dicts (typing and documentation).
+- `pyld.SqliteCacheRequestsDocumentLoader`: a SQLite-backed HTTP cache document loader using `requests-cache`.
+
+### Fixed
+- If value objects contain array values for `@type` during expansion, an error is now raised. Fixes [expand#ter54](https://w3c.github.io/json-ld-api/tests/expand-manifest.html#ter54) and [toRdf#ter54](https://w3c.github.io/json-ld-api/tests/toRdf-manifest.html#ter54).
+- Inline contexts that try to redefine @context now raise an error. Fixes [expand#ter56](https://w3c.github.io/json-ld-api/tests/expand-manifest.html#ter56) and [toRdf#ter56](https://w3c.github.io/json-ld-api/tests/toRdf-manifest.html#ter56).
+- When using native types, values of `xsd:boolean` and `xsd:integer` are now properly converted. Fixes [fromRdf#t0027](https://w3c.github.io/json-ld-api/tests/fromRdf-manifest.html#t0027).
+- Numbers with 0 as fractional part now parse to an `xsd:integer` instead of `xsd:double`. Fixes [toRdf#ttn02](https://w3c.github.io/json-ld-api/tests/toRdf-manifest.html#ttn02).
+- Zeros are now truncated for numeric values with negative exponent.
+- Blank node prefixes are now also used in IRI expansion.
+- Numbers with no fractions but that are >= 1e21 are now represented as xsd:double in json-ld-1.1 processing mode.
+- In `RequestsDocumentLoader`, constructor-level headers are now removed from `**kwargs` and stored separately, avoiding duplicate `headers=` when calling `session.get`. Per-call `options["headers"]` still takes precedence.
+
 ## 3.1.0 - 2026-06-19
 
 ### Fixed

{pyld-3.1.0/lib/PyLD.egg-info → pyld-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyLD
-Version: 3.1.0
+Version: 3.2.0
 Summary: Python implementation of the JSON-LD API
 Home-page: https://github.com/digitalbazaar/pyld
 Author: Digital Bazaar
@@ -24,6 +24,8 @@ Provides-Extra: requests
 Requires-Dist: requests; extra == "requests"
 Provides-Extra: aiohttp
 Requires-Dist: aiohttp; extra == "aiohttp"
+Provides-Extra: requests-cache
+Requires-Dist: requests-cache>=1.3; extra == "requests-cache"
 Provides-Extra: cachetools
 Requires-Dist: cachetools; extra == "cachetools"
 Provides-Extra: frozendict
@@ -258,7 +260,7 @@ attempt to use a locally cached version of contexts (see
 [§ Cache JSON-LD Contexts](https://w3c.github.io/json-ld-bp/#cache-json-ld-contexts)).
 Refresh the bundled copies with `make download-bundled-contexts`.
 
-### Customizing the ContextLoader
+### Customizing the ContextResolver
 
 You can customize the way contexts are loaded and cached by passing an instance
 of `ContextResolver`. The following example implements a loader with a prefilled

{pyld-3.1.0 → pyld-3.2.0}/README.md

@@ -216,7 +216,7 @@ attempt to use a locally cached version of contexts (see
 [§ Cache JSON-LD Contexts](https://w3c.github.io/json-ld-bp/#cache-json-ld-contexts)).
 Refresh the bundled copies with `make download-bundled-contexts`.
 
-### Customizing the ContextLoader
+### Customizing the ContextResolver
 
 You can customize the way contexts are loaded and cached by passing an instance
 of `ContextResolver`. The following example implements a loader with a prefilled

{pyld-3.1.0 → pyld-3.2.0}/README.txt

@@ -216,7 +216,7 @@ attempt to use a locally cached version of contexts (see
 [§ Cache JSON-LD Contexts](https://w3c.github.io/json-ld-bp/#cache-json-ld-contexts)).
 Refresh the bundled copies with `make download-bundled-contexts`.
 
-### Customizing the ContextLoader
+### Customizing the ContextResolver
 
 You can customize the way contexts are loaded and cached by passing an instance
 of `ContextResolver`. The following example implements a loader with a prefilled

{pyld-3.1.0 → pyld-3.2.0/lib/PyLD.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyLD
-Version: 3.1.0
+Version: 3.2.0
 Summary: Python implementation of the JSON-LD API
 Home-page: https://github.com/digitalbazaar/pyld
 Author: Digital Bazaar
@@ -24,6 +24,8 @@ Provides-Extra: requests
 Requires-Dist: requests; extra == "requests"
 Provides-Extra: aiohttp
 Requires-Dist: aiohttp; extra == "aiohttp"
+Provides-Extra: requests-cache
+Requires-Dist: requests-cache>=1.3; extra == "requests-cache"
 Provides-Extra: cachetools
 Requires-Dist: cachetools; extra == "cachetools"
 Provides-Extra: frozendict
@@ -258,7 +260,7 @@ attempt to use a locally cached version of contexts (see
 [§ Cache JSON-LD Contexts](https://w3c.github.io/json-ld-bp/#cache-json-ld-contexts)).
 Refresh the bundled copies with `make download-bundled-contexts`.
 
-### Customizing the ContextLoader
+### Customizing the ContextResolver
 
 You can customize the way contexts are loaded and cached by passing an instance
 of `ContextResolver`. The following example implements a loader with a prefilled

{pyld-3.1.0 → pyld-3.2.0}/lib/PyLD.egg-info/SOURCES.txt

@@ -21,11 +21,13 @@ lib/pyld/identifier_issuer.py
 lib/pyld/iri_resolver.py
 lib/pyld/jsonld.py
 lib/pyld/nquads.py
+lib/pyld/options.py
 lib/pyld/resolved_context.py
 lib/pyld/documentloader/__init__.py
 lib/pyld/documentloader/aiohttp.py
 lib/pyld/documentloader/base.py
 lib/pyld/documentloader/requests.py
+lib/pyld/documentloader/requests_sqlite_cache.py
 lib/pyld/documentloader/frozen/__init__.py
 lib/pyld/documentloader/frozen/bundled/activitystreams.jsonld
 lib/pyld/documentloader/frozen/bundled/credentials-v1.jsonld
@@ -35,9 +37,9 @@ lib/pyld/documentloader/frozen/bundled/security-ed25519-2020-v1.jsonld
 lib/pyld/documentloader/frozen/bundled/security-jws-2020-v1.jsonld
 lib/pyld/documentloader/frozen/bundled/security-v1.jsonld
 lib/pyld/documentloader/frozen/bundled/security-v2.jsonld
-tests/test_api.py
 tests/test_document_loader.py
 tests/test_frozen_document_loader.py
 tests/test_iri_resolver.py
 tests/test_jsonld.py
-tests/test_manifests.py
+tests/test_manifests.py
+tests/test_sqlite_cache_requests_document_loader.py

{pyld-3.1.0 → pyld-3.2.0}/lib/PyLD.egg-info/requires.txt

@@ -13,3 +13,6 @@ frozendict
 
 [requests]
 requests
+
+[requests-cache]
+requests-cache>=1.3

{pyld-3.1.0 → pyld-3.2.0}/lib/pyld/__about__.py

@@ -4,4 +4,4 @@ __all__ = ['__copyright__', '__license__', '__version__']
 
 __copyright__ = 'Copyright (c) 2011-2024 Digital Bazaar, Inc.'
 __license__ = 'BSD 3-Clause "New" or "Revised" License'
-__version__ = '3.1.0'
+__version__ = '3.2.0'

{pyld-3.1.0 → pyld-3.2.0}/lib/pyld/__init__.py

@@ -6,6 +6,7 @@ from .documentloader.aiohttp import AioHttpDocumentLoader
 from .documentloader.base import DocumentLoader, RemoteDocument
 from .documentloader.frozen import BUNDLED_CONTEXTS, FrozenDocumentLoader
 from .documentloader.requests import RequestsDocumentLoader
+from .documentloader.requests_sqlite_cache import SqliteCacheRequestsDocumentLoader
 
 __all__ = [
     'AioHttpDocumentLoader',
@@ -15,5 +16,6 @@ __all__ = [
     'FrozenDocumentLoader',
     'RequestsDocumentLoader',
     'RemoteDocument',
+    'SqliteCacheRequestsDocumentLoader',
     'jsonld',
 ]

{pyld-3.1.0 → pyld-3.2.0}/lib/pyld/documentloader/requests.py

@@ -15,17 +15,20 @@ import urllib.parse as urllib_parse
 
 from pyld import iri_resolver
 from pyld.documentloader.base import DocumentLoader, RemoteDocument
-from pyld.jsonld import JsonLdError, parse_link_header, LINK_HEADER_REL
+from pyld.jsonld import LINK_HEADER_REL, JsonLdError, parse_link_header
 
 
 class RequestsDocumentLoader(DocumentLoader):
     """Remote document loader using Requests."""
 
-    def __init__(self, secure=False, **kwargs):
-        import requests
+    def __init__(self, secure=False, session=None, **kwargs):
+        if session is None:
+            import requests
 
-        self.requests = requests
+            session = requests.Session()
+        self.session = session
         self.secure = secure
+        self.headers = kwargs.pop('headers', None)
         self.kwargs = kwargs
 
     def __call__(self, url, options=None) -> RemoteDocument:
@@ -56,12 +59,12 @@ class RequestsDocumentLoader(DocumentLoader):
                     'the URL\'s scheme is not "https".',
                     'jsonld.InvalidUrl', {'url': url},
                     code='loading document failed')
-            headers = options.get('headers')
+            headers = options.get('headers', self.headers)
             if headers is None:
                 headers = {
                     'Accept': 'application/ld+json, application/json'
                 }
-            response = self.requests.get(url, headers=headers, **self.kwargs)
+            response = self.session.get(url, headers=headers, **self.kwargs)
 
             content_type = response.headers.get('content-type')
             if not content_type:

pyld-3.2.0/lib/pyld/documentloader/requests_sqlite_cache.py

@@ -0,0 +1,55 @@
+"""
+SQLite-backed HTTP cache document loader using requests-cache.
+
+.. module:: jsonld.documentloader.requests_sqlite_cache
+  :synopsis: Persistent SQLite HTTP caching for Requests document loader
+"""
+from pathlib import Path
+
+from pyld.documentloader.base import DocumentLoader, RemoteDocument
+from pyld.documentloader.requests import RequestsDocumentLoader
+
+
+def _resolve_sqlite_file_path(sqlite_file_path: Path | None) -> Path:
+    """Return absolute path to the SQLite cache file."""
+    from platformdirs import user_cache_dir
+
+    if sqlite_file_path is None:
+        return (Path(user_cache_dir('pyld')) / 'http_cache.sqlite').resolve()
+    path = Path(sqlite_file_path).expanduser()
+    if not path.is_absolute():
+        raise ValueError(
+            'sqlite_file_path must be an absolute path to the .sqlite file')
+    return path.resolve()
+
+
+class SqliteCacheRequestsDocumentLoader(DocumentLoader):
+    """Remote document loader with persistent SQLite HTTP caching.
+
+    :param secure: require all requests to use HTTPS (default: False).
+    :param sqlite_file_path: absolute path to the ``.sqlite`` cache file; when
+        omitted, defaults to the platform user cache directory under ``pyld/``.
+    """
+
+    def __init__(
+        self,
+        secure: bool = False,
+        *,
+        sqlite_file_path: Path | None = None,
+    ):
+        from requests_cache import CachedSession
+
+        path = _resolve_sqlite_file_path(sqlite_file_path)
+        self.session = CachedSession(
+            cache_name=str(path),
+            backend='sqlite',
+            cache_control=True,
+            # Cache JSON-LD contexts persistently by default; Cache-Control and
+            # related response headers still override this when present.
+            expire_after=-1,
+        )
+        self._loader = RequestsDocumentLoader(
+            secure=secure, session=self.session)
+
+    def __call__(self, url, options=None) -> RemoteDocument:
+        return self._loader(url, options=options)