dsp-tools 18.0.0__py3-none-any.whl → 18.0.0.post3__py3-none-any.whl

dsp_tools/cli/call_action_with_network.py

@@ -6,7 +6,6 @@ from dsp_tools.cli.args import PathDependencies
 from dsp_tools.cli.args import ValidationSeverity
 from dsp_tools.cli.utils import check_docker_health
 from dsp_tools.cli.utils import check_input_dependencies
-from dsp_tools.cli.utils import check_network_health
 from dsp_tools.cli.utils import get_creds
 from dsp_tools.commands.create.lists_only import create_lists_only
 from dsp_tools.commands.excel2json.old_lists import validate_lists_section_with_schema
@@ -62,14 +61,14 @@ def call_upload_files(args: argparse.Namespace) -> bool:
 
 
 def call_ingest_files(args: argparse.Namespace) -> bool:
-    check_network_health(NetworkRequirements(api_url=args.server))
+    check_input_dependencies(network_dependencies=NetworkRequirements(api_url=args.server))
     return ingest_files(creds=get_creds(args), shortcode=args.shortcode)
 
 
 def call_ingest_xmlupload(args: argparse.Namespace) -> bool:
     xml_path = Path(args.xml_file)
     required_files = [xml_path]
-    id2iri_file = args.id2iri_replacement_with_file
+    id2iri_file = args.id2iri_file
     if id2iri_file:
         required_files.append(Path(id2iri_file))
     network_requirements = NetworkRequirements(args.server, always_requires_docker=True)
@@ -83,7 +82,7 @@ def call_ingest_xmlupload(args: argparse.Namespace) -> bool:
         interrupt_after=interrupt_after,
         skip_validation=args.skip_validation,
         skip_ontology_validation=args.skip_ontology_validation,
-        id2iri_replacement_file=id2iri_file,
+        id2iri_file=id2iri_file,
         do_not_request_resource_metadata_from_db=args.do_not_request_resource_metadata_from_db,
     )
 
@@ -91,7 +90,7 @@ def call_ingest_xmlupload(args: argparse.Namespace) -> bool:
 def call_xmlupload(args: argparse.Namespace) -> bool:
     xml_path = Path(args.xmlfile)
     required_files = [xml_path]
-    id2iri_file = args.id2iri_replacement_with_file
+    id2iri_file = args.id2iri_file
     if id2iri_file:
         required_files.append(Path(id2iri_file))
     network_requirements = NetworkRequirements(args.server, always_requires_docker=True)
@@ -128,7 +127,7 @@ def call_xmlupload(args: argparse.Namespace) -> bool:
                 validation_severity=severity,
                 skip_ontology_validation=args.skip_ontology_validation,
                 do_not_request_resource_metadata_from_db=args.do_not_request_resource_metadata_from_db,
-                id2iri_replacement_file=id2iri_file,
+                id2iri_file=id2iri_file,
             ),
         )
 
@@ -136,7 +135,7 @@ def call_xmlupload(args: argparse.Namespace) -> bool:
 def call_validate_data(args: argparse.Namespace) -> bool:
     xml_path = Path(args.xmlfile)
     required_files = [xml_path]
-    id2iri_file = args.id2iri_replacement_with_file
+    id2iri_file = args.id2iri_file
     if id2iri_file:
         required_files.append(Path(id2iri_file))
     network_requirements = NetworkRequirements(args.server, always_requires_docker=True)
@@ -149,14 +148,14 @@ def call_validate_data(args: argparse.Namespace) -> bool:
         save_graphs=args.save_graphs,
         ignore_duplicate_files_warning=args.ignore_duplicate_files_warning,
         skip_ontology_validation=args.skip_ontology_validation,
-        id2iri_replacement_file=id2iri_file,
+        id2iri_file=id2iri_file,
         do_not_request_resource_metadata_from_db=args.do_not_request_resource_metadata_from_db,
     )
 
 
 def call_resume_xmlupload(args: argparse.Namespace) -> bool:
     # this does not need docker if not on localhost, as does not need to validate
