Skip to content
Snippets Groups Projects
Unverified Commit 8f516705 authored by SKAJohanVenter's avatar SKAJohanVenter
Browse files

SAR-276 Reworked dataclass into standard class

parent b9d44738
No related branches found
No related tags found
No related merge requests found
...@@ -117,7 +117,6 @@ from queue import Empty, Queue ...@@ -117,7 +117,6 @@ from queue import Empty, Queue
from datetime import datetime from datetime import datetime
from threading import Event from threading import Event
from typing import Any, Callable, Dict, Optional, Tuple from typing import Any, Callable, Dict, Optional, Tuple
from dataclasses import dataclass
import tango import tango
...@@ -158,13 +157,22 @@ class TaskState(enum.IntEnum): ...@@ -158,13 +157,22 @@ class TaskState(enum.IntEnum):
""" """
@dataclass
class TaskUniqueId: class TaskUniqueId:
"""Convenience class for the unique ID of a task.""" """Convenience class for the unique ID of a task."""
id_uuid: str def __init__(self, id_uuid: str, id_datetime: datetime, id_task_name: str) -> None:
id_datetime: datetime """Create a TaskUniqueId instance.
id_task_name: str
:param id_uuid: The uuid portion of the task identifier
:type id_uuid: str
:param id_datetime: The datetime portion of the task identifier
:type id_datetime: datetime
:param id_task_name: The task name portion of the task identifier
:type id_task_name: str
"""
self.id_uuid = id_uuid
self.id_datetime = id_datetime
self.id_task_name = id_task_name
@classmethod @classmethod
def generate_unique_id(cls, task_name: str) -> str: def generate_unique_id(cls, task_name: str) -> str:
...@@ -183,7 +191,6 @@ class TaskUniqueId: ...@@ -183,7 +191,6 @@ class TaskUniqueId:
) )
@dataclass
class TaskResult: class TaskResult:
"""Convenience class for results.""" """Convenience class for results."""
...@@ -191,6 +198,22 @@ class TaskResult: ...@@ -191,6 +198,22 @@ class TaskResult:
task_result: str task_result: str
unique_id: str unique_id: str
def __init__(
self, result_code: ResultCode, task_result: str, unique_id: str
) -> None:
"""Create the TaskResult.
:param result_code: The ResultCode of the task result
:type result_code: ResultCode
:param task_result: The string of the task result
:type task_result: str
:param unique_id: The unique identifier of a task.
:type unique_id: str
"""
self.result_code = result_code
self.task_result = task_result
self.unique_id = unique_id
def to_task_result(self) -> Tuple[str, str, str]: def to_task_result(self) -> Tuple[str, str, str]:
"""Convert TaskResult to task_result. """Convert TaskResult to task_result.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment