dyngle 0.6.0__tar.gz → 1.0.0__tar.gz

dyngle-1.0.0/PACKAGE.md

@@ -0,0 +1,261 @@
+# Dyngle
+
+An experimantal, lightweight, easily configurable workflow engine for
+automating development, operations, data processing, and content management
+tasks.
+
+Technical foundations
+
+- Configuration, task definition, and flow control in YAML
+- Operations as system commands using a familiar shell-like syntax
+- Expressions and logic in pure Python
+
+## Quick installation (MacOS)
+
+```bash
+brew install python@3.11
+python3.11 -m pip install pipx
+pipx install dyngle
+```
+
+## Getting started
+
+Create a file `.dyngle.yml`:
+
+```yaml
+dyngle:
+  operations:
+    hello:
+      - echo "Hello world"
+```
+
+Run an operation:
+
+```bash
+dyngle run hello
+```
+
+## Configuration
+
+Dyngle reads configuration from YAML files. Specify the config file location using any of the following (in order of precedence):
+
+1. A `--config` command line option, OR
+2. A `DYNGLE_CONFIG` environment variable, OR
+3. `.dyngle.yml` in current directory, OR
+4. `~/.dyngle.yml` in home directory
+
+## Operations
+
+Operations are defined under `dyngle:` in the configuration. In its simplest form, an Operation is a YAML array defining the Steps, as system commands with space-separated arguments. In that sense, a Dyngle operation looks something akin to a phony Make target, a short Bash script, or a CI/CD job.
+
+As a serious example, consider the `init` operation from the Dyngle configuration delivered with the project's source code.
+
+```yaml
+dyngle:
+  operations:
+    init:
+      - rm -rf .venv
+      - python3.11 -m venv .venv
+      - .venv/bin/pip install --upgrade pip poetry
+```
+
+The elements of the YAML array _look_ like lines of Bash, but Dyngle processes them directly as system commands, allowing for template substitution and Python expression evaluation (described below). So shell-specific syntax such as `|`, `>`, and `$VARIABLE` won't work.
+
+## Data and Templates
+
+Dyngle maintains a block of "Live Data" throughout an operation, which is a set of named values (Python `dict`, YAML "mapping"). The values are usually strings but can also be other data types that are valid in both YAML and Python.
+
+The `dyngle run` command feeds the contents of stdin to the Operation as Data, by converting a YAML mapping to named Python values. The values may be substituted into commands or arguments in Steps using double-curly-bracket syntax (`{{` and `}}`) similar to Jinja2.
+
+For example, consider the following configuration:
+
+``` yaml
+dyngle:
+  operations:
+    hello:
+      - echo "Hello {{name}}!"
+```
+
+Cram some YAML into stdin to try it in your shell:
+
+```bash
+echo "name: Francis" | dyngle run hello
+```
+
+The output will say:
+
+```text
+Hello Francis!
+```
+
+## Expressions
+
+Operations may contain Expressions, written in Python, that can be referenced in Operation Step Templates using the same syntax as for Data. In the case of a naming conflict, an Expression takes precedence over Data with the same name. Expressions can reference names in the Data directly.
+
+Expressions may be defined in either of two ways in the configuration:
+
+1. Global Expressions, under the `dyngle:` mapping, using the `expressions:` key.
+2. Local Expressions, within a single Operation, in which case the Steps of the operation require a `steps:` key.
+
+Here's an example of a global Expression
+
+```yaml
+dyngle:
+  expressions:
+    count: len(name)    
+  operations:
+    say-hello:
+      - echo "Hello {{name}}! Your name has {{count}} characters."
+```
+
+For completeness, consider the following example using a local Expression for the same purpose.
+
+```yaml
+dyngle:
+  operations:
+    say-hello:
+      expressions:
+        count: len(name)
+      steps:
+        - echo "Hello {{name}}! Your name has {{count}} characters."
+```
+
+Expressions can use a controlled subset of the Python standard library, including:
+
+- Built-in data types such as `str()`
+- Essential built-in functions such as `len()`
+- The core modules from the `datetime` package (but some methods such as `strftime()` will fail)
+- A specialized function called `formatted()` to perform string formatting operations on a `datetime` object
+- A restricted version of `Path()` that only operates within the current working directory
+- Various other useful utilities, mostly read-only, such as the `math` module
+- A special function called `resolve` which resolves data expressions using the same logic as in templates
+- An array `args` containing arguments passed to the `dyngle run` command after the Operation name
+
+**NOTE** Some capabilities of the Expression namespace might be limited in the future. The goal is support purely read-only operations within Expressions.
+
+Expressions behave like functions that take no arguments, using the Data as a namespace. So Expressions reference Data directly as local names in Python.
+
+YAML keys can contain hyphens, which are fully supported in Dyngle. To reference a hyphenated key in an Expression, choose:
+
+- Reference the name using underscores instead of hyphens (they are automatically replaced), OR
+- Use the built-in special-purpose `resolve()` function (which can also be used to reference other expressions)
+
+```yaml
+dyngle:
+  expressions:
+    say-hello: >-
+        'Hello ' + full_name + '!'
+```
+
+... or using the `resolve()` function, which also allows expressions to essentially call other expressions, using the same underlying data set.
+
+```yaml
+dyngle:
+  expressions:
+    hello: >-
+        'Hello ' + resolve('formal-name') + '!'
+    formal-name: >-
+        'Ms. ' + full_name
+```
+
+Note it's also _possible_ to call other expressions by name as functions, if they only return hard-coded values (i.e. constants).
+
+```yaml
+dyngle:
+  expressions:
+    author-name: Francis Potter
+    author-hello: >-
+        'Hello ' + author_name()
+``` 
+
+Here are some slightly more sophisticated exercises using Expression reference syntax:
+
+```yaml
+dyngle:
+  operations:
+    reference-hyphenated-data-key:
+      expressions:
+        spaced-name: "' '.join([x for x in first_name])"
+        count-name: len(resolve('first-name'))
+        x-name: "'X' * int(resolve('count-name'))"
+      steps:
+        - echo "Your name is {{first-name}} with {{count-name}} characters, but I will call you '{{spaced-name}}' or maybe '{{x-name}}'"
+    reference-expression-using-function-syntax:
+      expressions:
+        name: "'George'"
+        works: "name()"
+        double: "name * 2"
+        fails: double()
+      steps:
+        - echo "It works to call you {{works}}"
+        # - echo "I have trouble calling you {{fails}}"
+```
+
+Finally, here's an example using args:
+
+```yaml
+dyngle:
+  operations:
+    name-from-arg:
+      expressions:
+        name: "args[0]"
+      steps:
+        - echo "Hello {{name}}"
+```
+
+## Passing values between Steps in an Operation
+
+The Steps parser supports two special operators designed to move data between Steps in an explicit way.
+
+- The data assignment operator (`=>`) assigns the contents of stdout from the command to an element in the data
+- The data input operator (`->`) assigns the value of an element in the data (or an evaluated expression) to stdin for the command
+
+The operators must appear in order in the step and must be isolated with whitespace, i.e.
+
+```
+<input-variable-name> -> <command and arguments> => <output-variable-name>
+```
+
+Here we get into more useful functionality, where commands can be strung together in meaningful ways without the need for Bash.
+
+```yaml
+dyngle:
+  operations:
+    weather:
+      - curl -s "https://api.open-meteo.com/v1/forecast?latitude=52.52&longitude=13.41&current_weather=true" => weather-data
+      - weather-data -> jq -j '.current_weather.temperature' => temperature
+      - echo "It's {{temperature}} degrees out there!"
+```
+
+If names overlap, data items populated using the data assignment operator take precedence over expressions and data in the original input from the beginning of the Operation.
+
+## Lifecycle
+
+The lifecycle of an operation is:
+
+1. Load Data if it exists from YAML on stdin (if no tty)
+2. Find the named Operation in the configuration
+2. Perform template rendering on the first Step, using Data and Expressions
+3. Execute the Step in a subprocess, passing in an input value and populating an output value in the Data
+4. Continue with the next Step
+
+Note that operations in the config are _not_ full shell lines. They are passed directly to the system.
+
+## Imports
+
+Configuration files can import other configuration files, by providing an entry `imports:` with an array of filepaths. The most obvious example is a Dyngle config in a local directory which imports the user-level configuration.
+
+```yaml
+dyngle:
+  imports:
+    - ~/.dyngle.yml
+  expressions:
+  operations:
+```
+
+In the event of item name conflicts, expressions and operations are loaded from imports in the order specified, so imports lower in the array will override those higher up. The expressions and operations defined in the main file override the imports. Imports are not recursive.
+
+## Security
+
+Commands are executed using Python's `subprocess.run()` with arguments split in a shell-like fashion. The shell is not used, which reduces the likelihood of shell injection attacks. However, note that Dyngle is not robust to malicious configuration. Use with caution.
+

dyngle-1.0.0/PKG-INFO

@@ -0,0 +1,277 @@
+Metadata-Version: 2.3
+Name: dyngle
+Version: 1.0.0
+Summary: Run lightweight local workflows
+License: MIT
+Author: Steampunk Wizard
+Author-email: dyngle@steamwiz.io
+Requires-Python: >=3.11,<3.12
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: wizlib (>=3.1.4,<4.0.0)
+Description-Content-Type: text/markdown
+
+# Dyngle
+
+An experimantal, lightweight, easily configurable workflow engine for
+automating development, operations, data processing, and content management
+tasks.
+
+Technical foundations
+
+- Configuration, task definition, and flow control in YAML
+- Operations as system commands using a familiar shell-like syntax
+- Expressions and logic in pure Python
+
+## Quick installation (MacOS)
+
+```bash
+brew install python@3.11
+python3.11 -m pip install pipx
+pipx install dyngle
+```
+
+## Getting started
+
+Create a file `.dyngle.yml`:
+
+```yaml
+dyngle:
+  operations:
+    hello:
+      - echo "Hello world"
+```
+
+Run an operation:
+
+```bash
+dyngle run hello
+```
+
+## Configuration
+
+Dyngle reads configuration from YAML files. Specify the config file location using any of the following (in order of precedence):
+
+1. A `--config` command line option, OR
+2. A `DYNGLE_CONFIG` environment variable, OR
+3. `.dyngle.yml` in current directory, OR
+4. `~/.dyngle.yml` in home directory
+
+## Operations
+
+Operations are defined under `dyngle:` in the configuration. In its simplest form, an Operation is a YAML array defining the Steps, as system commands with space-separated arguments. In that sense, a Dyngle operation looks something akin to a phony Make target, a short Bash script, or a CI/CD job.
+
+As a serious example, consider the `init` operation from the Dyngle configuration delivered with the project's source code.
+
+```yaml
+dyngle:
+  operations:
+    init:
+      - rm -rf .venv
+      - python3.11 -m venv .venv
+      - .venv/bin/pip install --upgrade pip poetry
+```
+
+The elements of the YAML array _look_ like lines of Bash, but Dyngle processes them directly as system commands, allowing for template substitution and Python expression evaluation (described below). So shell-specific syntax such as `|`, `>`, and `$VARIABLE` won't work.
+
+## Data and Templates
+
+Dyngle maintains a block of "Live Data" throughout an operation, which is a set of named values (Python `dict`, YAML "mapping"). The values are usually strings but can also be other data types that are valid in both YAML and Python.
+
+The `dyngle run` command feeds the contents of stdin to the Operation as Data, by converting a YAML mapping to named Python values. The values may be substituted into commands or arguments in Steps using double-curly-bracket syntax (`{{` and `}}`) similar to Jinja2.
+
+For example, consider the following configuration:
+
+``` yaml
+dyngle:
+  operations:
+    hello:
+      - echo "Hello {{name}}!"
+```
+
+Cram some YAML into stdin to try it in your shell:
+
+```bash
+echo "name: Francis" | dyngle run hello
+```
+
+The output will say:
+
+```text
+Hello Francis!
+```
+
+## Expressions
+
+Operations may contain Expressions, written in Python, that can be referenced in Operation Step Templates using the same syntax as for Data. In the case of a naming conflict, an Expression takes precedence over Data with the same name. Expressions can reference names in the Data directly.
+
+Expressions may be defined in either of two ways in the configuration:
+
+1. Global Expressions, under the `dyngle:` mapping, using the `expressions:` key.
+2. Local Expressions, within a single Operation, in which case the Steps of the operation require a `steps:` key.
+
+Here's an example of a global Expression
+
+```yaml
+dyngle:
+  expressions:
+    count: len(name)    
+  operations:
+    say-hello:
+      - echo "Hello {{name}}! Your name has {{count}} characters."
+```
+
+For completeness, consider the following example using a local Expression for the same purpose.
+
+```yaml
+dyngle:
+  operations:
+    say-hello:
+      expressions:
+        count: len(name)
+      steps:
+        - echo "Hello {{name}}! Your name has {{count}} characters."
+```
+
+Expressions can use a controlled subset of the Python standard library, including:
+
+- Built-in data types such as `str()`
+- Essential built-in functions such as `len()`
+- The core modules from the `datetime` package (but some methods such as `strftime()` will fail)
+- A specialized function called `formatted()` to perform string formatting operations on a `datetime` object
+- A restricted version of `Path()` that only operates within the current working directory
+- Various other useful utilities, mostly read-only, such as the `math` module
+- A special function called `resolve` which resolves data expressions using the same logic as in templates
+- An array `args` containing arguments passed to the `dyngle run` command after the Operation name
+
+**NOTE** Some capabilities of the Expression namespace might be limited in the future. The goal is support purely read-only operations within Expressions.
+
+Expressions behave like functions that take no arguments, using the Data as a namespace. So Expressions reference Data directly as local names in Python.
+
+YAML keys can contain hyphens, which are fully supported in Dyngle. To reference a hyphenated key in an Expression, choose:
+
+- Reference the name using underscores instead of hyphens (they are automatically replaced), OR
+- Use the built-in special-purpose `resolve()` function (which can also be used to reference other expressions)
+
+```yaml
+dyngle:
+  expressions:
+    say-hello: >-
+        'Hello ' + full_name + '!'
+```
+
+... or using the `resolve()` function, which also allows expressions to essentially call other expressions, using the same underlying data set.
+
+```yaml
+dyngle:
+  expressions:
+    hello: >-
+        'Hello ' + resolve('formal-name') + '!'
+    formal-name: >-
+        'Ms. ' + full_name
+```
+
+Note it's also _possible_ to call other expressions by name as functions, if they only return hard-coded values (i.e. constants).
+
+```yaml
+dyngle:
+  expressions:
+    author-name: Francis Potter
+    author-hello: >-
+        'Hello ' + author_name()
+``` 
+
+Here are some slightly more sophisticated exercises using Expression reference syntax:
+
+```yaml
+dyngle:
+  operations:
+    reference-hyphenated-data-key:
+      expressions:
+        spaced-name: "' '.join([x for x in first_name])"
+        count-name: len(resolve('first-name'))
+        x-name: "'X' * int(resolve('count-name'))"
+      steps:
+        - echo "Your name is {{first-name}} with {{count-name}} characters, but I will call you '{{spaced-name}}' or maybe '{{x-name}}'"
+    reference-expression-using-function-syntax:
+      expressions:
+        name: "'George'"
+        works: "name()"
+        double: "name * 2"
+        fails: double()
+      steps:
+        - echo "It works to call you {{works}}"
+        # - echo "I have trouble calling you {{fails}}"
+```
+
+Finally, here's an example using args:
+
+```yaml
+dyngle:
+  operations:
+    name-from-arg:
+      expressions:
+        name: "args[0]"
+      steps:
+        - echo "Hello {{name}}"
+```
+
+## Passing values between Steps in an Operation
+
+The Steps parser supports two special operators designed to move data between Steps in an explicit way.
+
+- The data assignment operator (`=>`) assigns the contents of stdout from the command to an element in the data
+- The data input operator (`->`) assigns the value of an element in the data (or an evaluated expression) to stdin for the command
+
+The operators must appear in order in the step and must be isolated with whitespace, i.e.
+
+```
+<input-variable-name> -> <command and arguments> => <output-variable-name>
+```
+
+Here we get into more useful functionality, where commands can be strung together in meaningful ways without the need for Bash.
+
+```yaml
+dyngle:
+  operations:
+    weather:
+      - curl -s "https://api.open-meteo.com/v1/forecast?latitude=52.52&longitude=13.41&current_weather=true" => weather-data
+      - weather-data -> jq -j '.current_weather.temperature' => temperature
+      - echo "It's {{temperature}} degrees out there!"
+```
+
+If names overlap, data items populated using the data assignment operator take precedence over expressions and data in the original input from the beginning of the Operation.
+
+## Lifecycle
+
+The lifecycle of an operation is:
+
+1. Load Data if it exists from YAML on stdin (if no tty)
+2. Find the named Operation in the configuration
+2. Perform template rendering on the first Step, using Data and Expressions
+3. Execute the Step in a subprocess, passing in an input value and populating an output value in the Data
+4. Continue with the next Step
+
+Note that operations in the config are _not_ full shell lines. They are passed directly to the system.
+
+## Imports
+
+Configuration files can import other configuration files, by providing an entry `imports:` with an array of filepaths. The most obvious example is a Dyngle config in a local directory which imports the user-level configuration.
+
+```yaml
+dyngle:
+  imports:
+    - ~/.dyngle.yml
+  expressions:
+  operations:
+```
+
+In the event of item name conflicts, expressions and operations are loaded from imports in the order specified, so imports lower in the array will override those higher up. The expressions and operations defined in the main file override the imports. Imports are not recursive.
+
+## Security
+
+Commands are executed using Python's `subprocess.run()` with arguments split in a shell-like fashion. The shell is not used, which reduces the likelihood of shell injection attacks. However, note that Dyngle is not robust to malicious configuration. Use with caution.
+
+

