robotransform 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

robotransform/__init__.py

@@ -1,7 +1,12 @@
-from robotransform.main import Store, MapleKStore
-from robotransform.convert import dump_aadl
+from robotransform.utils import Store, MapleKStore
+from robotransform.convert import generate_aadl, generate_messages_aadl, generate_logical_aadl
+from robotransform.utils import write_output
+
 __all__ = (
     "Store",
     "MapleKStore",
-    "dump_aadl",
+    "generate_aadl",
+    "generate_messages_aadl",
+    "generate_logical_aadl",
+    "write_output",
 )

robotransform/__main__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 import arklog
 
-from robotransform import Store, dump_aadl
+from robotransform import Store, generate_aadl
 
 
 def main():
@@ -20,7 +20,9 @@ def main():
     if args.path.exists():
         arklog.debug(f"Path exists: ({args.path}).")
         store = Store((args.path,))
-        arklog.info(dump_aadl(store))
+        messages, logical = generate_aadl(store)
+        arklog.info(messages)
+        arklog.info(logical)
     else:
         arklog.debug(f"Path does not exist: ({args.path.resolve()}).")
 

robotransform/convert.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import io
 import re
 from pathlib import Path
-from typing import Optional, Union
+from typing import Optional, Union, Tuple
 
 from robotransform.aadl import (
     AADLPackage,
@@ -20,7 +20,7 @@ from robotransform.aadl import (
     SystemImplementation,
 )
 from robotransform.filters import type_to_aadl_type
-from robotransform.main import get_template, write_output
+from robotransform.utils import get_template, Store
 from robotransform.concepts import Package, StateMachineDef, ControllerDef, RoboticPlatformDef, Variable, Event, Module
 
 _IDENTIFIER_RE = re.compile(r"[^0-9A-Za-z_]")
@@ -104,14 +104,13 @@ def _collect_defined_message_types(robo_packages: list[Package]) -> set[str]:
     return names
 
 
-def _render_messages(robo_packages: list[Package], aadl_packages: list[AADLPackage],
-                     output: Optional[Union[io.TextIOBase, Path, str]]) -> str:
+def _render_messages(robo_packages: list[Package], aadl_packages: list[AADLPackage]) -> str:
     used_types = _collect_message_types(aadl_packages)
     defined_types = _collect_defined_message_types(robo_packages)
     extra_types = sorted(used_types - defined_types)
     template = get_template("messages")
     data = template.render(packages=robo_packages, extra_types=extra_types)
-    return write_output(data, output)
+    return data
 
 
 def robocart_package_to_aadl_full(rc_pkg: "Package") -> AADLPackage:
@@ -440,25 +439,26 @@ def robocart_package_to_aadl_full(rc_pkg: "Package") -> AADLPackage:
     return aadl_pkg
 
 
-def dump_aadl(rc_input: Union["Package", "Store"], output: Optional[Union[io.TextIOBase, Path, str]] = None,
-              template_name: str = "aadl",
-              messages_output: Optional[Union[io.TextIOBase, Path, str]] = None) -> str:
-    # If a Store, render all packages inside it
+def _aadl_packages_from_input(rc_input: Union[Package, Store]) -> tuple[list[Package], list[AADLPackage]]:
     if hasattr(rc_input, "__iter__") and not isinstance(rc_input, Package):
         robo_packages = list(rc_input.load().values())
         packages = [robocart_package_to_aadl_full(pkg) for pkg in robo_packages]
     else:
         robo_packages = [rc_input]
         packages = [robocart_package_to_aadl_full(rc_input)]
+    return robo_packages, packages
 
-    template = get_template(template_name)
-    data = template.render(packages=packages)
-    write_output(data, output)
 
-    if messages_output is None and isinstance(output, (str, Path)):
-        messages_output = Path(output).parent / "messages.aadl"
+def generate_logical_aadl(rc_input: Union[Package, Store]) -> str:
+    robo_packages, packages = _aadl_packages_from_input(rc_input)
+    return get_template("logical").render(packages=packages)
 
-    if messages_output is not None:
-        _render_messages(robo_packages, packages, messages_output)
 
-    return data
+def generate_messages_aadl(rc_input: Union[Package, Store]) -> str:
+    robo_packages, packages = _aadl_packages_from_input(rc_input)
+    return _render_messages(robo_packages, packages)
+
+
+def generate_aadl(rc_input: Union[Package, Store]) -> Tuple[str, str]:
+    robo_packages, packages = _aadl_packages_from_input(rc_input)
+    return _render_messages(robo_packages, packages), get_template("logical").render(packages=packages)

robotransform/{main.py → utils.py}

@@ -114,7 +114,7 @@ def get_template(name: str) -> Template:
     environment.filters["type_to_aadl_type"] = type_to_aadl_type  # For use with pipes
     templates = {
         "messages": "messages.aadl.jinja",
-        "aadl": "aadl.jinja",
+        "logical": "logical.aadl.jinja",
     }
     if found := templates.get(name):
         return environment.get_template(found)
@@ -135,11 +135,3 @@ def write_output(data: str, output: Optional[Union[io.TextIOBase, Path, str]] =
     else:
         raise TypeError(f"Unsupported output type ({type(output)}).")
     return data
-
-
-def main():
-    pass
-
-
-if __name__ == "__main__":
-    main()

{robotransform-0.1.0.dist-info → robotransform-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotransform
-Version: 0.1.0
+Version: 0.1.1
 Summary: Perform model transformations for the RoboSapiens project.
 Keywords: transformation
 Author: Arkadiusz Michał Ryś

robotransform-0.1.1.dist-info/RECORD

@@ -0,0 +1,15 @@
+robotransform/__init__.py,sha256=LbzuUkjjxPEmbNUWotP0nGVG5ucIxj1HR7bSKV0NmAA,338
+robotransform/__main__.py,sha256=-4PUIeWy_o6h-KXU2IOXPbJY5lXMf55Qey1WLRBqzFg,691
+robotransform/aadl.py,sha256=tPlmiSltLSbC8kqU-FlxyDPdcdTjUT4rKHwEweFgBow,6664
+robotransform/concepts.py,sha256=MXPff6XwQyabWJcSC5armw3eI4xGDmnd6yZpmHdO6m8,9933
+robotransform/convert.py,sha256=wW0V2PZJFkNz6mTv5sGqScnR4NYC4cRu-0aL2Ec4KOY,18832
+robotransform/filters.py,sha256=uEG2xs-gvtxpmyItbXtjLeOXgCJlACbPgAL1Hi2n5iE,838
+robotransform/processors.py,sha256=8NaNFTAm3iaNAzbp5D8-Uv_qIWyxVklIbmGtXi5--nM,1578
+robotransform/robochart.tx,sha256=lM4ooS8jvb949q20X4t6jZzh1M3VCtlxUORlWS3GA4w,10229
+robotransform/templates/logical.aadl.jinja,sha256=7BHQvBPsJby5XSmiqEXd8mrQwEdSG3WPtwzcDu8WSlY,424
+robotransform/templates/messages.aadl.jinja,sha256=1EOMiBE-Lh5FWnfjSsVoICDU_-ZcgFEY1sMasXP5k00,530
+robotransform/utils.py,sha256=qNrjz5okBVe85XnGRg4rJds0RGhhsPOxWzuhnaLFoRw,4568
+robotransform-0.1.1.dist-info/WHEEL,sha256=jROcLULcdzropX2J55opKw4UHhPFREZax2XzS-Mvpxs,80
+robotransform-0.1.1.dist-info/entry_points.txt,sha256=NvmK-01oEE7ji06NbIxr7pZGUEJwbwMLjjfHssOVmB0,52
+robotransform-0.1.1.dist-info/METADATA,sha256=vO_T_WZWJXBtAnvYIyas7kcrbfgerkXSXZNKBphDawc,42259
+robotransform-0.1.1.dist-info/RECORD,,

{robotransform-0.1.0.dist-info → robotransform-0.1.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.26
+Generator: uv 0.10.0
 Root-Is-Purelib: true
 Tag: py3-none-any

robotransform-0.1.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-robotransform/__init__.py,sha256=xvdDZSVP3mLi7gN7a2Qdtyvh-ZQ1YwXlIaGFvcb1Ulg,157
-robotransform/__main__.py,sha256=PcaDvzku32_BZ3c9ODZMUJKveARGID3FGOq0XA60c7o,617
-robotransform/aadl.py,sha256=tPlmiSltLSbC8kqU-FlxyDPdcdTjUT4rKHwEweFgBow,6664
-robotransform/concepts.py,sha256=MXPff6XwQyabWJcSC5armw3eI4xGDmnd6yZpmHdO6m8,9933
-robotransform/convert.py,sha256=KStKLUDAXD15j4-jzqIG-rga8c5WGB3J4URjAGuJvt0,18819
-robotransform/filters.py,sha256=uEG2xs-gvtxpmyItbXtjLeOXgCJlACbPgAL1Hi2n5iE,838
-robotransform/main.py,sha256=xrbu1Dal027VPAYSzRjHFqh7OuFHQZ_tkL_xz7lYFro,4620
-robotransform/processors.py,sha256=8NaNFTAm3iaNAzbp5D8-Uv_qIWyxVklIbmGtXi5--nM,1578
-robotransform/robochart.tx,sha256=lM4ooS8jvb949q20X4t6jZzh1M3VCtlxUORlWS3GA4w,10229
-robotransform/templates/aadl.jinja,sha256=7BHQvBPsJby5XSmiqEXd8mrQwEdSG3WPtwzcDu8WSlY,424
-robotransform/templates/messages.aadl.jinja,sha256=1EOMiBE-Lh5FWnfjSsVoICDU_-ZcgFEY1sMasXP5k00,530
-robotransform-0.1.0.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
-robotransform-0.1.0.dist-info/entry_points.txt,sha256=NvmK-01oEE7ji06NbIxr7pZGUEJwbwMLjjfHssOVmB0,52
-robotransform-0.1.0.dist-info/METADATA,sha256=MwlUaGCSB2st_rvml5t5CzYM2oSmJ8U8LMNDYoYZ-h0,42259
-robotransform-0.1.0.dist-info/RECORD,,