rapidata 2.18.0__py3-none-any.whl → 2.19.1__py3-none-any.whl

rapidata/api_client/models/not_user_filter_model.py

@@ -0,0 +1,102 @@
+# coding: utf-8
+
+"""
+    Rapidata.Dataset
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: v1
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class NotUserFilterModel(BaseModel):
+    """
+    NotUserFilterModel
+    """ # noqa: E501
+    t: StrictStr = Field(description="Discriminator value for NotFilter", alias="_t")
+    filter: CreateOrderModelUserFiltersInner
+    __properties: ClassVar[List[str]] = ["_t", "filter"]
+
+    @field_validator('t')
+    def t_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['NotFilter']):
+            raise ValueError("must be one of enum values ('NotFilter')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of NotUserFilterModel from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of filter
+        if self.filter:
+            _dict['filter'] = self.filter.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of NotUserFilterModel from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "_t": obj.get("_t") if obj.get("_t") is not None else 'NotFilter',
+            "filter": CreateOrderModelUserFiltersInner.from_dict(obj["filter"]) if obj.get("filter") is not None else None
+        })
+        return _obj
+
+from rapidata.api_client.models.create_order_model_user_filters_inner import CreateOrderModelUserFiltersInner
+# TODO: Rewrite to not use raise_errors
+NotUserFilterModel.model_rebuild(raise_errors=False)
+

rapidata/api_client/models/or_user_filter_model.py

@@ -0,0 +1,106 @@
+# coding: utf-8
+
+"""
+    Rapidata.Dataset
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: v1
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class OrUserFilterModel(BaseModel):
+    """
+    OrUserFilterModel
+    """ # noqa: E501
+    t: StrictStr = Field(description="Discriminator value for OrFilter", alias="_t")
+    filters: List[CreateOrderModelUserFiltersInner]
+    __properties: ClassVar[List[str]] = ["_t", "filters"]
+
+    @field_validator('t')
+    def t_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['OrFilter']):
+            raise ValueError("must be one of enum values ('OrFilter')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of OrUserFilterModel from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of each item in filters (list)
+        _items = []
+        if self.filters:
+            for _item_filters in self.filters:
+                if _item_filters:
+                    _items.append(_item_filters.to_dict())
+            _dict['filters'] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of OrUserFilterModel from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "_t": obj.get("_t") if obj.get("_t") is not None else 'OrFilter',
+            "filters": [CreateOrderModelUserFiltersInner.from_dict(_item) for _item in obj["filters"]] if obj.get("filters") is not None else None
+        })
+        return _obj
+
+from rapidata.api_client.models.create_order_model_user_filters_inner import CreateOrderModelUserFiltersInner
+# TODO: Rewrite to not use raise_errors
+OrUserFilterModel.model_rebuild(raise_errors=False)
+

rapidata/api_client/models/query_validation_rapids_result.py

@@ -19,10 +19,10 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from rapidata.api_client.models.add_user_response_result_validation_truth import AddUserResponseResultValidationTruth
 from rapidata.api_client.models.file_asset_model_metadata_value import FileAssetModelMetadataValue
-from rapidata.api_client.models.query_validation_rapids_result_asset import QueryValidationRapidsResultAsset
-from rapidata.api_client.models.query_validation_rapids_result_payload import QueryValidationRapidsResultPayload
+from rapidata.api_client.models.get_validation_rapids_result_asset import GetValidationRapidsResultAsset
+from rapidata.api_client.models.get_validation_rapids_result_payload import GetValidationRapidsResultPayload
+from rapidata.api_client.models.get_validation_rapids_result_truth import GetValidationRapidsResultTruth
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -32,9 +32,9 @@ class QueryValidationRapidsResult(BaseModel):
     """ # noqa: E501
     id: StrictStr
     type: StrictStr
-    asset: Optional[QueryValidationRapidsResultAsset] = None
-    truth: Optional[AddUserResponseResultValidationTruth] = None
-    payload: QueryValidationRapidsResultPayload
+    asset: Optional[GetValidationRapidsResultAsset] = None
+    truth: Optional[GetValidationRapidsResultTruth] = None
+    payload: GetValidationRapidsResultPayload
     metadata: Dict[str, FileAssetModelMetadataValue]
     correct_validation_count: StrictInt = Field(alias="correctValidationCount")
     invalid_validation_count: StrictInt = Field(alias="invalidValidationCount")
@@ -125,9 +125,9 @@ class QueryValidationRapidsResult(BaseModel):
         _obj = cls.model_validate({
             "id": obj.get("id"),
             "type": obj.get("type"),
-            "asset": QueryValidationRapidsResultAsset.from_dict(obj["asset"]) if obj.get("asset") is not None else None,
-            "truth": AddUserResponseResultValidationTruth.from_dict(obj["truth"]) if obj.get("truth") is not None else None,
-            "payload": QueryValidationRapidsResultPayload.from_dict(obj["payload"]) if obj.get("payload") is not None else None,
+            "asset": GetValidationRapidsResultAsset.from_dict(obj["asset"]) if obj.get("asset") is not None else None,
+            "truth": GetValidationRapidsResultTruth.from_dict(obj["truth"]) if obj.get("truth") is not None else None,
+            "payload": GetValidationRapidsResultPayload.from_dict(obj["payload"]) if obj.get("payload") is not None else None,
             "metadata": dict(
                 (_k, FileAssetModelMetadataValue.from_dict(_v))
                 for _k, _v in obj["metadata"].items()

rapidata/api_client/rest.py

@@ -16,20 +16,19 @@ import json
 import re
 from typing import Dict, Optional
 
-import requests
-from authlib.integrations.requests_client import OAuth2Session
-from requests.adapters import HTTPAdapter
-from urllib3 import Retry
+import httpx
+from authlib.integrations.httpx_client import OAuth2Client
+from httpx import Timeout
 
 from rapidata.api_client.exceptions import ApiException, ApiValueError
 
 
 class RESTResponse(io.IOBase):
 
-    def __init__(self, resp: requests.Response) -> None:
+    def __init__(self, resp: httpx.Response) -> None:
         self.response = resp
         self.status = resp.status_code
-        self.reason = resp.reason
+        self.reason = resp.reason_phrase
         self.data = None
 
     def read(self):
@@ -54,43 +53,48 @@ class RESTClientObject:
     def __init__(self, configuration) -> None:
         self.configuration = configuration
 
-        self.session: Optional[OAuth2Session] = None
+        self.session: Optional[OAuth2Client] = None
 
     def setup_oauth_client_credentials(
-            self, client_id: str, client_secret: str, token_endpoint: str, scope: str
+        self, client_id: str, client_secret: str, token_endpoint: str, scope: str
     ):
-        self.session = OAuth2Session(
+        client_args = self._get_session_defaults()
+        self.session = OAuth2Client(
             client_id=client_id,
             client_secret=client_secret,
             token_endpoint=token_endpoint,
             scope=scope,
+            **client_args,
         )
-        self._configure_session_defaults()
+
         self.session.fetch_token()
 
-    def setup_oauth_with_token(self,
-                               client_id: str | None,
-                               client_secret: str | None,
-                               token: dict,
-                               token_endpoint: str,
-                               leeway: int = 60):
-        self.session = OAuth2Session(
+    def setup_oauth_with_token(
+        self,
+        client_id: str | None,
+        client_secret: str | None,
+        token: dict,
+        token_endpoint: str,
+        leeway: int = 60,
+    ):
+        client_args = self._get_session_defaults()
+        self.session = OAuth2Client(
             token=token,
             token_endpoint=token_endpoint,
             client_id=client_id,
             client_secret=client_secret,
             leeway=leeway,
+            **client_args,
         )
-        self._configure_session_defaults()
 
     def request(
-            self,
-            method,
-            url,
-            headers=None,
-            body=None,
-            post_params=None,
-            _request_timeout=None,
+        self,
+        method,
+        url,
+        headers=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None,
     ):
         """Perform requests.
 
@@ -127,9 +131,10 @@ class RESTClientObject:
         timeout = None
         if _request_timeout:
             if isinstance(_request_timeout, (int, float)):
