opentf-toolkit-nightly 0.63.0.dev1406__py3-none-any.whl → 0.63.0.dev1410__py3-none-any.whl

opentf/toolkit/channels.py

@@ -17,7 +17,6 @@
 
 from typing import Any, Callable, Dict, List, NamedTuple, Optional, Set, Tuple, Union
 
-from collections import defaultdict
 from copy import deepcopy
 from datetime import datetime
 from shlex import quote
@@ -48,15 +47,6 @@ STOPCOMMANDS_COMMAND = re.compile(r'^::stop-commands::(\w+)$')
 ADDMASK_COMMAND = re.compile(r'^::add-mask::(.*)$')
 PUT_FILE_COMMAND = re.compile(r'^::put\s+file=(.*?)\s*::(.*?)\s*$')
 
-COMMAND_PATTERNS = (
-    ATTACH_COMMAND,
-    UPLOAD_COMMAND,
-    DOWNLOAD_COMMAND,
-    PUT_FILE_COMMAND,
-    SETOUTPUT_COMMAND,
-)
-
-
 ## step sequence IDs
 
 CHANNEL_REQUEST = -1
@@ -323,7 +313,10 @@ class JobState:
     def __init__(self) -> None:
         self.stop_command: Optional[str] = None
         self.masks: List[str] = []
-        self.workflow_commands: List[str] = []
+        self.output_commands: List[str] = []
+        self.attachments: List[str] = []
+        self.attachments_metadata: Dict[str, Any] = {}
+        self.artifacts_resp: bool = False
 
 
 def mask(line: str, state: JobState) -> str:
@@ -552,17 +545,16 @@ def process_output(
     outputs = {}
     logs: List[str] = []
     attachments: List[str] = []
-    attachments_metadata = {}
+    attachments_metadata: Dict[str, Any] = {}
 
     is_channel_notify = False
     step_sequence_id = metadata['step_sequence_id']
     if resp is None:
         resp, is_channel_notify = 0, True
-    if not is_channel_notify and jobstate.workflow_commands:
-        stdout.extend(jobstate.workflow_commands)
-        jobstate.workflow_commands.clear()
+    if not is_channel_notify and jobstate.output_commands:
+        stdout.extend(jobstate.output_commands)
+        jobstate.output_commands.clear()
 
-    has_artifacts = False
     for line in stdout:
         # Parsing stdout for workflow commands
         if jobstate.stop_command:
@@ -570,14 +562,14 @@ def process_output(
                 jobstate.stop_command = None
             continue
 
-        if is_channel_notify and any(p.match(line) for p in COMMAND_PATTERNS):
-            jobstate.workflow_commands.append(line)
+        if is_channel_notify and SETOUTPUT_COMMAND.match(line):
+            jobstate.output_commands.append(line)
             continue
 
         if wcmd := ATTACH_COMMAND.match(line):
             resp = _attach(wcmd.group(2), wcmd.group(1))
         elif wcmd := UPLOAD_COMMAND.match(line):
-            has_artifacts = True
+            jobstate.artifacts_resp = True
             resp = _attach(wcmd.group(2), wcmd.group(1), is_artifact=True)
         elif wcmd := DOWNLOAD_COMMAND.match(line):
             resp = _download(wcmd.group(2), wcmd.group(1))
@@ -602,6 +594,9 @@ def process_output(
         notify['logs'] = logs
         if notify['metadata'].get('artifacts'):
             del notify['metadata']['artifacts']
+        if attachments:
+            jobstate.attachments.extend(attachments)
+            jobstate.attachments_metadata.update(attachments_metadata)
         return notify
 
     if metadata.get('artifacts'):
@@ -621,11 +616,17 @@ def process_output(
         result['outputs'] = outputs
     if logs:
         result['logs'] = logs
-    if attachments:
-        result['attachments'] = attachments
-        result['metadata']['attachments'] = attachments_metadata
-    if has_artifacts:
+    if attachments or jobstate.attachments:
+        result['attachments'] = jobstate.attachments + attachments
+        result['metadata']['attachments'] = {
+            **jobstate.attachments_metadata,
+            **attachments_metadata,
+        }
+        jobstate.attachments.clear()
+        jobstate.attachments_metadata = {}
+    if jobstate.artifacts_resp:
         result['metadata']['upload'] = resp
+        jobstate.artifacts_resp = False
     if opentf_variables:
         result['variables'] = opentf_variables
     return result

{opentf_toolkit_nightly-0.63.0.dev1406.dist-info → opentf_toolkit_nightly-0.63.0.dev1410.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentf-toolkit-nightly
-Version: 0.63.0.dev1406
+Version: 0.63.0.dev1410
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix

{opentf_toolkit_nightly-0.63.0.dev1406.dist-info → opentf_toolkit_nightly-0.63.0.dev1410.dist-info}/RECORD

@@ -58,11 +58,11 @@ opentf/schemas/opentestfactory.org/v1beta2/ServiceConfig.json,sha256=rEvK2YWL5lG
 opentf/scripts/launch_java_service.sh,sha256=S0jAaCuv2sZy0Gf2NGBuPX-eD531rcM-b0fNyhmzSjw,2423
 opentf/scripts/startup.py,sha256=DLanDaXutUTYcG2PwoJ34QH-5G0TwfLUY_xy1VkVOqA,23202
 opentf/toolkit/__init__.py,sha256=YnH66dmePAIU7dq_xWFYTIEUrsL9qV9f82LRDiBzbzs,22057
-opentf/toolkit/channels.py,sha256=8WuybkK7HZpTvCqstnik6cz-OGd7p4AMBAfBJX3E3zA,27389
+opentf/toolkit/channels.py,sha256=BQh5ztQmIKpxns6ozDNto4YpegktydPZyhOO9F3g-2Q,27731
 opentf/toolkit/core.py,sha256=jMBDIYZ8Qn3BvsysfKoG0iTtjOnZsggetpH3eXygCsI,9636
 opentf/toolkit/models.py,sha256=PNfXVQbeyOwDfaNrLjcfhYm6duMSlNWBtZsWZcs53ag,6583
-opentf_toolkit_nightly-0.63.0.dev1406.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.63.0.dev1406.dist-info/METADATA,sha256=EXkrO2T8qRPNdSP83yiGluJDu-aq7zwXDY4mDbsrbUg,2215
-opentf_toolkit_nightly-0.63.0.dev1406.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-opentf_toolkit_nightly-0.63.0.dev1406.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.63.0.dev1406.dist-info/RECORD,,
+opentf_toolkit_nightly-0.63.0.dev1410.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.63.0.dev1410.dist-info/METADATA,sha256=JGYwdjQVyIzFakde1XO0lPfaQgH5qfY6RsHHSM6Bmfo,2215
+opentf_toolkit_nightly-0.63.0.dev1410.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+opentf_toolkit_nightly-0.63.0.dev1410.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.63.0.dev1410.dist-info/RECORD,,

{opentf_toolkit_nightly-0.63.0.dev1406.dist-info → opentf_toolkit_nightly-0.63.0.dev1410.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any