waldur-api-client 7.7.3__py3-none-any.whl → 7.7.5__py3-none-any.whl

waldur_api_client/models/question_admin.py

@@ -6,7 +6,7 @@ from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
 from ..models.blank_enum import BlankEnum
-from ..models.operator_enum import OperatorEnum
+from ..models.checklist_operators import ChecklistOperators
 from ..models.question_type_enum import QuestionTypeEnum
 from ..types import UNSET, Unset
 
@@ -22,46 +22,52 @@ class QuestionAdmin:
     """
     Attributes:
         uuid (UUID):
-        category_uuid (UUID):
         question_options (list['QuestionOptionsAdmin']):
         url (str):
-        checklist_name (UUID):
+        checklist_name (str):
         checklist_uuid (UUID):
         checklist (str):
         description (Union[Unset, str]):
-        solution (Union[None, Unset, str]): Guidance shown when answer needs clarification
-        image (Union[None, Unset, str]):
+        user_guidance (Union[Unset, str]): Additional guidance text visible to users when answering and reviewing
         order (Union[Unset, int]):
         required (Union[Unset, bool]):
         question_type (Union[Unset, QuestionTypeEnum]):
-        operator (Union[BlankEnum, OperatorEnum, Unset]):
+        operator (Union[BlankEnum, ChecklistOperators, Unset]):
         review_answer_value (Union[Unset, Any]): Answer value that trigger review.
         always_requires_review (Union[Unset, bool]): This question always requires review regardless of answer
+        guidance_answer_value (Union[Unset, Any]): Answer value that triggers display of user guidance.
+        guidance_operator (Union[BlankEnum, ChecklistOperators, Unset]): Operator to use when comparing answer with
+            guidance_answer_value
+        always_show_guidance (Union[Unset, bool]): Show user guidance always, regardless of answer. If False, guidance
+            is conditional on answer matching guidance_answer_value with guidance_operator
+        min_value (Union[None, Unset, str]): Minimum value allowed for NUMBER type questions
+        max_value (Union[None, Unset, str]): Maximum value allowed for NUMBER type questions
     """
 
     uuid: UUID
-    category_uuid: UUID
     question_options: list["QuestionOptionsAdmin"]
     url: str
-    checklist_name: UUID
+    checklist_name: str
     checklist_uuid: UUID
     checklist: str
     description: Union[Unset, str] = UNSET
-    solution: Union[None, Unset, str] = UNSET
-    image: Union[None, Unset, str] = UNSET
+    user_guidance: Union[Unset, str] = UNSET
     order: Union[Unset, int] = UNSET
     required: Union[Unset, bool] = UNSET
     question_type: Union[Unset, QuestionTypeEnum] = UNSET
-    operator: Union[BlankEnum, OperatorEnum, Unset] = UNSET
+    operator: Union[BlankEnum, ChecklistOperators, Unset] = UNSET
     review_answer_value: Union[Unset, Any] = UNSET
     always_requires_review: Union[Unset, bool] = UNSET
+    guidance_answer_value: Union[Unset, Any] = UNSET
+    guidance_operator: Union[BlankEnum, ChecklistOperators, Unset] = UNSET
+    always_show_guidance: Union[Unset, bool] = UNSET
+    min_value: Union[None, Unset, str] = UNSET
+    max_value: Union[None, Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         uuid = str(self.uuid)
 
-        category_uuid = str(self.category_uuid)
-
         question_options = []
         for question_options_item_data in self.question_options:
             question_options_item = question_options_item_data.to_dict()
@@ -69,7 +75,7 @@ class QuestionAdmin:
 
         url = self.url
 
-        checklist_name = str(self.checklist_name)
+        checklist_name = self.checklist_name
 
         checklist_uuid = str(self.checklist_uuid)
 
@@ -77,17 +83,7 @@ class QuestionAdmin:
 
         description = self.description
 
-        solution: Union[None, Unset, str]
-        if isinstance(self.solution, Unset):
-            solution = UNSET
-        else:
-            solution = self.solution
-
-        image: Union[None, Unset, str]
-        if isinstance(self.image, Unset):
-            image = UNSET
-        else:
-            image = self.image
+        user_guidance = self.user_guidance
 
         order = self.order
 
@@ -100,7 +96,7 @@ class QuestionAdmin:
         operator: Union[Unset, str]
         if isinstance(self.operator, Unset):
             operator = UNSET
-        elif isinstance(self.operator, OperatorEnum):
+        elif isinstance(self.operator, ChecklistOperators):
             operator = self.operator.value
         else:
             operator = self.operator.value
@@ -109,12 +105,35 @@ class QuestionAdmin:
 
         always_requires_review = self.always_requires_review
 
+        guidance_answer_value = self.guidance_answer_value
+
+        guidance_operator: Union[Unset, str]
+        if isinstance(self.guidance_operator, Unset):
+            guidance_operator = UNSET
+        elif isinstance(self.guidance_operator, ChecklistOperators):
+            guidance_operator = self.guidance_operator.value
+        else:
+            guidance_operator = self.guidance_operator.value
+
+        always_show_guidance = self.always_show_guidance
+
+        min_value: Union[None, Unset, str]
+        if isinstance(self.min_value, Unset):
+            min_value = UNSET
+        else:
+            min_value = self.min_value
+
+        max_value: Union[None, Unset, str]
+        if isinstance(self.max_value, Unset):
+            max_value = UNSET
+        else:
+            max_value = self.max_value
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "uuid": uuid,
-                "category_uuid": category_uuid,
                 "question_options": question_options,
                 "url": url,
                 "checklist_name": checklist_name,
@@ -124,10 +143,8 @@ class QuestionAdmin:
         )
         if description is not UNSET:
             field_dict["description"] = description
-        if solution is not UNSET:
-            field_dict["solution"] = solution
-        if image is not UNSET:
-            field_dict["image"] = image
+        if user_guidance is not UNSET:
+            field_dict["user_guidance"] = user_guidance
         if order is not UNSET:
             field_dict["order"] = order
         if required is not UNSET:
@@ -140,6 +157,16 @@ class QuestionAdmin:
             field_dict["review_answer_value"] = review_answer_value
         if always_requires_review is not UNSET:
             field_dict["always_requires_review"] = always_requires_review
+        if guidance_answer_value is not UNSET:
+            field_dict["guidance_answer_value"] = guidance_answer_value
+        if guidance_operator is not UNSET:
+            field_dict["guidance_operator"] = guidance_operator
+        if always_show_guidance is not UNSET:
+            field_dict["always_show_guidance"] = always_show_guidance
+        if min_value is not UNSET:
+            field_dict["min_value"] = min_value
+        if max_value is not UNSET:
+            field_dict["max_value"] = max_value
 
         return field_dict
 
@@ -150,8 +177,6 @@ class QuestionAdmin:
         d = dict(src_dict)
         uuid = UUID(d.pop("uuid"))
 
-        category_uuid = UUID(d.pop("category_uuid"))
-
         question_options = []
         _question_options = d.pop("question_options")
         for question_options_item_data in _question_options:
@@ -161,7 +186,7 @@ class QuestionAdmin:
 
         url = d.pop("url")
 
-        checklist_name = UUID(d.pop("checklist_name"))
+        checklist_name = d.pop("checklist_name")
 
         checklist_uuid = UUID(d.pop("checklist_uuid"))
 
@@ -169,23 +194,7 @@ class QuestionAdmin:
 
         description = d.pop("description", UNSET)
 
-        def _parse_solution(data: object) -> Union[None, Unset, str]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            return cast(Union[None, Unset, str], data)
-
-        solution = _parse_solution(d.pop("solution", UNSET))
-
-        def _parse_image(data: object) -> Union[None, Unset, str]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            return cast(Union[None, Unset, str], data)
-
-        image = _parse_image(d.pop("image", UNSET))
+        user_guidance = d.pop("user_guidance", UNSET)
 
         order = d.pop("order", UNSET)
 
@@ -198,13 +207,13 @@ class QuestionAdmin:
         else:
             question_type = QuestionTypeEnum(_question_type)
 
-        def _parse_operator(data: object) -> Union[BlankEnum, OperatorEnum, Unset]:
+        def _parse_operator(data: object) -> Union[BlankEnum, ChecklistOperators, Unset]:
             if isinstance(data, Unset):
                 return data
             try:
                 if not isinstance(data, str):
                     raise TypeError()
-                operator_type_0 = OperatorEnum(data)
+                operator_type_0 = ChecklistOperators(data)
 
                 return operator_type_0
             except:  # noqa: E722
@@ -221,23 +230,67 @@ class QuestionAdmin:
 
         always_requires_review = d.pop("always_requires_review", UNSET)
 
