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

rapidata/rapidata_client/order/_rapidata_dataset.py

@@ -1,13 +1,7 @@
 from itertools import zip_longest
 
-from rapidata.api_client.models.datapoint_metadata_model import DatapointMetadataModel
-from rapidata.api_client.models.create_datapoint_from_urls_model import (
-    CreateDatapointFromUrlsModel,
-)
-from rapidata.api_client.models.create_datapoint_from_files_model import CreateDatapointFromFilesModel
-from rapidata.api_client.models.create_datapoint_from_urls_model import CreateDatapointFromUrlsModel
 from rapidata.api_client.models.create_datapoint_from_text_sources_model import CreateDatapointFromTextSourcesModel
-from rapidata.api_client.models.create_datapoint_from_files_model_metadata_inner import CreateDatapointFromFilesModelMetadataInner
+from rapidata.api_client.models.dataset_dataset_id_datapoints_post_request_metadata_inner import DatasetDatasetIdDatapointsPostRequestMetadataInner
 from rapidata.rapidata_client.metadata._base_metadata import Metadata
 from rapidata.rapidata_client.assets import TextAsset, MediaAsset, MultiAsset
 from rapidata.service import LocalFileService
@@ -15,9 +9,8 @@ from rapidata.service.openapi_service import OpenAPIService
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from tqdm import tqdm
 
-from pydantic import StrictStr
 from typing import cast, Sequence, Generator
-from rapidata.rapidata_client.logging import logger, RapidataOutputManger
+from rapidata.rapidata_client.logging import logger, RapidataOutputManager
 import time
 import threading
 
@@ -59,7 +52,7 @@ class RapidataDataset:
                 for meta in metadata_per_datapoint:
                     meta_model = meta.to_model() if meta else None
                     if meta_model:
-                        metadata.append(CreateDatapointFromFilesModelMetadataInner(meta_model))
+                        metadata.append(DatasetDatasetIdDatapointsPostRequestMetadataInner(meta_model))
 
             model = CreateDatapointFromTextSourcesModel(
                 textSources=texts,
@@ -76,7 +69,7 @@ class RapidataDataset:
                 for i, (text_asset, metadata) in enumerate(zip_longest(text_assets, metadata_list or []))
             ]
 
-            with tqdm(total=total_uploads, desc="Uploading text datapoints", disable=RapidataOutputManger.silent_mode) as pbar:
+            with tqdm(total=total_uploads, desc="Uploading text datapoints", disable=RapidataOutputManager.silent_mode) as pbar:
                 for future in as_completed(futures):
                     future.result()  # This will raise any exceptions that occurred during execution
                     pbar.update(1)
@@ -117,39 +110,23 @@ class RapidataDataset:
             else:
                 raise ValueError(f"Unsupported asset type: {type(media_asset)}")
 
-            # Convert multiple metadata to models
-            metadata = []
+            metadata: list[DatasetDatasetIdDatapointsPostRequestMetadataInner] = []
             if meta_list:
                 for meta in meta_list:
                     meta_model = meta.to_model() if meta else None
                     if meta_model:
-                        metadata.append(CreateDatapointFromFilesModelMetadataInner(meta_model))
+                        metadata.append(DatasetDatasetIdDatapointsPostRequestMetadataInner(meta_model))
 
-            local_paths: bool = assets[0].is_local()
-            files: list[StrictStr] = []
-            for asset in assets:
-                if isinstance(asset, MediaAsset):
-                    files.append(asset.path)
+            local_paths = [asset.to_file() for asset in assets if asset.is_local()]
+            urls = [asset.path for asset in assets if not asset.is_local()]
 
-            if local_paths:
-                model = CreateDatapointFromFilesModel(
-                    metadata=metadata,
-                    sortIndex=index,
-                )
-                upload_response = self.openapi_service.dataset_api.dataset_dataset_id_datapoints_files_post(
-                    dataset_id=self.dataset_id,
-                    model=model,
-                    files=files # type: ignore
-                )
-            else:
-                upload_response = self.openapi_service.dataset_api.dataset_dataset_id_datapoints_urls_post(
-                    dataset_id=self.dataset_id,
-                    create_datapoint_from_urls_model=CreateDatapointFromUrlsModel(
-                        urls=files,
-                        metadata=metadata,
-                        sortIndex=index
-                    ),
-                )
+            self.openapi_service.dataset_api.dataset_dataset_id_datapoints_post(
+                dataset_id=self.dataset_id,
+                file=local_paths,
+                url=urls,
+                metadata=metadata,
+                sort_index=index,
+            )
 
             local_successful.extend(identifiers_to_track)
 
@@ -183,7 +160,7 @@ class RapidataDataset:
         def progress_tracking_thread():
             try:
                 # Initialize progress bar with 0 completions
-                with tqdm(total=total_uploads, desc="Uploading datapoints", disable=RapidataOutputManger.silent_mode) as pbar:
+                with tqdm(total=total_uploads, desc="Uploading datapoints", disable=RapidataOutputManager.silent_mode) as pbar:
                     prev_ready = 0
                     prev_failed = 0
                     stall_count = 0

rapidata/rapidata_client/order/rapidata_order.py

@@ -16,7 +16,7 @@ from rapidata.api_client.models.preliminary_download_model import PreliminaryDow
 from rapidata.api_client.models.workflow_artifact_model import WorkflowArtifactModel
 from rapidata.rapidata_client.order.rapidata_results import RapidataResults
 from rapidata.service.openapi_service import OpenAPIService
-from rapidata.rapidata_client.logging import logger, managed_print, RapidataOutputManger
+from rapidata.rapidata_client.logging import logger, managed_print, RapidataOutputManager
 
 
 class RapidataOrder:
@@ -38,7 +38,7 @@ class RapidataOrder:
         order_id: str,
         openapi_service: OpenAPIService,
     ):
-        self.order_id = order_id
+        self.id = order_id
         self.name = name
         self.__created_at: datetime | None = None
         self.__openapi_service = openapi_service
@@ -47,20 +47,25 @@ class RapidataOrder:
         self.__pipeline_id: str = ""
         self._max_retries = 10  
         self._retry_delay = 2
-        self.order_details_page = f"https://app.{self.__openapi_service.environment}/order/detail/{self.order_id}"
+        self.order_details_page = f"https://app.{self.__openapi_service.environment}/order/detail/{self.id}"
         logger.debug("RapidataOrder initialized")
 
+    @property
+    def order_id(self) -> str:
+        managed_print(f"order_id is deprecated. Use id instead.")
+        return self.id
+    
     @property
     def created_at(self) -> datetime:
         """Returns the creation date of the order."""
         if not self.__created_at:
-            self.__created_at = self.__openapi_service.order_api.order_order_id_get(self.order_id).order_date
+            self.__created_at = self.__openapi_service.order_api.order_order_id_get(self.id).order_date
         return self.__created_at
     
     def run(self) -> "RapidataOrder":
         """Runs the order to start collecting responses."""
         logger.info(f"Starting order '{self}'")
-        self.__openapi_service.order_api.order_order_id_submit_post(self.order_id)
+        self.__openapi_service.order_api.order_order_id_submit_post(self.id)
         logger.debug(f"Order '{self}' has been started.")
         managed_print(f"Order '{self.name}' is now viewable under: {self.order_details_page}")
         return self
@@ -68,21 +73,21 @@ class RapidataOrder:
     def pause(self) -> None:
         """Pauses the order."""
         logger.info(f"Pausing order '{self}'")
-        self.__openapi_service.order_api.order_order_id_pause_post(self.order_id)
+        self.__openapi_service.order_api.order_order_id_pause_post(self.id)
         logger.debug(f"Order '{self}' has been paused.")
         managed_print(f"Order '{self}' has been paused.")
 
     def unpause(self) -> None:
         """Unpauses/resumes the order."""
         logger.info(f"Unpausing order '{self}'")
-        self.__openapi_service.order_api.order_resume_post(self.order_id)
+        self.__openapi_service.order_api.order_resume_post(self.id)
         logger.debug(f"Order '{self}' has been unpaused.")
         managed_print(f"Order '{self}' has been unpaused.")
 
     def delete(self) -> None:
         """Deletes the order."""
         logger.info(f"Deleting order '{self}'")
-        self.__openapi_service.order_api.order_order_id_delete(self.order_id)
+        self.__openapi_service.order_api.order_order_id_delete(self.id)
         logger.debug(f"Order '{self}' has been deleted.")
         managed_print(f"Order '{self}' has been deleted.")
 
@@ -100,7 +105,7 @@ class RapidataOrder:
             Completed: The order has been completed.\n
             Failed: The order has failed.
         """
-        return self.__openapi_service.order_api.order_order_id_get(self.order_id).state
+        return self.__openapi_service.order_api.order_order_id_get(self.id).state
 
     def display_progress_bar(self, refresh_rate: int=5) -> None:
         """
@@ -126,7 +131,7 @@ class RapidataOrder:
                 "Once started, run this method again to display the progress bar."
             )
         
-        with tqdm(total=100, desc="Processing order", unit="%", bar_format="{desc}: {percentage:3.0f}%|{bar}| completed [{elapsed}<{remaining}, {rate_fmt}]", disable=RapidataOutputManger.silent_mode) as pbar:
+        with tqdm(total=100, desc="Processing order", unit="%", bar_format="{desc}: {percentage:3.0f}%|{bar}| completed [{elapsed}<{remaining}, {rate_fmt}]", disable=RapidataOutputManager.silent_mode) as pbar:
             last_percentage = 0
             while True:
                 current_percentage = self._workflow_progress.completion_percentage
@@ -177,7 +182,7 @@ class RapidataOrder:
             sleep(5)
 
         try:
-            return RapidataResults(json.loads(self.__openapi_service.order_api.order_order_id_download_results_get(order_id=self.order_id)))
+            return RapidataResults(json.loads(self.__openapi_service.order_api.order_order_id_download_results_get(order_id=self.id)))
         except (ApiException, json.JSONDecodeError) as e:
             raise Exception(f"Failed to get order results: {str(e)}") from e
         
@@ -203,7 +208,7 @@ class RapidataOrder:
         """
         logger.info("Opening order preview in browser...")
         campaign_id = self.__get_campaign_id()
-        auth_url = f"https://app.{self.__openapi_service.environment}/order/detail/{self.order_id}/preview?campaignId={campaign_id}"
+        auth_url = f"https://app.{self.__openapi_service.environment}/order/detail/{self.id}/preview?campaignId={campaign_id}"
         could_open_browser = webbrowser.open(auth_url)
         if not could_open_browser:
             encoded_url = urllib.parse.quote(auth_url, safe="%/:=&?~#+!$,;'@()*[]")
@@ -214,7 +219,7 @@ class RapidataOrder:
         if not self.__pipeline_id:
             for _ in range(self._max_retries):
                 try:
-                    self.__pipeline_id = self.__openapi_service.order_api.order_order_id_get(self.order_id).pipeline_id
+                    self.__pipeline_id = self.__openapi_service.order_api.order_order_id_get(self.id).pipeline_id
                     break
                 except Exception:
                     sleep(self._retry_delay)
@@ -272,7 +277,7 @@ class RapidataOrder:
             raise Exception(f"Failed to get preliminary results: {str(e)}") from e
 
     def __str__(self) -> str:
-        return f"RapidataOrder(name='{self.name}', order_id='{self.order_id}')"
+        return f"RapidataOrder(name='{self.name}', order_id='{self.id}')"
 
     def __repr__(self) -> str:
-        return f"RapidataOrder(name='{self.name}', order_id='{self.order_id}')"
+        return f"RapidataOrder(name='{self.name}', order_id='{self.id}')"

rapidata/rapidata_client/order/rapidata_order_manager.py

@@ -28,7 +28,7 @@ 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.selection.rapidata_selections import RapidataSelections
-from rapidata.rapidata_client.logging import logger, RapidataOutputManger
+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
@@ -603,7 +603,7 @@ class RapidataOrderManager:
 
         assets = [MediaAsset(path=path) for path in datapoints]
 
-        for asset in tqdm(assets, desc="Downloading assets and checking duration", disable=RapidataOutputManger.silent_mode):
+        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)")
 

rapidata/rapidata_client/validation/rapids/rapids.py

@@ -15,8 +15,7 @@ from rapidata.api_client.models.add_validation_rapid_model_payload import (
 from rapidata.api_client.models.add_validation_rapid_model_truth import (
     AddValidationRapidModelTruth,
 )
-from rapidata.api_client.models.create_datapoint_from_files_model_metadata_inner import CreateDatapointFromFilesModelMetadataInner
-
+from rapidata.api_client.models.dataset_dataset_id_datapoints_post_request_metadata_inner import DatasetDatasetIdDatapointsPostRequestMetadataInner
 from rapidata.service.openapi_service import OpenAPIService
 
 from rapidata.rapidata_client.logging import logger
@@ -69,7 +68,7 @@ class Rapid():
             payload=AddValidationRapidModelPayload(self.payload),
             truth=AddValidationRapidModelTruth(self.truth),
             metadata=[
-              CreateDatapointFromFilesModelMetadataInner(meta.to_model())
+              DatasetDatasetIdDatapointsPostRequestMetadataInner(meta.to_model())
               for meta in self.metadata
             ],
             randomCorrectProbability=self.randomCorrectProbability,
@@ -96,7 +95,7 @@ class Rapid():
           payload=AddValidationRapidModelPayload(self.payload),
           truth=AddValidationRapidModelTruth(self.truth),
           metadata=[
-              CreateDatapointFromFilesModelMetadataInner(meta.to_model())
+              DatasetDatasetIdDatapointsPostRequestMetadataInner(meta.to_model())
               for meta in self.metadata
           ],
           randomCorrectProbability=self.randomCorrectProbability,

rapidata/rapidata_client/validation/validation_set_manager.py

@@ -15,7 +15,7 @@ from urllib3._collections import HTTPHeaderDict # type: ignore[import]
 
 from rapidata.rapidata_client.validation.rapids.box import Box
 
-from rapidata.rapidata_client.logging import logger, managed_print, RapidataOutputManger
+from rapidata.rapidata_client.logging import logger, managed_print, RapidataOutputManager
 from tqdm import tqdm
 
 
@@ -452,7 +452,7 @@ class ValidationSetManager:
         )
 
         logger.debug("Adding rapids to validation set")
-        for rapid in tqdm(rapids, desc="Uploading validation tasks", disable=RapidataOutputManger.silent_mode):
+        for rapid in tqdm(rapids, desc="Uploading validation tasks", disable=RapidataOutputManager.silent_mode):
             validation_set.add_rapid(rapid)
         
         managed_print()

rapidata/rapidata_client/workflow/_ranking_workflow.py

@@ -2,14 +2,10 @@ from rapidata.api_client import CompareWorkflowModelPairMakerConfig, OnlinePairM
 from rapidata.api_client.models.compare_workflow_model import CompareWorkflowModel
 from rapidata.rapidata_client.workflow._base_workflow import Workflow
 from rapidata.rapidata_client.metadata import PromptMetadata
-from rapidata.api_client.models.create_datapoint_from_urls_model import (
-    CreateDatapointFromFilesModelMetadataInner,
-)
+from rapidata.api_client.models.dataset_dataset_id_datapoints_post_request_metadata_inner import DatasetDatasetIdDatapointsPostRequestMetadataInner
 
 
 class RankingWorkflow(Workflow):
-
-
     def __init__(self,
                  criteria: str,
                  total_comparison_budget: int,
@@ -21,7 +17,7 @@ class RankingWorkflow(Workflow):
                  ):
         super().__init__(type="CompareWorkflowConfig")
 
-        self.context = [CreateDatapointFromFilesModelMetadataInner(
+        self.context = [DatasetDatasetIdDatapointsPostRequestMetadataInner(
             PromptMetadata(context).to_model())
             ] if context else None
 

{rapidata-2.26.1.dist-info → rapidata-2.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.26.1
+Version: 2.27.0
 Summary: Rapidata package containing the Rapidata Python Client to interact with the Rapidata Web API in an easy way.
 License: Apache-2.0
 Author: Rapidata AG