soft7 0.2.2__tar.gz → 0.3.0__tar.gz

{soft7-0.2.2 → soft7-0.3.0}/.github/workflows/ci_tests.yml

@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         # Supported Python versions (according to pyproject.toml)
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - name: Checkout repository

soft7-0.3.0/.markdownlint.yaml

@@ -0,0 +1,17 @@
+# Default state for all rules
+default: true
+
+# MD013/line-length - Line length
+MD013:
+  # Number of characters
+  # Set very long to support 1-sentence-per-line style.
+  line_length: 999
+  # Number of characters for headings (match that of black's default)
+  heading_line_length: 88
+  # Number of characters for code blocks (match that of black's default)
+  code_block_line_length: 88
+
+# MD024/no-duplicate-heading - Multiple headings with the same content
+MD024:
+  # Only check sibling headings
+  siblings_only: true

{soft7-0.2.2 → soft7-0.3.0}/CHANGELOG.md

@@ -2,15 +2,49 @@
 
 ## [Unreleased](https://github.com/SINTEF/soft7/tree/HEAD)
 
-[Full Changelog](https://github.com/SINTEF/soft7/compare/v0.2.2...HEAD)
+[Full Changelog](https://github.com/SINTEF/soft7/compare/v0.3.0...HEAD)
 
-# Fix issue with pydantic v2.10
+# New `graph` module
 
-There are some issues with pydantic's v2.10 concerning `Url` models.
-Since we use the pydantic version specified by `oteapi-core`, we make sure to at least use v0.7.0.dev6, since this ensure v2.10.0 and v2.10.1 is not installed.
-When v2.10.2 comes out, it can be tested on `oteapi-core` before a new release is done.
+Perform RDF graph operations, specifically meant for usage with SOFT7 and semantic interoperability utilizing the `s7.graph` module.
 
-All other dependencies and dev tools have also been updated.
+The main underlying technology is [RDFLib](https://rdflib.readthedocs.io/) and [SPARQLWrapper](https://sparqlwrapper.readthedocs.io/).
+
+## Support Python 3.13
+
+CI tests and official package metadata support for Python 3.13 has been added.
+
+## Support Pydantic v2.10
+
+There were several changes to the networking models in pydantic v2.10 - this update remedies most of these changes.
+
+**Implemented enhancements:**
+
+- Test support for Python 3.13 [\#71](https://github.com/SINTEF/soft7/issues/71)
+
+## [v0.3.0](https://github.com/SINTEF/soft7/tree/v0.3.0) (2024-12-02)
+
+[Full Changelog](https://github.com/SINTEF/soft7/compare/v0.2.2...v0.3.0)
+
+# New `graph` module
+
+Perform RDF graph operations, specifically meant for usage with SOFT7 and semantic interoperability utilizing the `s7.graph` module.
+
+The main underlying technology is [RDFLib](https://rdflib.readthedocs.io/) and [SPARQLWrapper](https://sparqlwrapper.readthedocs.io/).
+
+## Support Python 3.13
+
+CI tests and official package metadata support for Python 3.13 has been added.
+
+## Support Pydantic v2.10
+
+There were several changes to the networking models in pydantic v2.10 - this update remedies most of these changes.
+
+**Merged pull requests:**
+
+- Bump the dependencies group with 2 updates [\#87](https://github.com/SINTEF/soft7/pull/87) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Move in graphs to s7 package [\#86](https://github.com/SINTEF/soft7/pull/86) ([CasperWA](https://github.com/CasperWA))
+- Test with Python 3.13 [\#85](https://github.com/SINTEF/soft7/pull/85) ([CasperWA](https://github.com/CasperWA))
 
 ## [v0.2.2](https://github.com/SINTEF/soft7/tree/v0.2.2) (2024-11-25)
 

{soft7-0.2.2 → soft7-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: soft7
-Version: 0.2.2
+Version: 0.3.0
 Summary: SOFT7 semantic interoperability framework.
 Keywords: interoperability,semantic
 Author-email: Thomas Fjæstad Hagelien <thomas.f.hagelien@sintef.no>, Casper Welzel Andersen <casper.w.andersen@sintef.no>, Treesa Rose Joseph <treesa.joseph@sintef.no>
@@ -13,9 +13,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
-Requires-Dist: httpx~=0.27.2
+Requires-Dist: httpx>=0.27.2,<1
 Requires-Dist: oteapi-core>=0.7.0.dev6
 Requires-Dist: otelib~=0.5.0.dev1
 Requires-Dist: pyyaml~=6.0
@@ -30,7 +31,7 @@ Requires-Dist: rdflib~=7.1 ; extra == "graph"
 Requires-Dist: sparqlwrapper~=2.0 ; extra == "graph"
 Requires-Dist: pytest~=8.3 ; extra == "testing"
 Requires-Dist: pytest-cov~=6.0 ; extra == "testing"
-Requires-Dist: pytest-httpx~=0.34.0 ; extra == "testing"
+Requires-Dist: pytest-httpx~=0.35.0 ; extra == "testing"
 Requires-Dist: requests-mock~=1.12 ; extra == "testing"
 Requires-Dist: soft7[graph] ; extra == "testing"
 Project-URL: Changelog, https://github.com/SINTEF/soft7/blob/main/CHANGELOG.md

{soft7-0.2.2 → soft7-0.3.0}/pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Natural Language :: English",
     "Operating System :: OS Independent",
 ]
@@ -29,7 +30,7 @@ requires-python = "~=3.9"
 dynamic = ["version"]
 
 dependencies = [
-    "httpx~=0.27.2",
+    "httpx>=0.27.2,<1",
     "oteapi-core>=0.7.0.dev6",
     "otelib~=0.5.0.dev1",
     "pyyaml~=6.0",
@@ -53,7 +54,7 @@ graph = [
 testing = [
     "pytest~=8.3",
     "pytest-cov~=6.0",
-    "pytest-httpx~=0.34.0",
+    "pytest-httpx~=0.35.0",
     "requests-mock~=1.12",
     "soft7[graph]",
 ]

{soft7-0.2.2 → soft7-0.3.0}/s7/__init__.py

@@ -7,7 +7,7 @@ import logging
 from .pydantic_models.soft7_entity import SOFT7Entity, SOFT7EntityPropertyType
 from .pydantic_models.soft7_entity import parse_input_entity as get_entity
 
-__version__ = "0.2.2"
+__version__ = "0.3.0"
 
 __all__ = ("SOFT7Entity", "SOFT7EntityPropertyType", "__version__", "get_entity")
 

{soft7-0.2.2 → soft7-0.3.0}/s7/factories/datasource_factory.py

@@ -19,7 +19,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
 from otelib import OTEClient
-from pydantic import AnyUrl, Field, create_model
+from pydantic import AnyUrl, Field, FileUrl, create_model
 
 from s7.pydantic_models.datasource import (
     DataSourceDimensions,
@@ -28,6 +28,7 @@ from s7.pydantic_models.datasource import (
 )
 from s7.pydantic_models.soft7_entity import (
     SOFT7Entity,
+    SOFT7IdentityURIType,
     parse_identity,
     parse_input_entity,
 )
@@ -196,12 +197,13 @@ def _get_data(
 
 
 def create_datasource(
-    entity: SOFT7Entity | dict[str, Any] | Path | AnyUrl | str,
+    entity: SOFT7Entity | dict[str, Any] | Path | SOFT7IdentityURIType | str,
     configs: (
         GetDataConfigDict
-        | dict[str, GenericConfig | dict[str, Any] | Path | AnyUrl | str]
+        | dict[str, GenericConfig | dict[str, Any] | Path | AnyUrl | FileUrl | str]
         | Path
         | AnyUrl
+        | FileUrl
         | str
     ),
     oteapi_url: str | None = None,

{soft7-0.2.2 → soft7-0.3.0}/s7/factories/entity_factory.py

@@ -6,10 +6,11 @@ import logging
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-from pydantic import AnyUrl, ConfigDict, Field, create_model
+from pydantic import ConfigDict, Field, create_model
 
 from s7.pydantic_models.soft7_entity import (
     SOFT7Entity,
+    SOFT7IdentityURIType,
     parse_identity,
     parse_input_entity,
 )
@@ -33,7 +34,7 @@ LOGGER = logging.getLogger(__name__)
 
 
 def create_entity(
-    entity: Union[SOFT7Entity, dict[str, Any], Path, AnyUrl, str],
+    entity: Union[SOFT7Entity, dict[str, Any], Path, SOFT7IdentityURIType, str],
 ) -> type[SOFT7EntityInstance]:
     """Create and return a SOFT7 entity as a pydantic model.
 

soft7-0.3.0/s7/graph/README.md

@@ -0,0 +1,88 @@
+# RDF Graph Operations Library
+
+This library provides tools for interacting with RDF graphs via a SPARQL endpoint.
+It includes functions to find the `Lowest Common Ancestor` (LCA) of a set of classes and to populate an RDF graph with triples related to a given parent node.
+
+## Installation
+
+Ensure you have Python installed on your system.
+
+Install the SOFT7 package with the `graph` extra:
+
+```bash
+pip install soft7[graph}
+```
+
+## Functions
+
+### 1. find_parent_node
+
+This function queries a SPARQL endpoint to find the Lowest Common Ancestor (LCA) of a list of class URIs within a specified graph URI.
+
+#### Parameters
+
+* **sparql (`SPARQLWrapper`)**: An instance of SPARQLWrapper configured for the target SPARQL service.
+* **class_names (`list[str]`)**: The class URIs to find a common parent for.
+* **graph_uri (`str`)**: The URI of the graph in which to perform the query.
+
+#### Returns
+
+* **str | None**: The URI of the common parent node if one exists, otherwise `None`.
+
+#### Raises
+
+* **SPARQLWrapperException**: If there is an error in executing or processing the SPARQL query.
+* **TemplateError**: If there is an error in rendering the SPARQL query using Jinja2 templates.
+
+#### Usage Example
+
+```python
+...
+sparqlWrapper = SPARQLWrapper(sparql_endpoint)
+sparqlWrapper.setHTTPAuth(BASIC)
+sparqlWrapper.setCredentials(username, password)
+
+parent_node = find_parent_node(
+    sparql=sparqlWrapper,  
+    class_names=["http://example.com/class1", "http://example.com/class2"],
+    graph_uri="http://example.com/graph"
+)
+```
+
+### 2. fetch_and_populate_graph
+
+Fetches and populates an RDF graph with triples related to a specified parent node.
+
+#### Parameters
+
+* **sparql (`SPARQLWrapper`)**: An instance of SPARQLWrapper configured for the target SPARQL service.
+* **graph_uri (`str`)**: The URI of the graph from which triples will be fetched.
+* **parent_node (`str`)**: The URI of the parent node to base the triple fetching on.
+* **graph (`rdflib.Graph`, `optional`)**: An instance of an RDFlib graph to populate with fetched triples.
+  If `None`, a new empty graph is created. Defaults to `None`.
+
+#### Returns
+
+* **rdflib.Graph**: The graph populated with the fetched triples.
+
+#### Raises
+
+* **SPARQLWrapperException**: If there is an error in executing or processing the SPARQL query.
+* **RDFLibException**: If there is an error in adding fetched triples to the RDF graph.
+
+#### Usage Example
+
+```python
+...
+
+rdf_graph = fetch_and_populate_graph(
+    sparql=sparqlWrapper,
+    graph_uri="http://example.com/graph",
+    parent_node="http://example.com/parentClass"
+)
+```
+
+### Error Handling
+
+Both functions handle errors internally and will return `None` if an error occurs during execution.
+Errors during SPARQL querying or RDF graph manipulation are logged to the console.

{soft7-0.2.2 → soft7-0.3.0/s7}/graph/utils.py

@@ -10,6 +10,7 @@ used to handle SPARQL queries and RDFlib for graph operations.
 
 from __future__ import annotations
 
+import logging
 from typing import Optional
 
 import rdflib
@@ -18,6 +19,8 @@ from rdflib.exceptions import Error as RDFLibException
 from SPARQLWrapper import JSON, SPARQLWrapper
 from SPARQLWrapper.SPARQLExceptions import SPARQLWrapperException
 
+LOGGER = logging.getLogger(__name__)
+
 
 def find_parent_node(
     sparql: SPARQLWrapper,
@@ -66,7 +69,7 @@ def find_parent_node(
 
         template = Template(template_str)
         query = template.module.sparql_query(class_names, graph_uri)
-        print(query)
+        LOGGER.debug("Query: %s", query)
         sparql.setReturnFormat(JSON)
         sparql.setQuery(query)
 
@@ -90,7 +93,7 @@ def find_parent_node(
             f"Jinja2 template error: {template_error}"
         ) from template_error
 
-    print("Could not find a common parent node.")
+    LOGGER.info("Could not find a common parent node.")
     return None
 
 
@@ -157,7 +160,7 @@ def fetch_and_populate_graph(
            }}
         }}
         """
-        print(query)
+        LOGGER.debug("Query: %s", query)
         sparql.setQuery(query)
 
         results = sparql.query().convert()
@@ -170,7 +173,7 @@ def fetch_and_populate_graph(
                 )
             )
 
-        print("Graph populated with fetched triples.")
+        LOGGER.info("Graph populated with fetched triples.")
 
     except SPARQLWrapperException as wrapper_error:
         raise RuntimeError(

{soft7-0.2.2 → soft7-0.3.0}/s7/pydantic_models/soft7_entity.py

@@ -11,6 +11,7 @@ from typing import (
     Any,
     Optional,
     Union,
+    get_args,
 )
 
 if sys.version_info >= (3, 10):
@@ -20,16 +21,17 @@ else:
 
 from pydantic import (
     AliasChoices,
-    AnyUrl,
+    AnyHttpUrl,
     BaseModel,
     Field,
+    FileUrl,
+    TypeAdapter,
     ValidationError,
 )
 from pydantic.functional_validators import (
     field_validator,
     model_validator,
 )
-from pydantic.networks import UrlConstraints
 
 from s7.exceptions import EntityNotFound
 from s7.pydantic_models._utils import (
@@ -48,10 +50,7 @@ if TYPE_CHECKING:  # pragma: no cover
     ListPropertyType = Union[UnshapedPropertyType, ShapedListPropertyType]
 
 
-SOFT7IdentityURIType = Annotated[
-    AnyUrl,
-    UrlConstraints(allowed_schemes=["http", "https", "file"], host_required=True),
-]
+SOFT7IdentityURIType = Union[AnyHttpUrl, FileUrl]
 
 
 LOGGER = logging.getLogger(__name__)
@@ -76,9 +75,9 @@ def SOFT7IdentityURI(url: str) -> SOFT7IdentityURIType:
     """
     if isinstance(url, str):
         url = url.split("#", maxsplit=1)[0].split("?", maxsplit=1)[0]
-        return SOFT7IdentityURIType(url)
+        return TypeAdapter(SOFT7IdentityURIType).validate_python(url)
 
-    raise TypeError(f"Expected str or AnyUrl, got {type(url)}")
+    raise TypeError(f"Expected str, AnyHttpUrl, or FileUrl, got {type(url)}")
 
 
 SOFT7EntityPropertyType = Union[
@@ -109,7 +108,9 @@ map_soft_to_py_types: dict[str, type[UnshapedPropertyType]] = {
 """Use this with a fallback default of returning the lookup value."""
 
 
-def parse_identity(identity: AnyUrl) -> tuple[AnyUrl, Optional[str], str]:
+def parse_identity(
+    identity: SOFT7IdentityURIType,
+) -> tuple[SOFT7IdentityURIType, Optional[str], str]:
     """Parse the identity into a tuple of (namespace, version, name).
 
     The identity is a URI of the form: `<namespace>/<version>/<name>`.
@@ -168,7 +169,7 @@ def parse_identity(identity: AnyUrl) -> tuple[AnyUrl, Optional[str], str]:
     # Remove version and name from path, including the 2 associated preceding slashes.
     namespace += identity.path.rstrip("/")[: -len(version) - len(name) - 2]
 
-    return AnyUrl(namespace), version or None, name
+    return SOFT7IdentityURI(namespace), version or None, name
 
 
 class SOFT7EntityProperty(BaseModel):
@@ -281,7 +282,7 @@ class SOFT7EntityProperty(BaseModel):
                     # it.
                     return data
 
-            if isinstance(ref, AnyUrl):
+            if isinstance(ref, get_args(SOFT7IdentityURIType)):
                 new_type = ref
             elif isinstance(ref, str):
                 try:
@@ -632,7 +633,9 @@ class SOFT7Entity(BaseModel):
 
 
 def parse_input_entity(
-    entity: Union[SOFT7Entity, dict[str, Any], Path, AnyUrl, str, bytes, bytearray],
+    entity: Union[
+        SOFT7Entity, dict[str, Any], Path, SOFT7IdentityURIType, str, bytes, bytearray
+    ],
 ) -> SOFT7Entity:
     """Parse input to a function that expects a SOFT7 entity."""
     if isinstance(entity, SOFT7Entity):

{soft7-0.2.2 → soft7-0.3.0}/tests/factories/test_datasource_factory.py

@@ -169,7 +169,7 @@ def test_inspect_created_datasource(
     httpx_mock: HTTPXMock,
 ) -> None:
     """Test the generated data source contains the expected attributes and metadata."""
-    from pydantic import AnyUrl, BaseModel
+    from pydantic import AnyHttpUrl, BaseModel
 
     from s7.factories.datasource_factory import create_datasource
 
@@ -270,7 +270,7 @@ def test_inspect_created_datasource(
         == soft_entity_init["identity"]
         == "http://onto-ns.com/s7/0.1.0/MolecularSpecies"
     )
-    assert datasource.soft7___namespace == AnyUrl("http://onto-ns.com/s7")
+    assert datasource.soft7___namespace == AnyHttpUrl("http://onto-ns.com/s7")
     assert datasource.soft7___version == "0.1.0"
     assert datasource.soft7___name == "MolecularSpecies"
 

{soft7-0.2.2 → soft7-0.3.0}/tests/graph/test_utils.py

@@ -1,5 +1,4 @@
-""" Unit tests for the graph module
-"""
+"""Unit tests for the graph module"""
 
 from __future__ import annotations
 
@@ -8,15 +7,15 @@ from unittest.mock import patch
 
 import pytest
 
-from graph.utils import fetch_and_populate_graph, find_parent_node
-
 
 class TestFindParentNode(unittest.TestCase):
     """Testclass"""
 
-    @patch("graph.utils.SPARQLWrapper")
+    @patch("s7.graph.utils.SPARQLWrapper")
     def test_find_parent_node_success(self, mock_wrapper):
         """Set up the mock for successful return"""
+        from s7.graph.utils import find_parent_node
+
         sparql = mock_wrapper.return_value
         sparql.query().convert.return_value = {
             "results": {
@@ -31,9 +30,11 @@ class TestFindParentNode(unittest.TestCase):
 
         assert result == "http://example.com/Parent"
 
-    @patch("graph.utils.SPARQLWrapper")
+    @patch("s7.graph.utils.SPARQLWrapper")
     def test_find_parent_node_no_parent_found(self, mock_wrapper):
         """Set up the mock for no parent found"""
+        from s7.graph.utils import find_parent_node
+
         sparql = mock_wrapper.return_value
         sparql.query().convert.return_value = {"results": {"bindings": []}}
 
@@ -42,9 +43,11 @@ class TestFindParentNode(unittest.TestCase):
         )
         assert result is None
 
-    @patch("graph.utils.SPARQLWrapper")
+    @patch("s7.graph.utils.SPARQLWrapper")
     def test_find_parent_node_exception(self, mock_wrapper):
         """Simulate a RuntimError exception"""
+        from s7.graph.utils import find_parent_node
+
         sparql = mock_wrapper.return_value
         sparql.query.side_effect = RuntimeError("SPARQL error")
 
@@ -57,10 +60,12 @@ class TestFindParentNode(unittest.TestCase):
 class TestFetchAndPopulateGraph(unittest.TestCase):
     """Testclass"""
 
-    @patch("graph.utils.SPARQLWrapper")
-    @patch("graph.utils.rdflib.Graph")
+    @patch("s7.graph.utils.SPARQLWrapper")
+    @patch("s7.graph.utils.rdflib.Graph")
     def test_fetch_and_populate_graph_success(self, mock_graph, mock_wrapper):
         """Set up mocks"""
+        from s7.graph.utils import fetch_and_populate_graph
+
         sparql = mock_wrapper.return_value
         graph = mock_graph.return_value
         sparql.query().convert.return_value = {
@@ -82,9 +87,11 @@ class TestFetchAndPopulateGraph(unittest.TestCase):
         assert graph.add.called
         assert result == graph
 
-    @patch("graph.utils.SPARQLWrapper")
+    @patch("s7.graph.utils.SPARQLWrapper")
     def test_fetch_and_populate_graph_failure(self, mock_wrapper):
         """Simulate a SPARQLWrapper exception"""
+        from s7.graph.utils import fetch_and_populate_graph
+
         sparql = mock_wrapper.return_value
         sparql.query.side_effect = RuntimeError("SPARQL error")
 

{soft7-0.2.2 → soft7-0.3.0}/tests/oteapi_plugin/test_soft7_function.py

@@ -10,7 +10,7 @@ if TYPE_CHECKING:
     from pathlib import Path
     from typing import Any, Union
 
-    from pydantic import AnyUrl
+    from pydantic import AnyHttpUrl
     from pytest_httpx import HTTPXMock
 
     from s7.pydantic_models.soft7_entity import SOFT7Entity
@@ -25,7 +25,7 @@ def test__flatten_mapping(httpx_mock: HTTPXMock, static_folder: Path) -> None:
 
     from oteapi.models import AttrDict, MappingConfig
     from oteapi.strategies.mapping.mapping import MappingStrategy
-    from pydantic import AnyUrl
+    from pydantic import AnyHttpUrl
 
     from s7.oteapi_plugin.soft7_function import RDFTriple, SOFT7Generator
     from s7.pydantic_models.oteapi import default_soft7_ote_function_config
@@ -139,40 +139,46 @@ def test__flatten_mapping(httpx_mock: HTTPXMock, static_folder: Path) -> None:
         for _ in [
             (
                 {
-                    "namespace": AnyUrl(
+                    "namespace": AnyHttpUrl(
                         mapping_config.prefixes["optimade"].rstrip("#")
                     ),
                     "concept": "data.id",
                 },
                 {"namespace": "", "concept": ""},
                 {
-                    "namespace": AnyUrl(mapping_config.prefixes["soft7"].rstrip("#")),
+                    "namespace": AnyHttpUrl(
+                        mapping_config.prefixes["soft7"].rstrip("#")
+                    ),
                     "concept": "properties.id",
                 },
             ),
             (
                 {
-                    "namespace": AnyUrl(
+                    "namespace": AnyHttpUrl(
                         mapping_config.prefixes["optimade"].rstrip("#")
                     ),
                     "concept": "data.type",
                 },
                 {"namespace": "", "concept": ""},
                 {
-                    "namespace": AnyUrl(mapping_config.prefixes["soft7"].rstrip("#")),
+                    "namespace": AnyHttpUrl(
+                        mapping_config.prefixes["soft7"].rstrip("#")
+                    ),
                     "concept": "properties.type",
                 },
             ),
             (
                 {
-                    "namespace": AnyUrl(
+                    "namespace": AnyHttpUrl(
                         mapping_config.prefixes["optimade"].rstrip("#")
                     ),
                     "concept": "data.attributes",
                 },
                 {"namespace": "", "concept": ""},
                 {
-                    "namespace": AnyUrl(mapping_config.prefixes["soft7"].rstrip("#")),
+                    "namespace": AnyHttpUrl(
+                        mapping_config.prefixes["soft7"].rstrip("#")
+                    ),
                     "concept": "properties.attributes",
                 },
             ),
@@ -190,7 +196,7 @@ def _generate_entity_test_cases() -> tuple[
     list[str],
     list[
         str,
-        AnyUrl,
+        AnyHttpUrl,
         SOFT7Entity,
         str,
         dict[str, Any],
@@ -199,14 +205,17 @@ def _generate_entity_test_cases() -> tuple[
     ],
 ]:
     """Generate test cases for the `test_dataclass_validation()` test."""
+    from pathlib import Path
+
     import yaml
-    from pydantic import AnyUrl
+    from pydantic import AnyHttpUrl
 
     from s7.factories.entity_factory import create_entity
     from s7.pydantic_models.soft7_entity import SOFT7Entity
-    from tests.conftest import static_folder
 
-    test_data_entity_path = static_folder() / "soft_datasource_entity.yaml"
+    static_folder = Path(__file__).parent.parent / "static"
+
+    test_data_entity_path = static_folder / "soft_datasource_entity.yaml"
     test_data_entity = yaml.safe_load(test_data_entity_path.read_text(encoding="utf-8"))
     test_entity = SOFT7Entity(**test_data_entity)
 
@@ -214,7 +223,7 @@ def _generate_entity_test_cases() -> tuple[
         # identity as a string
         test_data_entity["identity"],
         # identity as a URL
-        AnyUrl(test_data_entity["identity"]),
+        AnyHttpUrl(test_data_entity["identity"]),
         # Entity as a SOFT7Entity instance
         test_entity,
         # Entity as a JSON-serialized string
@@ -236,19 +245,19 @@ def _generate_entity_test_cases() -> tuple[
 def test_dataclass_validation(
     functionType: str,
     entity: Union[
-        str, type[SOFT7EntityInstance], dict[str, Any], Path, AnyUrl, SOFT7Entity
+        str, type[SOFT7EntityInstance], dict[str, Any], Path, AnyHttpUrl, SOFT7Entity
     ],
     httpx_mock: HTTPXMock,
     soft_entity_init: dict[str, Union[str, dict]],
 ) -> None:
     """Check the dataclass instantiates correctly (and validates) with different input
     types."""
-    from pydantic import AnyUrl, ValidationError
+    from pydantic import AnyHttpUrl, ValidationError
 
     from s7.oteapi_plugin.soft7_function import SOFT7Generator
     from s7.pydantic_models.soft7_entity import SOFT7IdentityURI
 
-    if isinstance(entity, (AnyUrl, str)):
+    if isinstance(entity, (AnyHttpUrl, str)):
         try:
             SOFT7IdentityURI(str(entity))
         except ValidationError: