castor-extractor 0.20.5__tar.gz → 0.20.7__tar.gz

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/CHANGELOG.md

@@ -1,6 +1,14 @@
 
 # Changelog
 
+## 0.20.7 - 2024-10-18
+
+* Metabase: fix `require_ssl` type in credentials
+
+## 0.20.6 - 2024-10-15
+
+* Tableau: include `site_id` in **workbooks** to build url
+
 ## 0.20.5 - 2024-10-09
 
 * Redshift: enable extraction from a Redshift Serverless instance

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.5
+# syntax=docker/dockerfile:1
 
 FROM --platform=linux/amd64 python:3.11-slim
 

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: castor-extractor
-Version: 0.20.5
+Version: 0.20.7
 Summary: Extract your metadata assets.
 Home-page: https://www.castordoc.com/
 License: EULA
@@ -208,6 +208,14 @@ For any questions or bug report, contact us at [support@castordoc.com](mailto:su
 
 # Changelog
 
+## 0.20.7 - 2024-10-18
+
+* Metabase: fix `require_ssl` type in credentials
+
+## 0.20.6 - 2024-10-15
+
+* Tableau: include `site_id` in **workbooks** to build url
+
 ## 0.20.5 - 2024-10-09
 
 * Redshift: enable extraction from a Redshift Serverless instance

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/castor_extractor/visualization/metabase/client/db/credentials.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import Field
+from pydantic import AliasChoices, Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 METABASE_DB_ENV_PREFIX = "CASTOR_METABASE_DB_"
@@ -18,9 +18,15 @@ class MetabaseDbCredentials(BaseSettings):
     host: str
     port: str
     database: str
-    schema_: str = Field(validation_alias=f"{METABASE_DB_ENV_PREFIX}SCHEMA")
+    schema_: str = Field(
+        validation_alias=AliasChoices(
+            f"{METABASE_DB_ENV_PREFIX}SCHEMA", "schema"
+        )
+    )
     user: str = Field(validation_alias=f"{METABASE_DB_ENV_PREFIX}USERNAME")
     password: str = Field(repr=False)
 
-    encryption_secret_key: Optional[str] = Field(repr=False)
-    require_ssl: Optional[str]
+    encryption_secret_key: Optional[str] = Field(repr=False, default=None)
+    require_ssl: Optional[bool] = Field(
+        validation_alias=f"{METABASE_DB_ENV_PREFIX}REQUIRE_SSL_KEY"
+    )

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/castor_extractor/visualization/tableau_revamp/client/client.py

@@ -4,7 +4,7 @@ import tableauserverclient as TSC  # type: ignore
 
 from ....utils import SerializedAsset
 from ..assets import TABLEAU_PULSE_ASSETS, TableauRevampAsset
-from ..constants import DEFAULT_TIMEOUT_SECONDS
+from ..constants import CREDENTIALS_SITE_ID_KEY, DEFAULT_TIMEOUT_SECONDS
 from .client_metadata_api import TableauClientMetadataApi
 from .client_rest_api import TableauClientRestApi
 from .client_tsc import TableauClientTSC
@@ -33,6 +33,15 @@ _REST_API_ASSETS = (
 logging.getLogger("tableau.endpoint").setLevel(logging.WARNING)
 
 
+def _add_site_id(workbooks: SerializedAsset, site_id: str) -> SerializedAsset:
+    """
+    Add site_id from credentials: it's necessary to compute workbook's url
+    """
+    for workbook in workbooks:
+        workbook[CREDENTIALS_SITE_ID_KEY] = site_id
+    return workbooks
+
+
 def _merge_datasources(
     datasources: SerializedAsset,
     tsc_datasources: SerializedAsset,
@@ -182,7 +191,10 @@ class TableauRevampClient:
     def _fetch_workbooks(self) -> SerializedAsset:
         asset = TableauRevampAsset.WORKBOOK
 
+        site_id = self._credentials.site_id
         workbooks = self._client_metadata.fetch(asset)
+        workbooks = _add_site_id(workbooks, site_id)
+
         workbook_projects = self._client_tsc.fetch(asset)
 
         return _merge_workbooks(workbooks, workbook_projects)

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/castor_extractor/visualization/tableau_revamp/constants.py

@@ -1,3 +1,5 @@
 DEFAULT_PAGE_SIZE = 100
 
 DEFAULT_TIMEOUT_SECONDS = 100
+
+CREDENTIALS_SITE_ID_KEY = "credentials_site_id"

{castor_extractor-0.20.5 → castor_extractor-0.20.7}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.2"]
 
 [tool.poetry]
 name = "castor-extractor"
-version = "0.20.5"
+version = "0.20.7"
 description = "Extract your metadata assets."
 authors = ["Castor <support@castordoc.com>"]
 license = "EULA"