Merge branch 'datahub-project:master' into master

acryldata · Jun 7, 2024 · 0525e73 · 0525e73
2 parents 19671dd + 6fdf2f7
commit 0525e73
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/docs/api/tutorials/tags.md b/docs/api/tutorials/tags.md
@@ -275,6 +275,8 @@ Expected Response:
 
 ### Add Tags to a Column of a dataset
 
+In the example below `subResource` is `fieldPath` in the schema.
+
 <Tabs>
 <TabItem value="graphql" label="GraphQL">
 

diff --git a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/config.py b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/config.py
@@ -93,6 +93,8 @@ class Constant:
     # Personal entity constants
     PERSONAL_SPACE_ID = "personal-space-id"
     PERSONAL_SPACE_NAME = "personal_space"
+    # Hypercube
+    HYPERCUBE = "qHyperCube"
 
 
 @dataclass

diff --git a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/data_classes.py b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/data_classes.py
@@ -164,8 +164,8 @@ class Chart(BaseModel):
     @root_validator(pre=True)
     def update_values(cls, values: Dict) -> Dict:
         values[Constant.QID] = values[Constant.QINFO][Constant.QID]
-        values["qDimension"] = values["qHyperCube"]["qDimensionInfo"]
-        values["qMeasure"] = values["qHyperCube"]["qMeasureInfo"]
+        values["qDimension"] = values[Constant.HYPERCUBE]["qDimensionInfo"]
+        values["qMeasure"] = values[Constant.HYPERCUBE]["qMeasureInfo"]
         return values
 
 

diff --git a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_api.py b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_api.py
@@ -113,7 +113,13 @@ def _get_chart(
                 method="GetChild", params={"qId": chart_id}
             )
             response = websocket_connection.websocket_send_request(method="GetLayout")
-            return Chart.parse_obj(response[Constant.QLAYOUT])
+            q_layout = response[Constant.QLAYOUT]
+            if Constant.HYPERCUBE not in q_layout:
+                logger.warning(
+                    f"Chart with id {chart_id} of sheet {sheet_id} does not have hypercube. q_layout: {q_layout}"
+                )
+                return None
+            return Chart.parse_obj(q_layout)
         except Exception as e:
             self._log_http_error(
                 message=f"Unable to fetch chart {chart_id} of sheet {sheet_id}. Exception: {e}"
@@ -135,6 +141,11 @@ def _get_sheet(
                 # That means sheet is private sheet
                 return None
             sheet = Sheet.parse_obj(sheet_dict[Constant.QMETA])
+            if Constant.QCHILDLIST not in sheet_dict:
+                logger.warning(
+                    f"Sheet {sheet.title} with id {sheet_id} does not have any charts. sheet_dict: {sheet_dict}"
+                )
+                return sheet
             for i, chart_dict in enumerate(
                 sheet_dict[Constant.QCHILDLIST][Constant.QITEMS]
             ):