simapy 4.6.0.dev1__py3-none-any.whl → 4.6.1.dev0__py3-none-any.whl

simapy/sima/package_info.py

@@ -1 +1 @@
-packages =  [{'name': 'command', 'version': 1}, {'name': 'condition', 'version': 19}, {'name': 'custom', 'version': 12}, {'name': 'doc', 'version': 11}, {'name': 'environment', 'version': 22}, {'name': 'graph', 'version': 4}, {'name': 'hla', 'version': 24}, {'name': 'hydro', 'version': 28}, {'name': 'metocean', 'version': 10}, {'name': 'optimization', 'version': 1}, {'name': 'post', 'version': 27}, {'name': 'report', 'version': 11}, {'name': 'riflex', 'version': 43}, {'name': 'signals', 'version': 2, 'packages': [{'name': 'report', 'version': 2}]}, {'name': 'sima', 'version': 24}, {'name': 'simo', 'version': 45}, {'name': 'wamit', 'version': 14}, {'name': 'windpark', 'version': 1}, {'name': 'windturbine', 'version': 10}, {'name': 'workflow', 'version': 19}]
+packages =  {'command': 1, 'condition': 19,'custom': 12,'doc': 11,'environment': 22,'graph': 4,'hla': 24,'hydro': 28,'metocean': 10,'optimization': 1,'post': 27,'report': 11,'riflex': 43,'signals': 2, 'sima': 24,'simo': 45,'wamit': 14,'windpark': 1,'windturbine': 10,'workflow': 19}

simapy/sima_reader.py

@@ -6,6 +6,7 @@ from typing import Sequence
 from dmt.entity import Entity
 from dmt.dmt_reader import DMTReader
 from .sima.modelcontent import ModelContent
+from .sima.package_info import packages
 
 class SIMAReader():
     """ Creates entities from Dicts or file """
@@ -17,4 +18,17 @@ class SIMAReader():
             modelcontent: ModelContent =  res[0]
         else:
             modelcontent: ModelContent =  res
+        self.__check_version(modelcontent)
         return modelcontent.contents
+
+    def __check_version(self, modelcontent: ModelContent):
+        """ Check if imported model has the same version as the reader """
+        header = modelcontent.header
+        if header:
+            pkgs = modelcontent.header.packages
+            for pkg in pkgs:
+                version = packages.get(pkg.name)
+                if not version:
+                    raise ValueError(f"Unknown package {pkg.name}")
+                if version != pkg.version:
+                    raise ValueError(f"Package {pkg.name} has version {pkg.version} but reader expects {version}. Please use the correct version of simapy for the corresponding version of SIMA.")

simapy/sima_writer.py

@@ -24,8 +24,8 @@ class SIMAWriter():
         content = ModelContent()
         header = Header()
 
-        for package in packages:
-            header.packages.append(PackageInfo(**package))
+        for name,version in packages.items():
+            header.packages.append(PackageInfo(name=name,version=version))
 
         content.header = header
         content.contents.extend(models)

simapy/sre.py

@@ -1,12 +1,13 @@
 """Run a command using SIMA runtime engine (sre executable)"""
 import asyncio
 import os
+import re
 from pathlib import Path
-from typing import Sequence
+from typing import Sequence,Callable
 from simapy.sima_writer import SIMAWriter
 
 
-async def run_command(args, error_file, out_file):
+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(
@@ -14,26 +15,41 @@ async def run_command(args, error_file, out_file):
     )
 
     while True:
-        stdout, _ = await process.communicate()
-
-        if stdout:
-            for line in stdout.splitlines():
-                sline = line.decode("utf-8")
-                if sline.startswith("@STATUS"):
-                    print("STATUS found:" + sline, end="\n")
-                else:
-                    print(sline, end="\n")
-                    print(sline, end="\n", file=out_file)
+        # 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)
 
-        if process.returncode is not None:
-            return process.returncode
+    # 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
         if exe:
             self.exe = exe
         else:
@@ -42,22 +58,24 @@ class SIMA:
                 raise ValueError("No executable given, and SRE_EXE environment variable is not set")
 
 
