dsp-tools 17.0.0.post29__py3-none-any.whl → 18.0.0.post3__py3-none-any.whl

dsp_tools/commands/create/parsing/parse_project.py

@@ -11,12 +11,25 @@ from dsp_tools.commands.create.models.parsed_project import ParsedPermissions
 from dsp_tools.commands.create.models.parsed_project import ParsedProject
 from dsp_tools.commands.create.models.parsed_project import ParsedProjectMetadata
 from dsp_tools.commands.create.models.parsed_project import ParsedUser
+from dsp_tools.commands.create.parsing.parse_lists import parse_list_section
 from dsp_tools.commands.create.parsing.parse_ontology import parse_ontology
 from dsp_tools.commands.create.parsing.parsing_utils import create_prefix_lookup
 from dsp_tools.commands.project.create.project_validate import validate_project
 from dsp_tools.utils.json_parsing import parse_json_input
 
 
+def parse_lists_only(
+    project_file_as_path_or_parsed: str | Path | dict[str, Any],
+) -> tuple[ParsedProjectMetadata, list[ParsedList]] | CollectedProblems:
+    complete_json = _parse_and_validate(project_file_as_path_or_parsed)
+    project_json = complete_json["project"]
+    project_metadata = _parse_metadata(project_json)
+    parsed_lists, problems = _parse_lists(project_json)
+    if isinstance(problems, CollectedProblems):
+        return problems
+    return project_metadata, parsed_lists
+
+
 def parse_project(
     project_file_as_path_or_parsed: str | Path | dict[str, Any], api_url: str
 ) -> ParsedProject | list[CollectedProblems]:
@@ -28,6 +41,9 @@ def _parse_project(complete_json: dict[str, Any], api_url: str) -> ParsedProject
     prefix_lookup = create_prefix_lookup(complete_json, api_url)
     project_json = complete_json["project"]
     ontologies, failures = _parse_all_ontologies(project_json, prefix_lookup)
+    parsed_lists, problems = _parse_lists(project_json)
+    if isinstance(problems, CollectedProblems):
+        failures.append(problems)
     if failures:
         return failures
     return ParsedProject(
@@ -36,7 +52,7 @@ def _parse_project(complete_json: dict[str, Any], api_url: str) -> ParsedProject
         permissions=_parse_permissions(project_json),
         groups=_parse_groups(project_json),
         users=_parse_users(project_json),
-        lists=_parse_lists(project_json),
+        lists=parsed_lists,
         ontologies=ontologies,
     )
 
@@ -79,10 +95,13 @@ def _parse_users(project_json: dict[str, Any]) -> list[ParsedUser]:
     return [ParsedUser(x) for x in found]
 
 
-def _parse_lists(project_json: dict[str, Any]) -> list[ParsedList]:
+def _parse_lists(project_json: dict[str, Any]) -> tuple[list[ParsedList], CollectedProblems | None]:
     if not (found := project_json.get("lists")):
