arthur-client 1.4.1233__py3-none-any.whl → 1.4.1235__py3-none-any.whl

arthur_client/api_bindings/models/base_literal_parameter_schema.py

@@ -0,0 +1,106 @@
+# coding: utf-8
+
+"""
+    Arthur Scope
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: 0.1.0
+    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, Optional
+from arthur_client.api_bindings.models.d_type import DType
+from typing import Optional, Set
+from typing_extensions import Self
+
+class BaseLiteralParameterSchema(BaseModel):
+    """
+    BaseLiteralParameterSchema
+    """ # noqa: E501
+    parameter_key: StrictStr = Field(description="Name of the parameter.")
+    friendly_name: StrictStr = Field(description="User facing name of the parameter.")
+    description: StrictStr = Field(description="Description of the parameter.")
+    parameter_type: Optional[StrictStr] = 'literal'
+    parameter_dtype: DType = Field(description="Data type of the parameter.")
+    __properties: ClassVar[List[str]] = ["parameter_key", "friendly_name", "description", "parameter_type", "parameter_dtype"]
+
+    @field_validator('parameter_type')
+    def parameter_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['literal']):
+            raise ValueError("must be one of enum values ('literal')")
+        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 BaseLiteralParameterSchema 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,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of BaseLiteralParameterSchema from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "parameter_key": obj.get("parameter_key"),
+            "friendly_name": obj.get("friendly_name"),
+            "description": obj.get("description"),
+            "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'literal',
+            "parameter_dtype": obj.get("parameter_dtype")
+        })
+        return _obj
+
+

arthur_client/api_bindings/models/custom_aggregation_spec_schema.py

@@ -0,0 +1,126 @@
+# coding: utf-8
+
+"""
+    Arthur Scope
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: 0.1.0
+    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 datetime import datetime
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List
+from arthur_client.api_bindings.models.custom_aggregation_spec_schema_aggregate_args_inner import CustomAggregationSpecSchemaAggregateArgsInner
+from arthur_client.api_bindings.models.reported_custom_aggregation import ReportedCustomAggregation
+from arthur_client.api_bindings.models.user import User
+from typing import Optional, Set
+from typing_extensions import Self
+
+class CustomAggregationSpecSchema(BaseModel):
+    """
+    CustomAggregationSpecSchema
+    """ # noqa: E501
+    name: StrictStr = Field(description="Name of the custom aggregation function.")
+    description: StrictStr = Field(description="Description of the custom aggregation function and what it aggregates.")
+    reported_aggregations: List[ReportedCustomAggregation] = Field(description="Metadata for every aggregation the custom aggregation reports.")
+    aggregate_args: List[CustomAggregationSpecSchemaAggregateArgsInner] = Field(description="List of parameters to the custom aggregation's query function.")
+    sql: StrictStr = Field(description="DuckDBSQL query for the custom aggregation.")
+    id: StrictStr = Field(description="Unique identifier of the custom aggregation function.")
+    workspace_id: StrictStr = Field(description="Unique identifier of the custom aggregation's parent workspace.")
+    version: StrictInt = Field(description="Version number of the custom aggregation function.")
+    authored_by: User = Field(description="User who authored this custom aggregation.")
+    created_at: datetime = Field(description="Time of aggregation creation.")
+    __properties: ClassVar[List[str]] = ["name", "description", "reported_aggregations", "aggregate_args", "sql", "id", "workspace_id", "version", "authored_by", "created_at"]
+
+    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 CustomAggregationSpecSchema 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 reported_aggregations (list)
+        _items = []
+        if self.reported_aggregations:
+            for _item_reported_aggregations in self.reported_aggregations:
+                if _item_reported_aggregations:
+                    _items.append(_item_reported_aggregations.to_dict())
+            _dict['reported_aggregations'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in aggregate_args (list)
+        _items = []
+        if self.aggregate_args:
+            for _item_aggregate_args in self.aggregate_args:
+                if _item_aggregate_args:
+                    _items.append(_item_aggregate_args.to_dict())
+            _dict['aggregate_args'] = _items
+        # override the default output from pydantic by calling `to_dict()` of authored_by
+        if self.authored_by:
+            _dict['authored_by'] = self.authored_by.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of CustomAggregationSpecSchema from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "name": obj.get("name"),
+            "description": obj.get("description"),
+            "reported_aggregations": [ReportedCustomAggregation.from_dict(_item) for _item in obj["reported_aggregations"]] if obj.get("reported_aggregations") is not None else None,
+            "aggregate_args": [CustomAggregationSpecSchemaAggregateArgsInner.from_dict(_item) for _item in obj["aggregate_args"]] if obj.get("aggregate_args") is not None else None,
+            "sql": obj.get("sql"),
+            "id": obj.get("id"),
+            "workspace_id": obj.get("workspace_id"),
+            "version": obj.get("version"),
+            "authored_by": User.from_dict(obj["authored_by"]) if obj.get("authored_by") is not None else None,
+            "created_at": obj.get("created_at")
+        })
+        return _obj
+
+

