dyngle 1.0.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

dyngle/__init__.py

@@ -9,6 +9,7 @@ from dyngle.command import DyngleCommand
 from dyngle.error import DyngleError
 from dyngle.model.expression import expression
 from dyngle.model.operation import Operation
+from dyngle.model.template import Template
 
 
 class DyngleApp(WizApp):
@@ -53,19 +54,22 @@ class DyngleApp(WizApp):
             if isinstance(config, list):
                 operation = Operation({}, config)
             elif isinstance(config, dict):
-                local_expr_texts = config.get('expressions') or {}
-                local_expressions = _expressions_from_texts(local_expr_texts)
+                expr_texts = config.get('expressions') or {}
+                expressions = _expressions_from_texts(expr_texts)
+                values = config.get('values') or {}
                 steps = config.get('steps') or []
-                operation = Operation(local_expressions, steps)
+                operation = Operation(expressions | values, steps)
             else:
                 raise DyngleError(f"Invalid operation configuration for {key}")
             operations[key] = operation
         return operations
 
     @cached_property
-    def global_expressions(self):
+    def globals(self):
         expr_texts = self._get_configuration_details('expressions')
-        return _expressions_from_texts(expr_texts)
+        expressions = _expressions_from_texts(expr_texts)
+        values = self._get_configuration_details('values')
+        return expressions | (values if values else {})
 
 
 def _expressions_from_texts(expr_texts):

dyngle/command/run_command.py

@@ -42,6 +42,6 @@ class RunCommand(DyngleCommand):
         self._validate_operation_exists(operations)
         operation = operations[self.operation]
 
-        operation.run(data, self.app.global_expressions)
+        operation.run(data, self.app.globals)
 
         return f'Operation "{self.operation}" completed successfully'

dyngle/model/expression.py

@@ -54,6 +54,7 @@ GLOBALS = {
         "enumerate": enumerate,
         "zip": zip,
         "range": range,
+        "type": type
     },
 
     # Mathematical operations
