fairagro-middleware-api-client 8.7.1.dev8__tar.gz → 8.7.1.dev11__tar.gz

{fairagro_middleware_api_client-8.7.1.dev8 → fairagro_middleware_api_client-8.7.1.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairagro-middleware-api-client
-Version: 8.7.1.dev8
+Version: 8.7.1.dev11
 Summary: The FAIRagro advanced middleware API client
 Requires-Python: >=3.12
 Requires-Dist: httpx>=0.28.1

{fairagro_middleware_api_client-8.7.1.dev8 → fairagro_middleware_api_client-8.7.1.dev11}/src/middleware/api_client/api_client.py

@@ -280,12 +280,14 @@ class ApiClient:
             identifier = self._extract_identifier_from_rocrate(serialized)
             if identifier is not None:
                 if identifier in seen_identifiers:
-                    await self._cancel_pending_arc_tasks(pending_tasks)
-                    raise ApiClientError(
-                        f"Duplicate ARC identifier '{identifier}' submitted more than once "
-                        f"in harvest {harvest_id}. This is likely a client-side data error "
-                        "(two different ARCs sharing the same identifier)."
+                    logger.error(
+                        "Skipping duplicate ARC identifier '%s' in harvest %s. "
+                        "Two ARCs share the same identifier — this is a client-side data error.",
+                        identifier,
+                        harvest_id,
                     )
+                    failed_submissions += 1
+                    continue
                 seen_identifiers.add(identifier)
 
             task = asyncio.create_task(submit_one(serialized))

{fairagro_middleware_api_client-8.7.1.dev8 → fairagro_middleware_api_client-8.7.1.dev11}/tests/unit/test_client.py

@@ -714,11 +714,13 @@ async def test_harvest_arcs_cancels_on_catastrophic_error(client_config: Config)
 
 @pytest.mark.asyncio
 @respx.mock
-async def test_harvest_arcs_fails_on_duplicate_identifier(client_config: Config) -> None:
-    """harvest_arcs marks harvest as failed when the same ARC identifier appears twice."""
-    # Two ARC dicts that share the same RO-Crate identifier — simulates a
-    # client-side data error where two distinct ARCs were accidentally given
-    # the same identifier field.
+async def test_harvest_arcs_skips_duplicate_identifier(client_config: Config) -> None:
+    """harvest_arcs skips a duplicate ARC and completes the harvest successfully.
+
+    When the same RO-Crate identifier appears twice in the input, the second
+    occurrence is counted as a failed submission and the harvest continues.
+    This prevents a single client-side data error from aborting the whole harvest.
+    """
     arc_a = {
         "@context": "https://w3id.org/ro/crate/1.1/context",
         "@graph": [{"@id": "./", "@type": "Dataset", "identifier": "duplicate-arc", "name": "ARC A"}],
@@ -727,23 +729,24 @@ async def test_harvest_arcs_fails_on_duplicate_identifier(client_config: Config)
         "@context": "https://w3id.org/ro/crate/1.1/context",
         "@graph": [{"@id": "./", "@type": "Dataset", "identifier": "duplicate-arc", "name": "ARC B"}],
     }
-    failed_response = {**_HARVEST_RESPONSE, "status": "FAILED"}
+    completed_response = {**_HARVEST_RESPONSE, "status": "COMPLETED", "completed_at": "2024-01-01T01:00:00Z"}
     respx.post(f"{client_config.api_url}v3/harvests").mock(
         return_value=httpx.Response(http.HTTPStatus.OK, json=_HARVEST_RESPONSE)
     )
-    # The first ARC is submitted successfully before the duplicate is detected.
-    respx.post(f"{client_config.api_url}v3/harvests/harvest-456/arcs").mock(
+    # Only the first ARC is submitted; the duplicate is skipped client-side.
+    arc_route = respx.post(f"{client_config.api_url}v3/harvests/harvest-456/arcs").mock(
         return_value=httpx.Response(http.HTTPStatus.OK, json=_ARC_RESPONSE)
     )
-    fail_route = respx.patch(f"{client_config.api_url}v3/harvests/harvest-456").mock(
-        return_value=httpx.Response(http.HTTPStatus.OK, json=failed_response)
+    complete_route = respx.post(f"{client_config.api_url}v3/harvests/harvest-456/complete").mock(
+        return_value=httpx.Response(http.HTTPStatus.OK, json=completed_response)
     )
 
     async with ApiClient(client_config) as client:
-        with pytest.raises(ApiClientError, match="Duplicate ARC identifier 'duplicate-arc'"):
-            await client.harvest_arcs("test-rdi", _arc_gen(arc_a, arc_b))
+        result = await client.harvest_arcs("test-rdi", _arc_gen(arc_a, arc_b))
 
-    assert fail_route.called
+    assert result.status == "COMPLETED"
+    assert arc_route.call_count == 1  # duplicate was skipped, not submitted
+    assert complete_route.called
 
 
 @pytest.mark.asyncio