sysml2py 0.4.3__tar.gz → 0.5.2__tar.gz

{sysml2py-0.4.3 → sysml2py-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysml2py
-Version: 0.4.3
+Version: 0.5.2
 Summary: 
 Author: Christopher Cox
 Author-email: chris.cox@westfall.io

sysml2py-0.5.2/pyproject.toml

@@ -0,0 +1,111 @@
+[build-system]
+#requires = ["setuptools>=61.0"]
+#build-backend = "setuptools.build_meta"
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[project]
+name = "sysml2py"
+version = "0.5.2"
+authors = [
+  { name="Christopher Cox", email="chris.cox@westfall.io" },
+]
+description = "SysML v2.0 Parser"
+readme = "README.md"
+requires-python = ">=3.7"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["src/sysml2py", "src"]
+
+[tool.setuptools.package-data]
+grammar = ["*.tx"]
+
+[tool.pytest.ini_options]
+pythonpath = [
+  "src"
+]
+
+[tool.semantic_release]
+version_variable = [
+    "src/sysml2py/__init__.py:version",
+]
+version_toml=[
+    "pyproject.toml:tool.poetry.version",
+    "pyproject.toml:project.version",
+]
+commit_parser = "emoji"
+build_command = "pip install poetry && poetry build"
+commit_message = ":bookmark:{version}\n\nAutomatically generated by python-semantic-release"
+
+[tool.semantic_release.changelog]
+exclude_commit_patterns = [":robot:",":twisted_rightwards_arrows:",
+":poop:", "^[^:].*"]
+
+[tool.semantic_release.commit_parser_options]
+major_tags = [":boom:"]
+minor_tags = [
+    ":sparkles:",
+    ":children_crossing:",
+    ":lipstick:",
+    ":iphone:",
+    ":egg:",
+    ":chart_with_upwards_trend:",
+]
+patch_tags = [
+    ":ambulance:",
+    ":lock:",
+    ":bug:",
+    ":zap:",
+    ":goal_net:",
+    ":alien:",
+    ":wheelchair:",
+    ":speech_balloon:",
+    ":mag:",
+    ":apple:",
+    ":penguin:",
+    ":checkered_flag:",
+    ":robot:",
+    ":green_apple:",
+    ":memo:",
+    ":heavy_plus_sign:",
+    ":construction:",
+    ":white_check_mark:",
+]
+
+[tool.semantic_release.branches.main]
+match = "(main|master)"
+prerelease = false
+build_command = "pip install poetry && poetry build"
+
+[tool.semantic_release.branches."dev0.5.x"]
+match = "dev0.5.x"
+prerelease = true
+prerelease_token = "rc"
+build_command = "pip install poetry && poetry build"
+
+[project.urls]
+"Homepage" = "https://github.com/Westfall-io/sysml2py"
+"Bug Tracker" = "https://github.com/Westfall-io/sysml2py/issues"
+
+[tool.poetry]
+name = "sysml2py"
+version = "0.5.2"
+description = ""
+authors = ["Christopher Cox <chris.cox@westfall.io>"]
+readme = "README.md"
+packages = [{ include = "sysml2py", from = "src" }]
+
+[tool.poetry.dependencies]
+python = "^3.9"
+textx = "^3.1.1"
+astropy = "^5.3.1"
+pyyaml = "^6.0.1"

{sysml2py-0.4.3 → sysml2py-0.5.2}/src/sysml2py/__init__.py

@@ -6,14 +6,39 @@ Created on Mon May 29 23:26:16 2023
 @author: christophercox
 """
 
-__all__ = ["load", "loads"]
+__all__ = ["load", "loads", "load_grammar"]
 __author__ = "Christopher Cox"
+__version__ = "0.1.0"
 
 from sysml2py.usage import Item, Attribute, Part, Port
 from sysml2py.definition import Model, Package
 
 
-def load_grammar(fp, formatting="json"):
+def enforce_grammar():  # pragma: no cover
+    import re
+
+    comments_strip_rule = r"(?:(?:(?<!\\)(\/\/.*\n))|(?:\/\*(?:.|\n)*?\*\/))"
+    regex_rule = "\n[ ]*([\w]*)[ ]*:((?:(?:'[^']*')|(?:[^;']*))*;)"
+
+    g_list = []
+    rule_files = ["KerMLExpressions", "KerML", "SysML"]
+    for file in rule_files:
+        with open("grammar/" + file + ".tx", "r") as f:
+            g_list = (
+                re.findall(regex_rule, re.sub(comments_strip_rule, "", f.read()))
+                + g_list
+            )
+
+    # Make a new list and only add it if it's not already there
+    rules = []
+    [rules.append(x) for x in g_list if x[0] not in [x[0] for x in rules]]
+    grammar = "\n\n".join([":".join(x) for x in rules])
+    with open("grammar/SysML_compiled.tx", "w") as f:
+        f.write(grammar)
+    return grammar
+
+
+def load_grammar(fp, debug=False, enforce=False):
     """SysML load from file pointer
 
     Deserialize ``fp`` (a ``.read()``-supporting file-like object containing
@@ -73,36 +98,29 @@ def load_grammar(fp, formatting="json"):
             f"not {fp.__class__.__name__}"
         )
 
-    import importlib.resources as pkg_resources
+    from sysml2py.formatting import reformat
 
-    from textx import metamodel_from_file, TextXSyntaxError
+    if enforce:  # pragma: no cover
+        # This can only be run in development mode.
+        from textx import metamodel_from_str, TextXSyntaxError
 
-    import sysml2py
-    from sysml2py.formatting import reformat
+        grammar = enforce_grammar()
+        meta = metamodel_from_str(grammar)
+    else:
+        import importlib.resources as pkg_resources
+        import sysml2py
+        from textx import metamodel_from_file, TextXSyntaxError
 
-    if not isinstance(s, str):
-        raise TypeError(f"the SysML object must be str, " f"not {s.__class__.__name__}")
+        grammar = str((pkg_resources.files(sysml2py) / "grammar/SysML_compiled.tx"))
+        meta = metamodel_from_file(grammar)
 
     try:
-        grammar = str((pkg_resources.files(sysml2py) / "grammar/SysML.tx"))
-    except:
-        try:
-            grammar = "./src/sysml2py/grammar/SysML.tx"
-        except:
-            grammar = "./grammar/SysML.tx"
-    meta = metamodel_from_file(grammar)
-    try:
-        model = meta.model_from_str(s, debug=False)
+        model = meta.model_from_str(s, debug=debug)
     except TextXSyntaxError as e:
-        print(e)
-        import sys
+        print("TextX returned the following error: {}".format(e))
+        raise TextXSyntaxError("Invalid SysML")
 
-        sys.exit()
-
-    if formatting == "json":
-        return reformat(model)
-    else:
-        return model
+    return reformat(model)
 
 
 def load(fp):

{sysml2py-0.4.3 → sysml2py-0.5.2}/src/sysml2py/definition.py

@@ -36,23 +36,7 @@ class Model:
         from sysml2py import load_grammar
 
         # Try to load the grammar from the string
-        try:
-            definition = load_grammar(s)
-        except TextXSyntaxError:
-            import sys
-
-            print("Invalid SysML input, please correct the error.")
-            sys.exit()
-
-        # Ensure this is valid
-        if definition["name"] == "PackageBodyElement":
-            # This is a root element
-            definition = definition["ownedRelationship"]
-        else:
-            import sys
-
-            print("SysML does not match a base model.")
-            sys.exit()
+        definition = load_grammar(s)["ownedRelationship"]
 
         # Add each sub-element to children.
         member_grammar = []
@@ -233,6 +217,15 @@ class Package:
                             child.children[0].children.children.children
                         )
                     )
