tiferet 1.0.0a9__py3-none-any.whl → 1.0.0a11__py3-none-any.whl

tiferet/__init__.py

@@ -1 +1,5 @@
-from .contexts import *
+# *** imports
+
+# ** app
+from .contexts import *
+from .domain import *

tiferet/contexts/__init__.py

@@ -1,3 +1,8 @@
+# *** imports
+
+# ** app
 from .app import AppInterfaceContext
-from .request import RequestContext
-from .error import ErrorContext
+from .container import ContainerContext
+from .error import ErrorContext
+from .feature import FeatureContext
+from .request import RequestContext

tiferet/contexts/app.py

@@ -118,7 +118,7 @@ class AppInterfaceContext(Model):
         import json
 
         # Return the response.
-        return json.loads(request.result)
+        return json.loads(request.result) if request.result else ''
     
     # * method: run
     def run(self, **kwargs):
@@ -134,11 +134,11 @@ class AppInterfaceContext(Model):
 
         # Execute feature context and return session.
         # Handle error and return response if triggered.
-        has_error, message = self.errors.handle_error(lambda: self.execute_feature(request, **kwargs))
-
-        # Handle error if present.
-        if has_error:
-            return message
+        try:
+            self.execute_feature(request, **kwargs)
+        except Exception as e:
+            print('Error:', e)
+            return self.errors.handle_error(e)
 
         # Handle response.
         return self.handle_response(request)

tiferet/contexts/container.py

@@ -1,6 +1,7 @@
 # *** imports
 
 # ** core
+import os
 from typing import Any
 
 # ** app
@@ -78,11 +79,15 @@ class ContainerContext(Model):
         :type data_flag: str
         '''
 
-        # Add the attributes as an empty dictionary.
+        # Add the attributes and constants as empty dictionaries.
         attributes = {}
+        constants = {}
         
         # Get and set attributes and constants.
         attrs, consts = container_repo.list_all()
+
+        # Parse the constants.
+        constants.update({key: self.parse_parameter(consts[key]) for key in consts})
         
         # Add the attributes to the context.
         for attr in attrs:
@@ -99,7 +104,7 @@ class ContainerContext(Model):
             # Add any parameters as constants.
             for dep in attr.dependencies:
                 for key in dep.parameters:
-                    consts[key] = dep.parameters[key]
+                    constants[key] = self.parse_parameter(dep.parameters[key])
 
         # Add the constants and attributes to the context.
         super().__init__(dict(
@@ -107,9 +112,20 @@ class ContainerContext(Model):
             feature_flag=feature_flag,
             data_flag=data_flag,
             attributes=attributes,
-            constants=consts,
+            constants=constants,
         ))
 
+    
+    # * method: parse_environment_parameter
+    def parse_parameter(self, parameter: str) -> str:
+
+        # If the parameter is an environment variable, get the value.
+        if parameter.startswith('$env.'):
+            return os.getenv(parameter[5:])
+        
+        # Otherwise, return the parameter.
+        return parameter
+
     # * method: get_dependency
     def get_dependency(self, attribute_id: str):
         '''

tiferet/contexts/error.py

@@ -42,25 +42,24 @@ class ErrorContext(Model):
         self.validate()
 
     # * method: handle_error
-    def handle_error(self, execute_feature: Any) -> Tuple[bool, Any]:
+    def handle_error(self, exception: Exception, lang: str = 'en_US', **kwargs) -> Tuple[bool, Any]:
         '''
         Handle an error.
 
-        :param func: The execute feature function to handle.
-        :type func: function
+        :param exception: The exception to handle.
+        :type exception: Exception
+        :param lang: The language to use for the error message.
+        :type lang: str
         :return: Whether the error was handled.
         :rtype: bool
         '''
 
         # Execute the feature function and handle the errors.
