apache-airflow-providers-snowflake 5.5.0rc1__tar.gz → 5.5.1rc1__tar.gz

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-snowflake
-Version: 5.5.0rc1
+Version: 5.5.1rc1
 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,8 +28,8 @@ Requires-Dist: snowflake-sqlalchemy>=1.1.0
 Requires-Dist: apache-airflow-providers-common-sql ; extra == "common.sql"
 Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://twitter.com/ApacheAirflow
@@ -81,7 +81,7 @@ Provides-Extra: openlineage
 
 Package ``apache-airflow-providers-snowflake``
 
-Release: ``5.5.0.rc1``
+Release: ``5.5.1.rc1``
 
 
 `Snowflake <https://www.snowflake.com/>`__
@@ -94,7 +94,7 @@ This is a provider package for ``snowflake`` provider. All classes for this prov
 are in ``airflow.providers.snowflake`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1/>`_.
 
 Installation
 ------------
@@ -138,4 +138,4 @@ Dependent package
 ==============================================================================================================  ===============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1/changelog.html>`_.

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-snowflake``
 
-Release: ``5.5.0.rc1``
+Release: ``5.5.1.rc1``
 
 
 `Snowflake <https://www.snowflake.com/>`__
@@ -55,7 +55,7 @@ This is a provider package for ``snowflake`` provider. All classes for this prov
 are in ``airflow.providers.snowflake`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1/>`_.
 
 Installation
 ------------
@@ -99,4 +99,4 @@ Dependent package
 ==============================================================================================================  ===============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1/changelog.html>`_.

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/airflow/providers/snowflake/__init__.py

@@ -25,14 +25,11 @@ from __future__ import annotations
 
 import packaging.version
 
-__all__ = ["__version__"]
+from airflow import __version__ as airflow_version
 
-__version__ = "5.5.0"
+__all__ = ["__version__"]
 
-try:
-    from airflow import __version__ as airflow_version
-except ImportError:
-    from airflow.version import version as airflow_version
+__version__ = "5.5.1"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.7.0"

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/airflow/providers/snowflake/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "Snowflake",
         "description": "`Snowflake <https://www.snowflake.com/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1714477569,
+        "source-date-epoch": 1716289119,
         "versions": [
+            "5.5.1",
             "5.5.0",
             "5.4.0",
             "5.3.1",

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/airflow/providers/snowflake/hooks/snowflake.py

@@ -34,6 +34,7 @@ from sqlalchemy import create_engine
 
 from airflow.exceptions import AirflowException
 from airflow.providers.common.sql.hooks.sql import DbApiHook, return_single_query_results
+from airflow.providers.snowflake.utils.openlineage import fix_snowflake_sqlalchemy_uri
 from airflow.utils.strings import to_boolean
 
 T = TypeVar("T")
@@ -462,9 +463,7 @@ class SnowflakeHook(DbApiHook):
     def get_openlineage_default_schema(self) -> str | None:
         return self._get_conn_params["schema"]
 
-    def _get_openlineage_authority(self, _) -> str:
-        from openlineage.common.provider.snowflake import fix_snowflake_sqlalchemy_uri
-
+    def _get_openlineage_authority(self, _) -> str | None:
         uri = fix_snowflake_sqlalchemy_uri(self.get_uri())
         return urlparse(uri).hostname
 

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/airflow/providers/snowflake/transfers/copy_into_snowflake.py

@@ -42,8 +42,6 @@ class CopyFromExternalStageToSnowflakeOperator(BaseOperator):
     :param prefix: cloud storage location specified to limit the set of files to load
     :param files: files to load into table
     :param pattern: pattern to load files from external location to table
-    :param copy_into_postifx: optional sql postfix for INSERT INTO query
-           such as `formatTypeOptions` and `copyOptions`
     :param snowflake_conn_id:  Reference to :ref:`Snowflake connection id<howto/connection:snowflake>`
     :param account: snowflake account name
     :param warehouse: name of snowflake warehouse

apache_airflow_providers_snowflake-5.5.1rc1/airflow/providers/snowflake/utils/openlineage.py

@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from urllib.parse import quote, urlparse, urlunparse
+
+
+def fix_account_name(name: str) -> str:
+    """Fix account name to have the following format: <account_id>.<region>.<cloud>."""
+    spl = name.split(".")
+    if len(spl) == 1:
+        account = spl[0]
+        region, cloud = "us-west-1", "aws"
+    elif len(spl) == 2:
+        account, region = spl
+        cloud = "aws"
+    else:
+        account, region, cloud = spl
+    return f"{account}.{region}.{cloud}"
+
+
+def fix_snowflake_sqlalchemy_uri(uri: str) -> str:
+    """Fix snowflake sqlalchemy connection URI to OpenLineage structure.
+
+    Snowflake sqlalchemy connection URI has following structure:
+    'snowflake://<user_login_name>:<password>@<account_identifier>/<database_name>/<schema_name>?warehouse=<warehouse_name>&role=<role_name>'
+    We want account identifier normalized. It can have two forms:
+    - newer, in form of <organization>-<id>. In this case we want to do nothing.
+    - older, composed of <id>-<region>-<cloud> where region and cloud can be
+    optional in some cases. If <cloud> is omitted, it's AWS.
+    If region and cloud are omitted, it's AWS us-west-1
+    """
+    try:
+        parts = urlparse(uri)
+    except ValueError:
+        # snowflake.sqlalchemy.URL does not quote `[` and `]`
+        # that's a rare case so we can run more debugging code here
+        # to make sure we replace only password
+        parts = urlparse(uri.replace("[", quote("[")).replace("]", quote("]")))
+
+    hostname = parts.hostname
+    if not hostname:
+        return uri
+
+    # old account identifier like xy123456
+    if "." in hostname or not any(word in hostname for word in ["-", "_"]):
+        hostname = fix_account_name(hostname)
+    # else - its new hostname, just return it
+    return urlunparse((parts.scheme, hostname, parts.path, parts.params, parts.query, parts.fragment))

{apache_airflow_providers_snowflake-5.5.0rc1 → apache_airflow_providers_snowflake-5.5.1rc1}/pyproject.toml

@@ -28,7 +28,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-snowflake"
-version = "5.5.0.rc1"
+version = "5.5.1.rc1"
 description = "Provider package apache-airflow-providers-snowflake for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -63,8 +63,8 @@ dependencies = [
 ]
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-snowflake/5.5.1/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"