+                elif (
+                    child.children[0].children.children.children.__class__.__name__
+                    == "PartUsage"
+                ):
+                    self.children.append(
+                        Part().load_from_grammar(
+                            child.children[0].children.children.children
+                        )
+                    )
                 else:
                     print(child.children[0].children[0].__class__.__name__)
                     raise NotImplementedError
@@ -254,3 +247,8 @@ class Package:
 
         # self.children.append()
         return self
+
+    def _get_grammar(self):
+        # Force updates to grammar if something has changed.
+        self._ensure_body()
+        return self.grammar

{sysml2py-0.4.3 → sysml2py-0.5.2}/src/sysml2py/formatting.py

@@ -8,8 +8,6 @@ Created on Wed May 31 13:26:53 2023
 
 from sysml2py.grammar.classes import RootNamespace
 
-# from sysml2py import Part
-
 
 def remove_classes(model):
     """An example docstring for a class definition."""
@@ -39,39 +37,11 @@ def remove_classes(model):
 def reformat(model):
     """An example docstring for a class definition."""
     # Convert to dictionary format
-    try:
-        model_out = {"name": model.__class__.__name__}
-        model_out.update(remove_classes(model.__dict__))
-    except Exception as e:
-        print(e)
-        print("Error in printing")
+    model_out = {"name": model.__class__.__name__}
+    model_out.update(remove_classes(model.__dict__))
 
     return model_out
 
 
 def classtree(model):
     return RootNamespace(model)
-
-
-# def collapse(model):
-#     """Take a classtree and collapse it into our special classes that
-#     package all of the sub-grammar classes."""
-#     output = []
-#     if model.__class__.__name__ == "RootNamespace":
-#         for child in model.children[0].children:
-#             if child.__class__.__name__ == "UsageElement":
-#                 ue = child.children
-#                 if ue.__class__.__name__ == "OccurrenceUsageElement":
-#                     se = ue.children
-#                     if se.children.__class__.__name__ == "PartUsage":
-#                         output.append(Part().load_from_grammar(se.children))
-#                     else:
-#                         pass
-#                 else:
-#                     # OccurrenceUsageElement
-#                     pass
-#             else:
-#                 pass
-#     else:
-#         print("no")
-#     return output

{sysml2py-0.4.3 → sysml2py-0.5.2}/src/sysml2py/grammar/KerML.tx

@@ -709,7 +709,7 @@ FeatureConjugation :
 
 FeatureValue :
 	( '=' | isDefault ?= 'default' ( '=' | isInitial ?= ':=' )? )
-	ownedRelatedElement += OwnedExpression
+	ownedRelatedElement = OwnedExpression
 ;
 
 FeatureValueExpression :
@@ -936,8 +936,7 @@ Function :
 ;
 
 ReturnFeatureMember :
-	MemberPrefix 'return'
-	ownedRelatedElement += FeatureElement
+	MemberPrefix 'return' ownedRelatedElement += FeatureElement
 ;
 
 

{sysml2py-0.4.3 → sysml2py-0.5.2}/src/sysml2py/grammar/KerMLExpressions.tx

@@ -33,7 +33,7 @@
 /* Operator Expressions */
 
 OwnedExpressionMember :
-	ownedRelatedElement += OwnedExpression
+	ownedRelatedElement = OwnedExpression
 ;
 
 OwnedExpression :
@@ -47,7 +47,7 @@ OwnedExpressionReference :
 ;
 
 ConditionalExpression :
-	  operand += NullCoalescingExpression
+	  operand = NullCoalescingExpression
 	|  operator = ConditionalOperator operand += NullCoalescingExpression
 		  '?' operand += OwnedExpressionReference 'else' operand += OwnedExpressionReference
 ;
@@ -125,10 +125,15 @@ XorOperator :
 	'xor'
 ;
 
+AndOperand :
+  (operator = AndOperator operand = EqualityExpression)
+  |
+  (operator = ConditionalAndOperator operand = EqualityExpressionReference)
+;
+
 AndExpression :
-	equality=EqualityExpression (
-		( operator = AndOperator operand += EqualityExpression
-		| operator = ConditionalAndOperator operand += EqualityExpressionReference ) )*
+	equality=EqualityExpression
+  (operation+=AndOperand)*
 ;
 
 AndOperator :
@@ -142,17 +147,20 @@ ConditionalAndOperator :
 // Equality Expressions
 
 EqualityExpressionReference :
-	ownedRelationship += EqualityExpressionMember
+	ownedRelationship = EqualityExpressionMember
 ;
 
 EqualityExpressionMember :
-	ownedRelatedElement += EqualityExpression
+	ownedRelatedElement = EqualityExpression
 ;
 
-EqualityExpression :
-	classification=ClassificationExpression (
-		operator = EqualityOperator operand += ClassificationExpression )*
+EqualityOperand:
+  operator=EqualityOperator operand=ClassificationExpression
+;
 
+EqualityExpression :
+	classification=ClassificationExpression
+  (operation+=EqualityOperand)*
 ;
 
 EqualityOperator :
@@ -227,37 +235,45 @@ EmptyFeature ://This doesn't work.
 ;
 
 // Relational Expressions
+RelationalOperand:
+  operator=RelationalOperator operand=RangeExpression
+;
 
 RelationalExpression :
-	range=RangeExpression (
-		operator = RelationalOperator operand += RangeExpression )*
+	range=RangeExpression operation+=RelationalOperand*
 ;
 
 RelationalOperator :
-	'<' | '>' | '<=' | '>='
+	'<=' | '>=' | '<' | '>'
 ;
 
 // Range Expressions
 
 RangeExpression :
-	additive=AdditiveExpression (
-		operator = '..' operand += AdditiveExpression )?
+	additive=AdditiveExpression ('..' operand = AdditiveExpression )?
 ;
 
 // Arithmetic Expressions
 
+AdditiveOperand:
+  operator=AdditiveOperator operand=MultiplicativeExpression
+;
+
 AdditiveExpression :
-	multiplicitive=MultiplicativeExpression (
-		operator = AdditiveOperator operand += MultiplicativeExpression )*
+	multiplicitive=MultiplicativeExpression
+  (operation+=AdditiveOperand)*
 ;
 
 AdditiveOperator :
 	'+' | '-'
 ;
 
+MultiplicativeOperand:
+  operator=MultiplicativeOperator operand=ExponentiationExpression
+;
+
 MultiplicativeExpression :
-	exponential=ExponentiationExpression (
-		operator = MultiplicativeOperator operand += ExponentiationExpression )*
+	exponential=ExponentiationExpression operation+=MultiplicativeOperand*
 ;
 
 MultiplicativeOperator :
@@ -295,16 +311,16 @@ ExtentExpression :
 
 PrimaryExpression :
 	base=BaseExpression
-	(  '.' ownedRelationship += FeatureChainMember )?
+	(  '.' ownedRelationship1 += FeatureChainMember )?
 	(
     ( operator += '#' '(' operand += SequenceExpression ')'
       | operator += '[' operand += SequenceExpression ']'
-      | operator += '->' ownedRelationship += ReferenceTyping
+      | operator += '->' ownedRelationship = ReferenceTyping
         ( operand += BodyExpression | operand += FunctionReferenceExpression | operand+= ArgumentList )
       |  operator += '.' operand += BodyExpression
       |  operator += '.?' operand += BodyExpression
 	  )
-	  (  '.' ownedRelationship += FeatureChainMember )?
+	  (  '.' ownedRelationship2 += FeatureChainMember )?
 	)*
 ;
 
@@ -321,8 +337,8 @@ FunctionReference :
 ;
 
 FeatureChainMember :
-	  memberElement = QualifiedName
-	|  ownedRelatedElement += OwnedFeatureChain
+	  ownedRelatedElement = OwnedFeatureChain
+	|  memberElement = QualifiedName
 ;
 
 /* Base Expressions */
@@ -330,9 +346,9 @@ FeatureChainMember :
 BaseExpression :
 	  ownedRelationship=NullExpression
 	| ownedRelationship=LiteralExpression
-	| ownedRelationship=FeatureReferenceExpression
-	| ownedRelationship=MetadataAccessExpression
 	| ownedRelationship=InvocationExpression
+  | ownedRelationship=FeatureReferenceExpression
+	| ownedRelationship=MetadataAccessExpression
 	| ownedRelationship=BodyExpression
 	| '(' ownedRelationship=SequenceExpression ')'
 ;
@@ -340,11 +356,11 @@ BaseExpression :
 // Expression Bodies
 
 BodyExpression :
-	ownedRelationship += ExpressionBodyMember
+	ownedRelationship = ExpressionBodyMember
 ;
 
 ExpressionBodyMember :
