tiferet 1.0.0a2__tar.gz → 1.0.0a4__tar.gz

{tiferet-1.0.0a2/tiferet.egg-info → tiferet-1.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiferet
-Version: 1.0.0a2
+Version: 1.0.0a4
 Summary: A multi-purpose application framework embodying beauty in form.
 Home-page: https://github.com/greatstrength/app
 Download-URL: https://github.com/greatstrength/app
@@ -10,3 +10,4 @@ License: BSD 3
 License-File: LICENSE
 Requires-Dist: schematics>=2.1.1
 Requires-Dist: pyyaml>=6.0.1
+Requires-Dist: dependencies>=7.7.0

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/setup.py

@@ -9,11 +9,13 @@ 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.2',
+    'version': '1.0.0-alpha.4',
     'license': 'BSD 3',
     'install_requires': [
         'schematics>=2.1.1',
-        'pyyaml>=6.0.1'
+        'pyyaml>=6.0.1',
+        'dependencies>=7.7.0'
+
     ],
     'packages': [
         'tiferet',

tiferet-1.0.0a4/tiferet/__init__.py

@@ -0,0 +1 @@
+from .contexts import *

tiferet-1.0.0a4/tiferet/clients/__init__.py

@@ -0,0 +1 @@
+from . import yaml as yaml_client

tiferet-1.0.0a4/tiferet/contexts/__init__.py

@@ -0,0 +1,4 @@
+from .app import AppInterfaceContext
+from .env import EnvironmentContext
+from .request import RequestContext
+from .error import ErrorContext

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/tiferet/data/container.py

@@ -36,7 +36,7 @@ class ContainerDependencyYamlData(ContainerDependency, DataObject):
     parameters = DictType(
         StringType, 
         default={}, 
-        serialize_name='params', 
+        serialized_name='params', 
         deserialize_from=['params'],
         metadata=dict(
             description='The parameters need to now account for new data names in the YAML format.'
@@ -117,7 +117,7 @@ class ContainerAttributeYamlData(ContainerAttribute, DataObject):
     dependencies = DictType(
         ModelType(ContainerDependencyYamlData), 
         default=[], 
-        serialize_name='deps', 
+        serialized_name='deps', 
         deserialize_from=['deps', 'dependencies'],
         metadata=dict(
             description='The dependencies are now a key-value pair keyed by the flags.'

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/tiferet/domain/app.py

@@ -31,9 +31,9 @@ class AppDependency(ModuleDependency):
         '''
 
         # Create and return a new AppDependency object.
-        return super(AppDependency, AppDependency).new(
-            AppDependency,
-            **kwargs
+        return AppDependency(
+            super(AppDependency, AppDependency).new(**kwargs),
+            strict=False,
         )
 
 # ** model: app_interface
@@ -266,9 +266,9 @@ class AppRepositoryConfiguration(ModuleDependency):
         '''
 
         # Create and return a new AppRepositoryConfiguration object.
-        return super(AppRepositoryConfiguration, AppRepositoryConfiguration).new(
-            AppRepositoryConfiguration,
-            **kwargs
+        return AppRepositoryConfiguration(
+            super(AppRepositoryConfiguration, AppRepositoryConfiguration).new(**kwargs),
+            strict=False,
         )
 
 

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/tiferet/domain/core.py

@@ -193,7 +193,6 @@ class ModuleDependency(Model):
         '''
 
         # Create a new ModuleDependency object.
-        return super(ModuleDependency, ModuleDependency).new(
-            ModuleDependency,
+        return ModuleDependency(dict(
             **kwargs
-        )
+        ), strict=False)

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/tiferet/repos/app.py

@@ -2,7 +2,7 @@
 
 # ** app
 from ..domain.app import AppInterface
-from ..data.app import AppInterfaceData
+from ..data.app import AppInterfaceYamlData
 from ..clients import yaml as yaml_client
 
 
@@ -72,9 +72,10 @@ class YamlProxy(object):
         interfaces = yaml_client.load(
             self.config_file,
             create_data=lambda data: [
-                AppInterfaceData.new(
+                AppInterfaceYamlData.new(
+                    id=interface_id,
                     **record
-                ).map() for record in data],
+                ).map() for interface_id, record in data.items()],
             start_node=lambda data: data.get('interfaces'))
 
         # Return the list of app interface objects.
@@ -94,7 +95,7 @@ class YamlProxy(object):
         # Load the app interface data from the yaml configuration file.
         _data: AppInterface = yaml_client.load(
             self.config_file,
-            create_data=lambda data: AppInterfaceData.new (
+            create_data=lambda data: AppInterfaceYamlData.new (
                 id=id, **data),
             start_node=lambda data: data.get('interfaces').get(id))
 

tiferet-1.0.0a4/tiferet/services/__init__.py

@@ -0,0 +1 @@
+from . import container as container_service

{tiferet-1.0.0a2 → tiferet-1.0.0a4/tiferet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiferet
-Version: 1.0.0a2
+Version: 1.0.0a4
 Summary: A multi-purpose application framework embodying beauty in form.
 Home-page: https://github.com/greatstrength/app
 Download-URL: https://github.com/greatstrength/app
@@ -10,3 +10,4 @@ License: BSD 3
 License-File: LICENSE
 Requires-Dist: schematics>=2.1.1
 Requires-Dist: pyyaml>=6.0.1
+Requires-Dist: dependencies>=7.7.0

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/tiferet.egg-info/SOURCES.txt

@@ -38,5 +38,4 @@ tiferet/repos/container.py
 tiferet/repos/error.py
 tiferet/repos/feature.py
 tiferet/services/__init__.py
-tiferet/services/cli.py
 tiferet/services/container.py

{tiferet-1.0.0a2 → tiferet-1.0.0a4}/tiferet.egg-info/requires.txt

@@ -1,2 +1,3 @@
 schematics>=2.1.1
 pyyaml>=6.0.1
+dependencies>=7.7.0

tiferet-1.0.0a2/tiferet/contexts/__init__.py

@@ -1,2 +0,0 @@
-from .app import AppContext
-from .env import EnvironmentContext

tiferet-1.0.0a2/tiferet/services/__init__.py

@@ -1,4 +0,0 @@
-from . import cli as cli_service
-from . import container as container_service
-from . import object as object_service
-from . import sync as sync_service

tiferet-1.0.0a2/tiferet/services/cli.py

@@ -1,186 +0,0 @@
-from typing import List, Dict, Any
-import argparse
-
-from ..contexts.request import RequestContext
-from ..domain.cli import CliInterface
-from ..domain.cli import CliArgument
-
-
-def create_argument_data(cli_argument: CliArgument):
-
-    # List fields to be excluded.
-    exclude_fields = ['name_or_flags', 'arg_type', 'to_data']
-
-    # Exclude unneeded fields if the argument contains an action.
-    if cli_argument.action:
-        exclude_fields.append('nargs')
-        exclude_fields.append('type')
-        exclude_fields.append('choices')
-
-    # Set the data type for the argument.
-    if cli_argument.type == 'str':
-        data_type = str
-    elif cli_argument.type == 'int':
-        data_type = int
-    elif cli_argument.type == 'float':
-        data_type = float
-
-    # For each name or flag in the argument,
-    for name in cli_argument.name_or_flags:
-
-        # If the name or flag is a positional argument,
-        if not name.startswith('--'):
-
-            # Remove the required field.
-            exclude_fields.append('required')
-
-    # Assemble the argument data.
-    argument_data = cli_argument.to_primitive()
-
-    # Set the data type.
-    argument_data['type'] = data_type
-
-    # For each field in the excluded fields,
-    for field in exclude_fields:
-
-        # Remove the field from the argument data if it is present.
-        try:
-            del argument_data[field]
-        except KeyError:
-            pass
-
-    # Return the argument data.
-    return argument_data
-
-
-def create_headers(data: dict):
-    headers = dict(
-        group_id=data.pop('group'),
-        command_id=data.pop('command'),
-    )
-    headers['id'] = f"{headers['group_id']}.{headers['command_id']}".replace(
-        '-', '_')
-    return headers
-
-
-def create_cli_parser(cli_interface: CliInterface):
-
-    # Format commands into a dictionary lookup by group id.
-    commands = {}
-    for command in cli_interface.commands:
-        group_id = command.group_id
-        if group_id not in commands:
-            commands[group_id] = []
-        commands[group_id].append(command)
-
-    # Create parser.
-    parser = argparse.ArgumentParser()
-
-    # Add command subparsers
-    command_subparsers = parser.add_subparsers(dest='group')
-    for group_id, commands in commands.items():
-        group_name = group_id.replace('_', '-')
-        command_subparser = command_subparsers.add_parser(
-            group_name)
-        subcommand_subparsers = command_subparser.add_subparsers(
-            dest='command')
-        for command in commands:
-            command_name = command.id.split('.')[-1].replace('_', '-')
-            subcommand_subparser = subcommand_subparsers.add_parser(
-                command_name)
-            for argument in command.arguments:
-                subcommand_subparser.add_argument(
-                    *argument.name_or_flags, **create_argument_data(argument))
-        for argument in cli_interface.parent_arguments:
-            subcommand_subparser.add_argument(
-                *argument.name_or_flags, **create_argument_data(argument))
-
-    return parser
-
-
-def create_request(request: argparse.Namespace, cli_interface: CliInterface, **kwargs) -> RequestContext:
-
-    # Convert argparse.Namespace to dictionary.
-    data = vars(request)
-
-    # Create header values.
-    headers = create_headers(data)
-
-    # Get the command from the CLI interface.
-    command = cli_interface.get_command(**headers)
-
-    # Create map of arguments to their data attribute names.
-    argument_map = {arg.get_name(): arg for arg in command.arguments}
-
-    # Map the data to the request context.
-    for key, value in data.items():
-        if value is None:
-            continue
-        argument = argument_map.get(key)
-        data[key] = map_object_input(value, argument)
-
-    # Create request context.
-    return RequestContext(
-        feature_id=command.feature_id,
-        data=data,
-        headers=headers,
-        **headers,
-        **kwargs
-    )
-
-
-def map_object_input(data: Any, argument: CliArgument):
-
-    # If the argument is not input to data,
-    if not argument.to_data:
-
-        # Return the data.
-        return data
-
-    # If the argument is a dictionary,
-    if argument.nargs:
-
-        # If the argument is a list, split the data by the delimiter.
-        result = {}
-
-        # For each item in the data, split the item into key and value.
-        for item in data:
-
-            # Split the item into key and value.
-            key, value = item.split('=')
-
-            # Add the key and value to the result.
-            result[key] = value
-
-        # Return result.
-        return result
-
-    # If the argument is an object list,
-    if argument.action == 'append':
-
-        # Create a list to store the result.
-        result = []
-
-        # For each row object in the data,
-        for row in data:
-
-            # Create an object to store the key value pairs.
-            obj = {}
-
-            # Split the row by the delimiter.
-            items = row.split(';')
-
-            # For each item in the row,
-            for item in items:
-
-                # Split the item into key and value.
-                key, value = item.split('=')
-
-                # Add the key and value to the object.
-                obj[key] = value
-
-            # Add the object to the result.
-            result.append(obj)
-
-        # Return result.
-        return result