-    check_network_health(NetworkRequirements(args.server))
+    check_input_dependencies(network_dependencies=NetworkRequirements(args.server))
     return resume_xmlupload(
         creds=get_creds(args),
         skip_first_resource=args.skip_first_resource,

dsp_tools/cli/create_parsers.py

@@ -246,7 +246,7 @@ def _add_ingest_xmlupload(
         ),
     )
     subparser.add_argument(
-        "--id2iri-replacement-with-file",
+        "--id2iri-file",
         help=(
             "replaces internal IDs of an XML file (links and stand-off links inside richtext) "
             "by IRIs provided in this mapping file"
@@ -318,7 +318,7 @@ def _add_xmlupload(
         ),
     )
     subparser.add_argument(
-        "--id2iri-replacement-with-file",
+        "--id2iri-file",
         help=(
             "replaces internal IDs of an XML file (links and stand-off links inside richtext) "
             "by IRIs provided in this mapping file"
@@ -354,7 +354,7 @@ def _add_validate_data(
         "-s", "--server", default=default_dsp_api_url, help="URL of the DSP server where DSP-TOOLS sends the data to"
     )
     subparser.add_argument(
-        "--id2iri-replacement-with-file",
+        "--id2iri-file",
         help=(
             "replaces internal IDs of an XML file (links and stand-off links inside richtext) "
             "by IRIs provided in this mapping file"

dsp_tools/cli/utils.py

@@ -31,7 +31,7 @@ def check_input_dependencies(
     if paths:
         check_path_dependencies(paths)
     if network_dependencies:
-        check_network_health(network_dependencies)
+        _check_network_health(network_dependencies)
 
 
 def check_path_dependencies(paths: PathDependencies) -> None:
@@ -51,7 +51,7 @@ def _check_directory_exists(dir_path: Path) -> None:
         raise UserDirectoryNotFoundError(dir_path)
 
 
-def check_network_health(network_requirements: NetworkRequirements) -> None:
+def _check_network_health(network_requirements: NetworkRequirements) -> None:
     if network_requirements.api_url == LOCALHOST_API or network_requirements.always_requires_docker:
         check_docker_health()
     _check_api_health(network_requirements.api_url)

dsp_tools/clients/list_client_live.py

@@ -5,7 +5,6 @@ from typing import cast
 from urllib.parse import quote_plus
 
 import requests
-from loguru import logger
 from requests import RequestException
 from requests import Response
 
@@ -15,8 +14,10 @@ from dsp_tools.clients.list_client import ListGetClient
 from dsp_tools.clients.list_client import OneList
 from dsp_tools.clients.list_client import OneNode
 from dsp_tools.error.exceptions import BadCredentialsError
-from dsp_tools.error.exceptions import InternalError
+from dsp_tools.error.exceptions import FatalNonOkApiResponseCode
 from dsp_tools.utils.request_utils import RequestParameters
+from dsp_tools.utils.request_utils import log_and_raise_request_exception
+from dsp_tools.utils.request_utils import log_and_warn_unexpected_non_ok_response
 from dsp_tools.utils.request_utils import log_request
 from dsp_tools.utils.request_utils import log_response
 
@@ -46,12 +47,16 @@ class ListGetClientLive(ListGetClient):
         url = f"{self.api_url}/admin/lists?projectShortcode={self.shortcode}"
         timeout = 10
         log_request(RequestParameters("GET", url, timeout))
-        response = requests.get(url=url, timeout=timeout)
+        try:
+            response = requests.get(url=url, timeout=timeout)
+        except RequestException as err:
+            log_and_raise_request_exception(err)
+
         log_response(response)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        json_response = cast(dict[str, Any], response.json())
-        return json_response
+        if response.ok:
+            json_response = cast(dict[str, Any], response.json())
+            return json_response
+        raise FatalNonOkApiResponseCode(url, response.status_code, response.text)
 
     def _extract_list_iris(self, response_json: dict[str, Any]) -> list[str]:
         return [x["id"] for x in response_json["lists"]]
@@ -61,12 +66,16 @@ class ListGetClientLive(ListGetClient):
         url = f"{self.api_url}/admin/lists/{encoded_list_iri}"
         timeout = 30
         log_request(RequestParameters("GET", url, timeout))
-        response = requests.get(url=url, timeout=timeout)
+        try:
+            response = requests.get(url=url, timeout=timeout)
+        except RequestException as err:
+            log_and_raise_request_exception(err)
+
         log_response(response, include_response_content=False)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        response_json = cast(dict[str, Any], response.json())
-        return response_json
+        if response.ok:
+            response_json = cast(dict[str, Any], response.json())
+            return response_json
+        raise FatalNonOkApiResponseCode(url, response.status_code, response.text)
 
     def _reformat_one_list(self, response_json: dict[str, Any]) -> OneList:
         list_name = response_json["list"]["listinfo"]["name"]
@@ -94,12 +103,12 @@ class ListCreateClientLive(ListCreateClient):
 
     def create_new_list(self, list_info: dict[str, Any]) -> str | None:
         url = f"{self.api_url}/admin/lists"
+        headers = self._get_request_header()
         try:
-            headers = self._get_request_header()
             response = _post_and_log_request(url, list_info, headers)
         except RequestException as err:
-            logger.exception(err)
-            return None
+            log_and_raise_request_exception(err)
+
         if response.ok:
             result = response.json()
             list_iri = cast(str, result["list"]["listinfo"]["id"])
@@ -109,18 +118,18 @@ class ListCreateClientLive(ListCreateClient):
                 "Only a project or system administrator can create lists. "
                 "Your permissions are insufficient for this action."
             )
-        logger.exception(f"Failed to create list: '{list_info['name']}'")
+        log_and_warn_unexpected_non_ok_response(response.status_code, response.text)
         return None
 
     def add_list_node(self, node_info: dict[str, Any], parent_iri: str) -> str | None:
         encoded_parent_iri = quote_plus(parent_iri)
         url = f"{self.api_url}/admin/lists/{encoded_parent_iri}"
+        headers = self._get_request_header()
         try:
-            headers = self._get_request_header()
             response = _post_and_log_request(url, node_info, headers)
         except RequestException as err:
-            logger.error(err)
-            return None
+            log_and_raise_request_exception(err)
+
         if response.ok:
             result = response.json()
             node_iri = cast(str, result["nodeinfo"]["id"])
@@ -130,7 +139,7 @@ class ListCreateClientLive(ListCreateClient):
                 "Only a project or system administrator can add nodes to lists. "
                 "Your permissions are insufficient for this action."
             )
-        logger.error(f"Failed to add node: '{node_info['name']}'")
+        log_and_warn_unexpected_non_ok_response(response.status_code, response.text)
         return None
 
     def _get_request_header(self) -> dict[str, str]:

dsp_tools/clients/ontology_create_client_live.py

@@ -1,22 +1,24 @@
 from dataclasses import dataclass
 from http import HTTPStatus
 from typing import Any
+from typing import cast
 
 import requests
 from loguru import logger
 from rdflib import Graph
 from rdflib import Literal
 from rdflib import URIRef
-from requests import ReadTimeout
+from requests import RequestException
 from requests import Response
 
 from dsp_tools.clients.authentication_client import AuthenticationClient
 from dsp_tools.clients.ontology_clients import OntologyCreateClient
 from dsp_tools.error.exceptions import BadCredentialsError
-from dsp_tools.error.exceptions import UnexpectedApiResponseError
+from dsp_tools.error.exceptions import FatalNonOkApiResponseCode
 from dsp_tools.utils.rdflib_constants import KNORA_API
 from dsp_tools.utils.request_utils import RequestParameters
-from dsp_tools.utils.request_utils import log_and_raise_timeouts
+from dsp_tools.utils.request_utils import log_and_raise_request_exception
+from dsp_tools.utils.request_utils import log_and_warn_unexpected_non_ok_response
 from dsp_tools.utils.request_utils import log_request
 from dsp_tools.utils.request_utils import log_response
 
@@ -38,23 +40,12 @@ class OntologyCreateClientLive(OntologyCreateClient):
         logger.debug("GET ontology metadata")
         try:
             response = self._get_and_log_request(url, header)
-        except (TimeoutError, ReadTimeout) as err:
-            log_and_raise_timeouts(err)
+        except RequestException as err:
+            log_and_raise_request_exception(err)
+
         if response.ok:
-            date = _parse_last_modification_date(response.text, URIRef(onto_iri))
-            if not date:
-                raise UnexpectedApiResponseError(
-                    f"Could not find the last modification date of the ontology '{onto_iri}' "
-                    f"in the response: {response.text}"
-                )
-            return date
-        if response.status_code == HTTPStatus.FORBIDDEN:
-            raise BadCredentialsError("You do not have sufficient credentials to retrieve ontology metadata.")
-        else:
-            raise UnexpectedApiResponseError(
-                f"An unexpected response with the status code {response.status_code} was received from the API. "
-                f"Please consult 'warnings.log' for details."
-            )
+            return _parse_last_modification_date(response.text, URIRef(onto_iri))
+        raise FatalNonOkApiResponseCode(url, response.status_code, response.text)
 
     def post_resource_cardinalities(self, cardinality_graph: dict[str, Any]) -> Literal | None:
         url = f"{self.server}/v2/ontologies/cardinalities"
@@ -62,26 +53,18 @@ class OntologyCreateClientLive(OntologyCreateClient):
         logger.debug("POST resource cardinalities to ontology")
         try:
             response = self._post_and_log_request(url, cardinality_graph)
-        except (TimeoutError, ReadTimeout) as err:
-            log_and_raise_timeouts(err)
+        except RequestException as err:
+            log_and_raise_request_exception(err)
+
         if response.ok:
-            date = _parse_last_modification_date(response.text)
-            if not date:
-                raise UnexpectedApiResponseError(
-                    f"Could not find the last modification date in the response: {response.text}"
-                )
-            return date
+            return _parse_last_modification_date(response.text)
         if response.status_code == HTTPStatus.FORBIDDEN:
             raise BadCredentialsError(
                 "Only a project or system administrator can add cardinalities to resource classes. "
                 "Your permissions are insufficient for this action."
             )
-        else:
-            logger.error(
-                f"During cardinality creation an unexpected response with the status code {response.status_code} "
-                f"was received from the API."
-            )
-            return None
+        log_and_warn_unexpected_non_ok_response(response.status_code, response.text)
+        return None
 
     def _post_and_log_request(
         self,
@@ -130,10 +113,8 @@ class OntologyCreateClientLive(OntologyCreateClient):
         return data_dict, generic_headers
 
 
-def _parse_last_modification_date(response_text: str, onto_iri: URIRef | None = None) -> Literal | None:
+def _parse_last_modification_date(response_text: str, onto_iri: URIRef | None = None) -> Literal:
     g = Graph()
     g.parse(data=response_text, format="json-ld")
-    result = next(g.objects(subject=onto_iri, predicate=KNORA_API.lastModificationDate), None)
-    if isinstance(result, Literal):
-        return result
-    return None
+    date = next(g.objects(subject=onto_iri, predicate=KNORA_API.lastModificationDate))
+    return cast(Literal, date)

dsp_tools/clients/ontology_get_client_live.py

@@ -5,6 +5,7 @@ from typing import cast
 import requests
 
 from dsp_tools.clients.ontology_clients import OntologyGetClient
+from dsp_tools.error.exceptions import FatalNonOkApiResponseCode
 from dsp_tools.error.exceptions import InternalError
 from dsp_tools.utils.request_utils import RequestParameters
 from dsp_tools.utils.request_utils import log_request
@@ -23,9 +24,9 @@ class OntologyGetClientLive(OntologyGetClient):
         log_request(RequestParameters("GET", url, timeout=timeout, headers=headers))
         response = requests.get(url=url, headers=headers, timeout=timeout)
         log_response(response, include_response_content=False)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        return response.text
+        if response.ok:
+            return response.text
+        raise FatalNonOkApiResponseCode(url, response.status_code, response.text)
 
     def get_ontologies(self) -> tuple[list[str], list[str]]:
         """
@@ -49,7 +50,7 @@ class OntologyGetClientLive(OntologyGetClient):
             raise InternalError(f"Failed Request: {response.status_code} {response.text}")
         response_json = cast(dict[str, Any], response.json())
         if not (ontos := response_json.get("project", {}).get("ontologies")):
-            raise InternalError(f"The response from the API does not contain any ontologies.\nResponse:{response.text}")
+            raise FatalNonOkApiResponseCode(url, response.status_code, response.text)
         output = cast(list[str], ontos)
         return output
 
@@ -60,6 +61,6 @@ class OntologyGetClientLive(OntologyGetClient):
         log_request(RequestParameters("GET", url, timeout=timeout, headers=headers))
         response = requests.get(url=url, headers=headers, timeout=timeout)
         log_response(response, include_response_content=False)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        return response.text
+        if response.ok:
+            return response.text
+        raise FatalNonOkApiResponseCode(url, response.status_code, response.text)

dsp_tools/clients/project_client_live.py

@@ -3,10 +3,12 @@ from http import HTTPStatus
 from typing import cast
 
 import requests
+from requests import RequestException
 
 from dsp_tools.clients.project_client import ProjectInfoClient
-from dsp_tools.error.exceptions import UnexpectedApiResponseError
+from dsp_tools.error.exceptions import FatalNonOkApiResponseCode
 from dsp_tools.utils.request_utils import RequestParameters
+from dsp_tools.utils.request_utils import log_and_raise_request_exception
 from dsp_tools.utils.request_utils import log_request
 from dsp_tools.utils.request_utils import log_response
 
@@ -20,11 +22,15 @@ class ProjectInfoClientLive(ProjectInfoClient):
         timeout = 30
         params = RequestParameters("GET", url, timeout)
         log_request(params)
-        response = requests.get(url, timeout=timeout)
+        try:
+            response = requests.get(url, timeout=timeout)
+        except RequestException as err:
+            log_and_raise_request_exception(err)
+
         log_response(response)
         if response.ok:
             result = response.json()
             return cast(str, result["project"]["id"])
         if response.status_code == HTTPStatus.NOT_FOUND:
             return None
-        raise UnexpectedApiResponseError(f"Encountered unexpected API response with the code {response.status_code}")
+        raise FatalNonOkApiResponseCode(url, response.status_code, response.text)

dsp_tools/commands/create/create_on_server/lists.py

@@ -1,3 +1,4 @@
+import warnings
 from typing import Any
 
 from loguru import logger
@@ -17,6 +18,8 @@ from dsp_tools.commands.create.models.parsed_project import ParsedList
 from dsp_tools.commands.create.models.parsed_project import ParsedListNode
 from dsp_tools.commands.create.models.parsed_project import ParsedNodeInfo
 from dsp_tools.commands.create.models.server_project_info import ListNameToIriLookup
+from dsp_tools.error.custom_warnings import DspToolsUnexpectedStatusCodeWarning
+from dsp_tools.error.exceptions import FatalNonOkApiResponseCode
 from dsp_tools.utils.ansi_colors import BOLD
 from dsp_tools.utils.ansi_colors import BOLD_CYAN
 from dsp_tools.utils.ansi_colors import RESET_TO_DEFAULT
@@ -64,8 +67,18 @@ def _print_existing_list_info(existing_lists: list[UserInformation]) -> None:
 
 def get_existing_lists_on_server(shortcode: str, auth: AuthenticationClient) -> ListNameToIriLookup:
     client = ListGetClientLive(auth.server, shortcode)
-    name2iri_dict = client.get_all_list_iris_and_names()
-    return ListNameToIriLookup(name2iri_dict)
+    try:
+        name2iri_dict = client.get_all_list_iris_and_names()
+        return ListNameToIriLookup(name2iri_dict)
+    except FatalNonOkApiResponseCode as e:
+        logger.exception(e)
+        warnings.warn(
+            DspToolsUnexpectedStatusCodeWarning(
+                "Could not retrieve existing lists on server. "
+                "We will not be able to create any properties that require a list that is not defined in the JSON."
+            )
+        )
+        return ListNameToIriLookup({})
 
 
 def _filter_out_existing_lists(

dsp_tools/commands/ingest_xmlupload/create_resources/upload_xml.py

@@ -42,7 +42,7 @@ def ingest_xmlupload(
     interrupt_after: int | None = None,
     skip_validation: bool = False,
     skip_ontology_validation: bool = False,
-    id2iri_replacement_file: str | None = None,
+    id2iri_file: str | None = None,
     do_not_request_resource_metadata_from_db: bool = False,
 ) -> bool:
     """
@@ -59,7 +59,7 @@ def ingest_xmlupload(
         interrupt_after: if set, the upload will be interrupted after this number of resources
         skip_validation: skip the SHACL validation
         skip_ontology_validation: skip the ontology validation
-        id2iri_replacement_file: to replace internal IDs of an XML file by IRIs provided in this mapping file
+        id2iri_file: to replace internal IDs of an XML file by IRIs provided in this mapping file
         do_not_request_resource_metadata_from_db: if true do not request metadata information from the api
                                                   for existing resources
 
@@ -86,8 +86,8 @@ def ingest_xmlupload(
     clients = _get_live_clients(con, config, auth)
 
     parsed_resources, lookups = get_parsed_resources_and_mappers(root, clients)
-    if id2iri_replacement_file:
-        parsed_resources = use_id2iri_mapping_to_replace_ids(parsed_resources, Path(id2iri_replacement_file))
+    if id2iri_file:
+        parsed_resources = use_id2iri_mapping_to_replace_ids(parsed_resources, Path(id2iri_file))
 
     validation_should_be_skipped = skip_validation
     is_on_prod_like_server = is_prod_like_server(creds.server)

dsp_tools/commands/validate_data/prepare_data/prepare_data.py

@@ -30,15 +30,15 @@ from dsp_tools.utils.xml_parsing.parse_clean_validate_xml import parse_and_clean
 
 
 def get_info_and_parsed_resources_from_file(
-    file: Path, api_url: str, id2iri_replacement_file: str | None
+    file: Path, api_url: str, id2iri_file: str | None
 ) -> tuple[list[ParsedResource], str, dict[str, list[str]], list[str]]:
     root = parse_and_clean_xml_file(file)
     shortcode = root.attrib["shortcode"]
     authorship_lookup = get_authorship_lookup(root)
     permission_ids = [perm.attrib["id"] for perm in root.findall("permissions")]
     parsed_resources = get_parsed_resources(root, api_url)
-    if id2iri_replacement_file:
-        parsed_resources = use_id2iri_mapping_to_replace_ids(parsed_resources, Path(id2iri_replacement_file))
+    if id2iri_file:
+        parsed_resources = use_id2iri_mapping_to_replace_ids(parsed_resources, Path(id2iri_file))
     return parsed_resources, shortcode, authorship_lookup, permission_ids
 
 

dsp_tools/commands/validate_data/shacl_cli_validator.py

@@ -9,6 +9,7 @@ from rdflib import Graph
 
 from dsp_tools.commands.validate_data.models.api_responses import SHACLValidationReport
 from dsp_tools.commands.validate_data.models.validation import ValidationFilePaths
+from dsp_tools.config.logger_config import LOGGER_SAVEPATH
 from dsp_tools.error.exceptions import InternalError
 from dsp_tools.error.exceptions import ShaclValidationCliError
 
@@ -21,7 +22,8 @@ class ShaclCliValidator:
             logger.error(e)
             msg = (
                 "Data validation requires Docker. Is your Docker Desktop Application open? "
-                "If it is, please contact the DSP-TOOLS development team with your log file."
+                "If it is, please contact the DSP-TOOLS development team (at info@dasch.swiss) "
+                f"with the log file at {LOGGER_SAVEPATH}."
             )
             logger.error(msg)
             raise ShaclValidationCliError(msg) from None

dsp_tools/commands/validate_data/validate_data.py

@@ -51,7 +51,7 @@ def validate_data(
     ignore_duplicate_files_warning: bool,
     save_graphs: bool,
     skip_ontology_validation: bool,
-    id2iri_replacement_file: str | None,
+    id2iri_file: str | None,
     do_not_request_resource_metadata_from_db: bool,
 ) -> bool:
     """
@@ -63,7 +63,7 @@ def validate_data(
         ignore_duplicate_files_warning: ignore the shape that checks for duplicate files
         save_graphs: if this flag is set, all the graphs will be saved in a folder
         skip_ontology_validation: skip the ontology validation
-        id2iri_replacement_file: to replace internal IDs of an XML file by IRIs provided in this mapping file
+        id2iri_file: to replace internal IDs of an XML file by IRIs provided in this mapping file
         do_not_request_resource_metadata_from_db: true if no metadata for existing resources should be requested
 
     Returns:
@@ -88,7 +88,7 @@ def validate_data(
     parsed_resources, shortcode, authorship_lookup, permission_ids = get_info_and_parsed_resources_from_file(
         file=filepath,
         api_url=auth.server,
-        id2iri_replacement_file=id2iri_replacement_file,
+        id2iri_file=id2iri_file,
     )
     return validate_parsed_resources(
         parsed_resources=parsed_resources,

dsp_tools/commands/validate_data/validation/get_validation_report.py

@@ -32,7 +32,7 @@ def get_validation_report(
         dir_to_save_graphs = tmp_path.parent / "validation-graphs"
         msg = (
             f"An error occurred during the data validation. "
-            f"Please contact the dsp-tools development team "
+            f"Please contact the dsp-tools development team (at info@dasch.swiss) "
             f"with your log files and the files in the directory: {dir_to_save_graphs}"
         )
         raise ShaclValidationError(msg) from None

dsp_tools/commands/validate_data/validation/validate_ontology.py

@@ -52,7 +52,7 @@ def validate_ontology(
         save_graph_dir = tmp_path.parent / "validation-graphs"
         msg = (
             f"An error occurred during the ontology validation. "
-            f"Please contact the dsp-tools development team "
+            f"Please contact the dsp-tools development team (at info@dasch.swiss) "
             f"with your log files and the files in the directory: {save_graph_dir}"
         )
         raise ShaclValidationError(msg) from None

dsp_tools/commands/xmlupload/models/input_problems.py

@@ -54,5 +54,5 @@ class IIIFUriProblem:
     def _good_status_code_bad_regex_msg(self) -> list[str]:
         return [
             "Although the IIIF-server responded as expected, this URI did not pass validation.",
-            "Please contact the dsp-tools development team with this information.",
+            "Please contact the dsp-tools development team (at info@dasch.swiss) with this information.",
         ]

dsp_tools/commands/xmlupload/upload_config.py

@@ -55,7 +55,7 @@ class UploadConfig:
     skip_ontology_validation: bool = False
     ignore_duplicate_files_warning: bool = False
     validation_severity: ValidationSeverity = field(default_factory=lambda: ValidationSeverity.INFO)
-    id2iri_replacement_file: str | None = None
+    id2iri_file: str | None = None
     do_not_request_resource_metadata_from_db: bool = False
 
     def with_server_info(

dsp_tools/commands/xmlupload/xmlupload.py

@@ -94,8 +94,8 @@ def xmlupload(
     clients = _get_live_clients(con, auth, creds, shortcode, imgdir)
 
     parsed_resources, lookups = get_parsed_resources_and_mappers(root, clients)
-    if config.id2iri_replacement_file:
-        parsed_resources = use_id2iri_mapping_to_replace_ids(parsed_resources, Path(config.id2iri_replacement_file))
+    if config.id2iri_file:
+        parsed_resources = use_id2iri_mapping_to_replace_ids(parsed_resources, Path(config.id2iri_file))
 
     is_on_prod_like_server = is_prod_like_server(creds.server)
 

dsp_tools/error/custom_warnings.py

@@ -30,3 +30,10 @@ class DspToolsFutureWarning(DspToolsWarning, FutureWarning):
     def showwarning(cls, message: str) -> None:
         """Print the warning, without context"""
         print(BOLD_RED + f"DEPRECATION WARNING: {message}" + RESET_TO_DEFAULT)
+
+
+class DspToolsUnexpectedStatusCodeWarning(DspToolsWarning):
+    @classmethod
+    def showwarning(cls, message: str) -> None:
+        """Print the warning, without context"""
+        print(BOLD_RED + f"ERROR: {message}" + RESET_TO_DEFAULT)

dsp_tools/error/exceptions.py

@@ -29,7 +29,7 @@ class InternalError(BaseError):
     def __init__(self, custom_msg: str | None = None, keep_default_msg: bool = True) -> None:
         default_msg = (
             f"\n\n{BOLD_RED}An internal error occurred.{RESET_TO_DEFAULT}\n"
-            "Please contact the dsp-tools development team with the following information:\n"
+            "Please contact the dsp-tools development team (at info@dasch.swiss) with the following information:\n"
             "    - Which command was used.\n"
             "    - If applicable, any files that were used in conjunction with the command.\n"
             "    - A text file with the terminal output copied into.\n"
@@ -57,6 +57,10 @@ class DspApiNotReachableError(BaseError):
     """This error is raised when the DSP-API could not be reached on localhost."""
 
 
+class DspToolsRequestException(BaseError):
+    """Class for errors that are raised if any request exceptions happens."""
+
+
 class InputError(BaseError):
     """This error is raised when the user input is invalid. The message should be as user-friendly as possible."""
 
@@ -65,9 +69,20 @@ class InvalidGuiAttributeError(BaseError):
     """This error is raised when a invalid gui-attribute is used."""
 
 
-class UnexpectedApiResponseError(BaseError):
+class FatalNonOkApiResponseCode(BaseError):
     """This error is raised when the API gives an unexpected response, that we cannot anticipate and handle cleanly."""
 
+    def __init__(self, request_url: str, status_code: int, response_text: str) -> None:
+        resp_txt = response_text[:200] if len(response_text) > 200 else response_text
+        msg = (
+            f"We currently do not support the following API response code for this request.\n"
+            f"Status code: {status_code}\n"
+            f"Request URL: {request_url}\n"
+            f"Original Response: {resp_txt}\n"
+            f"Please contact info@dasch.swiss with the log file at {LOGGER_SAVEPATH}."
+        )
+        super().__init__(msg)
+
 
 class UserFilepathNotFoundError(InputError):
     """This error is raised if a filepath from the user does not exist."""

dsp_tools/utils/fuseki_bloating.py

@@ -4,6 +4,7 @@ from loguru import logger
 
 from dsp_tools.clients.fuseki_metrics import FusekiBloatingLevel
 from dsp_tools.clients.fuseki_metrics import FusekiMetrics
+from dsp_tools.config.logger_config import LOGGER_SAVEPATH
 from dsp_tools.utils.ansi_colors import BACKGROUND_BOLD_RED
 from dsp_tools.utils.ansi_colors import BOLD_YELLOW
 from dsp_tools.utils.ansi_colors import RESET_TO_DEFAULT
@@ -23,7 +24,7 @@ def communicate_fuseki_bloating(fuseki_metrics: FusekiMetrics) -> None:
     msg = (
         f"The xmlupload caused the database to use {rounded} GB disk space. "
         f"Please check that your test server has enough disk space for an upload. "
-        f"If you have any questions contact the dsp-tools developers."
+        f"If you have any questions contact the dsp-tools developers at info@dasch.swiss."
     )
     match bloating_level:
         case FusekiBloatingLevel.OK:
@@ -37,7 +38,8 @@ def communicate_fuseki_bloating(fuseki_metrics: FusekiMetrics) -> None:
         case FusekiBloatingLevel.CALCULATION_FAILURE:
             msg = (
                 "The database bloating size could not be calculated. "
-                "Please contact the dsp-tools developers with your logs."
+                f"Please contact the dsp-tools developers (at info@dasch.swiss) "
+                f"with your logs saved at {LOGGER_SAVEPATH}."
             )
             print(f"{BACKGROUND_BOLD_RED}{msg}{RESET_TO_DEFAULT}")
             logger.error(msg)

dsp_tools/utils/request_utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 import os
 import time
+import warnings
 from dataclasses import dataclass
 from dataclasses import field
 from datetime import datetime
@@ -14,10 +15,14 @@ from typing import Union
 from loguru import logger
 from requests import JSONDecodeError
 from requests import ReadTimeout
+from requests import RequestException
 from requests import Response
 
 from dsp_tools.commands.project.legacy_models.context import Context
 from dsp_tools.commands.project.legacy_models.helpers import OntoIri
+from dsp_tools.config.logger_config import LOGGER_SAVEPATH
+from dsp_tools.error.custom_warnings import DspToolsUnexpectedStatusCodeWarning
+from dsp_tools.error.exceptions import DspToolsRequestException
 from dsp_tools.error.exceptions import PermanentTimeOutError
 
 
@@ -192,3 +197,29 @@ def should_retry(response: Response) -> bool:
     try_again_later = "try again later" in response.text.lower()
     in_testing_env = os.getenv("DSP_TOOLS_TESTING") == "true"  # set in .github/workflows/tests-on-push.yml
     return (try_again_later or in_500_range) and not in_testing_env
+
+
+def log_and_raise_request_exception(error: RequestException) -> Never:
+    msg = (
+        f"During an API call the following exception occurred. "
+        f"Please contact info@dasch.swiss with the log file at {LOGGER_SAVEPATH} "
+        f"if you required help resolving the issue.\n"
+        f"Original exception name: {error.__class__.__name__}\n"
+    )
+    if error.request:
+        msg += f"Original request: {error.request.method} {error.request.url}"
+    logger.exception(msg)
+    raise DspToolsRequestException(msg) from None
+
+
+def log_and_warn_unexpected_non_ok_response(status_code: int, response_text: str) -> None:
+    resp_txt = response_text[:200] if len(response_text) > 200 else response_text
+    msg = (
+        "We got an unexpected API response during the following request. "
+        "Please contact the dsp-tools development team (at info@dasch.swiss) with your log file "
+        "so that we can handle this more gracefully in the future.\n"
+        f"Response status code: {status_code}\n"
+        f"Original Message: {resp_txt}"
+    )
+    logger.warning(msg)
+    warnings.warn(DspToolsUnexpectedStatusCodeWarning(msg))

dsp_tools/xmllib/models/res.py

@@ -91,10 +91,12 @@ class Resource:
             ```
         """
         if not is_valid_resource_id(res_id):
+            res_id = str(res_id)
             emit_xmllib_input_type_mismatch_warning(
                 expected_type="xsd:ID", value=res_id, res_id=res_id, value_field="resource ID"
             )
         if not is_nonempty_value(restype):
+            restype = str(restype)
             emit_xmllib_input_type_mismatch_warning(
                 expected_type="resource type", value=restype, res_id=res_id, value_field="restype"
             )

{dsp_tools-18.0.0.dist-info → dsp_tools-18.0.0.post3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dsp-tools
-Version: 18.0.0
+Version: 18.0.0.post3
 Summary: DSP-TOOLS is a Python package with a command line interface that helps you interact with a DaSCH service platform (DSP) server.
 Author: DaSCH - Swiss National Data and Service Center for the Humanities
 Author-email: DaSCH - Swiss National Data and Service Center for the Humanities <info@dasch.swiss>

{dsp_tools-18.0.0.dist-info → dsp_tools-18.0.0.post3.dist-info}/RECORD

@@ -3,10 +3,10 @@ dsp_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/cli/args.py,sha256=qUoEQVULA3eaCkI1xSdEhEcM26rku0lejnjSnKoevGU,1038
 dsp_tools/cli/call_action.py,sha256=l6pmY1SckKMkh-Y0DW1Aij2IR_D91uoe078fsruXkIQ,3275
 dsp_tools/cli/call_action_files_only.py,sha256=T0A51uN4pClcLaDv_eREZMwEshAIlHMyEDPOOqZIOKg,2630
-dsp_tools/cli/call_action_with_network.py,sha256=nEP60rXWZy_z4tkz5ed6DDOEkHMkXVuyheeNZQogjFs,8556
-dsp_tools/cli/create_parsers.py,sha256=UgHp3_3siQoLe1GdFTLn2ya8Vjumf-NibT0Rd58UxuY,19567
+dsp_tools/cli/call_action_with_network.py,sha256=JEMRWL13hvzJyFZ3NIHefMP8GnmTsdgHwgWaS2I9vAw,8466
+dsp_tools/cli/create_parsers.py,sha256=cYvXlVRVeqVRzAydsZ8_OUbRErjD_mz6irxFAVmhFqU,19516
 dsp_tools/cli/entry_point.py,sha256=gdexHqVDAy8_Atf0oUxvPVQyDGWUSUhio396U5Oc0RI,10331
-dsp_tools/cli/utils.py,sha256=57Bmv33A61YHcWDDm2zGOsjEuB_bV6p9FYIdN_42UBs,3072
+dsp_tools/cli/utils.py,sha256=Y3Sq1QlMJw7NvQ3CEB-55LQi-ht3tlsNcRjTISbEQO4,3074
 dsp_tools/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/clients/authentication_client.py,sha256=A9nTlOdUE4Ez0psWX6qXwuypNBAA2eSVfHIEPzRmoCs,267
 dsp_tools/clients/authentication_client_live.py,sha256=Bnc6-M2r_D8BNoZgKi5Rzc2vrz5RtRhwUNjJF3PrVTQ,1917
@@ -16,21 +16,21 @@ dsp_tools/clients/fuseki_metrics.py,sha256=Vy_aWOusnzlD0EnbyHZcTtPIpMEfRA_ihtYby
 dsp_tools/clients/legal_info_client.py,sha256=itDvGQf1VV1WiH2oHVcH1epSUSdJPRDwdRUvmCw8P4s,742
 dsp_tools/clients/legal_info_client_live.py,sha256=9nOe8Y-oQRHh4TkD2-tjdxLNNTonQ0i-P6UjCGgIBGA,5987
 dsp_tools/clients/list_client.py,sha256=L1CcbUcmzwkJVKbrbXa7EB2myJ-sCchjZywwuPh2uS8,1118
-dsp_tools/clients/list_client_live.py,sha256=yoznKeBus0gAIERUIjZAbEqGU1CA4AzRRLO48JkrBMU,6198
+dsp_tools/clients/list_client_live.py,sha256=QFDlZtGEvYu4bmaDIJVFkyWDG9pnJmIfz4GTMElxBqg,6553
 dsp_tools/clients/metadata_client.py,sha256=GD4uYXP3kEym59JAqSub61xXDZSmZaQ2lKRF1_MgYS0,623
 dsp_tools/clients/metadata_client_live.py,sha256=SLq2Ssob3TQaTx6PUblD-DeTimSLA4Y6woo6246Fca8,1863
 dsp_tools/clients/ontology_clients.py,sha256=juigGsfZ1uP42gtyEstDzaMfjeKcriS34mgYaFbJW-Y,989
-dsp_tools/clients/ontology_create_client_live.py,sha256=LOz3k2_ZiShEcdarhoscLFjsdMHG85mHGsbRuR7cq7Y,5386
-dsp_tools/clients/ontology_get_client_live.py,sha256=MeTqWVqTBW22wEebulv3R8fDsjvW2_dd-cs0Wqllxe8,2698
+dsp_tools/clients/ontology_create_client_live.py,sha256=zv32RRWanbIrLnb6kJ4s4vqgAD2ipc4xo_yOXTyZy3o,4492
+dsp_tools/clients/ontology_get_client_live.py,sha256=bq8g0nID9ChCmH5_enxOTLML5IikFEMhJq-kqk5cyaM,2710
 dsp_tools/clients/project_client.py,sha256=1nsp-RLRTqD1ePk824R4XKbAKCWMYwiGR9uzA-0qRqg,243
-dsp_tools/clients/project_client_live.py,sha256=NTnw_DG37YKfAouDExccwt79QHFsT66oPyrY3MXtVSY,1115
+dsp_tools/clients/project_client_live.py,sha256=rymSE8gYrDXErM5k5UExFjABfmtN5f6Pr5Eye5kJdrE,1297
 dsp_tools/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/create/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/create/communicate_problems.py,sha256=GdAOiUZevrYFhRINyDMhcbXdUqtGDKb2nEelhdfSFR0,885
 dsp_tools/commands/create/constants.py,sha256=ZzWNn_zh-0Oy0SJmGivQbcAnQTmwT0akNchZUppXgh0,276
 dsp_tools/commands/create/create_on_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/create/create_on_server/cardinalities.py,sha256=bp-3NokfyhpE5ddKTkib9imFpZiMyRKcN-pHK_DHyfo,5518
-dsp_tools/commands/create/create_on_server/lists.py,sha256=y_63BBpALfJKJ-wQfsgINEuevFnRolD07ZWt0Q4yFfA,6195
+dsp_tools/commands/create/create_on_server/lists.py,sha256=P4CsHHrbRMkfz66rRWbG6_MEIhm0kt8Pnou3mcGtdJ0,6759
 dsp_tools/commands/create/create_on_server/mappers.py,sha256=Lu2DJAICOZu7WP_1UDvyvRAi0T9ZGO88kvx0UfI6v5I,564
 dsp_tools/commands/create/lists_only.py,sha256=pSgl0XykdguR9445QIAvDTTRbsBuicIxgjD-zFQQzD0,2079
 dsp_tools/commands/create/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -76,7 +76,7 @@ dsp_tools/commands/ingest_xmlupload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 dsp_tools/commands/ingest_xmlupload/bulk_ingest_client.py,sha256=i53VPo5bRf6FkGzEuQuZJIzHKO4_aJKkmz3jmIA5q3Y,7617
 dsp_tools/commands/ingest_xmlupload/create_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/ingest_xmlupload/create_resources/apply_ingest_id.py,sha256=AM6nSDKQc0Oqrv2Z0Uyaz8ztcPJrUGnwN5tlpvBzaBg,2579
-dsp_tools/commands/ingest_xmlupload/create_resources/upload_xml.py,sha256=atfMF_8yaZ7qJ-ZzWLdLFlFEWvN3uiT3iqkINLUXxSQ,7796
+dsp_tools/commands/ingest_xmlupload/create_resources/upload_xml.py,sha256=1m3_KBbboCTunUAHtAfKDZS9K5DGhr-_EfMj3VOZ-_g,7748
 dsp_tools/commands/ingest_xmlupload/create_resources/user_information.py,sha256=wR6PGR2DQvPS0YXELzCJ70fvzQnFvIzek3VFWVPoZk0,4883
 dsp_tools/commands/ingest_xmlupload/ingest_files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/ingest_xmlupload/ingest_files/ingest_files.py,sha256=ML_k_KyuNOYBcwy6nrqJ077vj72b_a04MbJRy95KPcA,2306
@@ -126,24 +126,24 @@ dsp_tools/commands/validate_data/models/validation.py,sha256=okYFrLhaSQCGfa8A7gR
 dsp_tools/commands/validate_data/prepare_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/validate_data/prepare_data/get_rdf_like_data.py,sha256=sU_VmMAvvNsjKkld6Coc_HJLt32nzXOimvKRxIbte-o,11620
 dsp_tools/commands/validate_data/prepare_data/make_data_graph.py,sha256=TANm9WA_z-oPGkoMIR2BGZrHtAkizDlnK_5WDVxQRoQ,4098
-dsp_tools/commands/validate_data/prepare_data/prepare_data.py,sha256=BcmAC8SLAmNS4kGrNOvMxpGQrWPJCVE1f1jDYRpSvYU,8320
+dsp_tools/commands/validate_data/prepare_data/prepare_data.py,sha256=LL4JplvcQ0HXXqg13xY9pEkuOv9jfaQxB4xJdgXRSQk,8284
 dsp_tools/commands/validate_data/process_validation_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/validate_data/process_validation_report/get_user_validation_message.py,sha256=W5VYJPs8J3VvJAaFDBGBuCQ3Xtonhn1iRUOxwgO7xV0,16148
 dsp_tools/commands/validate_data/process_validation_report/query_validation_result.py,sha256=ln7zOq0LgkaVIoTNv2O72Z0tK6WX0UrbwAph-n0tD3E,22299
 dsp_tools/commands/validate_data/process_validation_report/reformat_validation_results.py,sha256=YGJnYLHhmc_X4I6RqKDgnLClMo_bNVtzRZBER3uLWp8,6556
-dsp_tools/commands/validate_data/shacl_cli_validator.py,sha256=3PMFLwPgei76GI07lcboPrLYvjmYaHv7pg_dNvF2KlQ,2958
+dsp_tools/commands/validate_data/shacl_cli_validator.py,sha256=4v8KM0GOkg1Zuq5ii29T2muUz3ZUsua7W6UhS9C3zcc,3079
 dsp_tools/commands/validate_data/sparql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/validate_data/sparql/cardinality_shacl.py,sha256=V45pljnAx6jvsE1VRDKMZjZ1HdmwoMUnPUCQrQIYHMU,7218
 dsp_tools/commands/validate_data/sparql/construct_shacl.py,sha256=pB8sHn8FiAEiweeIYHROUAJH0YeCk8NWbzEI98YuEIQ,3553
 dsp_tools/commands/validate_data/sparql/legal_info_shacl.py,sha256=2yhn5HfCJFJpOTB-3XNWfxP1KwW3zKxDfqPdhN_Sazg,1522
 dsp_tools/commands/validate_data/sparql/value_shacl.py,sha256=uUkOlrMCcqzuVYQTXwTJOJw4RGDTd00y3OtLP41nY2c,13044
 dsp_tools/commands/validate_data/utils.py,sha256=L3kpuhn46x-OHap9RnN9QwUQjFYpkQFlFXzFKQfy5ZE,1990
-dsp_tools/commands/validate_data/validate_data.py,sha256=GKQv0G2pDnB_5wbUghk12wcCWBsc5hoNySsxuQ81C5U,13498
+dsp_tools/commands/validate_data/validate_data.py,sha256=jMAqZfuy_HjHLYR58piXBFdb5oV4_UR8qdHBRYrUM7Q,13450
 dsp_tools/commands/validate_data/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/validate_data/validation/check_duplicate_files.py,sha256=8HU7GZkTMXj68WrVTXadtQujjEP_MvkOnQb4iVtEHt4,2228
 dsp_tools/commands/validate_data/validation/check_for_unknown_classes.py,sha256=Vhr1-nJzd3vzlwSoDJTljY-eFMpFLpTEy_zIEZb5MJs,2966
-dsp_tools/commands/validate_data/validation/get_validation_report.py,sha256=jvzFXzyG6bcSNzs6Buj_-NV85g9pwr9spMz_OBG8MQk,4201
-dsp_tools/commands/validate_data/validation/validate_ontology.py,sha256=R5-aD9cFc4KSLbT_IanhzSibx71uJX_dBBHgkoHtLKY,4783
+dsp_tools/commands/validate_data/validation/get_validation_report.py,sha256=pJrz-A9cziHS_MsmoAs-P5eyj5h-jV7Z9yZBVyvOpgE,4223
+dsp_tools/commands/validate_data/validation/validate_ontology.py,sha256=ePBoe7cUzeZcA0hUY9-vmkT4SUpaFhmfNwYwU5tsG9w,4805
 dsp_tools/commands/xmlupload/CLAUDE.md,sha256=EOmh0nPs5ne9iAFCdhG6LHYaYBn4hMkM86G8UfMMsaU,10547
 dsp_tools/commands/xmlupload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/xmlupload/iri_resolver.py,sha256=1vHj4jMNCG6ZB0-opDfuLwL0guieTQXMmWYfbCdhoUI,625
@@ -157,7 +157,7 @@ dsp_tools/commands/xmlupload/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 dsp_tools/commands/xmlupload/models/bitstream_info.py,sha256=LQHmaSauocNlCmnKSn89tG05dza1rkH671Ii5LocoQQ,464
 dsp_tools/commands/xmlupload/models/formatted_text_value.py,sha256=fBHctT5cHbDCNIAKs6IlgsY93v1qkKAyMeVwNg5d8g8,200
 dsp_tools/commands/xmlupload/models/ingest.py,sha256=dwZMpKQJ7cJpgUXCVRzQpyzagoOWPLq5B2NGbsJZPyU,5770
-dsp_tools/commands/xmlupload/models/input_problems.py,sha256=Sw4_V6JVMRd2l8m9vL32BpUozQ5DYgbnK9nLNaxIaV0,1995
+dsp_tools/commands/xmlupload/models/input_problems.py,sha256=agr0Qz2JFLlI7S9IeK09jqemxzPriTvuW5pYuTj4FGg,2017
 dsp_tools/commands/xmlupload/models/lookup_models.py,sha256=2rt1-tqvE-El-QDtDtxTGYMn3ZUN2JsHFwrmC01W4Kg,477
 dsp_tools/commands/xmlupload/models/permission.py,sha256=ptHV3sY5T0YVPf1zAboxKint4SajEfOI67OVl6YzfUY,1058
 dsp_tools/commands/xmlupload/models/permissions_parsed.py,sha256=frflZBEGKmcoz7-JZDBvYUamw5hSKuJe5R20Oq-umXE,3648
@@ -187,15 +187,15 @@ dsp_tools/commands/xmlupload/stash/stash_circular_references.py,sha256=EFcROk78B
 dsp_tools/commands/xmlupload/stash/stash_models.py,sha256=zIYKUyRIGY6SMiQRgA2AozyOKJwEwiq8nyXV06bEMiI,3300
 dsp_tools/commands/xmlupload/stash/upload_stashed_resptr_props.py,sha256=PTk-d9ZlSxMdrlE2gbd1k5WuHvROFn-e2pYhJJCi5sM,4212
 dsp_tools/commands/xmlupload/stash/upload_stashed_xml_texts.py,sha256=zMKUa2lx7zZ26bbL6uF-8vVypi8KKLgwBXqF-DADVV4,7460
-dsp_tools/commands/xmlupload/upload_config.py,sha256=4PBjzGIly0yh9k9I8IDYRWo81U1Bfuh5h8XitdzsGQE,2598
+dsp_tools/commands/xmlupload/upload_config.py,sha256=7lz3PcrHOsTvEBBzDWTvygtNRaf6luAKo_qoOxJp0Ks,2586
 dsp_tools/commands/xmlupload/write_diagnostic_info.py,sha256=ODjCAdKZyxHYDUhpIVpdEwIzjP-2HFySrzWN6Tddb1A,1281
-dsp_tools/commands/xmlupload/xmlupload.py,sha256=q_xC9CEDSFb4lMmJoECKZrzTGfIWnAgBx0dnGuz33Oo,22373
+dsp_tools/commands/xmlupload/xmlupload.py,sha256=82cNcy0x_FNjJkXRAijsu_T4m4tZHo7u5gJ74aSwC98,22349
 dsp_tools/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/config/logger_config.py,sha256=Bw2Gu5F2d8un_KNk0hvNtV7fvN2TlThqo6gSwqeccOU,2067
 dsp_tools/config/warnings_config.py,sha256=15_Lt227HLqhdn6v-zJbi1KG9Fo6Zi1_4fp_a-iY72w,1142
 dsp_tools/error/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/error/custom_warnings.py,sha256=7C2DscIz9k7IfM8uebIsKWPcWcSjwpDqbIRDaPw7bI8,1053
-dsp_tools/error/exceptions.py,sha256=CjP6zUqODKH5qw9XEo-v3gJcP3Pct0bZ-UbYrIahu-I,5321
+dsp_tools/error/custom_warnings.py,sha256=BPwvzZ9dxFMWYlWwIaDvTjdv24JFaDZU9-HW6MG5DK4,1294
+dsp_tools/error/exceptions.py,sha256=z8e4ccF4ezJ9JO6SD02P6b49yuJ3yUYGPT9YS0ihoO0,6013
 dsp_tools/error/problems.py,sha256=DotzVg3MYvMJmernd9tTBmDHoT1MOkHdiWVv8iMoFSk,265
 dsp_tools/error/xmllib_errors.py,sha256=DpYCsBIx_GmsBAUlfk2VMqtzD5IGMRbd2yXTcrJFHR4,549
 dsp_tools/error/xmllib_warnings.py,sha256=sS9jJXGJtQqCiJ9P2zCM5gpIhTpChbujQz_fPvxLm8g,1557
@@ -227,12 +227,12 @@ dsp_tools/utils/data_formats/date_util.py,sha256=VLNQnSsUX6NB1IY3Ry5KCxCLgHHYN0T
 dsp_tools/utils/data_formats/iri_util.py,sha256=oFcc3gcikmgJOf7iMhT4tfdUQg9wE7lUW5aysfHjylM,1030
 dsp_tools/utils/data_formats/shared.py,sha256=9AybXCAboojvRULZPud5e6B7UkjQOuN6f5fiVxwuZe8,2618
 dsp_tools/utils/data_formats/uri_util.py,sha256=9UGrbtxHVI0Ka0ttxd39KDhGeeP0xOdVLjt6HyV-Ic8,3257
-dsp_tools/utils/fuseki_bloating.py,sha256=yUCSijVf_Ne9iWUK_IzbPAkOMkN8Xt9ttPcWWRSIgMI,2381
+dsp_tools/utils/fuseki_bloating.py,sha256=B1k_HS9sLGY2YLqS7wiFBHxthoW4FVsb3JH1YxUOxnQ,2530
 dsp_tools/utils/json_parsing.py,sha256=KlNvwnZoq-gJqnOVH7tiZMzgdld_3IunuOVvlEVXGXc,1684
 dsp_tools/utils/rdflib_constants.py,sha256=D5HO7oILBRiQI-bJj14pbCx6zhKY4RGqjIjq6S_IawU,652
 dsp_tools/utils/rdflib_utils.py,sha256=M9UCXMe8W3SDQ0DYh4i6lRwYkyWozrWLl19NP5A-RlY,284
 dsp_tools/utils/replace_id_with_iri.py,sha256=5M5vXWJIQ0oO4ELwIt_5QeYBvyGESBc2smuNThHiQUY,2928
-dsp_tools/utils/request_utils.py,sha256=KxiFpQ_IH1ZCIF-SknPjRMP5-ZtLP3wWzwSrEZDB2fk,6902
+dsp_tools/utils/request_utils.py,sha256=JVJCCeHTfwXZnOlmsXJL4dHHBO6_q-4JdGEC8icIOzQ,8304
 dsp_tools/utils/xml_parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/utils/xml_parsing/get_lookups.py,sha256=RaBX_wWTmhxpvP1Ow5lbzNxekSyZ4SbuGZTFc18H1jQ,1386
 dsp_tools/utils/xml_parsing/get_parsed_resources.py,sha256=H3lLmWcBjuW5oN2fYV_Sv71brnH6E-ZsmwsceZ2l1yw,13496
@@ -265,11 +265,11 @@ dsp_tools/xmllib/models/licenses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 dsp_tools/xmllib/models/licenses/other.py,sha256=3S3kaVLHhgrVVG8d9PjApa3UwI3bor_bqx5OliW_Qsw,1986
 dsp_tools/xmllib/models/licenses/recommended.py,sha256=mxMg0wYrad_7vCbbtsLk7C3JwUeTse7wT-_mpiPVCKw,3924
 dsp_tools/xmllib/models/permissions.py,sha256=6pamw3q6CNV73OoFcIBZn6YibGTsSXnMoGy6AdkZI7o,1145
-dsp_tools/xmllib/models/res.py,sha256=c3edvilYZVDmv2O6Z36sSkHXcuKPAJLfWVpStDTMuJM,62857
+dsp_tools/xmllib/models/res.py,sha256=hUOyyS5sU7pIfFwVo5lQoK62adBgC-cYkGV9MWXWbGA,62925
 dsp_tools/xmllib/models/root.py,sha256=x8_vrDSJ1pZUJUL8LR460dZe4Cg57G_Hy-Zfr2S29dw,13562
 dsp_tools/xmllib/value_checkers.py,sha256=Yx3r6_WoZ5Lev8Orp8yDzd03JvP2GBmFNSFT2dzrycM,10712
 dsp_tools/xmllib/value_converters.py,sha256=WMYS5hd1VlrLLBXnf6pv9yYoPBsv_2MxOO6xv-QsRW4,29218
-dsp_tools-18.0.0.dist-info/WHEEL,sha256=UH59_qNuDUAa1VxQvC6fxmbl24EMw6DOIlT1yp8oeuU,78
-dsp_tools-18.0.0.dist-info/entry_points.txt,sha256=qjRfEbkeAwLU_AE2Q-l4Y9irPNmu4Wna-3bfRp1bqV4,62
-dsp_tools-18.0.0.dist-info/METADATA,sha256=j79Vnn6Ab7AjQuCuUpihzCmWwGbUtdsb0Q8zxmTANc8,4278
-dsp_tools-18.0.0.dist-info/RECORD,,
+dsp_tools-18.0.0.post3.dist-info/WHEEL,sha256=5w2T7AS2mz1-rW9CNagNYWRCaB0iQqBMYLwKdlgiR4Q,78
+dsp_tools-18.0.0.post3.dist-info/entry_points.txt,sha256=qjRfEbkeAwLU_AE2Q-l4Y9irPNmu4Wna-3bfRp1bqV4,62
+dsp_tools-18.0.0.post3.dist-info/METADATA,sha256=8RiY5uC7bUpxmhtHLqgUI0Zgx6imVNa6iKRz12SvCto,4284
+dsp_tools-18.0.0.post3.dist-info/RECORD,,

{dsp_tools-18.0.0.dist-info → dsp_tools-18.0.0.post3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.6
+Generator: uv 0.9.7
 Root-Is-Purelib: true
 Tag: py3-none-any