flamapy-fw 2.0.0.dev2__tar.gz → 2.0.0.dev3__tar.gz

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-fw
-Version: 2.0.0.dev2
+Version: 2.0.0.dev3
 Summary: Flamapy is a Python-based AAFM framework that takes into consideration previous AAFM tool designs and enables multi-solver and multi-metamodel support for the integration of AAFM tooling on the Python ecosystem.
 Home-page: https://github.com/flamapy/core
 Author: Flamapy

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/discover.py

@@ -100,7 +100,7 @@ class DiscoverMetamodels:
         operations = []
         for operation in self.get_operations():
             operations.append(operation.__name__)
-            base = operation.__base__.__name__
+            base = operation.__base__.__name__ if operation.__base__ else ''
             if base != 'ABC':
                 operations.append(base)
 
@@ -146,7 +146,7 @@ class DiscoverMetamodels:
         operations = []
         for operation in self.get_operations_by_plugin(plugin_name):
             operations.append(operation.__name__)
-            base = operation.__base__.__name__
+            base = operation.__base__.__name__ if operation.__base__ else ''
             if base != 'ABC':
                 operations.append(base)
 
@@ -189,7 +189,7 @@ class DiscoverMetamodels:
 
         if operation_name not in self.get_name_operations():
             raise OperationNotFound()
-
+        vm_temp = vm_orig
         if plugin_name is not None:
             plugin = self.plugins.get_plugin_by_name(plugin_name)
             #vm_temp = plugin.use_transformation_t2m(file)

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/operations/__init__.py

@@ -12,7 +12,8 @@ from .false_optional_features import \
 from .filter import Filter  # pylint: disable=cyclic-import
 from .configurations import Configurations  # pylint: disable=cyclic-import
 from .configurations_number import ConfigurationsNumber  # pylint: disable=cyclic-import
-from .estimated_configurations_number import EstimatedConfigurationsNumber  # pylint: disable=cyclic-import
+from .estimated_configurations_number import \
+    EstimatedConfigurationsNumber  # pylint: disable=cyclic-import
 from .satisfiable import Satisfiable  # pylint: disable=cyclic-import
 from .satisfiable_configuration import \
     SatisfiableConfiguration  # pylint: disable=cyclic-import
@@ -25,4 +26,5 @@ __all__ = ["Commonality", "DeadFeatures", "CoreFeatures", "FalseOptionalFeatures
            "ErrorDetection", "ErrorDiagnosis", "Operation", "Variability", "CountLeafs", 
            "AverageBranchingFactor", "Filter", "Sampling", 
            "EstimatedConfigurationsNumber", "AtomicSets", 'Metrics', 
-           "Satisfiable", "SatisfiableConfiguration", "Configurations", "ConfigurationsNumber"]
+           "Satisfiable", "SatisfiableConfiguration", 
+           "Configurations", "ConfigurationsNumber"]

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/operations/core_features.py

@@ -1,9 +1,9 @@
 from abc import abstractmethod
-from typing import Any
 
 from flamapy.core.operations import Operation
 from flamapy.core.models.variability_model import VariabilityElement
 
+
 class CoreFeatures(Operation):
 
     @abstractmethod

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/operations/dead_features.py

@@ -1,5 +1,4 @@
 from abc import abstractmethod
-from typing import Any
 
 from flamapy.core.operations import Operation
 from flamapy.core.models.variability_model import VariabilityElement

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/operations/false_optional_features.py

@@ -1,9 +1,9 @@
 from abc import abstractmethod
-from typing import Any
 
 from flamapy.core.operations import Operation
 from flamapy.core.models.variability_model import VariabilityElement
 
+
 class FalseOptionalFeatures(Operation):
     """A feature is defined as `false optional` if the selection of its parent makes the feature
     itself selected as well, although it is defined as optional and not mandatory.

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/operations/metrics_operation.py

@@ -1,8 +1,8 @@
-from abc import abstractmethod
+from abc import abstractmethod, ABCMeta
 import logging
 import json 
 
-from typing import Any, Optional, Collection
+from typing import Any, Optional, Collection, Type
 
 from flamapy.core.exceptions import FlamaException
 from flamapy.core.transformations.model_to_model import ModelToModel
@@ -12,7 +12,7 @@ from flamapy.core.models import VariabilityModel
 LOGGER = logging.getLogger('Metrics')
 
 
-class Metrics(Operation):
+class Metrics(Operation, metaclass=ABCMeta):
     """This is intended to host a set of metrics calculations for a variability model.
 
     This abstract class will recruit all its implementations and agregate the results
@@ -20,6 +20,11 @@ class Metrics(Operation):
     filter: Optional[list[str]] = None
     result: list[dict[str, Any]] = []
 
+    @property
+    @abstractmethod
+    def model_type_extension(self) -> str:
+        """Return the model type extension for the specific metric."""
+
     def __init__(self) -> None:
         self.model: Optional[VariabilityModel] = None
 
@@ -37,21 +42,24 @@ class Metrics(Operation):
         for subclass in Metrics.__subclasses__(): 
             # We first have to identify the metamodels that are being used and 
             # transform this model to the correspointing metamodel
-            metrics_operation = subclass()
-
+            metrics_operation = subclass()  # type: ignore
             if self.model.__class__.get_extension() == metrics_operation.model_type_extension:
                 # If its the metamodel that math the model, calculate the metrics
                 # Then we calculate the metrics for each metamodel
-                self.result.append(subclass().calculate_metamodel_metrics(model))
+                sub_metric = subclass()  # type: ignore
+                sub_metric.filter = self.filter
+                self.result.extend(sub_metric.calculate_metamodel_metrics(model))
             else:
                 # If not, search a transformation, transform and call the calutation
                 m_to_m = self._search_transformations(self.model.__class__.get_extension(), 
                                                       metrics_operation.model_type_extension)
                 dest_model = m_to_m(self.model).transform()
-                self.result.append(subclass().calculate_metamodel_metrics(dest_model))
+                sub_metric = subclass()  # type: ignore
+                sub_metric.filter = self.filter
+                self.result.extend(sub_metric.calculate_metamodel_metrics(dest_model))
         return self
 
-    def _search_transformations(self, orig: str, dest: str) -> ModelToModel:
+    def _search_transformations(self, orig: str, dest: str) -> Type[ModelToModel]:
         try:
             for m_to_m in ModelToModel.__subclasses__():
                 _orig = m_to_m.get_source_extension()

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/core/plugins.py

@@ -26,8 +26,8 @@ class Operations(UserList[Type[Operation]]):
     data: list[Type[Operation]]
 
     def search_by_name(self, name: str) -> Type[Operation]:
-        candidates = filter(
-            lambda op: name in [op.__name__, op.__base__.__name__],
+        candidates: filter[Type[Operation]] = filter(
+            lambda op: name in [op.__name__, op.__base__.__name__ if op.__base__ else ''],
             self.data
         )
 

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/metamodels/configuration_metamodel/models/configuration.py

@@ -1,5 +1,5 @@
-from typing import Any
-from flamapy.core.models import VariabilityModel, VariabilityElement
+from typing import Any, Iterator
+from flamapy.core.models import VariabilityModel
 
 
 class Configuration(VariabilityModel):
@@ -24,6 +24,6 @@ class Configuration(VariabilityModel):
 
     def __str__(self) -> str:
         return ', '.join([str(e) for e in self.get_selected_elements()])
-    
-    def __iter__(self):
+
+    def __iter__(self) -> Iterator[Any]:
         return iter(self.elements)

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy/metamodels/configuration_metamodel/transformations/configuration_basic_reader.py

@@ -1,7 +1,6 @@
 import csv
 
 from flamapy.core.transformations.text_to_model import TextToModel
-from flamapy.core.models.variability_model import VariabilityElement
 
 from flamapy.metamodels.configuration_metamodel.models.configuration import Configuration
 from flamapy.core.utils import file_exists

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy_fw.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-fw
-Version: 2.0.0.dev2
+Version: 2.0.0.dev3
 Summary: Flamapy is a Python-based AAFM framework that takes into consideration previous AAFM tool designs and enables multi-solver and multi-metamodel support for the integration of AAFM tooling on the Python ecosystem.
 Home-page: https://github.com/flamapy/core
 Author: Flamapy

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/flamapy_fw.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 README.md
 setup.py
-flamapy/commands/__init__.py
 flamapy/core/__init__.py
 flamapy/core/config.py
 flamapy/core/discover.py
@@ -35,7 +34,6 @@ flamapy/core/transformations/abstract_transformation.py
 flamapy/core/transformations/model_to_model.py
 flamapy/core/transformations/model_to_text.py
 flamapy/core/transformations/text_to_model.py
-flamapy/endpoint/diverso_lab.py
 flamapy/metamodels/configuration_metamodel/__init__.py
 flamapy/metamodels/configuration_metamodel/models/__init__.py
 flamapy/metamodels/configuration_metamodel/models/configuration.py

flamapy-fw-2.0.0.dev3/flamapy_fw.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+flamapy = flamapy.commands:flamapy_cli
+

{flamapy-fw-2.0.0.dev2 → flamapy-fw-2.0.0.dev3}/setup.py

@@ -13,7 +13,7 @@ dev_requirements = read_requirements("requirements-dev.txt")
 
 setuptools.setup(
     name="flamapy-fw",
-    version="2.0.0.dev2",
+    version="2.0.0.dev3",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="Flamapy is a Python-based AAFM framework that takes into consideration previous AAFM tool designs and enables multi-solver and multi-metamodel support for the integration of AAFM tooling on the Python ecosystem.",
@@ -32,7 +32,7 @@ setuptools.setup(
     },
     entry_points={
         'console_scripts': [
-            'flamapy-admin = flamapy.commands:flamapy_admin',
+            'flamapy = flamapy.commands:flamapy_cli',
         ],
     },
 )

flamapy-fw-2.0.0.dev2/flamapy/commands/__init__.py

@@ -1,88 +0,0 @@
-#!/usr/bin/python
-
-import argparse
-import os
-import sys
-from pathlib import Path
-from shutil import copytree
-
-from hug import development_runner
-
-
-def parser() -> argparse.ArgumentParser:
-    main_parser = argparse.ArgumentParser()
-    subparser = main_parser.add_subparsers(title="commands", dest="command")
-
-    new_plugin = subparser.add_parser("new_plugin", help="new_plugin")
-    new_plugin.add_argument('name', type=str, help='A name for your plugin. Ex: flama')
-    new_plugin.add_argument('extension', type=str, help='A extension for your plugin. Ex: fm')
-    new_plugin.add_argument('--path', default='.', type=str, help='Plugin project path.')
-
-    subparser.add_parser("cli", help="cli", description='flamapy_admin.py api: command line api')
-    return main_parser
-
-
-def cmd_new_plugin(options: argparse.Namespace) -> None:
-    name = options.name
-    ext = options.extension
-    dst = options.path
-    src = 'skel_metamodel/'
-
-    # Check DST exist
-    if not os.path.isdir(dst):
-        print(f"Folder {dst} not exist")
-        sys.exit()
-
-    # Check DST is empty
-    if len(os.listdir(dst)) != 0:
-        print(f"Folder {dst} is not empty")
-        sys.exit()
-
-    # Check DST has permissions to WRITE
-    if not os.access(dst, os.W_OK):
-        print(f"Folder {dst} has not write permissions")
-        sys.exit()
-
-    # Generating structure
-    print("Generating structure ...")
-
-    copy_files = copytree(src, dst, dirs_exist_ok=True)
-
-    for copy_file in Path(copy_files).glob('**/*'):
-        if copy_file.is_dir():
-            continue
-        with open(copy_file, "r", encoding="utf-8") as file:
-            lines = file.readlines()
-        with open(copy_file, "w", encoding="utf-8") as filewrite:
-            for line in lines:
-                out_line = line.replace('__NAME__', name.capitalize()).replace('__EXT__', ext)
-                filewrite.write(out_line)
-
-    os.rename(os.path.join(dst, 'flamapy/metamodels/__NAME__'),
-              os.path.join(dst, f'flamapy/metamodels/{name}'))
-    print("Done!")
-
-
-def cmd_cli() -> None:
-    subcommand = sys.argv[2:]
-    if not subcommand:
-        subcommand = ["help"]
-    sys.argv = [".", "-m", "flamapy.endpoint.diverso_lab", "cli", "-c"] + subcommand
-    development_runner.hug.interface.cli()
-
-
-def flamapy_admin() -> None:
-    main_parser = parser()
-
-    options, _ = main_parser.parse_known_args()
-    command = options.command
-
-    if command is None:
-        main_parser.print_help()
-        sys.exit()
-
-    if command == "new_plugin":
-        cmd_new_plugin(options)
-
-    if command == "cli":
-        cmd_cli()

flamapy-fw-2.0.0.dev2/flamapy/endpoint/diverso_lab.py

@@ -1,89 +0,0 @@
-from typing import Any, NewType, Optional
-import argparse
-from flamapy.core.discover import DiscoverMetamodels
-from flamapy.core.exceptions import (
-    ConfigurationNotFound,
-    OperationNotFound,
-    PluginNotFound,
-    TransformationNotFound,
-)
-
-dm = DiscoverMetamodels()
-
-PluginsType = NewType('PluginsType', dict[str, list[str]])
-OperationDict = NewType('OperationDict', dict[str, list[str]])
-OperationResult = NewType('OperationResult', dict[str, Any])
-
-
-def get_plugins() -> PluginsType:
-    """Get available plugins"""
-    plugins = dm.get_plugins()
-    return PluginsType({'plugins': plugins})
-
-
-def get_operations_name_by_plugin(plugin: str) -> OperationDict:
-    """Get available operations given a plugin name"""
-    operations = dm.get_name_operations_by_plugin(plugin)
-    return OperationDict({'operations': operations})
-
-
-def use_operation_from_file(
-    operation: str,
-    filename: str,
-    plugin: Optional[str] = None,
-    configuration_file: Optional[str] = None,
-) -> OperationResult:
-    """
-    Execute an operation given an operation and one input file. Optionally, you
-    can give a plugin as the last parameter.
-    """
-    try:
-        result = dm.use_operation_from_file(operation, filename, plugin, configuration_file)
-        return OperationResult({'result': result})
-    except OperationNotFound:
-        return OperationResult({'Error': 'Operation not found'})
-    except PluginNotFound:
-        return OperationResult({'Error': 'Plugin not found'})
-    except TransformationNotFound:
-        return OperationResult({'Error': 'Transformation not found'})
-    except FileNotFoundError:
-        return OperationResult({'Error': 'File not found'})
-    except ConfigurationNotFound:
-        return OperationResult({'Error': 'Configuration file not found'})
-
-
-def main():
-    parser = argparse.ArgumentParser(description="A simple CLI example")
-    subparsers = parser.add_subparsers(dest='command', help='sub-command help')
-
-    # Subparser for the 'get-plugins' command
-    parser_plugins = subparsers.add_parser('get-plugins', help='Get available plugins')
-
-    # Subparser for the 'get-operations' command
-    parser_operations = subparsers.add_parser('get-operations', help='Get available operations by plugin')
-    parser_operations.add_argument('plugin', type=str, help='Name of the plugin')
-
-    # Subparser for the 'use-operation' command
-    parser_use_operation = subparsers.add_parser('use-operation', help='Use an operation from file')
-    parser_use_operation.add_argument('operation', type=str, help='Operation to perform')
-    parser_use_operation.add_argument('filename', type=str, help='File to use for the operation')
-    parser_use_operation.add_argument('--plugin', type=str, help='Optional plugin name')
-    parser_use_operation.add_argument('--configuration_file', type=str, help='Optional configuration file')
-
-    args = parser.parse_args()
-
-    if args.command == 'get-plugins':
-        result = get_plugins()
-        print(result)
-    elif args.command == 'get-operations':
-        result = get_operations_name_by_plugin(args.plugin)
-        print(result)
-    elif args.command == 'use-operation':
-        result = use_operation_from_file(args.operation, args.filename, args.plugin, args.configuration_file)
-        print(result)
-    else:
-        parser.print_help()
-
-
-if __name__ == '__main__':
-    main()

flamapy-fw-2.0.0.dev2/flamapy_fw.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-flamapy-admin = flamapy.commands:flamapy_admin
-