arthur_client/api_bindings/models/custom_aggregation_spec_schema_aggregate_args_inner.py

@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Arthur Scope
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+from inspect import getfullargspec
+import json
+import pprint
+import re  # noqa: F401
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
+from typing import Optional
+from arthur_client.api_bindings.models.base_column_parameter_schema import BaseColumnParameterSchema
+from arthur_client.api_bindings.models.base_dataset_parameter_schema import BaseDatasetParameterSchema
+from arthur_client.api_bindings.models.base_literal_parameter_schema import BaseLiteralParameterSchema
+from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
+from typing_extensions import Literal, Self
+from pydantic import Field
+
+CUSTOMAGGREGATIONSPECSCHEMAAGGREGATEARGSINNER_ANY_OF_SCHEMAS = ["BaseColumnParameterSchema", "BaseDatasetParameterSchema", "BaseLiteralParameterSchema"]
+
+class CustomAggregationSpecSchemaAggregateArgsInner(BaseModel):
+    """
+    CustomAggregationSpecSchemaAggregateArgsInner
+    """
+
+    # data type: BaseDatasetParameterSchema
+    anyof_schema_1_validator: Optional[BaseDatasetParameterSchema] = None
+    # data type: BaseLiteralParameterSchema
+    anyof_schema_2_validator: Optional[BaseLiteralParameterSchema] = None
+    # data type: BaseColumnParameterSchema
+    anyof_schema_3_validator: Optional[BaseColumnParameterSchema] = None
+    if TYPE_CHECKING:
+        actual_instance: Optional[Union[BaseColumnParameterSchema, BaseDatasetParameterSchema, BaseLiteralParameterSchema]] = None
+    else:
+        actual_instance: Any = None
+    any_of_schemas: Set[str] = { "BaseColumnParameterSchema", "BaseDatasetParameterSchema", "BaseLiteralParameterSchema" }
+
+    model_config = {
+        "validate_assignment": True,
+        "protected_namespaces": (),
+    }
+
+    def __init__(self, *args, **kwargs) -> None:
+        if args:
+            if len(args) > 1:
+                raise ValueError("If a position argument is used, only 1 is allowed to set `actual_instance`")
+            if kwargs:
+                raise ValueError("If a position argument is used, keyword arguments cannot be used.")
+            super().__init__(actual_instance=args[0])
+        else:
+            super().__init__(**kwargs)
+
+    @field_validator('actual_instance')
+    def actual_instance_must_validate_anyof(cls, v):
+        instance = CustomAggregationSpecSchemaAggregateArgsInner.model_construct()
+        error_messages = []
+        # validate data type: BaseDatasetParameterSchema
+        if not isinstance(v, BaseDatasetParameterSchema):
+            error_messages.append(f"Error! Input type `{type(v)}` is not `BaseDatasetParameterSchema`")
+        else:
+            return v
+
+        # validate data type: BaseLiteralParameterSchema
+        if not isinstance(v, BaseLiteralParameterSchema):
+            error_messages.append(f"Error! Input type `{type(v)}` is not `BaseLiteralParameterSchema`")
+        else:
+            return v
+
+        # validate data type: BaseColumnParameterSchema
+        if not isinstance(v, BaseColumnParameterSchema):
+            error_messages.append(f"Error! Input type `{type(v)}` is not `BaseColumnParameterSchema`")
+        else:
+            return v
+
+        if error_messages:
+            # no match
+            raise ValueError("No match found when setting the actual_instance in CustomAggregationSpecSchemaAggregateArgsInner with anyOf schemas: BaseColumnParameterSchema, BaseDatasetParameterSchema, BaseLiteralParameterSchema. Details: " + ", ".join(error_messages))
+        else:
+            return v
+
+    @classmethod
+    def from_dict(cls, obj: Dict[str, Any]) -> Self:
+        return cls.from_json(json.dumps(obj))
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Returns the object represented by the json string"""
+        instance = cls.model_construct()
+        error_messages = []
+        # anyof_schema_1_validator: Optional[BaseDatasetParameterSchema] = None
+        try:
+            instance.actual_instance = BaseDatasetParameterSchema.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+             error_messages.append(str(e))
+        # anyof_schema_2_validator: Optional[BaseLiteralParameterSchema] = None
+        try:
+            instance.actual_instance = BaseLiteralParameterSchema.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+             error_messages.append(str(e))
+        # anyof_schema_3_validator: Optional[BaseColumnParameterSchema] = None
+        try:
+            instance.actual_instance = BaseColumnParameterSchema.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+             error_messages.append(str(e))
+
+        if error_messages:
+            # no match
+            raise ValueError("No match found when deserializing the JSON string into CustomAggregationSpecSchemaAggregateArgsInner with anyOf schemas: BaseColumnParameterSchema, BaseDatasetParameterSchema, BaseLiteralParameterSchema. Details: " + ", ".join(error_messages))
+        else:
+            return instance
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        if self.actual_instance is None:
+            return "null"
+
+        if hasattr(self.actual_instance, "to_json") and callable(self.actual_instance.to_json):
+            return self.actual_instance.to_json()
+        else:
+            return json.dumps(self.actual_instance)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], BaseColumnParameterSchema, BaseDatasetParameterSchema, BaseLiteralParameterSchema]]:
+        """Returns the dict representation of the actual instance"""
+        if self.actual_instance is None:
+            return None
+
+        if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict):
+            return self.actual_instance.to_dict()
+        else:
+            return self.actual_instance
+
+    def to_str(self) -> str:
+        """Returns the string representation of the actual instance"""
+        return pprint.pformat(self.model_dump())
+
+

arthur_client/api_bindings/models/metrics_column_list_parameter_schema.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from arthur_client.api_bindings.models.metrics_column_list_parameter_schema_allowed_column_types_inner import MetricsColumnListParameterSchemaAllowedColumnTypesInner
+from arthur_client.api_bindings.models.base_column_parameter_schema_allowed_column_types_inner import BaseColumnParameterSchemaAllowedColumnTypesInner
 from arthur_client.api_bindings.models.scope_schema_tag import ScopeSchemaTag
 from typing import Optional, Set
 from typing_extensions import Self
@@ -29,15 +29,15 @@ class MetricsColumnListParameterSchema(BaseModel):
     MetricsColumnListParameterSchema
     """ # noqa: E501
     parameter_key: StrictStr = Field(description="Name of the parameter.")
-    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
     friendly_name: StrictStr = Field(description="User facing name of the parameter.")
     description: StrictStr = Field(description="Description of the parameter.")
     tag_hints: Optional[List[ScopeSchemaTag]] = Field(default=None, description="List of tags that are applicable to this parameter. Datasets with columns that have matching tags can be inferred this way.")
     source_dataset_parameter_key: StrictStr = Field(description="Name of the parameter that provides the dataset to be used for this column.")
-    allowed_column_types: Optional[List[MetricsColumnListParameterSchemaAllowedColumnTypesInner]] = None
+    allowed_column_types: Optional[List[BaseColumnParameterSchemaAllowedColumnTypesInner]] = None
     allow_any_column_type: Optional[StrictBool] = Field(default=False, description="Indicates if this metric parameter can accept any column type.")
     parameter_type: Optional[StrictStr] = 'column_list'
-    __properties: ClassVar[List[str]] = ["parameter_key", "optional", "friendly_name", "description", "tag_hints", "source_dataset_parameter_key", "allowed_column_types", "allow_any_column_type", "parameter_type"]
+    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
+    __properties: ClassVar[List[str]] = ["parameter_key", "friendly_name", "description", "tag_hints", "source_dataset_parameter_key", "allowed_column_types", "allow_any_column_type", "parameter_type", "optional"]
 
     @field_validator('parameter_type')
     def parameter_type_validate_enum(cls, value):
@@ -113,14 +113,14 @@ class MetricsColumnListParameterSchema(BaseModel):
 
         _obj = cls.model_validate({
             "parameter_key": obj.get("parameter_key"),
-            "optional": obj.get("optional") if obj.get("optional") is not None else False,
             "friendly_name": obj.get("friendly_name"),
             "description": obj.get("description"),
             "tag_hints": obj.get("tag_hints"),
             "source_dataset_parameter_key": obj.get("source_dataset_parameter_key"),
-            "allowed_column_types": [MetricsColumnListParameterSchemaAllowedColumnTypesInner.from_dict(_item) for _item in obj["allowed_column_types"]] if obj.get("allowed_column_types") is not None else None,
+            "allowed_column_types": [BaseColumnParameterSchemaAllowedColumnTypesInner.from_dict(_item) for _item in obj["allowed_column_types"]] if obj.get("allowed_column_types") is not None else None,
             "allow_any_column_type": obj.get("allow_any_column_type") if obj.get("allow_any_column_type") is not None else False,
-            "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'column_list'
+            "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'column_list',
+            "optional": obj.get("optional") if obj.get("optional") is not None else False
         })
         return _obj
 

arthur_client/api_bindings/models/metrics_column_parameter_schema.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from arthur_client.api_bindings.models.metrics_column_list_parameter_schema_allowed_column_types_inner import MetricsColumnListParameterSchemaAllowedColumnTypesInner
+from arthur_client.api_bindings.models.base_column_parameter_schema_allowed_column_types_inner import BaseColumnParameterSchemaAllowedColumnTypesInner
 from arthur_client.api_bindings.models.scope_schema_tag import ScopeSchemaTag
 from typing import Optional, Set
 from typing_extensions import Self
