From a5eb1dee8f104f96eff3d8e80c3faa625167f1f7 Mon Sep 17 00:00:00 2001
From: Leah Tacke genannt Unterberg <leah.tgu@pads.rwth-aachen.de>
Date: Thu, 20 Mar 2025 13:49:21 +0100
Subject: [PATCH] aligned related objects to superset import
---
.../superset/definitions/mitm_dataset.py | 20 ++++++++++---------
.../superset/factories/mitm_dataset.py | 6 +++---
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/mitm_tooling/transformation/superset/definitions/mitm_dataset.py b/mitm_tooling/transformation/superset/definitions/mitm_dataset.py
index 5c5ff61..83d4d7e 100644
--- a/mitm_tooling/transformation/superset/definitions/mitm_dataset.py
+++ b/mitm_tooling/transformation/superset/definitions/mitm_dataset.py
@@ -10,19 +10,21 @@ class MitMDatasetIdentifier(BaseSupersetDefinition):
uuid: StrUUID | None = None
-class RelatedTable(BaseSupersetDefinition):
- table_id: SupersetId | None = None
- table_uuid: StrUUID
+class RelatedObjectIdentifier(BaseSupersetDefinition):
+ id: SupersetId | None = None
+ uuid: StrUUID
+
+
+class RelatedTable(RelatedObjectIdentifier):
+ pass
-class RelatedSlice(BaseSupersetDefinition):
- slice_id: SupersetId | None = None
- slice_uuid: StrUUID
+class RelatedSlice(RelatedObjectIdentifier):
+ pass
-class RelatedDashboard(BaseSupersetDefinition):
- dashboard_id: SupersetId | None = None
- dashboard_uuid: StrUUID
+class RelatedDashboard(RelatedObjectIdentifier):
+ pass
class SupersetMitMDatasetDef(SupersetDefFile):
diff --git a/mitm_tooling/transformation/superset/factories/mitm_dataset.py b/mitm_tooling/transformation/superset/factories/mitm_dataset.py
index fae7f79..2b15b05 100644
--- a/mitm_tooling/transformation/superset/factories/mitm_dataset.py
+++ b/mitm_tooling/transformation/superset/factories/mitm_dataset.py
@@ -12,11 +12,11 @@ def mk_related_obj(kind: Literal['table', 'slice', 'dashboard'],
uuid: UUID) -> RelatedTable | RelatedSlice | RelatedDashboard | None:
match kind:
case 'table':
- return RelatedTable(table_uuid=uuid)
+ return RelatedTable(uuid=uuid)
case 'slice':
- return RelatedSlice(slice_uuid=uuid)
+ return RelatedSlice(uuid=uuid)
case 'dashboard':
- return RelatedDashboard(dashboard_uuid=uuid)
+ return RelatedDashboard(uuid=uuid)
def mk_related_objs(kind: Literal['table', 'slice', 'dashboard'], uuids: Iterable[UUID]) -> Iterable[RelatedTable] | \
--
GitLab