conductor-python 1.1.5__tar.gz → 1.1.7__tar.gz

{conductor_python-1.1.5 → conductor_python-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conductor-python
-Version: 1.1.5
+Version: 1.1.7
 Summary: Netflix Conductor Python SDK
 Home-page: https://github.com/conductor-sdk/conductor-python
 Author: Orkes

{conductor_python-1.1.5 → conductor_python-1.1.7}/src/conductor/client/http/models/workflow_def.py

@@ -35,6 +35,7 @@ class WorkflowDef(object):
         'schema_version': 'int',
         'restartable': 'bool',
         'workflow_status_listener_enabled': 'bool',
+        'workflow_status_listener_sink': 'str',
         'owner_email': 'str',
         'timeout_policy': 'str',
         'timeout_seconds': 'int',
@@ -58,6 +59,7 @@ class WorkflowDef(object):
         'schema_version': 'schemaVersion',
         'restartable': 'restartable',
         'workflow_status_listener_enabled': 'workflowStatusListenerEnabled',
+        'workflow_status_listener_sink': 'workflowStatusListenerSink',
         'owner_email': 'ownerEmail',
         'timeout_policy': 'timeoutPolicy',
         'timeout_seconds': 'timeoutSeconds',
@@ -68,6 +70,7 @@ class WorkflowDef(object):
     def __init__(self, owner_app=None, create_time=None, update_time=None, created_by=None, updated_by=None, name=None,
                  description=None, version=None, tasks=None, input_parameters=None, output_parameters: dict = {},
                  failure_workflow=None, schema_version=None, restartable=None, workflow_status_listener_enabled=None,
+                 workflow_status_listener_sink=None,
                  owner_email=None, timeout_policy=None, timeout_seconds=None, variables=None,
                  input_template=None):  # noqa: E501
         """WorkflowDef - a model defined in Swagger"""  # noqa: E501
@@ -86,6 +89,7 @@ class WorkflowDef(object):
         self._schema_version = None
         self._restartable = None
         self._workflow_status_listener_enabled = None
+        self._workflow_status_listener_sink = None
         self._owner_email = None
         self._timeout_policy = None
         self._timeout_seconds = None
@@ -119,7 +123,9 @@ class WorkflowDef(object):
         if restartable is not None:
             self.restartable = restartable
         if workflow_status_listener_enabled is not None:
-            self.workflow_status_listener_enabled = workflow_status_listener_enabled
+            self._workflow_status_listener_enabled = workflow_status_listener_enabled
+        if workflow_status_listener_sink is not None:
+            self._workflow_status_listener_sink = workflow_status_listener_sink
         if owner_email is not None:
             self.owner_email = owner_email
         if timeout_policy is not None:
@@ -445,6 +451,14 @@ class WorkflowDef(object):
 
         self._workflow_status_listener_enabled = workflow_status_listener_enabled
 
+    @property
+    def workflow_status_listener_sink(self):
+        return self._workflow_status_listener_sink
+
+    @workflow_status_listener_sink.setter
+    def workflow_status_listener_sink(self, workflow_status_listener_sink):
+        self._workflow_status_listener_sink = workflow_status_listener_sink
+
     @property
     def owner_email(self):
         """Gets the owner_email of this WorkflowDef.  # noqa: E501

{conductor_python-1.1.5 → conductor_python-1.1.7}/src/conductor/client/http/rest.py

@@ -79,6 +79,8 @@ class RESTClientObject(object):
                     request_body = '{}'
                     if body is not None:
                         request_body = json.dumps(body)
+                        if isinstance(body, str):
+                            request_body = request_body.strip('"')
                     r = self.connection.request(
                         method, url,
                         data=request_body,

{conductor_python-1.1.5 → conductor_python-1.1.7}/src/conductor/client/workflow/conductor_workflow.py

@@ -36,6 +36,8 @@ class ConductorWorkflow:
         self._input_template = {}
         self._variables = {}
         self._restartable = True
+        self._workflow_status_listener_enabled = False
+        self._workflow_status_listener_sink = None
 
     @property
     def name(self) -> str:
@@ -101,6 +103,14 @@ class ConductorWorkflow:
         self._restartable = deepcopy(restartable)
         return self
 
+    def enable_status_listener(self, sink_name: bool) -> Self:
+        self._workflow_status_listener_sink = sink_name
+        self._workflow_status_listener_enabled = True
+
+    def disable_status_listener(self) -> Self:
+        self._workflow_status_listener_sink = None
+        self._workflow_status_listener_enabled = False
+
     # Workflow output follows similar structure as task input
     # See https://conductor.netflix.com/how-tos/Tasks/task-inputs.html for more details
     def output_parameters(self, output_parameters: Dict[str, Any]) -> Self:
@@ -192,6 +202,25 @@ class ConductorWorkflow:
         start_workflow_request.version = self.version
         return self._executor.start_workflow(start_workflow_request)
 
+    def start_workflow_with_input(self, workflow_input: dict = {}, correlation_id=None, task_to_domain=None,
+                 priority=None, idempotency_key: str = None, idempotency_strategy: IdempotencyStrategy = IdempotencyStrategy.FAIL) -> str:
+        """
+        Starts the workflow with given inputs and parameters and returns the id of the started workflow
+        """
+
+        start_workflow_request = StartWorkflowRequest()
+        start_workflow_request.workflow_def = self.to_workflow_def()
+        start_workflow_request.name = self.name
+        start_workflow_request.version = self.version
+        start_workflow_request.input = workflow_input
+        start_workflow_request.correlation_id = correlation_id
+        start_workflow_request.idempotency_key = idempotency_key
+        start_workflow_request.idempotency_strategy = idempotency_strategy
+        start_workflow_request.priority = priority
+        start_workflow_request.task_to_domain =task_to_domain
+
+        return self._executor.start_workflow(start_workflow_request)
+
     def execute(self, workflow_input: Any = {}, wait_until_task_ref: str = '', wait_for_seconds: int = 10,
                 request_id: str = None,
                 idempotency_key: str = None, idempotency_strategy : IdempotencyStrategy = IdempotencyStrategy.FAIL, task_to_domain: dict[str, str] = None) -> WorkflowRun:
@@ -238,6 +267,8 @@ class ConductorWorkflow:
             timeout_seconds=self._timeout_seconds,
             variables=self._variables,
             input_template=self._input_template,
+            workflow_status_listener_enabled=self._workflow_status_listener_enabled,
+            workflow_status_listener_sink=self._workflow_status_listener_sink
         )
 
     def to_workflow_task(self):

{conductor_python-1.1.5 → conductor_python-1.1.7}/src/conductor/client/workflow/task/join_task.py

@@ -9,12 +9,15 @@ from conductor.client.workflow.task.task_type import TaskType
 
 
 class JoinTask(TaskInterface):
-    def __init__(self, task_ref_name: str, join_on: List[str] = None) -> Self:
+    def __init__(self, task_ref_name: str, join_on: List[str] = None, join_on_script: str = None) -> Self:
         super().__init__(
             task_reference_name=task_ref_name,
             task_type=TaskType.JOIN
         )
         self._join_on = deepcopy(join_on)
+        if join_on_script is not None:
+            self.evaluator_type = 'js'
+            self.expression = join_on_script
 
     def to_workflow_task(self) -> WorkflowTask:
         workflow = super().to_workflow_task()

{conductor_python-1.1.5 → conductor_python-1.1.7}/src/conductor/client/workflow/task/task.py

@@ -34,6 +34,8 @@ class TaskInterface(ABC):
         self.input_parameters = input_parameters
         self._cache_key = cache_key
         self._cache_ttl_second = cache_ttl_second
+        self._expression = None
+        self._evaluator_type = None
 
     @property
     def task_reference_name(self) -> str:
@@ -65,6 +67,22 @@ class TaskInterface(ABC):
             raise Exception('invalid type')
         self._name = name
 
+    @property
+    def expression(self) -> str:
+        return self._expression
+
+    @expression.setter
+    def expression(self, expression: str) -> None:
+        self._expression = expression
+
+    @property
+    def evaluator_type(self) -> str:
+        return self._evaluator_type
+
+    @evaluator_type.setter
+    def evaluator_type(self, evaluator_type: str) -> None:
+        self._evaluator_type = evaluator_type
+
     def cache(self, cache_key: str, cache_ttl_second: int):
         self._cache_key = cache_key
         self._cache_ttl_second = cache_ttl_second
@@ -122,7 +140,9 @@ class TaskInterface(ABC):
             description=self._description,
             input_parameters=self._input_parameters,
             optional=self._optional,
-            cache_config=cache_config
+            cache_config=cache_config,
+            expression=self._expression,
+            evaluator_type=self._evaluator_type
         )
 
     def output(self, json_path: str = None) -> str:

{conductor_python-1.1.5 → conductor_python-1.1.7}/src/conductor_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conductor-python
-Version: 1.1.5
+Version: 1.1.7
 Summary: Netflix Conductor Python SDK
 Home-page: https://github.com/conductor-sdk/conductor-python
 Author: Orkes