From aaeebd35b8effb9eff15e01b3a02dbd3152eb5b6 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Thu, 19 Feb 2026 17:46:53 +0500
Subject: [PATCH 1/8] feat: support added to export content libraries to git

---
 .../contentstore/git_export_utils.py          | 122 ++++++++++++++++--
 1 file changed, 109 insertions(+), 13 deletions(-)

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index e0ac80a4627f..cd70770812a1 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -6,17 +6,24 @@
 
 import logging
 import os
+import shutil
 import subprocess
+import zipfile
+from datetime import datetime
+from pathlib import Path
+from tempfile import mkdtemp
 from urllib.parse import urlparse
 
 from django.conf import settings
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.utils import timezone
+from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
+from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.xml_exporter import export_course_to_xml
+from xmodule.modulestore.xml_exporter import export_course_to_xml, export_library_to_xml
 
 log = logging.getLogger(__name__)
 
@@ -66,10 +73,89 @@ def cmd_log(cmd, cwd):
     return output
 
 
-def export_to_git(course_id, repo, user='', rdir=None):
-    """Export a course to git."""
+def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
+    """
+    Export a v2 library using the backup API.
+
+    V2 libraries are stored in Learning Core and use a zip-based backup mechanism.
+    This function creates a zip backup and extracts it to the specified directory.
+
+    Args:
+        library_key: LibraryLocatorV2 for the library to export
+        root_dir: Root directory where library_dir will be created
+        library_dir: Directory name for the exported library content
+        user: User object for the backup API (optional)
+
+    Raises:
+        Exception: If backup creation or extraction fails
+    """
+    from openedx_content.api import create_zip_file as create_lib_zip_file
+
+    # Get user object for backup API
+    user_obj = User.objects.filter(username=user).first()
+    # Create temporary zip backup
+    temp_dir = Path(mkdtemp())
+    sanitized_lib_key = str(library_key).replace(":", "-")
+    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
+    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
+    zip_filename = f'{sanitized_lib_key}-{timestamp}.zip'
+    zip_path = os.path.join(temp_dir, zip_filename)
+
+    try:
+        origin_server = getattr(settings, 'CMS_BASE', None)
+        create_lib_zip_file(
+            lp_key=str(library_key),
+            path=zip_path,
+            user=user_obj,
+            origin_server=origin_server
+        )
+
+        # Target directory for extraction
+        target_dir = os.path.join(root_dir, library_dir)
+
+        # Create target directory if it doesn't exist
+        os.makedirs(target_dir, exist_ok=True)
+
+        # Extract zip contents (will overwrite existing files)
+        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+            zip_ref.extractall(target_dir)
+
+        log.info('Extracted library v2 backup to %s', target_dir)
+
+    finally:
+        # Cleanup temporary files
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
+
+
+def export_to_git(content_key, repo, user='', rdir=None):
+    """
+    Export a course or library to git.
+
+    Args:
+        content_key: CourseKey or LibraryLocator for the content to export
+        repo (str): Git repository URL
+        user (str): Optional username for git commit identity
+        rdir (str): Optional custom directory name for the repository
+
+    Raises:
+        GitExportError: For various git operation failures
+    """
     # pylint: disable=too-many-statements
 
+    # Detect content type and select appropriate export function
+    is_library_v2 = isinstance(content_key, LibraryLocatorV2)
+    if is_library_v2:
+        # V2 libraries use backup API with zip extraction
+        export_xml_func = export_library_v2_to_zip
+        content_type_label = "library"
+    elif isinstance(content_key, LibraryLocator):
+        export_xml_func = export_library_to_xml
+        content_type_label = "library"
+    else:
+        export_xml_func = export_course_to_xml
+        content_type_label = "course"
+
     if not GIT_REPO_EXPORT_DIR:
         raise GitExportError(GitExportError.NO_EXPORT_DIR)
 
@@ -128,15 +214,20 @@ def export_to_git(course_id, repo, user='', rdir=None):
             log.exception('Failed to pull git repository: %r', ex.output)
             raise GitExportError(GitExportError.CANNOT_PULL) from ex
 
-    # export course as xml before commiting and pushing
+    # export content as xml (or zip for v2 libraries) before commiting and pushing
     root_dir = os.path.dirname(rdirp)
-    course_dir = os.path.basename(rdirp).rsplit('.git', 1)[0]
+    content_dir = os.path.basename(rdirp).rsplit('.git', 1)[0]
+
     try:
-        export_course_to_xml(modulestore(), contentstore(), course_id,
-                             root_dir, course_dir)
-    except (OSError, AttributeError):
-        log.exception('Failed export to xml')
-        raise GitExportError(GitExportError.XML_EXPORT_FAIL)  # lint-amnesty, pylint: disable=raise-missing-from
+        if is_library_v2:
+            export_xml_func(content_key, root_dir, content_dir, user)
+        else:
+            # V1 libraries and courses: use XML export (no user parameter)
+            export_xml_func(modulestore(), contentstore(), content_key,
+                            root_dir, content_dir)
+    except (OSError, AttributeError) as ex:
+        log.exception('Failed to export %s', content_type_label)
+        raise GitExportError(GitExportError.XML_EXPORT_FAIL) from ex
 
     # Get current branch if not already set
     if not branch:
@@ -160,9 +251,7 @@ def export_to_git(course_id, repo, user='', rdir=None):
         ident = GIT_EXPORT_DEFAULT_IDENT
     time_stamp = timezone.now()
     cwd = os.path.abspath(rdirp)
-    commit_msg = "Export from Studio at {time_stamp}".format(
-        time_stamp=time_stamp,
-    )
+    commit_msg = f"Export {content_type_label} from Studio at {time_stamp}"
     try:
         cmd_log(['git', 'config', 'user.email', ident['email']], cwd)
         cmd_log(['git', 'config', 'user.name', ident['name']], cwd)
@@ -180,3 +269,10 @@ def export_to_git(course_id, repo, user='', rdir=None):
     except subprocess.CalledProcessError as ex:
         log.exception('Error running git push command: %r', ex.output)
         raise GitExportError(GitExportError.CANNOT_PUSH) from ex
+
+    log.info(
+        '%s %s exported to git repository %s successfully',
+        content_type_label.capitalize(),
+        content_key,
+        repo,
+    )

From 6b5510051ade7d67ac8f98799990b7a5c574ce47 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Fri, 13 Mar 2026 15:41:12 +0500
Subject: [PATCH 2/8] fix: separate common part for v2 zip and use that in git
 export

---
 .../contentstore/git_export_utils.py          | 24 ++------------
 .../djangoapps/content_libraries/tasks.py     | 33 ++++++++++++++-----
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index cd70770812a1..6b14de4429ed 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -9,15 +9,11 @@
 import shutil
 import subprocess
 import zipfile
-from datetime import datetime
-from pathlib import Path
-from tempfile import mkdtemp
 from urllib.parse import urlparse
 
 from django.conf import settings
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.utils import timezone
-from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
@@ -84,32 +80,18 @@ def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
         library_key: LibraryLocatorV2 for the library to export
         root_dir: Root directory where library_dir will be created
         library_dir: Directory name for the exported library content
-        user: User object for the backup API (optional)
+        user: Username string for the backup API (optional)
 
     Raises:
         Exception: If backup creation or extraction fails
     """
-    from openedx_content.api import create_zip_file as create_lib_zip_file
+    from openedx.core.djangoapps.content_libraries.tasks import create_library_v2_zip
 
     # Get user object for backup API
     user_obj = User.objects.filter(username=user).first()
-    # Create temporary zip backup
-    temp_dir = Path(mkdtemp())
-    sanitized_lib_key = str(library_key).replace(":", "-")
-    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
-    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
-    zip_filename = f'{sanitized_lib_key}-{timestamp}.zip'
-    zip_path = os.path.join(temp_dir, zip_filename)
+    temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
 
     try:
-        origin_server = getattr(settings, 'CMS_BASE', None)
-        create_lib_zip_file(
-            lp_key=str(library_key),
-            path=zip_path,
-            user=user_obj,
-            origin_server=origin_server
-        )
-
         # Target directory for extraction
         target_dir = os.path.join(root_dir, library_dir)
 
diff --git a/openedx/core/djangoapps/content_libraries/tasks.py b/openedx/core/djangoapps/content_libraries/tasks.py
index dfe1237b5613..6e0d871c04e1 100644
--- a/openedx/core/djangoapps/content_libraries/tasks.py
+++ b/openedx/core/djangoapps/content_libraries/tasks.py
@@ -508,6 +508,30 @@ def _copy_overrides(
     store.update_item(dest_block, user_id)
 
 
+def create_library_v2_zip(library_key: LibraryLocatorV2, user: User) -> tuple:
+    """
+    Create a zip backup of a v2 library and return ``(temp_dir, zip_file_path)``.
+
+    The caller is responsible for cleaning up ``temp_dir`` when done.
+
+    Args:
+        library_key: LibraryLocatorV2 identifying the library to export.
+        user: User object passed to the backup API.
+
+    Returns:
+        A tuple of ``(temp_dir as Path, zip_file_path as str)``.
+    """
+    root_dir = Path(mkdtemp())
+    sanitized_lib_key = str(library_key).replace(":", "-")
+    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
+    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
+    filename = f'{sanitized_lib_key}-{timestamp}.zip'
+    file_path = os.path.join(root_dir, filename)
+    origin_server = getattr(settings, 'CMS_BASE', None)
+    create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
+    return root_dir, file_path
+
+
 class LibraryBackupTask(UserTask):  # pylint: disable=abstract-method
     """
     Base class for tasks related with Library backup functionality.
@@ -553,15 +577,8 @@ def backup_library(self, user_id: int, library_key_str: str) -> None:
         self.status.set_state('Exporting')
         set_custom_attribute("exporting_started", str(library_key))
 
-        root_dir = Path(mkdtemp())
-        sanitized_lib_key = str(library_key).replace(":", "-")
-        sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
-        timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
-        filename = f'{sanitized_lib_key}-{timestamp}.zip'
-        file_path = os.path.join(root_dir, filename)
         user = User.objects.get(id=user_id)
-        origin_server = getattr(settings, 'CMS_BASE', None)
-        create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
+        _root_dir, file_path = create_library_v2_zip(library_key, user)
         set_custom_attribute("exporting_completed", str(library_key))
 
         with open(file_path, 'rb') as zipfile:

From c027312c50e2483be6005003f9708e62ed4fc392 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Fri, 13 Mar 2026 15:51:25 +0500
Subject: [PATCH 3/8] fix: move common function to a new file

---
 .../contentstore/git_export_utils.py          |  2 +-
 .../content_libraries/api/__init__.py         |  1 +
 .../content_libraries/api/backup.py           | 41 +++++++++++++++++++
 .../djangoapps/content_libraries/tasks.py     | 32 +--------------
 4 files changed, 45 insertions(+), 31 deletions(-)
 create mode 100644 openedx/core/djangoapps/content_libraries/api/backup.py

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index 6b14de4429ed..ab12c269670c 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -85,7 +85,7 @@ def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
     Raises:
         Exception: If backup creation or extraction fails
     """
-    from openedx.core.djangoapps.content_libraries.tasks import create_library_v2_zip
+    from openedx.core.djangoapps.content_libraries.api import create_library_v2_zip
 
     # Get user object for backup API
     user_obj = User.objects.filter(username=user).first()
diff --git a/openedx/core/djangoapps/content_libraries/api/__init__.py b/openedx/core/djangoapps/content_libraries/api/__init__.py
index 5f7db8b17f72..f6936f130023 100644
--- a/openedx/core/djangoapps/content_libraries/api/__init__.py
+++ b/openedx/core/djangoapps/content_libraries/api/__init__.py
@@ -1,6 +1,7 @@
 """
 Python API for working with content libraries
 """
+from .backup import *
 from .block_metadata import *
 from .collections import *
 from .container_metadata import *
diff --git a/openedx/core/djangoapps/content_libraries/api/backup.py b/openedx/core/djangoapps/content_libraries/api/backup.py
new file mode 100644
index 000000000000..4aa2589c2fb2
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/api/backup.py
@@ -0,0 +1,41 @@
+"""
+Public API for content library backup (zip export) utilities.
+"""
+from __future__ import annotations
+
+import os
+from datetime import datetime
+from tempfile import mkdtemp
+
+from django.conf import settings
+from django.utils.text import slugify
+from opaque_keys.edx.locator import LibraryLocatorV2
+from path import Path
+
+from openedx_content.api import create_zip_file as create_lib_zip_file
+
+__all__ = ["create_library_v2_zip"]
+
+
+def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
+    """
+    Create a zip backup of a v2 library and return ``(temp_dir, zip_file_path)``.
+
+    The caller is responsible for cleaning up ``temp_dir`` when done.
+
+    Args:
+        library_key: LibraryLocatorV2 identifying the library to export.
+        user: User object passed to the backup API.
+
+    Returns:
+        A tuple of ``(temp_dir as Path, zip_file_path as str)``.
+    """
+    root_dir = Path(mkdtemp())
+    sanitized_lib_key = str(library_key).replace(":", "-")
+    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
+    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
+    filename = f'{sanitized_lib_key}-{timestamp}.zip'
+    file_path = os.path.join(root_dir, filename)
+    origin_server = getattr(settings, 'CMS_BASE', None)
+    create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
+    return root_dir, file_path
diff --git a/openedx/core/djangoapps/content_libraries/tasks.py b/openedx/core/djangoapps/content_libraries/tasks.py
index 6e0d871c04e1..6375c30097bc 100644
--- a/openedx/core/djangoapps/content_libraries/tasks.py
+++ b/openedx/core/djangoapps/content_libraries/tasks.py
@@ -19,20 +19,17 @@
 from io import StringIO
 import logging
 import os
-from datetime import datetime
-from tempfile import mkdtemp, NamedTemporaryFile
+from tempfile import NamedTemporaryFile
 import json
 import shutil
 
 from django.core.files.base import ContentFile
 from django.contrib.auth import get_user_model
 from django.core.serializers.json import DjangoJSONEncoder
-from django.conf import settings
 from celery import shared_task
 from celery.utils.log import get_task_logger
 from celery_utils.logged_task import LoggedTask
 from django.core.files import File
-from django.utils.text import slugify
 from edx_django_utils.monitoring import (
     set_code_owner_attribute,
     set_code_owner_attribute_from_module,
@@ -58,9 +55,7 @@
     LIBRARY_CONTAINER_UPDATED
 )
 from openedx_content import api as content_api
-from openedx_content.api import create_zip_file as create_lib_zip_file
 from openedx_content.models_api import DraftChangeLog, PublishLog
-from path import Path
 from user_tasks.models import UserTaskArtifact
 from user_tasks.tasks import UserTask, UserTaskStatus
 from xblock.fields import Scope
@@ -76,6 +71,7 @@
 from cms.djangoapps.contentstore.storage import course_import_export_storage
 
 from . import api
+from .api import create_library_v2_zip
 from .models import ContentLibraryBlockImportTask
 
 log = logging.getLogger(__name__)
@@ -508,30 +504,6 @@ def _copy_overrides(
     store.update_item(dest_block, user_id)
 
 
-def create_library_v2_zip(library_key: LibraryLocatorV2, user: User) -> tuple:
-    """
-    Create a zip backup of a v2 library and return ``(temp_dir, zip_file_path)``.
-
-    The caller is responsible for cleaning up ``temp_dir`` when done.
-
-    Args:
-        library_key: LibraryLocatorV2 identifying the library to export.
-        user: User object passed to the backup API.
-
-    Returns:
-        A tuple of ``(temp_dir as Path, zip_file_path as str)``.
-    """
-    root_dir = Path(mkdtemp())
-    sanitized_lib_key = str(library_key).replace(":", "-")
-    sanitized_lib_key = slugify(sanitized_lib_key, allow_unicode=True)
-    timestamp = datetime.now().strftime("%Y-%m-%d-%H%M%S")
-    filename = f'{sanitized_lib_key}-{timestamp}.zip'
-    file_path = os.path.join(root_dir, filename)
-    origin_server = getattr(settings, 'CMS_BASE', None)
-    create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
-    return root_dir, file_path
-
-
 class LibraryBackupTask(UserTask):  # pylint: disable=abstract-method
     """
     Base class for tasks related with Library backup functionality.

