Skip to content

Commit 6dfd089

Browse files
Merge branch '1.11.12' into thiago/sigma-lineage-fixes
2 parents 225860c + 307b42e commit 6dfd089

8 files changed

Lines changed: 1396 additions & 19 deletions

File tree

ingestion/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ARG INGESTION_DEPENDENCY="all"
8080
ENV PIP_NO_CACHE_DIR=1
8181
# Make pip silent
8282
ENV PIP_QUIET=1
83-
ARG RI_VERSION="1.11.12.0"
83+
ARG RI_VERSION="1.11.12.2"
8484
# Pin setuptools<81 as pkg_resources was removed in setuptools 81.0.0+
8585
# cx-Oracle's setup.py still uses pkg_resources
8686
RUN pip install --upgrade pip "setuptools<81"

ingestion/operators/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ RUN pip install --upgrade pip "setuptools<81"
8888
RUN pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"
8989

9090
ARG INGESTION_DEPENDENCY="all"
91-
ARG RI_VERSION="1.11.12.0"
91+
ARG RI_VERSION="1.11.12.2"
9292
RUN pip install "openmetadata-ingestion[airflow]~=${RI_VERSION}"
9393
RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}"
9494

ingestion/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66
# since it helps us organize and isolate version management
77
[project]
88
name = "openmetadata-ingestion"
9-
version = "1.11.12.0"
9+
version = "1.11.12.2"
1010
dynamic = ["readme", "dependencies", "optional-dependencies"]
1111
authors = [
1212
{ name = "OpenMetadata Committers" }

ingestion/src/metadata/ingestion/source/dashboard/powerbi/constants.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
SNOWFLAKE_QUERY_EXPRESSION_KW = "Value.NativeQuery(Snowflake.Databases("
1919
DATABRICKS_QUERY_EXPRESSION_KW = "Value.NativeQuery(Databricks.Catalogs("
20+
BIGQUERY_QUERY_EXPRESSION_KW = "Value.NativeQuery(GoogleBigQuery.Database("
21+
SQL_DATABASE_EXPRESSION_KW = "Sql.Database("
2022

2123
DEFAULT_REPORTS_PREFIX = "reports"
2224
RDL_REPORT_FORMAT = "RDL"
@@ -45,3 +47,5 @@
4547
# =============================================================================
4648

4749
MAX_PROJECT_FILTER_SIZE = 10
50+
51+
SQL_LINE_COMMENT_PATTERN = r"//[^\n]*"

ingestion/src/metadata/ingestion/source/dashboard/powerbi/metadata.py

Lines changed: 500 additions & 15 deletions
Large diffs are not rendered by default.

ingestion/src/metadata/ingestion/source/dashboard/powerbi/models.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,24 @@ class DataflowEntity(BaseModel):
428428
attributes: Optional[List[DataflowEntityAttribute]] = []
429429

430430

431+
class DataflowQueryMetadata(BaseModel):
432+
queryId: Optional[str] = None
433+
queryName: Optional[str] = None
434+
loadEnabled: Optional[bool] = False
435+
436+
437+
class DataflowMashup(BaseModel):
438+
document: Optional[str] = None
439+
queriesMetadata: Optional[dict] = None
440+
441+
@field_validator("queriesMetadata", mode="before")
442+
@classmethod
443+
def parse_queries_metadata(cls, v):
444+
if isinstance(v, dict):
445+
return v
446+
return None
447+
448+
431449
class DataflowExportResponse(BaseModel):
432450
"""
433451
PowerBI Dataflow Export API Response Model
@@ -439,3 +457,4 @@ class DataflowExportResponse(BaseModel):
439457
description: Optional[str] = None
440458
version: Optional[str] = None
441459
entities: Optional[List[DataflowEntity]] = []
460+
mashup: Optional[DataflowMashup] = Field(None, alias="pbi:mashup")

0 commit comments

Comments
 (0)