tiferet 1.0.0a8__py3-none-any.whl → 1.0.0a10__py3-none-any.whl

tiferet/__init__.py

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

tiferet/clients/yaml.py

@@ -77,16 +77,25 @@ def save(yaml_file: str, data: dict, data_save_path: str = None):
 
         # If the new yaml data does not exist, create it from the yaml data.
         except TypeError:
-            new_yaml_data = yaml_data[fragment]
-            continue  
-
-        # If the fragment does not exist on 
+            try:
+                new_yaml_data = yaml_data[fragment]
+                continue  
+        
+            # If the fragment does not exist, create it.
+            except KeyError:
+                new_yaml_data = yaml_data[fragment] = {}
+
+        # If the fragment does not exist, create it.
         except KeyError: 
             new_yaml_data[fragment] = {}
             new_yaml_data = new_yaml_data[fragment]
 
     # Update the yaml data.
-    new_yaml_data[save_path_list[-1]] = data
+    try:
+        new_yaml_data[save_path_list[-1]] = data
+    # if there is a type error because the new yaml data is None, update the yaml data directly.
+    except TypeError:
+        yaml_data[save_path_list[-1]] = data
 
     # Save the updated yaml data.
     with open(yaml_file, 'w') as file:

tiferet/contexts/__init__.py

@@ -1,4 +1,8 @@
+# *** imports
+
+# ** app
 from .app import AppInterfaceContext
-from .env import EnvironmentContext
-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

@@ -1,7 +1,7 @@
 # *** imports
 
 # ** core
-from typing import Any 
+from typing import Any, Tuple
 
 # ** app
 from .request import RequestContext
@@ -70,13 +70,13 @@ class AppInterfaceContext(Model):
         # Initialize the model.
         super().__init__(dict(
             interface_id=interface_id,
-            name=app_name,
-            features=feature_context,
-            errors=error_context
+            name=app_name
         ))
+        self.features = feature_context
+        self.errors = error_context
 
     # * method: parse_request
-    def parse_request(self, request: Any, **kwargs) -> RequestContext:
+    def parse_request(self, request: Any, **kwargs) -> Tuple[RequestContext, dict]:
         '''
         Parse the incoming request.
 
@@ -89,7 +89,7 @@ class AppInterfaceContext(Model):
         '''
 
         # Parse request.
-        return request
+        return request, kwargs
     
     # * method: execute_feature
     def execute_feature(self, request: RequestContext, **kwargs):
@@ -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):
@@ -130,15 +130,15 @@ class AppInterfaceContext(Model):
         '''
         
         # Parse request.
-        request = self.parse_request(**kwargs)
+        request, kwargs = self.parse_request(**kwargs)
 
         # 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

@@ -86,17 +86,21 @@ class ContainerContext(Model):
         
         # Add the attributes to the context.
         for attr in attrs:
-            attribute: ContainerAttribute = attributes[attr.id]
-
+            
             # If the attribute already exists, set the dependencies.
             if attr.id in attributes:
                 for dep in attr.dependencies:
-                    attribute.set_dependency(dep)
+                    attr.set_dependency(dep)
                     continue
 
             # Otherwise, add the attribute.
             attributes[attr.id] = attr
 
+            # Add any parameters as constants.
+            for dep in attr.dependencies:
+                for key in dep.parameters:
+                    consts[key] = dep.parameters[key]
+
         # Add the constants and attributes to the context.
         super().__init__(dict(
             interface_id=interface_id,
@@ -145,7 +149,7 @@ class ContainerContext(Model):
             dependencies[attribute_id] = self.import_dependency(attribute, flag_map[attribute.type])
 
         # Create container.
-        return container_service.create_injector(self, 
+        return container_service.create_injector( 
             self.interface_id, 
             **self.constants, 
             **dependencies, 

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

@@ -45,10 +45,12 @@ class FeatureContext(Model):
         features = {feature.id: feature for feature in feature_repo.list()}
 
         # Set the features and container.
+        ## NOTE: There is a bug in the schematics library that does not allow us to initialize 
+        ## the feature context with the container context directly.
         super().__init__(dict(
             features=features,
-            container=container_context,
         ))
+        self.container = container_context
         
     # * method: execute
     def execute(self, request: RequestContext, debug: bool = False, **kwargs):
@@ -75,16 +77,21 @@ class FeatureContext(Model):
                 result = handler.execute(
                     **request.data,
                     **command.params,
+                    debug=debug,
                     **kwargs)
+                
+                # Return the result to the session context if return to data is set.
+                if command.return_to_data:
+                    request.data[command.data_key] = result
+                    continue
+
+                # Set the result in the request context.
+                if result:
+                    request.set_result(result)
+
+            # Handle assertion errors if pass on error is not set.
             except AssertionError as e:
                 if not command.pass_on_error:
                     raise e 
 
-            # Return the result to the session context if return to data is set.
-            if command.return_to_data:
-                request.data[command.data_key] = result
-                continue
-
-            # Set the result in the request context.
-            if result:
-                request.set_result(result)
+            

tiferet/contexts/request.py

@@ -62,9 +62,11 @@ class RequestContext(Model):
         '''
 
         # Set the context attributes.
