dyngle 0.4.3__py3-none-any.whl → 0.5.0__py3-none-any.whl

dyngle/__init__.py

@@ -1,10 +1,12 @@
 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
 
 
@@ -14,9 +16,42 @@ class DyngleApp(WizApp):
     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.config.get('dyngle-expressions')
+        expr_texts = self._get_configuration_details('expressions')
         if expr_texts:
             return {k: expression(t) for k, t in expr_texts.items()}
         else:

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.dist-info → dyngle-0.5.0.dist-info}/METADATA

@@ -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.4.3.dist-info → dyngle-0.5.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dyngle/__init__.py,sha256=drqd18F3T7LMTNqAU38WYjanczl1kANAA1vVBjbPEyU,653
+dyngle/__init__.py,sha256=Ld1T1kc6zJch8jUHKFP2GPp650b4TR8IKpkrPdZmLwg,1949
 dyngle/__main__.py,sha256=pYRIwzix_AL8CdJaDDis_8yMBBWO2N72NNwkroo1dQo,95
 dyngle/command/__init__.py,sha256=1S86gbef8MYvG-TWD5JRIWzFg7qV5xKhp9QXx9zEx5c,94
-dyngle/command/run_command.py,sha256=fgso_ZadAkA0f1ZjSGAUHs32hCHnX3QE_abnAmvg77g,1854
+dyngle/command/run_command.py,sha256=icdc0YaILB33Zy-wzJIlCGTnUVnk-p6eQT8j1kxa1rg,1827
 dyngle/error.py,sha256=CGcTa8L4O1qsHEYnzp_JBbkvntJTv2Qz46wj_TI8NLk,39
 dyngle/expression.py,sha256=-uLVbrO8ovNZGGLNqMZWIy_StCK-0laZqcQ1gOPhU6w,3476
 dyngle/safe_path.py,sha256=Hk2AhP6e3yKGh3kKrLLwhvAlMNx-j2jObBYJL-_doAU,3339
 dyngle/template.py,sha256=XM5VtOiuMVzNjMTsUdMMfugiygcOuAh-8MedfhEbGn0,1435
-dyngle-0.4.3.dist-info/METADATA,sha256=RpCvS1bRIN-Xcdyw2VIJ7j-zm-BAEVokemfUh52bpr0,4544
-dyngle-0.4.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dyngle-0.4.3.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
-dyngle-0.4.3.dist-info/RECORD,,
+dyngle-0.5.0.dist-info/METADATA,sha256=TYWz-gVzI2QZzn_JY-YmHRtOpEhyi2pmXrJqgZsBc7g,4544
+dyngle-0.5.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dyngle-0.5.0.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
+dyngle-0.5.0.dist-info/RECORD,,