Skip to content

Commit 2011b95

Browse files
committed
Adding Expert Parameters option
Adding Readonly
1 parent 66c966e commit 2011b95

File tree

4 files changed

+162
-70
lines changed

4 files changed

+162
-70
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name='wolf_comm',
8-
version='0.0.23',
8+
version='0.0.43',
99
author="Jan Rothkegel",
1010
author_email="jan.rothkegel@web.de",
1111
description="A package to communicate with Wolf SmartSet Cloud",

wolf_comm/constants.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
BUNDLE_ID = 'BundleId'
1818

19+
ISREADONLY = 'IsReadOnly'
20+
1921
BUNDLE = 'IsSubBundle'
2022

2123
VALUE_ID_LIST = 'ValueIdList'

wolf_comm/models.py

Lines changed: 72 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,18 @@ def parameter_id(self):
3939
def bundle_id(self):
4040
...
4141

42+
@property
43+
@abstractmethod
44+
def read_only(self):
45+
...
46+
4247
@property
4348
@abstractmethod
4449
def parent(self):
4550
...
4651

4752
def __str__(self) -> str:
48-
return "%s -> %s[%d][%d][%d] of %s" % (self.__class__.__name__, self.name, self.parameter_id, self.bundle_id, self.value_id, self.parent)
53+
return "%s -> %s[%d][%d][%s][%d] of %s" % (self.__class__.__name__, self.name, self.parameter_id, self.bundle_id, self.read_only, self.value_id, self.parent)
4954

5055

5156
class SimpleParameter(Parameter):
@@ -76,13 +81,18 @@ def parameter_id(self):
7681
@property
7782
def bundle_id(self):
7883
return self._bundle_id
84+
85+
@property
86+
def read_only(self):
87+
return self._read_only
7988

80-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
89+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
8190
self._value_id = value_id
8291
self._name = name
8392
self._parent = parent
8493
self._parameter_id = parameter_id
8594
self._bundle_id = bundle_id
95+
self._read_only = read_only
8696

8797

8898
class UnitParameter(Parameter, ABC):
@@ -119,6 +129,10 @@ def value_id(self):
119129
@property
120130
def bundle_id(self):
121131
return self._bundle_id
132+
133+
@property
134+
def read_only(self):
135+
return self._read_only
122136

123137
@value_id.setter
124138
def value_id(self, value_id: int):
@@ -128,12 +142,13 @@ def value_id(self, value_id: int):
128142
def parent(self):
129143
return self._parent
130144

131-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
145+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
132146
self._value_id = value_id
133147
self._name = name
134148
self._parent = parent
135149
self._parameter_id = parameter_id
136150
self._bundle_id = bundle_id
151+
self._read_only = read_only
137152

138153
class Pressure(UnitParameter):
139154
@property
@@ -163,17 +178,22 @@ def value_id(self, value_id: int):
163178
@property
164179
def bundle_id(self):
165180
return self._bundle_id
181+
182+
@property
183+
def read_only(self):
184+
return self._read_only
166185

167186
@property
168187
def parent(self):
169188
return self._parent
170189

171-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
190+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
172191
self._value_id = value_id
173192
self._name = name
174193
self._parent = parent
175194
self._parameter_id = parameter_id
176195
self._bundle_id = bundle_id
196+
self._read_only = read_only
177197

178198
class HoursParameter(UnitParameter):
179199
@property
@@ -203,17 +223,22 @@ def value_id(self, value_id: int):
203223
@property
204224
def bundle_id(self):
205225
return self._bundle_id
226+
227+
@property
228+
def read_only(self):
229+
return self._read_only
206230

207231
@property
208232
def parent(self):
209233
return self._parent
210234

211-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
235+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
212236
self._value_id = value_id
213237
self._name = name
214238
self._parent = parent
215239
self._parameter_id = parameter_id
216240
self._bundle_id = bundle_id
241+
self._read_only = read_only
217242

218243
class PercentageParameter(UnitParameter):
219244

@@ -245,16 +270,21 @@ def value_id(self, value_id: int):
245270
def bundle_id(self):
246271
return self._bundle_id
247272

273+
@property
274+
def read_only(self):
275+
return self._read_only
276+
248277
@property
249278
def parent(self):
250279
return self._parent
251280

252-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
281+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
253282
self._value_id = value_id
254283
self._name = name
255284
self._parent = parent
256285
self._parameter_id = parameter_id
257286
self._bundle_id = bundle_id
287+
self._read_only = read_only
258288

259289
class PowerParameter(UnitParameter):
260290

@@ -286,16 +316,21 @@ def value_id(self, value_id: int):
286316
def bundle_id(self):
287317
return self._bundle_id
288318

319+
@property
320+
def read_only(self):
321+
return self._read_only
322+
289323
@property
290324
def parent(self):
291325
return self._parent
292326

293-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
327+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
294328
self._value_id = value_id
295329
self._name = name
296330
self._parent = parent
297331
self._parameter_id = parameter_id
298332
self._bundle_id = bundle_id
333+
self._read_only = read_only
299334

300335
class EnergyParameter(UnitParameter):
301336

@@ -327,16 +362,21 @@ def value_id(self, value_id: int):
327362
def bundle_id(self):
328363
return self._bundle_id
329364

365+
@property
366+
def read_only(self):
367+
return self._read_only
368+
330369
@property
331370
def parent(self):
332371
return self._parent
333372

334-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
373+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
335374
self._value_id = value_id
336375
self._name = name
337376
self._parent = parent
338377
self._parameter_id = parameter_id
339378
self._bundle_id = bundle_id
379+
self._read_only = read_only
340380

341381
class RPMParameter(UnitParameter):
342382

@@ -367,17 +407,22 @@ def value_id(self, value_id: int):
367407
@property
368408
def bundle_id(self):
369409
return self._bundle_id
410+
411+
@property
412+
def read_only(self):
413+
return self._read_only
370414

371415
@property
372416
def parent(self):
373417
return self._parent
374418

375-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
419+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
376420
self._value_id = value_id
377421
self._name = name
378422
self._parent = parent
379423
self._parameter_id = parameter_id
380424
self._bundle_id = bundle_id
425+
self._read_only = read_only
381426

382427
class FlowParameter(UnitParameter):
383428

@@ -408,17 +453,22 @@ def value_id(self, value_id: int):
408453
@property
409454
def bundle_id(self):
410455
return self._bundle_id
456+
457+
@property
458+
def read_only(self):
459+
return self._read_only
411460

412461
@property
413462
def parent(self):
414463
return self._parent
415464

416-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
465+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
417466
self._value_id = value_id
418467
self._name = name
419468
self._parent = parent
420469
self._parameter_id = parameter_id
421470
self._bundle_id = bundle_id
471+
self._read_only = read_only
422472

423473
class FrequencyParameter(UnitParameter):
424474

@@ -449,17 +499,22 @@ def value_id(self, value_id: int):
449499
@property
450500
def bundle_id(self):
451501
return self._bundle_id
502+
503+
@property
504+
def read_only(self):
505+
return self._read_only
452506

453507
@property
454508
def parent(self):
455509
return self._parent
456510

457-
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int):
511+
def __init__(self, value_id: int, name: str, parent: str, parameter_id: int, bundle_id: int, read_only: bool):
458512
self._value_id = value_id
459513
self._name = name
460514
self._parent = parent
461515
self._parameter_id = parameter_id
462516
self._bundle_id = bundle_id
517+
self._read_only = read_only
463518

464519
class ListItem:
465520
name: str
@@ -490,6 +545,10 @@ def value_id(self, value_id: int):
490545
@property
491546
def bundle_id(self):
492547
return self._bundle_id
548+
549+
@property
550+
def read_only(self):
551+
return self._read_only
493552

494553
@property
495554
def name(self):
@@ -503,13 +562,14 @@ def name(self, name: str):
503562
def parent(self):
504563
return self._parent
505564

506-
def __init__(self, value_id: int, name: str, parent: str, items: list[ListItem], parameter_id: int, bundle_id: int):
565+
def __init__(self, value_id: int, name: str, parent: str, items: list[ListItem], parameter_id: int, bundle_id: int, read_only: bool):
507566
self._value_id = value_id
508567
self._name = name
509568
self._parent = parent
510569
self.items = items
511570
self._parameter_id = parameter_id
512571
self._bundle_id = bundle_id
572+
self._read_only = read_only
513573

514574
def __str__(self) -> str:
515575
return super().__str__() + " items: " + ", ".join([item.__str__() for item in self.items])

0 commit comments

Comments
 (0)