{dyngle-0.6.0 → dyngle-1.0.0}/dyngle/__init__.py

@@ -7,8 +7,8 @@ from wizlib.ui_handler import UIHandler
 
 from dyngle.command import DyngleCommand
 from dyngle.error import DyngleError
-from dyngle.expression import expression
-from dyngle.operation import Operation
+from dyngle.model.expression import expression
+from dyngle.model.operation import Operation
 
 
 class DyngleApp(WizApp):

{dyngle-0.6.0 → dyngle-1.0.0}/dyngle/command/run_command.py

@@ -4,8 +4,8 @@ from wizlib.parser import WizParser
 from yaml import safe_load
 
 from dyngle.command import DyngleCommand
-from dyngle.expression import expression
-from dyngle.template import Template
+from dyngle.model.expression import expression
+from dyngle.model.template import Template
 from dyngle.error import DyngleError
 
 
@@ -34,21 +34,14 @@ class RunCommand(DyngleCommand):
 
     @DyngleCommand.wrap
     def execute(self):
-        operations = self.app.operations
-        self._validate_operation_exists(operations)
-        operation = operations[self.operation]
-        steps = operation.steps
-        expressions = self.app.global_expressions | \
-            operation.local_expressions
         data_string = self.app.stream.text
         data = safe_load(data_string) or {}
         data['args'] = self.args
-        for step_template in steps:
-            step = Template(step_template).render(data, expressions)
-            parts = shlex.split(step)
-            result = subprocess.run(parts)
-            if result.returncode != 0:
-                raise DyngleError(
-                    f'Task failed with code {result.returncode}: {step}')
+
+        operations = self.app.operations
+        self._validate_operation_exists(operations)
+        operation = operations[self.operation]
+
+        operation.run(data, self.app.global_expressions)
 
         return f'Operation "{self.operation}" completed successfully'

{dyngle-0.6.0/dyngle → dyngle-1.0.0/dyngle/model}/expression.py

@@ -1,7 +1,8 @@
 from typing import Callable
 
 from dyngle.error import DyngleError
-from dyngle.safe_path import SafePath
+from dyngle.model.live_data import LiveData
+from dyngle.model.safe_path import SafePath
 
 from datetime import datetime as datetime, date, timedelta
 import math
@@ -9,7 +10,7 @@ import json
 import re
 import yaml
 
-from dyngle.template import Template
+from dyngle.model.template import Template
 
 
 def formatted_datetime(dt: datetime, format_string=None) -> str:
@@ -113,10 +114,33 @@ def _evaluate(expression: str, locals: dict) -> str:
     return str(result)
 
 
+# The 'expression' function returns the expression object itself, which is
+# really just a function.
+
 def expression(text: str) -> Callable[[dict], str]:
