serialisation deserialisation tests + fixes in model files

src/conductor/client/configuration/configuration.py

@@ -29,7 +29,7 @@ def __init__(
         self.temp_folder_path = None
         self.__ui_host = os.getenv('CONDUCTOR_UI_SERVER_URL')
         if self.__ui_host is None:
-            self.__ui_host = self.host.replace('8080/api', '5000')
+            self.__ui_host = self.host.replace('8080/api', '5001')
 
         if authentication_settings is not None:
             self.authentication_settings = authentication_settings

src/conductor/client/http/models/__init__.py

@@ -37,6 +37,7 @@
 from conductor.client.http.models.task_details import TaskDetails
 from conductor.client.http.models.task_exec_log import TaskExecLog
 from conductor.client.http.models.task_result import TaskResult
+from conductor.client.http.models.task_result_status import TaskResultStatus
 from conductor.client.http.models.task_summary import TaskSummary
 from conductor.client.http.models.token import Token
 from conductor.client.http.models.upsert_group_request import UpsertGroupRequest
@@ -47,6 +48,7 @@
 from conductor.client.http.models.workflow_schedule import WorkflowSchedule
 from conductor.client.http.models.workflow_schedule_execution_model import WorkflowScheduleExecutionModel
 from conductor.client.http.models.workflow_status import WorkflowStatus
+from conductor.client.http.models.workflow_state_update import WorkflowStateUpdate
 from conductor.client.http.models.workflow_summary import WorkflowSummary
 from conductor.client.http.models.workflow_tag import WorkflowTag
 from conductor.client.http.models.integration import Integration

src/conductor/client/http/models/create_or_update_application_request.py

@@ -19,13 +19,13 @@ class CreateOrUpdateApplicationRequest:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'name': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'name': 'name'
-    })
+    }
 
     name: InitVar[Optional[str]] = None
     _name: Optional[str] = field(default=None, init=False)

src/conductor/client/http/models/generate_token_request.py

@@ -22,15 +22,15 @@ class GenerateTokenRequest:
     key_secret: Optional[str] = field(default=None)
 
     # Class variables
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'key_id': 'str',
         'key_secret': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'key_id': 'keyId',
         'key_secret': 'keySecret'
-    })
+    }
 
     def __init__(self, key_id=None, key_secret=None):  # noqa: E501
         """GenerateTokenRequest - a model defined in Swagger"""  # noqa: E501

src/conductor/client/http/models/integration.py

@@ -33,7 +33,7 @@ class Integration:
     _updated_on: Optional[int] = field(default=None, init=False)
     _apis: Optional[List['IntegrationApi']] = field(default=None, init=False)
 
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'category': 'str',
         'configuration': 'dict(str, object)',
         'created_by': 'str',
@@ -47,9 +47,9 @@ class Integration:
         'updated_by': 'str',
         'updated_on': 'int',
         'apis': 'list[IntegrationApi]'
-    }, init=False)
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'category': 'category',
         'configuration': 'configuration',
         'created_by': 'createdBy',
@@ -63,7 +63,7 @@ class Integration:
         'updated_by': 'updatedBy',
         'updated_on': 'updatedOn',
         'apis': 'apis'
-    }, init=False)
+    }
 
     def __init__(self, category=None, configuration=None, created_by=None, created_on=None, description=None,
                  enabled=None, models_count=None, name=None, tags=None, type=None, updated_by=None,

src/conductor/client/http/models/integration_api.py

@@ -26,7 +26,7 @@ class IntegrationApi:
     _updated_by: Optional[str] = field(default=None, repr=False)
     _updated_on: Optional[int] = field(default=None, repr=False)
 
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'api': 'str',
         'configuration': 'dict(str, object)',
         'created_by': 'str',
@@ -37,9 +37,9 @@ class IntegrationApi:
         'tags': 'list[TagObject]',
         'updated_by': 'str',
         'updated_on': 'int'
-    }, repr=False)
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'api': 'api',
         'configuration': 'configuration',
         'created_by': 'createdBy',
@@ -50,7 +50,7 @@ class IntegrationApi:
         'tags': 'tags',
         'updated_by': 'updatedBy',
         'updated_on': 'updatedOn'
-    }, repr=False)
+    }
 
     discriminator: Optional[str] = field(default=None, repr=False)
 

src/conductor/client/http/models/permission.py

@@ -17,13 +17,13 @@ class Permission:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'name': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'name': 'name'
-    })
+    }
 
     _name: Optional[str] = field(default=None, init=False)
 

src/conductor/client/http/models/poll_data.py

@@ -19,19 +19,19 @@ class PollData:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'queue_name': 'str',
         'domain': 'str',
         'worker_id': 'str',
         'last_poll_time': 'int'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'queue_name': 'queueName',
         'domain': 'domain',
         'worker_id': 'workerId',
         'last_poll_time': 'lastPollTime'
-    })
+    }
 
     queue_name: Optional[str] = field(default=None)
     domain: Optional[str] = field(default=None)

src/conductor/client/http/models/prompt_test_request.py

@@ -37,25 +37,25 @@ class PromptTemplateTestRequest:
     _top_p: Optional[float] = field(init=False, repr=False, default=None)
 
     # Class variables
