Allowing AddReactiveDimmer to be used on ForLights (#227)

* Dimmers are not possible to be configured per light.

* Grouping dimmers by time between steps

* Using only relevant dimmers in the dimming context.

* Using the options of a group rather than one option for all dimmers.

* Passing light context through node and pipeline libraries.

* Adding pipeline context to pipeline lights.

Author: DevJasperNL

src/CodeCasa.AutomationPipelines.Lights/Extensions/LightTransitionReactiveNodeConfiguratorExtensions.cs

@@ -15,7 +15,7 @@ public static ILightTransitionReactiveNodeConfigurator<T> HandleExternalLightSta
             configurator.AddNodeSource(sp =>
             {
                 var light = sp.GetRequiredService<ILight>();
-                var context = sp.GetRequiredService<LightPipelineContext>();
+                var context = sp.GetService<LightPipelineContext>() ?? throw new InvalidOperationException($"{nameof(HandleExternalLightStateChanges)} can only be applies to reactive nodes hosted in a pipeline.");
                 return light.StateChanges()
                     .Where(l => 
                         l.New?.Brightness == 0 && 

src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.cs

@@ -59,7 +59,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddNode(Func<IServiceProvide
         public ILightTransitionPipelineConfigurator<TLight> AddReactiveNode(
             Action<ILightTransitionReactiveNodeConfigurator<TLight>> configure)
         {
-            var nodes = reactiveNodeFactory.CreateReactiveNodes(serviceProvider, NodeContainers.Select(nc => nc.Value.Light),
+            var nodes = reactiveNodeFactory.CreateReactiveNodes(serviceProvider, NodeContainers.ToDictionary(nc => nc.Value.Light, nc => nc.Value.ServiceProvider),
                 configure
                     .ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)
                     .SetObservableSharingStrategy(_observableSharingStrategy));
@@ -70,9 +70,10 @@ public ILightTransitionPipelineConfigurator<TLight> AddReactiveNode(
         /// <inheritdoc/>
         public ILightTransitionPipelineConfigurator<TLight> AddPipeline(Action<ILightTransitionPipelineConfigurator<TLight>> configure)
         {
-            var pipelines = lightPipelineFactory.CreateLightPipelines(serviceProvider, NodeContainers.Select(c => c.Value.Light), configure
-                .ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)
-                .SetObservableSharingStrategy(_observableSharingStrategy));
+            var pipelines = lightPipelineFactory.CreateLightPipelines(serviceProvider, NodeContainers.ToDictionary(nc => nc.Value.Light, nc => nc.Value.ServiceProvider), 
+                configure
+                    .ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false)
+                    .SetObservableSharingStrategy(_observableSharingStrategy));
             NodeContainers.ForEach(kvp => kvp.Value.AddNode(pipelines[kvp.Key]));
             return this;
         }

src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightPipelineFactory.cs

@@ -28,7 +28,7 @@ public IAsyncDisposable SetupLightPipeline<TLight>(TLight light,
             Action<ILightTransitionPipelineConfigurator<TLight>> pipelineBuilder) where TLight : ILight
         {
             var disposables = new CompositeAsyncDisposable();
-            var pipelines = CreateLightPipelines(rootServiceProvider, light.Flatten().Cast<TLight>(), pipelineBuilder);
+            var pipelines = CreateLightPipelines(rootServiceProvider, light.Flatten().Cast<TLight>().ToDictionary(l => l, _ => rootServiceProvider), pipelineBuilder);
             foreach (var pipeline in pipelines.Values)
             {
                 disposables.Add(pipeline);
@@ -49,13 +49,13 @@ public IPipeline<LightTransition> CreateLightPipeline<TLight>(TLight light,
         /// <summary>
         /// Creates a single light pipeline for the specified light.
         /// </summary>
-        /// <param name="serviceProvider">The service provider passed to the configurators. This method is used within the library to allow passing the composite service provider. This is necessary because the factory will only receive the root service provider even if resolved inside the context scope.</param>
+        /// <param name="compositeServiceProvider">The service provider passed to the configurators. This method is used within the library to allow passing the composite service provider. This is necessary because the factory will only receive the root service provider even if resolved inside the context scope.</param>
         /// <param name="light">The light to create a pipeline for.</param>
         /// <param name="pipelineBuilder">An action to configure the pipeline behavior.</param>
         /// <returns>A configured pipeline for controlling the specified light.</returns>
-        internal IPipeline<LightTransition> CreateLightPipeline<TLight>(IServiceProvider serviceProvider, TLight light, Action<ILightTransitionPipelineConfigurator<TLight>> pipelineBuilder) where TLight : ILight
+        internal IPipeline<LightTransition> CreateLightPipeline<TLight>(IServiceProvider compositeServiceProvider, TLight light, Action<ILightTransitionPipelineConfigurator<TLight>> pipelineBuilder) where TLight : ILight
         {
-            return CreateLightPipelines(serviceProvider, [light], pipelineBuilder)[light.Id];
+            return CreateLightPipelines(compositeServiceProvider, new Dictionary<TLight, IServiceProvider> { { light, compositeServiceProvider } }, pipelineBuilder)[light.Id];
         }
 
         /// <summary>
@@ -65,15 +65,15 @@ internal IPipeline<LightTransition> CreateLightPipeline<TLight>(IServiceProvider
         /// </summary>
         /// <typeparam name="TLight">The type of light, constrained to <see cref="ILight"/>.</typeparam>
         /// <param name="pipelineConfigurator">The configuration action used to initialize the pipeline logic.</param>
-        /// <param name="lights">The collection of lights for which pipelines will be created.</param>
+        /// <param name="lightsAndProviders">Mapping to the lights to their respective service providers. This allows the factory to create context-specific scopes for each light.</param>
         /// <returns>
         /// A <see cref="Dictionary{TKey, TValue}"/> where the key is the light ID and the value is a 
         /// function that resolves the corresponding <see cref="IPipelineNode{LightTransition}"/>.
         /// </returns>
-        internal Dictionary<string, Func<IServiceProvider, IPipelineNode<LightTransition>>> CreateCompositePipelineFactoryMap<TLight>(Action<ILightTransitionPipelineConfigurator<TLight>> pipelineConfigurator, TLight[] lights) where TLight : ILight
+        internal Dictionary<string, Func<IServiceProvider, IPipelineNode<LightTransition>>> CreateCompositePipelineFactoryMap<TLight>(Action<ILightTransitionPipelineConfigurator<TLight>> pipelineConfigurator, Dictionary<TLight, IServiceProvider> lightsAndProviders) where TLight : ILight
         {
-            var baseFactory = new CompositePipelineFactory<TLight>(pipelineConfigurator, lights);
-            return lights
+            var baseFactory = new CompositePipelineFactory<TLight>(pipelineConfigurator, lightsAndProviders);
+            return lightsAndProviders.Keys
                 .ToDictionary(
                     l => l.Id,
                     l =>
@@ -86,20 +86,20 @@ internal Dictionary<string, Func<IServiceProvider, IPipelineNode<LightTransition
         /// <summary>
         /// Creates light pipelines for multiple light entities.
         /// </summary>
-        /// <param name="serviceProvider">The service provider passed to the configurators. This method is used within the library to allow passing the composite service provider. This is necessary because the factory will only receive the root service provider even if resolved inside the context scope.</param>
-        /// <param name="lights">The light entities to create pipelines for.</param>
+        /// <param name="compositeServiceProvider">The service provider passed to the configurators. This method is used within the library to allow passing the composite service provider. This is necessary because the factory will only receive the root service provider even if resolved inside the context scope.</param>
+        /// <param name="lightsAndProviders">Mapping to the lights to their respective service providers. This allows the factory to create context-specific scopes for each light.</param>
         /// <param name="pipelineBuilder">An action to configure the pipeline behavior.</param>
         /// <returns>A dictionary mapping light IDs to their corresponding pipelines.</returns>
-        internal Dictionary<string, IPipeline<LightTransition>> CreateLightPipelines<TLight>(IServiceProvider serviceProvider, IEnumerable<TLight> lights, Action<ILightTransitionPipelineConfigurator<TLight>> pipelineBuilder) where TLight : ILight
+        internal Dictionary<string, IPipeline<LightTransition>> CreateLightPipelines<TLight>(IServiceProvider compositeServiceProvider, Dictionary<TLight, IServiceProvider> lightsAndProviders, Action<ILightTransitionPipelineConfigurator<TLight>> pipelineBuilder) where TLight : ILight
         {
             // Note: we simply assume that these are not groups.
-            var lightArray = lights.ToArray();
+            var lightArray = lightsAndProviders.Keys.ToArray();
             if (!lightArray.Any())
             {
                 return new Dictionary<string, IPipeline<LightTransition>>();
             }
 
-            var lightContextScopes = lightArray.ToDictionary(l => l.Id, serviceProvider.CreateLightPipelineContextScope);
+            var lightContextScopes = lightsAndProviders.ToDictionary(kvp => kvp.Key.Id, kvp => kvp.Value.CreateLightPipelineContextScope(kvp.Key));
             var configurators = 
                 lightArray.ToDictionary(l => l.Id,
                     l =>
@@ -111,9 +111,9 @@ internal Dictionary<string, IPipeline<LightTransition>> CreateLightPipelines<TLi
             ILightTransitionPipelineConfigurator<TLight> configurator = lightArray.Length == 1
                 ? configurators[lightArray[0].Id]
                 : new CompositeLightTransitionPipelineConfigurator<TLight>(
-                    serviceProvider,
-                    serviceProvider.GetRequiredService<LightPipelineFactory>(),
-                    serviceProvider.GetRequiredService<ReactiveNodeFactory>(),
+                    compositeServiceProvider,
+                    compositeServiceProvider.GetRequiredService<LightPipelineFactory>(),
+                    compositeServiceProvider.GetRequiredService<ReactiveNodeFactory>(),
                     configurators);
             pipelineBuilder(configurator);
 
@@ -164,7 +164,7 @@ internal Dictionary<string, IPipeline<LightTransition>> CreateLightPipelines<TLi
             });
         }
 
-        private class CompositePipelineFactory<TLight>(Action<ILightTransitionPipelineConfigurator<TLight>> pipelineConfigurator, IEnumerable<TLight> lights) where TLight : ILight
+        private class CompositePipelineFactory<TLight>(Action<ILightTransitionPipelineConfigurator<TLight>> pipelineConfigurator, Dictionary<TLight, IServiceProvider> lightsAndProviders) where TLight : ILight
         {
             private readonly Lock _lock = new();
             private Dictionary<string, IPipeline<LightTransition>>? _pipelines;
@@ -176,7 +176,7 @@ public IPipeline<LightTransition> GetOrCreatePipeline(IServiceProvider servicePr
                     if (_pipelines == null)
                     {
                         var pipelineFactory = serviceProvider.GetRequiredService<LightPipelineFactory>();
-                        _pipelines = pipelineFactory.CreateLightPipelines(serviceProvider, lights, pipelineConfigurator);
+                        _pipelines = pipelineFactory.CreateLightPipelines(serviceProvider, lightsAndProviders, pipelineConfigurator);
                     }
 
                     return _pipelines[lightId];

src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.Switch.cs

@@ -75,7 +75,7 @@ public ILightTransitionPipelineConfigurator<TLight> Switch(IObservable<bool> obs
     /// <inheritdoc/>
     public ILightTransitionPipelineConfigurator<TLight> Switch<TObservable>(Func<IServiceProvider, IPipelineNode<LightTransition>> trueNodeFactory, Func<IServiceProvider, IPipelineNode<LightTransition>> falseNodeFactory) where TObservable : IObservable<bool>
     {
-        var observable = ActivatorUtilities.CreateInstance<TObservable>(_serviceProvider);
+        var observable = ActivatorUtilities.CreateInstance<TObservable>(ServiceProvider);
         return Switch(observable, trueNodeFactory, falseNodeFactory);
     }
 
@@ -92,7 +92,7 @@ public ILightTransitionPipelineConfigurator<TLight> Switch(IObservable<bool> obs
     /// <inheritdoc/>
     public ILightTransitionPipelineConfigurator<TLight> Switch<TObservable, TTrueNode, TFalseNode>() where TObservable : IObservable<bool> where TTrueNode : IPipelineNode<LightTransition> where TFalseNode : IPipelineNode<LightTransition>
     {
-        var observable = ActivatorUtilities.CreateInstance<TObservable>(_serviceProvider);
+        var observable = ActivatorUtilities.CreateInstance<TObservable>(ServiceProvider);
         return Switch<TTrueNode, TFalseNode>(observable);
     }
 
@@ -108,7 +108,7 @@ public ILightTransitionPipelineConfigurator<TLight> Switch<TTrueNode, TFalseNode
     /// <inheritdoc/>
     public ILightTransitionPipelineConfigurator<TLight> AddReactiveNodeSwitch<TObservable>(Action<ILightTransitionReactiveNodeConfigurator<TLight>> trueConfigure, Action<ILightTransitionReactiveNodeConfigurator<TLight>> falseConfigure, InstantiationScope instantiationScope = InstantiationScope.Shared) where TObservable : IObservable<bool>
     {
-        var observable = ActivatorUtilities.CreateInstance<TObservable>(_serviceProvider);
+        var observable = ActivatorUtilities.CreateInstance<TObservable>(ServiceProvider);
         return AddReactiveNodeSwitch(observable, trueConfigure, falseConfigure, instantiationScope);
     }
 
@@ -125,7 +125,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddReactiveNodeSwitch(IObser
     /// <inheritdoc/>
     public ILightTransitionPipelineConfigurator<TLight> AddPipelineSwitch<TObservable>(Action<ILightTransitionPipelineConfigurator<TLight>> trueConfigure, Action<ILightTransitionPipelineConfigurator<TLight>> falseConfigure, InstantiationScope instantiationScope = InstantiationScope.Shared) where TObservable : IObservable<bool>
     {
-        var observable = ActivatorUtilities.CreateInstance<TObservable>(_serviceProvider);
+        var observable = ActivatorUtilities.CreateInstance<TObservable>(ServiceProvider);
         return AddPipelineSwitch(observable, trueConfigure, falseConfigure, instantiationScope);
     }
 
@@ -143,7 +143,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineSwitch(IObservabl
     public ILightTransitionPipelineConfigurator<TLight> Switch<TObservable>(Action<ILightTransitionSwitchConfigurator<TLight>> configure)
         where TObservable : IObservable<bool>
     {
-        var observable = ActivatorUtilities.CreateInstance<TObservable>(_serviceProvider);
+        var observable = ActivatorUtilities.CreateInstance<TObservable>(ServiceProvider);
         return Switch(observable, configure);
     }