From a63eacd484ab90795b57efcd7d416d0b8c40ed5f Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Mon, 16 Mar 2026 16:24:43 +0500
Subject: [PATCH 4/8] fix: move export_library_v2_to_zip to backup file as well

---
 .../contentstore/git_export_utils.py          | 44 +-----------------
 .../content_libraries/api/backup.py           | 45 ++++++++++++++++++-
 .../djangoapps/content_libraries/tasks.py     |  3 +-
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index ab12c269670c..f38c67cf6e06 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -6,9 +6,7 @@
 
 import logging
 import os
-import shutil
 import subprocess
-import zipfile
 from urllib.parse import urlparse
 
 from django.conf import settings
@@ -17,6 +15,7 @@
 from django.utils.translation import gettext_lazy as _
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
+from openedx.core.djangoapps.content_libraries.api.backup import export_library_v2_to_zip
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml_exporter import export_course_to_xml, export_library_to_xml
@@ -69,47 +68,6 @@ def cmd_log(cmd, cwd):
     return output
 
 
-def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
-    """
-    Export a v2 library using the backup API.
-
-    V2 libraries are stored in Learning Core and use a zip-based backup mechanism.
-    This function creates a zip backup and extracts it to the specified directory.
-
-    Args:
-        library_key: LibraryLocatorV2 for the library to export
-        root_dir: Root directory where library_dir will be created
-        library_dir: Directory name for the exported library content
-        user: Username string for the backup API (optional)
-
-    Raises:
-        Exception: If backup creation or extraction fails
-    """
-    from openedx.core.djangoapps.content_libraries.api import create_library_v2_zip
-
-    # Get user object for backup API
-    user_obj = User.objects.filter(username=user).first()
-    temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
-
-    try:
-        # Target directory for extraction
-        target_dir = os.path.join(root_dir, library_dir)
-
-        # Create target directory if it doesn't exist
-        os.makedirs(target_dir, exist_ok=True)
-
-        # Extract zip contents (will overwrite existing files)
-        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-            zip_ref.extractall(target_dir)
-
-        log.info('Extracted library v2 backup to %s', target_dir)
-
-    finally:
-        # Cleanup temporary files
-        if temp_dir.exists():
-            shutil.rmtree(temp_dir)
-
-
 def export_to_git(content_key, repo, user='', rdir=None):
     """
     Export a course or library to git.
diff --git a/openedx/core/djangoapps/content_libraries/api/backup.py b/openedx/core/djangoapps/content_libraries/api/backup.py
index 4aa2589c2fb2..200d46811284 100644
--- a/openedx/core/djangoapps/content_libraries/api/backup.py
+++ b/openedx/core/djangoapps/content_libraries/api/backup.py
@@ -5,11 +5,13 @@
 
 import os
 from datetime import datetime
+import shutil
 from tempfile import mkdtemp
+import zipfile
 
 from django.conf import settings
 from django.utils.text import slugify
-from opaque_keys.edx.locator import LibraryLocatorV2
+from opaque_keys.edx.locator import LibraryLocatorV2, log
 from path import Path
 
 from openedx_content.api import create_zip_file as create_lib_zip_file
@@ -39,3 +41,44 @@ def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
     origin_server = getattr(settings, 'CMS_BASE', None)
     create_lib_zip_file(lp_key=str(library_key), path=file_path, user=user, origin_server=origin_server)
     return root_dir, file_path
+
+
+def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
+    """
+    Export a v2 library using the backup API.
+
+    V2 libraries are stored in Learning Core and use a zip-based backup mechanism.
+    This function creates a zip backup and extracts it to the specified directory.
+
+    Args:
+        library_key: LibraryLocatorV2 for the library to export
+        root_dir: Root directory where library_dir will be created
+        library_dir: Directory name for the exported library content
+        user: Username string for the backup API (optional)
+
+    Raises:
+        Exception: If backup creation or extraction fails
+    """
+    from cms.djangoapps.contentstore.exams import User
+
+    # Get user object for backup API
+    user_obj = User.objects.filter(username=user).first()
+    temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
+
+    try:
+        # Target directory for extraction
+        target_dir = os.path.join(root_dir, library_dir)
+
+        # Create target directory if it doesn't exist
+        os.makedirs(target_dir, exist_ok=True)
+
+        # Extract zip contents (will overwrite existing files)
+        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+            zip_ref.extractall(target_dir)
+
+        log.info('Extracted library v2 backup to %s', target_dir)
+
+    finally:
+        # Cleanup temporary files
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
diff --git a/openedx/core/djangoapps/content_libraries/tasks.py b/openedx/core/djangoapps/content_libraries/tasks.py
index 6375c30097bc..fb70ce497b4b 100644
--- a/openedx/core/djangoapps/content_libraries/tasks.py
+++ b/openedx/core/djangoapps/content_libraries/tasks.py
@@ -71,7 +71,6 @@
 from cms.djangoapps.contentstore.storage import course_import_export_storage
 
 from . import api
-from .api import create_library_v2_zip
 from .models import ContentLibraryBlockImportTask
 
 log = logging.getLogger(__name__)
@@ -550,7 +549,7 @@ def backup_library(self, user_id: int, library_key_str: str) -> None:
         set_custom_attribute("exporting_started", str(library_key))
 
         user = User.objects.get(id=user_id)
-        _root_dir, file_path = create_library_v2_zip(library_key, user)
+        _root_dir, file_path = api.create_library_v2_zip(library_key, user)
         set_custom_attribute("exporting_completed", str(library_key))
 
         with open(file_path, 'rb') as zipfile:

From d6372e93b3395e4e4a1a4aba54eac801031562d3 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Tue, 17 Mar 2026 15:26:30 +0500
Subject: [PATCH 5/8] fix: lint-import fix

---
 cms/djangoapps/contentstore/git_export_utils.py         | 2 +-
 openedx/core/djangoapps/content_libraries/api/backup.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index f38c67cf6e06..636b6e01bace 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -15,7 +15,7 @@
 from django.utils.translation import gettext_lazy as _
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
-from openedx.core.djangoapps.content_libraries.api.backup import export_library_v2_to_zip
+from openedx.core.djangoapps.content_libraries.api import export_library_v2_to_zip
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml_exporter import export_course_to_xml, export_library_to_xml
diff --git a/openedx/core/djangoapps/content_libraries/api/backup.py b/openedx/core/djangoapps/content_libraries/api/backup.py
index 200d46811284..39dc26c7e072 100644
--- a/openedx/core/djangoapps/content_libraries/api/backup.py
+++ b/openedx/core/djangoapps/content_libraries/api/backup.py
@@ -10,13 +10,14 @@
 import zipfile
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.utils.text import slugify
 from opaque_keys.edx.locator import LibraryLocatorV2, log
 from path import Path
 
 from openedx_content.api import create_zip_file as create_lib_zip_file
 
-__all__ = ["create_library_v2_zip"]
+__all__ = ["create_library_v2_zip", "export_library_v2_to_zip"]
 
 
 def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
@@ -59,10 +60,8 @@ def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
     Raises:
         Exception: If backup creation or extraction fails
     """
