label-studio-sdk 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

label_studio_sdk/{_legacy/label_interface → label_interface}/interface.py

@@ -12,7 +12,7 @@ from typing import Dict, Optional, List, Tuple, Any, Callable, Union
 from pydantic import BaseModel
 
 # from typing import Dict, Optional, List, Tuple, Any
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from lxml import etree
 import xmljson
 
@@ -22,18 +22,18 @@ from label_studio_sdk._legacy.exceptions import (
     LabelStudioValidationErrorSentryIgnored,
 )
 
-from label_studio_sdk._legacy.label_interface.control_tags import (
+from .control_tags import (
     ControlTag,
     ChoicesTag,
     LabelsTag,
 )
-from label_studio_sdk._legacy.label_interface.object_tags import ObjectTag
-from label_studio_sdk._legacy.label_interface.label_tags import LabelTag
+from .object_tags import ObjectTag
+from .label_tags import LabelTag
 from label_studio_sdk._legacy.objects import AnnotationValue, TaskValue, PredictionValue
 
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
-file_path = os.path.join(dir_path, "..", "schema", "label_config_schema.json")
+file_path = os.path.join(dir_path, "..", "_legacy", "schema", "label_config_schema.json")
 
 with open(file_path) as f:
     _LABEL_CONFIG_SCHEMA_DATA = json.load(f)
@@ -189,23 +189,34 @@ class LabelInterface:
     ```
     """
 
-    def __init__(self, config: str, *args, **kwargs):
+    def __init__(self, config: str, tags_mapping=None, *args, **kwargs):
         """
-        Create LabelInterface instance from the config string
-        Example:
+        Initialize a LabelInterface instance using a config string.
+
+        Args:
+          config (str): Configuration string.
+          tags_mapping: Provide your own implementation of any tag, this is helpful in cases where you want to override one of the control tags, and have your custom .label() method implemented.
+
+        The configuration string should be formatted as follows:
+
         ```
-        label_config = LabelInterface('''
         <View>
-        <Choices name="sentiment" toName="txt">
+          <Choices name="sentiment" toName="txt">
             <Choice value="Positive" />
             <Choice value="Negative" />
             <Choice value="Neutral" />
-        </Choices>
-        <Text name="txt" value="$text" />
-        ''')
+          </Choices>
+          <Text name="txt" value="$text" />
+        </View>
+        ```
+        This method will extract the predefined task from the configuration and 
+        parse the controls, objects, and labels used in it.
         """
+        self.task_loaded = False
+        
         self._config = config
-
+        self._tags_mapping = tags_mapping
+        
         # extract predefined task from the config
         _task_data, _ann, _pred = LabelInterface.get_task_from_labeling_config(config)
         self._sample_config_task = _task_data
@@ -225,6 +236,8 @@ class LabelInterface:
         self._labels = labels
         self._tree = tree
 
+        
+
     ##### NEW API
 
     @property
@@ -391,7 +404,38 @@ class LabelInterface:
             lst = list(filter(match_fn, lst))
 
         return lst
+    
+    def load_task(self, task):
+        """Loads a task and substitutes the value in each object tag
+        with actual data from the task, returning a copy of the
+        LabelConfig object.
+
+        If the `value` field in an object tag is designed to take
+        variable input (i.e., `value_is_variable` is True), the
+        function replaces this value with the corresponding value from
+        the task dictionary.
+
+        Args:
+            task (dict): Dictionary representing the task, where
+            each key-value pair denotes an attribute-value of the
+            task.
+
+        Returns:
+            LabelInterface: A deep copy of the current LabelIntreface
+            instance with the object tags' value fields populated with
+            data from the task.
+
+        """
+        tree = copy.deepcopy(self)
+        tree.task_loaded = True
+        
+        for obj in tree.objects:
+            print(obj.value_is_variable, obj.value_name)
+            if obj.value_is_variable and obj.value_name in task:
+                obj.value = task.get(obj.value_name)
 
+        return tree
+    
     def parse(self, config_string: str) -> Tuple[Dict, Dict, Dict, etree._Element]:
         """Parses the received configuration string into dictionaries
         of ControlTags, ObjectTags, and Labels, along with an XML tree
@@ -422,10 +466,10 @@ class LabelInterface:
                 variables.append(tag.attrib["indexFlag"])
 
             if ControlTag.validate_node(tag):
-                controls[tag.attrib["name"]] = ControlTag.parse_node(tag)
+                controls[tag.attrib["name"]] = ControlTag.parse_node(tag, tags_mapping=self._tags_mapping)
 
             elif ObjectTag.validate_node(tag):
-                objects[tag.attrib["name"]] = ObjectTag.parse_node(tag)
+                objects[tag.attrib["name"]] = ObjectTag.parse_node(tag, tags_mapping=self._tags_mapping)
 
             elif LabelTag.validate_node(tag):
                 lb = LabelTag.parse_node(tag, controls)
@@ -488,34 +532,6 @@ class LabelInterface:
                 "Label config contains non-unique names"
             )
 
-    def load_task(self, task):
-        """Loads a task and substitutes the value in each object tag
-        with actual data from the task, returning a copy of the
-        LabelConfig object.
-
-        If the `value` field in an object tag is designed to take
-        variable input (i.e., `value_is_variable` is True), the
-        function replaces this value with the corresponding value from
-        the task dictionary.
-
-        Args:
-            task (dict): Dictionary representing the task, where
-            each key-value pair denotes an attribute-value of the
-            task.
-
-        Returns:
-            LabelInterface: A deep copy of the current LabelIntreface
-            instance with the object tags' value fields populated with
-            data from the task.
-
-        """
-        tree = copy.deepcopy(self)
-        for obj in tree.objects:
-            if obj.value_is_variable and obj.value_name in task:
-                obj.value = task.get(obj.value_name)
-
-        return tree
-
     @property
     def is_valid(self):
         """ """
@@ -568,6 +584,23 @@ class LabelInterface:
 
         return True
 
+    def _validate_object(self, obj):
+        """ """
+        regions = []
+        for r in obj.get(RESULT_KEY):
+            if r.get('type') != "relation":
+                if not self.validate_region(r):
+                    return False
+
+                regions.append(r)
+
+        for r in obj.get(RESULT_KEY):
+            if r.get('type') == "relation" and \
+               not self.validate_relation(r, regions):
+                return False
+
+        return True                                                
+        
     def validate_annotation(self, annotation):
         """Validates the given annotation against the current configuration.
 
@@ -586,11 +619,11 @@ class LabelInterface:
             validation, False otherwise.
 
         """
-        return all(self.validate_region(r) for r in annotation.get(RESULT_KEY))
+        return self._validate_object(annotation)
 
     def validate_prediction(self, prediction):
         """Same as validate_annotation right now"""
-        return all(self.validate_region(r) for r in prediction.get(RESULT_KEY))
+        return self._validate_object(prediction)
 
     def validate_region(self, region) -> bool:
         """Validates a region from the annotation against the current
@@ -620,22 +653,35 @@ class LabelInterface:
         if not control or not obj:
             return False
 
-        # type of the region should match the tag name
+        # type of the region should match the tag name        
         if control.tag.lower() != region["type"]:
             return False
-
+        
         # make sure that in config it connects to the same tag as
         # immplied by the region data
         if region["to_name"] not in control.to_name:
             return False
-
+        
         # validate the actual value, for example that <Labels /> tag
         # is producing start, end, and labels
         if not control.validate_value(region["value"]):
             return False
-
+        
         return True
 
+    def validate_relation(self, relation, regions, _mapping=None) -> bool:
+        """Validates that the relation is correct and all the associated objects are provided"""
+        if _mapping is None:
+            _mapping = { r['id']: r for r in regions }
+
+        if relation.get("type") != "relation" or \
+           relation.get("direction") not in ("left", "right", "bi") or \
+           relation.get("from_id") not in _mapping or \
+           relation.get("to_id") not in _mapping:
+            return False
+        
+        return True
+    
     ### Generation
 
     def _sample_task(self, secure_mode=False):

label_studio_sdk/{_legacy/label_interface → label_interface}/object_tags.py

@@ -8,7 +8,7 @@ import xml.etree.ElementTree
 from urllib.parse import urlencode
 from typing import Optional
 
-from .base import LabelStudioTag
+from .base import LabelStudioTag, get_tag_class
 
 _TAG_TO_CLASS = {
     "audio": "AudioTag",
@@ -77,12 +77,6 @@ def data_examples(
     return _DATA_EXAMPLES[mode]
 
 
-def get_tag_class(name):
-    """ """
-    class_name = _TAG_TO_CLASS.get(name.lower())
-    return globals().get(class_name, None)
-
-
 class ObjectTag(LabelStudioTag):
     """
     Class that represents a ObjectTag in Label Studio
@@ -103,7 +97,7 @@ class ObjectTag(LabelStudioTag):
     # self._value_type = value_type
 
     @classmethod
-    def parse_node(cls, tag: xml.etree.ElementTree.Element) -> "ObjectTag":
+    def parse_node(cls, tag: xml.etree.ElementTree.Element, tags_mapping=None) -> "ObjectTag":
         """
         This class method parses a node and returns a ObjectTag object if the node has a name and a value.
 
@@ -117,8 +111,10 @@ class ObjectTag(LabelStudioTag):
         ObjectTag
             A new ObjectTag object with the tag name, attributes, name, and value.
         """
-        tag_class = get_tag_class(tag.tag) or cls
-
+        tag_class = get_tag_class(tag.tag, _TAG_TO_CLASS, re_mapping=tags_mapping) or cls
+        if isinstance(tag_class, str):
+            tag_class = globals().get(tag_class, None)
+        
         return tag_class(
             tag=tag.tag,
             attr=dict(tag.attrib),
@@ -146,10 +142,9 @@ class ObjectTag(LabelStudioTag):
     @property
     def value_is_variable(self) -> bool:
         """Check if value has variable"""
-        pattern = re.compile(r"^\$[A-Za-z_]+$")
+        pattern = re.compile(r"^\$[^, ]+$")
         return bool(pattern.fullmatch(self.value))
-
-        # TODO this should not be here as soon as we cover all the tags
+    
 
     # and have generate_example in each
     def generate_example_value(self, mode="upload", secure_mode=False):

label_studio_sdk/label_interface/region.py

@@ -0,0 +1,75 @@
+"""
+"""
+
+import json
+from uuid import uuid4
+
+from typing import Any, List, Dict, Optional
+from pydantic import BaseModel, Field
+
+
+class Region(BaseModel):
+    """
+    Class for Region Tag
+
+    Attributes:
+    -----------
+    id: str
+        The unique identifier of the region
+    x: int
+        The x coordinate of the region
+    y: int
+
+    """
+
+    id: str = Field(default_factory=lambda: str(uuid4()))
+    from_tag: Any
+    to_tag: Any
+    value: Any
+    relations: Optional[List[Dict]] = []
+
+    def _dict(self):
+        """ """
+        return {
+            "id": self.id,
+            "from_name": self.from_tag.name,
+            "to_name": self.to_tag.name,
+            "type": self.from_tag.tag.lower(),
+            # TODO This needs to be improved
+            "value": self.value.dict(),
+        }
+
+    def _dict_relations(self):
+        """ """
+        # this code does not include "labels" key if no labels were passed
+        return [
+            {**{
+                "from_id": self.id,
+                "to_id": rel.get("region", {}).id,
+                "type": "relation",
+                "direction": rel.get("direction", "right")},
+             **({"labels": rel["labels"]} if rel.get("labels") else {})
+             }
+            for rel in self.relations
+        ]
+               
+    def to_json(self):
+        """ """
+        return json.dumps(self._dict())
+
+    def to_json_relations(self):
+        """ """
+        return json.dumps(self._dict_relations())
+
+    @property
+    def has_relations(self):
+        return len(self.relations) > 0
+    
+    def add_relation(self, region=None, direction="right", label=None):
+        """ """
+        self.relations.append({ "region": region, "direction": direction, "labels": label })
+        
+    def set_relations(self, rels):
+        """ """
+        self.relations = rels
+        

label_studio_sdk/projects/client.py

@@ -82,6 +82,7 @@ class ProjectsClient:
         )
         client.projects.list()
         """
+        page = page or 1
         _response = self._client_wrapper.httpx_client.request(
             "api/projects/",
             method="GET",
@@ -95,7 +96,7 @@ class ProjectsClient:
                 ordering=ordering,
                 ids=ids,
                 title=title,
-                page=page + 1 if page is not None else 1,
+                page=page + 1,
                 page_size=page_size,
                 request_options=request_options,
             )
@@ -597,6 +598,7 @@ class AsyncProjectsClient:
         )
         await client.projects.list()
         """
+        page = page or 1
         _response = await self._client_wrapper.httpx_client.request(
             "api/projects/",
             method="GET",
@@ -610,7 +612,7 @@ class AsyncProjectsClient:
                 ordering=ordering,
                 ids=ids,
                 title=title,
-                page=page + 1 if page is not None else 1,
+                page=page + 1,
                 page_size=page_size,
                 request_options=request_options,
             )

label_studio_sdk/projects/client_ext.py

@@ -0,0 +1,19 @@
+from .client import ProjectsClient, AsyncProjectsClient
+
+from label_studio_sdk._extensions.pager_ext import SyncPagerExt, AsyncPagerExt, T
+
+
+class ProjectsClientExt(ProjectsClient):
+
+    def list(self, **kwargs) -> SyncPagerExt[T]:
+        return SyncPagerExt.from_sync_pager(super().list(**kwargs))
+
+    list.__doc__ = ProjectsClient.list.__doc__
+
+
+class AsyncProjectsClientExt(AsyncProjectsClient):
+
+    async def list(self, **kwargs):
+        return await AsyncPagerExt.from_async_pager(await super().list(**kwargs))
+
+    list.__doc__ = AsyncProjectsClient.list.__doc__

label_studio_sdk/tasks/client.py

@@ -126,6 +126,7 @@ class TasksClient:
         fields: typing.Optional[TasksListRequestFields] = None,
         review: typing.Optional[bool] = None,
         include: typing.Optional[str] = None,
+        query: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> SyncPager[Task]:
         """
@@ -161,6 +162,14 @@ class TasksClient:
         include : typing.Optional[str]
             Specify which fields to include in the response
 
+        query : typing.Optional[str]
+            Additional query to filter tasks. It must be JSON encoded string of dict containing one of the following parameters: `{"filters": ..., "selectedItems": ..., "ordering": ...}`. Check Data Manager > Create View for more details about filters, selectedItems and ordering.
+
+            - **filters**: dict with `"conjunction"` string (`"or"` or `"and"`) and list of filters in `"items"` array. Each filter is a dictionary with keys: `"filter"`, `"operator"`, `"type"`, `"value"`. [Read more about available filters](https://labelstud.io/sdk/data_manager.html)<br/> Example: `{"conjunction": "or", "items": [{"filter": "filter:tasks:completed_at", "operator": "greater", "type": "Datetime", "value": "2021-01-01T00:00:00.000Z"}]}`
+            - **selectedItems**: dictionary with keys: `"all"`, `"included"`, `"excluded"`. If "all" is `false`, `"included"` must be used. If "all" is `true`, `"excluded"` must be used.<br/> Examples: `{"all": false, "included": [1, 2, 3]}` or `{"all": true, "excluded": [4, 5]}`
+            - **ordering**: list of fields to order by. Currently, ordering is supported by only one parameter. <br/>
+              Example: `["completed_at"]`
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -178,6 +187,7 @@ class TasksClient:
         )
         client.tasks.list()
         """
+        page = page or 1
         _response = self._client_wrapper.httpx_client.request(
             "api/tasks/",
             method="GET",
@@ -190,6 +200,7 @@ class TasksClient:
                 "fields": fields,
                 "review": review,
                 "include": include,
+                "query": query,
             },
             request_options=request_options,
         )
@@ -197,7 +208,7 @@ class TasksClient:
             _parsed_response = pydantic_v1.parse_obj_as(TasksListResponse, _response.json())  # type: ignore
             _has_next = True
             _get_next = lambda: self.list(
-                page=page + 1 if page is not None else 1,
+                page=page + 1,
                 page_size=page_size,
                 view=view,
                 project=project,
@@ -205,6 +216,7 @@ class TasksClient:
                 fields=fields,
                 review=review,
                 include=include,
+                query=query,
                 request_options=request_options,
             )
             _items = _parsed_response.tasks
@@ -522,6 +534,7 @@ class AsyncTasksClient:
         fields: typing.Optional[TasksListRequestFields] = None,
         review: typing.Optional[bool] = None,
         include: typing.Optional[str] = None,
+        query: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncPager[Task]:
         """
@@ -557,6 +570,14 @@ class AsyncTasksClient:
         include : typing.Optional[str]
             Specify which fields to include in the response
 
+        query : typing.Optional[str]
+            Additional query to filter tasks. It must be JSON encoded string of dict containing one of the following parameters: `{"filters": ..., "selectedItems": ..., "ordering": ...}`. Check Data Manager > Create View for more details about filters, selectedItems and ordering.
+
+            - **filters**: dict with `"conjunction"` string (`"or"` or `"and"`) and list of filters in `"items"` array. Each filter is a dictionary with keys: `"filter"`, `"operator"`, `"type"`, `"value"`. [Read more about available filters](https://labelstud.io/sdk/data_manager.html)<br/> Example: `{"conjunction": "or", "items": [{"filter": "filter:tasks:completed_at", "operator": "greater", "type": "Datetime", "value": "2021-01-01T00:00:00.000Z"}]}`
+            - **selectedItems**: dictionary with keys: `"all"`, `"included"`, `"excluded"`. If "all" is `false`, `"included"` must be used. If "all" is `true`, `"excluded"` must be used.<br/> Examples: `{"all": false, "included": [1, 2, 3]}` or `{"all": true, "excluded": [4, 5]}`
+            - **ordering**: list of fields to order by. Currently, ordering is supported by only one parameter. <br/>
+              Example: `["completed_at"]`
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -574,6 +595,7 @@ class AsyncTasksClient:
         )
         await client.tasks.list()
         """
+        page = page or 1
         _response = await self._client_wrapper.httpx_client.request(
             "api/tasks/",
             method="GET",
@@ -586,6 +608,7 @@ class AsyncTasksClient:
                 "fields": fields,
                 "review": review,
                 "include": include,
+                "query": query,
             },
             request_options=request_options,
         )
@@ -593,7 +616,7 @@ class AsyncTasksClient:
             _parsed_response = pydantic_v1.parse_obj_as(TasksListResponse, _response.json())  # type: ignore
             _has_next = True
             _get_next = lambda: self.list(
-                page=page + 1 if page is not None else 1,
+                page=page + 1,
                 page_size=page_size,
                 view=view,
                 project=project,
@@ -601,6 +624,7 @@ class AsyncTasksClient:
                 fields=fields,
                 review=review,
                 include=include,
+                query=query,
                 request_options=request_options,
             )
             _items = _parsed_response.tasks

label_studio_sdk/tasks/client_ext.py

@@ -0,0 +1,18 @@
+from .client import TasksClient, AsyncTasksClient
+from label_studio_sdk._extensions.pager_ext import SyncPagerExt, AsyncPagerExt, T
+
+
+class TasksClientExt(TasksClient):
+
+    def list(self, **kwargs) -> SyncPagerExt[T]:
+        return SyncPagerExt.from_sync_pager(super().list(**kwargs))
+
+    list.__doc__ = TasksClient.list.__doc__
+
+
+class AsyncTasksClientExt(AsyncTasksClient):
+
+    async def list(self, **kwargs):
+        return await AsyncPagerExt.from_async_pager(await super().list(**kwargs))
+
+    list.__doc__ = AsyncTasksClient.list.__doc__

label_studio_sdk/types/annotation.py

@@ -10,6 +10,11 @@ from .annotation_last_action import AnnotationLastAction
 
 class Annotation(pydantic_v1.BaseModel):
     id: typing.Optional[int] = None
+    result: typing.Optional[typing.List[typing.Dict[str, typing.Any]]] = pydantic_v1.Field(default=None)
+    """
+    List of annotation results for the task
+    """
+
     created_username: typing.Optional[str] = pydantic_v1.Field(default=None)
     """
     Username string
@@ -22,11 +27,6 @@ class Annotation(pydantic_v1.BaseModel):
 
     completed_by: typing.Optional[int] = None
     unique_id: typing.Optional[str] = None
-    result: typing.Optional[typing.Dict[str, typing.Any]] = pydantic_v1.Field(default=None)
-    """
-    The main value of annotator work - labeling result in JSON format
-    """
-
     was_cancelled: typing.Optional[bool] = pydantic_v1.Field(default=None)
     """
     User skipped the task

label_studio_sdk/types/task.py

@@ -58,7 +58,7 @@ class Task(pydantic_v1.BaseModel):
     Completion time of the task
     """
 
-    file_upload: typing.Optional[int] = pydantic_v1.Field(default=None)
+    file_upload: typing.Optional[str] = pydantic_v1.Field(default=None)
     """
     File upload ID for this task
     """

label_studio_sdk/views/__init__.py

@@ -5,14 +5,16 @@ from .types import (
     ViewsCreateRequestDataFilters,
     ViewsCreateRequestDataFiltersConjunction,
     ViewsCreateRequestDataFiltersItemsItem,
+    ViewsCreateRequestDataFiltersItemsItemFilter,
+    ViewsCreateRequestDataFiltersItemsItemOperator,
     ViewsCreateRequestDataOrderingItem,
-    ViewsCreateRequestDataOrderingItemDirection,
     ViewsUpdateRequestData,
     ViewsUpdateRequestDataFilters,
     ViewsUpdateRequestDataFiltersConjunction,
     ViewsUpdateRequestDataFiltersItemsItem,
+    ViewsUpdateRequestDataFiltersItemsItemFilter,
+    ViewsUpdateRequestDataFiltersItemsItemOperator,
     ViewsUpdateRequestDataOrderingItem,
-    ViewsUpdateRequestDataOrderingItemDirection,
 )
 
 __all__ = [
@@ -20,12 +22,14 @@ __all__ = [
     "ViewsCreateRequestDataFilters",
     "ViewsCreateRequestDataFiltersConjunction",
     "ViewsCreateRequestDataFiltersItemsItem",
+    "ViewsCreateRequestDataFiltersItemsItemFilter",
+    "ViewsCreateRequestDataFiltersItemsItemOperator",
     "ViewsCreateRequestDataOrderingItem",
-    "ViewsCreateRequestDataOrderingItemDirection",
     "ViewsUpdateRequestData",
     "ViewsUpdateRequestDataFilters",
     "ViewsUpdateRequestDataFiltersConjunction",
     "ViewsUpdateRequestDataFiltersItemsItem",
+    "ViewsUpdateRequestDataFiltersItemsItemFilter",
+    "ViewsUpdateRequestDataFiltersItemsItemOperator",
     "ViewsUpdateRequestDataOrderingItem",
-    "ViewsUpdateRequestDataOrderingItemDirection",
 ]

label_studio_sdk/views/types/__init__.py

@@ -4,26 +4,30 @@ from .views_create_request_data import ViewsCreateRequestData
 from .views_create_request_data_filters import ViewsCreateRequestDataFilters
 from .views_create_request_data_filters_conjunction import ViewsCreateRequestDataFiltersConjunction
 from .views_create_request_data_filters_items_item import ViewsCreateRequestDataFiltersItemsItem
+from .views_create_request_data_filters_items_item_filter import ViewsCreateRequestDataFiltersItemsItemFilter
+from .views_create_request_data_filters_items_item_operator import ViewsCreateRequestDataFiltersItemsItemOperator
 from .views_create_request_data_ordering_item import ViewsCreateRequestDataOrderingItem
-from .views_create_request_data_ordering_item_direction import ViewsCreateRequestDataOrderingItemDirection
 from .views_update_request_data import ViewsUpdateRequestData
 from .views_update_request_data_filters import ViewsUpdateRequestDataFilters
 from .views_update_request_data_filters_conjunction import ViewsUpdateRequestDataFiltersConjunction
 from .views_update_request_data_filters_items_item import ViewsUpdateRequestDataFiltersItemsItem
+from .views_update_request_data_filters_items_item_filter import ViewsUpdateRequestDataFiltersItemsItemFilter
+from .views_update_request_data_filters_items_item_operator import ViewsUpdateRequestDataFiltersItemsItemOperator
 from .views_update_request_data_ordering_item import ViewsUpdateRequestDataOrderingItem
-from .views_update_request_data_ordering_item_direction import ViewsUpdateRequestDataOrderingItemDirection
 
 __all__ = [
     "ViewsCreateRequestData",
     "ViewsCreateRequestDataFilters",
     "ViewsCreateRequestDataFiltersConjunction",
     "ViewsCreateRequestDataFiltersItemsItem",
+    "ViewsCreateRequestDataFiltersItemsItemFilter",
+    "ViewsCreateRequestDataFiltersItemsItemOperator",
     "ViewsCreateRequestDataOrderingItem",
-    "ViewsCreateRequestDataOrderingItemDirection",
     "ViewsUpdateRequestData",
     "ViewsUpdateRequestDataFilters",
     "ViewsUpdateRequestDataFiltersConjunction",
     "ViewsUpdateRequestDataFiltersItemsItem",
+    "ViewsUpdateRequestDataFiltersItemsItemFilter",
+    "ViewsUpdateRequestDataFiltersItemsItemOperator",
     "ViewsUpdateRequestDataOrderingItem",
-    "ViewsUpdateRequestDataOrderingItemDirection",
 ]