dafab-client 2.2.0__tar.gz → 2.2.3__tar.gz

{dafab_client-2.2.0 → dafab_client-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dafab_client
-Version: 2.2.0
+Version: 2.2.3
 Summary: DaFab helper client built on top of Rucio client modules.
 Author: DaFab
 License-Expression: Apache-2.0

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/_rucio/common/plugins.py

@@ -104,7 +104,7 @@ class PolicyPackageAlgorithms:
             if vo == DEFAULT_VO:
                 vo = ''
             package = cls._get_policy_package_name(vo)
-        except (NoOptionError, NoSectionError):
+        except (ConfigNotFound, NoOptionError, NoSectionError):
             cls._default_algorithms[type_for_vo] = default_algorithm
             return default_algorithm
 

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/_rucio/rse/rsemanager.py

@@ -37,6 +37,18 @@ if TYPE_CHECKING:
     from dafab_client._rucio.rse.protocols.protocol import RSEProtocol
 
 
+def _normalize_protocol_impl_path(impl: str) -> str:
+    """Resolve vendored protocol implementations under ``dafab_client._rucio``.
+
+    RSE configurations still commonly advertise protocol classes under the upstream
+    ``rucio.rse.protocols`` namespace. Inside this client repository we vendor those
+    modules under ``dafab_client._rucio.rse.protocols`` instead.
+    """
+    if impl.startswith("rucio.rse.protocols."):
+        return impl.replace("rucio.", "dafab_client._rucio.", 1)
+    return impl
+
+
 def get_scope_protocol(vo: str = DEFAULT_VO) -> 'Callable':
     """
         Returns the callable protocol to translate the pfn to a name/scope pair
@@ -238,6 +250,8 @@ def create_protocol(
             raise exception.RSEProtocolNotSupported('Protocol %s operation %s on domain %s not supported' % (protocol_attr, operation, domain))
 
     # Instantiate protocol
+    protocol_attr = copy.copy(protocol_attr)
+    protocol_attr['impl'] = _normalize_protocol_impl_path(protocol_attr['impl'])
     comp = protocol_attr['impl'].split('.')
     prefix = '.'.join(comp[-2:]) + ': '
     logger = formatted_logger(logger, prefix + "%s")

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/example_notebooks/dafab_dasi_workflows.ipynb

@@ -99,7 +99,7 @@
    "metadata": {},
    "source": [
     "original_item_ready = dc.ensure_item(ORIGINAL_ITEM_ID)\n",
-    "print(dc.as_json({\"scope\": STAC_SCOPE, \"item\": ORIGINAL_ITEM_ID, \"ready\": original_item_ready}))\n"
+    "print(dc.as_json({\"scope\": STAC_SCOPE, \"item\": ORIGINAL_ITEM_ID, \"ready\": original_item_ready}))"
    ],
    "id": "d9f3dc23de1b778b",
    "outputs": [],
@@ -122,7 +122,7 @@
     "    name=STAC_COLLECTION_ID,\n",
     "    members=[{\"scope\": STAC_SCOPE, \"name\": ORIGINAL_ITEM_ID}],\n",
     ")\n",
-    "print(dc.as_json({\"collection\": STAC_COLLECTION_ID, \"item\": ORIGINAL_ITEM_ID, \"attached\": original_item_attached}))\n"
+    "print(dc.as_json({\"collection\": STAC_COLLECTION_ID, \"item\": ORIGINAL_ITEM_ID, \"attached\": original_item_attached}))"
    ],
    "id": "025de93d608242fa",
    "outputs": [],
@@ -156,7 +156,7 @@
     "    expected_collection_id=STAC_COLLECTION_ID,\n",
     "    check_catalog_state=False,\n",
     ")\n",
-    "print(dc.as_json(original_item_pre_publish_validation))\n"
+    "print(dc.as_json(original_item_pre_publish_validation))"
    ],
    "id": "8f988f1e6d08439a",
    "outputs": [],
@@ -180,7 +180,7 @@
     "    metadata_path=ORIGINAL_ITEM_FILE,\n",
     "    scope=STAC_SCOPE,\n",
     "    op=\"upsert\",\n",
-    ")\n"
+    ")"
    ],
    "id": "6e822f1f67784d8f",
    "outputs": [],
@@ -216,7 +216,7 @@
     "    check_related_links=True,\n",
     "    autofix=False,\n",
     ")\n",
-    "print(dc.as_json(original_item_post_publish_validation))\n"
+    "print(dc.as_json(original_item_post_publish_validation))"
    ],
    "id": "6a3d46629ee90eaf",
    "outputs": [],
@@ -254,7 +254,7 @@
     "    autofix=True,\n",
     "    autofix_include_related_links=True,\n",
     ")\n",
-    "print(dc.as_json(original_item_post_publish_autofix))\n"
+    "print(dc.as_json(original_item_post_publish_autofix))"
    ],
    "id": "8b170b8be6c16f37",
    "outputs": [],
@@ -293,7 +293,7 @@
     "    full_scan=False,\n",
     "    dry_run=False,\n",
     ")\n",
-    "print(dc.as_json(dasi_extent_integrity_report))\n"
+    "print(dc.as_json(dasi_extent_integrity_report))"
    ],
    "id": "115a8a08718400ab",
    "outputs": [],
@@ -312,4 +312,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/example_notebooks/dafab_operator_workflows.ipynb

@@ -89,9 +89,7 @@
   {
    "cell_type": "code",
    "metadata": {},
-   "source": [
-    "dc.list_accounts()\n"
-   ],
+   "source": "dc.list_accounts()",
    "id": "9a621cf10199837c",
    "outputs": [],
    "execution_count": null
@@ -115,7 +113,7 @@
     "    email=\"d.xenakis@cern.ch\",\n",
     "    account_type=\"SERVICE\",\n",
     ")\n",
-    "print(dc.as_json(result))\n"
+    "print(dc.as_json(result))"
    ],
    "id": "9f13ef7c6bdaba11",
    "outputs": [],
@@ -140,7 +138,7 @@
     "    email=\"d.xenakis@cern.ch\",\n",
     "    authtype=\"userpass\",\n",
     "    password=\"dafab\",\n",
-    ")\n"
+    ")"
    ],
    "id": "effe4b3ff4628db9",
    "outputs": [],
@@ -163,7 +161,7 @@
     "    account=\"dafab_admin\",\n",
     "    scope=STAC_SCOPE,\n",
     ")\n",
-    "print(dc.as_json(scope_result))\n"
+    "print(dc.as_json(scope_result))"
    ],
    "id": "80228e542f59a1ec",
    "outputs": [],
@@ -183,7 +181,7 @@
    "metadata": {},
    "source": [
     "catalog_ready = dc.ensure_catalog(ROOT_CATALOG_ID, scope=STAC_SCOPE)\n",
-    "print(dc.as_json({\"scope\": STAC_SCOPE, \"catalog\": ROOT_CATALOG_ID, \"ready\": catalog_ready}))\n"
+    "print(dc.as_json({\"scope\": STAC_SCOPE, \"catalog\": ROOT_CATALOG_ID, \"ready\": catalog_ready}))"
    ],
    "id": "3f583ef42110fbdf",
    "outputs": [],
@@ -203,7 +201,7 @@
    "metadata": {},
    "source": [
     "collection_ready = dc.ensure_collection(STAC_COLLECTION_ID, scope=STAC_SCOPE)\n",
-    "print(dc.as_json({\"scope\": STAC_SCOPE, \"collection\": STAC_COLLECTION_ID, \"ready\": collection_ready}))\n"
+    "print(dc.as_json({\"scope\": STAC_SCOPE, \"collection\": STAC_COLLECTION_ID, \"ready\": collection_ready}))"
    ],
    "id": "6703b9e57f133a07",
    "outputs": [],
@@ -223,7 +221,7 @@
    "metadata": {},
    "source": [
     "water_facet_ready = dc.ensure_catalog(FACET_PARENT_CATALOG_ID, scope=STAC_SCOPE)\n",
-    "print(dc.as_json({\"scope\": STAC_SCOPE, \"catalog\": FACET_PARENT_CATALOG_ID, \"ready\": water_facet_ready}))\n"
+    "print(dc.as_json({\"scope\": STAC_SCOPE, \"catalog\": FACET_PARENT_CATALOG_ID, \"ready\": water_facet_ready}))"
    ],
    "id": "799da3f5efc2e22e",
    "outputs": [],
@@ -247,7 +245,7 @@
     "    name=STAC_COLLECTION_ID,\n",
     "    members=[{\"scope\": STAC_SCOPE, \"name\": FACET_PARENT_CATALOG_ID}],\n",
     ")\n",
-    "print(dc.as_json({\"collection\": STAC_COLLECTION_ID, \"facet_parent_catalog\": FACET_PARENT_CATALOG_ID, \"attached\": attached_facet_parent}))\n"
+    "print(dc.as_json({\"collection\": STAC_COLLECTION_ID, \"facet_parent_catalog\": FACET_PARENT_CATALOG_ID, \"attached\": attached_facet_parent}))"
    ],
    "id": "597a53067be47faf",
    "outputs": [],
@@ -271,7 +269,7 @@
     "    name=STAC_COLLECTION_ID,\n",
     "    members=[{\"scope\": STAC_SCOPE, \"name\": FACET_PARENT_CATALOG_ID}],\n",
     ")\n",
-    "print(dc.as_json({\"collection\": STAC_COLLECTION_ID, \"facet_parent_catalog\": FACET_PARENT_CATALOG_ID, \"detached\": detached_facet_parent}))\n"
+    "print(dc.as_json({\"collection\": STAC_COLLECTION_ID, \"facet_parent_catalog\": FACET_PARENT_CATALOG_ID, \"detached\": detached_facet_parent}))"
    ],
    "id": "4ae568166158268c",
    "outputs": [],
@@ -295,7 +293,7 @@
     "    name=ROOT_CATALOG_ID,\n",
     "    members=[{\"scope\": STAC_SCOPE, \"name\": STAC_COLLECTION_ID}],\n",
     ")\n",
-    "print(dc.as_json({\"root_catalog\": ROOT_CATALOG_ID, \"collection\": STAC_COLLECTION_ID, \"attached\": attached_collection}))\n"
+    "print(dc.as_json({\"root_catalog\": ROOT_CATALOG_ID, \"collection\": STAC_COLLECTION_ID, \"attached\": attached_collection}))"
    ],
    "id": "a4daa175ec0df7c5",
    "outputs": [],
@@ -320,7 +318,7 @@
     "    metadata_path=root_catalog_metadata_path,\n",
     "    scope=STAC_SCOPE,\n",
     "    op=\"upsert\",\n",
-    ")\n"
+    ")"
    ],
    "id": "973cf44be5fb9e44",
    "outputs": [],
@@ -363,7 +361,7 @@
     "        metadata_path=collection_metadata_path,\n",
     "        scope=STAC_SCOPE,\n",
     "        op=\"upsert\",\n",
-    "    )\n"
+    "    )"
    ],
    "id": "35be8d32e735a750",
    "outputs": [],
@@ -406,7 +404,7 @@
     "        metadata_path=facet_parent_catalog_metadata_path,\n",
     "        scope=STAC_SCOPE,\n",
     "        op=\"upsert\",\n",
-    "    )\n"
+    "    )"
    ],
    "id": "c018bd7919e1fe4f",
    "outputs": [],
@@ -428,7 +426,7 @@
     "    stac_namespace=STAC_SCOPE,\n",
     "    limit=50,\n",
     ")\n",
-    "print(dc.as_json(missing_asset_audit))\n"
+    "print(dc.as_json(missing_asset_audit))"
    ],
    "id": "96052be7d1f3f215",
    "outputs": [],
@@ -447,4 +445,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/example_notebooks/dafab_skim_workflows.ipynb

@@ -92,7 +92,7 @@
     "\n",
     "DERIVED_ASSET_KEY = \"dafab-field-boundaries\"\n",
     "\n",
-    "DERIVED_ASSET_FILE = \"docs/notebooks/demo-data/uploads/assets/smart_agriculture/S2A_30TYN_20200311_1_L2A/field-boundaries-S2A_30TYN_20200311_1_L2A-10-v1.2.0.geojson\"\n"
+    "DERIVED_ASSET_FILE = \"docs/notebooks/demo-data/uploads/assets/smart_agriculture/S2A_30TYN_20200311_1_L2A/field-boundaries-S2A_30TYN_20200311_1_L2A-10-v1.2.0.geojson\""
    ],
    "id": "26839e4a804af97b",
    "outputs": [],
@@ -112,7 +112,7 @@
    "metadata": {},
    "source": [
     "facet_value_ready = dc.ensure_catalog(FACET_VALUE_CATALOG_ID, scope=STAC_SCOPE)\n",
-    "print(dc.as_json({\"scope\": STAC_SCOPE, \"catalog\": FACET_VALUE_CATALOG_ID, \"ready\": facet_value_ready}))\n"
+    "print(dc.as_json({\"scope\": STAC_SCOPE, \"catalog\": FACET_VALUE_CATALOG_ID, \"ready\": facet_value_ready}))"
    ],
    "id": "cc274dac9e3476ae",
    "outputs": [],
@@ -136,7 +136,7 @@
     "    name=FACET_PARENT_CATALOG_ID,\n",
     "    members=[{\"scope\": STAC_SCOPE, \"name\": FACET_VALUE_CATALOG_ID}],\n",
     ")\n",
-    "print(dc.as_json({\"facet_parent_catalog\": FACET_PARENT_CATALOG_ID, \"facet_value_catalog\": FACET_VALUE_CATALOG_ID, \"attached\": attached_to_parent}))\n"
+    "print(dc.as_json({\"facet_parent_catalog\": FACET_PARENT_CATALOG_ID, \"facet_value_catalog\": FACET_VALUE_CATALOG_ID, \"attached\": attached_to_parent}))"
    ],
    "id": "ea0727f08cab3f2b",
    "outputs": [],
@@ -167,7 +167,7 @@
     "    schema_path=FACET_VALUE_CATALOG_SCHEMA,\n",
     "    scope=STAC_SCOPE,\n",
     ")\n",
-    "print(dc.as_json(facet_catalog_validation))\n"
+    "print(dc.as_json(facet_catalog_validation))"
    ],
    "id": "ed711690e254b61f",
    "outputs": [],
@@ -230,7 +230,7 @@
     "        metadata_path=facet_value_catalog_metadata_path,\n",
     "        scope=STAC_SCOPE,\n",
     "        op=\"upsert\",\n",
-    "    )\n"
+    "    )"
    ],
    "id": "261b4fccfb4a524b",
    "outputs": [],
@@ -251,7 +251,7 @@
    "id": "73319312",
    "source": [
     "derived_item_ready = dc.ensure_item(DERIVED_ITEM_ID, scope=STAC_SCOPE)\n",
-    "print(dc.as_json({\"scope\": STAC_SCOPE, \"item\": DERIVED_ITEM_ID, \"ready\": derived_item_ready}))\n"
+    "print(dc.as_json({\"scope\": STAC_SCOPE, \"item\": DERIVED_ITEM_ID, \"ready\": derived_item_ready}))"
    ],
    "outputs": [],
    "execution_count": null
@@ -274,7 +274,7 @@
     "    name=FACET_VALUE_CATALOG_ID,\n",
     "    members=[{\"scope\": STAC_SCOPE, \"name\": DERIVED_ITEM_ID}],\n",
     ")\n",
-    "print(dc.as_json({\"facet_value_catalog\": FACET_VALUE_CATALOG_ID, \"item\": DERIVED_ITEM_ID, \"attached\": attached_item}))\n"
+    "print(dc.as_json({\"facet_value_catalog\": FACET_VALUE_CATALOG_ID, \"item\": DERIVED_ITEM_ID, \"attached\": attached_item}))"
    ],
    "id": "4c448873861601fb",
    "outputs": [],
@@ -307,7 +307,7 @@
     "    expected_collection_id=DERIVED_ITEM_COLLECTION_ID,\n",
     "    check_catalog_state=False,\n",
     ")\n",
-    "print(dc.as_json(derived_item_pre_publish_validation))\n"
+    "print(dc.as_json(derived_item_pre_publish_validation))"
    ],
    "outputs": [],
    "execution_count": null
@@ -330,7 +330,7 @@
     "    metadata_path=DERIVED_ITEM_FILE,\n",
     "    scope=STAC_SCOPE,\n",
     "    op=\"upsert\",\n",
-    ")\n"
+    ")"
    ],
    "id": "b2fd4845e909172d",
    "outputs": [],
@@ -358,7 +358,7 @@
     "    overwrite=True,\n",
     "    scope=STAC_SCOPE,\n",
     ")\n",
-    "print(dc.as_json(published_derived_asset))\n"
+    "print(dc.as_json(published_derived_asset))"
    ],
    "id": "84e19cd6f860efc0",
    "outputs": [],
@@ -397,7 +397,7 @@
     "    check_catalog_state=True,\n",
     "    autofix=False,\n",
     ")\n",
-    "print(dc.as_json(derived_item_post_publish_validation))\n"
+    "print(dc.as_json(derived_item_post_publish_validation))"
    ],
    "outputs": [],
    "execution_count": null
@@ -433,7 +433,7 @@
     "    check_catalog_state=True,\n",
     "    autofix=True,\n",
     ")\n",
-    "print(dc.as_json(derived_item_post_publish_autofix))\n"
+    "print(dc.as_json(derived_item_post_publish_autofix))"
    ],
    "outputs": [],
    "execution_count": null
@@ -476,7 +476,7 @@
     "    full_scan=True,\n",
     "    dry_run=False,\n",
     ")\n",
-    "print(dc.as_json(skim_extent_integrity_report))\n"
+    "print(dc.as_json(skim_extent_integrity_report))"
    ],
    "outputs": [],
    "execution_count": null
@@ -494,4 +494,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/helpers/demo_imports.py

@@ -13,7 +13,7 @@ from .db_bootstrap.account_manager import add_rucio_account, add_rucio_identity
 from .dataset_management.ensure_dataset import ensure_item
 from .dataset_management.list_datasets import get_items
 from .dataset_management.scope_management import ensure_scope_for_account, list_stac_scopes
-from .did_management.operations import attach_stac_members, detach_stac_members
+from .did_management.operations import attach_stac_members, detach_stac_members, get_stac_objects
 from .filtering.filter_by_bbox import get_items_by_bbox
 from .filtering.filter_by_bbox_and_timerange import get_items_by_bbox_and_timerange
 from .filtering.filter_by_enhanced_filter import get_items_by_enhanced_filter
@@ -36,6 +36,8 @@ from .file_management.Workflows.manage_derived_assets import (
     list_item_asset_entries,
     publish_derived_asset,
 )
+from .file_management.Deletion.delete_file_of_scope_name import delete_file
+from .file_management.Deletion.delete_replica_of_scope_name import delete_replica
 from .metadata_management.Insertion.set_metadata import set_metadata
 from .metadata_management.Preflight.validate_derived_item_file import validate_derived_item
 from .metadata_management.Preflight.validate_facet_value_catalog_file import validate_facet_value_catalog_file
@@ -56,6 +58,8 @@ __all__ = [
     "build_stable_asset_href",
     "check_storage",
     "detach_stac_members",
+    "delete_file",
+    "delete_replica",
     "download_all_derived_item_assets",
     "download_asset_from_stable_href",
     "download_item_asset",
@@ -78,6 +82,7 @@ __all__ = [
     "get_related_item_ids_from_original_item",
     "get_sibling_derived_item_ids",
     "get_source_original_item_ids_from_derived_item",
+    "get_stac_objects",
     "list_accounts",
     "list_catalogs_and_collections",
     "list_derived_items_with_missing_assets",

dafab_client-2.2.3/dafab_client/helpers/file_management/Deletion/delete_file_of_scope_name.py

@@ -0,0 +1,123 @@
+import argparse
+import time
+import traceback
+
+import requests
+
+from dafab_client._rucio.dafab_lib import connection_manager, upload_manager
+from dafab_client._rucio.common.exception import AccessDenied, RucioException, SourceNotFound
+from dafab_client._rucio.global_utils import setup_logger
+
+LOG = setup_logger(__name__)
+
+SIGNED_DELETE_TIMEOUT = 120
+
+
+def _delete_file_via_signed_url(
+        fname: str,
+        scope: str,
+        rse: str,
+        timeout: int = SIGNED_DELETE_TIMEOUT,
+) -> bool:
+    """Delete a file through a signed HTTPS URL when the RSE supports sign_url."""
+    client = connection_manager()
+    did_str = f"{scope}:{fname}"
+    pfn_map = client.lfns2pfns(
+        rse=rse,
+        lfns=[did_str],
+        protocol_domain="wan",
+        operation="delete",
+        scheme="https",
+    )
+    delete_pfn = pfn_map.get(did_str)
+    if not isinstance(delete_pfn, str) or not delete_pfn.strip():
+        raise RucioException(f"Unable to resolve a delete PFN for {did_str} on {rse}.")
+
+    rse_info = client.get_rse(rse)
+    sign_service = rse_info.get("sign_url")
+    if not sign_service:
+        raise RucioException(f"RSE {rse} does not advertise sign_url support.")
+
+    signed_url = client.get_signed_url(rse, str(sign_service), "delete", delete_pfn)
+    response = requests.delete(signed_url, timeout=timeout)
+    if response.status_code in {200, 202, 204}:
+        return True
+    if response.status_code == 404:
+        raise SourceNotFound()
+    if response.status_code in {401, 403}:
+        raise AccessDenied(response.text or "Signed delete was rejected by the storage service.")
+    raise RucioException(
+        f"Signed delete failed with HTTP {response.status_code}: {response.text[:200]}"
+    )
+
+
+def delete_file(fname: str, scope: str = 'dafab', rse: str = 'MELUXINA_S3'):
+    """
+    Remove a file from an RSE in Rucio.
+
+    For signed-URL storages such as ``MELUXINA_S3``, the helper resolves the PFN
+    through the server and performs a direct HTTPS DELETE using a signed URL.
+    Other RSEs fall back to the legacy upload-client delete path.
+
+    Parameters
+    ----------
+    fname : str
+        Name of the file to delete.
+    scope : str, optional
+        Rucio scope of the file, by default ``'dafab'``.
+    rse : str, optional
+        Target RSE from which the file is deleted, by default ``'MELUXINA_S3'``.
+
+    Returns
+    -------
+    bool
+        ``True`` if the file was removed successfully, ``False`` after all retry attempts failed.
+    """
+    max_retries = 5
+    retry_delay = 30  # seconds
+
+    for attempt in range(max_retries):
+        try:
+            client = connection_manager()
+            rse_info = client.get_rse(rse)
+            if rse_info.get("sign_url"):
+                _delete_file_via_signed_url(fname, scope, rse)
+            else:
+                uploader = upload_manager()
+                uploader.delete_file(fname, scope, rse)
+            LOG.result(f"The deletion process of file '{fname}' from {rse} RSE finished.\n")
+            return True
+        except SourceNotFound:
+            LOG.result(f"The file '{scope}:{fname}' is already absent from {rse}.\n")
+            return True
+        except AccessDenied as e:
+            LOG.warning(
+                f"Access denied while deleting the file '{scope}:{fname}' from {rse}: {e}\n"
+            )
+            return False
+        except Exception as e:
+            LOG.warning(f"Attempt {attempt + 1}/{max_retries}: An unexpected error of type '{type(e).__name__}' occurred "
+                f"while deleting the '{fname}' file from {rse} RSE: {e}\n")
+
+            # Get the full traceback for debugging:
+            traceback.print_exc()
+
+            if attempt < max_retries - 1:  # Don't sleep after the last attempt
+                LOG.warning(f"Retrying in {retry_delay} seconds...")
+                time.sleep(retry_delay)
+
+    LOG.warning("All retry attempts exhausted.")
+    return False
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Delete file of a Copernicus metadata filename.')
+    parser.add_argument('filename', type=str,
+                        help='Copernicus metadata filename (e.g., field-boundaries-S2A_10SGG_20230426_0_L2A-v1.1.0.geojson).')
+
+    args = parser.parse_args()
+
+    filename = args.filename
+
+    deletion_success = delete_file(filename)
+    exit(0 if deletion_success else 1)

{dafab_client-2.2.0 → dafab_client-2.2.3}/dafab_client/helpers/file_management/Deletion/delete_replica_of_scope_name.py

@@ -3,12 +3,18 @@ import argparse
 import traceback
 
 from dafab_client._rucio.dafab_lib import connection_manager
+from dafab_client._rucio.common.exception import AccessDenied, ReplicaNotFound
 from dafab_client._rucio.global_utils import setup_logger
 
 LOG = setup_logger(__name__)
 
 
-def delete_replica(fname, rse: str = 'MELUXINA_S3'):
+def delete_replica(
+        fname: str,
+        rse: str = 'MELUXINA_S3',
+        scope: str = 'dafab',
+        ignore_availability: bool = True,
+):
     """
     Remove a file replica from Rucio.
 
@@ -22,6 +28,10 @@ def delete_replica(fname, rse: str = 'MELUXINA_S3'):
         Name of the file whose replica should be removed.
     rse : str, optional
         Target RSE from which to delete the replica, by default ``'MELUXINA_S3'``.
+    scope : str, optional
+        Rucio scope of the file, by default ``'dafab'``.
+    ignore_availability : bool, optional
+        Ignore RSE availability while deleting the replica, by default ``True``.
 
     Returns
     -------
@@ -37,18 +47,30 @@ def delete_replica(fname, rse: str = 'MELUXINA_S3'):
             # Get a client connection
             cl = connection_manager()
 
-            success = cl.delete_replica(fname, rse)
+            success = cl.delete_replicas(
+                rse=rse,
+                files=[{'scope': scope, 'name': fname}],
+                ignore_availability=ignore_availability,
+            )
             if success:
-                LOG.result(f"The '{fname}' replica is deregistered from the catalog.\n")
+                LOG.result(f"The '{scope}:{fname}' replica is deregistered from {rse}.\n")
                 return True
             else:
-                LOG.warning(f"Deletion of the '{fname}' replica from the database was not successful.\n")
+                LOG.warning(f"Deletion of the '{scope}:{fname}' replica from {rse} was not successful.\n")
                 return False
 
+        except ReplicaNotFound:
+            LOG.result(f"The '{scope}:{fname}' replica is already absent from {rse}.\n")
+            return True
+        except AccessDenied as e:
+            LOG.warning(
+                f"Access denied while deleting the '{scope}:{fname}' replica from {rse}: {e}\n"
+            )
+            return False
         except Exception as e:
             LOG.warning(f"Attempt {attempt + 1}/{max_retries}: An unexpected error "
                         f"of type '{type(e).__name__}' occurred "
-                        f"while deleting the '{fname}' replica from Rucio database: {e}\n")
+                        f"while deleting the '{scope}:{fname}' replica from {rse}: {e}\n")
 
             # Get the full traceback for debugging:
             traceback.print_exc()
@@ -65,10 +87,12 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Remove replica of a Copernicus metadata filename.')
     parser.add_argument('filename', type=str,
                         help='Copernicus metadata filename (e.g., field-boundaries-S2B_43QDB_20240408_0_L2A.geojson).')
+    parser.add_argument('--scope', default='dafab', help='Rucio scope of the file. Defaults to dafab.')
+    parser.add_argument('--rse', default='MELUXINA_S3', help='RSE from which to remove the replica.')
 
     args = parser.parse_args()
 
     filename = args.filename
 
-    deletion_success = delete_replica(filename)
+    deletion_success = delete_replica(filename, scope=args.scope, rse=args.rse)
     exit(0 if deletion_success else 1)