Skip to content

Commit 6dc3f72

Browse files
antmendozaantmendoza
committed
added-default-values
Signed-off-by: Antonio Mendoza Pérez <antmendoza@gmail.com>
1 parent 08666ea commit 6dc3f72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+486
-422
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ With the SDK you can:
77
* Parse workflow JSON and YAML definitions
88
* Validate workflow definitions
99

10+
### Status
11+
12+
Current sdk version conforms to the [Serverless Workflow specification v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x).
13+
1014

1115
## Install dependencies and run test
1216

@@ -26,7 +30,7 @@ python setup.py pytest
2630

2731
```
2832
workflow = Workflow(
29-
id_="greeting",
33+
id="greeting",
3034
name="Greeting Workflow",
3135
description="Greet Someone",
3236
version='1.0',

‎serverlessworkflow/sdk/action.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
from serverlessworkflow.sdk.action_data_filter import ActionDataFilter
66
from serverlessworkflow.sdk.event_ref import EventRef
77
from serverlessworkflow.sdk.function_ref import FunctionRef
8-
from serverlessworkflow.sdk.hydration import ComplexTypeOf, UnionTypeOf, SimpleTypeOf, HydratableParameter, \
9-
Fields
108
from serverlessworkflow.sdk.sleep import Sleep
119
from serverlessworkflow.sdk.sub_flow_ref import SubFlowRef
10+
from serverlessworkflow.sdk.swf_base import ComplexTypeOf, UnionTypeOf, SimpleTypeOf, HydratableParameter, SwfBase
1211

1312

14-
class Action:
13+
class Action(SwfBase):
1514
id: str = None
1615
name: str = None
1716
functionRef: (str | FunctionRef) = None
@@ -39,11 +38,10 @@ def __init__(self,
3938
eslavida: str = None,
4039
**kwargs):
4140

42-
Fields(locals(), kwargs, Action.f_hydration).set_to_object(self)
41+
SwfBase.__init__(self, locals(), kwargs, Action.f_hydration)
4342

4443
@staticmethod
4544
def f_hydration(p_key, p_value):
46-
4745
parameter = HydratableParameter(value=p_value)
4846
if p_key == 'functionRef':
4947
return parameter.hydrateAs(UnionTypeOf([SimpleTypeOf(str), ComplexTypeOf(FunctionRef)]))

‎serverlessworkflow/sdk/action_data_filter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from serverlessworkflow.sdk.hydration import Fields
1+
from serverlessworkflow.sdk.swf_base import SwfBase
22

33

4-
class ActionDataFilter:
4+
class ActionDataFilter(SwfBase):
55
fromStateData: str = None
66
useResults: bool = None
77
results: str = None
@@ -13,4 +13,4 @@ def __init__(self,
1313
results: str = None,
1414
toStateData: str = None,
1515
**kwargs):
16-
Fields(locals(), kwargs, Fields.default_hydration).set_to_object(self)
16+
SwfBase.__init__(self, locals(), kwargs, SwfBase.default_hydration)

‎serverlessworkflow/sdk/auth_def.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
from serverlessworkflow.sdk.basic_props_def import BasicPropsDef
66
from serverlessworkflow.sdk.bearer_props_def import BearerPropsDef
7-
from serverlessworkflow.sdk.hydration import Fields
87
from serverlessworkflow.sdk.oauth2props_def import Oauth2PropsDef
8+
from serverlessworkflow.sdk.swf_base import SwfBase
99

1010

11-
class AuthDef:
11+
class AuthDef(SwfBase):
1212
name: str = None
1313
scheme: str = None
1414
properties: (str | (BasicPropsDef | BearerPropsDef | Oauth2PropsDef)) = None
@@ -18,19 +18,20 @@ def __init__(self,
1818
scheme: str = None,
1919
properties: (str | (BasicPropsDef | BearerPropsDef | Oauth2PropsDef)) = None,
2020
**kwargs):
21-
Fields(locals(), kwargs, Fields.f_hydration).set_to_object(self)
21+
22+
_default_values = {'scheme': 'basic'}
23+
SwfBase.__init__(self, locals(), kwargs, SwfBase.default_hydration, _default_values)
2224

2325
@staticmethod
2426
def f_hydration(p_key, p_value):
25-
2627
result = copy.deepcopy(p_value)
2728

2829
if p_key == 'properties':
2930
if p_value["username"] and p_value["password"]:
30-
return BasicPropsDef(p_value);
31+
return BasicPropsDef(p_value)
3132
if p_value["token"]:
32-
return BearerPropsDef(p_value);
33+
return BearerPropsDef(p_value)
3334
if p_value["grantType"]:
34-
return Oauth2PropsDef(p_value);
35+
return Oauth2PropsDef(p_value)
3536

3637
return result

‎serverlessworkflow/sdk/basic_props_def.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from serverlessworkflow.sdk.hydration import Fields
21
from serverlessworkflow.sdk.metadata import Metadata
2+
from serverlessworkflow.sdk.swf_base import SwfBase
33

44

5-
class BasicPropsDef:
5+
class BasicPropsDef(SwfBase):
66
username: str = None
77
password: str = None
88
metadata: Metadata = None
@@ -12,4 +12,4 @@ def __init__(self,
1212
password: str = None,
1313
metadata: Metadata = None,
1414
**kwargs):
15-
Fields(locals(), kwargs, Fields.default_hydration).set_to_object(self)
15+
SwfBase.__init__(self, locals(), kwargs, SwfBase.default_hydration)

‎serverlessworkflow/sdk/bearer_props_def.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from serverlessworkflow.sdk.hydration import Fields
21
from serverlessworkflow.sdk.metadata import Metadata
2+
from serverlessworkflow.sdk.swf_base import SwfBase
33

44

5-
class BearerPropsDef:
5+
class BearerPropsDef(SwfBase):
66
token: str = None
77
metadata: Metadata = None
88

99
def __init__(self,
1010
token: str = None,
1111
metadata: Metadata = None,
1212
**kwargs):
13-
Fields(locals(), kwargs, Fields.default_hydration).set_to_object(self)
13+
SwfBase.__init__(self, locals(), kwargs, SwfBase.default_hydration)

‎serverlessworkflow/sdk/branch.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from serverlessworkflow.sdk.action import Action
44
from serverlessworkflow.sdk.branch_timeout import BranchTimeOut
5-
from serverlessworkflow.sdk.hydration import ArrayTypeOf, ComplexTypeOf, HydratableParameter, Fields
5+
from serverlessworkflow.sdk.swf_base import ArrayTypeOf, ComplexTypeOf, HydratableParameter, SwfBase
66

77

8-
class Branch:
8+
class Branch(SwfBase):
99
name: str = None
1010
timeouts: BranchTimeOut = None
1111
actions: [Action] = None
@@ -15,7 +15,8 @@ def __init__(self,
1515
timeouts: BranchTimeOut = None,
1616
actions: [Action] = None,
1717
**kwargs):
18-
Fields(locals(), kwargs, Branch.f_hydration).set_to_object(self)
18+
19+
SwfBase.__init__(self, locals(), kwargs, Branch.f_hydration)
1920

2021
@staticmethod
2122
def f_hydration(p_key, p_value):

‎serverlessworkflow/sdk/branch_timeout.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
from serverlessworkflow.sdk.hydration import Fields
1+
from serverlessworkflow.sdk.swf_base import SwfBase
22

33

4-
class BranchTimeOut:
4+
class BranchTimeOut(SwfBase):
55
actionExecTimeOut: str = None # ActionExecTimeOut
66
branchExecTimeOut: str = None # BranchExecTimeOut
77

88
def __init__(self,
99
actionExecTimeOut: str = None,
1010
branchExecTimeOut: str = None,
1111
**kwargs):
12-
Fields(locals(), kwargs, Fields.default_hydration).set_to_object(self)
12+
SwfBase.__init__(self, locals(), kwargs, SwfBase.default_hydration)

‎serverlessworkflow/sdk/callback_state.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
from serverlessworkflow.sdk.end import End
88
from serverlessworkflow.sdk.error import Error
99
from serverlessworkflow.sdk.event_data_filter import EventDataFilter
10-
from serverlessworkflow.sdk.hydration import ComplexTypeOf, ArrayTypeOf, HydratableParameter, SimpleTypeOf, \
11-
UnionTypeOf, Fields
1210
from serverlessworkflow.sdk.metadata import Metadata
1311
from serverlessworkflow.sdk.state import State
1412
from serverlessworkflow.sdk.state_data_filter import StateDataFilter
13+
from serverlessworkflow.sdk.swf_base import ComplexTypeOf, ArrayTypeOf, HydratableParameter, SimpleTypeOf, \
14+
UnionTypeOf, SwfBase
1515
from serverlessworkflow.sdk.transition import Transition
1616

1717

18-
class CallbackState(State):
18+
class CallbackState(State, SwfBase):
1919
id: str = None
2020
name: str = None
2121
type: str = None
@@ -48,11 +48,11 @@ def __init__(self,
4848
metadata: Metadata = None,
4949
**kwargs):
5050

51-
Fields(locals(), kwargs, Fields.f_hydration).set_to_object(self)
51+
_default_values = {'type': 'callback', 'usedForCompensation': False, }
52+
SwfBase.__init__(self, locals(), kwargs, SwfBase.default_hydration, _default_values)
5253

5354
@staticmethod
5455
def f_hydration(p_key, p_value):
55-
5656
if p_key == 'action':
5757
return HydratableParameter(value=p_value).hydrateAs(ComplexTypeOf(Action))
5858

‎serverlessworkflow/sdk/callback_state_timeout.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import copy
22

3-
from serverlessworkflow.sdk.hydration import HydratableParameter, ComplexTypeOf, Fields
43
from serverlessworkflow.sdk.state_exec_timeout import StateExecTimeOut
4+
from serverlessworkflow.sdk.swf_base import HydratableParameter, ComplexTypeOf, SwfBase
55

66

7-
class CallbackStateTimeOut:
7+
class CallbackStateTimeOut(SwfBase):
88
stateExecTimeOut: StateExecTimeOut = None
99
actionExecTimeOut: str = None # ActionExecTimeOut
1010
eventTimeOut: str = None # EventTimeOut
@@ -14,7 +14,7 @@ def __init__(self,
1414
actionExecTimeOut: str = None,
1515
eventTimeOut: str = None,
1616
**kwargs):
17-
Fields(locals(), kwargs, CallbackStateTimeOut.f_hydration).set_to_object(self)
17+
SwfBase.__init__(self, locals(), kwargs, CallbackStateTimeOut.f_hydration)
1818

1919
@staticmethod
2020
def f_hydration(p_key, p_value):

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy