sunank200 commented on code in PR #37101:
URL: https://github.com/apache/airflow/pull/37101#discussion_r1499015986
##########
airflow/models/dataset.py:
##########
@@ -374,12 +386,96 @@ def all_datasets(self) -> dict[str, Dataset]:
class DatasetAny(DatasetBooleanCondition):
- """Use to combine datasets schedule references in an "and" relationship."""
+ """
+ Represents a logical OR condition of datasets.
+
+ Inherits from DatasetBooleanCondition.
+ """
agg_func = any
+ def __init__(self, *objects: Dataset | DatasetAny | DatasetAll):
+ """Initialize with one or more Dataset, DatasetAny, or DatasetAll
instances."""
+ super().__init__(*objects)
+
+ def __or__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAny(*self.objects, other)
+ return NotImplemented
+
+ def __and__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAll(self, other)
+ return NotImplemented
+
+ def __repr__(self) -> str:
+ return f"DatasetAny({', '.join(map(str, self.objects))})"
+
class DatasetAll(DatasetBooleanCondition):
- """Use to combine datasets schedule references in an "or" relationship."""
+ """Represents a logical AND condition of datasets. Inherits from
DatasetBooleanCondition."""
agg_func = all
+
+ def __init__(self, *objects: Dataset | DatasetAny | DatasetAll):
+ """Initialize with one or more Dataset, DatasetAny, or DatasetAll
instances."""
+ super().__init__(*objects)
+
+ def __or__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAny(self, other)
+ return NotImplemented
+
+ def __and__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAll(*self.objects, other)
+ return NotImplemented
+
+ def __repr__(self) -> str:
+ return f"DatasetAnd({', '.join(map(str, self.objects))})"
+
+
+class DatasetsExpression:
+ """
+ Represents a node in an expression tree for dataset conditions.
+
+ :param value: The value of the node, which can be a 'Dataset', '&', or '|'.
+ :param left: The left child node.
+ :param right: The right child node.
+ """
+
+ def __init__(self, value, left=None, right=None):
+ self.value = value # value can be 'Dataset', '&', or '|'
+ self.left = left
+ self.right = right
+
+ def __or__(self, other: Dataset | DatasetsExpression) ->
DatasetsExpression:
+ return DatasetsExpression("|", self, other)
+
+ def __and__(self, other: Dataset | DatasetsExpression) ->
DatasetsExpression:
+ return DatasetsExpression("&", self, other)
+
+ def __repr__(self):
+ if isinstance(self.value, Dataset):
+ return f"Dataset(uri='{self.value.uri}')"
+ elif self.value == "&":
+ return repr(DatasetAll(self.left, self.right))
+ elif self.value == "|":
+ return repr(DatasetAny(self.left, self.right))
+
+
+def extract_datasets(dataset_expression: DatasetsExpression | Dataset):
+ """
+ Extracts the dataset(s) from an DatasetsExpression.
+
+ :param dataset_expression: The DatasetsExpression to extract from.
+ """
+ if isinstance(dataset_expression, DatasetsExpression):
+ if dataset_expression.value == "&":
+ return DatasetAll(dataset_expression.left,
dataset_expression.right)
+ elif dataset_expression.value == "|":
+ return DatasetAny(dataset_expression.left,
dataset_expression.right)
+ else:
+ raise ValueError("Invalid Expression node value")
+ else:
+ return dataset_expression
Review Comment:
Changed it
##########
airflow/models/dataset.py:
##########
@@ -374,12 +386,96 @@ def all_datasets(self) -> dict[str, Dataset]:
class DatasetAny(DatasetBooleanCondition):
- """Use to combine datasets schedule references in an "and" relationship."""
+ """
+ Represents a logical OR condition of datasets.
+
+ Inherits from DatasetBooleanCondition.
+ """
agg_func = any
+ def __init__(self, *objects: Dataset | DatasetAny | DatasetAll):
+ """Initialize with one or more Dataset, DatasetAny, or DatasetAll
instances."""
+ super().__init__(*objects)
+
+ def __or__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAny(*self.objects, other)
+ return NotImplemented
+
+ def __and__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAll(self, other)
+ return NotImplemented
+
+ def __repr__(self) -> str:
+ return f"DatasetAny({', '.join(map(str, self.objects))})"
+
class DatasetAll(DatasetBooleanCondition):
- """Use to combine datasets schedule references in an "or" relationship."""
+ """Represents a logical AND condition of datasets. Inherits from
DatasetBooleanCondition."""
agg_func = all
+
+ def __init__(self, *objects: Dataset | DatasetAny | DatasetAll):
+ """Initialize with one or more Dataset, DatasetAny, or DatasetAll
instances."""
+ super().__init__(*objects)
+
+ def __or__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAny(self, other)
+ return NotImplemented
+
+ def __and__(self, other):
+ if isinstance(other, (Dataset, DatasetAny, DatasetAll)):
+ return DatasetAll(*self.objects, other)
+ return NotImplemented
+
+ def __repr__(self) -> str:
+ return f"DatasetAnd({', '.join(map(str, self.objects))})"
+
+
+class DatasetsExpression:
+ """
+ Represents a node in an expression tree for dataset conditions.
+
+ :param value: The value of the node, which can be a 'Dataset', '&', or '|'.
+ :param left: The left child node.
+ :param right: The right child node.
+ """
+
+ def __init__(self, value, left=None, right=None):
+ self.value = value # value can be 'Dataset', '&', or '|'
+ self.left = left
+ self.right = right
+
+ def __or__(self, other: Dataset | DatasetsExpression) ->
DatasetsExpression:
+ return DatasetsExpression("|", self, other)
+
+ def __and__(self, other: Dataset | DatasetsExpression) ->
DatasetsExpression:
+ return DatasetsExpression("&", self, other)
+
+ def __repr__(self):
+ if isinstance(self.value, Dataset):
+ return f"Dataset(uri='{self.value.uri}')"
+ elif self.value == "&":
+ return repr(DatasetAll(self.left, self.right))
+ elif self.value == "|":
+ return repr(DatasetAny(self.left, self.right))
+
+
+def extract_datasets(dataset_expression: DatasetsExpression | Dataset):
+ """
+ Extracts the dataset(s) from an DatasetsExpression.
+
+ :param dataset_expression: The DatasetsExpression to extract from.
+ """
+ if isinstance(dataset_expression, DatasetsExpression):
+ if dataset_expression.value == "&":
+ return DatasetAll(dataset_expression.left,
dataset_expression.right)
+ elif dataset_expression.value == "|":
+ return DatasetAny(dataset_expression.left,
dataset_expression.right)
+ else:
+ raise ValueError("Invalid Expression node value")
Review Comment:
Changed it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]