-    def evaluate(data: dict = None) -> str:
-        items = data.items() if data else ()
-        locals = {k.replace('-', '_'): v for k, v in items}
-        def resolve(s): return Template.resolve(s, data)
-        return _evaluate(text, locals | {'resolve': resolve})
-    return evaluate
+    """Generate an expression, which is a function based on a string
+    expression"""
+
+    def definition(live_data: LiveData | dict | None = None) -> str:
+        """The expression function itself"""
+
+        # Allow for blankness and testability
+        live_data = LiveData(live_data)
+
+        # Translate names to underscore-separated instead of hyphen-separated
+        # so they work within the Python namespace.
+
+        items = live_data.items() if live_data else ()
+        locals = LiveData({k.replace('-', '_'): v for k, v in items})
+
+        # Create a resolve function which allows references using the hyphen
+        # syntax too
+
+        def resolve(key):
+            return live_data.resolve(key)
+        locals = locals | {'resolve': resolve}
+
+        # Perform the Python eval, expanded above
+        return _evaluate(text, locals)
+
+    return definition

dyngle-1.0.0/dyngle/model/live_data.py

@@ -0,0 +1,22 @@
+from collections import UserDict
+
+from dyngle.error import DyngleError
+
+
+class LiveData(UserDict):
+
+    def resolve(self, key: str):
+        """Given a key (which might be dot-separated), return
+        the value (which might include evaluating expressions)."""
+
+        parts = key.split('.')
+        current = self.data
+        for part in parts:
+            if part not in current:
+                raise DyngleError(
+                    f"Invalid expression or data reference '{key}'")
+            current = current[part]
+        if callable(current):
+            return current(self)
+        else:
+            return current

dyngle-1.0.0/dyngle/model/operation.py

@@ -0,0 +1,63 @@
+from dataclasses import dataclass
+from functools import cached_property
+import re
+import shlex
+import subprocess
+
+from dyngle.error import DyngleError
+from dyngle.model.live_data import LiveData
+from dyngle.model.template import Template
+
+
+@dataclass
+class Operation:
+
+    local_expressions: 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
+        for markup in self.steps:
+            step = Step(markup)
+            step.run(live_data)
+
+
+STEP_PATTERN = re.compile(
+    r'^\s*(?:([\w.-]+)\s+->\s+)?(.+?)(?:\s+=>\s+([\w.-]+))?\s*$')
+
+
+def parse_step(markup):
+    if match := STEP_PATTERN.match(markup):
+        input, command_text, output = match.groups()
+        command_template = shlex.split(command_text.strip())
+        return input, command_template, output
+    else:
+        raise DyngleError(f"Invalid step markup {{markup}}")
+
+
+@dataclass
+class Step:
+
+    markup: str
+
+    def __post_init__(self):
+        self.input, self.command_template, self.output = \
+            parse_step(self.markup)
+
+    def run(self, live_data: LiveData):
+        command = [Template(word).render(live_data)
+                   for word in self.command_template]
+        pipes = {}
+        if self.input:
+            pipes["input"] = live_data.resolve(self.input)
+        if self.output:
+            pipes['stdout'] = subprocess.PIPE
+        result = subprocess.run(command, text=True, **pipes)
+        if result.returncode != 0:
+            raise DyngleError(
+                f'Step failed with code {result.returncode}: {self.markup}')
+        if self.output:
+            live_data[self.output] = result.stdout

dyngle-1.0.0/dyngle/model/template.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+from functools import partial
+import re
+
+from dyngle.error import DyngleError
+from dyngle.model.live_data import LiveData
+
+
+PATTERN = re.compile(r'\{\{\s*([^}]+)\s*\}\}')
+
+
+@dataclass
+class Template:
+
+    template: str
+
+    def render(self, live_data: LiveData | dict | None = None) -> str:
+        """Render the template with the provided LiveData (raw data and
+        expressions)."""
+
+        live_data = LiveData(live_data)
+        resolver = partial(self._resolve, live_data=live_data)
+        return PATTERN.sub(resolver, self.template)
+
+    def _resolve(self, match, *, live_data: LiveData):
+        """Resolve a single name/path from the template. The argument is a
+        merge of the raw data and the expressions, either of which are valid
+        substitutions."""
+        key = match.group(1).strip()
+        return live_data.resolve(key)

{dyngle-0.6.0 → dyngle-1.0.0}/pyproject.toml

@@ -8,7 +8,7 @@ description = "Run lightweight local workflows"
 authors = ["Steampunk Wizard <dyngle@steamwiz.io>"]
 license = "MIT"
 readme = "PACKAGE.md"
-version = "0.6.0"
+version = "1.0.0"
 
 [tool.poetry.dependencies]
 python = "~3.11"

dyngle-0.6.0/PACKAGE.md

@@ -1,169 +0,0 @@
-# Dyngle
-
-## Run lightweight local workflows
-
-Dyngle is a simple workflow runner that executes sequences of commands defined in configuration files. It's like a lightweight combination of Make and a task runner, designed for automating common development and operational tasks.
-
-## Basic usage
-
-Create a configuration file (e.g., `.dyngle.yml`) with your workflows:
-
-```yaml
-dyngle:
-  operations:
-    build:
-      - python -m pip install -e .
-      - python -m pytest
-    deploy:
-      - docker build -t myapp .
-      - docker push myapp
-    clean:
-      - rm -rf __pycache__
-      - rm -rf .pytest_cache
-```
-
-Run an operation:
-
-```bash
-dyngle run build
-```
-
-## Configuration
-
-Dyngle reads configuration from YAML files. You can specify the config file location using:
-
-- `--config` command line option
-- `DYNGLE_CONFIG` environment variable  
-- `.dyngle.yml` in current directory
-- `~/.dyngle.yml` in home directory
-
-The configuration has 2 parts: `operations:` and `expressions`.
-
-Configuration files can import other configuration files, by providing an entry `imports:` with an array of filepaths. The most obvious example is a Dyngle config in a local directory which imports the user-level configuration.
-
-```yaml
-dyngle:
-  imports:
-    - ~/.dyngle.yml
-  expressions:
-  operations:
-```
-
-In the event of item name conflicts, expressions and operations are loaded from imports in the order specified, so imports lower in the array will override those higher up. The expressions and operations defined in the main file override the imports. Imports are not recursive.
-
-## Data
-
-Dyngle maintains a block of data throughout operations, which is parsed from YAML in stdin.
-
-## Operations
-
-Operations contain steps as a YAML array. The lifecycle of an operation is:
-
-1. Load input data if it exists from YAML on stdin (if no tty)
-2. Perform template rendering on a step, using data and expressions (see below)
-3. Execute the step in a subprocess
-4. Continue with the next step
-
-Note that operations in the config are _not_ full shell lines. They are passed directly to the system.
-
-## Templates
-
-Prior to running commands, the line containing that command is processed as a template. Entries from the data set can be substituted into the command line using Jinja-like expressions in double-curly brackets (`{{` and `}}`).
-
-For example, if stdin contains the following data:
-
-```yaml
-name: Francis
-```
-
-And the command looks like:
-
-``` yaml
-- echo "Hello {{name}}!"
-```
-
-Then the command will output "Hello Francis!".
-
-
-## Expressions
-
-Configs can also contain expressions, written in Python, that can also be referenced in operation steps.
-
-```yaml
-dyngle:
-  expressions:
-    say-hello: >-
-        'Hello ' + name + '!'
-  operations:
-    say-hello: echo {{say-hello}}
-```
-
-Expressions can use a controlled subset of the Python standard library, including:
-
-- Built-in data types such as `str()`
-- Essential built-in functions such as `len()`
-- The core modules from the `datetime` package (but some methods such as `strftime()` will fail)
-- A specialized function called `formatted()` to perform string formatting operations on a `datetime` object
-- A restricted version of `Path()` that only operates within the current working directory
-- Various other useful utilities, mostly read-only, such as the `math` module
-- A special function called `resolve` which resolves data expressions using the same logic as in templates
-
-Data keys containing hyphens are converted to valid Python names by replacing hyphens with underscores.
-
-Expressions can reference data directly as local names in Python (using the underscore replacements)...
-
-```yaml
-dyngle:
-  expressions:
-    say-hello: >-
-        'Hello ' + full_name + '!'
-```
-
-... or using the `resolve()` function, which also allows expressions to essentially call other expressions, using the same underlying data set.
-
-```yaml
-dyngle:
-  expressions:
-    hello: >-
-        'Hello ' + resolve('formal-name') + '!'
-    formal-name: >-
-        'Ms. ' + full_name
-```
-
-Note it's also _possible_ to call other expressions by name as functions, if they only return hard-coded values (i.e. constants).
-
-```yaml
-dyngle:
-  expressions:
-    author-name: Francis Potter
-    author-hello: >-
-        'Hello ' + author_name()
-``` 
-
-## Local Expressions
-
-Expressions can also be defined in a way that applies only to one operation - especially useful for command-line arguments.
-
-In this case, the operation definition has a different structure. See the example below.
-
-```yaml
-dyngle:
-  operations:
-    name_from_arg:
-      expressions:
-        local_name: "args[0]"
-      steps:
-        - echo "Hello {{local_name}}"
-```
-
-## Security
-
-Commands are executed using Python's `subprocess.run()` with arguments split in a shell-like fashion. The shell is not used, which reduces the likelihood of shell injection attacks. However, note that Dyngle is not robust to malicious configuration. Use with caution.
-
-## Quick installation (MacOS)
-
-```bash
-brew install python@3.11
-python3.11 -m pip install pipx
-pipx install dyngle
-```

