logs-py 2.9.6__py3-none-any.whl → 3.0.1__py3-none-any.whl

LOGS/Entities/LabNotebookExperimentRequestParameter.py

@@ -0,0 +1,49 @@
+from dataclasses import dataclass
+from enum import Enum
+from typing import List, Optional
+
+from LOGS.Entities.LabNotebookModels import LabNotebookExperimentStatus
+from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.INamedEntity import INamedEntityRequest
+from LOGS.Interfaces.IPermissionedEntity import (
+    GenericPermissionEntity,
+    IPermissionedEntityRequest,
+)
+from LOGS.Interfaces.IVersionedEntity import IVersionedEntityRequest
+
+
+class LabNotebookExperimentOrder(Enum):
+    ID_ASC = "ID_ASC"
+    ID_DESC = "ID_DESC"
+    NAME_ASC = "NAME_ASC"
+    NAME_DESC = "NAME_DESC"
+    STATUS_ASC = "STATUS_ASC"
+    STATUS_DESC = "STATUS_DESC"
+    LAB_NOTEBOOK_ID_ASC = "LAB_NOTEBOOK_ID_ASC"
+    LAB_NOTEBOOK_ID_DESC = "LAB_NOTEBOOK_ID_DESC"
+    LAB_NOTEBOOK_NAME_ASC = "LAB_NOTEBOOK_NAME_ASC"
+    LAB_NOTEBOOK_NAME_DESC = "LAB_NOTEBOOK_NAME_DESC"
+    LAB_NOTEBOOK_EXPERIMENT_NAME_ASC = "LAB_NOTEBOOK_EXPERIMENT_NAME_ASC"
+    LAB_NOTEBOOK_EXPERIMENT_NAME_DESC = "LAB_NOTEBOOK_EXPERIMENT_NAME_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
+    VERSION_ASC = "VERSION_ASC"
+    VERSION_DESC = "VERSION_DESC"
+
+
+@dataclass
+class LabNotebookExperimentRequestParameter(
+    EntityRequestParameter[LabNotebookExperimentOrder],
+    IPermissionedEntityRequest,
+    IVersionedEntityRequest[int],
+    GenericPermissionEntity,
+    INamedEntityRequest,
+):
+    status: Optional[List[LabNotebookExperimentStatus]] = None
+    labNotebookIds: Optional[List[int]] = None

LOGS/Entities/LabNotebookExperiments.py

@@ -0,0 +1,16 @@
+from LOGS.Auxiliary.Decorators import Endpoint
+from LOGS.Entities.LabNotebookExperiment import LabNotebookExperiment
+from LOGS.Entities.LabNotebookExperimentRequestParameter import (
+    LabNotebookExperimentRequestParameter,
+)
+from LOGS.Entity.EntityIterator import EntityIterator
+
+
+@Endpoint("lab_notebook_experiments")
+class LabNotebookExperiments(
+    EntityIterator[LabNotebookExperiment, LabNotebookExperimentRequestParameter]
+):
+    """LOGS connected LabNotebookExperiment iterator"""
+
+    _generatorType = LabNotebookExperiment
+    _parameterType = LabNotebookExperimentRequestParameter

LOGS/Entities/LabNotebookMinimal.py

@@ -0,0 +1,19 @@
+from typing import Optional
+
+from LOGS.Auxiliary.Decorators import FullModel
+from LOGS.Entities.LabNotebook import LabNotebook
+from LOGS.Entities.LabNotebookModels import LabNotebookStatus
+from LOGS.Entity.EntityMinimalWithIntId import EntityMinimalWithIntId
+
+
+@FullModel(LabNotebook)
+class LabNotebookMinimal(EntityMinimalWithIntId[LabNotebook]):
+    _status: Optional[LabNotebookStatus] = None
+
+    @property
+    def status(self) -> Optional[LabNotebookStatus]:
+        return self._status
+
+    @status.setter
+    def status(self, value: str):
+        self._status = self.checkAndConvertNullable(value, LabNotebookStatus, "status")

LOGS/Entities/LabNotebookModels.py

@@ -0,0 +1,14 @@
+from enum import Enum
+
+
+class LabNotebookStatus(Enum):
+    CLOSED = "CLOSED"
+    ACTIVE = "ACTIVE"
+
+
+class LabNotebookExperimentStatus(Enum):
+    RUNNING = "RUNNING"
+    PAUSED = "PAUSED"
+    COMPLETED = "COMPLETED"
+    FAILED = "FAILED"
+    ABORTED = "ABORTED"

LOGS/Entities/LabNotebookRequestParameter.py

@@ -0,0 +1,43 @@
+from dataclasses import dataclass
+from enum import Enum
+from typing import List, Optional
+
+from LOGS.Entities.LabNotebookModels import LabNotebookStatus
+from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.INamedEntity import INamedEntityRequest
+from LOGS.Interfaces.IPermissionedEntity import (
+    GenericPermissionEntity,
+    IPermissionedEntityRequest,
+)
+from LOGS.Interfaces.IProjectBased import IProjectBasedRequest
+from LOGS.Interfaces.IVersionedEntity import IVersionedEntityRequest
+
+
+class LabNotebookOrder(Enum):
+    ID_DESC = "ID_DESC"
+    NAME_ASC = "NAME_ASC"
+    NAME_DESC = "NAME_DESC"
+    STATUS_ASC = "STATUS_ASC"
+    STATUS_DESC = "STATUS_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
+    VERSION_ASC = "VERSION_ASC"
+    VERSION_DESC = "VERSION_DESC"
+
+
+@dataclass
+class LabNotebookRequestParameter(
+    EntityRequestParameter[LabNotebookOrder],
+    IPermissionedEntityRequest,
+    IVersionedEntityRequest[int],
+    IProjectBasedRequest,
+    GenericPermissionEntity,
+    INamedEntityRequest,
+):
+    status: Optional[List[LabNotebookStatus]] = None

LOGS/Entities/LabNotebooks.py

@@ -0,0 +1,12 @@
+from LOGS.Auxiliary.Decorators import Endpoint
+from LOGS.Entities.LabNotebook import LabNotebook
+from LOGS.Entities.LabNotebookRequestParameter import LabNotebookRequestParameter
+from LOGS.Entity.EntityIterator import EntityIterator
+
+
+@Endpoint("lab_notebooks")
+class LabNotebooks(EntityIterator[LabNotebook, LabNotebookRequestParameter]):
+    """LOGS connected LabNotebook iterator"""
+
+    _generatorType = LabNotebook
+    _parameterType = LabNotebookRequestParameter

LOGS/Entities/Method.py

@@ -6,7 +6,7 @@ from LOGS.Entity.EntityWithIntId import IEntityWithIntId
 from LOGS.Interfaces.ICreationRecord import ICreationRecord
 from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
-from LOGS.Interfaces.IPermissionedEntity import IPermissionedEntity
+from LOGS.Interfaces.IPermissionedEntity import GenericPermissionEntity
 from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.Interfaces.IUniqueEntity import IUniqueEntity
 
@@ -19,9 +19,9 @@ class Method(
     ICreationRecord,
     IModificationRecord,
     IRelatedEntity[MethodRelations],
-    IPermissionedEntity,
+    GenericPermissionEntity,
 ):
-    _relationType = type(MethodRelations)
+    _relationType = MethodRelations
 
     _fullName: Optional[str] = None
     _description: Optional[str] = None

LOGS/Entities/ParserLog.py

@@ -12,6 +12,10 @@ class ParserLog(SerializeableContent):
     def __init__(self, ref=None):
         super().__init__(ref=ref)
 
+    def __str__(self):
+        error = f" ({self.code})" if self.code else ""
+        return f"{type(self).__name__}.{self.type}{error}: {self.message}"
+
     @property
     def type(self) -> Optional[str]:
         return self._type

LOGS/Entities/Person.py

@@ -9,7 +9,7 @@ from LOGS.Entity.EntityWithIntId import IEntityWithIntId
 from LOGS.Interfaces.ICreationRecord import ICreationRecord
 from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
-from LOGS.Interfaces.IPermissionedEntity import IPermissionedEntity
+from LOGS.Interfaces.IPermissionedEntity import GenericPermissionEntity
 from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.Interfaces.ISoftDeletable import ISoftDeletable
 from LOGS.Interfaces.IUniqueEntity import IUniqueEntity
@@ -31,7 +31,7 @@ class Person(
     ISoftDeletable,
     ICreationRecord,
     IModificationRecord,
-    IPermissionedEntity,
+    GenericPermissionEntity,
 ):
     _firstName: Optional[str]
     _lastName: Optional[str]

LOGS/Entities/PersonRequestParameter.py

@@ -55,6 +55,7 @@ class PersonRequestParameter(
     documentIds: Optional[List[int]] = None
     hasAccount: Optional[bool] = None
     isAccountEnabled: Optional[bool] = None
+    includeSystemUsers: Optional[bool] = None
     logins: Optional[List[str]] = None
     emails: Optional[List[str]] = None
     firstNames: Optional[List[str]] = None

LOGS/Entities/Project.py

@@ -1,15 +1,15 @@
 from typing import List, Optional
 
 from LOGS.Auxiliary.Decorators import Endpoint
+from LOGS.Entities.ProjectPersonPermission import ProjectPersonPermission
 from LOGS.Entities.ProjectRelations import ProjectRelations
-from LOGS.Entities.ProjectUserPermission import ProjectUserPermission
 from LOGS.Entity.EntityWithIntId import IEntityWithIntId
 from LOGS.Entity.SerializeableContent import SerializeableClass
 from LOGS.Interfaces.ICreationRecord import ICreationRecord
 from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
 from LOGS.Interfaces.IOwnedEntity import IOwnedEntity
-from LOGS.Interfaces.IPermissionedEntity import IPermissionedEntity
+from LOGS.Interfaces.IPermissionedEntity import GenericPermissionEntity
 from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.Interfaces.IUniqueEntity import IUniqueEntity
 from LOGS.LOGSConnection import LOGSConnection
@@ -33,14 +33,14 @@ class Project(
     ICreationRecord,
     IModificationRecord,
     IOwnedEntity,
-    IPermissionedEntity,
+    GenericPermissionEntity,
 ):
-    _relationType = type(ProjectRelations)
+    _relationType = ProjectRelations
 
     _notes: Optional[str]
     _projectTags: Optional[List[ProjectTag]]
     _relations: Optional[ProjectRelations]
-    _projectPersonPermissions: Optional[List[ProjectUserPermission]]
+    _projectPersonPermissions: Optional[List[ProjectPersonPermission]]
 
     def __init__(
         self,
@@ -87,11 +87,11 @@ class Project(
         )
 
     @property
-    def projectPersonPermissions(self) -> Optional[List[ProjectUserPermission]]:
+    def projectPersonPermissions(self) -> Optional[List[ProjectPersonPermission]]:
         return self._projectPersonPermissions
 
     @projectPersonPermissions.setter
     def projectPersonPermissions(self, value):
         self._projectPersonPermissions = self.checkListAndConvertNullable(
-            value, ProjectUserPermission, "projectPersonPermissions"
+            value, ProjectPersonPermission, "projectPersonPermissions"
         )

LOGS/Entities/{ProjectUserPermission.py → ProjectPersonPermission.py}

@@ -1,26 +1,36 @@
 from typing import TYPE_CHECKING, Optional
 
-from LOGS.Auxiliary.MinimalModelGenerator import PersonMinimalFromDict
+from LOGS.Auxiliary.MinimalModelGenerator import MinimalFromSingle
 from LOGS.Entity.SerializeableContent import SerializeableContent
 
 if TYPE_CHECKING:
     from LOGS.Entities.PersonMinimal import PersonMinimal
+    from LOGS.Entities.ProjectMinimal import ProjectMinimal
 
 
-class ProjectUserPermission(SerializeableContent):
+class ProjectPersonPermission(SerializeableContent):
     _person: Optional["PersonMinimal"] = None
+    _project: Optional["ProjectMinimal"] = None
     _administer: Optional[bool] = None
     _edit: Optional[bool] = None
     _add: Optional[bool] = None
     _read: Optional[bool] = None
 
     @property
-    def person(self):
+    def person(self) -> Optional["PersonMinimal"]:
         return self._person
 
     @person.setter
     def person(self, value):
-        self._person = PersonMinimalFromDict(value, "person")
+        self._person = MinimalFromSingle(value, "PersonMinimal", "person")
+
+    @property
+    def project(self) -> Optional["ProjectMinimal"]:
+        return self._project
+
+    @project.setter
+    def project(self, value):
+        self._project = MinimalFromSingle(value, "ProjectMinimal", "project")
 
     @property
     def administer(self) -> Optional[bool]:

LOGS/Entities/Role.py

@@ -6,7 +6,7 @@ from LOGS.Entity.EntityWithIntId import IEntityWithIntId
 from LOGS.Interfaces.ICreationRecord import ICreationRecord
 from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
-from LOGS.Interfaces.IPermissionedEntity import IPermissionedEntity
+from LOGS.Interfaces.IPermissionedEntity import GenericPermissionEntity
 from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.LOGSConnection import LOGSConnection
 
@@ -21,9 +21,9 @@ class Role(
     ICreationRecord,
     IModificationRecord,
     IRelatedEntity[RoleRelations],
-    IPermissionedEntity,
+    GenericPermissionEntity,
 ):
-    _relationType = type(RoleRelations)
+    _relationType = RoleRelations
 
     _roleId: Optional[str] = None
     _description: Optional[str] = None

LOGS/Entities/RunState.py

@@ -5,3 +5,4 @@ class RunState(Enum):
     Running = "Running"
     Failed = "Failed"
     Finished = "Finished"
+    Waiting = "Waiting"

LOGS/Entities/Sample.py

@@ -1,17 +1,15 @@
 from datetime import datetime
-from typing import TYPE_CHECKING, Dict, List, Optional, Union, cast
+from typing import TYPE_CHECKING, List, Optional, Union, cast
 
 from LOGS.Auxiliary.Decorators import Endpoint
-from LOGS.Auxiliary.MinimalModelGenerator import (
-    MinimalFromList,
-    SampleTypeMinimalFromDict,
-)
+from LOGS.Auxiliary.MinimalModelGenerator import MinimalFromList
 from LOGS.Entities.SampleRelations import SampleRelations
-from LOGS.Entities.SampleTypeMinimal import SampleTypeMinimal
 from LOGS.Entity.EntityWithIntId import IEntityWithIntId
+from LOGS.Interfaces.ICreationRecord import ICreationRecord
+from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
 from LOGS.Interfaces.IOwnedEntity import IOwnedEntity
-from LOGS.Interfaces.IPermissionedEntity import IPermissionedEntity
+from LOGS.Interfaces.IPermissionedEntity import GenericPermissionEntity
 from LOGS.Interfaces.IProjectBased import IProjectBased
 from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.Interfaces.ISoftDeletable import ISoftDeletable
@@ -27,28 +25,27 @@ if TYPE_CHECKING:
 
 @Endpoint("samples")
 class Sample(
-    IProjectBased,
     IEntityWithIntId,
+    INamedEntity,
+    IOwnedEntity,
+    IModificationRecord,
+    ICreationRecord,
+    IProjectBased,
     IRelatedEntity[SampleRelations],
     ITypedEntity,
     IUniqueEntity,
-    IOwnedEntity,
     ISoftDeletable,
-    INamedEntity,
-    IPermissionedEntity,
+    GenericPermissionEntity,
 ):
-    _relationType = type(SampleRelations)
-
-    _type: Optional[SampleTypeMinimal]
-    _fullName: Optional[str] = None
-    _createdAt: Optional[datetime]
-    _preparedAt: Optional[datetime]
-    _discardedAt: Optional[datetime]
-    _preparedBy: Optional[List["PersonMinimal"]]
-    _discardedBy: Optional[List["PersonMinimal"]]
-    _other: Optional[str]
-    _notes: Optional[str]
-    _tags: Optional[Dict[str, Union[str, int, float]]]
+    _relationType = SampleRelations
+
+    _discarded: Optional[bool] = None
+    _discardedAt: Optional[datetime] = None
+    _discardedBy: Optional[List["PersonMinimal"]] = None
+    _notes: Optional[str] = None
+    _preparedAt: Optional[datetime] = None
+    _preparedBy: Optional[List["PersonMinimal"]] = None
+    _sequenceNumber: Optional[int] = None
 
     def __init__(
         self,
@@ -61,35 +58,15 @@ class Sample(
         projects: Optional[List[Union["ProjectMinimal", "Project"]]] = None,
     ):
         self._name = name
-        self._fullName = name
         self._preparedAt = preparedAt
         self._preparedBy = preparedBy
         self._projects = cast(Optional[List["ProjectMinimal"]], projects)
-        self._type = None
-        self._createdAt = None
-        self._discardedAt = None
-        self._discardedBy = None
-        self._other = None
-        self._notes = None
-        self._customFields = None
-        self._relations = None
-        self._tags = None
 
         if ref != None and isinstance(ref, (str, int, float)):
             ref = {"text": str(ref)}
 
         super().__init__(connection=connection, id=id, ref=ref)
 
-    @property
-    def type(self) -> Optional[SampleTypeMinimal]:
-        return self._type
-
-    @type.setter
-    def type(self, value):
-        self._type = SampleTypeMinimalFromDict(
-            value, "type", connection=self.connection
-        )
-
     @property
     def fullName(self) -> Optional[str]:
         return self._fullName
@@ -114,6 +91,14 @@ class Sample(
     def preparedAt(self, value):
         self._preparedAt = self.checkAndConvert(value, datetime, "preparedAt")
 
+    @property
+    def discarded(self) -> Optional[bool]:
+        return self._discarded
+
+    @discarded.setter
+    def discarded(self, value):
+        self._discarded = self.checkAndConvertNullable(value, bool, "discarded")
+
     @property
     def discardedAt(self) -> Optional[datetime]:
         return self._discardedAt
@@ -201,17 +186,11 @@ class Sample(
         self._notes = self.checkAndConvertNullable(value, str, "notes")
 
     @property
-    def tags(self) -> Optional[Dict[str, Union[str, int, float]]]:
-        return self._tags
-
-    @tags.setter
-    def tags(self, value):
-        self._tags = self.checkAndConvertNullable(value, dict, "tags")
-        if self._tags:
-            self._tags = {
-                str(k): v
-                for k, v in self._tags.items()
-                if v is not None and k != "Name" and isinstance(v, (str, int, float))
-            }
-        else:
-            self._tags = None
+    def sequenceNumber(self) -> Optional[int]:
+        return self._sequenceNumber
+
+    @sequenceNumber.setter
+    def sequenceNumber(self, value):
+        self._sequenceNumber = self.checkAndConvertNullable(
+            value, int, "sequenceNumber"
+        )

LOGS/Entities/SampleRequestParameter.py

@@ -4,6 +4,8 @@ from enum import Enum
 from typing import List, Optional
 
 from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.ICreationRecord import ICreationRecordRequest
+from LOGS.Interfaces.IModificationRecord import IModificationRecordRequest
 from LOGS.Interfaces.INamedEntity import INamedEntityRequest
 from LOGS.Interfaces.IOwnedEntity import IOwnedEntityRequest
 from LOGS.Interfaces.IPaginationRequest import IPaginationRequest
@@ -15,34 +17,47 @@ from LOGS.Interfaces.ITypedEntity import ITypedEntityRequest
 class SampleOrder(Enum):
     ID_ASC = "ID_ASC"
     ID_DESC = "ID_DESC"
-    CREATION_DATE_ASC = "CREATION_DATE_ASC"
-    CREATION_DATE_DESC = "CREATION_DATE_DESC"
-    PREPARATION_DATE_ASC = "PREPARATION_DATE_ASC"
-    PREPARATION_DATE_DESC = "PREPARATION_DATE_DESC"
     NAME_ASC = "NAME_ASC"
     NAME_DESC = "NAME_DESC"
+    PREPARATION_DATE_ASC = "PREPARATION_DATE_ASC"
+    PREPARATION_DATE_DESC = "PREPARATION_DATE_DESC"
     TYPE_ASC = "TYPE_ASC"
     TYPE_DESC = "TYPE_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
+    DISCARDED_DATE_ASC = "DISCARDED_DATE_ASC"
+    DISCARDED_DATE_DESC = "DISCARDED_DATE_DESC"
 
 
 @dataclass
 class SampleRequestParameter(
     EntityRequestParameter[SampleOrder],
-    IPaginationRequest,
-    IOwnedEntityRequest,
-    ITypedEntityRequest,
+    ICreationRecordRequest,
+    IModificationRecordRequest,
     INamedEntityRequest,
-    ISoftDeletableRequest,
+    IOwnedEntityRequest,
+    IPaginationRequest,
     IPermissionedEntityRequest,
+    ISoftDeletableRequest,
+    ITypedEntityRequest,
 ):
-    projectIds: Optional[List[int]] = None
-    organizationIds: Optional[List[int]] = None
-    preparedByIds: Optional[List[int]] = None
-    documentIds: Optional[List[int]] = None
     discardedByIds: Optional[List[int]] = None
-    participatedPersonIds: Optional[List[int]] = None
-    typeIds: Optional[List[str]] = None
+    discardedAtFrom: Optional[datetime] = None
+    discardedAtTo: Optional[datetime] = None
+    documentIds: Optional[List[int]] = None
     excludeDiscarded: Optional[bool] = None
+    includeTags: Optional[bool] = None
+    organizationIds: Optional[List[int]] = None
+    participatedPersonIds: Optional[List[int]] = None
     preparedAtFrom: Optional[datetime] = None
     preparedAtTo: Optional[datetime] = None
-    includeTags: Optional[bool] = None
+    preparedByIds: Optional[List[int]] = None
+    projectIds: Optional[List[int]] = None
+    typeIds: Optional[List[str]] = None
+    searchTermIncludeNotes: Optional[bool] = None

LOGS/Entities/Track.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, Generic, List, Literal, Optional, TypeVar, Union, cast
 
 from LOGS.Entities.Datatrack import Datatrack
+from LOGS.Entities.TrackData import TrackData
 from LOGS.Entities.TrackSettings import TrackSettings
 from LOGS.Entity.ConnectedEntity import ConnectedEntity
 
@@ -29,14 +30,17 @@ class Track(Generic[_T], ConnectedEntity):
     def fromDict(self, ref) -> None:
         if isinstance(ref, dict):
             if "data" in ref:
-                if "type" in ref:
-                    if ref["type"] == "XY_real" or ref["type"] == "XY_complex":
-                        self._dataIds = self.checkAndConvertNullable(ref["data"], dict)
-
+                self._dataIds = self.checkAndConvertNullable(ref["data"], dict)
                 ref["data"] = None
 
         super().fromDict(ref)
 
+    def toDict(self) -> Dict[str, Any]:
+        d = super().toDict()
+        if isinstance(self.datatracks, TrackData):
+            d["data"] = self.datatracks.toData()
+        return d
+
     def __str__(self):
         s = (" name:'%s'" % getattr(self, "name")) if hasattr(self, "name") else ""
         return "<%s id:%s%s>" % (type(self).__name__, str(self.id), s)

LOGS/Entities/TrackData.py

@@ -7,3 +7,14 @@ class TrackData(SerializeableContent):
             "Specific %a class for this track type is not implemented yet."
             % type(self).__name__
         )
+
+    def toData(self):
+        from LOGS.Entities.Datatrack import Datatrack
+
+        d = {}
+        for key in self.__dict__:
+            if key.startswith("_"):
+                a = getattr(self, key)
+                if isinstance(a, Datatrack):
+                    d[key[1:]] = a.id
+        return d

LOGS/Entities/TrackImage.py

@@ -0,0 +1,21 @@
+from typing import Optional
+
+from LOGS.Entities.Track import Track
+from LOGS.Entities.TrackImageData import TrackImageData
+
+
+class TrackImage(Track):
+    _datatracks: Optional[TrackImageData] = None
+
+    def _fetchData(self):
+        if self.datatracks:
+            if self.datatracks.image:
+                self.datatracks.image.fetchFull()
+
+    @property
+    def datatracks(self) -> Optional[TrackImageData]:
+        return self._datatracks
+
+    @datatracks.setter
+    def datatracks(self, value):
+        self._datatracks = self.checkAndConvertNullable(value, TrackImageData, "data")

LOGS/Entities/TrackImageData.py

@@ -0,0 +1,20 @@
+from typing import Optional
+
+from LOGS.Entities.DatatrackImage import DatatrackImage
+from LOGS.Entities.TrackData import TrackData
+
+
+class TrackImageData(TrackData):
+    _image: Optional[DatatrackImage] = None
+
+    def fetchFull(self):
+        if self.image:
+            self.image.fetchFull()
+
+    @property
+    def image(self) -> Optional[DatatrackImage]:
+        return self._image
+
+    @image.setter
+    def image(self, value):
+        self._image = self.checkAndConvertNullable(value, DatatrackImage, "image")