-    def run(self, working_dir: Path, command_args: Sequence):
+    def run(self, working_dir, command_args: Sequence[str]):
         """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])
-        working_dir.mkdir(parents=True, exist_ok=True)
+        wdir.mkdir(parents=True, exist_ok=True)
         self.__add_command_args(working_dir, arguments, command_args)
-        err_file = working_dir / "stderr.txt"
-        out_file = working_dir / "stdout.txt"
-        with open(err_file, "w", encoding="utf8") as ef, open(
+        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 of:
-            exit_code = asyncio.run(run_command(arguments, ef, of))
+        ) as o_f:
+            exit_code = asyncio.run(run_command(arguments, e_f, o_f, self.status_handler))
             if exit_code != 0 and self.fail_on_error:
                 raise RuntimeError(f"SIMA exited with error code {exit_code}")
 

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

@@ -1,37 +1,49 @@
-Metadata-Version: 2.1
-Name: simapy
-Version: 4.6.0.dev1
-Summary: Python utilities for SIMA
-Home-page: https://github.com/SINTEF/simapy
-Author: SINTEF Ocean
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: dmtpy (==0.3.4)
-Requires-Dist: numpy
-
-SIMAPY - Python utilities for SIMA
-=================================================================
-
-This Python library can be used to interact with [SIMA](https://sima.sintef.no)
-
-Parts of the library is generated from DMT models using a DMT Python code generator
-
-Please examine the tests for ways to interact
-
-Also check out the examples in [simapy-examples](https://github.com/SINTEF/simapy-examples)
-
-## Dependencies
-
-* [DMTPY](https://github.com/SINTEF/dmtpy)
-
-## Authors
-
-* **Lasse Bjermeland** - [lassebje](https://github.com/lassebje)
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+Metadata-Version: 2.1
+Name: simapy
+Version: 4.6.1.dev0
+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
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dmtpy (==0.3.4)
+Requires-Dist: numpy
+
+SIMAPY - Python utilities for SIMA
+=================================================================
+
+This Python library can be used to interact with [SIMA](https://sima.sintef.no)
+
+Parts of the library is generated from [data models](https://github.com/SINTEF/sima-dmt-models) using a [Python code generator](https://github.com/SINTEF/dmt-gen-py)
+
+Please examine the tests for ways to interact
+
+Also check out the examples in [simapy-examples](https://github.com/SINTEF/simapy-examples)
+
+## Installation
+
+Use the package manager [pip](https://pip.pypa.io/en/stable/) to install simapy.
+
+```bash
+pip install simapy
+```
+
+## Dependencies
+
+* [DMTPY](https://github.com/SINTEF/dmtpy)
+
+## Authors
+
+* **Lasse Bjermeland** - [lassebje](https://github.com/lassebje)
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+

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

@@ -1,7 +1,7 @@
 simapy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simapy/sima_reader.py,sha256=lU8mvZp1LMh5wvcZhlQRD3T0ltSjWnuPqO1J8YsoBnI,611
-simapy/sima_writer.py,sha256=bklm6V4m6qnF1h1uoglK4i6Paw9PVQt4t8kvpKe8XAc,1180
-simapy/sre.py,sha256=VWcaAqHvMHa8L_OcOfROT9tS6ncFwiBT-i5n7huVn0o,3240
+simapy/sima_reader.py,sha256=86P_CMaz1i6o8pIzXtNBHcJj0zS6Bw8_8BVO-Wvzs5c,1364
+simapy/sima_writer.py,sha256=MPwvooPLfGpOISxJUVlOWbtf4wVOEvgVCVsvQfLzxxY,1209
+simapy/sre.py,sha256=M2Lhwecrx030C7sDceOks1KM94i13Jry2FBIuE6nIJ0,4045
 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
@@ -70,7 +70,7 @@ simapy/metocean/scatter/blueprints/windcurrent.py,sha256=lNR5Y7y-gjWo1SpHyMIOg3Z
 simapy/sima/__init__.py,sha256=vSYgUegrUGeABTa0EaQ6arITEaz9Nhy0sNsC0TWCTW4,127
 simapy/sima/header.py,sha256=97CWJjRGUokQ-VDeaDYrUi06JKgyU0qZh037RHv01PI,1442
 simapy/sima/modelcontent.py,sha256=HRP2YuN05rJjPO0eLJVmRSTsS5sSODKd66ce66lC2_o,1697
-simapy/sima/package_info.py,sha256=6obukVUnRiFgVpOzmdlXk8ra_gcxHvi-GWNXCNLH4xo,767
+simapy/sima/package_info.py,sha256=b2lrouwC5nCYB5WON-aArm1lXSdLI39xWQ5mYpeUGng,284
 simapy/sima/packageinfo.py,sha256=f_8twmLCJ-7IBtzOit94I6ya4AyfRXNQSjto6TDGycE,1564
 simapy/sima/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simapy/sima/blueprints/header.py,sha256=Z4l7ACY3WvgqqIPYDhQB2KAn2mMw-KZOfBDZUfXKMnw,655
@@ -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.0.dev1.dist-info/LICENSE,sha256=F5QFv7maV1Hoof3UbIwTNKqDFoo2JykLoI_w6F4HqxI,1088
-simapy-4.6.0.dev1.dist-info/METADATA,sha256=R1LCuUTQSDr37M_rtxtWMkQAlkd1z848U7wPkdmTnAI,1129
-simapy-4.6.0.dev1.dist-info/WHEEL,sha256=00yskusixUoUt5ob_CiUp6LsnN5lqzTJpoqOFg_FVIc,92
-simapy-4.6.0.dev1.dist-info/top_level.txt,sha256=AVWKlvxcgSVR0H1omucqMujOVuQbcFNLjlgp3skT_1Q,7
-simapy-4.6.0.dev1.dist-info/RECORD,,
+simapy-4.6.1.dev0.dist-info/LICENSE,sha256=F5QFv7maV1Hoof3UbIwTNKqDFoo2JykLoI_w6F4HqxI,1088
+simapy-4.6.1.dev0.dist-info/METADATA,sha256=RXFQ7YP9_9z4tNzSr22AIovvcRcBkV1gE9gESWgWlvI,1342
+simapy-4.6.1.dev0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+simapy-4.6.1.dev0.dist-info/top_level.txt,sha256=AVWKlvxcgSVR0H1omucqMujOVuQbcFNLjlgp3skT_1Q,7
+simapy-4.6.1.dev0.dist-info/RECORD,,

{simapy-4.6.0.dev1.dist-info → simapy-4.6.1.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.1)
+Generator: bdist_wheel (0.37.1)
 Root-Is-Purelib: true
 Tag: py3-none-any