@on_viceroy test harness

Makefile

@@ -10,7 +10,6 @@ DEV_MODE ?= 1
 
 # Rust crate path
 FASTLY_COMPUTE_PY_MANIFEST := $(abspath crates/fastly-compute-py/Cargo.toml)
-FASTLY_COMPUTE_PY_BIN := target/release/fastly_compute_py_build
 
 # Select build tool based on DEV_MODE
 ifeq ($(DEV_MODE),1)
@@ -28,7 +27,7 @@ EXAMPLES_DIR := examples
 COMPUTE_WIT := wit/deps/fastly/compute.wit
 
 # Define all available examples (add new ones here)
-EXAMPLES := bottle-app flask-app backend-requests game-of-life config-store logging
+EXAMPLES := bottle-app flask-app backend-requests game-of-life logging
 
 # Default example for serve target
 EXAMPLE ?= bottle-app

crates/fastly-compute-py/src/cli.rs

@@ -30,5 +30,10 @@ pub enum Command {
         /// Entry point module (default: main or auto-detect)
         #[arg(short, long)]
         entry: Option<String>,
+
+        /// Virtual environment in which to look for modules (default:
+        /// VIRTUAL_ENV env var or .venv)
+        #[arg(short, long)]
+        virtualenv: Option<PathBuf>,
     },
 }

crates/fastly-compute-py/src/config.rs

@@ -9,6 +9,7 @@ use crate::cli::Command;
 pub struct ConfigSource {
     pub entry: Option<String>,
     pub output: Option<PathBuf>,
+    pub virtualenv: Option<PathBuf>,
 }
 
 #[derive(Deserialize, Debug)]
@@ -61,12 +62,17 @@ impl ConfigBuilder {
     /// Add CLI command arguments as a configuration source
     pub fn with_command(mut self, command: &Command) -> Self {
         match command {
-            Command::Build { entry, output } => {
-                if entry.is_some() || output.is_some() {
-                    log::debug!("Config from CLI: entry={entry:?}, output={output:?}");
+            Command::Build {
+                entry,
+                output,
+                virtualenv,
+            } => {
+                if entry.is_some() || output.is_some() || virtualenv.is_some() {
+                    log::debug!("Config from CLI: entry={entry:?}, output={output:?}, virtualenv={virtualenv:?}");
                 }
                 self.cli.entry = entry.clone();
                 self.cli.output = output.clone();
+                self.cli.virtualenv = virtualenv.clone();
             }
         }
         self
@@ -89,12 +95,17 @@ impl ConfigBuilder {
                 PathBuf::from("bin/main.wasm")
             });
 
-        Config { entry, output }
+        Config {
+            entry,
+            output,
+            virtualenv: self.cli.virtualenv,
+        }
     }
 }
 
 #[derive(Debug)]
 pub struct Config {
     pub entry: String,
     pub output: PathBuf,
+    pub virtualenv: Option<PathBuf>,
 }

crates/fastly-compute-py/src/lib.rs

@@ -93,7 +93,7 @@ pub fn run_main(cli: &Cli) -> Result<()> {
     log::info!("  Entry point: {}", config.entry);
     log::info!("  Output: {}", config.output.display());
 
-    build(config.output.clone(), config.entry)?;
+    build(config.output.clone(), config.entry, config.virtualenv)?;
 
     log::info!("✓ Build complete: {}", config.output.display());
 
@@ -118,7 +118,7 @@ fn _fastly_compute_py(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     Ok(())
 }
 
-pub fn build(output: PathBuf, entry_name: String) -> Result<()> {
+pub fn build(output: PathBuf, entry_name: String, virtualenv: Option<PathBuf>) -> Result<()> {
     let temp_dir = TempDir::new()?;
     let temp_path = temp_dir.path();
 
@@ -132,7 +132,7 @@ pub fn build(output: PathBuf, entry_name: String) -> Result<()> {
     let temp_component_wasm_path = temp_path.join("component.wasm");
 
     log::info!("  Resolving Python dependencies...");
-    let python_path = site_packages::build_python_path()?;
+    let python_path = site_packages::build_python_path(&virtualenv)?;
     log::debug!("Using python_path: {:?}", python_path);
 
     let python_path_refs: Vec<&str> = python_path.iter().map(|s| s.as_str()).collect();

crates/fastly-compute-py/src/site_packages.rs

@@ -5,13 +5,13 @@ use std::path::{Path, PathBuf};
 
 /// Build a python_path list suitable for componentize-py.
 /// This includes the current directory and all site-packages paths.
-pub fn build_python_path() -> Result<Vec<String>> {
+pub fn build_python_path(virtualenv: &Option<PathBuf>) -> Result<Vec<String>> {
     let cwd = env::current_dir()?;
     log::debug!("Current directory: {}", cwd.display());
 
     let mut python_path = vec![cwd.to_string_lossy().to_string()];
 
-    if let Some(site_packages) = find_site_packages()? {
+    if let Some(site_packages) = find_site_packages(virtualenv)? {
         log::debug!(
             "Adding site-packages to python_path: {}",
             site_packages.display()
@@ -38,8 +38,8 @@ pub fn build_python_path() -> Result<Vec<String>> {
 }
 
 /// Find the site-packages directory within a virtualenv.
-pub fn find_site_packages() -> Result<Option<PathBuf>> {
-    let venv_path = find_venv()?;
+pub fn find_site_packages(virtualenv: &Option<PathBuf>) -> Result<Option<PathBuf>> {
+    let venv_path = virtualenv.to_owned().or(find_venv()?);
 
     if let Some(venv) = venv_path {
         log::debug!("Found virtualenv: {}", venv.display());

fastly_compute/config_store.py

@@ -11,6 +11,8 @@
         api_url = config.get("api_url", "https://api.example.com")
 """
 
+from typing import Self
+
 from wit_world.imports import config_store as wit_config_store
 
 # The maximum value for a u32, used to signal that we don't want to cap
@@ -36,7 +38,7 @@ def __init__(self, store: wit_config_store.Store):
         self._store = store
 
     @classmethod
-    def open(cls, name: str) -> "ConfigStore":
+    def open(cls, name: str) -> Self:
         """Open a config store by name.
 
         :param name: The name of the config store
@@ -101,7 +103,7 @@ def close(self) -> None:
         """
         self._store.__exit__(None, None, None)
 
-    def __enter__(self) -> "ConfigStore":
+    def __enter__(self) -> Self:
         """Context manager entry.
 
         Allows use of ConfigStore in a 'with' statement.

fastly_compute/requests/timeout.py

@@ -4,7 +4,7 @@
 requests-compatible timeouts and Fastly-specific granular timeout controls.
 """
 
-from typing import override
+from typing import Self, override
 
 
 class TimeoutConfig:
@@ -52,9 +52,7 @@ def between_bytes_ms(self) -> int:
         return int(self.between_bytes * 1000)
 
     @classmethod
-    def from_requests_timeout(
-        cls, timeout: None | float | tuple[float, float]
-    ) -> "TimeoutConfig":
+    def from_requests_timeout(cls, timeout: None | float | tuple[float, float]) -> Self:
         """Create TimeoutConfig from requests-compatible timeout parameter.
 
         Args: