Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
workflow
pypushflow
Commits
54bba7bd
Commit
54bba7bd
authored
Sep 22, 2020
by
Operator for ID30
Browse files
New scheme for setting outData from Python actor
parent
093e9092
Changes
1
Hide whitespace changes
Inline
Side-by-side
pypushflow/PythonActor.py
View file @
54bba7bd
...
...
@@ -128,8 +128,7 @@ class ActorWrapper(object):
logger
.
debug
(
'args={0}, kwargs={1}, method={2}'
.
format
(
args
,
kwargs
,
self
.
method
))
inData
=
args
[
0
]
outData
=
self
.
method
(
**
inData
)
inData
.
update
(
outData
)
return
inData
return
outData
class
PythonActor
(
AbstractActor
):
...
...
@@ -151,7 +150,7 @@ class PythonActor(AbstractActor):
def
trigger
(
self
,
inData
):
self
.
setStarted
()
self
.
inData
=
inData
self
.
inData
=
dict
(
inData
)
self
.
uploadDataToMongo
(
actorData
=
{
'inData'
:
inData
},
script
=
self
.
script
)
logger
.
debug
(
'In trigger {0}, inData = {1}'
.
format
(
self
.
name
,
pprint
.
pformat
(
inData
)))
if
isinstance
(
inData
,
WorkflowException
):
...
...
@@ -168,7 +167,7 @@ class PythonActor(AbstractActor):
self
.
af
=
AsyncFactory
(
self
.
actorWrapper
.
run
,
callback
=
self
.
triggerDownStreamActor
,
errorCallback
=
self
.
errorHandler
)
self
.
af
.
call
(
inData
)
self
.
af
.
call
(
self
.
inData
)
def
errorHandler
(
self
,
exception
):
logger
.
error
(
'Error when running actor {0}!'
.
format
(
self
.
name
))
...
...
@@ -208,13 +207,7 @@ class PythonActor(AbstractActor):
logger
.
error
(
'Trigger on error on errorHandler "{0}"'
.
format
(
self
.
errorHandler
.
name
))
self
.
errorHandler
.
triggerOnError
(
inData
=
oldInData
)
else
:
outData
=
{}
for
key
,
value
in
inData
.
items
():
if
key
in
self
.
inData
:
if
self
.
inData
[
key
]
!=
value
:
outData
[
key
]
=
value
else
:
outData
[
key
]
=
value
outData
=
dict
(
inData
)
self
.
uploadDataToMongo
(
actorData
=
{
'stopTime'
:
datetime
.
datetime
.
now
(),
'status'
:
'finished'
,
...
...
@@ -224,8 +217,10 @@ class PythonActor(AbstractActor):
self
.
setMongoAttribute
(
"logFile"
,
outData
[
"workflowLogFile"
])
if
"workflowDebugLogFile"
in
outData
:
self
.
setMongoAttribute
(
"debugLogFile"
,
outData
[
"workflowDebugLogFile"
])
downstreamData
=
dict
(
self
.
inData
)
downstreamData
.
update
(
outData
)
for
downStreamActor
in
self
.
listDownStreamActor
:
logger
.
debug
(
'In trigger {0}, triggering actor {1}, inData={2}'
.
format
(
self
.
name
,
downStreamActor
.
name
,
in
Data
))
downStreamActor
.
trigger
(
in
Data
)
logger
.
debug
(
'In trigger {0}, triggering actor {1}, inData={2}'
.
format
(
self
.
name
,
downStreamActor
.
name
,
downstream
Data
))
downStreamActor
.
trigger
(
downstream
Data
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment