dyngle 0.4.3__tar.gz → 0.5.0__tar.gz

{dyngle-0.4.3 → dyngle-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dyngle
-Version: 0.4.3
+Version: 0.5.0
 Summary: Run lightweight local workflows
 License: MIT
 Author: Steampunk Wizard

dyngle-0.5.0/dyngle/__init__.py

@@ -0,0 +1,58 @@
+from functools import cached_property
+from pathlib import Path
+from wizlib.app import WizApp
+from wizlib.stream_handler import StreamHandler
+from wizlib.config_handler import ConfigHandler
+from wizlib.ui_handler import UIHandler
+
+from dyngle.command import DyngleCommand
+from dyngle.error import DyngleError
+from dyngle.expression import expression
+
+
+class DyngleApp(WizApp):
+
+    base = DyngleCommand
+    name = 'dyngle'
+    handlers = [StreamHandler, ConfigHandler, UIHandler]
+
+    # For possible upstreaming to WizLib, a mechanism to "import" configuration
+    # settings from external files.
+
+    @property
+    def _imported_configrations(self):
+        if not hasattr(self, '__imported_configurations'):
+            imports = self.config.get('dyngle-imports')
+            confs = []
+            if imports:
+                for filename in imports:
+                    full_filename = Path(filename).expanduser()
+                    confs.append(ConfigHandler(full_filename))
+            self.__imported_configurations = confs
+        return self.__imported_configurations
+
+    def _get_configuration_details(self, type: str):
+        label = f'dyngle-{type}'
+        details = {}
+        for conf in self._imported_configrations:
+            if (imported_details := conf.get(label)):
+                details |= imported_details
+        configured_details = self.config.get(label)
+        if configured_details:
+            details |= configured_details
+        return details
+
+    @cached_property
+    def operations(self):
+        operations = self._get_configuration_details('operations')
+        if not operations:
+            raise DyngleError("No operations defined")
+        return operations
+
+    @cached_property
+    def expressions(self):
+        expr_texts = self._get_configuration_details('expressions')
+        if expr_texts:
+            return {k: expression(t) for k, t in expr_texts.items()}
+        else:
+            return {}

{dyngle-0.4.3 → dyngle-0.5.0}/dyngle/command/run_command.py

@@ -29,13 +29,13 @@ class RunCommand(DyngleCommand):
         if self.operation not in operations:
             available_operations = ', '.join(operations.keys())
             raise DyngleError(
-                f'Operation "{self.operation}" not found. " + \
-                    f"Available operations: {available_operations}')
+                f"Operation '{self.operation}' not found. " +
+                f"Available operations: {available_operations}")
 
     @DyngleCommand.wrap
     def execute(self):
         expressions = self.app.expressions
-        operations = self.app.config.get('dyngle-operations')
+        operations = self.app.operations
         self._validate_operation_exists(operations)
         steps = operations[self.operation]
         data_string = self.app.stream.text

{dyngle-0.4.3 → dyngle-0.5.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.4.3"
+version = "0.5.0"
 
 [tool.poetry.dependencies]
 python = "~3.11"

dyngle-0.4.3/dyngle/__init__.py

@@ -1,23 +0,0 @@
-from functools import cached_property
-from wizlib.app import WizApp
-from wizlib.stream_handler import StreamHandler
-from wizlib.config_handler import ConfigHandler
-from wizlib.ui_handler import UIHandler
-
-from dyngle.command import DyngleCommand
-from dyngle.expression import expression
-
-
-class DyngleApp(WizApp):
-
-    base = DyngleCommand
-    name = 'dyngle'
-    handlers = [StreamHandler, ConfigHandler, UIHandler]
-
-    @cached_property
-    def expressions(self):
-        expr_texts = self.config.get('dyngle-expressions')
-        if expr_texts:
-            return {k: expression(t) for k, t in expr_texts.items()}
-        else:
-            return {}