Merge branch 'main' into 3.12

Author: tosh2230

poetry.lock

@@ -11,42 +11,43 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4"
-PyYAML = ">=5.0"
+PyYAML = { version = "!=6.0.0,!=5.4.0,!=5.4.1" }
 Jinja2 = ">=2.10.3"
 
 # For unit tests
 boto3-stubs = {version = ">=1.24.17", extras = ["s3"]}
 
 # optional dependencies
-google-cloud-storage = { version = ">=2.0.0", optional = true }
-psycopg2 = { version = ">=2.9.3", optional = true }
-SQLAlchemy = { version = ">=1.4.31", optional = true }
-dbt-core = { version = ">=1.4", optional = true }
-dbt-bigquery = { version = ">=1.1", optional = true }
-google-cloud-bigquery = { version = ">=2.0", optional = true }
-protobuf = { version = ">=3.20.2", optional = true }
 boto3 = { version = ">=1.24.14", optional = true }
+dbt-adapters = { version = "~1.1.1", optional = true }
+dbt-bigquery = { version = ">=1.8", optional = true }
+dbt-core = { version = ">=1.8", optional = true }
+google-cloud-bigquery = { version = ">=3.0", optional = true }
+google-cloud-storage = { version = ">=2.0", optional = true }
+protobuf = { version = ">=3.20.2", optional = true }
+psycopg2 = { version = ">=2.9.3", optional = true }
 rsa = { version = ">=4.7", optional = true }
+SQLAlchemy = { version = ">=2.0", optional = true }
 
 # To avoid not in poetry.lock metadata
 networkx = { version = ">=2.3,<2.8.1", optional = true }
 
 [tool.poetry.extras]
+dbt-bigquery = ["dbt-adapters", "dbt-core", "dbt-bigquery", "google-cloud-bigquery", "protobuf", "networkx", "rsa"]
 gcs = ["google-cloud-storage", "protobuf", "rsa"]
 redash = ["psycopg2", "SQLAlchemy"]
-dbt-bigquery = ["dbt-core", "dbt-bigquery", "google-cloud-bigquery", "protobuf", "networkx", "rsa"]
 s3 = ["boto3", "boto3-stubs"]
 
 [tool.poetry.dev-dependencies]
 black = ">=22.3.0"
 flake8 = ">=4.0.1"
 isort = ">=5.9.3"
+moto = {extras = ["s3"], version = ">=3.1.16"}
 mypy = ">=0.961"
-types-PyYAML = ">=6.0.8"
 pytest = ">=7.2.0"
 pytest-cov = ">=4.0.0"
 pytest-mock = ">=3.8.1"
-moto = {extras = ["s3"], version = ">=3.1.16"}
+types-PyYAML = ">=6.0.8"
 
 [tool.poetry.scripts]
 stairlight = "src.stairlight.cli:main"

pyproject.toml

@@ -67,7 +67,7 @@ def get_template_str(self) -> str:
 
     def get_uri(self) -> str:
         """Get uri"""
-        return super().get_uri()
+        return self.uri
 
 
 class RedashTemplateSource(TemplateSource):

src/stairlight/source/redash/template.py

@@ -196,24 +196,22 @@ def render_by_string_template(
 
         try:
             rendered_str = s.substitute(params)
-        except KeyError as e:
+        except KeyError:
             logger.warning(
                 (
-                    f"{e.with_traceback}, "
+                    f"Params not found; "
                     f"source_type: {self.source_type}, "
                     f"key: {self.key}",
-                    f"template_str: {template_str}",
                     f"params: {params}",
                 )
             )
             rendered_str = s.safe_substitute(params)
-        except ValueError as e:
+        except ValueError:
             logger.warning(
                 (
-                    f"{e.with_traceback}, "
+                    f"Query rendering failed; "
                     f"source_type: {self.source_type}, "
                     f"key: {self.key}",
-                    f"template_str: {template_str}",
                     f"params: {params}",
                 )
             )

src/stairlight/source/template.py

@@ -505,9 +505,9 @@ def search_verbose(
                         next_table_name
                     ]
                     if next_response[next_table_name][direction.value]:
-                        search_results[next_table_name][
-                            direction.value
-                        ] = next_response[next_table_name][direction.value]
+                        search_results[next_table_name][direction.value] = (
+                            next_response[next_table_name][direction.value]
+                        )
                 else:
                     search_results[table_name]["Templates"].append(template)
 

src/stairlight/stairlight.py

@@ -4,7 +4,7 @@
 
 import boto3
 import pytest
-from moto import mock_s3
+from moto import mock_aws
 
 from src.stairlight.configurator import Configurator
 from src.stairlight.source.config import (
@@ -74,7 +74,7 @@ def test_get_uri(
     ):
         assert s3_template.uri == f"{S3_URI_SCHEME}{bucket}/{key}"
 
-    @mock_s3
+    @mock_aws
     def test_get_jinja_params(
         self,
         s3_template: S3Template,
@@ -95,7 +95,7 @@ def test_get_jinja_params_integration(
         template_str = s3_template.get_template_str()
         assert len(s3_template.get_jinja_params(template_str)) > 0
 
-    @mock_s3
+    @mock_aws
     def test_render(
         self,
         s3_template: S3Template,
@@ -143,7 +143,7 @@ def s3_template_source(
             include=_include,
         )
 
-    @mock_s3
+    @mock_aws
     def test_search_templates(self, s3_template_source: S3TemplateSource):
         s3_client = boto3.resource("s3", region_name="us-east-1")
         s3_client.create_bucket(Bucket=BUCKET_NAME)