-        try:
-            execute_feature()
-            return (False, None)
-        except AssertionError as e:
-            return (True, self.format_error_response(str(e)))
+        if isinstance(exception, AssertionError):
+            return self.format_error_response(str(exception), lang, **kwargs)
 
     # * method: format_error_response
-    def format_error_response(self, error_message: str, lang: str = 'en_US', **kwargs) -> Any:
+    def format_error_response(self, error_message: str, lang: str, **kwargs) -> Any:
         '''
         Format the error response.
 

tiferet/contexts/feature.py

@@ -51,6 +51,20 @@ class FeatureContext(Model):
             features=features,
         ))
         self.container = container_context
+
+    # * method: parse_parameter
+    def parse_parameter(self, parameter: str) -> str:
+        '''
+        Parse a parameter.
+
+        :param parameter: The parameter to parse.
+        :type parameter: str
+        :return: The parsed parameter.
+        :rtype: str
+        '''
+
+        # Parse the parameter.
+        return self.container.parse_parameter(parameter)
         
     # * method: execute
     def execute(self, request: RequestContext, debug: bool = False, **kwargs):
@@ -71,12 +85,21 @@ class FeatureContext(Model):
             # Get the feature command handler instance.
             handler = self.container.get_dependency(command.attribute_id)
 
+            # Parse the command parameters
+            params = {
+                param: 
+                self.parse_parameter(
+                    command.params.get(param)
+                ) 
+                for param in command.params
+            }
+
             # Execute the handler function.
             # Handle assertion errors if pass on error is not set.
             try:
                 result = handler.execute(
                     **request.data,
-                    **command.params,
+                    **params,
                     debug=debug,
                     **kwargs)
                 

{tiferet-1.0.0a9.dist-info → tiferet-1.0.0a11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiferet
-Version: 1.0.0a9
+Version: 1.0.0a11
 Summary: A multi-purpose application framework embodying beauty in form.
 Home-page: https://github.com/greatstrength/app
 Download-URL: https://github.com/greatstrength/app
@@ -11,3 +11,6 @@ License-File: LICENSE
 Requires-Dist: schematics>=2.1.1
 Requires-Dist: pyyaml>=6.0.1
 Requires-Dist: dependencies>=7.7.0
+Provides-Extra: test
+Requires-Dist: pytest>=8.3.3; extra == "test"
+Requires-Dist: pytest_env>=1.1.5; extra == "test"

{tiferet-1.0.0a9.dist-info → tiferet-1.0.0a11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tiferet/__init__.py,sha256=XtrOOpLk8fjC_CY-UZFmzYQ6Q9mL73D_6scuWpEJXZU,23
+tiferet/__init__.py,sha256=1CDYADhNKmHqE4yYf7RgcQcNQm34FTRR2w4WTzbm2Rk,70
 tiferet/clients/__init__.py,sha256=hSa_PgXM2jw9iVRrJH_SQUlSVISK-T4tTfgRKnXKkzA,33
 tiferet/clients/yaml.py,sha256=790LB7CpaMow_Ng8zB6jGmJnoqz8xjMYbfDLeMd4o3Q,2816
 tiferet/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -6,11 +6,11 @@ tiferet/commands/container.py,sha256=L2IKJqEbRglw_LC144oYAkARr2Rixj8IFuC6Ro1jAqA
 tiferet/commands/error.py,sha256=ixMYH0yrEWlMAVGDSRke3IGoWaOShfmiXntrUC2b3wY,573
 tiferet/commands/feature.py,sha256=tXa-MDf14ByIJqwQFeSUu2QLUjHPdsyvFNhj1XeaQVk,2507
 tiferet/configs/__init__.py,sha256=NfT6XFNcJznOLXjMuNmj3XeaOPVWwbc-N4kVWaVjuD0,845
-tiferet/contexts/__init__.py,sha256=suRJE4NrVPNm95iBtTb3cplElnWgmoCiiSC8niBbxbw,104
-tiferet/contexts/app.py,sha256=BFODEVIviu2YvjThXjpVoZ9DnVaxJIKqgIvQRbKqA0E,3769
-tiferet/contexts/container.py,sha256=WXg_PsZQOIfZWW8rNj0NTTg3bLJUjIRGhIGgENzJfxE,5175
-tiferet/contexts/error.py,sha256=VO3Wgkmf5bdK6LoT0xhQn1WeSAVulQwUhvBAsoUPd1c,2503
-tiferet/contexts/feature.py,sha256=FgHgk3xz3jpQUPynfX7uw9GmhV5wpHRHLtYWvKkkEwE,2979
+tiferet/contexts/__init__.py,sha256=HjI-9n29mFxN6ILSa3LBhLSVPRe-1V36ffQXSP9RavM,204
+tiferet/contexts/app.py,sha256=9VxWliIX_Y0Y8CZXQzYLgzN89MabkFzkW2e7-3P5KrQ,3781
+tiferet/contexts/container.py,sha256=qQzrAxGoq5yNqijMnVzE2wVwKprBmEVgiaBunnNcMd8,5704
+tiferet/contexts/error.py,sha256=mS72JU7rlxs9yEeDj5ZW3DuJftYqmkyp8DOhzNUwtMw,2562
+tiferet/contexts/feature.py,sha256=CnfgvYvApjkOa2fpZw9Vz6a7fsmiVx7mXaeZT2g9HGc,3589
 tiferet/contexts/request.py,sha256=EwTyXVYi8z1t1ns_0yDrjY6qICIMPn1UvZpV7ULKReY,2756
 tiferet/data/__init__.py,sha256=JKaeCw508WY15-etqdFJxPUUJxMxCAi6ASmA472D1_s,93
 tiferet/data/app.py,sha256=TWWwP0MDpQ-LSKg9166CyPSeI7jjcklIfwBlLW_rT5c,9619
@@ -31,8 +31,8 @@ tiferet/repos/feature.py,sha256=GxOV8XHNwz9YY3I8Wch6GaDskvkdi8l1hM9E9fCg1y0,3644
 tiferet/services/__init__.py,sha256=zB5elAFApNH435JLExPmWxvBmZcCtbAyai-KawUjr4E,101
 tiferet/services/app.py,sha256=92GvC-Vh8FDZoYMLdgzQ3iS1TVL4uyIErk7NJ4rpYPI,1462
 tiferet/services/container.py,sha256=ISJhkiNLV--nHbAv6Ajd3ug1cGiyazZoePJOCJu5n_s,1130
-tiferet-1.0.0a9.dist-info/LICENSE,sha256=e8_GutFM0sxbRlgUaeVsGvJ5uE-KvruLApOzIoHy_zU,1513
-tiferet-1.0.0a9.dist-info/METADATA,sha256=kWHQuZHr_mwozBh2i_Yyu-a4jFj_jkejPP1D2zenVEo,418
-tiferet-1.0.0a9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-tiferet-1.0.0a9.dist-info/top_level.txt,sha256=g19Qw0j_VxPw-fgPF1TMPwbtHjnEhNQs0fa69wJZ6IM,8
-tiferet-1.0.0a9.dist-info/RECORD,,
+tiferet-1.0.0a11.dist-info/LICENSE,sha256=e8_GutFM0sxbRlgUaeVsGvJ5uE-KvruLApOzIoHy_zU,1513
+tiferet-1.0.0a11.dist-info/METADATA,sha256=E1LI8jIwaqNUYA7rDRg-Sj7qeLwZ0voMKFZlS9hCtVU,536
+tiferet-1.0.0a11.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+tiferet-1.0.0a11.dist-info/top_level.txt,sha256=g19Qw0j_VxPw-fgPF1TMPwbtHjnEhNQs0fa69wJZ6IM,8
+tiferet-1.0.0a11.dist-info/RECORD,,