@@ -29,15 +29,15 @@ class MetricsColumnParameterSchema(BaseModel):
     MetricsColumnParameterSchema
     """ # noqa: E501
     parameter_key: StrictStr = Field(description="Name of the parameter.")
-    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
     friendly_name: StrictStr = Field(description="User facing name of the parameter.")
     description: StrictStr = Field(description="Description of the parameter.")
     tag_hints: Optional[List[ScopeSchemaTag]] = Field(default=None, description="List of tags that are applicable to this parameter. Datasets with columns that have matching tags can be inferred this way.")
     source_dataset_parameter_key: StrictStr = Field(description="Name of the parameter that provides the dataset to be used for this column.")
-    allowed_column_types: Optional[List[MetricsColumnListParameterSchemaAllowedColumnTypesInner]] = None
+    allowed_column_types: Optional[List[BaseColumnParameterSchemaAllowedColumnTypesInner]] = None
     allow_any_column_type: Optional[StrictBool] = Field(default=False, description="Indicates if this metric parameter can accept any column type.")
     parameter_type: Optional[StrictStr] = 'column'
-    __properties: ClassVar[List[str]] = ["parameter_key", "optional", "friendly_name", "description", "tag_hints", "source_dataset_parameter_key", "allowed_column_types", "allow_any_column_type", "parameter_type"]
+    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
+    __properties: ClassVar[List[str]] = ["parameter_key", "friendly_name", "description", "tag_hints", "source_dataset_parameter_key", "allowed_column_types", "allow_any_column_type", "parameter_type", "optional"]
 
     @field_validator('parameter_type')
     def parameter_type_validate_enum(cls, value):
@@ -113,14 +113,14 @@ class MetricsColumnParameterSchema(BaseModel):
 
         _obj = cls.model_validate({
             "parameter_key": obj.get("parameter_key"),
-            "optional": obj.get("optional") if obj.get("optional") is not None else False,
             "friendly_name": obj.get("friendly_name"),
             "description": obj.get("description"),
             "tag_hints": obj.get("tag_hints"),
             "source_dataset_parameter_key": obj.get("source_dataset_parameter_key"),
-            "allowed_column_types": [MetricsColumnListParameterSchemaAllowedColumnTypesInner.from_dict(_item) for _item in obj["allowed_column_types"]] if obj.get("allowed_column_types") is not None else None,
+            "allowed_column_types": [BaseColumnParameterSchemaAllowedColumnTypesInner.from_dict(_item) for _item in obj["allowed_column_types"]] if obj.get("allowed_column_types") is not None else None,
             "allow_any_column_type": obj.get("allow_any_column_type") if obj.get("allow_any_column_type") is not None else False,
-            "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'column'
+            "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'column',
+            "optional": obj.get("optional") if obj.get("optional") is not None else False
         })
         return _obj
 

arthur_client/api_bindings/models/metrics_dataset_parameter_schema.py

@@ -28,12 +28,12 @@ class MetricsDatasetParameterSchema(BaseModel):
     MetricsDatasetParameterSchema
     """ # noqa: E501
     parameter_key: StrictStr = Field(description="Name of the parameter.")
-    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
     friendly_name: StrictStr = Field(description="User facing name of the parameter.")
     description: StrictStr = Field(description="Description of the parameter.")
     parameter_type: Optional[StrictStr] = 'dataset'
     model_problem_type: Optional[ModelProblemType] = None
-    __properties: ClassVar[List[str]] = ["parameter_key", "optional", "friendly_name", "description", "parameter_type", "model_problem_type"]
+    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
+    __properties: ClassVar[List[str]] = ["parameter_key", "friendly_name", "description", "parameter_type", "model_problem_type", "optional"]
 
     @field_validator('parameter_type')
     def parameter_type_validate_enum(cls, value):
@@ -102,11 +102,11 @@ class MetricsDatasetParameterSchema(BaseModel):
 
         _obj = cls.model_validate({
             "parameter_key": obj.get("parameter_key"),
-            "optional": obj.get("optional") if obj.get("optional") is not None else False,
             "friendly_name": obj.get("friendly_name"),
             "description": obj.get("description"),
             "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'dataset',
-            "model_problem_type": obj.get("model_problem_type")
+            "model_problem_type": obj.get("model_problem_type"),
+            "optional": obj.get("optional") if obj.get("optional") is not None else False
         })
         return _obj
 

arthur_client/api_bindings/models/metrics_literal_parameter_schema.py

