Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolver = "2"

[workspace.package]
edition = "2021"
version = "0.3.43"
version = "0.3.44"
description = "Tower is the best way to host Python data apps in production"
rust-version = "1.81"
authors = ["Brad Heller <brad@tower.dev>"]
Expand All @@ -28,20 +28,24 @@ config = { path = "crates/config" }
crypto = { path = "crates/crypto" }
ctrlc = "3"
dirs = "5"
fs2 = "0.4"
futures = "0.3"
futures-util = "0.3"
futures-lite = "2.6"
glob = "0.3"
hex = "0.4"
http = "1.1"
indicatif = "0.17"
nix = { version = "0.30", features = ["signal"] }
pem = "3"
promptly = "0.3"
rand = "0.8"
regex = "1"
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "stream"] }
reqwest-eventsource = { version = "0.6" }
rpassword = "7"
rsa = "0.9"
seahash = "4.1"
serde = "1"
serde_json = "1.0"
sha2 = "0.10"
Expand Down
22 changes: 12 additions & 10 deletions crates/config/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,11 @@ impl Session {
jwt: session_response.token.jwt.clone(),
};

// Remember the current active team's JWT if there is one
let active_team_jwt = self.active_team.as_ref().map(|team| team.token.jwt.clone());
// Remember current active team after refresh
let active_team_aid = self
.active_team
.as_ref()
.and_then(|team| extract_aid_from_jwt(&team.token.jwt));

// Update teams
self.teams = session_response
Expand All @@ -240,15 +243,14 @@ impl Session {
})
.collect();

// Try to restore the active team based on the JWT
let jwt_match_found = if let Some(jwt) = active_team_jwt {
self.set_active_team_by_jwt(&jwt)
} else {
false
};
// Try to restore the active team by account ID (JWT changes after refresh)
let found_active_team = active_team_aid
.as_ref()
.map(|aid| self.set_active_team_by_aid(aid))
.unwrap_or(false);

// If no active team was set by JWT, fall back to a personal team
if !jwt_match_found && self.active_team.is_none() {
// Fall back to personal team if previous active team not found
if !found_active_team {
// Find a team with team_type="personal"
if let Some(personal_team) = self.teams.iter().find(|team| team.team_type == "personal")
{
Expand Down
9 changes: 6 additions & 3 deletions crates/config/src/towerfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ pub struct App {
#[serde(default)]
pub schedule: String,

#[serde(default)]
pub description: String,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,

#[serde(default)]
pub import_paths: Vec<PathBuf>,
Expand Down Expand Up @@ -58,7 +58,7 @@ impl Towerfile {
script: String::from(""),
source: vec![],
schedule: String::from("0 0 * * *"),
description: String::from(""),
description: None,
import_paths: vec![],
},
}
Expand Down Expand Up @@ -147,6 +147,7 @@ mod test {
assert_eq!(towerfile.app.script, "./script.py");
assert_eq!(towerfile.app.source, vec!["*.py"]);
assert_eq!(towerfile.app.schedule, "0 0 * * *");
assert_eq!(towerfile.app.description, None);
}

#[test]
Expand All @@ -163,6 +164,7 @@ mod test {
assert_eq!(towerfile.app.script, "./script.py");
assert_eq!(towerfile.app.source, vec!["*.py"]);
assert_eq!(towerfile.app.schedule, "");
assert_eq!(towerfile.app.description, None);
}

#[test]
Expand Down Expand Up @@ -316,6 +318,7 @@ default = "value2"
assert_eq!(towerfile.app.name, reparsed.app.name);
assert_eq!(towerfile.app.script, reparsed.app.script);
assert_eq!(towerfile.app.source, reparsed.app.source);
assert_eq!(towerfile.app.description, reparsed.app.description);
assert_eq!(towerfile.parameters.len(), reparsed.parameters.len());
assert_eq!(towerfile.parameters[0].name, reparsed.parameters[0].name);
}
Expand Down
1 change: 1 addition & 0 deletions crates/tower-cmd/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ pub async fn create_app(
create_app_params: tower_api::models::CreateAppParams {
schema: None,
name: name.to_string(),
// API create expects short_description; CLI/Towerfile expose "description".
short_description: Some(description.to_string()),
slug: None,
is_externally_accessible: None,
Expand Down
12 changes: 6 additions & 6 deletions crates/tower-cmd/src/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ pub async fn do_deploy(config: Config, args: &ArgMatches) {
crate::Error::ApiDeployError { source } => {
output::tower_error_and_die(source, "Deploying app failed")
}
crate::Error::ApiCreateAppError { source } => {
output::tower_error_and_die(source, "Creating app failed")
}
crate::Error::ApiDescribeAppError { source } => {
output::tower_error_and_die(source, "Fetching app details failed")
}
Expand Down Expand Up @@ -72,16 +75,13 @@ pub async fn deploy_from_dir(
let api_config = config.into();

// Add app existence check before proceeding
if let Err(err) = util::apps::ensure_app_exists(
util::apps::ensure_app_exists(
&api_config,
&towerfile.app.name,
&towerfile.app.description,
towerfile.app.description.as_deref(),
create_app,
)
.await
{
return Err(crate::Error::ApiDescribeAppError { source: err });
}
.await?;

let spec = PackageSpec::from_towerfile(&towerfile);
let mut spinner = output::spinner("Building package...");
Expand Down
14 changes: 13 additions & 1 deletion crates/tower-cmd/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use snafu::prelude::*;
use tower_api::apis::default_api::{
DeployAppError, DescribeAppError, DescribeRunError, RunAppError,
CreateAppError, DeployAppError, DescribeAppError, DescribeRunError, RunAppError,
};
use tower_telemetry::debug;

Expand Down Expand Up @@ -91,6 +91,12 @@ pub enum Error {
source: tower_api::apis::Error<DeployAppError>,
},

// API create app error
#[snafu(display("API create app error: {}", source))]
ApiCreateAppError {
source: tower_api::apis::Error<CreateAppError>,
},

// API describe app error
#[snafu(display("API describe app error: {}", source))]
ApiDescribeAppError {
Expand Down Expand Up @@ -173,6 +179,12 @@ impl From<tower_api::apis::Error<DeployAppError>> for Error {
}
}

impl From<tower_api::apis::Error<CreateAppError>> for Error {
fn from(source: tower_api::apis::Error<CreateAppError>) -> Self {
Self::ApiCreateAppError { source }
}
}

impl From<tower_api::apis::Error<DescribeAppError>> for Error {
fn from(source: tower_api::apis::Error<DescribeAppError>) -> Self {
Self::ApiDescribeAppError { source }
Expand Down
2 changes: 1 addition & 1 deletion crates/tower-cmd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ impl App {
}

match matches.subcommand() {
Some(("login", _)) => session::do_login(config).await,
Some(("login", args)) => session::do_login(config, args).await,
Some(("version", _)) => version::do_version().await,
Some(("apps", sub_matches)) => {
let apps_command = sub_matches.subcommand();
Expand Down
2 changes: 1 addition & 1 deletion crates/tower-cmd/src/mcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ impl TowerService {
towerfile.app.script = script;
}
if let Some(description) = request.description {
towerfile.app.description = description;
towerfile.app.description = Some(description);
}
if let Some(source) = request.source {
towerfile.app.source = source;
Expand Down
Loading