rapidata 2.30.0__py3-none-any.whl → 2.31.1__py3-none-any.whl

rapidata/api_client/api/validation_set_api.py

@@ -1402,7 +1402,7 @@ class ValidationSetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> AddValidationRapidResult:
-        """Adds a new validation rapid to the specified validation set using files to create the assets.
+        """(Deprecated) Adds a new validation rapid to the specified validation set using files to create the assets.
 
 
         :param validation_set_id: The ID of the validation set to add the rapid to. (required)
@@ -1432,6 +1432,7 @@ class ValidationSetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /validation-set/{validationSetId}/rapid/files is deprecated.", DeprecationWarning)
 
         _param = self._validation_set_validation_set_id_rapid_files_post_serialize(
             validation_set_id=validation_set_id,
@@ -1476,7 +1477,7 @@ class ValidationSetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[AddValidationRapidResult]:
-        """Adds a new validation rapid to the specified validation set using files to create the assets.
+        """(Deprecated) Adds a new validation rapid to the specified validation set using files to create the assets.
 
 
         :param validation_set_id: The ID of the validation set to add the rapid to. (required)
@@ -1506,6 +1507,7 @@ class ValidationSetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /validation-set/{validationSetId}/rapid/files is deprecated.", DeprecationWarning)
 
         _param = self._validation_set_validation_set_id_rapid_files_post_serialize(
             validation_set_id=validation_set_id,
@@ -1550,7 +1552,7 @@ class ValidationSetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Adds a new validation rapid to the specified validation set using files to create the assets.
+        """(Deprecated) Adds a new validation rapid to the specified validation set using files to create the assets.
 
 
         :param validation_set_id: The ID of the validation set to add the rapid to. (required)
@@ -1580,6 +1582,7 @@ class ValidationSetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /validation-set/{validationSetId}/rapid/files is deprecated.", DeprecationWarning)
 
         _param = self._validation_set_validation_set_id_rapid_files_post_serialize(
             validation_set_id=validation_set_id,
@@ -1688,6 +1691,343 @@ class ValidationSetApi:
 
 
 
+    @validate_call
+    def validation_set_validation_set_id_rapid_post(
+        self,
+        validation_set_id: Annotated[StrictStr, Field(description="The ID of the validation set to add the rapid to.")],
+        model: Optional[AddValidationRapidModel] = None,
+        files: Optional[List[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]]] = None,
+        texts: Annotated[Optional[List[StrictStr]], Field(description="The texts to use for the rapid.")] = None,
+        urls: Annotated[Optional[List[StrictStr]], Field(description="The urls to use for the rapid")] = None,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> AddValidationRapidResult:
+        """Adds a new validation rapid to the specified validation set using files to create the assets.
+
+
+        :param validation_set_id: The ID of the validation set to add the rapid to. (required)
+        :type validation_set_id: str
+        :param model:
+        :type model: AddValidationRapidModel
+        :param files:
+        :type files: List[bytearray]
+        :param texts: The texts to use for the rapid.
+        :type texts: List[str]
+        :param urls: The urls to use for the rapid
+        :type urls: List[str]
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._validation_set_validation_set_id_rapid_post_serialize(
+            validation_set_id=validation_set_id,
+            model=model,
+            files=files,
+            texts=texts,
+            urls=urls,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "AddValidationRapidResult",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def validation_set_validation_set_id_rapid_post_with_http_info(
+        self,
+        validation_set_id: Annotated[StrictStr, Field(description="The ID of the validation set to add the rapid to.")],
+        model: Optional[AddValidationRapidModel] = None,
+        files: Optional[List[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]]] = None,
+        texts: Annotated[Optional[List[StrictStr]], Field(description="The texts to use for the rapid.")] = None,
+        urls: Annotated[Optional[List[StrictStr]], Field(description="The urls to use for the rapid")] = None,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[AddValidationRapidResult]:
+        """Adds a new validation rapid to the specified validation set using files to create the assets.
+
+
+        :param validation_set_id: The ID of the validation set to add the rapid to. (required)
+        :type validation_set_id: str
+        :param model:
+        :type model: AddValidationRapidModel
+        :param files:
+        :type files: List[bytearray]
+        :param texts: The texts to use for the rapid.
+        :type texts: List[str]
+        :param urls: The urls to use for the rapid
+        :type urls: List[str]
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._validation_set_validation_set_id_rapid_post_serialize(
+            validation_set_id=validation_set_id,
+            model=model,
+            files=files,
+            texts=texts,
+            urls=urls,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "AddValidationRapidResult",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def validation_set_validation_set_id_rapid_post_without_preload_content(
+        self,
+        validation_set_id: Annotated[StrictStr, Field(description="The ID of the validation set to add the rapid to.")],
+        model: Optional[AddValidationRapidModel] = None,
+        files: Optional[List[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]]] = None,
+        texts: Annotated[Optional[List[StrictStr]], Field(description="The texts to use for the rapid.")] = None,
+        urls: Annotated[Optional[List[StrictStr]], Field(description="The urls to use for the rapid")] = None,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Adds a new validation rapid to the specified validation set using files to create the assets.
+
+
+        :param validation_set_id: The ID of the validation set to add the rapid to. (required)
+        :type validation_set_id: str
+        :param model:
+        :type model: AddValidationRapidModel
+        :param files:
+        :type files: List[bytearray]
+        :param texts: The texts to use for the rapid.
+        :type texts: List[str]
+        :param urls: The urls to use for the rapid
+        :type urls: List[str]
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._validation_set_validation_set_id_rapid_post_serialize(
+            validation_set_id=validation_set_id,
+            model=model,
+            files=files,
+            texts=texts,
+            urls=urls,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "AddValidationRapidResult",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _validation_set_validation_set_id_rapid_post_serialize(
+        self,
+        validation_set_id,
+        model,
+        files,
+        texts,
+        urls,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+            'files': 'multi',
+            'texts': 'multi',
+            'urls': 'multi',
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[
+            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
+        ] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if validation_set_id is not None:
+            _path_params['validationSetId'] = validation_set_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        if model is not None:
+            _form_params.append(('model', model))
+        if files is not None:
+            _files['files'] = files
+        if texts is not None:
+            _form_params.append(('texts', texts))
+        if urls is not None:
+            _form_params.append(('urls', urls))
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'text/plain', 
+                    'application/json', 
+                    'text/json'
+                ]
+            )
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'multipart/form-data'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'bearer', 
+            'oauth2'
+        ]
+
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/validation-set/{validationSetId}/rapid',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
     @validate_call
     def validation_set_validation_set_id_rapid_texts_post(
         self,
@@ -1706,7 +2046,7 @@ class ValidationSetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> AddValidationRapidResult:
-        """Adds a new validation rapid to the specified validation set using text sources to create the assets.
+        """(Deprecated) Adds a new validation rapid to the specified validation set using text sources to create the assets.
 
 
         :param validation_set_id: The ID of the validation set to add the rapid to. (required)
@@ -1734,6 +2074,7 @@ class ValidationSetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /validation-set/{validationSetId}/rapid/texts is deprecated.", DeprecationWarning)
 
         _param = self._validation_set_validation_set_id_rapid_texts_post_serialize(
             validation_set_id=validation_set_id,
@@ -1776,7 +2117,7 @@ class ValidationSetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[AddValidationRapidResult]:
-        """Adds a new validation rapid to the specified validation set using text sources to create the assets.
+        """(Deprecated) Adds a new validation rapid to the specified validation set using text sources to create the assets.
 
 
         :param validation_set_id: The ID of the validation set to add the rapid to. (required)
@@ -1804,6 +2145,7 @@ class ValidationSetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /validation-set/{validationSetId}/rapid/texts is deprecated.", DeprecationWarning)
 
         _param = self._validation_set_validation_set_id_rapid_texts_post_serialize(
             validation_set_id=validation_set_id,
@@ -1846,7 +2188,7 @@ class ValidationSetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Adds a new validation rapid to the specified validation set using text sources to create the assets.
+        """(Deprecated) Adds a new validation rapid to the specified validation set using text sources to create the assets.
 
 
         :param validation_set_id: The ID of the validation set to add the rapid to. (required)
@@ -1874,6 +2216,7 @@ class ValidationSetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /validation-set/{validationSetId}/rapid/texts is deprecated.", DeprecationWarning)
 
         _param = self._validation_set_validation_set_id_rapid_texts_post_serialize(
             validation_set_id=validation_set_id,

rapidata/api_client/models/get_standing_by_id_result.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -31,10 +31,11 @@ class GetStandingByIdResult(BaseModel):
     benchmark_id: StrictStr = Field(alias="benchmarkId")
     dataset_id: StrictStr = Field(alias="datasetId")
     status: StrictStr
+    is_disabled: StrictBool = Field(alias="isDisabled")
     score: Optional[Union[StrictFloat, StrictInt]] = None
     wins: StrictInt
     total_matches: StrictInt = Field(alias="totalMatches")
-    __properties: ClassVar[List[str]] = ["id", "name", "benchmarkId", "datasetId", "status", "score", "wins", "totalMatches"]
+    __properties: ClassVar[List[str]] = ["id", "name", "benchmarkId", "datasetId", "status", "isDisabled", "score", "wins", "totalMatches"]
 
     @field_validator('status')
     def status_validate_enum(cls, value):
@@ -104,6 +105,7 @@ class GetStandingByIdResult(BaseModel):
             "benchmarkId": obj.get("benchmarkId"),
             "datasetId": obj.get("datasetId"),
             "status": obj.get("status"),
+            "isDisabled": obj.get("isDisabled"),
             "score": obj.get("score"),
             "wins": obj.get("wins"),
             "totalMatches": obj.get("totalMatches")

rapidata/api_client/models/participant_by_benchmark.py

@@ -36,8 +36,8 @@ class ParticipantByBenchmark(BaseModel):
     @field_validator('status')
     def status_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in set(['Created', 'Submitted']):
-            raise ValueError("must be one of enum values ('Created', 'Submitted')")
+        if value not in set(['Created', 'Submitted', 'Disabled']):
+            raise ValueError("must be one of enum values ('Created', 'Submitted', 'Disabled')")
         return value
 
     model_config = ConfigDict(

rapidata/api_client/models/participant_status.py

@@ -28,6 +28,7 @@ class ParticipantStatus(str, Enum):
     """
     CREATED = 'Created'
     SUBMITTED = 'Submitted'
+    DISABLED = 'Disabled'
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

rapidata/api_client/models/standing_by_leaderboard.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -34,7 +34,8 @@ class StandingByLeaderboard(BaseModel):
     score: Optional[Union[StrictFloat, StrictInt]] = None
     wins: StrictInt
     total_matches: StrictInt = Field(alias="totalMatches")
-    __properties: ClassVar[List[str]] = ["id", "name", "leaderboardId", "datasetId", "status", "score", "wins", "totalMatches"]
+    is_disabled: StrictBool = Field(alias="isDisabled")
+    __properties: ClassVar[List[str]] = ["id", "name", "leaderboardId", "datasetId", "status", "score", "wins", "totalMatches", "isDisabled"]
 
     @field_validator('status')
     def status_validate_enum(cls, value):
@@ -106,7 +107,8 @@ class StandingByLeaderboard(BaseModel):
             "status": obj.get("status"),
             "score": obj.get("score"),
             "wins": obj.get("wins"),
-            "totalMatches": obj.get("totalMatches")
+            "totalMatches": obj.get("totalMatches"),
+            "isDisabled": obj.get("isDisabled")
         })
         return _obj
 

rapidata/api_client_README.md

@@ -78,6 +78,7 @@ Class | Method | HTTP request | Description
 *BenchmarkApi* | [**benchmark_benchmark_id_participant_participant_id_delete**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_participant_participant_id_delete) | **DELETE** /benchmark/{benchmarkId}/participant/{participantId} | Deletes a participant on a benchmark.
 *BenchmarkApi* | [**benchmark_benchmark_id_participant_participant_id_get**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_participant_participant_id_get) | **GET** /benchmark/{benchmarkId}/participant/{participantId} | Gets a participant by it's Id.
 *BenchmarkApi* | [**benchmark_benchmark_id_participants_get**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_participants_get) | **GET** /benchmark/{benchmarkId}/participants | Query all participants within a benchmark
+*BenchmarkApi* | [**benchmark_benchmark_id_participants_participant_id_disable_post**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_participants_participant_id_disable_post) | **POST** /benchmark/{benchmarkId}/participants/{participantId}/disable | This endpoint disables a participant in a benchmark. this means that the participant will no longer actively be matched up against other participants and not collect further results. It will still be visible in the leaderboard.
 *BenchmarkApi* | [**benchmark_benchmark_id_participants_participant_id_submit_post**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_participants_participant_id_submit_post) | **POST** /benchmark/{benchmarkId}/participants/{participantId}/submit | Submits a participant to a benchmark.
 *BenchmarkApi* | [**benchmark_benchmark_id_participants_post**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_participants_post) | **POST** /benchmark/{benchmarkId}/participants | Creates a participant in a benchmark.
 *BenchmarkApi* | [**benchmark_benchmark_id_prompt_post**](rapidata/api_client/docs/BenchmarkApi.md#benchmark_benchmark_id_prompt_post) | **POST** /benchmark/{benchmarkId}/prompt | Adds a new prompt to a benchmark.
@@ -184,6 +185,7 @@ Class | Method | HTTP request | Description
 *ValidationSetApi* | [**validation_set_validation_set_id_export_get**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_validation_set_id_export_get) | **GET** /validation-set/{validationSetId}/export | Exports all rapids of a validation-set to a file.
 *ValidationSetApi* | [**validation_set_validation_set_id_get**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_validation_set_id_get) | **GET** /validation-set/{validationSetId} | Gets a validation set by the id.
 *ValidationSetApi* | [**validation_set_validation_set_id_rapid_files_post**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_validation_set_id_rapid_files_post) | **POST** /validation-set/{validationSetId}/rapid/files | Adds a new validation rapid to the specified validation set using files to create the assets.
+*ValidationSetApi* | [**validation_set_validation_set_id_rapid_post**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_validation_set_id_rapid_post) | **POST** /validation-set/{validationSetId}/rapid | Adds a new validation rapid to the specified validation set using files to create the assets.
 *ValidationSetApi* | [**validation_set_validation_set_id_rapid_texts_post**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_validation_set_id_rapid_texts_post) | **POST** /validation-set/{validationSetId}/rapid/texts | Adds a new validation rapid to the specified validation set using text sources to create the assets.
 *ValidationSetApi* | [**validation_set_validation_set_id_rapids_get**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_validation_set_id_rapids_get) | **GET** /validation-set/{validationSetId}/rapids | Queries the validation rapids for a specific validation set.
 *ValidationSetApi* | [**validation_set_zip_compare_post**](rapidata/api_client/docs/ValidationSetApi.md#validation_set_zip_compare_post) | **POST** /validation-set/zip/compare | Imports a compare validation set from a zip file.

rapidata/rapidata_client/assets/data_type_enum.py

@@ -1,4 +1,5 @@
 class RapidataDataTypes:
+    # deprecated use Literal["media", "text"] instead
     MEDIA = "media" # any form of image, video or audio
     TEXT = "text"
 

rapidata/rapidata_client/filter/__init__.py

@@ -8,5 +8,6 @@ from .user_score_filter import UserScoreFilter
 from .custom_filter import CustomFilter
 from .not_filter import NotFilter
 from .or_filter import OrFilter
+from .and_filter import AndFilter
 from .response_count_filter import ResponseCountFilter
 from .new_user_filter import NewUserFilter

rapidata/rapidata_client/filter/_base_filter.py

@@ -29,6 +29,26 @@ class RapidataFilter:
         else:
             return OrFilter([self, other])
 
+    def __and__(self, other):
+        """Enable the & operator to create AndFilter combinations."""
+        if not isinstance(other, RapidataFilter):
+            return NotImplemented
+        
+        from rapidata.rapidata_client.filter.and_filter import AndFilter
+        
+        # If self is already an AndFilter, extend its filters list
+        if isinstance(self, AndFilter):
+            if isinstance(other, AndFilter):
+                return AndFilter(self.filters + other.filters)
+            else:
+                return AndFilter(self.filters + [other])
+        # If other is an AndFilter, prepend self to its filters
+        elif isinstance(other, AndFilter):
+            return AndFilter([self] + other.filters)
+        # Neither is an AndFilter, create a new one
+        else:
+            return AndFilter([self, other])
+
     def __invert__(self):
         """Enable the ~ operator to create NotFilter negations."""
         from rapidata.rapidata_client.filter.not_filter import NotFilter

rapidata/rapidata_client/filter/and_filter.py

@@ -0,0 +1,30 @@
+from typing import Any
+from rapidata.rapidata_client.filter._base_filter import RapidataFilter
+from rapidata.api_client.models.and_user_filter_model import AndUserFilterModel
+from rapidata.api_client.models.and_user_filter_model_filters_inner import AndUserFilterModelFiltersInner
+
+
+class AndFilter(RapidataFilter):
+    """A filter that combines multiple filters with a logical AND operation.
+    This class implements a logical AND operation on a list of filters, where the condition is met if all of the filters' conditions are met.
+
+    Args:
+        filters (list[RapidataFilter]): A list of filters to be combined with AND.
+        
+    Example:
+        ```python
+        from rapidata import AndFilter, LanguageFilter, CountryFilter
+
+        AndFilter([LanguageFilter(["en"]), CountryFilter(["US"])]) 
+        ```
+
+        This will match users who have their phone set to English AND are located in the United States.
+    """
+    def __init__(self, filters: list[RapidataFilter]):
+        if not all(isinstance(filter, RapidataFilter) for filter in filters):
+            raise ValueError("Filters must be a RapidataFilter object")
+        
+        self.filters = filters
+
+    def _to_model(self):
+        return AndUserFilterModel(_t="AndFilter", filters=[AndUserFilterModelFiltersInner(filter._to_model()) for filter in self.filters])

rapidata/rapidata_client/filter/rapidata_filters.py

@@ -5,7 +5,8 @@ from rapidata.rapidata_client.filter import (
     LanguageFilter, 
     UserScoreFilter,
     NotFilter,
-    OrFilter)
+    OrFilter,
+    AndFilter)
 
 class RapidataFilters:
     """RapidataFilters Classes
@@ -25,6 +26,7 @@ class RapidataFilters:
         language (LanguageFilter): Filters for users with a specific language.
         not_filter (NotFilter): Inverts the filter.
         or_filter (OrFilter): Combines multiple filters with a logical OR operation.
+        and_filter (AndFilter): Combines multiple filters with a logical AND operation.
 
     Example:
         ```python
@@ -35,15 +37,15 @@ class RapidataFilters:
         This ensures the order is only shown to users in the US and Germany whose phones are set to English.
 
     Info:        
-        The or and not filter support the | and ~ operators respectively.
-        The and is given by the elements in the list.
+        The OR, AND and NOT filter support the |, & and ~ operators respectively.
+        The AND is additionally given by the elements in the list.
 
         ```python
         from rapidata import AgeFilter, LanguageFilter, CountryFilter
-        filters=[~AgeFilter([AgeGroup.UNDER_18]), CountryFilter(["US"]) | LanguageFilter(["en"])]
+        filters=[~AgeFilter([AgeGroup.UNDER_18]), CountryFilter(["US"]) | (CountryFilter(["CA"]) & LanguageFilter(["en"]))]
         ```
 
-        This would return users who are not under 18 years old and are from the US or whose phones are set to English.
+        This would return users who are not under 18 years old and are from the US or who are from Canada and whose phones are set to English.
     """
     user_score = UserScoreFilter
     age = AgeFilter 
@@ -52,3 +54,4 @@ class RapidataFilters:
     language = LanguageFilter
     not_filter = NotFilter
     or_filter = OrFilter
+    and_filter = AndFilter