apache-airflow-providers-git 0.0.8__py3-none-any.whl → 0.0.9__py3-none-any.whl

airflow/providers/git/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.8"
+__version__ = "0.0.9"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "3.0.0"

airflow/providers/git/bundles/git.py

@@ -17,13 +17,15 @@
 from __future__ import annotations
 
 import os
+import shutil
 from contextlib import nullcontext
 from pathlib import Path
 from urllib.parse import urlparse
 
 import structlog
 from git import Repo
-from git.exc import BadName, GitCommandError, NoSuchPathError
+from git.exc import BadName, GitCommandError, InvalidGitRepositoryError, NoSuchPathError
+from tenacity import retry, retry_if_exception_type, stop_after_attempt
 
 from airflow.dag_processing.bundles.base import BaseDagBundle
 from airflow.exceptions import AirflowException
@@ -91,11 +93,21 @@ class GitDagBundle(BaseDagBundle):
         with self.lock():
             cm = self.hook.configure_hook_env() if self.hook else nullcontext()
             with cm:
-                self._clone_bare_repo_if_required()
+                try:
+                    self._clone_bare_repo_if_required()
+                except GitCommandError as e:
+                    raise RuntimeError("Error cloning repository") from e
+                except InvalidGitRepositoryError as e:
+                    raise RuntimeError(f"Invalid git repository at {self.bare_repo_path}") from e
                 self._ensure_version_in_bare_repo()
             self.bare_repo.close()
 
-            self._clone_repo_if_required()
+            try:
+                self._clone_repo_if_required()
+            except GitCommandError as e:
+                raise RuntimeError("Error cloning repository") from e
+            except InvalidGitRepositoryError as e:
+                raise RuntimeError(f"Invalid git repository at {self.repo_path}") from e
             self.repo.git.checkout(self.tracking_ref)
             self._log.debug("bundle initialize", version=self.version)
             if self.version:
@@ -113,36 +125,65 @@ class GitDagBundle(BaseDagBundle):
         self._initialize()
         super().initialize()
 
+    @retry(
+        retry=retry_if_exception_type((InvalidGitRepositoryError, GitCommandError)),
+        stop=stop_after_attempt(2),
+        reraise=True,
+    )
     def _clone_repo_if_required(self) -> None:
-        if not os.path.exists(self.repo_path):
-            self._log.info("Cloning repository", repo_path=self.repo_path, bare_repo_path=self.bare_repo_path)
-            try:
+        try:
+            if not os.path.exists(self.repo_path):
+                self._log.info(
+                    "Cloning repository", repo_path=self.repo_path, bare_repo_path=self.bare_repo_path
+                )
                 Repo.clone_from(
                     url=self.bare_repo_path,
                     to_path=self.repo_path,
                 )
-            except NoSuchPathError as e:
-                # Protection should the bare repo be removed manually
-                raise AirflowException("Repository path: %s not found", self.bare_repo_path) from e
-        else:
-            self._log.debug("repo exists", repo_path=self.repo_path)
-        self.repo = Repo(self.repo_path)
-
+            else:
+                self._log.debug("repo exists", repo_path=self.repo_path)
+            self.repo = Repo(self.repo_path)
+        except NoSuchPathError as e:
+            # Protection should the bare repo be removed manually
+            raise AirflowException("Repository path: %s not found", self.bare_repo_path) from e
+        except (InvalidGitRepositoryError, GitCommandError) as e:
+            self._log.warning(
+                "Repository clone/open failed, cleaning up and retrying",
+                repo_path=self.repo_path,
+                exc=e,
+            )
+            if os.path.exists(self.repo_path):
+                shutil.rmtree(self.repo_path)
+            raise
+
+    @retry(
+        retry=retry_if_exception_type((InvalidGitRepositoryError, GitCommandError)),
+        stop=stop_after_attempt(2),
+        reraise=True,
+    )
     def _clone_bare_repo_if_required(self) -> None:
         if not self.repo_url:
             raise AirflowException(f"Connection {self.git_conn_id} doesn't have a host url")
-        if not os.path.exists(self.bare_repo_path):
-            self._log.info("Cloning bare repository", bare_repo_path=self.bare_repo_path)
-            try:
+
+        try:
+            if not os.path.exists(self.bare_repo_path):
+                self._log.info("Cloning bare repository", bare_repo_path=self.bare_repo_path)
                 Repo.clone_from(
                     url=self.repo_url,
                     to_path=self.bare_repo_path,
                     bare=True,
                     env=self.hook.env if self.hook else None,
                 )
-            except GitCommandError as e:
-                raise AirflowException("Error cloning repository") from e
-        self.bare_repo = Repo(self.bare_repo_path)
+            self.bare_repo = Repo(self.bare_repo_path)
+        except (InvalidGitRepositoryError, GitCommandError) as e:
+            self._log.warning(
+                "Bare repository clone/open failed, cleaning up and retrying",
+                bare_repo_path=self.bare_repo_path,
+                exc=e,
+            )
+            if os.path.exists(self.bare_repo_path):
+                shutil.rmtree(self.bare_repo_path)
+            raise
 
     def _ensure_version_in_bare_repo(self) -> None:
         if not self.version:

airflow/providers/git/hooks/git.py

@@ -25,7 +25,7 @@ import tempfile
 from typing import Any
 
 from airflow.exceptions import AirflowException
-from airflow.providers.git.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 log = logging.getLogger(__name__)
 

airflow/providers/git/version_compat.py

@@ -35,9 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]

{apache_airflow_providers_git-0.0.8.dist-info → apache_airflow_providers_git-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-git
-Version: 0.0.8
+Version: 0.0.9
 Summary: Provider package apache-airflow-providers-git for Apache Airflow
 Keywords: airflow-provider,git,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -21,10 +21,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=3.0.0
+Requires-Dist: apache-airflow-providers-common-compat>=1.8.0
 Requires-Dist: GitPython>=3.1.44
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.8/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.8
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.9/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.9
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -55,7 +56,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-git``
 
-Release: ``0.0.8``
+Release: ``0.0.9``
 
 
 `Distributed version control system (GIT) <https://git-scm.com/>`__
@@ -68,7 +69,7 @@ This is a provider package for ``git`` provider. All classes for this provider p
 are in ``airflow.providers.git`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.8/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.9/>`_.
 
 Installation
 ------------
@@ -82,13 +83,33 @@ The package supports the following python versions: 3.10,3.11,3.12,3.13
 Requirements
 ------------
 
-==================  ==================
-PIP package         Version required
-==================  ==================
-``apache-airflow``  ``>=3.0.0``
-``GitPython``       ``>=3.1.44``
-==================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=3.0.0``
+``apache-airflow-providers-common-compat``  ``>=1.8.0``
+``GitPython``                               ``>=3.1.44``
+==========================================  ==================
+
+Cross provider package dependencies
+-----------------------------------
+
+Those are dependencies that might be needed in order to use all the features of the package.
+You need to install the specified providers in order to use them.
+
+You can install such cross-provider dependencies when installing from PyPI. For example:
+
+.. code-block:: bash
+
+    pip install apache-airflow-providers-git[common.compat]
+
+
+==================================================================================================================  =================
+Dependent package                                                                                                   Extra
+==================================================================================================================  =================
+`apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
+==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.8/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.9/changelog.html>`_.
 

apache_airflow_providers_git-0.0.9.dist-info/RECORD

@@ -0,0 +1,12 @@
+airflow/providers/git/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
+airflow/providers/git/__init__.py,sha256=1dwM-4yAxdIshbRngFq3J3tU-CkjzDqfjL4e4OsMy68,1490
+airflow/providers/git/get_provider_info.py,sha256=6xC_Jru3CMrhO7r5aX03J4HR6Jl62rp9BWVcLKFjxQQ,1809
+airflow/providers/git/version_compat.py,sha256=cmeoGMcTp0kiFa3GKZlQh31_kMk7UX9nOX8sYyGtuFg,1665
+airflow/providers/git/bundles/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/git/bundles/git.py,sha256=GbdgiHCu74sYnXN-qnloOkoVupiwYWfMPVshIymYyKs,12252
+airflow/providers/git/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/git/hooks/git.py,sha256=RNEdKVqwjHOQsA6jjXMPkogJJf9lJASj5hXTdK4idgo,4015
+apache_airflow_providers_git-0.0.9.dist-info/entry_points.txt,sha256=k9QR9MAaAm9yDsRDBIK3QOt5Fos3fBCqCngNFPaJnKs,99
+apache_airflow_providers_git-0.0.9.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_git-0.0.9.dist-info/METADATA,sha256=xr5SnRyY3t4NWEK-enpQWgWFM3EHtbfQIoDGB6PQDSk,5167
+apache_airflow_providers_git-0.0.9.dist-info/RECORD,,

apache_airflow_providers_git-0.0.8.dist-info/RECORD

@@ -1,12 +0,0 @@
-airflow/providers/git/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-airflow/providers/git/__init__.py,sha256=f7FvYWLzw8Jz2nT68590fHdPjL-74IFIlU0hvg_HiQE,1490
-airflow/providers/git/get_provider_info.py,sha256=6xC_Jru3CMrhO7r5aX03J4HR6Jl62rp9BWVcLKFjxQQ,1809
-airflow/providers/git/version_compat.py,sha256=wu5478Lfl32vjsmb_tx5zQBL2aVynAVK26XqF-5Wou0,1827
-airflow/providers/git/bundles/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/git/bundles/git.py,sha256=xnaKQu78WiJH4Mp7g3A6aMxpnLKWMCzHt-5CESH0Pnw,10565
-airflow/providers/git/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/git/hooks/git.py,sha256=UxH-hPlmX1VphZey1svhJYUhgK1zEWsryh363k_s008,4016
-apache_airflow_providers_git-0.0.8.dist-info/entry_points.txt,sha256=k9QR9MAaAm9yDsRDBIK3QOt5Fos3fBCqCngNFPaJnKs,99
-apache_airflow_providers_git-0.0.8.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_git-0.0.8.dist-info/METADATA,sha256=igqMZhi8Qb7I598xy0Oyea4tu6ntfrFTfhqxtzNeYlE,3840
-apache_airflow_providers_git-0.0.8.dist-info/RECORD,,