castor-extractor 0.20.5__py3-none-any.whl → 0.20.7__py3-none-any.whl

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

Dockerfile

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

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/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/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.dist-info → castor_extractor-0.20.7.dist-info}/METADATA

@@ -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.dist-info → castor_extractor-0.20.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
-CHANGELOG.md,sha256=gqprCxUMpvdGZdxp3AxdsRKA3JK-Q9NM72m839G5CeQ,13996
-Dockerfile,sha256=HcX5z8OpeSvkScQsN-Y7CNMUig_UB6vTMDl7uqzuLGE,303
+CHANGELOG.md,sha256=8s0QcdkmJwFZParMHTjOoICh4-G6RD_sQ2JVFwktPPA,14155
+Dockerfile,sha256=xQ05-CFfGShT3oUqaiumaldwA288dj9Yb_pxofQpufg,301
 DockerfileUsage.md,sha256=2hkJQF-5JuuzfPZ7IOxgM6QgIQW7l-9oRMFVwyXC4gE,998
 LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
 README.md,sha256=uF6PXm9ocPITlKVSh9afTakHmpLx3TvawLf-CbMP3wM,3578
@@ -167,7 +167,7 @@ castor_extractor/visualization/metabase/client/api/client_test.py,sha256=7Lb5yvr
 castor_extractor/visualization/metabase/client/api/credentials.py,sha256=SiHWyWWEDy_Ak4ne0hgXPZCSP6mEuHH26wDhsed_9v8,519
 castor_extractor/visualization/metabase/client/db/__init__.py,sha256=nawDhJ-JGlpM6VMzZZRjf066QXk9kWzZr6l9n6OHTZ0,76
 castor_extractor/visualization/metabase/client/db/client.py,sha256=s38mubBaun4LfYWXqk_fyObWTk9f69AorDrXyW4HNiw,3369
-castor_extractor/visualization/metabase/client/db/credentials.py,sha256=LrtfUd2c1jAAFzxu64suIwvZe2dJnZ8suv9vGTnXtrI,746
+castor_extractor/visualization/metabase/client/db/credentials.py,sha256=rhA6rM7QMTBSpF4BknYXz2VqujFcWAdx5TPR4kmdPy4,918
 castor_extractor/visualization/metabase/client/db/queries/.sqlfluff,sha256=sOQQOpAa9QMj9cBlulfmt-DZ_kQzMpzSAEnh10QGSB0,76
 castor_extractor/visualization/metabase/client/db/queries/base_url.sql,sha256=p2EL9kdt-hw_yh3aeCE91AXEB4RrYAbG2QrBBNqQjDE,79
 castor_extractor/visualization/metabase/client/db/queries/card.sql,sha256=U4-ZrZP5XS7Kssd3CFlpGrABbHAMK09Bh_yeT3z7Yk8,419
@@ -274,7 +274,7 @@ castor_extractor/visualization/tableau/usage.py,sha256=LlFwlbEr-EnYUJjKZha99CRCR
 castor_extractor/visualization/tableau_revamp/__init__.py,sha256=a3DGjQhaz17gBqW-E84TAgupKbqLC40y5Ajo1yn-ot4,156
 castor_extractor/visualization/tableau_revamp/assets.py,sha256=8sJsK6Qixao6xVmVaO1usvs16SjNub9sIx7o-adYV14,659
 castor_extractor/visualization/tableau_revamp/client/__init__.py,sha256=wmS9uLtUiqNYVloi0-DgD8d2qzu3RVZEAtWiaDp6G_M,90
