simapy 4.6.1.dev1__py3-none-any.whl → 4.6.1.dev2__py3-none-any.whl

simapy/sre.py

@@ -1,43 +1,18 @@
 """Run a command using SIMA runtime engine (sre executable)"""
-import asyncio
+import subprocess
 import os
 from pathlib import Path
 from typing import Sequence,Callable
 from simapy.sima_writer import SIMAWriter
 
 
-async def run_command(args, error_file, out_file, console_handler):
-    """"Run a command asynchronously and print output to standard out. 
-    Standard err is piped to stderr.txt in the working directory"""
-    process = await asyncio.create_subprocess_exec(
-        *args, stdout=asyncio.subprocess.PIPE, stderr=error_file
-    )
-
-    while True:
-        # Use an awaitable to read data from stdout
-        # Read the next line of data from stdout asynchronously
-        data = await process.stdout.readline()
-        if not data:
-            break  # Break the loop when there's no more data
-        sline = data.decode('utf-8')
-        if console_handler:
-            console_handler(sline)
-        else:
-            # Print the line to standard out
-            print(sline, end="\n")
-        print(sline, end="\n", file=out_file)
-
-    # Wait for the subprocess to finish
-    await process.wait()
-    if process.returncode is not None:
-        return process.returncode
-
 class SIMA:
     """"Run a command using SIMA runtime engine (sre executable)"""
 
     def __init__(self, exe=None, fail_on_error=True):
         self.fail_on_error = fail_on_error
-        # A status handler is a function that can handle standard out from the process
+        # A Console handler is a function that can handle standard out from the process
+        # This can i.e. be used to parse @STATUS messages from the SIMA process wich can be used for progress indication
         self.console_handler: Callable = None
         if exe:
             self.exe = exe
@@ -48,26 +23,42 @@ class SIMA:
 
 
     def run(self, working_dir, command_args: Sequence[str]):
-        """Run the sima executable and print output to standard out. 
+        """Run the sima executable and print output to standard out.
            Standard err is piped to stderr.txt in the working directory"""
 
         wdir = Path(str(working_dir))
         arguments = [self.exe]
-        arguments.extend(["-configuration", "/var/opt/sima/config"])
         arguments.append("-consoleLog")
         arguments.append("--progress")
         arguments.extend(["-data", working_dir])
         wdir.mkdir(parents=True, exist_ok=True)
         self.__add_command_args(working_dir, arguments, command_args)
-        err_file = wdir / "stderr.txt"
         out_file = wdir / "stdout.txt"
-        with open(err_file, "w", encoding="utf8") as e_f, open(
-            out_file, "w", encoding="utf8"
-        ) as o_f:
-            exit_code = asyncio.run(run_command(arguments, e_f, o_f, self.console_handler))
+        with open(out_file, "w", encoding="utf8") as o_f:
+            proc = subprocess.Popen(arguments,
+                        stdin=subprocess.PIPE,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.STDOUT)
+            self.__read_lines(proc, o_f)
+            # Wait for the process to finish
+            exit_code = proc.wait()
             if exit_code != 0 and self.fail_on_error:
                 raise RuntimeError(f"SIMA exited with error code {exit_code}")
 
+    def __read_lines(self,proc,out_file):
+        console_handler = self.console_handler
+        while True:
+            line = proc.stdout.readline()
+            if not line:
+                break
+            sline = line.decode(encoding="utf8").rstrip()
+            if console_handler:
+                console_handler(sline)
+            else:
+                # Print the line to standard out
+                print(sline, end="\n")
+            print(sline, end="\n", file=out_file)
+
     def __add_command_args(self, working_dir: Path, args: Sequence, command_args: Sequence[str]):
         """Add command arguments to the list of arguments"""
         if len(command_args) > 0:

{simapy-4.6.1.dev1.dist-info → simapy-4.6.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simapy
-Version: 4.6.1.dev1
+Version: 4.6.1.dev2
 Summary: Python utilities for SIMA
 Home-page: https://github.com/SINTEF/simapy
 Author: SINTEF Ocean

{simapy-4.6.1.dev1.dist-info → simapy-4.6.1.dev2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 simapy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simapy/sima_reader.py,sha256=86P_CMaz1i6o8pIzXtNBHcJj0zS6Bw8_8BVO-Wvzs5c,1364
 simapy/sima_writer.py,sha256=MPwvooPLfGpOISxJUVlOWbtf4wVOEvgVCVsvQfLzxxY,1209
-simapy/sre.py,sha256=OpRNl66_dUnbXpE4UPSy4s3Q4IV8DtOng2VAQDY73l4,3601
+simapy/sre.py,sha256=Lm14wKFg1afnEhSqcry0RsD7oLGinU8P8d8jBc4pHhQ,3273
 simapy/metocean/__init__.py,sha256=AeEF1FYpBDe46JuZ0EYJOofOuf2dwsaAdQZ0DsseB_g,39
 simapy/metocean/metocean.py,sha256=TmfSYezAzxWLt9n_ChLKIdaIz6GxSTUu6-5wnipQz6Y,2912
 simapy/metocean/package_info.py,sha256=6FEJ4gZkXieP2WWTA-oZO23BjQOi4YnXx3nLQY0ydYE,208
@@ -2400,8 +2400,8 @@ simapy/sima/workflow/blueprints/workflowsetitem.py,sha256=EyyxbrnPDcL-f1cgjWcH3o
 simapy/sima/workflow/blueprints/workflowsetnode.py,sha256=UIZYi61xYtOEBzSZ5wQclUjzdAarZ8ymJ67iGARdXH4,4018
 simapy/sima/workflow/blueprints/workflowtask.py,sha256=c1rpN0KRKg7zIhonXKEaAGL0c6k8-ecIcP3RK3EUD8g,1514
 simapy/sima/workflow/blueprints/xytablenode.py,sha256=J-ADKlq47efkQMbay2eS0WJGtB9K0B75caOUTbj7Ogs,1667
-simapy-4.6.1.dev1.dist-info/LICENSE,sha256=F5QFv7maV1Hoof3UbIwTNKqDFoo2JykLoI_w6F4HqxI,1088
-simapy-4.6.1.dev1.dist-info/METADATA,sha256=Sn8FREYcao6qN2meKBHoeHmkELFaQxbbgr-GQuGjJcY,1350
-simapy-4.6.1.dev1.dist-info/WHEEL,sha256=00yskusixUoUt5ob_CiUp6LsnN5lqzTJpoqOFg_FVIc,92
-simapy-4.6.1.dev1.dist-info/top_level.txt,sha256=AVWKlvxcgSVR0H1omucqMujOVuQbcFNLjlgp3skT_1Q,7
-simapy-4.6.1.dev1.dist-info/RECORD,,
+simapy-4.6.1.dev2.dist-info/LICENSE,sha256=F5QFv7maV1Hoof3UbIwTNKqDFoo2JykLoI_w6F4HqxI,1088
+simapy-4.6.1.dev2.dist-info/METADATA,sha256=PRwk_Co4_-Yc8DUENfeqgRqkSnUL-8Jlmn0ARJnjS_c,1350
+simapy-4.6.1.dev2.dist-info/WHEEL,sha256=00yskusixUoUt5ob_CiUp6LsnN5lqzTJpoqOFg_FVIc,92
+simapy-4.6.1.dev2.dist-info/top_level.txt,sha256=AVWKlvxcgSVR0H1omucqMujOVuQbcFNLjlgp3skT_1Q,7
+simapy-4.6.1.dev2.dist-info/RECORD,,