-    from cms.djangoapps.contentstore.exams import User
-
     # Get user object for backup API
-    user_obj = User.objects.filter(username=user).first()
+    user_obj = get_user_model().objects.filter(username=user).first()
     temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
 
     try:

From 26ccb6a35a7f48aef7ef70bd305803ea93763756 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Thu, 19 Mar 2026 15:08:42 +0500
Subject: [PATCH 6/8] refactor: export function renamed

---
 .../contentstore/git_export_utils.py           | 15 +++++++--------
 .../djangoapps/content_libraries/api/backup.py | 18 ++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index 636b6e01bace..8a6c8ad5e2ab 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -15,7 +15,7 @@
 from django.utils.translation import gettext_lazy as _
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
-from openedx.core.djangoapps.content_libraries.api import export_library_v2_to_zip
+from openedx.core.djangoapps.content_libraries.api import export_library_v2_to_dir
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml_exporter import export_course_to_xml, export_library_to_xml
@@ -84,16 +84,15 @@ def export_to_git(content_key, repo, user='', rdir=None):
     # pylint: disable=too-many-statements
 
     # Detect content type and select appropriate export function
+    content_type_label = "library"
     is_library_v2 = isinstance(content_key, LibraryLocatorV2)
     if is_library_v2:
         # V2 libraries use backup API with zip extraction
-        export_xml_func = export_library_v2_to_zip
-        content_type_label = "library"
+        content_export_func = export_library_v2_to_dir
     elif isinstance(content_key, LibraryLocator):
-        export_xml_func = export_library_to_xml
-        content_type_label = "library"
+        content_export_func = export_library_to_xml
     else:
-        export_xml_func = export_course_to_xml
+        content_export_func = export_course_to_xml
         content_type_label = "course"
 
     if not GIT_REPO_EXPORT_DIR:
@@ -160,10 +159,10 @@ def export_to_git(content_key, repo, user='', rdir=None):
 
     try:
         if is_library_v2:
-            export_xml_func(content_key, root_dir, content_dir, user)
+            content_export_func(content_key, root_dir, content_dir, user)
         else:
             # V1 libraries and courses: use XML export (no user parameter)
-            export_xml_func(modulestore(), contentstore(), content_key,
+            content_export_func(modulestore(), contentstore(), content_key,
                             root_dir, content_dir)
     except (OSError, AttributeError) as ex:
         log.exception('Failed to export %s', content_type_label)
diff --git a/openedx/core/djangoapps/content_libraries/api/backup.py b/openedx/core/djangoapps/content_libraries/api/backup.py
index 39dc26c7e072..5b9614913950 100644
--- a/openedx/core/djangoapps/content_libraries/api/backup.py
+++ b/openedx/core/djangoapps/content_libraries/api/backup.py
@@ -17,7 +17,7 @@
 
 from openedx_content.api import create_zip_file as create_lib_zip_file
 
-__all__ = ["create_library_v2_zip", "export_library_v2_to_zip"]
+__all__ = ["create_library_v2_zip", "export_library_v2_to_dir"]
 
 
 def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
@@ -44,17 +44,18 @@ def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
     return root_dir, file_path
 
 
-def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
+def export_library_v2_to_dir(library_key, root_dir, library_dir, user=None):
     """
-    Export a v2 library using the backup API.
+    Export a v2 library to a directory by creating a zip backup and extracting it.
 
     V2 libraries are stored in Learning Core and use a zip-based backup mechanism.
-    This function creates a zip backup and extracts it to the specified directory.
+    This function creates a temporary zip backup, extracts its contents into
+    ``library_dir`` under ``root_dir``, then cleans up the temporary zip.
 
     Args:
         library_key: LibraryLocatorV2 for the library to export
         root_dir: Root directory where library_dir will be created
-        library_dir: Directory name for the exported library content
+        library_dir: Directory name under root_dir to extract the library into
         user: Username string for the backup API (optional)
 
     Raises:
@@ -65,19 +66,12 @@ def export_library_v2_to_zip(library_key, root_dir, library_dir, user=None):
     temp_dir, zip_path = create_library_v2_zip(library_key, user_obj)
 
     try:
-        # Target directory for extraction
         target_dir = os.path.join(root_dir, library_dir)
-
-        # Create target directory if it doesn't exist
         os.makedirs(target_dir, exist_ok=True)
-
         # Extract zip contents (will overwrite existing files)
         with zipfile.ZipFile(zip_path, 'r') as zip_ref:
             zip_ref.extractall(target_dir)
-
         log.info('Extracted library v2 backup to %s', target_dir)
-
     finally:
-        # Cleanup temporary files
         if temp_dir.exists():
             shutil.rmtree(temp_dir)

From 623471a72bfcb8f3b88fd394fbabad197a520f39 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Thu, 19 Mar 2026 15:13:32 +0500
Subject: [PATCH 7/8] test: re-run tests


From 9c6d943ef3ed2c23b0fb954b84fa2403ea714f50 Mon Sep 17 00:00:00 2001
From: Muhammad Arslan Abdul Rauf <arslan.abdulrauf@arbisoft.com>
Date: Thu, 26 Mar 2026 17:17:49 +0500
Subject: [PATCH 8/8] test: content library export tests added

---
 .../contentstore/git_export_utils.py          |  4 +-
 .../commands/tests/test_git_export.py         | 55 +++++++++++-
 .../content_libraries/api/backup.py           |  4 +-
 .../content_libraries/api/tests/__init__.py   |  0
 .../api/tests/test_backup.py                  | 89 +++++++++++++++++++
 5 files changed, 147 insertions(+), 5 deletions(-)
 create mode 100644 openedx/core/djangoapps/content_libraries/api/tests/__init__.py
 create mode 100644 openedx/core/djangoapps/content_libraries/api/tests/test_backup.py

diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py
index 8a6c8ad5e2ab..a2c292a34c23 100644
--- a/cms/djangoapps/contentstore/git_export_utils.py
+++ b/cms/djangoapps/contentstore/git_export_utils.py
@@ -15,7 +15,7 @@
 from django.utils.translation import gettext_lazy as _
 from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
 
-from openedx.core.djangoapps.content_libraries.api import export_library_v2_to_dir
+from openedx.core.djangoapps.content_libraries.api import extract_library_v2_zip_to_dir
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml_exporter import export_course_to_xml, export_library_to_xml
@@ -88,7 +88,7 @@ def export_to_git(content_key, repo, user='', rdir=None):
     is_library_v2 = isinstance(content_key, LibraryLocatorV2)
     if is_library_v2:
         # V2 libraries use backup API with zip extraction
-        content_export_func = export_library_v2_to_dir
+        content_export_func = extract_library_v2_zip_to_dir
     elif isinstance(content_key, LibraryLocator):
         content_export_func = export_library_to_xml
     else:
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py b/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py
index 8a2334b34375..fb564ad850e8 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_git_export.py
@@ -9,13 +9,14 @@
 import subprocess
 import unittest
 from io import StringIO
+from unittest.mock import patch
 from uuid import uuid4
 
 from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.test.utils import override_settings
-from opaque_keys.edx.locator import CourseLocator
+from opaque_keys.edx.locator import CourseLocator, LibraryLocator, LibraryLocatorV2
 
 import cms.djangoapps.contentstore.git_export_utils as git_export_utils
 from cms.djangoapps.contentstore.git_export_utils import GitExportError
@@ -34,6 +35,9 @@ class TestGitExport(CourseTestCase):
     Excercise the git_export django management command with various inputs.
     """
 
+    LIBRARY_V2_KEY = LibraryLocatorV2(org='TestOrg', slug='test-lib')
+    LIBRARY_V1_KEY = LibraryLocator(org='TestOrg', library='test-lib')
+
     def setUp(self):
         """
         Create/reinitialize bare repo and folders needed
@@ -182,3 +186,52 @@ def test_no_change(self):
         with self.assertRaisesRegex(GitExportError, str(GitExportError.CANNOT_COMMIT)):
             git_export_utils.export_to_git(
                 self.course.id, f'file://{self.bare_repo_dir}')
+
+    @patch('cms.djangoapps.contentstore.git_export_utils.cmd_log', return_value=b'main')
+    @patch('cms.djangoapps.contentstore.git_export_utils.extract_library_v2_zip_to_dir')
+    def test_library_v2_export_selects_correct_function(self, mock_extract, mock_cmd_log):
+        """
+        When ``export_to_git`` is given a LibraryLocatorV2 key it must call
+        ``extract_library_v2_zip_to_dir`` and must not call the v1 XML export
+        functions (``export_library_to_xml`` or ``export_course_to_xml``).
+        cmd_log is mocked so no real git subprocess or repo state is needed.
+        """
+        mock_extract.return_value = None
+        repo_url = f'file://{self.bare_repo_dir}'
+
+        with patch('cms.djangoapps.contentstore.git_export_utils.export_course_to_xml') as mock_course_xml, \
+             patch('cms.djangoapps.contentstore.git_export_utils.export_library_to_xml') as mock_lib_xml:
+            git_export_utils.export_to_git(self.LIBRARY_V2_KEY, repo_url, self.user.username)
+
+        assert mock_extract.call_args[0][0] == self.LIBRARY_V2_KEY
+        mock_course_xml.assert_not_called()
+        mock_lib_xml.assert_not_called()
+
+    @patch('cms.djangoapps.contentstore.git_export_utils.cmd_log', return_value=b'main')
+    @patch('cms.djangoapps.contentstore.git_export_utils.export_library_to_xml')
+    def test_library_v1_export_selects_correct_function(self, mock_lib_xml, mock_cmd_log):
+        """
+        When ``export_to_git`` is given a LibraryLocator (v1) key it must call
+        ``export_library_to_xml`` and must not call ``extract_library_v2_zip_to_dir``.
+        cmd_log is mocked so no real git subprocess or repo state is needed.
+        """
+        mock_lib_xml.return_value = None
+        repo_url = f'file://{self.bare_repo_dir}'
+
+        with patch('cms.djangoapps.contentstore.git_export_utils.extract_library_v2_zip_to_dir') as mock_v2, \
+             patch('cms.djangoapps.contentstore.git_export_utils.export_course_to_xml') as mock_course_xml:
+            git_export_utils.export_to_git(self.LIBRARY_V1_KEY, repo_url, self.user.username)
+
+        assert mock_lib_xml.called
+        mock_v2.assert_not_called()
+        mock_course_xml.assert_not_called()
+
+    @patch('cms.djangoapps.contentstore.git_export_utils.extract_library_v2_zip_to_dir',
+           side_effect=OSError('disk full'))
+    def test_library_v2_export_failure_raises_xml_export_fail(self, mock_extract):
+        """
+        If ``extract_library_v2_zip_to_dir`` raises, ``export_to_git`` should
+        wrap it in ``GitExportError.XML_EXPORT_FAIL``.
+        """
+        with self.assertRaisesRegex(GitExportError, str(GitExportError.XML_EXPORT_FAIL)):
+            git_export_utils.export_to_git(self.LIBRARY_V2_KEY, f'file://{self.bare_repo_dir}')
diff --git a/openedx/core/djangoapps/content_libraries/api/backup.py b/openedx/core/djangoapps/content_libraries/api/backup.py
index 5b9614913950..97a3b3c5bd4c 100644
--- a/openedx/core/djangoapps/content_libraries/api/backup.py
+++ b/openedx/core/djangoapps/content_libraries/api/backup.py
@@ -17,7 +17,7 @@
 
 from openedx_content.api import create_zip_file as create_lib_zip_file
 
-__all__ = ["create_library_v2_zip", "export_library_v2_to_dir"]
+__all__ = ["create_library_v2_zip", "extract_library_v2_zip_to_dir"]
 
 
 def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
@@ -44,7 +44,7 @@ def create_library_v2_zip(library_key: LibraryLocatorV2, user) -> tuple:
     return root_dir, file_path
 
 
-def export_library_v2_to_dir(library_key, root_dir, library_dir, user=None):
+def extract_library_v2_zip_to_dir(library_key, root_dir, library_dir, user=None):
     """
     Export a v2 library to a directory by creating a zip backup and extracting it.
 
diff --git a/openedx/core/djangoapps/content_libraries/api/tests/__init__.py b/openedx/core/djangoapps/content_libraries/api/tests/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/openedx/core/djangoapps/content_libraries/api/tests/test_backup.py b/openedx/core/djangoapps/content_libraries/api/tests/test_backup.py
new file mode 100644
index 000000000000..8947ba40a1dd
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/api/tests/test_backup.py
@@ -0,0 +1,89 @@
+"""
+Tests for content library backup (zip export) utilities.
+"""
+from __future__ import annotations
+
+import shutil
+import tempfile
+import zipfile
+from unittest.mock import MagicMock, patch
+
+import pytest
+from django.test import TestCase
+from opaque_keys.edx.locator import LibraryLocatorV2
+from path import Path
+
+from openedx.core.djangoapps.content_libraries.api.backup import extract_library_v2_zip_to_dir
+
+
+LIBRARY_KEY = LibraryLocatorV2(org='TestOrg', slug='test-lib')
+
+
+class TestExtractLibraryV2ZipToDir(TestCase):
+    """
+    Tests for ``extract_library_v2_zip_to_dir``.
+    """
+
+    def _make_zip_in_temp_dir(self, contents=None):
+        """
+        Helper: create a real temp dir + zip file and return (temp_dir_path, zip_path).
+        ``contents`` is a dict of {filename: bytes} to write into the zip.
+        """
+        temp_dir = Path(tempfile.mkdtemp())
+        zip_path = str(temp_dir / 'library.zip')
+        with zipfile.ZipFile(zip_path, 'w') as zf:
+            for name, data in (contents or {'data.xml': b'<library/>'}).items():
+                zf.writestr(name, data)
+        return temp_dir, zip_path
+
+    @patch('openedx.core.djangoapps.content_libraries.api.backup.get_user_model')
+    @patch('openedx.core.djangoapps.content_libraries.api.backup.create_library_v2_zip')
+    def test_successful_extraction(self, mock_create_zip, mock_get_user_model):
+        """
+        On a successful call the function should:
+        - resolve the username to a user object via the user model,
+        - pass that user object to ``create_library_v2_zip``,
+        - create the target directory if it does not already exist,
+        - extract the zip contents into <root_dir>/<library_dir>,
+        - clean up the temporary zip directory.
+        """
+        root_dir = Path(tempfile.mkdtemp())
+        temp_zip_dir, zip_path = self._make_zip_in_temp_dir({'content.xml': b'<lib/>'})
+        mock_create_zip.return_value = (temp_zip_dir, zip_path)
+        mock_user = MagicMock()
+        mock_get_user_model.return_value.objects.filter.return_value.first.return_value = mock_user
+
+        try:
+            target = root_dir / 'my-library'
+            assert not target.exists(), "Target dir should not exist before the call"
+
+            extract_library_v2_zip_to_dir(LIBRARY_KEY, str(root_dir), 'my-library', user='testuser')
+
+            mock_get_user_model.return_value.objects.filter.assert_called_once_with(username='testuser')
+            mock_create_zip.assert_called_once_with(LIBRARY_KEY, mock_user)
+            assert target.isdir(), "Target dir should have been created"
+            assert (target / 'content.xml').exists(), "Zip content should be extracted"
+            assert not temp_zip_dir.exists(), "Temp zip dir should have been removed"
+        finally:
+            shutil.rmtree(root_dir, ignore_errors=True)
+            shutil.rmtree(temp_zip_dir, ignore_errors=True)
+
+    @patch('openedx.core.djangoapps.content_libraries.api.backup.get_user_model')
+    @patch('openedx.core.djangoapps.content_libraries.api.backup.create_library_v2_zip')
+    def test_temp_dir_cleaned_up_even_on_extraction_error(self, mock_create_zip, mock_get_user_model):
+        """
+        The temporary directory must be cleaned up even when extraction raises.
+        """
+        root_dir = Path(tempfile.mkdtemp())
+        temp_zip_dir, zip_path = self._make_zip_in_temp_dir()
+        mock_create_zip.return_value = (temp_zip_dir, zip_path)
+        mock_get_user_model.return_value.objects.filter.return_value.first.return_value = None
+
+        try:
+            with patch('zipfile.ZipFile.extractall', side_effect=OSError('disk full')):
+                with pytest.raises(OSError):
+                    extract_library_v2_zip_to_dir(LIBRARY_KEY, str(root_dir), 'my-library', user=None)
+            assert not temp_zip_dir.exists(), "Temp dir should be cleaned up on error"
+        finally:
+            shutil.rmtree(root_dir, ignore_errors=True)
+            shutil.rmtree(temp_zip_dir, ignore_errors=True)