+        guidance_answer_value = d.pop("guidance_answer_value", UNSET)
+
+        def _parse_guidance_operator(data: object) -> Union[BlankEnum, ChecklistOperators, Unset]:
+            if isinstance(data, Unset):
+                return data
+            try:
+                if not isinstance(data, str):
+                    raise TypeError()
+                guidance_operator_type_0 = ChecklistOperators(data)
+
+                return guidance_operator_type_0
+            except:  # noqa: E722
+                pass
+            if not isinstance(data, str):
+                raise TypeError()
+            guidance_operator_type_1 = BlankEnum(data)
+
+            return guidance_operator_type_1
+
+        guidance_operator = _parse_guidance_operator(d.pop("guidance_operator", UNSET))
+
+        always_show_guidance = d.pop("always_show_guidance", UNSET)
+
+        def _parse_min_value(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        min_value = _parse_min_value(d.pop("min_value", UNSET))
+
+        def _parse_max_value(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        max_value = _parse_max_value(d.pop("max_value", UNSET))
+
         question_admin = cls(
             uuid=uuid,
-            category_uuid=category_uuid,
             question_options=question_options,
             url=url,
             checklist_name=checklist_name,
             checklist_uuid=checklist_uuid,
             checklist=checklist,
             description=description,
-            solution=solution,
-            image=image,
+            user_guidance=user_guidance,
             order=order,
             required=required,
             question_type=question_type,
             operator=operator,
             review_answer_value=review_answer_value,
             always_requires_review=always_requires_review,
+            guidance_answer_value=guidance_answer_value,
+            guidance_operator=guidance_operator,
+            always_show_guidance=always_show_guidance,
+            min_value=min_value,
+            max_value=max_value,
         )
 
         question_admin.additional_properties = d

waldur_api_client/models/question_admin_request.py

@@ -1,15 +1,13 @@
 from collections.abc import Mapping
-from io import BytesIO
 from typing import Any, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from .. import types
 from ..models.blank_enum import BlankEnum
-from ..models.operator_enum import OperatorEnum
+from ..models.checklist_operators import ChecklistOperators
 from ..models.question_type_enum import QuestionTypeEnum
-from ..types import UNSET, File, Unset
+from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="QuestionAdminRequest")
 
@@ -20,26 +18,36 @@ class QuestionAdminRequest:
     Attributes:
         checklist (str):
         description (Union[Unset, str]):
-        solution (Union[None, Unset, str]): Guidance shown when answer needs clarification
-        image (Union[File, None, Unset]):
+        user_guidance (Union[Unset, str]): Additional guidance text visible to users when answering and reviewing
         order (Union[Unset, int]):
         required (Union[Unset, bool]):
         question_type (Union[Unset, QuestionTypeEnum]):
-        operator (Union[BlankEnum, OperatorEnum, Unset]):
+        operator (Union[BlankEnum, ChecklistOperators, Unset]):
         review_answer_value (Union[Unset, Any]): Answer value that trigger review.
         always_requires_review (Union[Unset, bool]): This question always requires review regardless of answer
+        guidance_answer_value (Union[Unset, Any]): Answer value that triggers display of user guidance.
+        guidance_operator (Union[BlankEnum, ChecklistOperators, Unset]): Operator to use when comparing answer with
+            guidance_answer_value
+        always_show_guidance (Union[Unset, bool]): Show user guidance always, regardless of answer. If False, guidance
+            is conditional on answer matching guidance_answer_value with guidance_operator
+        min_value (Union[None, Unset, str]): Minimum value allowed for NUMBER type questions
+        max_value (Union[None, Unset, str]): Maximum value allowed for NUMBER type questions
     """
 
     checklist: str
     description: Union[Unset, str] = UNSET
-    solution: Union[None, Unset, str] = UNSET
-    image: Union[File, None, Unset] = UNSET
+    user_guidance: Union[Unset, str] = UNSET
     order: Union[Unset, int] = UNSET
     required: Union[Unset, bool] = UNSET
     question_type: Union[Unset, QuestionTypeEnum] = UNSET
-    operator: Union[BlankEnum, OperatorEnum, Unset] = UNSET
+    operator: Union[BlankEnum, ChecklistOperators, Unset] = UNSET
     review_answer_value: Union[Unset, Any] = UNSET
     always_requires_review: Union[Unset, bool] = UNSET
+    guidance_answer_value: Union[Unset, Any] = UNSET
+    guidance_operator: Union[BlankEnum, ChecklistOperators, Unset] = UNSET
+    always_show_guidance: Union[Unset, bool] = UNSET
+    min_value: Union[None, Unset, str] = UNSET
+    max_value: Union[None, Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -47,20 +55,7 @@ class QuestionAdminRequest:
 
         description = self.description
 
-        solution: Union[None, Unset, str]
-        if isinstance(self.solution, Unset):
-            solution = UNSET
-        else:
-            solution = self.solution
-
-        image: Union[None, Unset, types.FileTypes]
-        if isinstance(self.image, Unset):
-            image = UNSET
-        elif isinstance(self.image, File):
-            image = self.image.to_tuple()
-
-        else:
-            image = self.image
+        user_guidance = self.user_guidance
 
         order = self.order
 
@@ -73,7 +68,7 @@ class QuestionAdminRequest:
         operator: Union[Unset, str]
         if isinstance(self.operator, Unset):
             operator = UNSET
-        elif isinstance(self.operator, OperatorEnum):
+        elif isinstance(self.operator, ChecklistOperators):
             operator = self.operator.value
         else:
             operator = self.operator.value
@@ -82,6 +77,30 @@ class QuestionAdminRequest:
 
         always_requires_review = self.always_requires_review
 
+        guidance_answer_value = self.guidance_answer_value
+
+        guidance_operator: Union[Unset, str]
+        if isinstance(self.guidance_operator, Unset):
+            guidance_operator = UNSET
+        elif isinstance(self.guidance_operator, ChecklistOperators):
+            guidance_operator = self.guidance_operator.value
+        else:
+            guidance_operator = self.guidance_operator.value
+
+        always_show_guidance = self.always_show_guidance
+
+        min_value: Union[None, Unset, str]
+        if isinstance(self.min_value, Unset):
+            min_value = UNSET
+        else:
+            min_value = self.min_value
+
+        max_value: Union[None, Unset, str]
+        if isinstance(self.max_value, Unset):
+            max_value = UNSET
+        else:
+            max_value = self.max_value
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
@@ -91,10 +110,8 @@ class QuestionAdminRequest:
         )
         if description is not UNSET:
             field_dict["description"] = description
-        if solution is not UNSET:
-            field_dict["solution"] = solution
-        if image is not UNSET:
-            field_dict["image"] = image
+        if user_guidance is not UNSET:
+            field_dict["user_guidance"] = user_guidance
         if order is not UNSET:
             field_dict["order"] = order
         if required is not UNSET:
@@ -107,6 +124,16 @@ class QuestionAdminRequest:
             field_dict["review_answer_value"] = review_answer_value
         if always_requires_review is not UNSET:
             field_dict["always_requires_review"] = always_requires_review
+        if guidance_answer_value is not UNSET:
+            field_dict["guidance_answer_value"] = guidance_answer_value
+        if guidance_operator is not UNSET:
+            field_dict["guidance_operator"] = guidance_operator
+        if always_show_guidance is not UNSET:
+            field_dict["always_show_guidance"] = always_show_guidance
+        if min_value is not UNSET:
+            field_dict["min_value"] = min_value
+        if max_value is not UNSET:
+            field_dict["max_value"] = max_value
 
         return field_dict
 
@@ -117,31 +144,7 @@ class QuestionAdminRequest:
 
         description = d.pop("description", UNSET)
 
-        def _parse_solution(data: object) -> Union[None, Unset, str]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            return cast(Union[None, Unset, str], data)
-
-        solution = _parse_solution(d.pop("solution", UNSET))
-
-        def _parse_image(data: object) -> Union[File, None, Unset]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            try:
-                if not isinstance(data, bytes):
-                    raise TypeError()
-                image_type_0 = File(payload=BytesIO(data))
-
-                return image_type_0
-            except:  # noqa: E722
-                pass
-            return cast(Union[File, None, Unset], data)
-
-        image = _parse_image(d.pop("image", UNSET))
+        user_guidance = d.pop("user_guidance", UNSET)
 
         order = d.pop("order", UNSET)
 
@@ -154,13 +157,13 @@ class QuestionAdminRequest:
         else:
             question_type = QuestionTypeEnum(_question_type)
 
-        def _parse_operator(data: object) -> Union[BlankEnum, OperatorEnum, Unset]:
+        def _parse_operator(data: object) -> Union[BlankEnum, ChecklistOperators, Unset]:
             if isinstance(data, Unset):
                 return data
             try:
                 if not isinstance(data, str):
                     raise TypeError()
-                operator_type_0 = OperatorEnum(data)
+                operator_type_0 = ChecklistOperators(data)
 
                 return operator_type_0
             except:  # noqa: E722
@@ -177,17 +180,62 @@ class QuestionAdminRequest:
 
         always_requires_review = d.pop("always_requires_review", UNSET)
 
+        guidance_answer_value = d.pop("guidance_answer_value", UNSET)
+
+        def _parse_guidance_operator(data: object) -> Union[BlankEnum, ChecklistOperators, Unset]:
+            if isinstance(data, Unset):
+                return data
+            try:
+                if not isinstance(data, str):
+                    raise TypeError()
+                guidance_operator_type_0 = ChecklistOperators(data)
+
+                return guidance_operator_type_0
+            except:  # noqa: E722
+                pass
+            if not isinstance(data, str):
+                raise TypeError()
+            guidance_operator_type_1 = BlankEnum(data)
+
+            return guidance_operator_type_1
+
+        guidance_operator = _parse_guidance_operator(d.pop("guidance_operator", UNSET))
+
+        always_show_guidance = d.pop("always_show_guidance", UNSET)
+
+        def _parse_min_value(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        min_value = _parse_min_value(d.pop("min_value", UNSET))
+
+        def _parse_max_value(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        max_value = _parse_max_value(d.pop("max_value", UNSET))
+
         question_admin_request = cls(
             checklist=checklist,
             description=description,
-            solution=solution,
-            image=image,
+            user_guidance=user_guidance,
             order=order,
             required=required,
             question_type=question_type,
             operator=operator,
             review_answer_value=review_answer_value,
             always_requires_review=always_requires_review,
+            guidance_answer_value=guidance_answer_value,
+            guidance_operator=guidance_operator,
+            always_show_guidance=always_show_guidance,
+            min_value=min_value,
+            max_value=max_value,
         )
 
         question_admin_request.additional_properties = d

waldur_api_client/models/question_dependency.py

@@ -5,7 +5,7 @@ from uuid import UUID
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from ..models.operator_enum import OperatorEnum
+from ..models.checklist_operators import ChecklistOperators
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="QuestionDependency")
@@ -22,7 +22,7 @@ class QuestionDependency:
         depends_on_question (str):
         depends_on_question_name (str):
         required_answer_value (Any): The answer value(s) that make this question visible
-        operator (Union[Unset, OperatorEnum]):
+        operator (Union[Unset, ChecklistOperators]):
     """
 
     uuid: UUID
@@ -32,7 +32,7 @@ class QuestionDependency:
     depends_on_question: str
     depends_on_question_name: str
     required_answer_value: Any
-    operator: Union[Unset, OperatorEnum] = UNSET
+    operator: Union[Unset, ChecklistOperators] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -90,11 +90,11 @@ class QuestionDependency:
         required_answer_value = d.pop("required_answer_value")
 
         _operator = d.pop("operator", UNSET)
-        operator: Union[Unset, OperatorEnum]
+        operator: Union[Unset, ChecklistOperators]
         if isinstance(_operator, Unset):
             operator = UNSET
         else:
-            operator = OperatorEnum(_operator)
+            operator = ChecklistOperators(_operator)
 
         question_dependency = cls(
             uuid=uuid,

waldur_api_client/models/question_dependency_request.py

@@ -4,7 +4,7 @@ from typing import Any, TypeVar, Union
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from ..models.operator_enum import OperatorEnum
+from ..models.checklist_operators import ChecklistOperators
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="QuestionDependencyRequest")
@@ -17,13 +17,13 @@ class QuestionDependencyRequest:
         question (str):
         depends_on_question (str):
         required_answer_value (Any): The answer value(s) that make this question visible
-        operator (Union[Unset, OperatorEnum]):
+        operator (Union[Unset, ChecklistOperators]):
     """
 
     question: str
     depends_on_question: str
     required_answer_value: Any
-    operator: Union[Unset, OperatorEnum] = UNSET
+    operator: Union[Unset, ChecklistOperators] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -61,11 +61,11 @@ class QuestionDependencyRequest:
         required_answer_value = d.pop("required_answer_value")
 
         _operator = d.pop("operator", UNSET)
-        operator: Union[Unset, OperatorEnum]
+        operator: Union[Unset, ChecklistOperators]
         if isinstance(_operator, Unset):
             operator = UNSET
         else:
-            operator = OperatorEnum(_operator)
+            operator = ChecklistOperators(_operator)
 
         question_dependency_request = cls(
             question=question,