logs-py 3.0.6__py3-none-any.whl → 3.0.7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of logs-py might be problematic. Click here for more details.
- LOGS/Auxiliary/Constants.py +0 -2
- LOGS/Auxiliary/DateTimeConverter.py +1 -1
- LOGS/Converter/Conversion.py +4 -4
- LOGS/Converter/Converter.py +2 -2
- LOGS/Converter/ConverterParameter.py +2 -2
- LOGS/Converter/ExportParamters.py +2 -2
- LOGS/Entities/AutoloadClientInfo.py +2 -2
- LOGS/Entities/AutoloadFileInfo.py +2 -2
- LOGS/Entities/AutoloadStatus.py +2 -2
- LOGS/Entities/AutoloadStatusError.py +2 -2
- LOGS/Entities/AxisNaming.py +2 -2
- LOGS/Entities/CustomFieldValue.py +2 -2
- LOGS/Entities/CustomSchemaSection.py +2 -2
- LOGS/Entities/CustomTypeSection.py +2 -2
- LOGS/Entities/DataSourceStatus.py +2 -2
- LOGS/Entities/Dataset.py +2 -2
- LOGS/Entities/DatasetInfo.py +2 -2
- LOGS/Entities/DatasetMatchTypes.py +9 -9
- LOGS/Entities/DatasetModels.py +3 -3
- LOGS/Entities/DatasetRelations.py +0 -11
- LOGS/Entities/DatasetRequestParameter.py +0 -1
- LOGS/Entities/EntitiesRequestParameter.py +2 -2
- LOGS/Entities/EntityOriginWriteModelWithId.py +2 -2
- LOGS/Entities/FileEntry.py +4 -4
- LOGS/Entities/FileExcludePattern.py +2 -2
- LOGS/Entities/FormattedTable/DatatypeFormattedTable.py +2 -2
- LOGS/Entities/FormattedTable/DatatypeFormattedTableCell.py +2 -2
- LOGS/Entities/FormattedTable/DatatypeFormattedTableSettings.py +2 -2
- LOGS/Entities/HierarchyLeaf.py +2 -2
- LOGS/Entities/HierarchyNode.py +2 -2
- LOGS/Entities/LabNotebookEntryContent/BasicAttribute.py +2 -2
- LOGS/Entities/LabNotebookEntryContent/EntityAttribute.py +3 -3
- LOGS/Entities/LabNotebookEntryContent/EntryContentItem.py +2 -2
- LOGS/Entities/LabNotebookEntryContent/IEntryContentWithAttribute.py +2 -2
- LOGS/Entities/LabNotebookEntryContent/IEntryContentWithContent.py +2 -2
- LOGS/Entities/LabNotebookEntryContent/IEntryContentWithTextAttribute.py +2 -2
- LOGS/Entities/LabNotebookEntryRelations.py +0 -12
- LOGS/Entities/ParserLog.py +2 -2
- LOGS/Entities/PersonCategory.py +2 -2
- LOGS/Entities/PersonRelations.py +0 -13
- LOGS/Entities/PersonRequestParameter.py +0 -1
- LOGS/Entities/Project.py +2 -2
- LOGS/Entities/ProjectPersonPermission.py +2 -2
- LOGS/Entities/ProjectRelations.py +0 -11
- LOGS/Entities/ProjectRequestParameter.py +0 -3
- LOGS/Entities/Sample.py +0 -34
- LOGS/Entities/SampleRelations.py +0 -12
- LOGS/Entities/SampleRequestParameter.py +0 -1
- LOGS/Entities/TrackData.py +2 -2
- LOGS/Entities/TrackSettings.py +2 -2
- LOGS/Entities/__init__.py +1 -5
- LOGS/Entity/ConnectedEntity.py +2 -2
- LOGS/Entity/EntityConnector.py +2 -2
- LOGS/Entity/EntityRelation.py +2 -2
- LOGS/Entity/EntityRequestParameter.py +2 -2
- LOGS/Entity/{SerializeableContent.py → SerializableContent.py} +8 -12
- LOGS/Entity/__init__.py +1 -1
- LOGS/Interfaces/IPermissionedEntity.py +2 -2
- LOGS/LOGS.py +2 -24
- LOGS/Parameters/Color.py +3 -3
- LOGS/Parameters/ParameterBase.py +2 -2
- LOGS/ServerMetaData.py +2 -2
- {logs_py-3.0.6.dist-info → logs_py-3.0.7.dist-info}/METADATA +1 -1
- {logs_py-3.0.6.dist-info → logs_py-3.0.7.dist-info}/RECORD +66 -70
- LOGS/Entities/Document.py +0 -228
- LOGS/Entities/DocumentRelations.py +0 -36
- LOGS/Entities/DocumentRequestParameter.py +0 -19
- LOGS/Entities/Documents.py +0 -12
- {logs_py-3.0.6.dist-info → logs_py-3.0.7.dist-info}/WHEEL +0 -0
- {logs_py-3.0.6.dist-info → logs_py-3.0.7.dist-info}/top_level.txt +0 -0
LOGS/Auxiliary/Constants.py
CHANGED
|
@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, TypeVar, Union
|
|
|
4
4
|
if TYPE_CHECKING:
|
|
5
5
|
from LOGS.Entities.Bridge import Bridge
|
|
6
6
|
from LOGS.Entities.Dataset import Dataset
|
|
7
|
-
from LOGS.Entities.Document import Document
|
|
8
7
|
from LOGS.Entities.Equipment import Equipment
|
|
9
8
|
from LOGS.Entities.Experiment import Experiment
|
|
10
9
|
from LOGS.Entities.FileEntry import FileEntry
|
|
@@ -60,7 +59,6 @@ class Constants:
|
|
|
60
59
|
|
|
61
60
|
ENTITIES = TypeVar(
|
|
62
61
|
"ENTITIES",
|
|
63
|
-
"Document",
|
|
64
62
|
"Person",
|
|
65
63
|
"Project",
|
|
66
64
|
"Sample",
|
|
@@ -18,10 +18,10 @@ class DateTimeConverter:
|
|
|
18
18
|
|
|
19
19
|
if platform.system() == "Windows":
|
|
20
20
|
from tzlocal.win32 import get_localzone_name
|
|
21
|
+
|
|
21
22
|
return pytz.timezone(get_localzone_name())
|
|
22
23
|
else:
|
|
23
24
|
return pytz.timezone(time.tzname[0])
|
|
24
|
-
|
|
25
25
|
|
|
26
26
|
@classmethod
|
|
27
27
|
def convertDateTime(cls, entry: str):
|
LOGS/Converter/Conversion.py
CHANGED
|
@@ -13,7 +13,7 @@ from LOGS.Converter.ConverterParameter import ParameterType
|
|
|
13
13
|
from LOGS.Entities.ParserLog import ParserLog
|
|
14
14
|
from LOGS.Entity import Entity
|
|
15
15
|
from LOGS.Entity.ConnectedEntity import ConnectedEntity
|
|
16
|
-
from LOGS.Entity.
|
|
16
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
17
17
|
from LOGS.LOGSConnection import ResponseTypes
|
|
18
18
|
|
|
19
19
|
|
|
@@ -23,18 +23,18 @@ class ConversionState(Enum):
|
|
|
23
23
|
Waiting = "Waiting"
|
|
24
24
|
|
|
25
25
|
|
|
26
|
-
class ConversionFile(
|
|
26
|
+
class ConversionFile(SerializableClass):
|
|
27
27
|
path: Optional[str] = None
|
|
28
28
|
size: Optional[int] = None
|
|
29
29
|
|
|
30
30
|
|
|
31
|
-
class DatasetConversionZipReadModel(
|
|
31
|
+
class DatasetConversionZipReadModel(SerializableClass):
|
|
32
32
|
size: Optional[int] = None
|
|
33
33
|
id: Optional[str] = None
|
|
34
34
|
url: Optional[str] = None
|
|
35
35
|
|
|
36
36
|
|
|
37
|
-
class ConverterParameterEntry(
|
|
37
|
+
class ConverterParameterEntry(SerializableClass):
|
|
38
38
|
id: Optional[str] = None
|
|
39
39
|
value: Optional[Any] = None
|
|
40
40
|
type: Optional[ParameterType] = None
|
LOGS/Converter/Converter.py
CHANGED
|
@@ -3,10 +3,10 @@ from typing import Any, Dict, List, Optional
|
|
|
3
3
|
from LOGS.Auxiliary import Tools
|
|
4
4
|
from LOGS.Converter.ConverterParameter import IConverterParameter
|
|
5
5
|
from LOGS.Converter.ExportParamters import ExportParamters
|
|
6
|
-
from LOGS.Entity.
|
|
6
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
class Converter(
|
|
9
|
+
class Converter(SerializableContent):
|
|
10
10
|
_formatId: Optional[str] = None
|
|
11
11
|
_exportId: Optional[str] = None
|
|
12
12
|
_version: Optional[str] = None
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from enum import Enum
|
|
2
2
|
from typing import Optional, Union
|
|
3
3
|
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
class ParameterType(Enum):
|
|
@@ -11,7 +11,7 @@ class ParameterType(Enum):
|
|
|
11
11
|
Float = "Float"
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
class IConverterParameter(
|
|
14
|
+
class IConverterParameter(SerializableClass):
|
|
15
15
|
name: Optional[str] = None
|
|
16
16
|
id: Optional[str] = None
|
|
17
17
|
description: Optional[str] = None
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
from typing import Any, Dict, Optional
|
|
2
2
|
|
|
3
3
|
from LOGS.Auxiliary.Tools import Tools
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
class ExportParamters(
|
|
7
|
+
class ExportParamters(SerializableClass):
|
|
8
8
|
|
|
9
9
|
def __init__(
|
|
10
10
|
self,
|
|
@@ -2,10 +2,10 @@ from datetime import datetime
|
|
|
2
2
|
from typing import Optional
|
|
3
3
|
from uuid import UUID
|
|
4
4
|
|
|
5
|
-
from LOGS.Entity.
|
|
5
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
class AutoloadClientInfo(
|
|
8
|
+
class AutoloadClientInfo(SerializableContent):
|
|
9
9
|
_id: Optional[UUID] = None
|
|
10
10
|
_host: Optional[str] = None
|
|
11
11
|
_clientVersion: Optional[str] = None
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
from datetime import datetime
|
|
2
2
|
from typing import Optional
|
|
3
3
|
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
class AutoloadFileInfo(
|
|
7
|
+
class AutoloadFileInfo(SerializableClass):
|
|
8
8
|
name: Optional[str] = None
|
|
9
9
|
fullPath: Optional[str] = None
|
|
10
10
|
size: Optional[int] = None
|
LOGS/Entities/AutoloadStatus.py
CHANGED
|
@@ -5,10 +5,10 @@ from uuid import UUID
|
|
|
5
5
|
from LOGS.Entities.AutoloadStatusError import AutoloadStatusError
|
|
6
6
|
from LOGS.Entities.BridgeType import BridgeType
|
|
7
7
|
from LOGS.Entities.RunState import RunState
|
|
8
|
-
from LOGS.Entity.
|
|
8
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
class AutoloadStatus(
|
|
11
|
+
class AutoloadStatus(SerializableClass):
|
|
12
12
|
type: Optional[BridgeType]
|
|
13
13
|
uuid: Optional[UUID]
|
|
14
14
|
lastUpdated: Optional[datetime]
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class AutoloadStatusError(
|
|
6
|
+
class AutoloadStatusError(SerializableClass):
|
|
7
7
|
message: Optional[str] = None
|
LOGS/Entities/AxisNaming.py
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class AxisNaming(
|
|
6
|
+
class AxisNaming(SerializableContent):
|
|
7
7
|
_x: Optional[str] = None
|
|
8
8
|
_y: Optional[str] = None
|
|
9
9
|
_z: Optional[str] = None
|
|
@@ -4,13 +4,13 @@ from LOGS.Auxiliary.Exceptions import IllegalFieldValueException
|
|
|
4
4
|
from LOGS.Auxiliary.Tools import Tools
|
|
5
5
|
from LOGS.Entities.CustomFieldModels import CustomFieldDataType, CustomFieldValueType
|
|
6
6
|
from LOGS.Entities.CustomFieldValueConverter import CustomFieldValueConverter
|
|
7
|
-
from LOGS.Entity.
|
|
7
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
8
8
|
|
|
9
9
|
if TYPE_CHECKING:
|
|
10
10
|
pass
|
|
11
11
|
|
|
12
12
|
|
|
13
|
-
class ICustomValue(
|
|
13
|
+
class ICustomValue(SerializableContent):
|
|
14
14
|
_name: Optional[str] = None
|
|
15
15
|
_type: CustomFieldValueType = cast(CustomFieldValueType, None)
|
|
16
16
|
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
from typing import TYPE_CHECKING, List, Optional
|
|
2
2
|
|
|
3
3
|
from LOGS.Entities.CustomField import CustomField
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
5
5
|
from LOGS.Interfaces.INamedEntity import INamedEntity
|
|
6
6
|
|
|
7
7
|
if TYPE_CHECKING:
|
|
8
8
|
pass
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
class CustomSchemaSection(
|
|
11
|
+
class CustomSchemaSection(SerializableContent, INamedEntity):
|
|
12
12
|
_isFolded: Optional[bool]
|
|
13
13
|
_children: Optional[List[CustomField]]
|
|
14
14
|
|
|
@@ -2,10 +2,10 @@ from typing import List, Optional
|
|
|
2
2
|
|
|
3
3
|
from LOGS.Entities.CustomField import CustomField
|
|
4
4
|
from LOGS.Entities.ILiterarTypedEntity import ILiterarTypedEntity
|
|
5
|
-
from LOGS.Entity.
|
|
5
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
class CustomTypeSection(
|
|
8
|
+
class CustomTypeSection(SerializableContent, ILiterarTypedEntity):
|
|
9
9
|
_name: Optional[str] = None
|
|
10
10
|
_isFolded: Optional[bool] = None
|
|
11
11
|
_customFields: Optional[List[CustomField]] = None
|
|
@@ -2,10 +2,10 @@ from datetime import datetime
|
|
|
2
2
|
from typing import List, Optional
|
|
3
3
|
|
|
4
4
|
from LOGS.Entities.AutoloadStatus import AutoloadStatus
|
|
5
|
-
from LOGS.Entity.
|
|
5
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
class DataSourceStatus(
|
|
8
|
+
class DataSourceStatus(SerializableClass):
|
|
9
9
|
isConnected: Optional[bool] = None
|
|
10
10
|
nextScheduledDate: Optional[datetime] = None
|
|
11
11
|
lastClientStatus: Optional[AutoloadStatus] = None
|
LOGS/Entities/Dataset.py
CHANGED
|
@@ -37,7 +37,7 @@ from LOGS.Entities.ParserLog import ParserLog
|
|
|
37
37
|
from LOGS.Entities.Track import Track
|
|
38
38
|
from LOGS.Entity.EntityMinimalWithIntId import EntityMinimalWithIntId
|
|
39
39
|
from LOGS.Entity.EntityWithIntId import IEntityWithIntId
|
|
40
|
-
from LOGS.Entity.
|
|
40
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
41
41
|
from LOGS.Interfaces.ICreationRecord import ICreationRecord
|
|
42
42
|
from LOGS.Interfaces.IModificationRecord import IModificationRecord
|
|
43
43
|
from LOGS.Interfaces.INamedEntity import INamedEntity
|
|
@@ -62,7 +62,7 @@ if TYPE_CHECKING:
|
|
|
62
62
|
from LOGS.Entities.SampleMinimal import SampleMinimal
|
|
63
63
|
|
|
64
64
|
|
|
65
|
-
class ParsedMetadata(
|
|
65
|
+
class ParsedMetadata(SerializableContent):
|
|
66
66
|
Parameters: bool = False
|
|
67
67
|
Tracks: bool = False
|
|
68
68
|
TrackCount: int = False
|
LOGS/Entities/DatasetInfo.py
CHANGED
|
@@ -15,14 +15,14 @@ from LOGS.Entities.TrackMatrix import TrackMatrix
|
|
|
15
15
|
from LOGS.Entities.TrackTable import TrackTable
|
|
16
16
|
from LOGS.Entities.TrackXY import TrackXY
|
|
17
17
|
from LOGS.Entities.TrackXYComplex import TrackXYComplex
|
|
18
|
-
from LOGS.Entity.
|
|
18
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
19
19
|
|
|
20
20
|
TRACKS = Union[Track, TrackXY]
|
|
21
21
|
DATATRACKS = Union[Datatrack, DatatrackNumericArray]
|
|
22
22
|
_T = TypeVar("_T", Track, TrackXY)
|
|
23
23
|
|
|
24
24
|
|
|
25
|
-
class DatasetInfo(
|
|
25
|
+
class DatasetInfo(SerializableContent):
|
|
26
26
|
_name: Optional[str] = None
|
|
27
27
|
_type: Optional[str] = None
|
|
28
28
|
_formatVersion: Optional[int] = None
|
|
@@ -5,10 +5,10 @@ from deprecation import deprecated
|
|
|
5
5
|
|
|
6
6
|
from LOGS.Auxiliary.Tools import Tools
|
|
7
7
|
from LOGS.Entities.FileEntry import FileEntry, FileFragment
|
|
8
|
-
from LOGS.Entity.
|
|
8
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
class MatchRequest(
|
|
11
|
+
class MatchRequest(SerializableClass):
|
|
12
12
|
_typeMapper = {"files": FileEntry}
|
|
13
13
|
|
|
14
14
|
def __init__(self, ref: Any = None):
|
|
@@ -17,7 +17,7 @@ class MatchRequest(SerializeableClass):
|
|
|
17
17
|
super().__init__(ref)
|
|
18
18
|
|
|
19
19
|
|
|
20
|
-
class DatasetForSearch(
|
|
20
|
+
class DatasetForSearch(SerializableClass):
|
|
21
21
|
_typeMapper = {"files": FileEntry}
|
|
22
22
|
|
|
23
23
|
def __init__(self, ref: Any = None):
|
|
@@ -39,7 +39,7 @@ class DatasetForSearch(SerializeableClass):
|
|
|
39
39
|
self.formatId = value
|
|
40
40
|
|
|
41
41
|
|
|
42
|
-
class DatasetsUpdatableFiles(
|
|
42
|
+
class DatasetsUpdatableFiles(SerializableClass):
|
|
43
43
|
_typeMapper = {"files": FileEntry}
|
|
44
44
|
|
|
45
45
|
def __init__(
|
|
@@ -57,7 +57,7 @@ class DatasetsUpdatableFiles(SerializeableClass):
|
|
|
57
57
|
self.files = files
|
|
58
58
|
|
|
59
59
|
|
|
60
|
-
class DatasetSearchResult(
|
|
60
|
+
class DatasetSearchResult(SerializableClass):
|
|
61
61
|
_typeMapper: dict = {"files": FileEntry}
|
|
62
62
|
|
|
63
63
|
def __init__(self, ref: Any = None):
|
|
@@ -69,7 +69,7 @@ class DatasetSearchResult(SerializeableClass):
|
|
|
69
69
|
super().__init__(ref)
|
|
70
70
|
|
|
71
71
|
|
|
72
|
-
class DatasetSearchRequest(
|
|
72
|
+
class DatasetSearchRequest(SerializableClass):
|
|
73
73
|
_typeMapper = {"datasets": DatasetForSearch}
|
|
74
74
|
|
|
75
75
|
def __init__(self, ref: Any = None):
|
|
@@ -77,7 +77,7 @@ class DatasetSearchRequest(SerializeableClass):
|
|
|
77
77
|
super().__init__(ref)
|
|
78
78
|
|
|
79
79
|
|
|
80
|
-
class MatchedDataset(
|
|
80
|
+
class MatchedDataset(SerializableClass):
|
|
81
81
|
_typeMapper = {"files": FileEntry}
|
|
82
82
|
|
|
83
83
|
def __init__(self, ref: Any = None):
|
|
@@ -114,7 +114,7 @@ class MatchedDataset(SerializeableClass):
|
|
|
114
114
|
self.formatId = value
|
|
115
115
|
|
|
116
116
|
|
|
117
|
-
class DatasetMatch(
|
|
117
|
+
class DatasetMatch(SerializableClass):
|
|
118
118
|
_typeMapper = {"datasets": MatchedDataset}
|
|
119
119
|
|
|
120
120
|
def __init__(self, ref: Any = None):
|
|
@@ -148,7 +148,7 @@ class DatasetMatch(SerializeableClass):
|
|
|
148
148
|
self.formatId = value
|
|
149
149
|
|
|
150
150
|
|
|
151
|
-
class MatchResult(
|
|
151
|
+
class MatchResult(SerializableClass):
|
|
152
152
|
_typeMapper = {"matches": DatasetMatch, "missingFragments": FileFragment}
|
|
153
153
|
|
|
154
154
|
def __init__(self, ref: Any = None):
|
LOGS/Entities/DatasetModels.py
CHANGED
|
@@ -2,7 +2,7 @@ from dataclasses import dataclass
|
|
|
2
2
|
from enum import Enum
|
|
3
3
|
from typing import List, Optional
|
|
4
4
|
|
|
5
|
-
from LOGS.Entity.
|
|
5
|
+
from LOGS.Entity.SerializableContent import SerializableClass, SerializableContent
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
class DatasetSourceType(Enum):
|
|
@@ -12,7 +12,7 @@ class DatasetSourceType(Enum):
|
|
|
12
12
|
APIUpload = 3
|
|
13
13
|
|
|
14
14
|
|
|
15
|
-
class ParsedMetadata(
|
|
15
|
+
class ParsedMetadata(SerializableContent):
|
|
16
16
|
Parameters: bool = False
|
|
17
17
|
Tracks: bool = False
|
|
18
18
|
TrackCount: int = False
|
|
@@ -20,7 +20,7 @@ class ParsedMetadata(SerializeableContent):
|
|
|
20
20
|
|
|
21
21
|
|
|
22
22
|
@dataclass
|
|
23
|
-
class DatasetSource(
|
|
23
|
+
class DatasetSource(SerializableClass):
|
|
24
24
|
id: Optional[int] = None
|
|
25
25
|
type: Optional[DatasetSourceType] = None
|
|
26
26
|
name: Optional[str] = None
|
|
@@ -4,8 +4,6 @@ from LOGS.Entity.EntityRelation import EntityRelation
|
|
|
4
4
|
from LOGS.Entity.EntityRelations import EntityRelations
|
|
5
5
|
|
|
6
6
|
if TYPE_CHECKING:
|
|
7
|
-
from LOGS.Entities.Document import Document
|
|
8
|
-
from LOGS.Entities.Documents import Documents
|
|
9
7
|
from LOGS.Entities.LabNotebookEntry import LabNotebookEntry
|
|
10
8
|
from LOGS.Entities.Project import Project
|
|
11
9
|
|
|
@@ -13,18 +11,9 @@ if TYPE_CHECKING:
|
|
|
13
11
|
class DatasetRelations(EntityRelations):
|
|
14
12
|
"""Relations of a Dataset with other entities"""
|
|
15
13
|
|
|
16
|
-
_documents: Optional[EntityRelation["Document"]] = None
|
|
17
14
|
_labNotebookEntries: Optional[EntityRelation["LabNotebookEntry"]] = None
|
|
18
15
|
_projects: Optional[EntityRelation["Project"]] = None
|
|
19
16
|
|
|
20
|
-
@property
|
|
21
|
-
def documents(self) -> Optional[EntityRelation["Document"]]:
|
|
22
|
-
return self._documents
|
|
23
|
-
|
|
24
|
-
@documents.setter
|
|
25
|
-
def documents(self, value):
|
|
26
|
-
self._documents = self._entityConverter(value, Documents)
|
|
27
|
-
|
|
28
17
|
@property
|
|
29
18
|
def labNotebookEntries(self) -> Optional[EntityRelation]:
|
|
30
19
|
return self._labNotebookEntries
|
|
@@ -75,7 +75,6 @@ class DatasetRequestParameter(
|
|
|
75
75
|
autoloadServerIds: Optional[List[int]] = None
|
|
76
76
|
bridgeIds: Optional[List[int]] = None
|
|
77
77
|
dataSourceIds: Optional[List[int]] = None
|
|
78
|
-
documentIds: Optional[List[int]] = None
|
|
79
78
|
equipmentIds: Optional[List[int]] = None
|
|
80
79
|
excludeUndeleted: Optional[bool] = None
|
|
81
80
|
experimentIds: Optional[List[int]] = None
|
|
@@ -2,11 +2,11 @@ from dataclasses import dataclass
|
|
|
2
2
|
from typing import List, Optional, Sequence, Union
|
|
3
3
|
from uuid import UUID
|
|
4
4
|
|
|
5
|
-
from LOGS.Entity.
|
|
5
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
@dataclass
|
|
9
|
-
class EntitiesRequestParameter(
|
|
9
|
+
class EntitiesRequestParameter(SerializableClass):
|
|
10
10
|
_noSerialize = ["asString"]
|
|
11
11
|
uids: Optional[Sequence[Union[str, UUID]]] = None
|
|
12
12
|
names: Optional[List[str]] = None
|
|
@@ -4,11 +4,11 @@ from uuid import UUID
|
|
|
4
4
|
|
|
5
5
|
from LOGS.Auxiliary.Constants import Constants
|
|
6
6
|
from LOGS.Entities.OriginMinimal import OriginMinimal
|
|
7
|
-
from LOGS.Entity.
|
|
7
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
@dataclass
|
|
11
|
-
class EntityOriginWriteModelWithId(
|
|
11
|
+
class EntityOriginWriteModelWithId(SerializableClass):
|
|
12
12
|
_noSerialize = ["asString"]
|
|
13
13
|
id: Optional[Constants.ID_TYPE] = None
|
|
14
14
|
uid: Optional[UUID] = None
|
LOGS/Entities/FileEntry.py
CHANGED
|
@@ -6,16 +6,16 @@ from hashlib import sha256
|
|
|
6
6
|
from typing import Any, List, Literal, Optional, Sequence, Union, cast
|
|
7
7
|
|
|
8
8
|
from LOGS.Auxiliary.Constants import Constants
|
|
9
|
-
from LOGS.Entity.
|
|
9
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
class FingerprintFragment(
|
|
12
|
+
class FingerprintFragment(SerializableClass):
|
|
13
13
|
offset: int = 0
|
|
14
14
|
length: int = 0
|
|
15
15
|
bytes: str = ""
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
class FileFragment(
|
|
18
|
+
class FileFragment(SerializableClass):
|
|
19
19
|
_typeMapper = {"fragments": FingerprintFragment}
|
|
20
20
|
id: str = ""
|
|
21
21
|
fragments: List[FingerprintFragment] = []
|
|
@@ -24,7 +24,7 @@ class FileFragment(SerializeableClass):
|
|
|
24
24
|
FormatFileState = Literal["NEW", "UNCHANGED", "NEEDSUPDATE", "DELETE"]
|
|
25
25
|
|
|
26
26
|
|
|
27
|
-
class FileEntry(
|
|
27
|
+
class FileEntry(SerializableClass):
|
|
28
28
|
_typeMapper = {"fragments": FingerprintFragment}
|
|
29
29
|
_noSerialize = ["isDir", "name"]
|
|
30
30
|
id: Optional[str] = None
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class FileExcludePattern(
|
|
6
|
+
class FileExcludePattern(SerializableClass):
|
|
7
7
|
name: Optional[str] = None
|
|
8
8
|
regex: Optional[str] = None
|
|
@@ -4,12 +4,12 @@ from typing import Dict, List, Literal, Optional, Union
|
|
|
4
4
|
from LOGS.Entities.FormattedTable.DatatypeFormattedTableCell import (
|
|
5
5
|
DatatypeFormattedTableCell,
|
|
6
6
|
)
|
|
7
|
-
from LOGS.Entity.
|
|
7
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
8
8
|
|
|
9
9
|
_VTypeType = Literal["int", "float", "str", "bool"]
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
class DatatypeFormattedTable(
|
|
12
|
+
class DatatypeFormattedTable(SerializableContent):
|
|
13
13
|
_type: str = "formatted_table"
|
|
14
14
|
_name: Optional[str] = None
|
|
15
15
|
_id = ""
|
|
@@ -3,13 +3,13 @@ from typing import Literal, Optional, Union
|
|
|
3
3
|
from LOGS.Entities.FormattedTable.DatatypeFormattedTableSettings import (
|
|
4
4
|
DatatypeFormattedTableSettings,
|
|
5
5
|
)
|
|
6
|
-
from LOGS.Entity.
|
|
6
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
7
7
|
|
|
8
8
|
_VTypeType = Literal["int", "float", "str", "bool"]
|
|
9
9
|
_ValueType = Union[str, int, float, bool, None]
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
class DatatypeFormattedTableCell(
|
|
12
|
+
class DatatypeFormattedTableCell(SerializableContent):
|
|
13
13
|
__vtype = {"int": int, "float": float, "str": str, "bool": bool}
|
|
14
14
|
|
|
15
15
|
_id: str = ""
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
from typing import Dict, List, Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class DatatypeFormattedTableSettings(
|
|
6
|
+
class DatatypeFormattedTableSettings(SerializableClass):
|
|
7
7
|
_type: str = "formatted_table"
|
|
8
8
|
_name: Optional[str] = None
|
|
9
9
|
_id: str = ""
|
LOGS/Entities/HierarchyLeaf.py
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class HierarchyLeaf(
|
|
6
|
+
class HierarchyLeaf(SerializableContent):
|
|
7
7
|
_track: Optional[str] = None
|
|
8
8
|
|
|
9
9
|
@property
|
LOGS/Entities/HierarchyNode.py
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
from typing import Optional, Sequence, Union
|
|
2
2
|
|
|
3
3
|
from LOGS.Entities.HierarchyLeaf import HierarchyLeaf
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
class HierarchyNode(
|
|
7
|
+
class HierarchyNode(SerializableContent):
|
|
8
8
|
_name: Optional[str] = None
|
|
9
9
|
_content: Optional[Sequence[Union["HierarchyNode", HierarchyLeaf]]] = None
|
|
10
10
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class BasicAttribute(
|
|
6
|
+
class BasicAttribute(SerializableContent):
|
|
7
7
|
_id: Optional[str] = None
|
|
8
8
|
|
|
9
9
|
@property
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
3
|
from LOGS.Entities.LabNotebookEntryContent.BasicAttribute import BasicAttribute
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableClass
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
class EntityAttributeSettings(
|
|
7
|
+
class EntityAttributeSettings(SerializableClass):
|
|
8
8
|
showHeader: Optional[bool] = None
|
|
9
9
|
collapsible: Optional[bool] = None
|
|
10
10
|
defaultCollapsed: Optional[bool] = None
|
|
11
11
|
|
|
12
12
|
|
|
13
|
-
class EntityAttributeAdditionalSettings(
|
|
13
|
+
class EntityAttributeAdditionalSettings(SerializableClass):
|
|
14
14
|
height: Optional[int] = None
|
|
15
15
|
showViewer: Optional[bool] = None
|
|
16
16
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
|
-
from LOGS.Entity.
|
|
3
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class EntryContentItem(
|
|
6
|
+
class EntryContentItem(SerializableContent):
|
|
7
7
|
__type: str = "Unknown"
|
|
8
8
|
_type: Optional[str] = None
|
|
9
9
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
from typing import Generic, Optional, Type, TypeVar
|
|
2
2
|
|
|
3
3
|
from LOGS.Entities.LabNotebookEntryContent.BasicAttribute import BasicAttribute
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
5
5
|
|
|
6
6
|
_T = TypeVar("_T", bound=BasicAttribute)
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
class IEntryContentWithAttribute(Generic[_T],
|
|
9
|
+
class IEntryContentWithAttribute(Generic[_T], SerializableContent):
|
|
10
10
|
_attrType: Optional[Type] = None
|
|
11
11
|
_attrs: Optional[_T] = None
|
|
12
12
|
|
|
@@ -4,12 +4,12 @@ from LOGS.Entities.LabNotebookEntryContent.EntryContentConverter import (
|
|
|
4
4
|
EntryContentConverter,
|
|
5
5
|
)
|
|
6
6
|
from LOGS.Entities.LabNotebookEntryContent.EntryContentItem import EntryContentItem
|
|
7
|
-
from LOGS.Entity.
|
|
7
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
8
8
|
|
|
9
9
|
_T = TypeVar("_T", bound=EntryContentItem)
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
class IEntryContentWithContent(
|
|
12
|
+
class IEntryContentWithContent(SerializableContent):
|
|
13
13
|
_content: List[EntryContentItem] = cast(List[EntryContentItem], None)
|
|
14
14
|
|
|
15
15
|
def listContentItems(
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
|
|
3
3
|
from LOGS.Entities.LabNotebookEntryContent.TextAttribute import TextAttribute
|
|
4
|
-
from LOGS.Entity.
|
|
4
|
+
from LOGS.Entity.SerializableContent import SerializableContent
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
class IEntryContentWithTextAttribute(
|
|
7
|
+
class IEntryContentWithTextAttribute(SerializableContent):
|
|
8
8
|
_attrs: Optional[TextAttribute] = None
|
|
9
9
|
|
|
10
10
|
@property
|