dsp-tools 18.0.0__tar.gz → 18.0.0.post3__tar.gz

{dsp_tools-18.0.0 → dsp_tools-18.0.0.post3}/PKG-INFO

@@ -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 → dsp_tools-18.0.0.post3}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "dsp-tools"
-version = "18.0.0"
+version = "18.0.0.post3"
 description = "DSP-TOOLS is a Python package with a command line interface that helps you interact with a DaSCH service platform (DSP) server."
 authors = [
     { name = "DaSCH - Swiss National Data and Service Center for the Humanities", email = "info@dasch.swiss" },

{dsp_tools-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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-18.0.0 → dsp_tools-18.0.0.post3}/src/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)