dyngle-0.6.0/PKG-INFO

@@ -1,185 +0,0 @@
-Metadata-Version: 2.3
-Name: dyngle
-Version: 0.6.0
-Summary: Run lightweight local workflows
-License: MIT
-Author: Steampunk Wizard
-Author-email: dyngle@steamwiz.io
-Requires-Python: >=3.11,<3.12
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: wizlib (>=3.1.4,<4.0.0)
-Description-Content-Type: text/markdown
-
-# Dyngle
-
-## Run lightweight local workflows
-
-Dyngle is a simple workflow runner that executes sequences of commands defined in configuration files. It's like a lightweight combination of Make and a task runner, designed for automating common development and operational tasks.
-
-## Basic usage
-
-Create a configuration file (e.g., `.dyngle.yml`) with your workflows:
-
-```yaml
-dyngle:
-  operations:
-    build:
-      - python -m pip install -e .
-      - python -m pytest
-    deploy:
-      - docker build -t myapp .
-      - docker push myapp
-    clean:
-      - rm -rf __pycache__
-      - rm -rf .pytest_cache
-```
-
-Run an operation:
-
-```bash
-dyngle run build
-```
-
-## Configuration
-
-Dyngle reads configuration from YAML files. You can specify the config file location using:
-
-- `--config` command line option
-- `DYNGLE_CONFIG` environment variable  
-- `.dyngle.yml` in current directory
-- `~/.dyngle.yml` in home directory
-
-The configuration has 2 parts: `operations:` and `expressions`.
-
-Configuration files can import other configuration files, by providing an entry `imports:` with an array of filepaths. The most obvious example is a Dyngle config in a local directory which imports the user-level configuration.
-
-```yaml
-dyngle:
-  imports:
-    - ~/.dyngle.yml
-  expressions:
-  operations:
-```
-
-In the event of item name conflicts, expressions and operations are loaded from imports in the order specified, so imports lower in the array will override those higher up. The expressions and operations defined in the main file override the imports. Imports are not recursive.
-
-## Data
-
-Dyngle maintains a block of data throughout operations, which is parsed from YAML in stdin.
-
-## Operations
-
-Operations contain steps as a YAML array. The lifecycle of an operation is:
-
-1. Load input data if it exists from YAML on stdin (if no tty)
-2. Perform template rendering on a step, using data and expressions (see below)
-3. Execute the step in a subprocess
-4. Continue with the next step
-
-Note that operations in the config are _not_ full shell lines. They are passed directly to the system.
-
-## Templates
-
-Prior to running commands, the line containing that command is processed as a template. Entries from the data set can be substituted into the command line using Jinja-like expressions in double-curly brackets (`{{` and `}}`).
-
-For example, if stdin contains the following data:
-
-```yaml
-name: Francis
-```
-
-And the command looks like:
-
-``` yaml
-- echo "Hello {{name}}!"
-```
-
-Then the command will output "Hello Francis!".
-
-
-## Expressions
-
-Configs can also contain expressions, written in Python, that can also be referenced in operation steps.
-
-```yaml
-dyngle:
-  expressions:
-    say-hello: >-
-        'Hello ' + name + '!'
-  operations:
-    say-hello: echo {{say-hello}}
-```
-
-Expressions can use a controlled subset of the Python standard library, including:
-
-- Built-in data types such as `str()`
-- Essential built-in functions such as `len()`
-- The core modules from the `datetime` package (but some methods such as `strftime()` will fail)
-- A specialized function called `formatted()` to perform string formatting operations on a `datetime` object
-- A restricted version of `Path()` that only operates within the current working directory
-- Various other useful utilities, mostly read-only, such as the `math` module
-- A special function called `resolve` which resolves data expressions using the same logic as in templates
-
-Data keys containing hyphens are converted to valid Python names by replacing hyphens with underscores.
-
-Expressions can reference data directly as local names in Python (using the underscore replacements)...
-
-```yaml
-dyngle:
-  expressions:
-    say-hello: >-
-        'Hello ' + full_name + '!'
-```
-
-... or using the `resolve()` function, which also allows expressions to essentially call other expressions, using the same underlying data set.
-
-```yaml
-dyngle:
-  expressions:
-    hello: >-
-        'Hello ' + resolve('formal-name') + '!'
-    formal-name: >-
-        'Ms. ' + full_name
-```
-
-Note it's also _possible_ to call other expressions by name as functions, if they only return hard-coded values (i.e. constants).
-
-```yaml
-dyngle:
-  expressions:
-    author-name: Francis Potter
-    author-hello: >-
-        'Hello ' + author_name()
-``` 
-
-## Local Expressions
-
-Expressions can also be defined in a way that applies only to one operation - especially useful for command-line arguments.
-
-In this case, the operation definition has a different structure. See the example below.
-
-```yaml
-dyngle:
-  operations:
-    name_from_arg:
-      expressions:
-        local_name: "args[0]"
-      steps:
-        - echo "Hello {{local_name}}"
-```
-
-## Security
-
-Commands are executed using Python's `subprocess.run()` with arguments split in a shell-like fashion. The shell is not used, which reduces the likelihood of shell injection attacks. However, note that Dyngle is not robust to malicious configuration. Use with caution.
-
-## Quick installation (MacOS)
-
-```bash
-brew install python@3.11
-python3.11 -m pip install pipx
-pipx install dyngle
-```
-

