dsp-tools 9.1.0.post11__py3-none-any.whl → 18.3.0.post13__py3-none-any.whl

dsp_tools/commands/excel2xml/excel2xml_cli.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import warnings
+from collections.abc import Callable
 from pathlib import Path
 from typing import Any
-from typing import Callable
 from typing import Optional
 from typing import Union
 
@@ -12,7 +12,6 @@ import regex
 from lxml import etree
 
 from dsp_tools.commands.excel2xml.excel2xml_lib import append_permissions
-from dsp_tools.commands.excel2xml.excel2xml_lib import make_annotation
 from dsp_tools.commands.excel2xml.excel2xml_lib import make_bitstream_prop
 from dsp_tools.commands.excel2xml.excel2xml_lib import make_boolean_prop
 from dsp_tools.commands.excel2xml.excel2xml_lib import make_color_prop
@@ -31,8 +30,8 @@ from dsp_tools.commands.excel2xml.excel2xml_lib import make_text_prop
 from dsp_tools.commands.excel2xml.excel2xml_lib import make_uri_prop
 from dsp_tools.commands.excel2xml.excel2xml_lib import write_xml
 from dsp_tools.commands.excel2xml.propertyelement import PropertyElement
-from dsp_tools.models.exceptions import BaseError
-from dsp_tools.utils.shared import check_notna
+from dsp_tools.error.exceptions import BaseError
+from dsp_tools.utils.data_formats.shared import check_notna
 
 # ruff: noqa: E501 (line-too-long)
 
@@ -186,11 +185,8 @@ def _append_bitstream_to_resource(
     """
     file_permissions = row.get("file permissions")
     if not check_notna(file_permissions):
-        resource_permissions = row.get("permissions")
-        if resource_permissions == "res-default":
-            file_permissions = "prop-default"
-        elif resource_permissions == "res-restricted":
-            file_permissions = "prop-restricted"
+        if resource_permissions := row.get("permissions"):
+            file_permissions = resource_permissions
         else:
             file_permissions = ""
             warnings.warn(
@@ -208,14 +204,14 @@ def _append_bitstream_to_resource(
     return resource
 
 
-def _convert_resource_row_to_xml(  # noqa: PLR0912 (too-many-branches)
+def _convert_resource_row_to_xml(
     row_number: int,
     row: pd.Series[Any],
 ) -> etree._Element:
     """
     Convert a resource-row to an XML resource element.
     First, check if the mandatory cells are present.
-    Then, call the appropriate function, depending on the restype (Resource, LinkObj, Annotation, Region).
+    Then, call the appropriate function, depending on the restype (Resource, LinkObj, Region).
 
     Args:
         row_number: row number of the CSV/Excel sheet
@@ -265,10 +261,6 @@ def _convert_resource_row_to_xml(  # noqa: PLR0912 (too-many-branches)
         with warnings.catch_warnings():  # prevent dublette warnings: most problems were already checked above
             warnings.filterwarnings("ignore")
             resource = make_region(**kwargs_resource)
-    elif resource_restype == "Annotation":
-        with warnings.catch_warnings():  # prevent dublette warnings: most problems were already checked above
-            warnings.filterwarnings("ignore")
-            resource = make_annotation(**kwargs_resource)
     elif resource_restype == "LinkObj":
         with warnings.catch_warnings():  # prevent dublette warnings: most problems were already checked above
             warnings.filterwarnings("ignore")