rapidata 2.17.1__py3-none-any.whl → 2.19.0__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

@@ -11,114 +11,86 @@
     Do not edit the class manually.
 """  # noqa: E501
 
-
 import io
 import json
 import re
-import ssl
+from typing import Dict, Optional
 
-import urllib3
+import requests
+from authlib.integrations.requests_client import OAuth2Session
+from requests.adapters import HTTPAdapter
+from urllib3 import Retry
 
 from rapidata.api_client.exceptions import ApiException, ApiValueError
 
-SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"}
-RESTResponseType = urllib3.HTTPResponse
-
-
-def is_socks_proxy_url(url):
-    if url is None:
-        return False
-    split_section = url.split("://")
-    if len(split_section) < 2:
-        return False
-    else:
-        return split_section[0].lower() in SUPPORTED_SOCKS_PROXIES
-
 
 class RESTResponse(io.IOBase):
 
-    def __init__(self, resp) -> None:
+    def __init__(self, resp: requests.Response) -> None:
         self.response = resp
-        self.status = resp.status
+        self.status = resp.status_code
         self.reason = resp.reason
         self.data = None
 
     def read(self):
         if self.data is None:
-            self.data = self.response.data
+            self.data = self.response.content
         return self.data
 
-    def getheaders(self):
+    def getheaders(self) -> Dict[str, str]:
         """Returns a dictionary of the response headers."""
-        return self.response.headers
+        return dict(self.response.headers)
 
-    def getheader(self, name, default=None):
+    def getheader(self, name, default=None) -> Optional[str]:
         """Returns a given response header."""
         return self.response.headers.get(name, default)
 
 
-class RESTClientObject:
-
-    def __init__(self, configuration) -> None:
-        # urllib3.PoolManager will pass all kw parameters to connectionpool
-        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
-        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
-        # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
-
-        # cert_reqs
-        if configuration.verify_ssl:
-            cert_reqs = ssl.CERT_REQUIRED
-        else:
-            cert_reqs = ssl.CERT_NONE
-
-        pool_args = {
-            "cert_reqs": cert_reqs,
-            "ca_certs": configuration.ssl_ca_cert,
-            "cert_file": configuration.cert_file,
-            "key_file": configuration.key_file,
-        }
-        if configuration.assert_hostname is not None:
-            pool_args['assert_hostname'] = (
-                configuration.assert_hostname
-            )
+RESTResponseType = RESTResponse
 
-        if configuration.retries is not None:
-            pool_args['retries'] = configuration.retries
 
-        if configuration.tls_server_name:
-            pool_args['server_hostname'] = configuration.tls_server_name
-
-
-        if configuration.socket_options is not None:
-            pool_args['socket_options'] = configuration.socket_options
+class RESTClientObject:
 
-        if configuration.connection_pool_maxsize is not None:
-            pool_args['maxsize'] = configuration.connection_pool_maxsize
+    def __init__(self, configuration) -> None:
+        self.configuration = configuration
 
-        # https pool manager
-        self.pool_manager: urllib3.PoolManager
+        self.session: Optional[OAuth2Session] = None
 
-        if configuration.proxy:
-            if is_socks_proxy_url(configuration.proxy):
-                from urllib3.contrib.socks import SOCKSProxyManager
-                pool_args["proxy_url"] = configuration.proxy
-                pool_args["headers"] = configuration.proxy_headers
-                self.pool_manager = SOCKSProxyManager(**pool_args)
-            else:
-                pool_args["proxy_url"] = configuration.proxy
-                pool_args["proxy_headers"] = configuration.proxy_headers
-                self.pool_manager = urllib3.ProxyManager(**pool_args)
-        else:
-            self.pool_manager = urllib3.PoolManager(**pool_args)
+    def setup_oauth_client_credentials(
+            self, client_id: str, client_secret: str, token_endpoint: str, scope: str
+    ):
+        self.session = OAuth2Session(
+            client_id=client_id,
+            client_secret=client_secret,
+            token_endpoint=token_endpoint,
+            scope=scope,
+        )
+        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(
+            token=token,
+            token_endpoint=token_endpoint,
+            client_id=client_id,
+            client_secret=client_secret,
+            leeway=leeway,
+        )
+        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.
 
@@ -135,15 +107,7 @@ class RESTClientObject:
                                  (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in [
-            'GET',
-            'HEAD',
-            'DELETE',
-            'POST',
-            'PUT',
-            'PATCH',
-            'OPTIONS'
-        ]
+        assert method in ["GET", "HEAD", "DELETE", "POST", "PUT", "PATCH", "OPTIONS"]
 
         if post_params and body:
             raise ApiValueError(
@@ -153,105 +117,115 @@ class RESTClientObject:
         post_params = post_params or {}
         headers = headers or {}
 
+        if not self.session:
+            raise ApiValueError(
+                "OAuth2 session is not initialized. Please initialize it before making requests."
+            )
+
+        session = self.session
+
         timeout = None
         if _request_timeout:
             if isinstance(_request_timeout, (int, float)):
-                timeout = urllib3.Timeout(total=_request_timeout)
-            elif (
-                    isinstance(_request_timeout, tuple)
-                    and len(_request_timeout) == 2
-                ):
-                timeout = urllib3.Timeout(
-                    connect=_request_timeout[0],
-                    read=_request_timeout[1]
-                )
+                timeout = _request_timeout
+            elif isinstance(_request_timeout, tuple) and len(_request_timeout) == 2:
+                timeout = _request_timeout
 
         try:
-            # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
-            if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
-
-                # no content type provided or payload is json
-                content_type = headers.get('Content-Type')
-                if (
-                    not content_type
-                    or re.search('json', content_type, re.IGNORECASE)
-                ):
+            if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]:
+                content_type = headers.get("Content-Type")
+
+                if not content_type or re.search("json", content_type, re.IGNORECASE):
                     request_body = None
                     if body is not None:
                         request_body = json.dumps(body)
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        body=request_body,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False
-                    )
+                    r = session.request(method, url, data=request_body, timeout=timeout, headers=headers)
+
                 elif content_type == 'application/x-www-form-urlencoded':
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        fields=post_params,
-                        encode_multipart=False,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False
-                    )
+                    r = session.request(method, url, data=post_params, timeout=timeout, headers=headers)
+
                 elif content_type == 'multipart/form-data':
-                    # must del headers['Content-Type'], or the correct
-                    # Content-Type which generated by urllib3 will be
-                    # overwritten.
                     del headers['Content-Type']
-                    # Ensures that dict objects are serialized
-                    post_params = [(a, json.dumps(b)) if isinstance(b, dict) else (a,b) for a, b in post_params]
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        fields=post_params,
-                        encode_multipart=True,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False
-                    )
-                # Pass a `string` parameter directly in the body to support
-                # other content types than JSON when `body` argument is
-                # provided in serialized form.
+                    files = []
+                    data = {}
+
+                    for key, value in post_params:
+                        if isinstance(value, tuple) and len(value) >= 2:
+                            # This is a file tuple (filename, file_data, [content_type])
+                            filename, file_data = value[0], value[1]
+                            content_type = value[2] if len(value) > 2 else None
+                            files.append((key, (filename, file_data, content_type)))
+                        elif isinstance(value, dict):
+                            # JSON-serialize dictionary values
+                            if key in data:
+                                # If we already have this key, handle as needed
+                                # (convert to list or append to existing list)
+                                if not isinstance(data[key], list):
+                                    data[key] = [data[key]]
+                                data[key].append(json.dumps(value))
+                            else:
+                                data[key] = json.dumps(value)
+                        else:
+                            # Regular form data
+                            if key in data:
+                                if not isinstance(data[key], list):
+                                    data[key] = [data[key]]
+                                data[key].append(value)
+                            else:
+                                data[key] = value
+                    r = session.request(method, url, files=files, data=data, timeout=timeout, headers=headers)
+
                 elif isinstance(body, str) or isinstance(body, bytes):
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        body=body,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False
-                    )
+                    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 = self.pool_manager.request(
-                        method,
-                        url,
-                        body=request_body,
-                        preload_content=False,
-                        timeout=timeout,
-                        headers=headers)
+                    request_body = 'true' if body else 'false'
+                    r = session.request(method, url, data=request_body, timeout=timeout, headers=headers)
+
                 else:
-                    # Cannot generate the request from given parameters
-                    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)
-            # For `GET`, `HEAD`
+
             else:
-                r = self.pool_manager.request(
-                    method,
-                    url,
-                    fields={},
-                    timeout=timeout,
-                    headers=headers,
-                    preload_content=False
-                )
-        except urllib3.exceptions.SSLError as e:
-            msg = "\n".join([type(e).__name__, str(e)])
+                r = session.request(method, url, params={}, timeout=timeout, headers=headers)
+
+        except requests.exceptions.SSLError 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,
+            )
+
+        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,
+            }
+
+            if self.configuration.proxy_headers:
+                for key, value in self.configuration.proxy_headers.items():
+                    self.session.headers[key] = value