tiferet 1.0.0a13__tar.gz → 1.0.0a15__tar.gz

{tiferet-1.0.0a13/tiferet.egg-info → tiferet-1.0.0a15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiferet
-Version: 1.0.0a13
+Version: 1.0.0a15
 Summary: A multi-purpose application framework embodying beauty in form.
 Home-page: https://github.com/greatstrength/app
 Download-URL: https://github.com/greatstrength/app

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/setup.py

@@ -9,7 +9,7 @@ config = {
     'url': r'https://github.com/greatstrength/app',
     'download_url': r'https://github.com/greatstrength/app',
     'author_email': 'andrew@greatstrength.me',
-    'version': '1.0.0-alpha.13',
+    'version': '1.0.0-alpha.15',
     'license': 'BSD 3',
     'install_requires': [
         'schematics>=2.1.1',
@@ -24,8 +24,7 @@ config = {
         'tiferet.contexts',
         'tiferet.data',
         'tiferet.domain',
-        'tiferet.repos',
-        'tiferet.services',
+        'tiferet.repos'
     ],    
     'scripts': [],
     'name': 'tiferet',

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet/contexts/__init__.py

@@ -1,7 +1,7 @@
 # *** imports
 
 # ** app
-from .app import AppInterfaceContext
+from .app import AppContext, AppContext as App, AppInterfaceContext
 from .container import ContainerContext
 from .error import ErrorContext
 from .feature import FeatureContext

tiferet-1.0.0a15/tiferet/contexts/app.py

@@ -0,0 +1,285 @@
+# *** imports
+
+# ** core
+from typing import Dict, Any, Tuple
+
+# ** app
+from .request import RequestContext
+from .feature import FeatureContext
+from .error import ErrorContext
+from .container import create_injector, import_dependency
+from ..domain import Model, StringType, DictType, ModelType
+from ..domain import AppInterface
+from ..repos import AppRepository
+
+
+# *** contexts
+
+# ** context: app_context
+class AppContext(Model):
+
+    # * attribute: app_repo_module_path
+    app_repo_module_path = StringType(
+        required=True,
+        default='tiferet.repos.app',
+        metadata=dict(
+            description='The application repository module path.'
+        ),
+    )
+
+    # * attribute: app_repo_class_name
+    app_repo_class_name = StringType(
+        required=True,
+        default='AppYamlProxy',
+        metadata=dict(
+            description='The application repository class name.'
+        ),
+    )
+
+    # * attribute: app_repo_parameters
+    app_repo_parameters = DictType(
+        StringType(),
+        default=dict(
+            app_config_file='app/configs/app.yml'
+        ),
+        metadata=dict(
+            description='The application repository parameters.'
+        ),
+    )
+
+    # * method: run
+    def run(self, interface_id: str, dependencies: Dict[str, Any] = {}, **kwargs) -> Any:
+        '''
+        Run the application interface.
+
+        :param interface_id: The interface ID.
+        :type interface_id: str
+        :param dependencies: The dependencies.
+        :type dependencies: dict
+        :param kwargs: Additional keyword arguments.
+        :type kwargs: dict
+        :return: The response.
+        :rtype: Any
+        '''
+
+        # Load the interface.
+        app_interface = self.load_interface(interface_id, **dependencies)
+
+        # Run the interface.
+        return app_interface.run(**kwargs)
+
+    # * method: load_interface
+    def load_interface(self, interface_id: str, **dependencies) -> AppInterface:
+        '''
+        Load the application interface.
+
+        :param interface_id: The interface ID.
+        :type interface_id: str
+        :param dependencies: The dependencies.
+        :type dependencies: dict
+        :return: The application interface.
+        :rtype: AppInterface
+        '''
+        
+        # Import the app repository.
+        app_repo = self.import_app_repo(
+            self.app_repo_module_path, 
+            self.app_repo_class_name, 
+            **self.app_repo_parameters
+        )
+
+        # Get the app interface.
+        app_interface = app_repo.get_interface(interface_id)
+
+        # Create the injector.
+        injector = self.create_injector(app_interface, **dependencies)
+
+        # Load the app interface context.
+        return getattr(injector, 'app_context')
+
+    # * method: import_app_repo
+    def import_app_repo(self, module_path: str, class_name: str, **kwargs) -> AppRepository:
+        '''
+        Import the app repository.
+
+        :param module_path: The module path.
+        :type module_path: str
+        :param class_name: The class name.
+        :type class_name: str
+        :param kwargs: Additional keyword arguments.
+        :type kwargs: dict
+        :return: The app repository.
+        :rtype: AppRepository
+        '''
+
+        # Try to import the module provided.
+        try:
+            return import_dependency(module_path, class_name)(**kwargs)
+
+        # Return None if nothing comes up.
+        except:
+            return None
+        
+    # ** method: create_injector
+    def create_injector(self, app_interface: AppInterface, **kwargs) -> Any:
+        '''
+        Create the injector.
+
+        :param app_interface: The app interface.
+        :type app_interface: AppInterface
+        :param kwargs: Additional keyword arguments.
+        :type kwargs: dict
+        :return: The injector.
+        :rtype: Any
+        '''
+
+        # Get the dependencies for the app interface.
+        dependencies = dict(
+            interface_id=app_interface.id,
+            app_name=app_interface.name,
+            feature_flag=app_interface.feature_flag,
+            data_flag=app_interface.data_flag,
+            app_context=import_dependency(
+                **app_interface.get_dependency('app_context').to_primitive()
+            ),
+            **app_interface.constants
+        )
+
+        # Add the remaining dependencies from the app interface.
+        dependencies.update({dep.attribute_id: import_dependency(dep.module_path, dep.class_name) for dep in app_interface.dependencies})
+
+        # Create the injector.
+        return create_injector(app_interface.id, **dependencies, **kwargs)
+
+
+# ** context: app_interface_context
+class AppInterfaceContext(Model): 
+    '''
+    The application interface context is a class that is used to create and run the application interface.
+    '''
+
+    # * attribute: interface_id
+    interface_id = StringType(
+        required=True,
+        metadata=dict(
+            description='The interface ID.'
+        ),
+    )
+
+    # * attribute: name
+    name = StringType(
+        required=True,
+        metadata=dict(
+            description='The application name.'
+        ),
+    )
+
+    # * field: features
+    features = ModelType(
+        FeatureContext,
+        required=True,
+        metadata=dict(
+            description='The feature context.'
+        ),
+    )
+
+    # * field: errors
+    errors = ModelType(
+        ErrorContext,
+        required=True,
+        metadata=dict(
+            description='The error context.'
+        ),
+    )
+
+    # * method: init
+    def __init__(self, interface_id: str, app_name: str, feature_context: FeatureContext, error_context: ErrorContext):
+        '''
+        Initialize the application interface context.
+
+        :param interface_id: The interface ID.
+        :type interface_id: str
+        :param app_name: The application name.
+        :type app_name: str
+        :param feature_context: The feature context.
+        :type feature_context: FeatureContext
+        :param error_context: The error context.
+        :type error_context: ErrorContext
+        '''
+
+        # Initialize the model.
+        super().__init__(dict(
+            interface_id=interface_id,
+            name=app_name
+        ))
+        self.features = feature_context
+        self.errors = error_context
+
+    # * method: parse_request
+    def parse_request(self, request: Any, **kwargs) -> Tuple[RequestContext, dict]:
+        '''
+        Parse the incoming request.
+
+        :param request: The incoming request.
+        :type request: Any
+        :param kwargs: Additional keyword arguments.
+        :type kwargs: dict
+        :return: The request context.
+        :rtype: RequestContext
+        '''
+
+        # Parse request.
+        return request, kwargs
+    
+    # * method: execute_feature
+    def execute_feature(self, request: RequestContext, **kwargs):
+        '''
+        Execute the feature context.
+
+        :param request: The request context.
+        :type request: RequestContext
+        '''
+
+        # Execute feature context and return session.
+        self.features.execute(request, **kwargs)
+    
+    # * method: handle_response
+    def handle_response(self, request: RequestContext) -> Any:
+        '''
+        Handle the response.
+
+        :param request: The request context.
+        :type request: RequestContext
+        :return: The response.
+        :rtype: Any
+        '''
+        
+        # Import the JSON module.
+        import json
+
+        # Return the response.
+        return json.loads(request.result) if request.result else None
+    
+    # * method: run
+    def run(self, **kwargs):
+        '''
+        Run the application interface.
+
+        :param kwargs: Additional keyword arguments.
+        :type kwargs: dict
+        '''
+        
+        # Parse request.
+        request, kwargs = self.parse_request(**kwargs)
+
+        # Execute feature context and return session.
+        try:
+            self.execute_feature(request, **kwargs)
+
+        # Handle error and return response if triggered.
+        except Exception as e:
+            print('Error:', e)
+            return self.errors.handle_error(e)
+
+        # Handle response.
+        return self.handle_response(request)

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet/contexts/container.py

@@ -6,10 +6,47 @@ from typing import Any
 
 # ** app
 from ..domain import *
-from ..services import container_service
 from ..repos.container import ContainerRepository
 
 
+# *** functions
+
+# ** function: create_injector
+def create_injector(name: str, **dependencies) -> Any:
+    '''
+    Create an injector object with the given dependencies.
+
+    :param name: The name of the injector.
+    :type name: str
+    :param dependencies: The dependencies.
+    :type dependencies: dict
+    :return: The injector object.
+    :rtype: Any
+    '''
+
+    # Create container.
+    from dependencies import Injector
+    return type(f'{name.capitalize()}Container', (Injector,), {**dependencies})
+
+
+# ** function: import_dependency
+def import_dependency(module_path: str, class_name: str) -> Any:
+    '''
+    Import an object dependency from its configured Python module.
+
+    :param module_path: The module path.
+    :type module_path: str
+    :param class_name: The class name.
+    :type class_name: str
+    :return: The dependency.
+    :rtype: Any
+    '''
+
+    # Import module.
+    from importlib import import_module
+    return getattr(import_module(module_path), class_name)
+
+
 # *** contexts
 
 # ** contexts: container_context
@@ -165,7 +202,7 @@ class ContainerContext(Model):
             dependencies[attribute_id] = self.import_dependency(attribute, flag_map[attribute.type])
 
         # Create container.
-        return container_service.create_injector( 
+        return create_injector( 
             self.interface_id, 
             **self.constants, 
             **dependencies, 
@@ -192,4 +229,4 @@ class ContainerContext(Model):
             dependency = attribute.get_dependency('core')
 
         # Import the dependency.
-        return container_service.import_dependency(dependency.module_path, dependency.class_name)
+        return import_dependency(dependency.module_path, dependency.class_name)

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet/data/app.py

@@ -6,7 +6,7 @@ from typing import Dict
 # ** app
 from ..configs import *
 from ..domain import DataObject
-from ..domain.app import AppDependency, AppInterface, AppRepositoryConfiguration
+from ..domain.app import AppDependency, AppInterface
 
 
 # *** constants
@@ -283,54 +283,3 @@ class AppInterfaceYamlData(AppInterface, DataObject):
             **self.to_primitive('to_model'),
             **kwargs
         )
-
-
-# ** data: app_repository_configuration_yaml_data
-class AppRepositoryConfigurationYamlData(DataObject, AppRepositoryConfiguration):
-    '''
-    A YAML data representation of an app repository configuration object.
-    '''
-
-    class Options():
-        '''
-        The options for the app repository configuration data.
-        '''
-        serialize_when_none = False
-        roles = {
-            'to_model': DataObject.allow(),
-            'to_data': DataObject.allow()
-        }
-
-    # * method: new
-    @staticmethod
-    def from_data(**kwargs) -> 'AppRepositoryConfigurationYamlData':
-        '''
-        Initializes a new YAML representation of an AppRepositoryConfiguration object.
-
-        :param kwargs: Additional keyword arguments.
-        :type kwargs: dict
-        :return: A new AppRepositoryConfigurationData object.
-        :rtype: AppRepositoryConfigurationData
-        '''
-
-        # Create a new AppRepositoryConfigurationData object.
-        return super(AppRepositoryConfigurationYamlData, AppRepositoryConfigurationYamlData).from_data(
-            AppRepositoryConfigurationYamlData,
-            **kwargs
-        )
-
-    # * method: map
-    def map(self, **kwargs) -> AppRepositoryConfiguration:
-        '''
-        Maps the app repository configuration data to an app repository configuration object.
-
-        :param role: The role for the mapping.
-        :type role: str
-        :param kwargs: Additional keyword arguments.
-        :type kwargs: dict
-        :return: A new app repository configuration object.
-        :rtype: AppRepositoryConfiguration
-        '''
-
-        # Map the app repository configuration data.
-        return super().map(AppRepositoryConfiguration, **kwargs)

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet/domain/__init__.py

@@ -1,5 +1,5 @@
 from .core import *
-from .app import AppInterface, AppDependency, AppRepositoryConfiguration
+from .app import AppInterface, AppDependency
 from .container import ContainerAttribute, ContainerDependency
 from .error import Error, ErrorMessage
 from .feature import Feature

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet/domain/app.py

@@ -128,59 +128,4 @@ class AppInterface(Entity):
 
         # Get the dependency by attribute id.
         return next((dep for dep in self.dependencies if dep.attribute_id == attribute_id), None)
-    
-
-# ** model: app_repository_configuration
-class AppRepositoryConfiguration(ModuleDependency):
-    '''
-    The import configuration for the application repository.
-    '''
-
-    # * attribute: module_path
-    module_path = StringType(
-        required=True,
-        default='tiferet.repos.app',
-        metadata=dict(
-            description='The module path for the application repository.'
-        ),
-    )
-
-    # * attribute: class_name
-    class_name = StringType(
-        required=True,
-        default='YamlProxy',
-        metadata=dict(
-            description='The class name for the application repository.'
-        ),
-    )
-
-    # * attribute: params
-    params = DictType(
-        StringType,
-        default=dict(
-            app_config_file='app/configs/app.yml',
-        ),
-        metadata=dict(
-            description='The application repository configuration parameters.'
-        ),
-    )
-
-    # * method: new
-    @staticmethod
-    def new(**kwargs) -> 'AppRepositoryConfiguration':
-        '''
-        Initializes a new AppRepositoryConfiguration object.
-
-        :param kwargs: Additional keyword arguments.
-        :type kwargs: dict
-        :return: A new AppRepositoryConfiguration object.
-        :rtype: AppRepositoryConfiguration
-        '''
-
-        # Create and return a new AppRepositoryConfiguration object.
-        return AppRepositoryConfiguration(
-            super(AppRepositoryConfiguration, AppRepositoryConfiguration).new(
-                AppRepositoryConfiguration,
-                **kwargs),
-            strict=False,
-        )
+    

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet/repos/app.py

@@ -41,8 +41,8 @@ class AppRepository(object):
         raise NotImplementedError()
 
 
-# ** proxy: yaml_proxy
-class YamlProxy(object):
+# ** proxy: app_yaml_proxy
+class AppYamlProxy(AppRepository):
 
     # * field: config_file
     config_file: str = None

{tiferet-1.0.0a13 → tiferet-1.0.0a15/tiferet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiferet
-Version: 1.0.0a13
+Version: 1.0.0a15
 Summary: A multi-purpose application framework embodying beauty in form.
 Home-page: https://github.com/greatstrength/app
 Download-URL: https://github.com/greatstrength/app

{tiferet-1.0.0a13 → tiferet-1.0.0a15}/tiferet.egg-info/SOURCES.txt

@@ -34,7 +34,4 @@ tiferet/repos/__init__.py
 tiferet/repos/app.py
 tiferet/repos/container.py
 tiferet/repos/error.py
-tiferet/repos/feature.py
-tiferet/services/__init__.py
-tiferet/services/app.py
-tiferet/services/container.py
+tiferet/repos/feature.py

tiferet-1.0.0a13/tiferet/contexts/app.py

@@ -1,144 +0,0 @@
-# *** imports
-
-# ** core
-from typing import Any, Tuple
-
-# ** app
-from .request import RequestContext
-from .feature import FeatureContext
-from .error import ErrorContext
-from ..domain import *
-
-
-# *** contexts
-
-# ** context: app_interface_context
-class AppInterfaceContext(Model): 
-    '''
-    The application interface context is a class that is used to create and run the application interface.
-    '''
-
-    # * attribute: interface_id
-    interface_id = StringType(
-        required=True,
-        metadata=dict(
-            description='The interface ID.'
-        ),
-    )
-
-    # * attribute: name
-    name = StringType(
-        required=True,
-        metadata=dict(
-            description='The application name.'
-        ),
-    )
-
-    # * field: features
-    features = ModelType(
-        FeatureContext,
-        required=True,
-        metadata=dict(
-            description='The feature context.'
-        ),
-    )
-
-    # * field: errors
-    errors = ModelType(
-        ErrorContext,
-        required=True,
-        metadata=dict(
-            description='The error context.'
-        ),
-    )
-
-    # * method: init
-    def __init__(self, interface_id: str, app_name: str, feature_context: FeatureContext, error_context: ErrorContext):
-        '''
-        Initialize the application interface context.
-
-        :param interface_id: The interface ID.
-        :type interface_id: str
-        :param app_name: The application name.
-        :type app_name: str
-        :param feature_context: The feature context.
-        :type feature_context: FeatureContext
-        :param error_context: The error context.
-        :type error_context: ErrorContext
-        '''
-
-        # Initialize the model.
-        super().__init__(dict(
-            interface_id=interface_id,
-            name=app_name
-        ))
-        self.features = feature_context
-        self.errors = error_context
-
-    # * method: parse_request
-    def parse_request(self, request: Any, **kwargs) -> Tuple[RequestContext, dict]:
-        '''
-        Parse the incoming request.
-
-        :param request: The incoming request.
-        :type request: Any
-        :param kwargs: Additional keyword arguments.
-        :type kwargs: dict
-        :return: The request context.
-        :rtype: RequestContext
-        '''
-
-        # Parse request.
-        return request, kwargs
-    
-    # * method: execute_feature
-    def execute_feature(self, request: RequestContext, **kwargs):
-        '''
-        Execute the feature context.
-
-        :param request: The request context.
-        :type request: RequestContext
-        '''
-
-        # Execute feature context and return session.
-        self.features.execute(request, **kwargs)
-    
-    # * method: handle_response
-    def handle_response(self, request: RequestContext) -> Any:
-        '''
-        Handle the response.
-
-        :param request: The request context.
-        :type request: RequestContext
-        :return: The response.
-        :rtype: Any
-        '''
-        
-        # Import the JSON module.
-        import json
-
-        # Return the response.
-        return json.loads(request.result) if request.result else None
-    
-    # * method: run
-    def run(self, **kwargs):
-        '''
-        Run the application interface.
-
-        :param kwargs: Additional keyword arguments.
-        :type kwargs: dict
-        '''
-        
-        # Parse request.
-        request, kwargs = self.parse_request(**kwargs)
-
-        # Execute feature context and return session.
-        # Handle error and return response if triggered.
-        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-1.0.0a13/tiferet/services/__init__.py

@@ -1,5 +0,0 @@
-# *** imports
-
-# ** app
-from . import container as container_service
-from . import app as app_service

tiferet-1.0.0a13/tiferet/services/app.py

@@ -1,52 +0,0 @@
-# *** imports
-
-# ** core
-from typing import Any
-
-# ** app
-from ..domain import AppInterface
-from ..repos.app import AppRepository
-from . import container_service
-
-
-# *** functions
-
-# ** function: load_app_context
-def load_app_context(interface_id: str, app_repo: AppRepository) -> Any:
-    '''
-    Load the app context.
-
-    :param container: The app container.
-    :type container: AppContainer
-    :return: The app context.
-    :rtype: Any
-    '''
-
-    # Get the app interface.
-    app_interface: AppInterface = app_repo.get_interface(interface_id)
-
-    # Get the default dependencies for the app interface.
-    app_context = app_interface.get_dependency('app_context')
-    dependencies = dict(
-        interface_id=app_interface.id,
-        app_name=app_interface.name,
-        feature_flag=app_interface.feature_flag,
-        data_flag=app_interface.data_flag,
-        app_context=container_service.import_dependency(
-            **app_context.to_primitive()
-        ),
-        **app_interface.constants
-    )
-
-    # Import the dependencies.
-    for dep in app_interface.dependencies:
-        dependencies[dep.attribute_id] = container_service.import_dependency(dep.module_path, dep.class_name)
-
-    # Create the injector from the dependencies, constants, and the app interface.
-    injector = container_service.create_injector(
-        app_interface.id,
-        **dependencies
-    )
-
-    # Return the app context.
-    return getattr(injector, 'app_context')

tiferet-1.0.0a13/tiferet/services/container.py

@@ -1,46 +0,0 @@
-# *** imports
-
-# ** core
-from typing import Any
-
-# ** infra
-from dependencies import Injector
-
-
-# *** functions
-
-# ** function: import_dependency
-def import_dependency(module_path: str, class_name: str, **kwargs) -> Any:
-    '''
-    Import an object dependency from its configured Python module.
-
-    :param module_path: The module path.
-    :type module_path: str
-    :param class_name: The class name.
-    :type class_name: str
-    :param kwargs: Additional keyword arguments.
-    :type kwargs: dict
-    :return: The dependency.
-    :rtype: Any
-    '''
-
-    # Import module.
-    from importlib import import_module
-    return getattr(import_module(module_path), class_name)
-
-
-# ** function: create_injector
-def create_injector(name: str, **dependencies) -> Any:
-    '''
-    Create an injector object with the given dependencies.
-
-    :param name: The name of the injector.
-    :type name: str
-    :param dependencies: The dependencies.
-    :type dependencies: dict
-    :return: The injector object.
-    :rtype: Any
-    '''
-
-    # Create container.
-    return type(f'{name.capitalize()}Container', (Injector,), {**dependencies})