-        self.feature_id = feature_id
-        self.headers = headers
-        self.data = data
+        super().__init__(dict(
+            feature_id=feature_id,
+            headers=headers,
+            data=data
+        ))
 
         # Validate the context.
         self.validate()
@@ -92,7 +94,7 @@ class RequestContext(Model):
             return
 
         # If the result is not a list, it must be a dict, so serialize it and set it.
-        if type(self.result) != list:
+        if type(result) != list:
             self.result = json.dumps(result)
             return
 

tiferet/data/__init__.py

@@ -1,4 +1,5 @@
 from typing import List, Dict
 
 from .error import *
-from .feature import *
+from .feature import *
+from .app import *

tiferet/data/app.py

@@ -9,6 +9,50 @@ from ..domain import DataObject
 from ..domain.app import AppDependency, AppInterface, AppRepositoryConfiguration
 
 
+# *** constants
+
+# ** constant: app_dependency_default
+FEATURE_CONTEXT_DEFAULT = dict(
+    module_path='tiferet.contexts.feature',
+    class_name='FeatureContext',
+) 
+
+# * constant: app_dependency_default
+CONTAINER_CONTEXT_DEFAULT = dict(
+    module_path='tiferet.contexts.container',
+    class_name='ContainerContext',
+)
+
+ERROR_CONTEXT_DEFAULT = dict(
+    module_path='tiferet.contexts.error',
+    class_name='ErrorContext',
+)
+
+FEATURE_REPO_DEFAULT = dict(
+    module_path='tiferet.repos.feature',
+    class_name='YamlProxy',
+)
+
+CONTAINER_REPO_DEFAULT = dict(
+    module_path='tiferet.repos.container',
+    class_name='YamlProxy',
+)
+
+ERROR_REPO_DEFAULT = dict(
+    module_path='tiferet.repos.error',
+    class_name='YamlProxy',
+)
+
+# ** constant: context_list_default
+CONTEXT_LIST_DEFAULT = {
+    'feature_context': FEATURE_CONTEXT_DEFAULT,
+    'container_context': CONTAINER_CONTEXT_DEFAULT,
+    'error_context': ERROR_CONTEXT_DEFAULT,
+    'feature_repo': FEATURE_REPO_DEFAULT,
+    'container_repo': CONTAINER_REPO_DEFAULT,
+    'error_repo': ERROR_REPO_DEFAULT,
+}
+
 # *** data
 
 # ** data: app_dependency_yaml_data
@@ -34,9 +78,27 @@ class AppDependencyYamlData(AppDependency, DataObject):
             'to_data.yaml': DataObject.deny('attribute_id')
         }
 
+    # * method: from_data
+    @staticmethod
+    def from_data(**kwargs) -> 'AppDependencyYamlData':
+        '''
+        Initializes a new YAML representation of an AppDependency object.
+        
+        :param kwargs: Additional keyword arguments.
+        :type kwargs: dict
+        :return: A new AppDependencyData object.
+        :rtype: AppDependencyData
+        '''
+
+        # Create a new AppDependencyData object.
+        return super(AppDependencyYamlData, AppDependencyYamlData).from_data(
+            AppDependencyYamlData,
+            **kwargs
+        )
+
     # * method: new
     @staticmethod
-    def new(**kwargs) -> 'AppDependencyYamlData':
+    def from_data(**kwargs) -> 'AppDependencyYamlData':
         '''
         Initializes a new YAML representation of an AppDependency object.
 
@@ -47,11 +109,11 @@ class AppDependencyYamlData(AppDependency, DataObject):
         '''
 
         # Create a new AppDependencyData object.