-    swagger_types: Dict[str, str] = field(init=False, repr=False, default_factory=lambda: {
+    swagger_types = {
         'llm_provider': 'str',
         'model': 'str',
         'prompt': 'str',
         'prompt_variables': 'dict(str, object)',
         'stop_words': 'list[str]',
         'temperature': 'float',
         'top_p': 'float'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(init=False, repr=False, default_factory=lambda: {
+    attribute_map = {
         'llm_provider': 'llmProvider',
         'model': 'model',
         'prompt': 'prompt',
         'prompt_variables': 'promptVariables',
         'stop_words': 'stopWords',
         'temperature': 'temperature',
         'top_p': 'topP'
-    })
+    }
 
     discriminator: None = field(init=False, repr=False, default=None)
 

src/conductor/client/http/models/rerun_workflow_request.py

@@ -26,21 +26,21 @@ class RerunWorkflowRequest:
     correlation_id: InitVar[Optional[str]] = None
 
     # Class properties for swagger documentation
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types =  {
         're_run_from_workflow_id': 'str',
         'workflow_input': 'dict(str, object)',
         're_run_from_task_id': 'str',
         'task_input': 'dict(str, object)',
         'correlation_id': 'str'
-    }, init=False)
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         're_run_from_workflow_id': 'reRunFromWorkflowId',
         'workflow_input': 'workflowInput',
         're_run_from_task_id': 'reRunFromTaskId',
         'task_input': 'taskInput',
         'correlation_id': 'correlationId'
-    }, init=False)
+    }
 
     def __post_init__(self, re_run_from_workflow_id, workflow_input, re_run_from_task_id, task_input, correlation_id):
         """Initialize attributes after @dataclass initialization"""

src/conductor/client/http/models/save_schedule_request.py

@@ -19,7 +19,7 @@ class SaveScheduleRequest:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'name': 'str',
         'cron_expression': 'str',
         'run_catchup_schedule_instances': 'bool',
@@ -31,9 +31,9 @@ class SaveScheduleRequest:
         'schedule_end_time': 'int',
         'zone_id': 'str',
         'description': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'name': 'name',
         'cron_expression': 'cronExpression',
         'run_catchup_schedule_instances': 'runCatchupScheduleInstances',
@@ -45,7 +45,7 @@ class SaveScheduleRequest:
         'schedule_end_time': 'scheduleEndTime',
         'zone_id': 'zoneId',
         'description': 'description'
-    })
+    }
 
     name: InitVar[Optional[str]] = None
     cron_expression: InitVar[Optional[str]] = None

src/conductor/client/http/models/schema_def.py

@@ -5,6 +5,8 @@
 import six
 from deprecated import deprecated
 
+from conductor.client.http.models.auditable import Auditable
+
 
 class SchemaType(str, Enum):
     JSON = "JSON",
@@ -16,22 +18,24 @@ def __str__(self) -> str:
 
 
 @dataclass
-class SchemaDef:
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+class SchemaDef(Auditable):
+    swagger_types = {
+        **Auditable.swagger_types,
         'name': 'str',
         'version': 'int',
         'type': 'str',
         'data': 'dict(str, object)',
         'external_ref': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
+        **Auditable.attribute_map,
         'name': 'name',
         'version': 'version',
         'type': 'type',
         'data': 'data',
         'external_ref': 'externalRef'
-    })
+    }
 
     # Private fields for properties
     _name: Optional[str] = field(default=None, init=False)

src/conductor/client/http/models/subject_ref.py

@@ -28,15 +28,15 @@ class SubjectRef:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'type': 'str',
         'id': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'type': 'type',
         'id': 'id'
-    })
+    }
 
     _type: Optional[str] = field(default=None, init=False)
     _id: Optional[str] = field(default=None, init=False)

src/conductor/client/http/models/tag_object.py

@@ -2,6 +2,7 @@
 
 import pprint
 import re  # noqa: F401
+import six
 from dataclasses import dataclass, field, InitVar
 from typing import Any, Dict, List, Optional
 from enum import Enum

src/conductor/client/http/models/tag_string.py

@@ -31,17 +31,17 @@ class TagString:
     _type: Optional[str] = field(default=None, init=False, repr=False)
     _value: Optional[str] = field(default=None, init=False, repr=False)
 
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'key': 'str',
         'type': 'str',
         'value': 'str'
-    }, repr=False)
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'key': 'key',
         'type': 'type',
         'value': 'value'
-    }, repr=False)
+    }
 
     discriminator: None = field(default=None, repr=False)
 

src/conductor/client/http/models/target_ref.py

@@ -29,15 +29,15 @@ class TargetRef:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'type': 'str',
         'id': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'type': 'type',
         'id': 'id'
-    })
+    }
 
     # Dataclass fields
     type: Optional[str] = field(default=None)

src/conductor/client/http/models/task_summary.py

@@ -19,7 +19,7 @@ class TaskSummary:
       attribute_map (dict): The key is attribute name
                             and the value is json key in definition.
     """
-    swagger_types: Dict[str, str] = field(default_factory=lambda: {
+    swagger_types = {
         'workflow_id': 'str',
         'workflow_type': 'str',
         'correlation_id': 'str',
@@ -40,9 +40,9 @@ class TaskSummary:
         'external_output_payload_storage_path': 'str',
         'workflow_priority': 'int',
         'domain': 'str'
-    })
+    }
 
-    attribute_map: Dict[str, str] = field(default_factory=lambda: {
+    attribute_map = {
         'workflow_id': 'workflowId',
         'workflow_type': 'workflowType',
         'correlation_id': 'correlationId',
@@ -63,7 +63,7 @@ class TaskSummary:
         'external_output_payload_storage_path': 'externalOutputPayloadStoragePath',
         'workflow_priority': 'workflowPriority',
         'domain': 'domain'
-    })
+    }
 
     # Dataclass fields with default values
     workflow_id: Optional[str] = field(default=None)