Move Spin CLI runtime factors to their own crate

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -57,6 +57,7 @@ spin-manifest = { path = "crates/manifest" }
 spin-oci = { path = "crates/oci" }
 spin-plugins = { path = "crates/plugins" }
 spin-runtime-config = { path = "crates/runtime-config" }
+spin-runtime-factors = { path = "crates/runtime-factors" }
 spin-telemetry = { path = "crates/telemetry", features = [
   "tracing-log-compat",
 ] }
@@ -112,9 +113,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 = [

Cargo.toml

@@ -25,6 +25,7 @@ spin-factor-sqlite = { path = "../factor-sqlite" }
 spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
+spin-runtime-factors = { path = "../runtime-factors" }
 spin-sqlite = { path = "../sqlite" }
 spin-trigger = { path = "../trigger" }
 toml = "0.8"

crates/runtime-config/Cargo.toml

@@ -19,6 +19,7 @@ use spin_factors::{
     runtime_config::toml::TomlKeyTracker, FactorRuntimeConfigSource, RuntimeConfigSourceFinalizer,
 };
 use spin_key_value_spin::{SpinKeyValueRuntimeConfig, SpinKeyValueStore};
+use spin_runtime_factors::TriggerFactorsRuntimeConfig;
 use spin_sqlite as sqlite;
 use spin_trigger::cli::UserProvidedPath;
 
@@ -159,10 +160,8 @@ where
     }
 }
 
-impl From<ResolvedRuntimeConfig<spin_trigger::TriggerFactorsRuntimeConfig>>
-    for spin_trigger::TriggerFactorsRuntimeConfig
-{
-    fn from(value: ResolvedRuntimeConfig<spin_trigger::TriggerFactorsRuntimeConfig>) -> Self {
+impl From<ResolvedRuntimeConfig<TriggerFactorsRuntimeConfig>> for TriggerFactorsRuntimeConfig {
+    fn from(value: ResolvedRuntimeConfig<TriggerFactorsRuntimeConfig>) -> Self {
         value.runtime_config
     }
 }
@@ -432,7 +431,7 @@ fn sqlite_config_resolver(
     ))
 }
 