-        return AppDependencyYamlData(
-            dict(**kwargs),
-            strict=False,
+        return super(AppDependencyYamlData, AppDependencyYamlData).from_data(
+            AppDependencyYamlData,
+            **kwargs
         )
-    
+
     # * method: map
     def map(self, **kwargs) -> AppDependency:
         '''
@@ -67,7 +129,7 @@ class AppDependencyYamlData(AppDependency, DataObject):
 
         # Map the app dependency data.
         return super().map(AppDependency, **kwargs)
-    
+
 
 # ** data: app_interface_yaml_data
 class AppInterfaceYamlData(AppInterface, DataObject):
@@ -82,7 +144,7 @@ class AppInterfaceYamlData(AppInterface, DataObject):
         serialize_when_none = False
         roles = {
             'to_model': DataObject.deny('app_context', 'container_context', 'feature_context', 'error_context', 'feature_repo', 'container_repo', 'error_repo'),
-            'to_data.yaml': DataObject.deny('id')
+            'to_data': DataObject.deny('id')
         }
 
     # attribute: app_context
@@ -98,11 +160,6 @@ class AppInterfaceYamlData(AppInterface, DataObject):
     feature_context = ModelType(
         AppDependencyYamlData,
         required=True,
-        default=AppDependencyYamlData.new(
-            attribute_id='feature_context',
-            module_path='tiferet.contexts.feature',
-            class_name='FeatureContext',
-        ),
         metadata=dict(
             description='The feature context dependency.'
         ),
@@ -112,11 +169,6 @@ class AppInterfaceYamlData(AppInterface, DataObject):
     container_context = ModelType(
         AppDependencyYamlData,
         required=True,
-        default=AppDependencyYamlData.new(
-            attribute_id='container_context',
-            module_path='tiferet.contexts.container',
-            class_name='ContainerContext',
-        ),
         metadata=dict(
             description='The container context dependency.'
         ),
@@ -126,11 +178,6 @@ class AppInterfaceYamlData(AppInterface, DataObject):
     error_context = ModelType(
         AppDependencyYamlData,
         required=True,
-        default=AppDependencyYamlData.new(
-            attribute_id='error_context',
-            module_path='tiferet.contexts.error',
-            class_name='ErrorContext',
-        ),
         metadata=dict(
             description='The error context dependency.'
         ),
@@ -140,11 +187,6 @@ class AppInterfaceYamlData(AppInterface, DataObject):
     feature_repo = ModelType(
         AppDependencyYamlData,
         required=True,
-        default=AppDependencyYamlData.new(
-            attribute_id='feature_repo',
-            module_path='tiferet.repos.feature',
-            class_name='YamlProxy',
-        ),
         metadata=dict(
             description='The feature repository dependency.'
         ),
@@ -154,11 +196,6 @@ class AppInterfaceYamlData(AppInterface, DataObject):
     container_repo = ModelType(
         AppDependencyYamlData,
         required=True,
-        default=AppDependencyYamlData.new(
-            attribute_id='container_repo',
-            module_path='tiferet.repos.container',
-            class_name='YamlProxy',
-        ),
         metadata=dict(
             description='The container repository dependency.'
         ),
@@ -168,11 +205,6 @@ class AppInterfaceYamlData(AppInterface, DataObject):
     error_repo = ModelType(
         AppDependencyYamlData,
         required=True,
-        default=AppDependencyYamlData.new(
-            attribute_id='error_repo',
-            module_path='tiferet.repos.error',
-            class_name='YamlProxy',
-        ),
         metadata=dict(
             description='The error repository dependency.'
         ),
@@ -180,14 +212,8 @@ class AppInterfaceYamlData(AppInterface, DataObject):
 
     # * method: new
     @staticmethod
-    def new(app_context: Dict[str, str],
-            container_context: Dict[str, str] = None,
-            feature_context: Dict[str, str] = None,
-            error_context: Dict[str, str] = None,
-            feature_repo: Dict[str, str] = None,
-            container_repo: Dict[str, str] = None,
-            error_repo: Dict[str, str] = None,
-            **kwargs) -> 'AppInterfaceYamlData':
+    def from_data(app_context: Dict[str, str],
+        **kwargs) -> 'AppInterfaceYamlData':
         '''
         Initializes a new YAML representation of an AppInterface object.
 
@@ -197,34 +223,36 @@ class AppInterfaceYamlData(AppInterface, DataObject):
         :rtype: AppInterfaceData
         '''
 
-        # Format the dependencies.
-        dependencies = {}
-        if app_context:
-            dependencies['app_context'] = AppDependencyYamlData.new(attribute_id='app_context', **app_context)
-        if container_context:
-            dependencies['container_context'] = AppDependencyYamlData.new(attribute_id='container_context', **container_context)
-        if feature_context:
-            dependencies['feature_context'] = AppDependencyYamlData.new(attribute_id='feature_context', **feature_context)
-        if error_context:
-            dependencies['error_context'] = AppDependencyYamlData.new(attribute_id='error_context', **error_context)
-        if feature_repo:
-            dependencies['feature_repo'] = AppDependencyYamlData.new(attribute_id='feature_repo', **feature_repo)
-        if container_repo:
-            dependencies['container_repo'] = AppDependencyYamlData.new(attribute_id='container_repo', **container_repo)
-        if error_repo:
-            dependencies['error_repo'] = AppDependencyYamlData.new(attribute_id='error_repo', **error_repo)
+        # Add the app context to the dependencies.
+        dependencies = dict(
+            app_context=AppDependencyYamlData.from_data(
+                attribute_id='app_context',
+                **app_context
+            )
+        )
+
+        # Going through the default dependencies...
+        for key, value in CONTEXT_LIST_DEFAULT.items():
+            
+            # If the key is in the kwargs, add it and continue.
+            if key in kwargs:
+                dependencies[key] = AppDependencyYamlData.from_data(
+                    attribute_id=key,
+                    **kwargs.pop(key)) # Pop the key to avoid duplication.
+                continue
+            
+            # Otherwise, add the default value.
+            dependencies[key] = AppDependencyYamlData.from_data(
+                attribute_id=key,
+                **value)
 
         # Create a new AppInterfaceData object.
-        data = AppInterfaceYamlData(dict(
+        return super(AppInterfaceYamlData, AppInterfaceYamlData).from_data(
+            AppInterfaceYamlData,
             **dependencies,
-            **kwargs),
-            strict=False,
+            **kwargs
         )
 
-        # Validate and return the new AppInterfaceData object.
-        data.validate()
-        return data
-    
     # * method: map
     def map(self, **kwargs) -> AppInterface:
         '''
@@ -250,15 +278,15 @@ class AppInterfaceYamlData(AppInterface, DataObject):
         ]
 
         # Map the app interface data.
