Merge pull request #2790 from fermyon/generic-factors2

Make `Trigger` trait generic over `RuntimeFactors`

Cargo.toml

@@ -54,6 +54,7 @@ spin-locked-app = { path = "crates/locked-app" }
 spin-manifest = { path = "crates/manifest" }
 spin-oci = { path = "crates/oci" }
 spin-plugins = { path = "crates/plugins" }
+spin-runtime-factors = { path = "crates/runtime-factors" }
 spin-telemetry = { path = "crates/telemetry", features = [
   "tracing-log-compat",
 ] }
@@ -66,7 +67,7 @@ terminal = { path = "crates/terminal" }
 subprocess = "0.2.9"
 tempfile = "3.8.0"
 tokio = { version = "1.23", features = ["full"] }
-toml = "0.6"
+toml = "0.8"
 tracing = { workspace = true }
 url = "2.2.2"
 uuid = { version = "^1.0", features = ["v4"] }
@@ -109,9 +110,9 @@ vergen = { version = "^8.2.1", default-features = false, features = [
 default = ["llm"]
 all-tests = ["extern-dependencies-tests"]
 extern-dependencies-tests = []
-llm = ["spin-trigger-http/llm"]
-llm-metal = ["llm", "spin-trigger-http/llm-metal"]
-llm-cublas = ["llm", "spin-trigger-http/llm-cublas"]
+llm = ["spin-runtime-factors/llm"]
+llm-metal = ["llm", "spin-runtime-factors/llm-metal"]
+llm-cublas = ["llm", "spin-runtime-factors/llm-cublas"]
 
 [workspace]
 members = [

crates/factor-key-value/src/lib.rs

@@ -10,8 +10,7 @@ use std::{
 use anyhow::ensure;
 use host::KEY_VALUE_STORES_KEY;
 use spin_factors::{
-    ConfigureAppContext, Factor, FactorInstanceBuilder, InitContext, InstanceBuilders,
-    PrepareContext, RuntimeFactors,
+    ConfigureAppContext, Factor, FactorInstanceBuilder, InitContext, PrepareContext, RuntimeFactors,
 };
 use util::{CachingStoreManager, DefaultManagerGetter};
 
@@ -89,8 +88,7 @@ impl Factor for KeyValueFactor {
 
     fn prepare<T: RuntimeFactors>(
         &self,
-        ctx: PrepareContext<Self>,
-        _builders: &mut InstanceBuilders<T>,
+        ctx: PrepareContext<T, Self>,
     ) -> anyhow::Result<InstanceBuilder> {
         let app_state = ctx.app_state();
         let allowed_stores = app_state
@@ -133,6 +131,11 @@ impl AppState {
             .values()
             .any(|stores| stores.contains(label))
     }
+
+    /// Get a store by label.
+    pub async fn get_store(&self, label: &str) -> Option<Arc<dyn Store>> {
+        self.store_manager.get(label).await.ok()
+    }
 }
 
 pub struct InstanceBuilder {

crates/factor-llm/src/lib.rs

@@ -6,8 +6,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use spin_factors::{
-    ConfigureAppContext, Factor, InstanceBuilders, PrepareContext, RuntimeFactors,
-    SelfInstanceBuilder,
+    ConfigureAppContext, Factor, PrepareContext, RuntimeFactors, SelfInstanceBuilder,
 };
 use spin_locked_app::MetadataKey;
 use spin_world::v1::llm::{self as v1};
@@ -77,8 +76,7 @@ impl Factor for LlmFactor {
 
     fn prepare<T: RuntimeFactors>(
         &self,
-        ctx: PrepareContext<Self>,
-        _builders: &mut InstanceBuilders<T>,
+        ctx: PrepareContext<T, Self>,
     ) -> anyhow::Result<Self::InstanceBuilder> {
         let allowed_models = ctx
             .app_state()

crates/factor-outbound-http/src/lib.rs

@@ -14,8 +14,7 @@ use spin_factor_outbound_networking::{
     ComponentTlsConfigs, OutboundAllowedHosts, OutboundNetworkingFactor,
 };
 use spin_factors::{
-    anyhow, ConfigureAppContext, Factor, InstanceBuilders, PrepareContext, RuntimeFactors,
-    SelfInstanceBuilder,
+    anyhow, ConfigureAppContext, Factor, PrepareContext, RuntimeFactors, SelfInstanceBuilder,
 };
 use wasmtime_wasi_http::WasiHttpCtx;
 
@@ -59,10 +58,9 @@ impl Factor for OutboundHttpFactor {
 
     fn prepare<T: RuntimeFactors>(
         &self,
-        _ctx: PrepareContext<Self>,
-        builders: &mut InstanceBuilders<T>,
+        mut ctx: PrepareContext<T, Self>,
     ) -> anyhow::Result<Self::InstanceBuilder> {
-        let outbound_networking = builders.get_mut::<OutboundNetworkingFactor>()?;
+        let outbound_networking = ctx.instance_builder::<OutboundNetworkingFactor>()?;
         let allowed_hosts = outbound_networking.allowed_hosts();
         let component_tls_configs = outbound_networking.component_tls_configs().clone();
         Ok(InstanceState {

crates/factor-outbound-mqtt/src/lib.rs

@@ -9,8 +9,7 @@ use rumqttc::{AsyncClient, Event, Incoming, Outgoing, QoS};
 use spin_core::async_trait;
 use spin_factor_outbound_networking::OutboundNetworkingFactor;
 use spin_factors::{
-    ConfigureAppContext, Factor, InstanceBuilders, PrepareContext, RuntimeFactors,
-    SelfInstanceBuilder,
+    ConfigureAppContext, Factor, PrepareContext, RuntimeFactors, SelfInstanceBuilder,
 };
 use spin_world::v2::mqtt::{self as v2, Error, Qos};
 use tokio::sync::Mutex;
@@ -49,11 +48,10 @@ impl Factor for OutboundMqttFactor {
 
     fn prepare<T: RuntimeFactors>(
         &self,
-        _ctx: PrepareContext<Self>,
-        builders: &mut InstanceBuilders<T>,
+        mut ctx: PrepareContext<T, Self>,
     ) -> anyhow::Result<Self::InstanceBuilder> {
-        let allowed_hosts = builders
-            .get_mut::<OutboundNetworkingFactor>()?
+        let allowed_hosts = ctx
+            .instance_builder::<OutboundNetworkingFactor>()?
             .allowed_hosts();
         Ok(InstanceState::new(
             allowed_hosts,

crates/factor-outbound-mysql/src/lib.rs

@@ -32,11 +32,10 @@ impl<C: Send + Sync + Client + 'static> Factor for OutboundMysqlFactor<C> {
 
     fn prepare<T: spin_factors::RuntimeFactors>(
         &self,
-        _ctx: spin_factors::PrepareContext<Self>,
-        builders: &mut spin_factors::InstanceBuilders<T>,
+        mut ctx: spin_factors::PrepareContext<T, Self>,
     ) -> anyhow::Result<Self::InstanceBuilder> {
-        let allowed_hosts = builders
-            .get_mut::<OutboundNetworkingFactor>()?
+        let allowed_hosts = ctx
+            .instance_builder::<OutboundNetworkingFactor>()?
             .allowed_hosts();
         Ok(InstanceState {
             allowed_hosts,

crates/factor-outbound-networking/src/lib.rs

@@ -13,8 +13,7 @@ use spin_factor_variables::VariablesFactor;
 use spin_factor_wasi::{SocketAddrUse, WasiFactor};
 use spin_factors::{
     anyhow::{self, Context},
-    ConfigureAppContext, Error, Factor, FactorInstanceBuilder, InstanceBuilders, PrepareContext,
-    RuntimeFactors,
+    ConfigureAppContext, Error, Factor, FactorInstanceBuilder, PrepareContext, RuntimeFactors,
 };
 
 pub use config::{
@@ -82,17 +81,16 @@ impl Factor for OutboundNetworkingFactor {
 
     fn prepare<T: RuntimeFactors>(
         &self,
-        ctx: PrepareContext<Self>,
-        builders: &mut InstanceBuilders<T>,
+        mut ctx: PrepareContext<T, Self>,
     ) -> anyhow::Result<Self::InstanceBuilder> {
         let hosts = ctx
             .app_state()
             .component_allowed_hosts
             .get(ctx.app_component().id())
             .cloned()
             .context("missing component allowed hosts")?;
-        let resolver = builders
-            .get_mut::<VariablesFactor>()?
+        let resolver = ctx
+            .instance_builder::<VariablesFactor>()?
             .expression_resolver()
             .clone();
         let allowed_hosts_future = async move {
@@ -103,7 +101,7 @@ impl Factor for OutboundNetworkingFactor {
         .boxed()
         .shared();
 
-        match builders.get_mut::<WasiFactor>() {
+        match ctx.instance_builder::<WasiFactor>() {
             Ok(wasi_builder) => {
                 // Update Wasi socket allowed ports
                 let allowed_hosts = OutboundAllowedHosts {