orchestrator-lso 2.4.1__tar.gz → 2.4.3__tar.gz

{orchestrator_lso-2.4.1 → orchestrator_lso-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-lso
-Version: 2.4.1
+Version: 2.4.3
 Summary: LSO, an API for remotely running Ansible playbooks.
 Author: GÉANT Orchestration and Automation Team
 Author-email: GÉANT Orchestration and Automation Team <goat@geant.org>
@@ -26,7 +26,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: ansible-runner==2.4.2
 Requires-Dist: ansible==10.7.0
-Requires-Dist: fastapi==0.120.4
+Requires-Dist: fastapi==0.121.1
 Requires-Dist: httpx==0.28.1
 Requires-Dist: uvicorn[standard]==0.38.0
 Requires-Dist: requests==2.32.5

{orchestrator_lso-2.4.1 → orchestrator_lso-2.4.3}/lso/__init__.py

@@ -13,7 +13,7 @@
 
 """LSO, an API for remotely running Ansible playbooks."""
 
-__version__ = "2.4.1"
+__version__ = "2.4.3"
 
 import logging
 

{orchestrator_lso-2.4.1 → orchestrator_lso-2.4.3}/lso/tasks.py

@@ -45,16 +45,21 @@ def playbook_event_handler_factory(
     This is used to send incremental progress updates to the external system that called for this playbook to be run.
 
     :param str progress: The progress URL where the external system expects to receive updates.
-    :param bool progress_is_incremental: Whether progress updates are sent incrementally, or only contain the latest
-                                         event data.
+    :param bool progress_is_incremental: Whether progress updates are sent incrementally, or contain the whole history
+                                         of event data.
     """
     events_stdout = []
 
     def _playbook_event_handler(event: dict) -> bool:
+        event_data = event["stdout"].strip()
+        if not event_data:
+            return False
+
+        event_data_lines = event_data.split("\r\n")
         if progress_is_incremental:
-            emit_body = event["stdout"].strip()
+            emit_body = event_data_lines
         else:
-            events_stdout.append(event["stdout"].strip())
+            events_stdout.extend(event_data_lines)
             emit_body = events_stdout
 
         requests.post(str(progress), json={"progress": emit_body}, timeout=settings.REQUEST_TIMEOUT_SEC)
@@ -76,10 +81,13 @@ def playbook_finished_handler_factory(callback: str | None, job_id: str) -> Call
     """
 
     def _playbook_finished_handler(runner: Runner) -> None:
+        playbook_output = runner.stdout.read().split("\n")
+        playbook_output = [line for line in playbook_output if line.strip()]
+
         payload = {
             "status": runner.status,
             "job_id": job_id,
-            "output": runner.stdout.readlines(),
+            "output": playbook_output,
             "return_code": int(runner.rc),
         }
 

{orchestrator_lso-2.4.1 → orchestrator_lso-2.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "orchestrator-lso"
-version = "2.4.1"
+version = "2.4.3"
 description = "LSO, an API for remotely running Ansible playbooks."
 readme = "README.md"
 license = "Apache-2.0"
@@ -32,7 +32,7 @@ classifiers = [
 dependencies = [
     "ansible-runner==2.4.2",
     "ansible==10.7.0",
-    "fastapi==0.120.4",
+    "fastapi==0.121.1",
     "httpx==0.28.1",
     "uvicorn[standard]==0.38.0",
     "requests==2.32.5",