apache-airflow-providers-snowflake 6.3.0rc1__tar.gz → 6.3.0rc2__tar.gz

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-snowflake
-Version: 6.3.0rc1
+Version: 6.3.0rc2
 Summary: Provider package apache-airflow-providers-snowflake for Apache Airflow
 Keywords: airflow-provider,snowflake,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -28,7 +28,7 @@ Requires-Dist: pyarrow>=14.0.1
 Requires-Dist: snowflake-connector-python>=3.7.1
 Requires-Dist: snowflake-sqlalchemy>=1.4.0
 Requires-Dist: snowflake-snowpark-python>=1.17.0;python_version<'3.12'
-Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
+Requires-Dist: apache-airflow-providers-openlineage>=2.3.0rc1 ; extra == "openlineage"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
 Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-snowflake/6.3.0/changelog.html
 Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-snowflake/6.3.0

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/docs/changelog.rst

@@ -53,9 +53,11 @@ Features
 Bug Fixes
 ~~~~~~~~~
 
-* ``Fix SnowflakeSqlApiHook backwards compatibility for get_oauth_token method (#49482)``
 * ``make 'private_key_content' in snowflake connection to be a base64 encoded string (#49467)``
+* ``Fix SnowflakeSqlApiHook backwards compatibility for get_oauth_token method (#49482)``
 * ``Fix mypy for get_oauth_token signature in SnowflakeSqlApiHook (#49449)``
+* ``Fix infinite recursive call of _get_conn_params while getting oauth token from snowflake (#50344)``
+* ``Fix: adjust dag_run extraction for Airflow 3 in OL utils (#50346)``
 
 Misc
 ~~~~
@@ -64,10 +66,13 @@ Misc
 * ``Bump min Airflow version in providers to 2.10 (#49843)``
 * ``enhance: logs SQL before execution in 'snowflake' and 'databricks_sql' (#48942)``
 * ``chore: import paths use the stable functions (#49460)``
+* ``add root parent information to OpenLineage events (#49237)``
 
 .. Below changes are excluded from the changelog. Move them to
    appropriate section above if needed. Do not delete the lines(!):
    * ``Avoid committing history for providers (#49907)``
+   * ``Update description of provider.yaml dependencies (#50231)``
+   * ``Prepare ad hoc release for providers May 2025 (#50166)``
 
 6.2.2
 .....

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/provider.yaml

@@ -23,7 +23,10 @@ description: |
 
 state: ready
 source-date-epoch: 1746344752
-# note that those versions are maintained by release manager - do not update them manually
+# Note that those versions are maintained by release manager - do not update them manually
+# with the exception of case where other provider in sources has >= new provider version.
+# In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
+# to be done in the same PR
 versions:
   - 6.3.0
   - 6.2.2

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-snowflake"
-version = "6.3.0rc1"
+version = "6.3.0rc2"
 description = "Provider package apache-airflow-providers-snowflake for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -75,7 +75,7 @@ dependencies = [
 # Any change in the dependencies is preserved when the file is regenerated
 [project.optional-dependencies]
 "openlineage" = [
-    "apache-airflow-providers-openlineage"
+    "apache-airflow-providers-openlineage>=2.3.0rc1"
 ]
 
 [dependency-groups]

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/src/airflow/providers/snowflake/hooks/snowflake.py

@@ -191,7 +191,7 @@ class SnowflakeHook(DbApiHook):
 
     @property
     def account_identifier(self) -> str:
-        """Returns snowflake account identifier."""
+        """Get snowflake account identifier."""
         conn_config = self._get_conn_params
         account_identifier = f"https://{conn_config['account']}"
 
@@ -205,7 +205,7 @@ class SnowflakeHook(DbApiHook):
         if conn_config is None:
             conn_config = self._get_conn_params
 
-        url = f"{self.account_identifier}.snowflakecomputing.com/oauth/token-request"
+        url = f"https://{conn_config['account']}.snowflakecomputing.com/oauth/token-request"
 
         data = {
             "grant_type": "refresh_token",

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/src/airflow/providers/snowflake/utils/openlineage.py

@@ -97,6 +97,28 @@ def fix_snowflake_sqlalchemy_uri(uri: str) -> str:
     return urlunparse((parts.scheme, hostname, parts.path, parts.params, parts.query, parts.fragment))
 
 
+def _get_logical_date(task_instance):
+    # todo: remove when min airflow version >= 3.0
+    if AIRFLOW_V_3_0_PLUS:
+        dagrun = task_instance.get_template_context()["dag_run"]
+        return dagrun.logical_date or dagrun.run_after
+
+    if hasattr(task_instance, "logical_date"):
+        date = task_instance.logical_date
+    else:
+        date = task_instance.execution_date
+
+    return date
+
+
+def _get_dag_run_clear_number(task_instance):
+    # todo: remove when min airflow version >= 3.0
+    if AIRFLOW_V_3_0_PLUS:
+        dagrun = task_instance.get_template_context()["dag_run"]
+        return dagrun.clear_number
+    return task_instance.dag_run.clear_number
+
+
 # todo: move this run_id logic into OpenLineage's listener to avoid differences
 def _get_ol_run_id(task_instance) -> str:
     """
@@ -108,29 +130,27 @@ def _get_ol_run_id(task_instance) -> str:
     """
     from airflow.providers.openlineage.plugins.adapter import OpenLineageAdapter
 
-    def _get_logical_date():
-        # todo: remove when min airflow version >= 3.0
-        if AIRFLOW_V_3_0_PLUS:
-            dagrun = task_instance.get_template_context()["dag_run"]
-            return dagrun.logical_date or dagrun.run_after
-
-        if hasattr(task_instance, "logical_date"):
-            date = task_instance.logical_date
-        else:
-            date = task_instance.execution_date
-
-        return date
-
     # Generate same OL run id as is generated for current task instance
     return OpenLineageAdapter.build_task_instance_run_id(
         dag_id=task_instance.dag_id,
         task_id=task_instance.task_id,
-        logical_date=_get_logical_date(),
+        logical_date=_get_logical_date(task_instance),
         try_number=task_instance.try_number,
         map_index=task_instance.map_index,
     )
 
 
+# todo: move this run_id logic into OpenLineage's listener to avoid differences
+def _get_ol_dag_run_id(task_instance) -> str:
+    from airflow.providers.openlineage.plugins.adapter import OpenLineageAdapter
+
+    return OpenLineageAdapter.build_dag_run_id(
+        dag_id=task_instance.dag_id,
+        logical_date=_get_logical_date(task_instance),
+        clear_number=_get_dag_run_clear_number(task_instance),
+    )
+
+
 def _get_parent_run_facet(task_instance):
     """
     Retrieve the ParentRunFacet associated with a specific Airflow task instance.
@@ -144,6 +164,7 @@ def _get_parent_run_facet(task_instance):
     from airflow.providers.openlineage.conf import namespace
 
     parent_run_id = _get_ol_run_id(task_instance)
+    root_parent_run_id = _get_ol_dag_run_id(task_instance)
 
     return parent_run.ParentRunFacet(
         run=parent_run.Run(runId=parent_run_id),
@@ -151,6 +172,13 @@ def _get_parent_run_facet(task_instance):
             namespace=namespace(),
             name=f"{task_instance.dag_id}.{task_instance.task_id}",
         ),
+        root=parent_run.Root(
+            run=parent_run.RootRun(runId=root_parent_run_id),
+            job=parent_run.RootJob(
+                name=task_instance.dag_id,
+                namespace=namespace(),
+            ),
+        ),
     )
 
 
@@ -218,7 +246,7 @@ def _create_snowflake_event_pair(
     return start, end
 
 
-@require_openlineage_version(provider_min_version="2.0.0")
+@require_openlineage_version(provider_min_version="2.3.0")
 def emit_openlineage_events_for_snowflake_queries(
     query_ids: list[str],
     query_source_namespace: str,

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/tests/unit/snowflake/hooks/test_snowflake.py

@@ -860,7 +860,7 @@ class TestPytestSnowflakeHook:
         hook.get_openlineage_database_info = lambda x: mock.MagicMock(authority="auth", scheme="scheme")
 
         expected_err = (
-            "OpenLineage provider version `1.99.0` is lower than required `2.0.0`, "
+            "OpenLineage provider version `1.99.0` is lower than required `2.3.0`, "
             "skipping function `emit_openlineage_events_for_snowflake_queries` execution"
         )
         with pytest.raises(AirflowOptionalProviderFeatureException, match=expected_err):
@@ -908,7 +908,7 @@ class TestPytestSnowflakeHook:
         hook = SnowflakeHook(snowflake_conn_id="mock_conn_id")
         hook.get_oauth_token(conn_config=CONN_PARAMS_OAUTH)
         requests_post.assert_called_once_with(
-            f"https://{CONN_PARAMS_OAUTH['account']}.{CONN_PARAMS_OAUTH['region']}.snowflakecomputing.com/oauth/token-request",
+            f"https://{CONN_PARAMS_OAUTH['account']}.snowflakecomputing.com/oauth/token-request",
             data={
                 "grant_type": "refresh_token",
                 "refresh_token": CONN_PARAMS_OAUTH["refresh_token"],

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/tests/unit/snowflake/hooks/test_snowflake_sql_api.py

@@ -368,7 +368,7 @@ class TestSnowflakeSqlApiHook:
         with pytest.warns(expected_warning=AirflowProviderDeprecationWarning):
             hook.get_oauth_token(CONN_PARAMS_OAUTH)
         requests_post.assert_called_once_with(
-            f"https://{CONN_PARAMS_OAUTH['account']}.{CONN_PARAMS_OAUTH['region']}.snowflakecomputing.com/oauth/token-request",
+            f"https://{CONN_PARAMS_OAUTH['account']}.snowflakecomputing.com/oauth/token-request",
             data={
                 "grant_type": "refresh_token",
                 "refresh_token": CONN_PARAMS_OAUTH["refresh_token"],

{apache_airflow_providers_snowflake-6.3.0rc1 → apache_airflow_providers_snowflake-6.3.0rc2}/tests/unit/snowflake/utils/test_openlineage.py

@@ -304,9 +304,10 @@ def test_create_snowflake_event_pair_success(mock_generate_uuid, is_successful):
     assert start_event.job == end_event.job
 
 
+@mock.patch("importlib.metadata.version", return_value="2.3.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 @mock.patch("airflow.utils.timezone.utcnow")
-def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_generate_uuid):
+def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_generate_uuid, mock_version):
     fake_uuid = "01958e68-03a2-79e3-9ae9-26865cc40e2f"
     mock_generate_uuid.return_value = fake_uuid
 
@@ -316,6 +317,7 @@ def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_
     query_ids = ["query1", "query2", "query3"]
     original_query_ids = copy.deepcopy(query_ids)
     logical_date = timezone.datetime(2025, 1, 1)
+    mock_dagrun = mock.MagicMock(logical_date=logical_date, clear_number=0)
     mock_ti = mock.MagicMock(
         dag_id="dag_id",
         task_id="task_id",
@@ -323,8 +325,9 @@ def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_
         try_number=1,
         logical_date=logical_date,
         state=TaskInstanceState.FAILED,  # This will be query default state if no metadata found
+        dag_run=mock_dagrun,
     )
-    mock_ti.get_template_context.return_value = {"dag_run": mock.MagicMock(logical_date=logical_date)}
+    mock_ti.get_template_context.return_value = {"dag_run": mock_dagrun}
 
     fake_metadata = {
         "query1": {
@@ -387,6 +390,10 @@ def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_
             "parent": parent_run.ParentRunFacet(
                 run=parent_run.Run(runId="01941f29-7c00-7087-8906-40e512c257bd"),
                 job=parent_run.Job(namespace=namespace(), name="dag_id.task_id"),
+                root=parent_run.Root(
+                    run=parent_run.RootRun(runId="01941f29-7c00-743e-b109-28b18d0a19c5"),
+                    job=parent_run.RootJob(namespace=namespace(), name="dag_id"),
+                ),
             ),
             "custom_run": "value_run",
         }
@@ -535,9 +542,12 @@ def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_
         assert fake_client.emit.call_args_list == expected_calls
 
 
+@mock.patch("importlib.metadata.version", return_value="2.3.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 @mock.patch("airflow.utils.timezone.utcnow")
-def test_emit_openlineage_events_for_snowflake_queries_without_hook(mock_now, mock_generate_uuid):
+def test_emit_openlineage_events_for_snowflake_queries_without_hook(
+    mock_now, mock_generate_uuid, mock_version
+):
     fake_uuid = "01958e68-03a2-79e3-9ae9-26865cc40e2f"
     mock_generate_uuid.return_value = fake_uuid
 
@@ -554,8 +564,11 @@ def test_emit_openlineage_events_for_snowflake_queries_without_hook(mock_now, mo
         try_number=1,
         logical_date=logical_date,
         state=TaskInstanceState.SUCCESS,  # This will be query default state if no metadata found
+        dag_run=mock.MagicMock(logical_date=logical_date, clear_number=0),
     )
-    mock_ti.get_template_context.return_value = {"dag_run": mock.MagicMock(logical_date=logical_date)}
+    mock_ti.get_template_context.return_value = {
+        "dag_run": mock.MagicMock(logical_date=logical_date, clear_number=0)
+    }
 
     additional_run_facets = {"custom_run": "value_run"}
     additional_job_facets = {"custom_job": "value_job"}
@@ -593,6 +606,10 @@ def test_emit_openlineage_events_for_snowflake_queries_without_hook(mock_now, mo
             "parent": parent_run.ParentRunFacet(
                 run=parent_run.Run(runId="01941f29-7c00-7087-8906-40e512c257bd"),
                 job=parent_run.Job(namespace=namespace(), name="dag_id.task_id"),
+                root=parent_run.Root(
+                    run=parent_run.RootRun(runId="01941f29-7c00-743e-b109-28b18d0a19c5"),
+                    job=parent_run.RootJob(namespace=namespace(), name="dag_id"),
+                ),
             ),
             "custom_run": "value_run",
         }
@@ -643,7 +660,8 @@ def test_emit_openlineage_events_for_snowflake_queries_without_hook(mock_now, mo
         assert fake_client.emit.call_args_list == expected_calls
 
 
-def test_emit_openlineage_events_for_snowflake_queries_without_query_ids():
+@mock.patch("importlib.metadata.version", return_value="2.3.0")
+def test_emit_openlineage_events_for_snowflake_queries_without_query_ids(mock_version):
     query_ids = []
     original_query_ids = copy.deepcopy(query_ids)
 
@@ -666,7 +684,7 @@ def test_emit_openlineage_events_for_snowflake_queries_without_query_ids():
         fake_client.emit.assert_not_called()  # No events should be emitted
 
 
-# emit_openlineage_events_for_snowflake_queries requires OL provider 2.0.0
+# emit_openlineage_events_for_snowflake_queries requires OL provider 2.3.0
 @mock.patch("importlib.metadata.version", return_value="1.99.0")
 def test_emit_openlineage_events_with_old_openlineage_provider(mock_version):
     query_ids = ["q1", "q2"]
@@ -682,7 +700,7 @@ def test_emit_openlineage_events_with_old_openlineage_provider(mock_version):
         return_value=fake_listener,
     ):
         expected_err = (
-            "OpenLineage provider version `1.99.0` is lower than required `2.0.0`, "
+            "OpenLineage provider version `1.99.0` is lower than required `2.3.0`, "
             "skipping function `emit_openlineage_events_for_snowflake_queries` execution"
         )