-impl TryFrom<TomlRuntimeConfigSource<'_, '_>> for spin_trigger::TriggerFactorsRuntimeConfig {
+impl TryFrom<TomlRuntimeConfigSource<'_, '_>> for TriggerFactorsRuntimeConfig {
     type Error = anyhow::Error;
 
     fn try_from(value: TomlRuntimeConfigSource<'_, '_>) -> Result<Self, Self::Error> {

crates/runtime-config/src/lib.rs

@@ -0,0 +1,37 @@
+[package]
+name = "spin-runtime-factors"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+
+[features]
+llm = ["spin-factor-llm/llm"]
+llm-metal = ["spin-factor-llm/llm-metal"]
+llm-cublas = ["spin-factor-llm/llm-cublas"]
+
+[dependencies]
+anyhow = "1"
+clap = { version = "3.1.18", features = ["derive", "env"] }
+spin-common = { path = "../common" }
+spin-factor-key-value = { path = "../factor-key-value" }
+spin-factor-llm = { path = "../factor-llm" }
+spin-factor-outbound-http = { path = "../factor-outbound-http" }
+spin-factor-outbound-mqtt = { path = "../factor-outbound-mqtt" }
+spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" }
+spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
+spin-factor-outbound-pg = { path = "../factor-outbound-pg" }
+spin-factor-outbound-redis = { path = "../factor-outbound-redis" }
+spin-factor-sqlite = { path = "../factor-sqlite" }
+spin-factor-variables = { path = "../factor-variables" }
+spin-factor-wasi = { path = "../factor-wasi" }
+spin-factors = { path = "../factors" }
+spin-telemetry = { path = "../telemetry" }
+terminal = { path = "../terminal" }
+tracing = { workspace = true }
+
+[lints]
+workspace = true

crates/runtime-factors/Cargo.toml

@@ -7,11 +7,6 @@ edition = { workspace = true }
 [lib]
 doctest = false
 
-[features]
-llm = ["spin-trigger/llm"]
-llm-metal = ["spin-trigger/llm-metal"]
-llm-cublas = ["spin-trigger/llm-cublas"]
-
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"

crates/trigger/src/factors.rs renamed to crates/runtime-factors/src/lib.rs

@@ -8,11 +8,6 @@ homepage.workspace = true
 repository.workspace = true
 rust-version.workspace = true
 
-[features]
-llm = ["spin-factor-llm/llm"]
-llm-metal = ["spin-factor-llm/llm-metal"]
-llm-cublas = ["spin-factor-llm/llm-cublas"]
-
 [dependencies]
 anyhow = "1"
 clap = { version = "3.1.18", features = ["derive", "env"] }
@@ -27,21 +22,12 @@ spin-componentize = { path = "../componentize" }
 spin-compose = { path = "../compose" }
 spin-core = { path = "../core" }
 spin-factor-key-value = { path = "../factor-key-value" }
-spin-factor-llm = { path = "../factor-llm" }
-spin-factor-outbound-http = { path = "../factor-outbound-http" }
-spin-factor-outbound-mqtt = { path = "../factor-outbound-mqtt" }
-spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" }
-spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
-spin-factor-outbound-pg = { path = "../factor-outbound-pg" }
-spin-factor-outbound-redis = { path = "../factor-outbound-redis" }
 spin-factor-sqlite = { path = "../factor-sqlite" }
-spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-factors-executor = { path = "../factors-executor" }
 spin-runtime-config = { path = "../runtime-config" }
 spin-telemetry = { path = "../telemetry" }
-terminal = { path = "../terminal" }
 tokio = { version = "1.23", features = ["fs", "rt"] }
 toml = "0.8"
 tracing = { workspace = true }

crates/trigger-http/Cargo.toml

@@ -1,11 +1,11 @@
 mod launch_metadata;
 mod sqlite_statements;
+mod stdio;
 mod summary;
 
 use std::future::Future;
 use std::path::PathBuf;
 
-pub use crate::stdio::StdioLoggingExecutorHooks;
 use anyhow::{Context, Result};
 use clap::{Args, IntoApp, Parser};
 use spin_app::App;
@@ -15,12 +15,13 @@ use spin_common::url::parse_file_url;
 use spin_core::async_trait;
 use spin_factors::RuntimeFactors;
 use spin_factors_executor::{ComponentLoader, FactorsExecutor};
-pub use sqlite_statements::SqlStatementExecutorHook;
-pub use summary::KeyValueDefaultStoreSummaryHook;
 
-use crate::stdio::FollowComponents;
 use crate::{Trigger, TriggerApp};
 pub use launch_metadata::LaunchMetadata;
+pub use sqlite_statements::SqlStatementExecutorHook;
+use stdio::FollowComponents;
+pub use stdio::StdioLoggingExecutorHooks;
+pub use summary::KeyValueDefaultStoreSummaryHook;
 
 pub const APP_LOG_DIR: &str = "APP_LOG_DIR";
 pub const DISABLE_WASMTIME_CACHE: &str = "DISABLE_WASMTIME_CACHE";

crates/trigger/Cargo.toml

@@ -7,11 +7,11 @@ use std::{
 use anyhow::{Context, Result};
 use spin_common::ui::quoted_path;
 use spin_core::async_trait;
+use spin_factor_wasi::WasiFactor;
+use spin_factors::{HasInstanceBuilder, RuntimeFactors};
 use spin_factors_executor::ExecutorHooks;
 use tokio::io::AsyncWrite;
 
-use crate::factors::TriggerFactors;
-
 /// Which components should have their logs followed on stdout/stderr.
 #[derive(Clone, Debug, Default)]
 pub enum FollowComponents {
@@ -89,10 +89,10 @@ impl StdioLoggingExecutorHooks {
 }
 
 #[async_trait]
-impl<U> ExecutorHooks<TriggerFactors, U> for StdioLoggingExecutorHooks {
+impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for StdioLoggingExecutorHooks {
     async fn configure_app(
         &mut self,
-        configured_app: &spin_factors::ConfiguredApp<TriggerFactors>,
+        configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         self.validate_follows(configured_app.app())?;
         if let Some(dir) = &self.log_dir {
@@ -107,10 +107,12 @@ impl<U> ExecutorHooks<TriggerFactors, U> for StdioLoggingExecutorHooks {
 
     fn prepare_instance(
         &self,
-        builder: &mut spin_factors_executor::FactorsInstanceBuilder<TriggerFactors, U>,
+        builder: &mut spin_factors_executor::FactorsInstanceBuilder<F, U>,
     ) -> anyhow::Result<()> {
         let component_id = builder.app_component().id().to_string();
-        let wasi_builder = builder.factor_builders().wasi();
+        let Some(wasi_builder) = builder.factor_builders().for_factor::<WasiFactor>() else {
+            return Ok(());
+        };
         wasi_builder.stdout_pipe(self.component_stdio_writer(
             &component_id,
             "stdout",