@@ -107,11 +108,16 @@ def _evaluate(expression: str, locals: dict) -> str:
     """
     try:
         result = eval(expression, GLOBALS, locals)
-    except KeyError:
+    except KeyError as error:
         raise DyngleError(f"The following expression contains " +
-                          f"at least one invalid name: {expression}")
+                          f"invalid name '{error}:\n{expression}")
+
+    # Allow the use of a comma to separate sub-expressions, which can then use
+    # warus to set values, and only the last exxpression in the list returns a
+    # value.
     result = result[-1] if isinstance(result, tuple) else result
-    return str(result)
+
+    return result
 
 
 # The 'expression' function returns the expression object itself, which is
@@ -137,7 +143,7 @@ def expression(text: str) -> Callable[[dict], str]:
         # syntax too
 
         def resolve(key):
-            return live_data.resolve(key)
+            return live_data.resolve(key, str_only=False)
         locals = locals | {'resolve': resolve}
 
         # Perform the Python eval, expanded above

dyngle/model/live_data.py

@@ -1,11 +1,15 @@
 from collections import UserDict
+from datetime import date, timedelta
+from numbers import Number
+
+from yaml import safe_dump
 
 from dyngle.error import DyngleError
 
 
 class LiveData(UserDict):
 
-    def resolve(self, key: str):
+    def resolve(self, key: str, str_only: bool = True):
         """Given a key (which might be dot-separated), return
         the value (which might include evaluating expressions)."""
 
@@ -16,7 +20,18 @@ class LiveData(UserDict):
                 raise DyngleError(
                     f"Invalid expression or data reference '{key}'")
             current = current[part]
-        if callable(current):
-            return current(self)
-        else:
-            return current
+        result = current(self) if callable(current) else current
+        return _stringify(result) if str_only else result
+
+
+def _stringify(value) -> str:
+    if isinstance(value, bool):
+        return '.' if value is True else ''
+    elif isinstance(value, (Number, str, date, timedelta)):
+        return str(value)
+    elif isinstance(value, (list, dict, tuple)):
+        return safe_dump(value)
+    elif isinstance(value, set):
+        return safe_dump(list(value))
+    else:
+        raise DyngleError(f'Unable to serialize value of type {type(value)}')

dyngle/model/operation.py

@@ -12,14 +12,13 @@ from dyngle.model.template import Template
 @dataclass
 class Operation:
 
-    local_expressions: dict
+    # Expressions and values defined within the operation
+    locals: dict
 
     steps: list
 
-    def run(self, data: dict, global_expressions: dict):
-        expressions = global_expressions | self.local_expressions
-        # Data takes precedence if names match
-        live_data = LiveData(expressions) | data
+    def run(self, data: dict, globals: dict):
+        live_data = LiveData(globals) | self.locals | data
         for markup in self.steps:
             step = Step(markup)
             step.run(live_data)

{dyngle-1.0.1.dist-info → dyngle-1.2.0.dist-info}/METADATA

@@ -1,16 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: dyngle
-Version: 1.0.1
+Version: 1.2.0
 Summary: Run lightweight local workflows
 License: MIT
 Author: Steampunk Wizard
 Author-email: dyngle@steamwiz.io
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.13,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: wizlib (>=3.3.8,<3.4.0)
 Description-Content-Type: text/markdown

dyngle-1.2.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+dyngle/__init__.py,sha256=ZSBChSHOOTW68vZ-2q4ts8VhmEJ5hssG45jhbTTMvk0,2919
+dyngle/__main__.py,sha256=pYRIwzix_AL8CdJaDDis_8yMBBWO2N72NNwkroo1dQo,95
+dyngle/command/__init__.py,sha256=1S86gbef8MYvG-TWD5JRIWzFg7qV5xKhp9QXx9zEx5c,94
+dyngle/command/run_command.py,sha256=gYTQjATRMu_81HLP-hrMz7GNw9Lcz2VjuhP7h_qYLcE,1514
+dyngle/error.py,sha256=CGcTa8L4O1qsHEYnzp_JBbkvntJTv2Qz46wj_TI8NLk,39
+dyngle/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dyngle/model/expression.py,sha256=9nwfahjOHtScjdDzjwWIleo60lJjtXGrPGfroCbslvg,4431
+dyngle/model/live_data.py,sha256=yWiTgb9w9KaJ2yynGEudfu89Z3hOoHcLdUXfEJRtZG4,1197
+dyngle/model/operation.py,sha256=nSz-8Eh03xAvQlc6Wzn56t-dMArp9uJWY_8XJJZEIwc,1743
+dyngle/model/safe_path.py,sha256=Hk2AhP6e3yKGh3kKrLLwhvAlMNx-j2jObBYJL-_doAU,3339
+dyngle/model/template.py,sha256=MeXu--ZNtj_ujABU1GjjcQ1Ea_o_M-50LocuXFeOLRE,887
+dyngle-1.2.0.dist-info/METADATA,sha256=0jg6HNybNbzJZZRr6-hEUDDMhHJVDNVrLdBZ3m8P7kA,9710
+dyngle-1.2.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dyngle-1.2.0.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
+dyngle-1.2.0.dist-info/RECORD,,

{dyngle-1.0.1.dist-info → dyngle-1.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any

dyngle-1.0.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-dyngle/__init__.py,sha256=Mku-FaOXp1HMBoQc6K9ZJfhr9n-CXxvtotRFzSZ042I,2728
-dyngle/__main__.py,sha256=pYRIwzix_AL8CdJaDDis_8yMBBWO2N72NNwkroo1dQo,95
-dyngle/command/__init__.py,sha256=1S86gbef8MYvG-TWD5JRIWzFg7qV5xKhp9QXx9zEx5c,94
-dyngle/command/run_command.py,sha256=yq5VJv3XWtzTf9F_rW-_nANFPGGkIMQO3kiU5atEATo,1525
-dyngle/error.py,sha256=CGcTa8L4O1qsHEYnzp_JBbkvntJTv2Qz46wj_TI8NLk,39
-dyngle/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dyngle/model/expression.py,sha256=FqYOfotUzTHDyON9cUCwyO5Cw4jTphY_TuWjQyhvSFY,4220
-dyngle/model/live_data.py,sha256=6YdCfCDjhzMoCC5Znuwn_T-UpqeU_3I38M1mOBOLh2U,629
-dyngle/model/operation.py,sha256=87TOCGr_ECgWaLOAkJs4xwqChZvE3FQiGU4jf33x8LY,1810
-dyngle/model/safe_path.py,sha256=Hk2AhP6e3yKGh3kKrLLwhvAlMNx-j2jObBYJL-_doAU,3339
-dyngle/model/template.py,sha256=MeXu--ZNtj_ujABU1GjjcQ1Ea_o_M-50LocuXFeOLRE,887
-dyngle-1.0.1.dist-info/METADATA,sha256=jyuumkrmM3J37uXUvlVpssOGN1noeeSkcft8_IS4mwQ,9761
-dyngle-1.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dyngle-1.0.1.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
-dyngle-1.0.1.dist-info/RECORD,,