-	ownedRelatedElement += ExpressionBody
+	ownedRelatedElement = ExpressionBody
 ;
 
 // This default production is overridden in the KerML and SysML grammars.
@@ -367,8 +383,14 @@ BodyParameter :
 
 // Sequence Expressions
 
+SequenceOperand:
+  (',' operand = OwnedExpression)
+  |
+  ','
+;
+
 SequenceExpression :
-	ownedRelationship=OwnedExpression ( ',' |  operator = ',' operand += SequenceExpression)?
+	ownedRelationship=OwnedExpression operation+=SequenceOperand*
 ;
 
 // Feature Reference Expressions
@@ -390,7 +412,7 @@ MetadataAccessExpression :
 // Invocation Expressions
 
 InvocationExpression :
-	ownedRelationship += OwnedFeatureTyping ArgumentList
+	ownedRelationship=OwnedFeatureTyping arg_list=ArgumentList
 ;
 
 OwnedFeatureTyping :
@@ -404,8 +426,7 @@ OwnedFeatureChain :
 
 // For use in KerML and SysML grammars
  FeatureChain :
-	ownedRelationship += OwnedFeatureChaining '.' ownedRelationship += OwnedFeatureChaining
-	( '.' ownedRelationship += OwnedFeatureChaining )*
+	ownedRelationship += OwnedFeatureChaining['.']
 ;
 
 OwnedFeatureChaining :
@@ -413,33 +434,31 @@ OwnedFeatureChaining :
 ;
 
  ArgumentList :
-	'(' ( PositionalArgumentList | NamedArgumentList )? ')'
+	'(' ( pos_list=PositionalArgumentList | named_list=NamedArgumentList )? ')'
 ;
 
  PositionalArgumentList :
-	ownedRelationship += ArgumentMember
-	( ',' ownedRelationship += ArgumentMember )*
+	ownedRelationship += ArgumentMember[',']
 ;
 
 ArgumentMember :
-	ownedRelatedElement += Argument
+	ownedRelatedElement = Argument
 ;
 
 Argument :
-	ownedRelationship += ArgumentValue
+	ownedRelationship = ArgumentValue
 ;
 
  NamedArgumentList :
-	ownedRelationship += NamedArgumentMember
-	( ',' ownedRelationship += NamedArgumentMember )*
+	ownedRelationship += NamedArgumentMember[',']
 ;
 
 NamedArgumentMember :
-	ownedRelatedElement += NamedArgument
+	ownedRelatedElement = NamedArgument
 ;
 
 NamedArgument :
-	ownedRelationship += ParameterRedefinition '=' ownedRelationship += ArgumentValue
+	redefinition = ParameterRedefinition '=' value = ArgumentValue
 ;
 
 ParameterRedefinition :
@@ -447,7 +466,7 @@ ParameterRedefinition :
 ;
 
 ArgumentValue :
-	ownedRelatedElement += OwnedExpression
+	ownedRelatedElement = OwnedExpression
 ;
 
 // Null Expressions
@@ -461,8 +480,8 @@ NullExpression :
 LiteralExpression :
 	  LiteralBoolean
 	| LiteralString
-	| LiteralInteger
 	| LiteralReal
+	| LiteralInteger
 	| LiteralInfinity
 ;
 
@@ -497,7 +516,9 @@ LiteralInfinity :
 /* NAMES */
 
 ReservedKeyword:
-  'about' | 'to' | 'connect' | 'connection'
+  'about' | /to[\s]/ | 'connect' | 'connection' | 'from' | /of[\s]/ | 'then' |
+  'entry' | /accept[\s]/ | /do[\s]/ | /exit[\s]/ | /action[\s]/ | /at[\s]/ |
+  /assign[\s]/
 ;
 
 Name:
@@ -509,13 +530,14 @@ Qualification :
 ;
 
 QualifiedName:
-	name1=Name ( '::' names+=Name )*
+	//name1=Name ( '::' names+=Name )*
+  names+=Name['::']
 ;
 
 /* TERMINALS */
 
 DECIMAL_VALUE :
-   /[0-9]*/;
+   /[0-9]+/;
 
 EXP_VALUE:
 	DECIMAL_VALUE ('e' | 'E') ('+' | '-')? DECIMAL_VALUE;