-                timeout = _request_timeout
+                timeout = Timeout(timeout=_request_timeout)
             elif isinstance(_request_timeout, tuple) and len(_request_timeout) == 2:
-                timeout = _request_timeout
+                connect_timeout, read_timeout = _request_timeout
+                timeout = Timeout(timeout=connect_timeout, read=read_timeout)
 
         try:
             if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]:
@@ -139,13 +144,21 @@ class RESTClientObject:
                     request_body = None
                     if body is not None:
                         request_body = json.dumps(body)
-                    r = session.request(method, url, data=request_body, timeout=timeout, headers=headers)
-
-                elif content_type == 'application/x-www-form-urlencoded':
-                    r = session.request(method, url, data=post_params, timeout=timeout, headers=headers)
-
-                elif content_type == 'multipart/form-data':
-                    del headers['Content-Type']
+                    r = session.request(
+                        method,
+                        url,
+                        content=request_body,
+                        timeout=timeout,
+                        headers=headers,
+                    )
+
+                elif content_type == "application/x-www-form-urlencoded":
+                    r = session.request(
+                        method, url, data=post_params, timeout=timeout, headers=headers
+                    )
+
+                elif content_type == "multipart/form-data":
+                    del headers["Content-Type"]
                     files = []
                     data = {}
 
@@ -173,59 +186,68 @@ class RESTClientObject:
                                 data[key].append(value)
                             else:
                                 data[key] = value
-                    r = session.request(method, url, files=files, data=data, timeout=timeout, headers=headers)
+                    r = session.request(
+                        method,
+                        url,
+                        files=files,
+                        data=data,
+                        timeout=timeout,
+                        headers=headers,
+                    )
 
                 elif isinstance(body, str) or isinstance(body, bytes):
-                    r = session.request(method, url, data=body, timeout=timeout, headers=headers)
-
-                elif headers['Content-Type'].startswith('text/') and isinstance(body, bool):
-                    request_body = 'true' if body else 'false'
-                    r = session.request(method, url, data=request_body, timeout=timeout, headers=headers)
+                    r = session.request(
+                        method, url, content=body, timeout=timeout, headers=headers
+                    )
+
+                elif headers["Content-Type"].startswith("text/") and isinstance(
+                    body, bool
+                ):
+                    request_body = "true" if body else "false"
+                    r = session.request(
+                        method,
+                        url,
+                        content=request_body,
+                        timeout=timeout,
+                        headers=headers,
+                    )
 
                 else:
-                    msg = '''Cannot prepare a request message for provided arguments.
-                             Please check that your arguments match declared content type.'''
+                    msg = """Cannot prepare a request message for provided arguments.
+                             Please check that your arguments match declared content type."""
                     raise ApiException(status=0, reason=msg)
 
             else:
-                r = session.request(method, url, params={}, timeout=timeout, headers=headers)
+                r = session.request(
+                    method, url, params={}, timeout=timeout, headers=headers
+                )
 
-        except requests.exceptions.SSLError as e:
-            msg = '\n'.join([type(e).__name__, str(e)])
+        except httpx.HTTPError as e:
+            msg = "\n".join([type(e).__name__, str(e)])
             raise ApiException(status=0, reason=msg)
 
         return RESTResponse(r)
 