-        return super().map(AppInterface, 
-            dependencies=dependencies, 
-            **self.to_primitive('to_model'), 
+        return super().map(AppInterface,
+            dependencies=dependencies,
+            **self.to_primitive('to_model'),
             **kwargs
         )
 
 
 # ** data: app_repository_configuration_yaml_data
-class AppRepositoryConfigurationYamlData(DataObject):
+class AppRepositoryConfigurationYamlData(DataObject, AppRepositoryConfiguration):
     '''
     A YAML data representation of an app repository configuration object.
     '''
@@ -270,12 +298,12 @@ class AppRepositoryConfigurationYamlData(DataObject):
         serialize_when_none = False
         roles = {
             'to_model': DataObject.allow(),
-            'to_data.yaml': DataObject.allow()
+            'to_data': DataObject.allow()
         }
 
     # * method: new
     @staticmethod
-    def new(**kwargs) -> 'AppRepositoryConfigurationYamlData':
+    def from_data(**kwargs) -> 'AppRepositoryConfigurationYamlData':
         '''
         Initializes a new YAML representation of an AppRepositoryConfiguration object.
 
@@ -286,12 +314,11 @@ class AppRepositoryConfigurationYamlData(DataObject):
         '''
 
         # Create a new AppRepositoryConfigurationData object.
-        return AppRepositoryConfigurationYamlData(
-            super(AppRepositoryConfigurationYamlData, AppRepositoryConfigurationYamlData).new(
-                **kwargs
-            )
+        return super(AppRepositoryConfigurationYamlData, AppRepositoryConfigurationYamlData).from_data(
+            AppRepositoryConfigurationYamlData,
+            **kwargs
         )
-    
+
     # * method: map
     def map(self, **kwargs) -> AppRepositoryConfiguration:
         '''
@@ -306,4 +333,4 @@ class AppRepositoryConfigurationYamlData(DataObject):
         '''
 
         # Map the app repository configuration data.
-        return super().map(AppRepositoryConfiguration, **kwargs)
+        return super().map(AppRepositoryConfiguration, **kwargs)