-        return []
-    return [ParsedList(x["name"], x) for x in found]
+        return [], None
+    result = parse_list_section(found)
+    if isinstance(result, CollectedProblems):
+        return [], result
+    return result, None
 
 
 def _parse_all_ontologies(

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/project/create/project_create_all.py

@@ -15,12 +15,13 @@ from dsp_tools.clients.authentication_client_live import AuthenticationClientLiv
 from dsp_tools.clients.connection import Connection
 from dsp_tools.clients.connection_live import ConnectionLive
 from dsp_tools.commands.create.communicate_problems import print_problem_collection
+from dsp_tools.commands.create.create_on_server.lists import create_lists
+from dsp_tools.commands.create.create_on_server.lists import get_existing_lists_on_server
 from dsp_tools.commands.create.models.parsed_project import ParsedProject
 from dsp_tools.commands.create.models.server_project_info import ProjectIriLookup
 from dsp_tools.commands.create.parsing.parse_project import parse_project
 from dsp_tools.commands.project.create.parse_project import parse_project_json
 from dsp_tools.commands.project.create.project_create_default_permissions import create_default_permissions
-from dsp_tools.commands.project.create.project_create_lists import create_lists_on_server
 from dsp_tools.commands.project.create.project_create_ontologies import create_ontologies
 from dsp_tools.commands.project.legacy_models.context import Context
 from dsp_tools.commands.project.legacy_models.group import Group
@@ -33,6 +34,8 @@ from dsp_tools.error.exceptions import InputError
 from dsp_tools.error.exceptions import InvalidInputError
 from dsp_tools.error.exceptions import PermanentConnectionError
 from dsp_tools.legacy_models.langstring import LangString
+from dsp_tools.utils.ansi_colors import BOLD
+from dsp_tools.utils.ansi_colors import RESET_TO_DEFAULT
 from dsp_tools.utils.json_parsing import parse_json_input
 
 load_dotenv()
@@ -89,8 +92,8 @@ def create_project(  # noqa: PLR0915,PLR0912 (too many statements & branches)
     con = ConnectionLive(creds.server, auth)
 
     # create project on DSP server
-    info_str = f"Create project '{legacy_project.metadata.shortname}' ({legacy_project.metadata.shortcode})..."
-    print(info_str)
+    info_str = f"Create project '{legacy_project.metadata.shortname}' ({legacy_project.metadata.shortcode}):"
+    print(BOLD + info_str + RESET_TO_DEFAULT)
     logger.info(info_str)
     project_remote, success = _create_project_on_server(
         project_definition=legacy_project.metadata,
@@ -102,17 +105,18 @@ def create_project(  # noqa: PLR0915,PLR0912 (too many statements & branches)
         overall_success = False
 
     # create the lists
-    names_and_iris_of_list_nodes: dict[str, Any] = {}
-    if legacy_project.lists:
-        print("Create lists...")
-        logger.info("Create lists...")
-        names_and_iris_of_list_nodes, success = create_lists_on_server(
-            lists_to_create=legacy_project.lists,
-            con=con,
-            project_remote=project_remote,
+    if parsed_project.lists:
+        list_name_2_iri, list_problems = create_lists(
+            parsed_lists=parsed_project.lists,
+            shortcode=parsed_project.project_metadata.shortcode,
+            auth=auth,
+            project_iri=project_iri,
         )
-        if not success:
+        if list_problems:
             overall_success = False
+            print_problem_collection(list_problems)
+    else:
+        list_name_2_iri = get_existing_lists_on_server(parsed_project.project_metadata.shortcode, auth)
 
     # create the groups
     current_project_groups: dict[str, Group] = {}
@@ -146,7 +150,7 @@ def create_project(  # noqa: PLR0915,PLR0912 (too many statements & branches)
         con=con,
         context=context,
         knora_api_prefix=knora_api_prefix,
-        names_and_iris_of_list_nodes=names_and_iris_of_list_nodes,
+        list_name_2_iri=list_name_2_iri,
         ontology_definitions=legacy_project.ontologies,
         project_remote=project_remote,
         verbose=verbose,

dsp_tools/commands/project/create/project_create_default_permissions.py

@@ -1,6 +1,8 @@
 from loguru import logger
 
 from dsp_tools.commands.project.models.permissions_client import PermissionsClient
+from dsp_tools.utils.ansi_colors import BOLD
+from dsp_tools.utils.ansi_colors import RESET_TO_DEFAULT
 
 USER_IRI_PREFIX = "http://www.knora.org/ontology/knora-admin#"
 
@@ -11,23 +13,23 @@ def create_default_permissions(
     default_permissions_overrule: dict[str, str | list[str]] | None,
     shortcode: str,
 ) -> bool:
-    logger.info("Set default permissions...")
-    print("Set default permissions...")
+    print(BOLD + "Processing default permissions:" + RESET_TO_DEFAULT)
+    logger.info("Processing default permissions:")
     if not _delete_existing_doaps(perm_client):
-        print("WARNING: Cannot delete the existing default permissions")
+        print("    WARNING: Cannot delete the existing default permissions")
         logger.warning("Cannot delete the existing default permissions")
         return False
     if not _create_new_doap(perm_client, default_permissions):
-        print("WARNING: Cannot create default permissions")
+        print("    WARNING: Cannot create default permissions")
         logger.warning("Cannot create default permissions")
         return False
     if default_permissions_overrule:
         if not _create_overrules(perm_client, default_permissions_overrule, shortcode):
-            print("WARNING: Cannot create default permissions overrules")
+            print("    WARNING: Cannot create default permissions overrules")
             logger.warning("Cannot create default permissions overrules")
             return False
+    print("    Default permissions have been set")
     logger.info("Default permissions have been set")
-    print("Default permissions have been set")
     return True
 
 

dsp_tools/commands/project/create/project_create_ontologies.py

@@ -7,11 +7,12 @@ from loguru import logger
 
 from dsp_tools.clients.authentication_client import AuthenticationClient
 from dsp_tools.clients.connection import Connection
-from dsp_tools.clients.ontology_client_live import OntologyClientLive
+from dsp_tools.clients.ontology_create_client_live import OntologyCreateClientLive
 from dsp_tools.commands.create.communicate_problems import print_problem_collection
 from dsp_tools.commands.create.create_on_server.cardinalities import add_all_cardinalities
 from dsp_tools.commands.create.models.parsed_ontology import ParsedOntology
 from dsp_tools.commands.create.models.server_project_info import CreatedIriCollection
+from dsp_tools.commands.create.models.server_project_info import ListNameToIriLookup
 from dsp_tools.commands.create.models.server_project_info import ProjectIriLookup
 from dsp_tools.commands.project.legacy_models.context import Context
 from dsp_tools.commands.project.legacy_models.ontology import Ontology
@@ -22,13 +23,15 @@ from dsp_tools.error.exceptions import BaseError
 from dsp_tools.error.exceptions import InputError
 from dsp_tools.legacy_models.datetimestamp import DateTimeStamp
 from dsp_tools.legacy_models.langstring import LangString
+from dsp_tools.utils.ansi_colors import BOLD
+from dsp_tools.utils.ansi_colors import RESET_TO_DEFAULT
 
 
 def create_ontologies(
     con: Connection,
     context: Context,
     knora_api_prefix: str,
-    names_and_iris_of_list_nodes: dict[str, Any],
+    list_name_2_iri: ListNameToIriLookup,
     ontology_definitions: list[dict[str, Any]],
     project_remote: Project,
     verbose: bool,
@@ -45,7 +48,7 @@ def create_ontologies(
         con: Connection to the DSP server
         context: prefixes and the ontology IRIs they stand for
         knora_api_prefix: the prefix that stands for the knora-api ontology
-        names_and_iris_of_list_nodes: IRIs of list nodes that were already created and are available on the DSP server
+        list_name_2_iri: IRIs of list nodes that were already created and are available on the DSP server
         ontology_definitions: the "ontologies" section of the parsed JSON project file
         project_remote: representation of the project on the DSP server
         verbose: verbose switch
@@ -61,17 +64,15 @@ def create_ontologies(
         True if everything went smoothly, False otherwise
     """
     success_collection = CreatedIriCollection()
-    onto_client = OntologyClientLive(auth.server, auth)
+    onto_client = OntologyCreateClientLive(auth.server, auth)
 
     overall_success = True
-
-    print("Create ontologies...")
-    logger.info("Create ontologies...")
+    logger.info("Processing Ontology Section")
     try:
         project_ontologies = Ontology.getProjectOntologies(con=con, project_id=str(project_remote.iri))
     except BaseError:
         err_msg = "Unable to retrieve remote ontologies. Cannot check if your ontology already exists."
-        print("WARNING: {err_msg}")
+        print(f"    WARNING: {err_msg}")
         logger.exception(err_msg)
         project_ontologies = []
 
@@ -114,7 +115,7 @@ def create_ontologies(
             onto_name=ontology_definition["name"],
             property_definitions=ontology_definition.get("properties", []),
             ontology_remote=ontology_remote,
-            names_and_iris_of_list_nodes=names_and_iris_of_list_nodes,
+            list_name_2_iri=list_name_2_iri,
             con=con,
             last_modification_date=last_modification_date,
             knora_api_prefix=knora_api_prefix,
@@ -125,7 +126,7 @@ def create_ontologies(
         if not success:
             overall_success = False
 
-    print("Add cardinalities to resource classes...")
+    print(BOLD + "Processing Cardinalities:" + RESET_TO_DEFAULT)
     problems = add_all_cardinalities(
         ontologies=parsed_ontologies,
         project_iri_lookup=project_iri_lookup,
@@ -173,12 +174,12 @@ def _create_ontology(
     # skip if it already exists on the DSP server
     if onto_name in [onto.name for onto in project_ontologies]:
         err_msg = f"Ontology '{onto_name}' already exists on the DSP server. Skipping..."
-        print(f"    WARNING: {err_msg}")
+        print(f"WARNING: {err_msg}")
         logger.warning(err_msg)
         return None
 
-    print(f"Create ontology '{onto_name}'...")
-    logger.info(f"Create ontology '{onto_name}'...")
+    print(BOLD + f"Processing ontology '{onto_name}':" + RESET_TO_DEFAULT)
+    logger.info(f"Processing ontology '{onto_name}'")
     ontology_local = Ontology(
         con=con,
         project=project_remote,
@@ -308,11 +309,11 @@ def _sort_resources(
     return sorted_resources
 
 
-def _add_property_classes_to_remote_ontology(
+def _add_property_classes_to_remote_ontology(  # noqa: PLR0912
     onto_name: str,
     property_definitions: list[dict[str, Any]],
     ontology_remote: Ontology,
-    names_and_iris_of_list_nodes: dict[str, Any],
+    list_name_2_iri: ListNameToIriLookup,
     con: Connection,
     last_modification_date: DateTimeStamp,
     knora_api_prefix: str,
@@ -328,7 +329,7 @@ def _add_property_classes_to_remote_ontology(
         onto_name: name of the current ontology
         property_definitions: the part of the parsed JSON project file that contains the properties of the current onto
         ontology_remote: representation of the current ontology on the DSP server
-        names_and_iris_of_list_nodes: IRIs of list nodes that were already created and are available on the DSP server
+        list_name_2_iri: IRIs of list nodes that were already created and are available on the DSP server
         con: connection to the DSP server
         last_modification_date: last modification date of the ontology on the DSP server
         knora_api_prefix: the prefix that stands for the knora-api ontology
@@ -373,7 +374,18 @@ def _add_property_classes_to_remote_ontology(
         # get the gui_attributes
         gui_attributes = prop_class.get("gui_attributes")
         if gui_attributes and gui_attributes.get("hlist"):
-            list_iri = names_and_iris_of_list_nodes[gui_attributes["hlist"]]["id"]
+            list_name = gui_attributes["hlist"]
+            list_iri = list_name_2_iri.get_iri(list_name)
+            if not list_iri:
+                err_msg = (
+                    f"Unable to create property class '{prop_class['name']}' "
+                    f"because the list with the name '{list_name}' does not exist on the server."
+                )
+                print(f"    WARNING: {err_msg}")
+                logger.warning(err_msg)
+                overall_success = False
+                continue
+
             gui_attributes["hlist"] = f"<{list_iri}>"
 
         # create the property class
@@ -405,7 +417,7 @@ def _add_property_classes_to_remote_ontology(
                 err.message,
             ):
                 err_msg += f", because it refers to a class of another project: '{found.group(1)}'."
-            print(f"WARNING: {err_msg}")
+            print(f"    WARNING: {err_msg}")
             logger.exception(err_msg)
             overall_success = False
 

dsp_tools/commands/project/legacy_models/listnode.py

@@ -301,36 +301,6 @@ class ListNode(Model):
             rootNodeIri=rootNodeIri,
         )
 
-    def create(self) -> ListNode:
-        """
-        Create a new List
-
-        :return: JSON-object from DSP-API
-        """
-        jsonobj = self._toJsonObj_create()
-        if self._parent:
-            result = self._con.post(ListNode.ROUTE_SLASH + quote_plus(self._parent), jsonobj)
-            return ListNode.fromJsonObj(self._con, result["nodeinfo"])
-        else:
-            result = self._con.post(ListNode.ROUTE, jsonobj)
-            return ListNode.fromJsonObj(self._con, result["list"]["listinfo"])
-
-    def _toJsonObj_create(self):
-        tmp = {}
-        if self._project is None:
-            raise BaseError("There must be a project id given!")
-        tmp["projectIri"] = self._project
-        if self._label.isEmpty():
-            raise BaseError("There must be a valid ListNode label!")
-        tmp["labels"] = self._label.toJsonObj()
-        if self._comments:
-            tmp["comments"] = self._comments.toJsonObj()
-        if self._name:
-            tmp["name"] = self._name
-        if self._parent:
-            tmp["parentNodeIri"] = self._parent
-        return tmp
-
     def read(self) -> Any:
         """
         Read a project from DSP-API

dsp_tools/commands/validate_data/models/api_responses.py

@@ -5,6 +5,8 @@ from dataclasses import dataclass
 from rdflib import Graph
 from rdflib import URIRef
 
+from dsp_tools.clients.list_client import OneList
+
 
 @dataclass
 class SHACLValidationReport:
@@ -24,22 +26,6 @@ class ListLookup:
     lists: dict[tuple[str, str], str]
 
 
-@dataclass
-class OneList:
-    list_iri: str
-    list_name: str
-    nodes: list[OneNode]
-
-    def hlist(self) -> str:
-        return f'"hlist=<{self.list_iri}>"'
-
-
-@dataclass
-class OneNode:
-    name: str
-    iri: str
-
-
 @dataclass
 class SHACLListInfo:
     list_iri: URIRef

dsp_tools/commands/validate_data/prepare_data/prepare_data.py

@@ -8,14 +8,15 @@ from rdflib import URIRef
 
 from dsp_tools.clients.authentication_client import AuthenticationClient
 from dsp_tools.clients.legal_info_client_live import LegalInfoClientLive
+from dsp_tools.clients.list_client import OneList
+from dsp_tools.clients.list_client_live import ListGetClientLive
 from dsp_tools.clients.metadata_client import ExistingResourcesRetrieved
 from dsp_tools.clients.metadata_client_live import MetadataClientLive
-from dsp_tools.commands.validate_data.api_clients import ListClient
-from dsp_tools.commands.validate_data.api_clients import OntologyClient
+from dsp_tools.clients.ontology_clients import OntologyGetClient
+from dsp_tools.clients.ontology_get_client_live import OntologyGetClientLive
 from dsp_tools.commands.validate_data.models.api_responses import EnabledLicenseIris
 from dsp_tools.commands.validate_data.models.api_responses import InfoForResourceInDB
 from dsp_tools.commands.validate_data.models.api_responses import ListLookup
-from dsp_tools.commands.validate_data.models.api_responses import OneList
 from dsp_tools.commands.validate_data.models.api_responses import ProjectDataFromApi
 from dsp_tools.commands.validate_data.models.validation import RDFGraphs
 from dsp_tools.commands.validate_data.prepare_data.get_rdf_like_data import get_rdf_like_data
@@ -29,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
 
 
@@ -71,8 +72,8 @@ def _make_list_lookup(project_lists: list[OneList]) -> ListLookup:
 def _get_project_specific_information_from_api(
     auth: AuthenticationClient, shortcode: str, do_not_request_resource_metadata_from_db: bool
 ) -> tuple[ProjectDataFromApi, ExistingResourcesRetrieved]:
-    list_client = ListClient(auth.server, shortcode)
-    all_lists = list_client.get_lists()
+    list_client = ListGetClientLive(auth.server, shortcode)
+    all_lists = list_client.get_all_lists_and_nodes()
     enabled_licenses = _get_license_iris(shortcode, auth)
     if do_not_request_resource_metadata_from_db:
         existing_resources_retrieved = ExistingResourcesRetrieved.FALSE
@@ -107,7 +108,7 @@ def _create_graphs(
     permission_ids: list[str],
 ) -> RDFGraphs:
     logger.debug("Create all graphs.")
-    onto_client = OntologyClient(auth.server, shortcode)
+    onto_client = OntologyGetClientLive(auth.server, shortcode)
     ontologies, onto_iris = _get_project_ontos(onto_client)
     knora_ttl = onto_client.get_knora_api()
     knora_api = Graph()
@@ -154,7 +155,7 @@ def _bind_prefixes_to_graph(g: Graph, project_ontos: list[str]) -> Graph:
     return g
 
 
-def _get_project_ontos(onto_client: OntologyClient) -> tuple[Graph, list[str]]:
+def _get_project_ontos(onto_client: OntologyGetClient) -> tuple[Graph, list[str]]:
     logger.debug("Get project ontologies from server.")
     all_ontos, onto_iris = onto_client.get_ontologies()
     onto_g = Graph()

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/sparql/value_shacl.py

@@ -8,7 +8,7 @@ from rdflib import Literal
 from rdflib import URIRef
 from rdflib.collection import Collection
 
-from dsp_tools.commands.validate_data.models.api_responses import OneList
+from dsp_tools.clients.list_client import OneList
 from dsp_tools.commands.validate_data.models.api_responses import SHACLListInfo
 from dsp_tools.utils.rdflib_constants import KNORA_API
 from dsp_tools.utils.rdflib_constants import PropertyTypeAlias

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."""
@@ -154,3 +169,11 @@ class XmlUploadListNodeNotFoundError(BaseError):
 
 class UnknownDOAPException(BaseError):
     """Class for errors that are raised if a DOAP cannot be parsed"""
+
+
+class CreateError(BaseError):
+    """Errors for the create command."""
+
+
+class ProjectNotFoundError(CreateError):
+    """Class if a project is expected to exist but could not be found."""