-castor_extractor/visualization/tableau_revamp/client/client.py,sha256=8pATeVTKslF5HCbN1c_DusysP7lTU51yXPp8uhzWwZg,7165
+castor_extractor/visualization/tableau_revamp/client/client.py,sha256=oaxvPsCccAcTWooXmDQNcJ6RFUVsCUzl6HxaHIwh5kU,7564
 castor_extractor/visualization/tableau_revamp/client/client_metadata_api.py,sha256=yNnGR3Tk32TUmaDejaz5fkw2p9DtmMeCv5rsZNOHUfY,3047
 castor_extractor/visualization/tableau_revamp/client/client_rest_api.py,sha256=0g8AddrhzirRCUWR2jrudPR02mk4Of5YilWth7zJO-g,4016
 castor_extractor/visualization/tableau_revamp/client/client_tsc.py,sha256=BBwIOqK2zU66udFRmLGmB_3J1ILGhVOY5Hq4nmsonF0,1853
@@ -282,7 +282,7 @@ castor_extractor/visualization/tableau_revamp/client/credentials.py,sha256=qA-Ea
 castor_extractor/visualization/tableau_revamp/client/errors.py,sha256=dTe1shqmWmAXpDpCz-E24m8dGYjt6rvIGV9qQb4jnvI,150
 castor_extractor/visualization/tableau_revamp/client/gql_queries.py,sha256=-V3ToD5Gi7nmfVB2OxTOZw8dcOiF7_ciSWjjW2UdvvI,2270
 castor_extractor/visualization/tableau_revamp/client/rest_fields.py,sha256=gx39X1zMfRVpjmFbgvbgbvtlE0QwxOtk8rZFsIqeGRI,978
-castor_extractor/visualization/tableau_revamp/constants.py,sha256=thS935pJyuZkdciM2EFHbIuTqSFYfB3YGCJYJ_Ls294,55
+castor_extractor/visualization/tableau_revamp/constants.py,sha256=lHGB50FgVNO2nXeIhkvQKivD8ZFBIjDrflgD5cTXKJw,104
 castor_extractor/visualization/tableau_revamp/extract.py,sha256=BPy38rFjGG6Nh1eDFeCckE4RHaO-bWW2uhXh7wm8mKk,1368
 castor_extractor/visualization/thoughtspot/__init__.py,sha256=NhTGUk5Kdt54oCjHYoAt0cLBmVLys5lFYiRANL6wCmI,150
 castor_extractor/visualization/thoughtspot/assets.py,sha256=lPRvXk0PKybgLv1AcDVxg-ssf4XLTs0biRqLrqC2TzU,196
@@ -415,8 +415,8 @@ castor_extractor/warehouse/sqlserver/queries/table.sql,sha256=kbBQP-TdG5px1IVgyx
 castor_extractor/warehouse/sqlserver/queries/user.sql,sha256=gOrZsMVypusR2dc4vwVs4E1a-CliRsr_UjnD2EbXs-A,94
 castor_extractor/warehouse/sqlserver/query.py,sha256=j_d5-HMnzBouwGfywVZMRSSwbXzPvzDWlFCZmvxcoGQ,539
 castor_extractor/warehouse/synapse/queries/column.sql,sha256=lNcFoIW3Y0PFOqoOzJEXmPvZvfAsY0AP63Mu2LuPzPo,1351
-castor_extractor-0.20.5.dist-info/LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
-castor_extractor-0.20.5.dist-info/METADATA,sha256=wmQH2GPtnBGHq8a5CdjKZ6yPMNIrS4gkYrTpbV0T9yg,21214
-castor_extractor-0.20.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-castor_extractor-0.20.5.dist-info/entry_points.txt,sha256=IVGy_oM8VjzADMAxzmiNJTYYidTCsI98MpO_mkXjkqE,1573
-castor_extractor-0.20.5.dist-info/RECORD,,
+castor_extractor-0.20.7.dist-info/LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
+castor_extractor-0.20.7.dist-info/METADATA,sha256=XGGqjLLLfjnVXfoEfuRb3kao81OQ8c5VdwjdSockixk,21373
+castor_extractor-0.20.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+castor_extractor-0.20.7.dist-info/entry_points.txt,sha256=IVGy_oM8VjzADMAxzmiNJTYYidTCsI98MpO_mkXjkqE,1573
+castor_extractor-0.20.7.dist-info/RECORD,,