Simplified filter creation

Author: Val Brodsky

libs/labelbox/src/labelbox/schema/search_filters.py

@@ -67,7 +67,7 @@ class OrganizationFilter(BaseSearchFilter):
     """
     Filter for organization
     """
-    operation: Literal[OperationType.Organization]
+    operation: Literal[OperationType.Organization] = OperationType.Organization
     operator: IdOperator
     values: List[str]
 
@@ -76,7 +76,7 @@ class WorkspaceFilter(BaseSearchFilter):
     """
     Filter for workspace
     """
-    operation: Literal[OperationType.Workspace]
+    operation: Literal[OperationType.Workspace] = OperationType.Workspace
     operator: IdOperator
     values: List[str]
 
@@ -85,7 +85,7 @@ class TagFilter(BaseSearchFilter):
     """
     Filter for project tags
     """
-    operation: Literal[OperationType.Tag]
+    operation: Literal[OperationType.Tag] = OperationType.Tag
     operator: IdOperator
     values: List[str]
 
@@ -94,7 +94,7 @@ class ProjectStageFilter(BaseSearchFilter):
     """
     Filter labelbox service / aka project stages
     """
-    operation: Literal[OperationType.Stage]
+    operation: Literal[OperationType.Stage] = OperationType.Stage
     operator: IdOperator
     values: List[str]
 
@@ -124,15 +124,19 @@ class WorkforceStageUpdatedFilter(BaseSearchFilter):
     """
     Filter for workforce stage updated date
     """
-    operation: Literal[OperationType.WorkforceStageUpdatedDate]
+    operation: Literal[
+        OperationType.
+        WorkforceStageUpdatedDate] = OperationType.WorkforceStageUpdatedDate
     value: DateValue
 
 
 class WorkforceRequestedDateFilter(BaseSearchFilter):
     """
     Filter for workforce requested date
     """
-    operation: Literal[OperationType.WorforceRequestedDate]
+    operation: Literal[
+        OperationType.
+        WorforceRequestedDate] = OperationType.WorforceRequestedDate
     value: DateValue
 
 
@@ -156,31 +160,37 @@ class WorkforceRequestedDateRangeFilter(BaseSearchFilter):
     """
     Filter for workforce requested date range
     """
-    operation: Literal[OperationType.WorforceRequestedDate]
+    operation: Literal[
+        OperationType.
+        WorforceRequestedDate] = OperationType.WorforceRequestedDate
     value: DateRangeValue
 
 
 class WorkforceStageUpdatedRangeFilter(BaseSearchFilter):
     """
     Filter for workforce stage updated date range
     """
-    operation: Literal[OperationType.WorkforceStageUpdatedDate]
+    operation: Literal[
+        OperationType.
+        WorkforceStageUpdatedDate] = OperationType.WorkforceStageUpdatedDate
     value: DateRangeValue
 
 
 class TaskCompletedCountFilter(BaseSearchFilter):
     """
     Filter for workforce stage updated date
     """
-    operation: Literal[OperationType.TaskCompletedCount]
+    operation: Literal[
+        OperationType.TaskCompletedCount] = OperationType.TaskCompletedCount
     value: IntegerValue
 
 
 class TaskRemainingCountFilter(BaseSearchFilter):
     """
     Filter for workforce stage updated date
     """
-    operation: Literal[OperationType.TaskRemainingCount]
+    operation: Literal[
+        OperationType.TaskRemainingCount] = OperationType.TaskRemainingCount
     value: IntegerValue
 
 

libs/labelbox/tests/unit/test_unit_search_filters.py

@@ -5,18 +5,12 @@
 
 def test_id_filters():
     filters = [
-        OrganizationFilter(operation=OperationType.Organization,
-                           operator=IdOperator.Is,
+        OrganizationFilter(operator=IdOperator.Is,
                            values=["clphb4vd7000cd2wv1ktu5cwa"]),
-        WorkspaceFilter(operation=OperationType.Workspace,
-                        operator=IdOperator.Is,
+        WorkspaceFilter(operator=IdOperator.Is,
                         values=["clphb4vd7000cd2wv1ktu5cwa"]),
-        TagFilter(operation=OperationType.Tag,
-                  operator=IdOperator.Is,
-                  values=["tag"]),
-        ProjectStageFilter(operation=OperationType.Stage,
-                           operator=IdOperator.Is,
-                           values=["requested"]),
+        TagFilter(operator=IdOperator.Is, values=["tag"]),
+        ProjectStageFilter(operator=IdOperator.Is, values=["requested"]),
     ]
 
     assert build_search_filter(
@@ -29,16 +23,12 @@ def test_date_filters():
     local_time_end = datetime.strptime("2025-01-01", "%Y-%m-%d")
 
     filters = [
-        WorkforceRequestedDateFilter(
-            operation=OperationType.WorforceRequestedDate,
-            value=DateValue(
-                operator=RangeOperatorWithSingleValue.GreaterThanOrEqual,
-                value=local_time_start)),
-        WorkforceStageUpdatedFilter(
-            operation=OperationType.WorkforceStageUpdatedDate,
-            value=DateValue(
-                operator=RangeOperatorWithSingleValue.LessThanOrEqual,
-                value=local_time_end)),
+        WorkforceRequestedDateFilter(value=DateValue(
+            operator=RangeOperatorWithSingleValue.GreaterThanOrEqual,
+            value=local_time_start)),
+        WorkforceStageUpdatedFilter(value=DateValue(
+            operator=RangeOperatorWithSingleValue.LessThanOrEqual,
+            value=local_time_end)),
     ]
     expected_start = format_iso_datetime(local_time_start)
     expected_end = format_iso_datetime(local_time_end)
@@ -49,24 +39,18 @@ def test_date_filters():
 
 def test_date_range_filters():
     filters = [
-        WorkforceRequestedDateRangeFilter(
-            operation=OperationType.WorforceRequestedDate,
-            value=DateRangeValue(operator=RangeOperatorWithValue.Between,
-                                 value=DateRange(min=datetime.strptime(
-                                     "2024-01-01T00:00:00-0800",
-                                     "%Y-%m-%dT%H:%M:%S%z"),
-                                                 max=datetime.strptime(
-                                                     "2025-01-01T00:00:00-0800",
-                                                     "%Y-%m-%dT%H:%M:%S%z")))),
-        WorkforceStageUpdatedRangeFilter(
-            operation=OperationType.WorkforceStageUpdatedDate,
-            value=DateRangeValue(operator=RangeOperatorWithValue.Between,
-                                 value=DateRange(min=datetime.strptime(
-                                     "2024-01-01T00:00:00-0800",
-                                     "%Y-%m-%dT%H:%M:%S%z"),
-                                                 max=datetime.strptime(
-                                                     "2025-01-01T00:00:00-0800",
-                                                     "%Y-%m-%dT%H:%M:%S%z")))),
+        WorkforceRequestedDateRangeFilter(value=DateRangeValue(
+            operator=RangeOperatorWithValue.Between,
+            value=DateRange(min=datetime.strptime("2024-01-01T00:00:00-0800",
+                                                  "%Y-%m-%dT%H:%M:%S%z"),
+                            max=datetime.strptime("2025-01-01T00:00:00-0800",
+                                                  "%Y-%m-%dT%H:%M:%S%z")))),
+        WorkforceStageUpdatedRangeFilter(value=DateRangeValue(
+            operator=RangeOperatorWithValue.Between,
+            value=DateRange(min=datetime.strptime("2024-01-01T00:00:00-0800",
+                                                  "%Y-%m-%dT%H:%M:%S%z"),
+                            max=datetime.strptime("2025-01-01T00:00:00-0800",
+                                                  "%Y-%m-%dT%H:%M:%S%z")))),
     ]
     assert build_search_filter(
         filters
@@ -75,16 +59,10 @@ def test_date_range_filters():
 
 def test_task_count_filters():
     filters = [
-        TaskCompletedCountFilter(
-            operation=OperationType.TaskCompletedCount,
-            value=IntegerValue(
-                operator=RangeOperatorWithSingleValue.GreaterThanOrEqual,
-                value=1)),
-        TaskRemainingCountFilter(
-            operation=OperationType.TaskRemainingCount,
-            value=IntegerValue(
-                operator=RangeOperatorWithSingleValue.LessThanOrEqual,
-                value=10)),
+        TaskCompletedCountFilter(value=IntegerValue(
+            operator=RangeOperatorWithSingleValue.GreaterThanOrEqual, value=1)),
+        TaskRemainingCountFilter(value=IntegerValue(
+            operator=RangeOperatorWithSingleValue.LessThanOrEqual, value=10)),
     ]
 
     expected = '[{value: {operator: "GREATER_THAN_OR_EQUAL", value: 1}, type: "task_completed_count"}, {value: {operator: "LESS_THAN_OR_EQUAL", value: 10}, type: "task_remaining_count"}]'