dsp-tools 17.0.0.post23__tar.gz → 17.0.0.post25__tar.gz

{dsp_tools-17.0.0.post23 → dsp_tools-17.0.0.post25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dsp-tools
-Version: 17.0.0.post23
+Version: 17.0.0.post25
 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-17.0.0.post23 → dsp_tools-17.0.0.post25}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "dsp-tools"
-version = "17.0.0.post23"
+version = "17.0.0.post25"
 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-17.0.0.post23 → dsp_tools-17.0.0.post25}/src/dsp_tools/commands/create/parsing/parsing_utils.py

@@ -4,6 +4,7 @@ import regex
 
 from dsp_tools.commands.create.constants import KNORA_API_STR
 from dsp_tools.commands.create.constants import UNIVERSAL_PREFIXES
+from dsp_tools.utils.data_formats.iri_util import make_dsp_ontology_prefix
 from dsp_tools.utils.data_formats.uri_util import is_uri
 
 
@@ -27,7 +28,7 @@ def create_prefix_lookup(project_json: dict[str, Any], api_url: str) -> dict[str
     shortcode = project_json["project"]["shortcode"]
     for onto in project_json["project"]["ontologies"]:
         onto_name = onto["name"]
-        defined_prefixes[onto_name] = _make_dsp_ontology_prefix(api_url, shortcode, onto_name)
+        defined_prefixes[onto_name] = make_dsp_ontology_prefix(api_url, shortcode, onto_name)
     return defined_prefixes
 
 
@@ -37,7 +38,3 @@ def _correct_external_prefix(prefixes: dict[str, str]) -> dict[str, str]:
             continue
         prefixes[prfx] = f"{namespace}/"
     return prefixes
-
-
-def _make_dsp_ontology_prefix(api_url: str, shortcode: str, onto_name: str) -> str:
-    return f"{api_url}/ontology/{shortcode}/{onto_name}/v2#"

{dsp_tools-17.0.0.post23 → dsp_tools-17.0.0.post25}/src/dsp_tools/utils/data_formats/iri_util.py

@@ -19,3 +19,12 @@ def from_dsp_iri_to_prefixed_iri(iri: str) -> str:
     if not (found := regex.search(dsp_iri_re, iri)):
         return iri
     return f"{found.group(1)}:{found.group(2)}"
+
+
+def make_dsp_ontology_prefix(api_url: str, shortcode: str, onto_name: str) -> str:
+    api_fixed = convert_api_url_for_correct_iri_namespace_construction(api_url)
+    return f"{api_fixed}/ontology/{shortcode}/{onto_name}/v2#"
+
+
+def convert_api_url_for_correct_iri_namespace_construction(api_url: str) -> str:
+    return regex.sub(r"^https", "http", api_url)

{dsp_tools-17.0.0.post23 → dsp_tools-17.0.0.post25}/src/dsp_tools/utils/xml_parsing/get_parsed_resources.py

@@ -5,6 +5,7 @@ from lxml import etree
 
 from dsp_tools.commands.validate_data.mappers import XML_TAG_TO_VALUE_TYPE_MAPPER
 from dsp_tools.error.exceptions import InputError
+from dsp_tools.utils.data_formats.iri_util import convert_api_url_for_correct_iri_namespace_construction
 from dsp_tools.utils.rdflib_constants import KNORA_API_STR
 from dsp_tools.utils.xml_parsing.models.parsed_resource import KnoraValueType
 from dsp_tools.utils.xml_parsing.models.parsed_resource import ParsedFileValue
@@ -15,7 +16,7 @@ from dsp_tools.utils.xml_parsing.models.parsed_resource import ParsedValue
 
 
 def get_parsed_resources(root: etree._Element, api_url: str) -> list[ParsedResource]:
-    api_url = _convert_api_url_for_correct_iri_namespace_construction(api_url)
+    api_url = convert_api_url_for_correct_iri_namespace_construction(api_url)
     iri_lookup = _create_from_local_name_to_absolute_iri_lookup(root, api_url)
     all_res: list[ParsedResource] = []
     for res in root.iterdescendants(tag="resource"):
@@ -34,10 +35,6 @@ def get_parsed_resources(root: etree._Element, api_url: str) -> list[ParsedResou
     return all_res
 
 
-def _convert_api_url_for_correct_iri_namespace_construction(api_url: str) -> str:
-    return regex.sub(r"^https", "http", api_url)
-
-
 def _create_from_local_name_to_absolute_iri_lookup(root: etree._Element, api_url: str) -> dict[str, str]:
     shortcode = root.attrib["shortcode"]
     default_ontology = root.attrib["default-ontology"]