rapidata 2.23.2__py3-none-any.whl → 3.0.1__py3-none-any.whl

rapidata/api_client/models/simple_workflow_config_model.py

@@ -20,6 +20,7 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List
 from rapidata.api_client.models.compare_workflow_model1_referee import CompareWorkflowModel1Referee
+from rapidata.api_client.models.feature_flag import FeatureFlag
 from rapidata.api_client.models.simple_workflow_config_model_blueprint import SimpleWorkflowConfigModelBlueprint
 from typing import Optional, Set
 from typing_extensions import Self
@@ -31,8 +32,8 @@ class SimpleWorkflowConfigModel(BaseModel):
     t: StrictStr = Field(description="Discriminator value for SimpleWorkflowConfig", alias="_t")
     referee: CompareWorkflowModel1Referee
     blueprint: SimpleWorkflowConfigModelBlueprint
-    target_country_codes: List[StrictStr] = Field(description="A list of country codes that this workflow is targeting.", alias="targetCountryCodes")
-    __properties: ClassVar[List[str]] = ["_t", "referee", "blueprint", "targetCountryCodes"]
+    feature_flags: List[FeatureFlag] = Field(description="The list of feature flags that will be applied to the rapids created by this workflow.", alias="featureFlags")
+    __properties: ClassVar[List[str]] = ["_t", "referee", "blueprint", "featureFlags"]
 
     @field_validator('t')
     def t_validate_enum(cls, value):
@@ -86,6 +87,13 @@ class SimpleWorkflowConfigModel(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of blueprint
         if self.blueprint:
             _dict['blueprint'] = self.blueprint.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in feature_flags (list)
+        _items = []
+        if self.feature_flags:
+            for _item_feature_flags in self.feature_flags:
+                if _item_feature_flags:
+                    _items.append(_item_feature_flags.to_dict())
+            _dict['featureFlags'] = _items
         return _dict
 
     @classmethod
@@ -101,7 +109,7 @@ class SimpleWorkflowConfigModel(BaseModel):
             "_t": obj.get("_t") if obj.get("_t") is not None else 'SimpleWorkflowConfig',
             "referee": CompareWorkflowModel1Referee.from_dict(obj["referee"]) if obj.get("referee") is not None else None,
             "blueprint": SimpleWorkflowConfigModelBlueprint.from_dict(obj["blueprint"]) if obj.get("blueprint") is not None else None,
-            "targetCountryCodes": obj.get("targetCountryCodes")
+            "featureFlags": [FeatureFlag.from_dict(_item) for _item in obj["featureFlags"]] if obj.get("featureFlags") is not None else None
         })
         return _obj
 

rapidata/api_client/models/simple_workflow_model.py

@@ -18,18 +18,20 @@ 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 Any, ClassVar, Dict, List, Optional
+from rapidata.api_client.models.feature_flag import FeatureFlag
 from rapidata.api_client.models.simple_workflow_model_blueprint import SimpleWorkflowModelBlueprint
 from typing import Optional, Set
 from typing_extensions import Self
 
 class SimpleWorkflowModel(BaseModel):
     """
-    If the SimpleWorkflow is chosen, each datapoint uploaded will correspond to a single task to be solved. This is the most commonly chosen workflow.
+    SimpleWorkflowModel
     """ # noqa: E501
     t: StrictStr = Field(description="Discriminator value for SimpleWorkflow", alias="_t")
     blueprint: SimpleWorkflowModelBlueprint
-    __properties: ClassVar[List[str]] = ["_t", "blueprint"]
+    feature_flags: Optional[List[FeatureFlag]] = Field(default=None, alias="featureFlags")
+    __properties: ClassVar[List[str]] = ["_t", "blueprint", "featureFlags"]
 
     @field_validator('t')
     def t_validate_enum(cls, value):
