rapidata 2.27.0__py3-none-any.whl → 2.44.4__py3-none-any.whl

rapidata/rapidata_client/order/rapidata_order_manager.py

@@ -1,161 +1,168 @@
-from typing import Sequence, Optional
-from urllib3._collections import HTTPHeaderDict # type: ignore[import]
-from itertools import zip_longest
+from __future__ import annotations
 
-from rapidata.service.openapi_service import OpenAPIService
-from rapidata.rapidata_client.assets.data_type_enum import RapidataDataTypes
-from rapidata.rapidata_client.order.rapidata_order import RapidataOrder
-from rapidata.rapidata_client.order._rapidata_order_builder import RapidataOrderBuilder
-from rapidata.rapidata_client.metadata import PromptMetadata, SelectWordsMetadata, PrivateTextMetadata, MediaAssetMetadata, Metadata
-from rapidata.rapidata_client.referee._naive_referee import NaiveReferee
-from rapidata.rapidata_client.referee._early_stopping_referee import EarlyStoppingReferee
-from rapidata.rapidata_client.selection._base_selection import RapidataSelection
-from rapidata.rapidata_client.workflow import (
-    Workflow,
-    ClassifyWorkflow,
-    CompareWorkflow,
-    FreeTextWorkflow,
-    SelectWordsWorkflow,
-    LocateWorkflow,
-    DrawWorkflow,
-    TimestampWorkflow,
-    RankingWorkflow
+from typing import Literal, Optional, Sequence, get_args, TYPE_CHECKING
+
+from rapidata.rapidata_client.config import logger
+from rapidata.rapidata_client.config.tracer import tracer
+from rapidata.rapidata_client.datapoints._asset_uploader import AssetUploader
+from rapidata.rapidata_client.datapoints._datapoint import Datapoint
+from rapidata.rapidata_client.datapoints._datapoints_validator import (
+    DatapointsValidator,
 )
-from rapidata.rapidata_client.selection.validation_selection import ValidationSelection
-from rapidata.rapidata_client.selection.labeling_selection import LabelingSelection
-from rapidata.rapidata_client.assets import MediaAsset, TextAsset, MultiAsset
 from rapidata.rapidata_client.filter import RapidataFilter
 from rapidata.rapidata_client.filter.rapidata_filters import RapidataFilters
-from rapidata.rapidata_client.settings import RapidataSettings, RapidataSetting
+from rapidata.rapidata_client.settings import RapidataSetting, RapidataSettings
 from rapidata.rapidata_client.selection.rapidata_selections import RapidataSelections
-from rapidata.rapidata_client.logging import logger, RapidataOutputManager
-
-from rapidata.api_client.models.query_model import QueryModel
-from rapidata.api_client.models.page_info import PageInfo
-from rapidata.api_client.models.root_filter import RootFilter
-from rapidata.api_client.models.filter import Filter
-from rapidata.api_client.models.sort_criterion import SortCriterion
+from rapidata.service.openapi_service import OpenAPIService
 
-from tqdm import tqdm
+if TYPE_CHECKING:
+    from rapidata.rapidata_client.order._rapidata_order_builder import (
+        StickyStateLiteral,
+    )
+    from rapidata.rapidata_client.order.rapidata_order import RapidataOrder
+    from rapidata.rapidata_client.selection._base_selection import RapidataSelection
+    from rapidata.rapidata_client.workflow import (
+        Workflow,
+    )
 
 
 class RapidataOrderManager:
     """
     Handels everything regarding the orders from creation to retrieval.
-    
+
     Attributes:
         filters (RapidataFilters): The RapidataFilters instance.
         settings (RapidataSettings): The RapidataSettings instance.
         selections (RapidataSelections): The RapidataSelections instance."""
 
     def __init__(self, openapi_service: OpenAPIService):
-        self._openapi_service = openapi_service
+        self.__openapi_service = openapi_service
         self.filters = RapidataFilters
         self.settings = RapidataSettings
         self.selections = RapidataSelections
-        self.__priority = 50
+        from rapidata.rapidata_client.order._rapidata_order_builder import (
+            StickyStateLiteral,
+        )
+
+        self.__priority: int | None = None
+        self.__sticky_state: StickyStateLiteral | None = None
+        self._asset_uploader = AssetUploader(openapi_service)
         logger.debug("RapidataOrderManager initialized")
 
-    def __get_selections(self, validation_set_id: str | None, labeling_amount=3) -> Sequence[RapidataSelection]:
-        if validation_set_id:
-            return [ValidationSelection(validation_set_id=validation_set_id), LabelingSelection(amount=labeling_amount-1)]
-        return [LabelingSelection(amount=labeling_amount)]
-    
-    def _create_general_order(self,
-            name: str,
-            workflow: Workflow,
-            assets: list[MediaAsset] | list[TextAsset] | list[MultiAsset],
-            responses_per_datapoint: int = 10,
-            contexts: list[str] | None = None,
-            media_contexts: list[str] | None = None,
-            validation_set_id: str | None = None,
-            confidence_threshold: float | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            sentences: list[str] | None = None,
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-            default_labeling_amount: int = 3
-        ) -> RapidataOrder:
-        
-        if contexts and len(contexts) != len(assets):
-            raise ValueError("Number of contexts must match number of datapoints")
-        
-        if media_contexts and len(media_contexts) != len(assets):
-            raise ValueError("Number of media contexts must match number of datapoints")
-        
-        if sentences and len(sentences) != len(assets):
-            raise ValueError("Number of sentences must match number of datapoints")
-
-        if private_notes and len(private_notes) != len(assets):
-            raise ValueError("Number of private notes must match number of datapoints")
-        
-        if sentences and contexts:
-            raise ValueError("You can only use contexts or sentences, not both")
+    def _create_general_order(
+        self,
+        name: str,
+        workflow: Workflow,
+        datapoints: list[Datapoint],
+        responses_per_datapoint: int = 10,
+        validation_set_id: str | None = None,
+        confidence_threshold: float | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+    ) -> RapidataOrder:
+        if filters is None:
+            filters = []
+        if settings is None:
+            settings = []
+        if selections is None:
+            selections = []
 
         if not confidence_threshold:
+            from rapidata.rapidata_client.referee._naive_referee import NaiveReferee
+
             referee = NaiveReferee(responses=responses_per_datapoint)
         else:
+            from rapidata.rapidata_client.referee._early_stopping_referee import (
+                EarlyStoppingReferee,
+            )
+
             referee = EarlyStoppingReferee(
                 threshold=confidence_threshold,
                 max_vote_count=responses_per_datapoint,
             )
 
-        order_builder = RapidataOrderBuilder(name=name, openapi_service=self._openapi_service)
+        logger.debug(
+            "Creating order with parameters: name %s, workflow %s, datapoints %s, responses_per_datapoint %s, validation_set_id %s, confidence_threshold %s, filters %s, settings %s, selections %s",
+            name,
+            workflow,
+            datapoints,
+            responses_per_datapoint,
+            validation_set_id,
+            confidence_threshold,
+            filters,
+            settings,
+            selections,
+        )
+
+        from rapidata.rapidata_client.order._rapidata_order_builder import (
+            RapidataOrderBuilder,
+        )
+
+        order_builder = RapidataOrderBuilder(
+            name=name, openapi_service=self.__openapi_service
+        )
 
         if selections and validation_set_id:
-            logger.warning("Warning: Both selections and validation_set_id provided. Ignoring validation_set_id.")
-        
-        if not selections:
-            selections = self.__get_selections(validation_set_id, labeling_amount=default_labeling_amount)
-
-        prompts_metadata = [PromptMetadata(prompt=prompt) for prompt in contexts] if contexts else None
-        sentence_metadata = [SelectWordsMetadata(select_words=sentence) for sentence in sentences] if sentences else None
-
-        if prompts_metadata and sentence_metadata:
-            raise ValueError("You can only use contexts or sentences, not both")
-        
-        asset_metadata: Sequence[Metadata] = [MediaAssetMetadata(url=context) for context in media_contexts] if media_contexts else []
-        prompt_metadata: Sequence[Metadata] = prompts_metadata or sentence_metadata or []
-        private_notes_metadata: Sequence[Metadata] = [PrivateTextMetadata(text=text) for text in private_notes] if private_notes else []
-
-        multi_metadata = [[item for item in items if item is not None] 
-                     for items in zip_longest(prompt_metadata, asset_metadata, private_notes_metadata)]
-
-        order = (order_builder
-                 ._workflow(workflow)
-                 ._media(
-                     assets=assets,
-                     multi_metadata=multi_metadata
-                     )
-                 ._referee(referee)
-                 ._filters(filters)
-                 ._selections(selections) 
-                 ._settings(settings)
-                 ._priority(self.__priority)
-                 ._create()
-                 )
+            logger.warning(
+                "Warning: Both selections and validation_set_id provided. Ignoring validation_set_id."
+            )
+
+        order = (
+            order_builder._set_workflow(workflow)
+            ._set_datapoints(datapoints=datapoints)
+            ._set_referee(referee)
+            ._set_filters(filters)
+            ._set_selections(selections)
+            ._set_settings(settings)
+            ._set_validation_set_id(validation_set_id if not selections else None)
+            ._set_priority(self.__priority)
+            ._set_sticky_state(self.__sticky_state)
+            ._create()
+        )
+        logger.debug("Order created: %s", order)
         return order
-    
-    def _set_priority(self, priority: int):
+
+    def _set_priority(self, priority: int | None):
+        if priority is not None and not isinstance(priority, int):
+            raise TypeError("Priority must be an integer or None")
+
+        if priority is not None and priority < 0:
+            raise ValueError("Priority must be greater than 0 or None")
+
         self.__priority = priority
-        
-    def create_classification_order(self,
-            name: str,
-            instruction: str,
-            answer_options: list[str],
-            datapoints: list[str],
-            data_type: str = RapidataDataTypes.MEDIA,
-            responses_per_datapoint: int = 10,
-            contexts: list[str] | None = None,
-            media_contexts: list[str] | None = None,
-            validation_set_id: str | None = None,
-            confidence_threshold: float | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+
+    def _set_sticky_state(self, sticky_state: StickyStateLiteral | None):
+        from rapidata.rapidata_client.order._rapidata_order_builder import (
+            StickyStateLiteral,
+        )
+
+        sticky_state_valid_values = get_args(StickyStateLiteral)
+
+        if sticky_state is not None and sticky_state not in sticky_state_valid_values:
+            raise ValueError(
+                f"Sticky state must be one of {sticky_state_valid_values} or None"
+            )
+
+        self.__sticky_state = sticky_state
+
+    def create_classification_order(
+        self,
+        name: str,
+        instruction: str,
+        answer_options: list[str],
+        datapoints: list[str],
+        data_type: Literal["media", "text"] = "media",
+        responses_per_datapoint: int = 10,
+        contexts: list[str] | None = None,
+        media_contexts: list[str] | None = None,
+        validation_set_id: str | None = None,
+        confidence_threshold: float | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a classification order.
 
         With this order you can have a datapoint (image, text, video, audio) be classified into one of the answer options.
@@ -166,8 +173,8 @@ class RapidataOrderManager:
             instruction (str): The instruction for how the data should be classified.
             answer_options (list[str]): The list of options for the classification.
             datapoints (list[str]): The list of datapoints for the classification - each datapoint will be labeled.
-            data_type (str, optional): The data type of the datapoints. Defaults to RapidataDataTypes.MEDIA. \n
-                Other option: RapidataDataTypes.TEXT ("text").
+            data_type (str, optional): The data type of the datapoints. Defaults to "media" (any form of image, video or audio). \n
+                Other option: "text".
             responses_per_datapoint (int, optional): The number of responses that will be collected per datapoint. Defaults to 10.
             contexts (list[str], optional): The list of contexts for the classification. Defaults to None.\n
                 If provided has to be the same length as datapoints and will be shown in addition to the instruction and options. (Therefore will be different for each datapoint)
@@ -182,50 +189,74 @@ class RapidataOrderManager:
             settings (Sequence[RapidataSetting], optional): The list of settings for the classification. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the classification. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the classification. Defaults to None.
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
+
+        Example:
+            ```python
+            from rapidata import RapidataClient, NoShuffle
+
+            rapi = RapidataClient()
+            order = rapi.order.create_classification_order(
+                name="Image Quality Rating",
+                instruction="How would you rate the quality of this image?",
+                answer_options=["1: Poor", "2: Fair", "3: Good", "4: Excellent"],
+                datapoints=["https://example.com/image1.jpg", "https://example.com/image2.jpg"],
+                responses_per_datapoint=15,
+                settings=[NoShuffle()],  # Keep options in order for Likert scale
+            ).run()
+
+            results = order.get_results()
+            ```
         """
-        
-        if data_type == RapidataDataTypes.MEDIA:
-            assets = [MediaAsset(path=path) for path in datapoints]
-        elif data_type == RapidataDataTypes.TEXT:
-            assets = [TextAsset(text=text) for text in datapoints]
-        else:
-            raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
-        
-        return self._create_general_order(
-            name=name,
-            workflow=ClassifyWorkflow(
-                instruction=instruction,
-                answer_options=answer_options
-            ),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            contexts=contexts,
-            media_contexts=media_contexts,
-            validation_set_id=validation_set_id,
-            confidence_threshold=confidence_threshold,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            private_notes=private_notes
-        )
-    
-    def create_compare_order(self,
-            name: str,
-            instruction: str,
-            datapoints: list[list[str]],
-            data_type: str = RapidataDataTypes.MEDIA,
-            responses_per_datapoint: int = 10,
-            contexts: list[str] | None = None,
-            media_contexts: list[str] | None = None,
-            validation_set_id: str | None = None,
-            confidence_threshold: float | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+        with tracer.start_as_current_span(
+            "RapidataOrderManager.create_classification_order"
+        ):
+            if not isinstance(datapoints, list) or not all(
+                isinstance(datapoint, str) for datapoint in datapoints
+            ):
+                raise ValueError("Datapoints must be a list of strings")
+
+            from rapidata.rapidata_client.workflow import ClassifyWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                contexts=contexts,
+                media_contexts=media_contexts,
+                private_notes=private_notes,
+                data_type=data_type,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=ClassifyWorkflow(
+                    instruction=instruction, answer_options=answer_options
+                ),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                validation_set_id=validation_set_id,
+                confidence_threshold=confidence_threshold,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
+
+    def create_compare_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[list[str]],
+        data_type: Literal["media", "text"] = "media",
+        responses_per_datapoint: int = 10,
+        contexts: list[str] | None = None,
+        media_contexts: list[str] | None = None,
+        a_b_names: list[str] | None = None,
+        validation_set_id: str | None = None,
+        confidence_threshold: float | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a compare order.
 
         With this order you compare two datapoints (image, text, video, audio) and the annotators will choose one of the two based on the instruction.
@@ -234,8 +265,8 @@ class RapidataOrderManager:
             name (str): The name of the order. (Will not be shown to the labeler)
             instruction (str): The instruction for the comparison. Will be shown along side each datapoint.
             datapoints (list[list[str]]): Outher list is the datapoints, inner list is the options for the comparison - each datapoint will be labeled.
-            data_type (str, optional): The data type of the datapoints. Defaults to RapidataDataTypes.MEDIA. \n
-                Other option: RapidataDataTypes.TEXT ("text").
+            data_type (str, optional): The data type of the datapoints. Defaults to "media" (any form of image, video or audio). \n
+                Other option: "text".
             responses_per_datapoint (int, optional): The number of responses that will be collected per datapoint. Defaults to 10.
             contexts (list[str], optional): The list of contexts for the comparison. Defaults to None.\n
                 If provided has to be the same length as datapoints and will be shown in addition to the instruction. (Therefore will be different for each datapoint)
@@ -243,6 +274,15 @@ class RapidataOrderManager:
             media_contexts (list[str], optional): The list of media contexts i.e. links to the images / videos for the comparison. Defaults to None.\n
                 If provided has to be the same length as datapoints and will be shown in addition to the instruction. (Therefore will be different for each datapoint)
                 Will be matched up with the datapoints using the list index.
+            a_b_names (list[str], optional): Custom naming for the two opposing models defined by the index in the datapoints list. Defaults to None.\n
+                If provided has to be a list of exactly two strings.
+                example:
+                ```python
+                datapoints = [["path_to_image_A", "path_to_image_B"], ["path_to_text_A", "path_to_text_B"]]
+                a_b_naming = ["Model A", "Model B"]
+                ```
+                The results will then correctly show "Model A" and "Model B".
+                If not provided, the results will be shown as "A" and "B".
             validation_set_id (str, optional): The ID of the validation set. Defaults to None.\n
                 If provided, one validation task will be shown infront of the datapoints that will be labeled.
             confidence_threshold (float, optional): The probability threshold for the comparison. Defaults to None.\n
@@ -251,113 +291,219 @@ class RapidataOrderManager:
             settings (Sequence[RapidataSetting], optional): The list of settings for the comparison. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the comparison. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the comparison. Defaults to None.\n
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
-        """
-
-        if any(type(datapoint) != list for datapoint in datapoints):
-            raise ValueError("Each datapoint must be a list of 2 paths/texts")
-
-        if any(len(datapoint) != 2 for datapoint in datapoints):
-            raise ValueError("Each datapoint must contain exactly two options")
 
-        if data_type == RapidataDataTypes.MEDIA:
-            assets = [MultiAsset([MediaAsset(path=path) for path in datapoint]) for datapoint in datapoints]
-        elif data_type == RapidataDataTypes.TEXT:
-            assets = [MultiAsset([TextAsset(text=text) for text in datapoint]) for datapoint in datapoints]
-        else:
-            raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
-        
-        return self._create_general_order(
-            name=name,
-            workflow=CompareWorkflow(
-                instruction=instruction
-            ),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            contexts=contexts,
-            media_contexts=media_contexts,
-            validation_set_id=validation_set_id,
-            confidence_threshold=confidence_threshold,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            private_notes=private_notes
-        )
+        Example:
+            ```python
+            from rapidata import RapidataClient
+
+            rapi = RapidataClient()
+            order = rapi.order.create_compare_order(
+                name="Image Prompt Alignment",
+                instruction="Which image follows the prompt more accurately?",
+                datapoints=[
+                    ["https://example.com/model_a_img1.jpg", "https://example.com/model_b_img1.jpg"],
+                    ["https://example.com/model_a_img2.jpg", "https://example.com/model_b_img2.jpg"],
+                ],
+                contexts=["A cat sitting on a red couch", "A blue car in the rain"],
+                responses_per_datapoint=25,
+                a_b_names=["Flux", "Midjourney"],  # Optional: label the models in results
+            ).run()
+
+            results = order.get_results()
+            ```
+        """
+        with tracer.start_as_current_span("RapidataOrderManager.create_compare_order"):
+            if any(not isinstance(datapoint, list) for datapoint in datapoints):
+                raise ValueError("Each datapoint must be a list of 2 paths/texts")
+
+            if any(len(set(datapoint)) != 2 for datapoint in datapoints):
+                raise ValueError(
+                    "Each datapoint must contain exactly two unique options"
+                )
+
+            if a_b_names is not None and len(a_b_names) != 2:
+                raise ValueError(
+                    "A_B_naming must be a list of exactly two strings or None"
+                )
+
+            from rapidata.rapidata_client.workflow import CompareWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                contexts=contexts,
+                media_contexts=media_contexts,
+                private_notes=private_notes,
+                data_type=data_type,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=CompareWorkflow(instruction=instruction, a_b_names=a_b_names),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                validation_set_id=validation_set_id,
+                confidence_threshold=confidence_threshold,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
 
-    def create_ranking_order(self,
-                             name: str,
-                             instruction: str,
-                             datapoints: list[str],
-                             total_comparison_budget: int,
-                             responses_per_comparison: int = 5,
-                             data_type: str = RapidataDataTypes.MEDIA,
-                             random_comparisons_ratio: float = 0.5,
-                             context: Optional[str] = None,
-                             validation_set_id: Optional[str] = None,
-                             filters: Sequence[RapidataFilter] = [],
-                             settings: Sequence[RapidataSetting] = [],
-                             selections: Sequence[RapidataSelection] = []
-                             ) -> RapidataOrder:
+    def create_ranking_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[list[str]],
+        comparison_budget_per_ranking: int,
+        responses_per_comparison: int = 1,
+        data_type: Literal["media", "text"] = "media",
+        random_comparisons_ratio: float = 0.5,
+        contexts: Optional[list[str]] = None,
+        media_contexts: Optional[list[str]] = None,
+        validation_set_id: Optional[str] = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+    ) -> RapidataOrder:
         """
         Create a ranking order.
 
-        With this order you can rank a list of datapoints (image, text, video, audio) based on the instruction.
-        The annotators will be shown two datapoints at a time. The ranking happens in terms of an elo system based on the matchup results.
+        With this order you can have a multiple lists of datapoints (image, text, video, audio) be ranked based on the instruction.
+        Each list will be ranked independently, based on comparison matchups.
 
         Args:
             name (str): The name of the order.
-            instruction (str): The question asked from People when They see two datapoints.
-            datapoints (list[str]): A list of datapoints that will participate in the ranking.
-            total_comparison_budget (int): The total number of (pairwise-)comparisons that can be made.
-            responses_per_comparison (int, optional): The number of responses collected per comparison.
-            data_type (str, optional): The data type of the datapoints. Defaults to RapidataDataTypes.MEDIA. \n
-                Other option: RapidataDataTypes.TEXT ("text").
-            random_comparisons_ratio (float, optional): The fraction of random comparisons in the ranking process.
-                The rest will focus on pairing similarly ranked datapoints. Defaults to 0.5 and can be left untouched.
-            context (str, optional): The context for all the comparison. Defaults to None.\n
-                If provided will be shown in addition to the instruction for all the matchups.
+            instruction (str): The instruction for the ranking. Will be shown with each matchup.
+            datapoints (list[list[str]]): The outer list is determines the independent rankings, the inner list is the datapoints for each ranking.
+            comparison_budget_per_ranking (int): The number of comparisons that will be collected per ranking (outer list of datapoints).
+            responses_per_comparison (int, optional): The number of responses that will be collected per comparison. Defaults to 1.
+            data_type (str, optional): The data type of the datapoints. Defaults to "media" (any form of image, video or audio). \n
+                Other option: "text".
+            random_comparisons_ratio (float, optional): The ratio of random comparisons to the total number of comparisons. Defaults to 0.5.
+            contexts (list[str], optional): The list of contexts for the ranking. Defaults to None.\n
+                If provided has to be the same length as the outer list of datapoints and will be shown in addition to the instruction. (Therefore will be different for each ranking)
+                Will be matched up with the datapoints using the list index.
+            media_contexts (list[str], optional): The list of media contexts for the ranking i.e links to the images / videos. Defaults to None.\n
+                If provided has to be the same length as the outer list of datapoints and will be shown in addition to the instruction. (Therefore will be different for each ranking)
+                Will be matched up with the datapoints using the list index.
             validation_set_id (str, optional): The ID of the validation set. Defaults to None.\n
                 If provided, one validation task will be shown infront of the datapoints that will be labeled.
-            filters (Sequence[RapidataFilter], optional): The list of filters for the order. Defaults to []. Decides who the tasks should be shown to.
-            settings (Sequence[RapidataSetting], optional): The list of settings for the order. Defaults to []. Decides how the tasks should be shown.
-            selections (Sequence[RapidataSelection], optional): The list of selections for the order. Defaults to []. Decides in what order the tasks should be shown.
+            filters (Sequence[RapidataFilter], optional): The list of filters for the ranking. Defaults to []. Decides who the tasks should be shown to.
+            settings (Sequence[RapidataSetting], optional): The list of settings for the ranking. Defaults to []. Decides how the tasks should be shown.
+            selections (Sequence[RapidataSelection], optional): The list of selections for the ranking. Defaults to []. Decides in what order the tasks should be shown.
+
+        Example:
+            ```python
+            from rapidata import RapidataClient
+
+            rapi = RapidataClient()
+            # Rank 12 images by preference using 50 pairwise comparisons
+            order = rapi.order.create_ranking_order(
+                name="Image Quality Ranking",
+                instruction="Which image looks better?",
+                datapoints=[["img1.jpg", "img2.jpg", "img3.jpg", "img4.jpg", "img5.jpg",
+                            "img6.jpg", "img7.jpg", "img8.jpg", "img9.jpg", "img10.jpg",
+                            "img11.jpg", "img12.jpg"]],
+                comparison_budget_per_ranking=50,
+                random_comparisons_ratio=0.5,  # 50% random, 50% close matchups
+            ).run()
+
+            results = order.get_results()  # Returns ranked list with scores
+            ```
         """
+        with tracer.start_as_current_span("RapidataOrderManager.create_ranking_order"):
+            if contexts and len(contexts) != len(datapoints):
+                raise ValueError(
+                    "Number of contexts must match the number of sets that will be ranked"
+                )
+            if media_contexts and len(media_contexts) != len(datapoints):
+                raise ValueError(
+                    "Number of media contexts must match the number of sets that will be ranked"
+                )
+            if not isinstance(datapoints, list) or not all(
+                isinstance(dp, list) for dp in datapoints
+            ):
+                raise ValueError(
+                    "Datapoints must be a list of lists. Outer list is the independent rankings, inner list is the datapoints for each ranking."
+                )
+            if not all(len(set(dp)) == len(dp) for dp in datapoints):
+                raise ValueError("Each inner list must contain unique datapoints.")
+
+            if not all(len(inner_list) >= 2 for inner_list in datapoints):
+                raise ValueError(
+                    "Each ranking must contain at least two unique datapoints."
+                )
+
+            from rapidata.rapidata_client.workflow import MultiRankingWorkflow
+            from rapidata.api_client.models.i_asset_input import IAssetInput
+            from rapidata.api_client.models.i_asset_input_existing_asset_input import (
+                IAssetInputExistingAssetInput,
+            )
 
-        if data_type == RapidataDataTypes.MEDIA:
-            assets = [MediaAsset(path=path) for path in datapoints]
-        elif data_type == RapidataDataTypes.TEXT:
-            assets = [TextAsset(text=text) for text in datapoints]
-        else:
-            raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
-
-        return self._create_general_order(
-            name=name,
-            workflow=RankingWorkflow(
-                criteria=instruction,
-                total_comparison_budget=total_comparison_budget,
-                random_comparisons_ratio=random_comparisons_ratio,
-                context=context
-            ),
-            assets=assets,
-            responses_per_datapoint=responses_per_comparison,
-            validation_set_id=validation_set_id,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-        )
+            datapoints_instances = []
+            for i, datapoint in enumerate(datapoints):
+                for d in datapoint:
+                    datapoints_instances.append(
+                        Datapoint(
+                            asset=d,
+                            data_type=data_type,
+                            context=contexts[i] if contexts else None,
+                            media_context=media_contexts[i] if media_contexts else None,
+                            group=str(i),
+                        )
+                    )
+
+            contexts_dict = (
+                {str(i): context for i, context in enumerate(contexts)}
+                if contexts
+                else None
+            )
 
-    def create_free_text_order(self,
-            name: str,
-            instruction: str,
-            datapoints: list[str],
-            data_type: str = RapidataDataTypes.MEDIA,
-            responses_per_datapoint: int = 10,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+            media_contexts_dict = (
+                {
+                    str(i): IAssetInput(
+                        actual_instance=IAssetInputExistingAssetInput(
+                            _t="ExistingAssetInput",
+                            name=self._asset_uploader.upload_asset(media_context),
+                        )
+                    )
+                    for i, media_context in enumerate(media_contexts)
+                }
+                if media_contexts
+                else None
+            )
+
+            return self._create_general_order(
+                name=name,
+                workflow=MultiRankingWorkflow(
+                    instruction=instruction,
+                    comparison_budget_per_ranking=comparison_budget_per_ranking,
+                    random_comparisons_ratio=random_comparisons_ratio,
+                    contexts=contexts_dict,
+                    media_contexts=media_contexts_dict,
+                ),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_comparison,
+                validation_set_id=validation_set_id,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
+
+    def create_free_text_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[str],
+        data_type: Literal["media", "text"] = "media",
+        responses_per_datapoint: int = 10,
+        contexts: list[str] | None = None,
+        media_contexts: list[str] | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a free text order.
 
         With this order you can have a datapoint (image, text, video, audio) be labeled with free text.
@@ -367,50 +513,73 @@ class RapidataOrderManager:
             name (str): The name of the order.
             instruction (str): The instruction to answer with free text. Will be shown along side each datapoint.
             datapoints (list[str]): The list of datapoints for the free text - each datapoint will be labeled.
-            data_type (str, optional): The data type of the datapoints. Defaults to RapidataDataTypes.MEDIA. \n
-                Other option: RapidataDataTypes.TEXT ("text").
+            data_type (str, optional): The data type of the datapoints. Defaults to "media" (any form of image, video or audio). \n
+                Other option: "text".
             responses_per_datapoint (int, optional): The number of responses that will be collected per datapoint. Defaults to 10.
+            contexts (list[str], optional): The list of contexts for the free text. Defaults to None.\n
+                If provided has to be the same length as datapoints and will be shown in addition to the instruction. (Therefore will be different for each datapoint)
+                Will be matched up with the datapoints using the list index.
+            media_contexts (list[str], optional): The list of media contexts for the free text i.e links to the images / videos. Defaults to None.\n
+                If provided has to be the same length as datapoints and will be shown in addition to the instruction. (Therefore will be different for each datapoint)
+                Will be matched up with the datapoints using the list index.
             filters (Sequence[RapidataFilter], optional): The list of filters for the free text. Defaults to []. Decides who the tasks should be shown to.
             settings (Sequence[RapidataSetting], optional): The list of settings for the free text. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the free text. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the free text. Defaults to None.\n
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
+
+        Example:
+            ```python
+            from rapidata import RapidataClient, FreeTextMinimumCharacters
+
+            rapi = RapidataClient()
+            order = rapi.order.create_free_text_order(
+                name="Image Captioning",
+                instruction="Describe what you see in this image in detail",
+                datapoints=["https://example.com/image1.jpg", "https://example.com/image2.jpg"],
+                responses_per_datapoint=5,
+                settings=[FreeTextMinimumCharacters(20)],  # Require at least 20 characters
+            ).run()
+
+            results = order.get_results()
+            ```
         """
+        with tracer.start_as_current_span(
+            "RapidataOrderManager.create_free_text_order"
+        ):
+            from rapidata.rapidata_client.workflow import FreeTextWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                contexts=contexts,
+                media_contexts=media_contexts,
+                private_notes=private_notes,
+                data_type=data_type,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=FreeTextWorkflow(instruction=instruction),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
 
-        if data_type == RapidataDataTypes.MEDIA:
-            assets = [MediaAsset(path=path) for path in datapoints]
-        elif data_type == RapidataDataTypes.TEXT:
-            assets = [TextAsset(text=text) for text in datapoints]
-        else:
-            raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
-
-        return self._create_general_order(
-            name=name,
-            workflow=FreeTextWorkflow(
-                instruction=instruction
-            ),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            default_labeling_amount=1,
-            private_notes=private_notes
-        )
-    
-    def create_select_words_order(self,
-            name: str,
-            instruction: str,
-            datapoints: list[str],
-            sentences: list[str],
-            responses_per_datapoint: int = 10,
-            validation_set_id: str | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+    def create_select_words_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[str],
+        sentences: list[str],
+        responses_per_datapoint: int = 10,
+        validation_set_id: str | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a select words order.
 
         With this order you can have a datapoint (image, text, video, audio) be labeled with a list of words.
@@ -430,41 +599,62 @@ class RapidataOrderManager:
             settings (Sequence[RapidataSetting], optional): The list of settings for the select words. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the select words. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the select words. Defaults to None.\n
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
+
+        Example:
+            ```python
+            from rapidata import RapidataClient
+
+            rapi = RapidataClient()
+            order = rapi.order.create_select_words_order(
+                name="Find Text-Image Mismatches",
+                instruction="Select words that don't match what's shown in the image",
+                datapoints=["https://example.com/image1.jpg", "https://example.com/image2.jpg"],
+                sentences=["A red car on a blue road", "Two cats playing with yarn"],
+                responses_per_datapoint=15,
+            ).run()
+
+            results = order.get_results()
+            ```
         """
+        with tracer.start_as_current_span(
+            "RapidataOrderManager.create_select_words_order"
+        ):
+            from rapidata.rapidata_client.workflow import SelectWordsWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                sentences=sentences,
+                private_notes=private_notes,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=SelectWordsWorkflow(
+                    instruction=instruction,
+                ),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                validation_set_id=validation_set_id,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
 
-        assets = [MediaAsset(path=path) for path in datapoints]
-        
-        return self._create_general_order(
-            name=name,
-            workflow=SelectWordsWorkflow(
-                instruction=instruction
-            ),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            validation_set_id=validation_set_id,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            sentences=sentences,
-            default_labeling_amount=2,
-            private_notes=private_notes
-        )
-    
-    def create_locate_order(self,
-            name: str,
-            instruction: str,
-            datapoints: list[str],
-            responses_per_datapoint: int = 10,
-            contexts: list[str] | None = None,
-            media_contexts: list[str] | None = None,
-            validation_set_id: str | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+    def create_locate_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[str],
+        responses_per_datapoint: int = 10,
+        contexts: list[str] | None = None,
+        media_contexts: list[str] | None = None,
+        validation_set_id: str | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a locate order.
 
         With this order you can have people locate specific objects in a datapoint (image, text, video, audio).
@@ -486,39 +676,58 @@ class RapidataOrderManager:
             settings (Sequence[RapidataSetting], optional): The list of settings for the locate. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the locate. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the locate. Defaults to None.\n
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
-        """
 
-        assets = [MediaAsset(path=path) for path in datapoints]
-
-        return self._create_general_order(
-            name=name,
-            workflow=LocateWorkflow(target=instruction),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            contexts=contexts,
-            media_contexts=media_contexts,
-            validation_set_id=validation_set_id,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            private_notes=private_notes
-        )
+        Example:
+            ```python
+            from rapidata import RapidataClient
 
-    def create_draw_order(self,
-            name: str,
-            instruction: str,
-            datapoints: list[str],
-            responses_per_datapoint: int = 10,
-            contexts: list[str] | None = None,
-            media_contexts: list[str] | None = None,
-            validation_set_id: str | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+            rapi = RapidataClient()
+            order = rapi.order.create_locate_order(
+                name="Find Artifacts",
+                instruction="Tap on any visual glitches or errors in the image",
+                datapoints=["https://example.com/ai_generated1.jpg", "https://example.com/ai_generated2.jpg"],
+                responses_per_datapoint=35,
+            ).run()
+
+            results = order.get_results()
+            ```
+        """
+        with tracer.start_as_current_span("RapidataOrderManager.create_locate_order"):
+            from rapidata.rapidata_client.workflow import LocateWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                contexts=contexts,
+                media_contexts=media_contexts,
+                private_notes=private_notes,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=LocateWorkflow(target=instruction),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                validation_set_id=validation_set_id,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
+
+    def create_draw_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[str],
+        responses_per_datapoint: int = 10,
+        contexts: list[str] | None = None,
+        media_contexts: list[str] | None = None,
+        validation_set_id: str | None = None,
+        filters: Sequence[RapidataFilter] = [],
+        settings: Sequence[RapidataSetting] = [],
+        selections: Sequence[RapidataSelection] = [],
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a draw order.
 
         With this order you can have people draw lines on a datapoint (image, text, video, audio).
@@ -540,42 +749,61 @@ class RapidataOrderManager:
             settings (Sequence[RapidataSetting], optional): The list of settings for the draw lines. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the draw lines. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the draw lines. Defaults to None.\n
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
+
+        Example:
+            ```python
+            from rapidata import RapidataClient
+
+            rapi = RapidataClient()
+            order = rapi.order.create_draw_order(
+                name="Segment Objects",
+                instruction="Color in all the cars in the image",
+                datapoints=["https://example.com/street1.jpg", "https://example.com/street2.jpg"],
+                responses_per_datapoint=35,
+            ).run()
+
+            results = order.get_results()
+            ```
         """
+        with tracer.start_as_current_span("RapidataOrderManager.create_draw_order"):
+            from rapidata.rapidata_client.workflow import DrawWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                contexts=contexts,
+                media_contexts=media_contexts,
+                private_notes=private_notes,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=DrawWorkflow(target=instruction),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                validation_set_id=validation_set_id,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
 
-        assets = [MediaAsset(path=path) for path in datapoints]
-
-        return self._create_general_order(
-            name=name,
-            workflow=DrawWorkflow(target=instruction),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            contexts=contexts,
-            media_contexts=media_contexts,
-            validation_set_id=validation_set_id,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            private_notes=private_notes
-        )
-    
-    def create_timestamp_order(self,
-            name: str,
-            instruction: str,
-            datapoints: list[str],
-            responses_per_datapoint: int = 10,
-            contexts: list[str] | None = None,
-            media_contexts: list[str] | None = None,
-            validation_set_id: str | None = None,
-            filters: Sequence[RapidataFilter] = [],
-            settings: Sequence[RapidataSetting] = [],
-            selections: Sequence[RapidataSelection] = [],
-            private_notes: list[str] | None = None,
-        ) -> RapidataOrder:
+    def create_timestamp_order(
+        self,
+        name: str,
+        instruction: str,
+        datapoints: list[str],
+        responses_per_datapoint: int = 10,
+        contexts: list[str] | None = None,
+        media_contexts: list[str] | None = None,
+        validation_set_id: str | None = None,
+        filters: Sequence[RapidataFilter] | None = None,
+        settings: Sequence[RapidataSetting] | None = None,
+        selections: Sequence[RapidataSelection] | None = None,
+        private_notes: list[str] | None = None,
+    ) -> RapidataOrder:
         """Create a timestamp order.
 
-        Warning: 
+        Warning:
             This order is currently not fully supported and may give unexpected results.
 
         With this order you can have people mark specific timestamps in a datapoint (video, audio).
@@ -597,32 +825,31 @@ class RapidataOrderManager:
             settings (Sequence[RapidataSetting], optional): The list of settings for the timestamp. Defaults to []. Decides how the tasks should be shown.
             selections (Sequence[RapidataSelection], optional): The list of selections for the timestamp. Defaults to []. Decides in what order the tasks should be shown.
             private_notes (list[str], optional): The list of private notes for the timestamp. Defaults to None.\n
-                If provided has to be the same length as datapoints.\n 
+                If provided has to be the same length as datapoints.\n
                 This will NOT be shown to the labelers but will be included in the result purely for your own reference.
         """
 
-        assets = [MediaAsset(path=path) for path in datapoints]
-
-        for asset in tqdm(assets, desc="Downloading assets and checking duration", disable=RapidataOutputManager.silent_mode):
-            if not asset.get_duration():
-                raise ValueError("The datapoints for this order must have a duration. (e.g. video or audio)")
-
-        return self._create_general_order(
-            name=name,
-            workflow=TimestampWorkflow(
-                instruction=instruction
-            ),
-            assets=assets,
-            responses_per_datapoint=responses_per_datapoint,
-            contexts=contexts,
-            media_contexts=media_contexts,
-            validation_set_id=validation_set_id,
-            filters=filters,
-            selections=selections,
-            settings=settings,
-            default_labeling_amount=2,
-            private_notes=private_notes
-        )
+        with tracer.start_as_current_span(
+            "RapidataOrderManager.create_timestamp_order"
+        ):
+            from rapidata.rapidata_client.workflow import TimestampWorkflow
+
+            datapoints_instances = DatapointsValidator.map_datapoints(
+                datapoints=datapoints,
+                contexts=contexts,
+                media_contexts=media_contexts,
+                private_notes=private_notes,
+            )
+            return self._create_general_order(
+                name=name,
+                workflow=TimestampWorkflow(instruction=instruction),
+                datapoints=datapoints_instances,
+                responses_per_datapoint=responses_per_datapoint,
+                validation_set_id=validation_set_id,
+                filters=filters,
+                selections=selections,
+                settings=settings,
+            )
 
     def get_order_by_id(self, order_id: str) -> RapidataOrder:
         """Get an order by ID.
@@ -633,13 +860,16 @@ class RapidataOrderManager:
         Returns:
             RapidataOrder: The Order instance.
         """
-        
-        order = self._openapi_service.order_api.order_order_id_get(order_id)
+        with tracer.start_as_current_span("RapidataOrderManager.get_order_by_id"):
+            from rapidata.rapidata_client.order.rapidata_order import RapidataOrder
+
+            order = self.__openapi_service.order_api.order_order_id_get(order_id)
 
-        return RapidataOrder(
-            order_id=order_id, 
-            name=order.order_name,
-            openapi_service=self._openapi_service)
+            return RapidataOrder(
+                order_id=order_id,
+                name=order.order_name,
+                openapi_service=self.__openapi_service,
+            )
 
     def find_orders(self, name: str = "", amount: int = 10) -> list[RapidataOrder]:
         """Find your recent orders given criteria. If nothing is provided, it will return the most recent order.
@@ -651,11 +881,42 @@ class RapidataOrderManager:
         Returns:
             list[RapidataOrder]: A list of RapidataOrder instances.
         """
-        order_page_result = self._openapi_service.order_api.orders_get(QueryModel(
-            page=PageInfo(index=1, size=amount),
-            filter=RootFilter(filters=[Filter(field="OrderName", operator="Contains", value=name)]),
-            sortCriteria=[SortCriterion(direction="Desc", propertyName="OrderDate")]
-            ))
-
-        orders = [self.get_order_by_id(order.id) for order in order_page_result.items]
-        return orders
+        with tracer.start_as_current_span("RapidataOrderManager.find_orders"):
+            from rapidata.api_client.models.page_info import PageInfo
+            from rapidata.api_client.models.query_model import QueryModel
+            from rapidata.api_client.models.root_filter import RootFilter
+            from rapidata.api_client.models.filter import Filter
+            from rapidata.api_client.models.filter_operator import FilterOperator
+            from rapidata.api_client.models.sort_criterion import SortCriterion
+            from rapidata.api_client.models.sort_direction import SortDirection
+
+            order_page_result = self.__openapi_service.order_api.orders_get(
+                QueryModel(
+                    page=PageInfo(index=1, size=amount),
+                    filter=RootFilter(
+                        filters=[
+                            Filter(
+                                field="OrderName",
+                                operator=FilterOperator.CONTAINS,
+                                value=name,
+                            )
+                        ]
+                    ),
+                    sortCriteria=[
+                        SortCriterion(
+                            direction=SortDirection.DESC, propertyName="OrderDate"
+                        )
+                    ],
+                )
+            )
+
+            orders = [
+                self.get_order_by_id(order.id) for order in order_page_result.items
+            ]
+            return orders
+
+    def __str__(self) -> str:
+        return "RapidataOrderManager"
+
+    def __repr__(self) -> str:
+        return self.__str__()