refactor(xmlupload): refactor resource creation

src/dsp_tools/commands/resume_xmlupload/resume_xmlupload.py

@@ -6,7 +6,6 @@
 from loguru import logger
 from termcolor import colored
 
-from dsp_tools.commands.xmlupload.iri_resolver import IriResolver
 from dsp_tools.commands.xmlupload.list_client import ListClient
 from dsp_tools.commands.xmlupload.list_client import ListClientLive
 from dsp_tools.commands.xmlupload.models.sipi import Sipi
@@ -52,7 +51,7 @@ def resume_xmlupload(server: str, user: str, password: str, sipi: str, skip_firs
             if resp == "n":
                 sys.exit(1)
 
-    previous_successful = len(upload_state.iri_resolver_lookup)
+    previous_successful = len(upload_state.iri_resolver.lookup)
     previous_failed = len(upload_state.failed_uploads)
     previous_total = previous_successful + previous_failed
     msg = (
@@ -72,21 +71,15 @@ def resume_xmlupload(server: str, user: str, password: str, sipi: str, skip_firs
     project_client: ProjectClient = ProjectClientLive(con, upload_state.config.shortcode)
     list_client: ListClient = ListClientLive(con, project_client.get_project_iri())
 
-    iri_resolver, failed_uploads, nonapplied_stash = upload_resources(
-        resources=upload_state.pending_resources,
-        failed_uploads=upload_state.failed_uploads,
+    nonapplied_stash = upload_resources(
+        upload_state=upload_state,
         imgdir=".",
         sipi_server=sipi_server,
-        permissions_lookup=upload_state.permissions_lookup,
-        con=con,
-        stash=upload_state.pending_stash,
-        config=upload_state.config,
         project_client=project_client,
         list_client=list_client,
-        iri_resolver=IriResolver(upload_state.iri_resolver_lookup),
     )
 
-    return cleanup_upload(iri_resolver, upload_state.config, failed_uploads, nonapplied_stash)
+    return cleanup_upload(upload_state.iri_resolver, upload_state.config, upload_state.failed_uploads, nonapplied_stash)
 
 
 def _read_upload_state_from_disk(server: str) -> UploadState:

src/dsp_tools/commands/xmlupload/models/upload_state.py

@@ -1,20 +1,21 @@
 from dataclasses import dataclass
 
+from dsp_tools.commands.xmlupload.iri_resolver import IriResolver
 from dsp_tools.commands.xmlupload.models.permission import Permissions
 from dsp_tools.commands.xmlupload.models.xmlresource import XMLResource
 from dsp_tools.commands.xmlupload.stash.stash_models import Stash
 from dsp_tools.commands.xmlupload.upload_config import UploadConfig
 
 
-@dataclass(frozen=True)
+@dataclass
 class UploadState:
     """
     Save the state of an xmlupload, so that after an interruption, it can be resumed.
     """
 
     pending_resources: list[XMLResource]
     failed_uploads: list[str]
-    iri_resolver_lookup: dict[str, str]
+    iri_resolver: IriResolver
     pending_stash: Stash | None
     config: UploadConfig
     permissions_lookup: dict[str, Permissions]

src/dsp_tools/commands/xmlupload/project_client.py

@@ -19,6 +19,10 @@ class ProjectInfo:
 class ProjectClient(Protocol):
     """Interface (protocol) for project-related requests to the DSP-API."""
 
+    con: Connection
+    shortcode: str
+    project_info: ProjectInfo | None
+
     def get_project_iri(self) -> str:
         """Get the IRI of the project to which the data is being uploaded."""
 

src/dsp_tools/commands/xmlupload/resource_create_client.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 from typing import Any
 from typing import assert_never
+from typing import cast
 
 from loguru import logger
 
@@ -37,17 +38,15 @@ def create_resource(
         self,
         resource: XMLResource,
         bitstream_information: BitstreamInfo | None,
-    ) -> tuple[str, str]:
+    ) -> str:
         """Creates a resource on the DSP server."""
         logger.info(
             f"Attempting to create resource {resource.res_id} (label: {resource.label}, iri: {resource.iri})..."
         )
         resource_dict = self._make_resource_with_values(resource, bitstream_information)
         headers = {"X-Asset-Ingested": "true"} if self.media_previously_ingested else None
         res = self.con.post(route="/v2/resources", data=resource_dict, headers=headers)
-        iri = res["@id"]
-        label = res["rdfs:label"]
-        return iri, label
+        return cast(str, res["@id"])
 
     def _make_resource_with_values(
         self,

src/dsp_tools/commands/xmlupload/stash/stash_models.py

@@ -106,3 +106,9 @@ def make(standoff_stash: StandoffStash | None, link_value_stash: LinkValueStash
         if standoff_stash or link_value_stash:
             return Stash(standoff_stash, link_value_stash)
         return None
+
+    def is_empty(self) -> bool:
+        """Check if there are any stashed items in this stash"""
+        standoff = not self.standoff_stash or not self.standoff_stash.res_2_stash_items
+        link = not self.link_value_stash or not self.link_value_stash.res_2_stash_items
+        return standoff and link