refactoring following review

Author: paulnoirel

libs/labelbox/src/labelbox/schema/workflow/__init__.py

@@ -7,18 +7,12 @@
 from labelbox.schema.workflow.enums import (
     WorkflowDefinitionId,
     NodeOutput,
+    NodeInput,
+    MatchFilters,
+    Scope,
     FilterField,
     FilterOperator,
 )
-from labelbox.schema.workflow.filters import (
-    Filter,
-    UserFilter,
-    MetadataFilter,
-    TimeRangeFilter,
-    DatasetFilter,
-    AnnotationFilter,
-    NLSearchFilter,
-)
 from labelbox.schema.workflow.base import (
     BaseWorkflowNode,
     NodePosition,
@@ -31,44 +25,89 @@
     LogicNode,
     DoneNode,
     CustomReworkNode,
+    AutoQANode,
     UnknownWorkflowNode,
 )
 from labelbox.schema.workflow.edges import (
     WorkflowEdge,
     WorkflowEdgeFactory,
 )
 from labelbox.schema.workflow.graph import ProjectWorkflowGraph
-from labelbox.schema.workflow.project_filter import ProjectWorkflowFilter
-from labelbox.schema.workflow.workflow import ProjectWorkflow
+from labelbox.schema.workflow.workflow import ProjectWorkflow, NodeType
+
+# Import Fluent DSL for improved filter construction
+from labelbox.schema.workflow.project_filter import (
+    # Filter construction functions
+    created_by,
+    labeled_by,
+    annotation,
+    sample,
+    dataset,
+    batch,
+    issue_category,
+    model_prediction,
+    natural_language,
+    # Metadata helper functions (NEW - recommended)
+    metadata,
+    condition,
+    # Field instances for chaining
+    labeled_at,
+    labeling_time,
+    review_time,
+    consensus_average,
+    feature_consensus_average,
+    # Main filter class
+    ProjectWorkflowFilter,
+    # Utility functions
+    convert_to_api_format,
+)
 
 # Re-export key classes at the module level
 __all__ = [
+    # Core workflow components
     "WorkflowDefinitionId",
     "NodeOutput",
+    "NodeInput",
+    "MatchFilters",
+    "Scope",
     "FilterField",
     "FilterOperator",
     "BaseWorkflowNode",
     "NodePosition",
-    "Filter",
-    "UserFilter",
-    "MetadataFilter",
-    "TimeRangeFilter",
-    "DatasetFilter",
-    "AnnotationFilter",
-    "NLSearchFilter",
     "InitialLabelingNode",
     "InitialReworkNode",
     "ReviewNode",
     "ReworkNode",
     "LogicNode",
     "DoneNode",
     "CustomReworkNode",
+    "AutoQANode",
     "UnknownWorkflowNode",
     "WorkflowEdge",
     "WorkflowEdgeFactory",
     "ProjectWorkflow",
+    "NodeType",
     "ProjectWorkflowGraph",
     "ProjectWorkflowFilter",
+    # Fluent DSL exports
+    "created_by",
+    "labeled_by",
+    "annotation",
+    "sample",
+    "dataset",
+    "batch",
+    "issue_category",
+    "model_prediction",
+    "natural_language",
+    "labeled_at",
+    "labeling_time",
+    "review_time",
+    "consensus_average",
+    "feature_consensus_average",
+    "metadata",
+    "condition",
+    # Utility functions
+    "convert_to_api_format",
 ]
 
 # Define a mapping of node types for backward compatibility
@@ -80,5 +119,6 @@
     WorkflowDefinitionId.Logic: LogicNode,
     WorkflowDefinitionId.Done: DoneNode,
     WorkflowDefinitionId.CustomReworkTask: CustomReworkNode,
+    WorkflowDefinitionId.AutoQA: AutoQANode,
     WorkflowDefinitionId.Unknown: UnknownWorkflowNode,
 }