Improve dag parsing logic

tdp/cli/commands/default_diff.py

@@ -35,7 +35,7 @@ def default_diff(collections: Collections, vars: Path, service: Optional[str] =
             service_diff(collections, service_variables)
 
 
-def service_diff(collections, service):
+def service_diff(collections: Collections, service):
     """Computes the difference between the default variables from a service, and the variables from your service variables inside your tdp_vars.
 
     Args:
@@ -44,12 +44,14 @@ def service_diff(collections, service):
     """
     # key: filename with extension, value: PosixPath(filepath)
     default_service_vars_paths = OrderedDict()
-    for collection in collections.values():
-        default_vars = collection.get_service_default_vars(service.name)
-        if not default_vars:
+    for collection_default_vars_dir in collections.default_vars_dirs.values():
+        service_default_vars_dir = collection_default_vars_dir / service.name
+        if not service_default_vars_dir.exists():
             continue
-        for name, path in default_vars:
-            default_service_vars_paths.setdefault(name, []).append(path)
+        for default_vars_path in service_default_vars_dir.iterdir():
+            default_service_vars_paths.setdefault(default_vars_path.name, []).append(
+                default_vars_path
+            )
 
     for (
         default_service_vars_filename,

tdp/cli/commands/vars/edit.py

@@ -96,7 +96,7 @@ def edit(
     # Check if component exists
     entity_name = parse_hostable_entity_name(variables_file.stem)
     if isinstance(entity_name, ServiceComponentName):
-        if entity_name not in collections.get_components_from_service(service_name):
+        if entity_name not in collections.hostable_entities[service_name]:
             raise click.ClickException(
                 f"Error unknown component '{entity_name.component}' for service '{entity_name.service}'"
             )

tdp/cli/params/collections_option.py

@@ -6,7 +6,6 @@
 import click
 from click.decorators import FC
 
-from tdp.core.collection import Collection
 from tdp.core.collections import Collections
 
 
@@ -29,10 +28,7 @@ def _collections_from_paths(
     if not value:
         raise click.BadParameter("cannot be empty", ctx=ctx, param=param)
 
-    collections_list = [Collection.from_path(path) for path in value]
-    collections = Collections.from_collection_list(collections_list)
-
-    return collections
+    return Collections.from_collection_paths(value)
 
 
 def collections_option(func: FC) -> FC:

tdp/cli/params/status/component_argument.py

@@ -19,8 +19,7 @@ def _check_component(
     collections: Collections = ctx.params["collections"]
     service: str = ctx.params["service"]
     if value and value not in [
-        sc_name.component
-        for sc_name in collections.get_components_from_service(service)
+        sc_name.component for sc_name in collections.hostable_entities[service]
     ]:
         raise click.UsageError(
             f"Component '{value}' does not exists in service '{service}'."

tdp/core/collections/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2022 TOSIT.IO
+# SPDX-License-Identifier: Apache-2.0
+
+from .collections import Collections