dyngle-0.6.0/dyngle/operation.py

@@ -1,9 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass
-class Operation:
-
-    local_expressions: dict
-
-    steps: list

dyngle-0.6.0/dyngle/template.py

@@ -1,56 +0,0 @@
-from dataclasses import dataclass
-from functools import partial
-import re
-
-from dyngle.error import DyngleError
-
-
-PATTERN = re.compile(r'\{\{\s*([^}]+)\s*\}\}')
-
-
-@dataclass
-class Template:
-
-    template: str
-
-    def render(self, data: dict = None, expressions: dict = None) -> str:
-        """Render the template with the provided data and expressions.
-
-        Parameters
-        ----------
-        data : dict
-            String data to insert
-        expressions : dict
-            Functions to call with data
-
-        Returns
-        -------
-        str
-            Template rendered with expression resolution and values inserted.
-        """
-
-        data = data if data else {}
-        expressions = expressions if expressions else {}
-        resolver = partial(self._resolve, live_data=data | expressions)
-        return PATTERN.sub(resolver, self.template)
-
-    def _resolve(self, match, *, live_data: dict):
-        """Resolve a single name/path from the template. The argument is a
-        merge of the raw data and the expressions, either of which are valid
-        substitutions."""
-        key = match.group(1).strip()
-        return self.resolve(key, live_data)
-
-    @staticmethod
-    def resolve(key: str, live_data: dict):
-        parts = key.split('.')
-        current = live_data
-        for part in parts:
-            if part not in current:
-                raise DyngleError(
-                    f"Invalid expression or data reference '{key}")
-            current = current[part]
-        if callable(current):
-            return current(live_data)
-        else:
-            return current