@@ -80,6 +82,13 @@ class SimpleWorkflowModel(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of blueprint
         if self.blueprint:
             _dict['blueprint'] = self.blueprint.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in feature_flags (list)
+        _items = []
+        if self.feature_flags:
+            for _item_feature_flags in self.feature_flags:
+                if _item_feature_flags:
+                    _items.append(_item_feature_flags.to_dict())
+            _dict['featureFlags'] = _items
         return _dict
 
     @classmethod
@@ -93,7 +102,8 @@ class SimpleWorkflowModel(BaseModel):
 
         _obj = cls.model_validate({
             "_t": obj.get("_t") if obj.get("_t") is not None else 'SimpleWorkflow',
-            "blueprint": SimpleWorkflowModelBlueprint.from_dict(obj["blueprint"]) if obj.get("blueprint") is not None else None
+            "blueprint": SimpleWorkflowModelBlueprint.from_dict(obj["blueprint"]) if obj.get("blueprint") is not None else None,
+            "featureFlags": [FeatureFlag.from_dict(_item) for _item in obj["featureFlags"]] if obj.get("featureFlags") is not None else None
         })
         return _obj
 

rapidata/api_client/models/simple_workflow_model1.py

@@ -20,7 +20,7 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from rapidata.api_client.models.compare_workflow_model1_referee import CompareWorkflowModel1Referee
-from rapidata.api_client.models.validation_import_post_request_blueprint import ValidationImportPostRequestBlueprint
+from rapidata.api_client.models.simple_workflow_model_blueprint import SimpleWorkflowModelBlueprint
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -30,13 +30,12 @@ class SimpleWorkflowModel1(BaseModel):
     """ # noqa: E501
     t: StrictStr = Field(description="Discriminator value for SimpleWorkflowModel", alias="_t")
     id: StrictStr
-    dataset_id: Optional[StrictStr] = Field(default=None, alias="datasetId")
     state: StrictStr
-    blueprint: ValidationImportPostRequestBlueprint
+    blueprint: SimpleWorkflowModelBlueprint
     referee: CompareWorkflowModel1Referee
     name: StrictStr
     owner_mail: Optional[StrictStr] = Field(default=None, alias="ownerMail")
-    __properties: ClassVar[List[str]] = ["_t", "id", "datasetId", "state", "blueprint", "referee", "name", "ownerMail"]
+    __properties: ClassVar[List[str]] = ["_t", "id", "state", "blueprint", "referee", "name", "ownerMail"]
 
     @field_validator('t')
     def t_validate_enum(cls, value):
@@ -90,11 +89,6 @@ class SimpleWorkflowModel1(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of referee
         if self.referee:
             _dict['referee'] = self.referee.to_dict()
-        # set to None if dataset_id (nullable) is None
-        # and model_fields_set contains the field
-        if self.dataset_id is None and "dataset_id" in self.model_fields_set:
-            _dict['datasetId'] = None
-
         # set to None if owner_mail (nullable) is None
         # and model_fields_set contains the field
         if self.owner_mail is None and "owner_mail" in self.model_fields_set:
@@ -114,9 +108,8 @@ class SimpleWorkflowModel1(BaseModel):
         _obj = cls.model_validate({
             "_t": obj.get("_t") if obj.get("_t") is not None else 'SimpleWorkflowModel',
             "id": obj.get("id"),
-            "datasetId": obj.get("datasetId"),
             "state": obj.get("state"),
-            "blueprint": ValidationImportPostRequestBlueprint.from_dict(obj["blueprint"]) if obj.get("blueprint") is not None else None,
+            "blueprint": SimpleWorkflowModelBlueprint.from_dict(obj["blueprint"]) if obj.get("blueprint") is not None else None,
             "referee": CompareWorkflowModel1Referee.from_dict(obj["referee"]) if obj.get("referee") is not None else None,
             "name": obj.get("name"),
             "ownerMail": obj.get("ownerMail")

rapidata/api_client/models/simple_workflow_model_blueprint.py

@@ -35,7 +35,7 @@ SIMPLEWORKFLOWMODELBLUEPRINT_ONE_OF_SCHEMAS = ["AttachCategoryRapidBlueprint", "
 
 class SimpleWorkflowModelBlueprint(BaseModel):
     """
-    The blueprint is used to create the tasks that will be shown to the users. They contain the common information across all tasks. For example, the tasks question.
+    SimpleWorkflowModelBlueprint
     """
     # data type: TranscriptionRapidBlueprint
     oneof_schema_1_validator: Optional[TranscriptionRapidBlueprint] = None

rapidata/api_client/models/sort_criterion.py

@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Rapidata.Dataset
+    Rapidata Asset API
 
-    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+    The API for the Rapidata Asset service
 
     The version of the OpenAPI document: v1
     Generated by OpenAPI Generator (https://openapi-generator.tech)
@@ -17,8 +17,9 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List
+from rapidata.api_client.models.sort_direction import SortDirection
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -27,16 +28,9 @@ class SortCriterion(BaseModel):
     SortCriterion
     """ # noqa: E501
     property_name: StrictStr = Field(alias="propertyName")
-    direction: StrictStr
+    direction: SortDirection
     __properties: ClassVar[List[str]] = ["propertyName", "direction"]
 
-    @field_validator('direction')
-    def direction_validate_enum(cls, value):
-        """Validates the enum"""
-        if value not in set(['Asc', 'Desc']):
-            raise ValueError("must be one of enum values ('Asc', 'Desc')")
-        return value
-
     model_config = ConfigDict(
         populate_by_name=True,
         validate_assignment=True,

rapidata/api_client/models/sort_direction.py

@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Rapidata.Dataset
+    Rapidata Asset API
 
-    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+    The API for the Rapidata Asset service
 
     The version of the OpenAPI document: v1
     Generated by OpenAPI Generator (https://openapi-generator.tech)

rapidata/api_client/models/source_url_metadata.py

@@ -28,7 +28,7 @@ class SourceUrlMetadata(BaseModel):
     """ # noqa: E501
     t: StrictStr = Field(description="Discriminator value for SourceUrlMetadata", alias="_t")
     url: StrictStr
-    visibilities: Optional[StrictStr] = None
+    visibilities: Optional[List[StrictStr]] = None
     __properties: ClassVar[List[str]] = ["_t", "url", "visibilities"]
 
     @field_validator('t')
@@ -38,6 +38,17 @@ class SourceUrlMetadata(BaseModel):
             raise ValueError("must be one of enum values ('SourceUrlMetadata')")
         return value
 
+    @field_validator('visibilities')
+    def visibilities_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        for i in value:
+            if i not in set(['None', 'Users', 'Customers', 'Admins', 'Dashboard', 'All']):
+                raise ValueError("each list item must be one of ('None', 'Users', 'Customers', 'Admins', 'Dashboard', 'All')")
+        return value
+
     model_config = ConfigDict(
         populate_by_name=True,
         validate_assignment=True,

rapidata/api_client/models/standing_by_benchmark.py

@@ -0,0 +1,113 @@
+# coding: utf-8
+
+"""
+    Rapidata Asset API
+
+    The API for the Rapidata Asset service
+
+    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, StrictBool, StrictFloat, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from rapidata.api_client.models.confidence_interval import ConfidenceInterval
+from rapidata.api_client.models.standing_status import StandingStatus
+from typing import Optional, Set
+from typing_extensions import Self
+
+class StandingByBenchmark(BaseModel):
+    """
+    StandingByBenchmark
+    """ # noqa: E501
+    id: StrictStr
+    name: StrictStr
+    benchmark_id: StrictStr = Field(alias="benchmarkId")
+    status: StandingStatus
+    score: Union[StrictFloat, StrictInt]
+    wins: Union[StrictFloat, StrictInt]
+    total_matches: Union[StrictFloat, StrictInt] = Field(alias="totalMatches")
+    is_disabled: StrictBool = Field(alias="isDisabled")
+    confidence_interval: Optional[ConfidenceInterval] = Field(default=None, alias="confidenceInterval")
+    __properties: ClassVar[List[str]] = ["id", "name", "benchmarkId", "status", "score", "wins", "totalMatches", "isDisabled", "confidenceInterval"]
+
+    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 StandingByBenchmark 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 confidence_interval
+        if self.confidence_interval:
+            _dict['confidenceInterval'] = self.confidence_interval.to_dict()
+        # set to None if confidence_interval (nullable) is None
+        # and model_fields_set contains the field
+        if self.confidence_interval is None and "confidence_interval" in self.model_fields_set:
+            _dict['confidenceInterval'] = None
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of StandingByBenchmark from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "id": obj.get("id"),
+            "name": obj.get("name"),
+            "benchmarkId": obj.get("benchmarkId"),
+            "status": obj.get("status"),
+            "score": obj.get("score"),
+            "wins": obj.get("wins"),
+            "totalMatches": obj.get("totalMatches"),
+            "isDisabled": obj.get("isDisabled"),
+            "confidenceInterval": ConfidenceInterval.from_dict(obj["confidenceInterval"]) if obj.get("confidenceInterval") is not None else None
+        })
+        return _obj
+
+

rapidata/api_client/models/standing_by_leaderboard.py

@@ -0,0 +1,113 @@
+# coding: utf-8
+
+"""
+    Rapidata Asset API
+
+    The API for the Rapidata Asset service
+
+    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, StrictBool, StrictFloat, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from rapidata.api_client.models.confidence_interval import ConfidenceInterval
+from rapidata.api_client.models.standing_status import StandingStatus
+from typing import Optional, Set
+from typing_extensions import Self
+
+class StandingByLeaderboard(BaseModel):
+    """
+    StandingByLeaderboard
+    """ # noqa: E501
+    id: StrictStr
+    name: StrictStr
+    leaderboard_id: StrictStr = Field(alias="leaderboardId")
+    status: StandingStatus
+    score: Union[StrictFloat, StrictInt]
+    wins: Union[StrictFloat, StrictInt]
+    total_matches: Union[StrictFloat, StrictInt] = Field(alias="totalMatches")
+    is_disabled: StrictBool = Field(alias="isDisabled")
+    confidence_interval: Optional[ConfidenceInterval] = Field(default=None, alias="confidenceInterval")
+    __properties: ClassVar[List[str]] = ["id", "name", "leaderboardId", "status", "score", "wins", "totalMatches", "isDisabled", "confidenceInterval"]
+
+    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 StandingByLeaderboard 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 confidence_interval
+        if self.confidence_interval:
+            _dict['confidenceInterval'] = self.confidence_interval.to_dict()
+        # set to None if confidence_interval (nullable) is None
+        # and model_fields_set contains the field
+        if self.confidence_interval is None and "confidence_interval" in self.model_fields_set:
+            _dict['confidenceInterval'] = None
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of StandingByLeaderboard from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "id": obj.get("id"),
+            "name": obj.get("name"),
+            "leaderboardId": obj.get("leaderboardId"),
+            "status": obj.get("status"),
+            "score": obj.get("score"),
+            "wins": obj.get("wins"),
+            "totalMatches": obj.get("totalMatches"),
+            "isDisabled": obj.get("isDisabled"),
+            "confidenceInterval": ConfidenceInterval.from_dict(obj["confidenceInterval"]) if obj.get("confidenceInterval") is not None else None
+        })
+        return _obj
+
+

rapidata/api_client/models/standing_by_leaderboard_paged_result.py

@@ -0,0 +1,105 @@
+# 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, StrictInt
+from typing import Any, ClassVar, Dict, List, Optional
+from rapidata.api_client.models.standing_by_leaderboard import StandingByLeaderboard
+from typing import Optional, Set
+from typing_extensions import Self
+
+class StandingByLeaderboardPagedResult(BaseModel):
+    """
+    StandingByLeaderboardPagedResult
+    """ # noqa: E501
+    total: StrictInt
+    page: StrictInt
+    page_size: StrictInt = Field(alias="pageSize")
+    items: List[StandingByLeaderboard]
+    total_pages: Optional[StrictInt] = Field(default=None, alias="totalPages")
+    __properties: ClassVar[List[str]] = ["total", "page", "pageSize", "items", "totalPages"]
+
+    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 StandingByLeaderboardPagedResult 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.
+        * OpenAPI `readOnly` fields are excluded.
+        """
+        excluded_fields: Set[str] = set([
+            "total_pages",
+        ])
+
+        _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 items (list)
+        _items = []
+        if self.items:
+            for _item_items in self.items:
+                if _item_items:
+                    _items.append(_item_items.to_dict())
+            _dict['items'] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of StandingByLeaderboardPagedResult from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "total": obj.get("total"),
+            "page": obj.get("page"),
+            "pageSize": obj.get("pageSize"),
+            "items": [StandingByLeaderboard.from_dict(_item) for _item in obj["items"]] if obj.get("items") is not None else None,
+            "totalPages": obj.get("totalPages")
+        })
+        return _obj
+
+

rapidata/api_client/models/standing_status.py

@@ -0,0 +1,38 @@
+# coding: utf-8
+
+"""
+    Rapidata Asset API
+
+    The API for the Rapidata Asset service
+
+    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 json
+from enum import Enum
+from typing_extensions import Self
+
+
+class StandingStatus(str, Enum):
+    """
+    StandingStatus
+    """
+
+    """
+    allowed enum values
+    """
+    CREATED = 'Created'
+    ACTIVE = 'Active'
+    IDLE = 'Idle'
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of StandingStatus from a JSON string"""
+        return cls(json.loads(json_str))
+
+