tower 0.3.7__tar.gz → 0.3.8__tar.gz

{tower-0.3.7 → tower-0.3.8}/Cargo.lock

@@ -310,7 +310,7 @@ dependencies = [
 
 [[package]]
 name = "config"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "clap",
  "dirs",
@@ -379,7 +379,7 @@ dependencies = [
 
 [[package]]
 name = "crypto"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "base64",
  "pem",
@@ -2410,7 +2410,7 @@ dependencies = [
 
 [[package]]
 name = "testutils"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "pem",
  "rsa",
@@ -2614,7 +2614,7 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "tokio",
  "tower-api",
@@ -2646,12 +2646,11 @@ dependencies = [
  "serde_repr",
  "serde_with",
  "url",
- "uuid",
 ]
 
 [[package]]
 name = "tower-cmd"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2690,7 +2689,7 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-package"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "async-compression",
  "config",
@@ -2708,7 +2707,7 @@ dependencies = [
 
 [[package]]
 name = "tower-runtime"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "chrono",
  "log",
@@ -2725,7 +2724,7 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tower-version"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "anyhow",
  "log",
@@ -2830,16 +2829,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "uuid"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
-dependencies = [
- "getrandom 0.3.2",
- "serde",
-]
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"

{tower-0.3.7 → tower-0.3.8}/Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.3.7"
+version = "0.3.8"
 description = "Tower is the best way to host Python data apps in production"
 rust-version = "1.77"
 authors = ["Brad Heller <brad@tower.dev>"]

{tower-0.3.7 → tower-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tower
-Version: 0.3.7
+Version: 0.3.8
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{tower-0.3.7 → tower-0.3.8}/crates/config/src/towerfile.rs

@@ -30,6 +30,9 @@ pub struct App {
 
     #[serde(default)]
     pub description: String,
+
+    #[serde(default)]
+    pub workspace: PathBuf,
 }
 
 #[derive(Deserialize)]
@@ -56,6 +59,7 @@ impl Towerfile {
                 source: vec![],
                 schedule: String::from("0 0 * * *"),
                 description: String::from(""),
+                workspace: PathBuf::new(),
             },
         }
     }
@@ -63,7 +67,16 @@ impl Towerfile {
     /// from_toml parses a new Towerfile from a TOML string. It's not exposed externally because
     /// the base_dir field always needs to be set after parsing.
     pub fn from_toml(toml: &str) -> Result<Self, Error> {
-        let towerfile: Towerfile = toml::from_str(toml)?;
+        let mut towerfile: Towerfile = toml::from_str(toml)?;
+
+        // We set the workspace to the directory of the Towerfile if it's not set because that's
+        // the implicit behavior overall for legacy Towerfiles.
+        if towerfile.app.workspace.as_os_str().is_empty() {
+            towerfile.app.workspace = towerfile.file_path
+                .parent()
+                .map(|p| p.to_path_buf())
+                .unwrap_or_else(|| PathBuf::new());
+        }
 
         if towerfile.app.name.is_empty() {
             return Err(Error::MissingRequiredAppField{ field: "name".to_string() });
@@ -246,4 +259,19 @@ mod test {
         assert_eq!(towerfile.parameters[0].name, "my_first_param");
         assert_eq!(towerfile.parameters[1].name, "my_second_param");
     }
+
+    #[test]
+    fn test_parsing_workspaces() {
+        let toml = r#"
+            [app]
+            name = "my-app"
+            script = "my-app/script.py"
+            source = ["*.py"]
+            workspace = "../"
+        "#;
+
+        // All we want need to do is to ensure that the workspace is set accordingly.
+        let towerfile = crate::Towerfile::from_toml(toml).unwrap();
+        assert_eq!(towerfile.app.workspace, PathBuf::from("../"));
+    }
 }

{tower-0.3.7 → tower-0.3.8}/crates/tower-api/Cargo.toml

@@ -14,5 +14,4 @@ serde_with = { version = "^3.8", default-features = false, features = ["base64",
 serde_json = "^1.0"
 serde_repr = "^0.1"
 url = "^2.5"
-uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "multipart"] }

{tower-0.3.7 → tower-0.3.8}/crates/tower-api/README.md

@@ -8,9 +8,9 @@ For more information, please visit [https://tower.dev](https://tower.dev)
 
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
 
-- API version: v0.4.3
+- API version: v0.5.1
 - Package version: 1.0.0
-- Generator version: 7.12.0-SNAPSHOT
+- Generator version: 7.13.0-SNAPSHOT
 - Build package: `org.openapitools.codegen.languages.RustClientCodegen`
 
 ## Installation
@@ -28,57 +28,58 @@ All URIs are relative to *https://api.tower.dev/v1*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *DefaultApi* | [**accept_invitation**](docs/DefaultApi.md#accept_invitation) | **POST** /accounts/invite | Accept an invitation code
-*DefaultApi* | [**cancel_run**](docs/DefaultApi.md#cancel_run) | **POST** /apps/{name}/runs/{seq} | Cancel run
+*DefaultApi* | [**cancel_run**](docs/DefaultApi.md#cancel_run) | **POST** /apps/{slug}/runs/{seq} | Cancel run
 *DefaultApi* | [**claim_device_login_ticket**](docs/DefaultApi.md#claim_device_login_ticket) | **POST** /login/device/claim | Claim a device login ticket
 *DefaultApi* | [**create_account**](docs/DefaultApi.md#create_account) | **POST** /accounts | Create account
 *DefaultApi* | [**create_api_key**](docs/DefaultApi.md#create_api_key) | **POST** /api-keys | Create API Key
-*DefaultApi* | [**create_apps**](docs/DefaultApi.md#create_apps) | **POST** /apps | Create app
+*DefaultApi* | [**create_app**](docs/DefaultApi.md#create_app) | **POST** /apps | Create app
 *DefaultApi* | [**create_catalog**](docs/DefaultApi.md#create_catalog) | **POST** /catalogs | Create catalog
-*DefaultApi* | [**create_device_login_ticket**](docs/DefaultApi.md#create_device_login_ticket) | **GET** /login/device | Create a device login ticket
+*DefaultApi* | [**create_device_login_ticket**](docs/DefaultApi.md#create_device_login_ticket) | **GET** /login/device | Create device login ticket
 *DefaultApi* | [**create_secret**](docs/DefaultApi.md#create_secret) | **POST** /secrets | Create secret
 *DefaultApi* | [**create_session**](docs/DefaultApi.md#create_session) | **POST** /session | Create session
-*DefaultApi* | [**create_team**](docs/DefaultApi.md#create_team) | **POST** /teams | Create Team
-*DefaultApi* | [**delete_api_key**](docs/DefaultApi.md#delete_api_key) | **DELETE** /api-keys | Delete API Key
-*DefaultApi* | [**delete_app**](docs/DefaultApi.md#delete_app) | **DELETE** /apps/{name} | Delete app
+*DefaultApi* | [**create_team**](docs/DefaultApi.md#create_team) | **POST** /teams | Create team
+*DefaultApi* | [**delete_api_key**](docs/DefaultApi.md#delete_api_key) | **DELETE** /api-keys | Delete API key
+*DefaultApi* | [**delete_app**](docs/DefaultApi.md#delete_app) | **DELETE** /apps/{slug} | Delete app
 *DefaultApi* | [**delete_catalog**](docs/DefaultApi.md#delete_catalog) | **DELETE** /catalogs/{slug} | Delete catalog
-*DefaultApi* | [**delete_secret**](docs/DefaultApi.md#delete_secret) | **DELETE** /secrets/{name} | Delete a secret.
-*DefaultApi* | [**delete_team**](docs/DefaultApi.md#delete_team) | **DELETE** /teams | Delete Team
-*DefaultApi* | [**delete_team_invitation**](docs/DefaultApi.md#delete_team_invitation) | **DELETE** /teams/{slug}/invites | Delete Team Invitation
-*DefaultApi* | [**deploy_app**](docs/DefaultApi.md#deploy_app) | **POST** /apps/{name}/deploy | Deploy app
-*DefaultApi* | [**describe_app**](docs/DefaultApi.md#describe_app) | **GET** /apps/{name} | Describe app
+*DefaultApi* | [**delete_secret**](docs/DefaultApi.md#delete_secret) | **DELETE** /secrets/{name} | Delete secret
+*DefaultApi* | [**delete_team**](docs/DefaultApi.md#delete_team) | **DELETE** /teams | Delete team
+*DefaultApi* | [**delete_team_invitation**](docs/DefaultApi.md#delete_team_invitation) | **DELETE** /teams/{slug}/invites | Delete team invitation
+*DefaultApi* | [**deploy_app**](docs/DefaultApi.md#deploy_app) | **POST** /apps/{slug}/deploy | Deploy app
+*DefaultApi* | [**describe_app**](docs/DefaultApi.md#describe_app) | **GET** /apps/{slug} | Describe app
 *DefaultApi* | [**describe_app_version**](docs/DefaultApi.md#describe_app_version) | **GET** /apps/{name}/versions/{num} | Describe app version
 *DefaultApi* | [**describe_device_login_session**](docs/DefaultApi.md#describe_device_login_session) | **GET** /login/device/{device_code} | Describe device login session
-*DefaultApi* | [**describe_run**](docs/DefaultApi.md#describe_run) | **GET** /apps/{name}/runs/{seq} | Describe run
+*DefaultApi* | [**describe_run**](docs/DefaultApi.md#describe_run) | **GET** /apps/{slug}/runs/{seq} | Describe run
+*DefaultApi* | [**describe_run_logs**](docs/DefaultApi.md#describe_run_logs) | **GET** /apps/{slug}/runs/{seq}/logs | Describe run logs
 *DefaultApi* | [**describe_secrets_key**](docs/DefaultApi.md#describe_secrets_key) | **GET** /secrets/key | Describe encryption key
 *DefaultApi* | [**describe_session**](docs/DefaultApi.md#describe_session) | **GET** /session | Describe session
 *DefaultApi* | [**export_secrets**](docs/DefaultApi.md#export_secrets) | **GET** /secrets/export | Export secrets
 *DefaultApi* | [**generate_app_statistics**](docs/DefaultApi.md#generate_app_statistics) | **GET** /stats/apps | Generate app statistics
 *DefaultApi* | [**generate_run_statistics**](docs/DefaultApi.md#generate_run_statistics) | **GET** /stats/runs | Generate run statistics
-*DefaultApi* | [**get_app_run_logs**](docs/DefaultApi.md#get_app_run_logs) | **GET** /apps/{name}/runs/{seq}/logs | Get logs for a specific app run.
-*DefaultApi* | [**invite_team_member**](docs/DefaultApi.md#invite_team_member) | **POST** /teams/{slug}/invites | Invite Team Member
-*DefaultApi* | [**leave_team**](docs/DefaultApi.md#leave_team) | **POST** /teams/{slug}/leave | Leave Team
-*DefaultApi* | [**list_api_keys**](docs/DefaultApi.md#list_api_keys) | **GET** /api-keys | List API Keys
-*DefaultApi* | [**list_app_environments**](docs/DefaultApi.md#list_app_environments) | **GET** /apps/{name}/environments | List app environments
+*DefaultApi* | [**invite_team_member**](docs/DefaultApi.md#invite_team_member) | **POST** /teams/{slug}/invites | Invite team member
+*DefaultApi* | [**leave_team**](docs/DefaultApi.md#leave_team) | **POST** /teams/{slug}/leave | Leave team
+*DefaultApi* | [**list_api_keys**](docs/DefaultApi.md#list_api_keys) | **GET** /api-keys | List API keys
+*DefaultApi* | [**list_app_environments**](docs/DefaultApi.md#list_app_environments) | **GET** /apps/{slug}/environments | List app environments
 *DefaultApi* | [**list_app_versions**](docs/DefaultApi.md#list_app_versions) | **GET** /apps/{name}/versions | List app versions
 *DefaultApi* | [**list_apps**](docs/DefaultApi.md#list_apps) | **GET** /apps | List apps
 *DefaultApi* | [**list_catalogs**](docs/DefaultApi.md#list_catalogs) | **GET** /catalogs | List catalogs
-*DefaultApi* | [**list_my_team_invitations**](docs/DefaultApi.md#list_my_team_invitations) | **GET** /team-invites | List My Team Invitations
-*DefaultApi* | [**list_runs**](docs/DefaultApi.md#list_runs) | **GET** /apps/{name}/runs | List runs
+*DefaultApi* | [**list_my_team_invitations**](docs/DefaultApi.md#list_my_team_invitations) | **GET** /team-invites | List my team invitations
+*DefaultApi* | [**list_runs**](docs/DefaultApi.md#list_runs) | **GET** /apps/{slug}/runs | List runs
 *DefaultApi* | [**list_secret_environments**](docs/DefaultApi.md#list_secret_environments) | **GET** /secrets/environments | List secret environments
 *DefaultApi* | [**list_secrets**](docs/DefaultApi.md#list_secrets) | **GET** /secrets | List secrets
-*DefaultApi* | [**list_team_invitations**](docs/DefaultApi.md#list_team_invitations) | **GET** /teams/{slug}/invites | List Team Invitations
-*DefaultApi* | [**list_team_members**](docs/DefaultApi.md#list_team_members) | **GET** /teams/{slug}/members | List Team Members
-*DefaultApi* | [**list_teams**](docs/DefaultApi.md#list_teams) | **GET** /teams | List Teams
+*DefaultApi* | [**list_team_invitations**](docs/DefaultApi.md#list_team_invitations) | **GET** /teams/{slug}/invites | List team invitations
+*DefaultApi* | [**list_team_members**](docs/DefaultApi.md#list_team_members) | **GET** /teams/{slug}/members | List team members
+*DefaultApi* | [**list_teams**](docs/DefaultApi.md#list_teams) | **GET** /teams | List teams
 *DefaultApi* | [**refresh_session**](docs/DefaultApi.md#refresh_session) | **POST** /session/refresh | Refresh session
-*DefaultApi* | [**remove_team_member**](docs/DefaultApi.md#remove_team_member) | **DELETE** /teams/{slug}/members | Remove Team Member
-*DefaultApi* | [**resend_team_invitation**](docs/DefaultApi.md#resend_team_invitation) | **POST** /teams/{slug}/invites/resend | Resend Team Invitation
-*DefaultApi* | [**run_app**](docs/DefaultApi.md#run_app) | **POST** /apps/{name}/runs | Run app
-*DefaultApi* | [**stream_app_run_logs**](docs/DefaultApi.md#stream_app_run_logs) | **GET** /apps/{name}/runs/{seq}/logs/stream | Stream logs for a specific app run
+*DefaultApi* | [**remove_team_member**](docs/DefaultApi.md#remove_team_member) | **DELETE** /teams/{slug}/members | Remove team member
+*DefaultApi* | [**resend_team_invitation**](docs/DefaultApi.md#resend_team_invitation) | **POST** /teams/{slug}/invites/resend | Resend team invitation
+*DefaultApi* | [**run_app**](docs/DefaultApi.md#run_app) | **POST** /apps/{slug}/runs | Run app
+*DefaultApi* | [**stream_run_logs**](docs/DefaultApi.md#stream_run_logs) | **GET** /apps/{slug}/runs/{seq}/logs/stream | Stream run logs
 *DefaultApi* | [**update_account_slug**](docs/DefaultApi.md#update_account_slug) | **PUT** /accounts/{slug} | Update account slug
+*DefaultApi* | [**update_app**](docs/DefaultApi.md#update_app) | **PUT** /apps/{name} | Update app
 *DefaultApi* | [**update_catalog**](docs/DefaultApi.md#update_catalog) | **PUT** /catalogs/{slug} | Update catalog
-*DefaultApi* | [**update_my_team_invitation**](docs/DefaultApi.md#update_my_team_invitation) | **PUT** /team-invites | Update My Team Invitation
+*DefaultApi* | [**update_my_team_invitation**](docs/DefaultApi.md#update_my_team_invitation) | **PUT** /team-invites | Update my team invitation
 *DefaultApi* | [**update_secret**](docs/DefaultApi.md#update_secret) | **PUT** /secrets/{name} | Update secret
-*DefaultApi* | [**update_team**](docs/DefaultApi.md#update_team) | **PUT** /teams/{slug} | Update Team
+*DefaultApi* | [**update_team**](docs/DefaultApi.md#update_team) | **PUT** /teams/{slug} | Update team
 *DefaultApi* | [**update_user**](docs/DefaultApi.md#update_user) | **PUT** /user | Update user profile
 
 
@@ -125,6 +126,7 @@ Class | Method | HTTP request | Description
  - [DescribeAppResponse](docs/DescribeAppResponse.md)
  - [DescribeAppVersionResponse](docs/DescribeAppVersionResponse.md)
  - [DescribeDeviceLoginSessionResponse](docs/DescribeDeviceLoginSessionResponse.md)
+ - [DescribeRunLogsResponse](docs/DescribeRunLogsResponse.md)
  - [DescribeRunResponse](docs/DescribeRunResponse.md)
  - [DescribeSecretsKeyResponse](docs/DescribeSecretsKeyResponse.md)
  - [DescribeSessionResponse](docs/DescribeSessionResponse.md)
@@ -136,8 +138,6 @@ Class | Method | HTTP request | Description
  - [ExportedSecret](docs/ExportedSecret.md)
  - [GenerateAppStatisticsResponse](docs/GenerateAppStatisticsResponse.md)
  - [GenerateRunStatisticsResponse](docs/GenerateRunStatisticsResponse.md)
- - [GetRunLogLine](docs/GetRunLogLine.md)
- - [GetRunLogsOutputBody](docs/GetRunLogsOutputBody.md)
  - [InviteTeamMemberParams](docs/InviteTeamMemberParams.md)
  - [InviteTeamMemberResponse](docs/InviteTeamMemberResponse.md)
  - [LeaveTeamResponse](docs/LeaveTeamResponse.md)
@@ -166,18 +166,21 @@ Class | Method | HTTP request | Description
  - [Run](docs/Run.md)
  - [RunAppParams](docs/RunAppParams.md)
  - [RunAppResponse](docs/RunAppResponse.md)
+ - [RunLogLine](docs/RunLogLine.md)
  - [RunResults](docs/RunResults.md)
  - [RunStatistics](docs/RunStatistics.md)
  - [Secret](docs/Secret.md)
  - [SeriesPoint](docs/SeriesPoint.md)
  - [Session](docs/Session.md)
  - [StatisticsSettings](docs/StatisticsSettings.md)
- - [StreamAppRunLogs200ResponseInner](docs/StreamAppRunLogs200ResponseInner.md)
+ - [StreamRunLogs200ResponseInner](docs/StreamRunLogs200ResponseInner.md)
  - [Team](docs/Team.md)
  - [TeamInvitation](docs/TeamInvitation.md)
  - [Token](docs/Token.md)
  - [UpdateAccountSlugParams](docs/UpdateAccountSlugParams.md)
  - [UpdateAccountSlugResponse](docs/UpdateAccountSlugResponse.md)
+ - [UpdateAppParams](docs/UpdateAppParams.md)
+ - [UpdateAppResponse](docs/UpdateAppResponse.md)
  - [UpdateCatalogParams](docs/UpdateCatalogParams.md)
  - [UpdateCatalogResponse](docs/UpdateCatalogResponse.md)
  - [UpdateMyTeamInvitationParams](docs/UpdateMyTeamInvitationParams.md)

{tower-0.3.7 → tower-0.3.8}/crates/tower-api/src/apis/configuration.rs

@@ -3,7 +3,7 @@
  *
  * REST API to interact with Tower Services.
  *
- * The version of the OpenAPI document: v0.4.3
+ * The version of the OpenAPI document: v0.5.1
  * Contact: hello@tower.dev
  * Generated by: https://openapi-generator.tech
  */