Moved conditions prop into status structure

xcube/core/gen2/service/generator.py

@@ -128,8 +128,8 @@ def _get_cube_generation_result(cls, response: requests.Response) -> Result:
         result = response_instance.result
         if result.status.failed:
             message = 'Cube generation failed'
-            if result.conditions:
-                sub_messages = [item['message'] or '' for item in result.conditions
+            if result.status.conditions:
+                sub_messages = [item['message'] or '' for item in result.status.conditions
                                 if isinstance(item, dict) and 'message' in item]
                 message = f'{message}: {": ".join(sub_messages)}'
             raise CubeGeneratorError(message,
@@ -146,6 +146,7 @@ def _parse_response(cls, response: requests.Response, response_type: Type[R]) ->
         try:
             return response_type.from_dict(data)
         except Exception as e:
+            print(data)
             raise RuntimeError(f'internal error: unexpected response'
                                f' from API call {response.url}: {e}') from e
 

xcube/core/gen2/service/response.py

@@ -57,16 +57,15 @@ def __init__(self,
                  active: int = None,
                  start_time: str = None,
                  completion_time: str = None,
-                 conditions=None,
-                 progress=None,
+                 conditions: List[Dict[str, Any]] = None,
                  **additional_properties):
-        self.succeeded = succeeded
-        self.failed = failed
-        self.active = active
-        self.start_time = start_time
-        self.completion_time = completion_time
-        self.conditions = conditions
-        self.additional_properties = additional_properties
+        self.succeeded: Optional[int] = succeeded
+        self.failed: Optional[int] = failed
+        self.active: Optional[int] = active
+        self.start_time: Optional[str] = start_time
+        self.completion_time: Optional[str] = completion_time
+        self.conditions: Optional[Dict[str, Any]] = conditions
+        self.additional_properties: Dict[str, Any] = additional_properties
 
     @classmethod
     def get_schema(cls) -> JsonObjectSchema:
@@ -75,7 +74,10 @@ def get_schema(cls) -> JsonObjectSchema:
                                                 active=JsonIntegerSchema(nullable=True),
                                                 start_time=JsonStringSchema(nullable=True),
                                                 completion_time=JsonStringSchema(nullable=True),
-                                                conditions=JsonArraySchema(nullable=True)),
+                                                conditions=JsonArraySchema(
+                                                    items=JsonObjectSchema(additional_properties=True),
+                                                    nullable=True
+                                                )),
                                 additional_properties=True,
                                 factory=cls)
 
@@ -148,14 +150,12 @@ def __init__(self,
                  status: Status,
                  output: List[str] = None,
                  progress: List[Progress] = None,
-                 conditions: List[Dict[str, Any]] = None,
                  **additional_properties):
         self.cubegen_id: str = cubegen_id
         self.status: Status = status
         self.output: Optional[List[str]] = output
         self.progress: Optional[List[Progress]] = progress
-        self.conditions: Optional[List[Dict[str, Any]]] = conditions
-        self.additional_properties = additional_properties
+        self.additional_properties: Dict[str, Any] = additional_properties
 
     @classmethod
     def get_schema(cls) -> JsonObjectSchema:
@@ -168,10 +168,6 @@ def get_schema(cls) -> JsonObjectSchema:
                                                 progress=JsonArraySchema(
                                                     items=Progress.get_schema(),
                                                     nullable=True
-                                                ),
-                                                conditions=JsonArraySchema(
-                                                    items=JsonObjectSchema(additional_properties=True),
-                                                    nullable=True
                                                 )),
                                 required=['cubegen_id', 'status'],
                                 additional_properties=True,