simapy 4.6.1.dev0__tar.gz → 4.6.1.dev2__tar.gz

{simapy-4.6.1.dev0/src/simapy.egg-info → simapy-4.6.1.dev2}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.1
 Name: simapy
-Version: 4.6.1.dev0
+Version: 4.6.1.dev2
 Summary: Python utilities for SIMA
 Home-page: https://github.com/SINTEF/simapy
 Author: SINTEF Ocean
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -43,5 +41,3 @@ pip install simapy
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
-
-

{simapy-4.6.1.dev0 → simapy-4.6.1.dev2}/setup.py

@@ -18,7 +18,7 @@ with open('requirements.txt',encoding='utf8') as f:
 
 setup(
     name="simapy",
-    version="4.6.1.dev0",
+    version="4.6.1.dev2",
     author="SINTEF Ocean",
     description="Python utilities for SIMA",
     url="https://github.com/SINTEF/simapy",

{simapy-4.6.1.dev0 → simapy-4.6.1.dev2}/src/simapy/sre.py

@@ -1,55 +1,19 @@
 """Run a command using SIMA runtime engine (sre executable)"""
-import asyncio
+import subprocess
 import os
-import re
 from pathlib import Path
 from typing import Sequence,Callable
 from simapy.sima_writer import SIMAWriter
 
 
-async def run_command(args, error_file, out_file, status_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 status_handler and sline.startswith("@STATUS"):
-            __parse_status(sline,status_handler)
-        else:
-            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
-
-def __parse_status(line: str,status_handler):
-    # A status line looks like this: @STATUS "Total" 100 1000
-    # The first number is the current value, the second is the total
-    pattern = r'@STATUS "(?P<label>\w+)" (?P<current>\d+) (?P<total>\d+)'
-    # Match the pattern in the string
-    match = re.match(pattern, line)
-    if match:
-        label = match.group('label')
-        current = int(match.group('current'))
-        total = int(match.group('total'))
-        status_handler(label,current,total)
-
 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
-        self.status_handler: Callable = None
+        # 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
         else:
@@ -59,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.status_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.dev0 → simapy-4.6.1.dev2/src/simapy.egg-info}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.1
 Name: simapy
-Version: 4.6.1.dev0
+Version: 4.6.1.dev2
 Summary: Python utilities for SIMA
 Home-page: https://github.com/SINTEF/simapy
 Author: SINTEF Ocean
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -43,5 +41,3 @@ pip install simapy
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
-
-