-    def _configure_session_defaults(self):
-        self.session.verify = (
-            self.configuration.ssl_ca_cert
-            if self.configuration.ssl_ca_cert
-            else self.configuration.verify_ssl
-        )
-
-        if self.configuration.cert_file and self.configuration.key_file:
-            self.session.cert = (
-                self.configuration.cert_file,
-                self.configuration.key_file,
+    def _get_session_defaults(self):
+        client_kwargs = {
+            "verify": (
+                self.configuration.ssl_ca_cert
+                if self.configuration.ssl_ca_cert
+                else self.configuration.verify_ssl
             )
-
-        if self.configuration.retries is not None:
-            retry = Retry(
-                total=self.configuration.retries,
-                backoff_factor=0.3,
-                status_forcelist=[429, 500, 502, 503, 504],
-            )
-            adapter = HTTPAdapter(max_retries=retry)
-            self.session.mount("https://", adapter)
-            # noinspection HttpUrlsUsage
-            self.session.mount("http://", adapter)
+        }
 
         if self.configuration.proxy:
-            self.session.proxies = {
-                "http": self.configuration.proxy,
-                "https": self.configuration.proxy,
-            }
+            client_kwargs["proxy"] = self.configuration.proxy
 
+            existing_headers = client_kwargs.pop("headers")
             if self.configuration.proxy_headers:
                 for key, value in self.configuration.proxy_headers.items():
-                    self.session.headers[key] = value
+                    existing_headers[key] = value
+            client_kwargs["headers"] = existing_headers
+
+        if self.configuration.retries is not None:
+            transport = httpx.HTTPTransport(retries=self.configuration.retries)
+            client_kwargs["transport"] = transport
+
+        return client_kwargs

rapidata/api_client_README.md

@@ -162,8 +162,10 @@ Class | Method | HTTP request | Description
 *OrderApi* | [**orders_public_get**](rapidata/api_client/docs/OrderApi.md#orders_public_get) | **GET** /orders/public | Retrieves orders that are public and can be cloned by any user.
 *PipelineApi* | [**pipeline_id_workflow_artifact_id_put**](rapidata/api_client/docs/PipelineApi.md#pipeline_id_workflow_artifact_id_put) | **PUT** /pipeline/{id}/workflow/{artifactId} | Updates the workflow configuration for a pipeline.
 *PipelineApi* | [**pipeline_id_workflow_config_artifact_id_put**](rapidata/api_client/docs/PipelineApi.md#pipeline_id_workflow_config_artifact_id_put) | **PUT** /pipeline/{id}/workflow-config/{artifactId} | Updates the workflow configuration for a pipeline.
+*PipelineApi* | [**pipeline_id_workflow_config_put**](rapidata/api_client/docs/PipelineApi.md#pipeline_id_workflow_config_put) | **PUT** /pipeline/{id}/workflow-config | Updates the workflow configuration for a pipeline.
 *PipelineApi* | [**pipeline_pipeline_id_campaign_artifact_id_put**](rapidata/api_client/docs/PipelineApi.md#pipeline_pipeline_id_campaign_artifact_id_put) | **PUT** /pipeline/{pipelineId}/campaign/{artifactId} | Updates a specific campaign for a pipeline.
 *PipelineApi* | [**pipeline_pipeline_id_campaign_post**](rapidata/api_client/docs/PipelineApi.md#pipeline_pipeline_id_campaign_post) | **POST** /pipeline/{pipelineId}/campaign | Adds a campaign to a pipeline.
+*PipelineApi* | [**pipeline_pipeline_id_campaign_put**](rapidata/api_client/docs/PipelineApi.md#pipeline_pipeline_id_campaign_put) | **PUT** /pipeline/{pipelineId}/campaign | Updates a specific campaign for a pipeline.
 *PipelineApi* | [**pipeline_pipeline_id_get**](rapidata/api_client/docs/PipelineApi.md#pipeline_pipeline_id_get) | **GET** /pipeline/{pipelineId} | Gets a pipeline by its id.
 *PipelineApi* | [**pipeline_pipeline_id_preliminary_download_post**](rapidata/api_client/docs/PipelineApi.md#pipeline_pipeline_id_preliminary_download_post) | **POST** /pipeline/{pipelineId}/preliminary-download | Initiates a preliminary download of the pipeline.
 *PipelineApi* | [**pipeline_preliminary_download_preliminary_download_id_get**](rapidata/api_client/docs/PipelineApi.md#pipeline_preliminary_download_preliminary_download_id_get) | **GET** /pipeline/preliminary-download/{preliminaryDownloadId} | Gets the preliminary download.
@@ -223,7 +225,6 @@ Class | Method | HTTP request | Description
  - [AddCampaignArtifactResult](rapidata/api_client/docs/AddCampaignArtifactResult.md)
  - [AddCampaignModel](rapidata/api_client/docs/AddCampaignModel.md)
  - [AddUserResponseResult](rapidata/api_client/docs/AddUserResponseResult.md)
- - [AddUserResponseResultValidationTruth](rapidata/api_client/docs/AddUserResponseResultValidationTruth.md)
  - [AddValidationRapidModel](rapidata/api_client/docs/AddValidationRapidModel.md)
  - [AddValidationRapidModelPayload](rapidata/api_client/docs/AddValidationRapidModelPayload.md)
  - [AddValidationRapidModelTruth](rapidata/api_client/docs/AddValidationRapidModelTruth.md)
@@ -353,8 +354,11 @@ Class | Method | HTTP request | Description
  - [GetSimpleWorkflowResultsModel](rapidata/api_client/docs/GetSimpleWorkflowResultsModel.md)
  - [GetSimpleWorkflowResultsResult](rapidata/api_client/docs/GetSimpleWorkflowResultsResult.md)
  - [GetSimpleWorkflowResultsResultPagedResult](rapidata/api_client/docs/GetSimpleWorkflowResultsResultPagedResult.md)
- - [GetValidationRapidsQuery](rapidata/api_client/docs/GetValidationRapidsQuery.md)
- - [GetValidationRapidsQueryPagedResult](rapidata/api_client/docs/GetValidationRapidsQueryPagedResult.md)
+ - [GetValidationRapidsResult](rapidata/api_client/docs/GetValidationRapidsResult.md)
+ - [GetValidationRapidsResultAsset](rapidata/api_client/docs/GetValidationRapidsResultAsset.md)
+ - [GetValidationRapidsResultPagedResult](rapidata/api_client/docs/GetValidationRapidsResultPagedResult.md)
+ - [GetValidationRapidsResultPayload](rapidata/api_client/docs/GetValidationRapidsResultPayload.md)
+ - [GetValidationRapidsResultTruth](rapidata/api_client/docs/GetValidationRapidsResultTruth.md)
  - [GetValidationSetByIdResult](rapidata/api_client/docs/GetValidationSetByIdResult.md)
  - [GetWorkflowByIdResult](rapidata/api_client/docs/GetWorkflowByIdResult.md)
  - [GetWorkflowByIdResultWorkflow](rapidata/api_client/docs/GetWorkflowByIdResultWorkflow.md)
@@ -395,10 +399,12 @@ Class | Method | HTTP request | Description
  - [NewUserFilterModel](rapidata/api_client/docs/NewUserFilterModel.md)
  - [NewsletterModel](rapidata/api_client/docs/NewsletterModel.md)
  - [NotAvailableYetResult](rapidata/api_client/docs/NotAvailableYetResult.md)
+ - [NotUserFilterModel](rapidata/api_client/docs/NotUserFilterModel.md)
  - [NullAssetModel](rapidata/api_client/docs/NullAssetModel.md)
  - [OnlinePairMakerConfig](rapidata/api_client/docs/OnlinePairMakerConfig.md)
  - [OnlinePairMakerConfigModel](rapidata/api_client/docs/OnlinePairMakerConfigModel.md)
  - [OnlinePairMakerInformation](rapidata/api_client/docs/OnlinePairMakerInformation.md)
+ - [OrUserFilterModel](rapidata/api_client/docs/OrUserFilterModel.md)
  - [OrderModel](rapidata/api_client/docs/OrderModel.md)
  - [OrderModelPagedResult](rapidata/api_client/docs/OrderModelPagedResult.md)
  - [OrderState](rapidata/api_client/docs/OrderState.md)
@@ -421,9 +427,7 @@ Class | Method | HTTP request | Description
  - [PublicTextMetadataInput](rapidata/api_client/docs/PublicTextMetadataInput.md)
  - [QueryModel](rapidata/api_client/docs/QueryModel.md)
  - [QueryValidationRapidsResult](rapidata/api_client/docs/QueryValidationRapidsResult.md)
- - [QueryValidationRapidsResultAsset](rapidata/api_client/docs/QueryValidationRapidsResultAsset.md)
  - [QueryValidationRapidsResultPagedResult](rapidata/api_client/docs/QueryValidationRapidsResultPagedResult.md)
- - [QueryValidationRapidsResultPayload](rapidata/api_client/docs/QueryValidationRapidsResultPayload.md)
  - [QueryWorkflowsModel](rapidata/api_client/docs/QueryWorkflowsModel.md)
  - [RapidIssue](rapidata/api_client/docs/RapidIssue.md)
  - [RapidResponse](rapidata/api_client/docs/RapidResponse.md)

rapidata/rapidata_client/__init__.py

@@ -40,6 +40,8 @@ from .filter import (
     CustomFilter,
     AgeGroup,
     Gender,
+    NotFilter,
+    OrFilter,
 )
 
 from .validation import Box

rapidata/rapidata_client/filter/__init__.py

@@ -6,3 +6,5 @@ from .gender_filter import GenderFilter, Gender
 from .language_filter import LanguageFilter
 from .user_score_filter import UserScoreFilter
 from .custom_filter import CustomFilter
+from .not_filter import NotFilter
+from .or_filter import OrFilter

rapidata/rapidata_client/filter/not_filter.py

@@ -0,0 +1,30 @@
+from typing import Any
+from rapidata.rapidata_client.filter._base_filter import RapidataFilter
+from rapidata.api_client.models.not_user_filter_model import NotUserFilterModel
+from rapidata.api_client.models.create_order_model_user_filters_inner import CreateOrderModelUserFiltersInner
+
+
+class NotFilter(RapidataFilter):
+    """A filter that negates another filter's condition.
+    This class implements a logical NOT operation on a given filter, inverting its results.
+
+    Args:
+        filter (RapidataFilter): The filter whose condition should be negated.
+        
+    Example:
+        ```python
+        from rapidata import NotFilter, LanguageFilter
+
+        NotFilter(LanguageFilter(["en"])) 
+        ```
+
+        This will limit the order to be shown to only people who have their phone set to a language other than English.
+    """
+    def __init__(self, filter: RapidataFilter):
+        if not isinstance(filter, RapidataFilter):
+            raise ValueError("Filter must be a RapidataFilter object")
+        
+        self.filter = filter
+
+    def _to_model(self):
+        return NotUserFilterModel(_t="NotFilter", filter=CreateOrderModelUserFiltersInner(self.filter._to_model()))

rapidata/rapidata_client/filter/or_filter.py

@@ -0,0 +1,30 @@
+from typing import Any
+from rapidata.rapidata_client.filter._base_filter import RapidataFilter
+from rapidata.api_client.models.or_user_filter_model import OrUserFilterModel
+from rapidata.api_client.models.create_order_model_user_filters_inner import CreateOrderModelUserFiltersInner
+
+
+class OrFilter(RapidataFilter):
+    """A filter that combines multiple filters with a logical OR operation.
+    This class implements a logical OR operation on a list of filters, where the condition is met if any of the filters' conditions are met.
+
+    Args:
+        filters (list[RapidataFilter]): A list of filters to be combined with OR.
+        
+    Example:
+        ```python
+        from rapidata import OrFilter, LanguageFilter, CountryFilter
+
+        OrFilter([LanguageFilter(["en"]), CountryFilter(["US"])]) 
+        ```
+
+        This will match users who either have their phone set to English OR 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 OrUserFilterModel(_t="OrFilter", filters=[CreateOrderModelUserFiltersInner(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 (
     GenderFilter, 
     LanguageFilter, 
     UserScoreFilter,
-    CustomFilter)
+    NotFilter,
+    OrFilter)
 
 class RapidataFilters:
     """RapidataFilters Classes
@@ -24,7 +25,8 @@ class RapidataFilters:
         country (CountryFilter): The CountryFilter instance.
         gender (GenderFilter): The GenderFilter instance.
         language (LanguageFilter): The LanguageFilter instance.
-        custom_filter (CustomFilter): The CustomFilter instance.
+        not_filter (NotFilter): The NotFilter instance.
+        or_filter (OrFilter): The OrFilter instance.
 
     Example:
         ```python
@@ -40,4 +42,5 @@ class RapidataFilters:
     country = CountryFilter
     gender = GenderFilter
     language = LanguageFilter
-    custom_filter = CustomFilter
+    not_filter = NotFilter
+    or_filter = OrFilter

{rapidata-2.18.0.dist-info → rapidata-2.19.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.18.0
+Version: 2.19.1
 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