@@ -28,12 +28,12 @@ class MetricsLiteralParameterSchema(BaseModel):
     MetricsLiteralParameterSchema
     """ # noqa: E501
     parameter_key: StrictStr = Field(description="Name of the parameter.")
-    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
     friendly_name: StrictStr = Field(description="User facing name of the parameter.")
     description: StrictStr = Field(description="Description of the parameter.")
     parameter_type: Optional[StrictStr] = 'literal'
     parameter_dtype: DType = Field(description="Data type of the parameter.")
-    __properties: ClassVar[List[str]] = ["parameter_key", "optional", "friendly_name", "description", "parameter_type", "parameter_dtype"]
+    optional: Optional[StrictBool] = Field(default=False, description="Boolean denoting if the parameter is optional.")
+    __properties: ClassVar[List[str]] = ["parameter_key", "friendly_name", "description", "parameter_type", "parameter_dtype", "optional"]
 
     @field_validator('parameter_type')
     def parameter_type_validate_enum(cls, value):
@@ -97,11 +97,11 @@ class MetricsLiteralParameterSchema(BaseModel):
 
         _obj = cls.model_validate({
             "parameter_key": obj.get("parameter_key"),
-            "optional": obj.get("optional") if obj.get("optional") is not None else False,
             "friendly_name": obj.get("friendly_name"),
             "description": obj.get("description"),
             "parameter_type": obj.get("parameter_type") if obj.get("parameter_type") is not None else 'literal',
-            "parameter_dtype": obj.get("parameter_dtype")
+            "parameter_dtype": obj.get("parameter_dtype"),
+            "optional": obj.get("optional") if obj.get("optional") is not None else False
         })
         return _obj
 

arthur_client/api_bindings/models/object_type.py

@@ -26,7 +26,7 @@ class ObjectType(BaseModel):
     """
     ObjectType
     """ # noqa: E501
-    object: Dict[str, MetricsColumnListParameterSchemaAllowedColumnTypesInner]
+    object: Dict[str, BaseColumnParameterSchemaAllowedColumnTypesInner]
     __properties: ClassVar[List[str]] = ["object"]
 
     model_config = ConfigDict(
@@ -88,7 +88,7 @@ class ObjectType(BaseModel):
 
         _obj = cls.model_validate({
             "object": dict(
-                (_k, MetricsColumnListParameterSchemaAllowedColumnTypesInner.from_dict(_v))
+                (_k, BaseColumnParameterSchemaAllowedColumnTypesInner.from_dict(_v))
                 for _k, _v in obj["object"].items()
             )
             if obj.get("object") is not None
@@ -96,7 +96,7 @@ class ObjectType(BaseModel):
         })
         return _obj
 
-from arthur_client.api_bindings.models.metrics_column_list_parameter_schema_allowed_column_types_inner import MetricsColumnListParameterSchemaAllowedColumnTypesInner
+from arthur_client.api_bindings.models.base_column_parameter_schema_allowed_column_types_inner import BaseColumnParameterSchemaAllowedColumnTypesInner
 # TODO: Rewrite to not use raise_errors
 ObjectType.model_rebuild(raise_errors=False)
 

arthur_client/api_bindings/models/permission_name.py

@@ -68,6 +68,8 @@ class PermissionName(str, Enum):
     WORKSPACE_CREATE_WEBHOOK = 'workspace_create_webhook'
     WORKSPACE_LIST_WEBHOOKS = 'workspace_list_webhooks'
     WORKSPACE_TEST_WEBHOOK = 'workspace_test_webhook'
+    WORKSPACE_CREATE_CUSTOM_AGGREGATION = 'workspace_create_custom_aggregation'
+    WORKSPACE_VALIDATE_CUSTOM_AGGREGATION = 'workspace_validate_custom_aggregation'
     PROJECT_READ = 'project_read'
     PROJECT_UPDATE = 'project_update'
     PROJECT_DELETE = 'project_delete'
@@ -158,6 +160,9 @@ class PermissionName(str, Enum):
     WEBHOOK_UPDATE = 'webhook_update'
     WEBHOOK_DELETE = 'webhook_delete'
     ROLE_READ = 'role_read'
+    CUSTOM_AGGREGATION_READ = 'custom_aggregation_read'
+    CUSTOM_AGGREGATION_PUT = 'custom_aggregation_put'
+    CUSTOM_AGGREGATION_DELETE = 'custom_aggregation_delete'
 
     @classmethod
     def from_json(cls, json_str: str) -> Self: