logs-py 3.0.7__py3-none-any.whl → 3.0.8__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/Converter/Converter.py +3 -3
- LOGS/Converter/{ExportParamters.py → ExportParameters.py} +1 -1
- LOGS/Entities/Dataset.py +5 -5
- LOGS/Entities/DatasetRequestParameter.py +0 -1
- {logs_py-3.0.7.dist-info → logs_py-3.0.8.dist-info}/METADATA +1 -1
- {logs_py-3.0.7.dist-info → logs_py-3.0.8.dist-info}/RECORD +8 -8
- {logs_py-3.0.7.dist-info → logs_py-3.0.8.dist-info}/WHEEL +0 -0
- {logs_py-3.0.7.dist-info → logs_py-3.0.8.dist-info}/top_level.txt +0 -0
LOGS/Converter/Converter.py
CHANGED
|
@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional
|
|
|
2
2
|
|
|
3
3
|
from LOGS.Auxiliary import Tools
|
|
4
4
|
from LOGS.Converter.ConverterParameter import IConverterParameter
|
|
5
|
-
from LOGS.Converter.
|
|
5
|
+
from LOGS.Converter.ExportParameters import ExportParameters
|
|
6
6
|
from LOGS.Entity.SerializableContent import SerializableContent
|
|
7
7
|
|
|
8
8
|
|
|
@@ -67,13 +67,13 @@ class Converter(SerializableContent):
|
|
|
67
67
|
self._id = self.checkAndConvertNullable(value, str, "id")
|
|
68
68
|
|
|
69
69
|
@property
|
|
70
|
-
def requestParameter(self) -> Optional[
|
|
70
|
+
def requestParameter(self) -> Optional[ExportParameters]:
|
|
71
71
|
if self.parameters is None:
|
|
72
72
|
return None
|
|
73
73
|
|
|
74
74
|
p: Dict[str, Any] = {p.id: None for p in self.parameters if p.id}
|
|
75
75
|
p["_parentId"] = self.id
|
|
76
|
-
return
|
|
76
|
+
return ExportParameters(
|
|
77
77
|
ref=p,
|
|
78
78
|
types={
|
|
79
79
|
p.id: IConverterParameter.TypeMapper(p.type)
|
LOGS/Entities/Dataset.py
CHANGED
|
@@ -25,7 +25,7 @@ from LOGS.Auxiliary.ParameterHelper import ParameterHelper
|
|
|
25
25
|
from LOGS.Auxiliary.Tools import Tools
|
|
26
26
|
from LOGS.Converter import Converter
|
|
27
27
|
from LOGS.Converter.Conversion import Conversion
|
|
28
|
-
from LOGS.Converter.
|
|
28
|
+
from LOGS.Converter.ExportParameters import ExportParameters
|
|
29
29
|
from LOGS.Entities.DatasetInfo import DatasetInfo
|
|
30
30
|
from LOGS.Entities.DatasetModels import DatasetSourceType, ViewableEntityTypes
|
|
31
31
|
from LOGS.Entities.DatasetRelations import DatasetRelations
|
|
@@ -375,7 +375,7 @@ class Dataset(
|
|
|
375
375
|
self._parameterHelper = ParameterHelper(self.parameters)
|
|
376
376
|
return self._parameterHelper.get(key, removeUnit)
|
|
377
377
|
|
|
378
|
-
def _requestReport(self, exportId: str, parameters: Optional[
|
|
378
|
+
def _requestReport(self, exportId: str, parameters: Optional[ExportParameters]):
|
|
379
379
|
connection, endpoint, id = self._getConnectionData()
|
|
380
380
|
converterEndpoint: Any = endpoint + [id, "exports", exportId]
|
|
381
381
|
payload = parameters.toDict() if parameters else {}
|
|
@@ -393,7 +393,7 @@ class Dataset(
|
|
|
393
393
|
return conversion
|
|
394
394
|
|
|
395
395
|
def exportTo(
|
|
396
|
-
self, exportId: str, parameters: Optional[Union[
|
|
396
|
+
self, exportId: str, parameters: Optional[Union[ExportParameters, dict]] = None
|
|
397
397
|
):
|
|
398
398
|
|
|
399
399
|
if self._noExports:
|
|
@@ -412,14 +412,14 @@ class Dataset(
|
|
|
412
412
|
if parameters is not None and p is not None:
|
|
413
413
|
if isinstance(parameters, dict):
|
|
414
414
|
p.fromDict(parameters)
|
|
415
|
-
elif isinstance(parameters,
|
|
415
|
+
elif isinstance(parameters, ExportParameters):
|
|
416
416
|
if parameters._parentId is None or parameters._parentId != p._parentId:
|
|
417
417
|
raise LOGSException(
|
|
418
418
|
f"The passed export parameters is not generated by and valid export format. (Expected class '{p.identifier}')"
|
|
419
419
|
)
|
|
420
420
|
else:
|
|
421
421
|
raise LOGSException(
|
|
422
|
-
f"Invalid parameter type '{type(parameters).__name__}'. (Expected 'dict' or '{
|
|
422
|
+
f"Invalid parameter type '{type(parameters).__name__}'. (Expected 'dict' or '{ExportParameters.__name__}')"
|
|
423
423
|
)
|
|
424
424
|
|
|
425
425
|
return self._requestReport(exportId, p)
|
|
@@ -94,7 +94,6 @@ class DatasetRequestParameter(
|
|
|
94
94
|
methodIds: Optional[List[int]] = None
|
|
95
95
|
names: Optional[List[str]] = None
|
|
96
96
|
operatorIds: Optional[List[int]] = None
|
|
97
|
-
orderBy: Optional[DatasetOrder] = None
|
|
98
97
|
organizationIds: Optional[List[int]] = None
|
|
99
98
|
originIds: Optional[List[int]] = None
|
|
100
99
|
parameters: Optional[Dict[str, Any]] = None
|
|
@@ -14,9 +14,9 @@ LOGS/Auxiliary/ReplaceMessage.py,sha256=ilzfyNidpUQguDglqxehZRJw6diF3-FH5mk3rVLr
|
|
|
14
14
|
LOGS/Auxiliary/Tools.py,sha256=Zd2YncaU_qiv3uu8pNbk5C_uYy8_xT-OagxQjn9hTnc,10079
|
|
15
15
|
LOGS/Auxiliary/__init__.py,sha256=345a0imJBwsfWkGqkEyD1frAcouaUc0B6QdMSVJB_ak,351
|
|
16
16
|
LOGS/Converter/Conversion.py,sha256=lXIRlnwgSDok6-ayxXOcNDJI4JDrYvmeSq85-BopaNE,7778
|
|
17
|
-
LOGS/Converter/Converter.py,sha256=
|
|
17
|
+
LOGS/Converter/Converter.py,sha256=0V6vcHY8x9NjJhYP3YOQtXB4qDEuGu78qqw0K2HFzWQ,2681
|
|
18
18
|
LOGS/Converter/ConverterParameter.py,sha256=bZ-VtU9ZGn4HD9BTI494QWRakpKZc_8dAG4lHIZky04,2576
|
|
19
|
-
LOGS/Converter/
|
|
19
|
+
LOGS/Converter/ExportParameters.py,sha256=2HyPWbTXiS1sRrA7BsAdlLczHEdIrljyV8BU4uxnHU0,3017
|
|
20
20
|
LOGS/Converter/__init__.py,sha256=2zs2B7nMYi6CqUdIWhX0ndkurO43Q3nDL_t0DanBf6c,315
|
|
21
21
|
LOGS/Entities/AutoloadClientInfo.py,sha256=B8gnKFLTStwTd01STfFFr4bHGwQo2Hq_vsH9KD0fOsg,2620
|
|
22
22
|
LOGS/Entities/AutoloadFileInfo.py,sha256=dcyTOLPmXUOStqslZ5YKZQx-PINSPQTW6FoOKDWzx5c,335
|
|
@@ -53,7 +53,7 @@ LOGS/Entities/DataSourceRelations.py,sha256=eIszpHjZqz6v4WyhaPNu8efSzedsJLNrYR9b
|
|
|
53
53
|
LOGS/Entities/DataSourceRequestParameter.py,sha256=zAfC61NvVt4XO3HhIy1PLViN3AEBJo7Q6Fa_EtyqNvA,1610
|
|
54
54
|
LOGS/Entities/DataSourceStatus.py,sha256=LIMesU020i1clMiTxvO3hAoESf4B1-fXsDGMMtWLdsM,427
|
|
55
55
|
LOGS/Entities/DataSources.py,sha256=UU5ey98_vX4WQknyWITMy-dPOV-wgjblXxu5uXpnVso,481
|
|
56
|
-
LOGS/Entities/Dataset.py,sha256=
|
|
56
|
+
LOGS/Entities/Dataset.py,sha256=VTelbPwxSpLsX6Fu4-4flBFClKtEjLXfiVDC-8uwU-Q,27417
|
|
57
57
|
LOGS/Entities/DatasetCreator.py,sha256=GJ2e0pcYt5ziVqREViBM_uq45K3rm3FG_3NqIOjrO3Y,3253
|
|
58
58
|
LOGS/Entities/DatasetInfo.py,sha256=GVs9dxE2ufMfiuhgKXDcN-GEi2VrZPM1TMBLwtsfMU0,4972
|
|
59
59
|
LOGS/Entities/DatasetMatchTypes.py,sha256=6C60F0GcioNyfRWIIh2XGQJokZxFdBZY9UpKv1y3M7w,4363
|
|
@@ -61,7 +61,7 @@ LOGS/Entities/DatasetMatching.py,sha256=1tLYQKFMssOQIPuCh06dr70oYCpjj4bXer6VAO3p
|
|
|
61
61
|
LOGS/Entities/DatasetMinimal.py,sha256=AfSMihe4mU53D3dib1MzW7ZAtfvFytVyGpMMi3Fr2Cw,246
|
|
62
62
|
LOGS/Entities/DatasetModels.py,sha256=ilJUJP1LWQXSXbvZ4NF0oHUpLPV9yd0sPVNiS60veec,695
|
|
63
63
|
LOGS/Entities/DatasetRelations.py,sha256=lXV99yA6VvCcwobZK4WRIefYdqV3rcmBsHoQwLurjHY,1075
|
|
64
|
-
LOGS/Entities/DatasetRequestParameter.py,sha256
|
|
64
|
+
LOGS/Entities/DatasetRequestParameter.py,sha256=-P94r-AHf5UjHzQRKf-mF4a78emPcsf0eI-lzUTA0Ac,4264
|
|
65
65
|
LOGS/Entities/DatasetUploadParameter.py,sha256=bfH3Nm3BZs-hvWhFzWfxWSL-9hHJCRfW_PHwORtY_tw,470
|
|
66
66
|
LOGS/Entities/Datasets.py,sha256=wGeHowTv62F91oDtyJIVQzRl7qJsPT0SQlNoKBwWfs0,5022
|
|
67
67
|
LOGS/Entities/Datatrack.py,sha256=HpzDD9tJmvQGhm6W9vBqJ_yXC8oex0Cf0ygLfjZpbug,5297
|
|
@@ -254,7 +254,7 @@ LOGS/Parameters/ParameterElement.py,sha256=fr6AlO_flKRygZZFx1OILP4P-2lV2Tx4PAe6W
|
|
|
254
254
|
LOGS/Parameters/ParameterList.py,sha256=ijukB1__iKI5cefmOIIWz0wKaPz9Cx8KpD7Y7Gz2Pn0,1478
|
|
255
255
|
LOGS/Parameters/ParameterTable.py,sha256=7Lew4DPgWmKcpV1T-1Pvt00kEI05FB383QqO-LHAjds,1758
|
|
256
256
|
LOGS/Parameters/__init__.py,sha256=KpMSuBPx964v2YMZ1BqVp8vjrgSpuiW9KYBm-aejRuc,312
|
|
257
|
-
logs_py-3.0.
|
|
258
|
-
logs_py-3.0.
|
|
259
|
-
logs_py-3.0.
|
|
260
|
-
logs_py-3.0.
|
|
257
|
+
logs_py-3.0.8.dist-info/METADATA,sha256=2ddIR966EkrF9IwiimrJebOpNfYcK_bs3MPGR3MoRo4,2339
|
|
258
|
+
logs_py-3.0.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
|
|
259
|
+
logs_py-3.0.8.dist-info/top_level.txt,sha256=Ckn2LiAmGaR7k3tdEnKAc04z_uboMD4gLreYghRNdCs,5
|
|
260
|
+
logs_py-3.0.8.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|