starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-21 08:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ai_models in workspace_settings is now optional

Browse Source
This commit is contained in:
Ruben Fiszel
2025-02-14 02:41:21 +01:00
parent 0b4cfd8ffa
commit 470d80e219
2 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/.sqlx/query-1730f39fd1793d45fbb41b21389c61296a3ff7489ae12f52a19f9543173ac597.json → backend/.sqlx/query-4e9c2e0690eaca280ccb5e5160438f207d930d29e3000b9845eef89e87a35ad1.json
Generated
+136 -136
View File
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
"query": "SELECT * FROM workspace_settings WHERE workspace_id = $1",
"query": "SELECT workspace_id, slack_team_id, teams_team_id, teams_team_name, slack_name, slack_command_script, teams_command_script, slack_email, auto_invite_domain, auto_invite_operator, auto_add, customer_id, plan, webhook, deploy_to, ai_resource, ai_models, code_completion_model, error_handler, error_handler_extra_args, error_handler_muted_on_cancel, large_file_storage, git_sync, deploy_ui, default_app, automatic_billing, default_scripts, mute_critical_alerts, color, operator_settings FROM workspace_settings WHERE workspace_id = $1",
"describe": {
"columns": [
{
@@ -15,143 +15,143 @@
},
{
"ordinal": 2,
"name": "slack_name",
"type_info": "Varchar"
},
{
"ordinal": 3,
"name": "slack_command_script",
"type_info": "Varchar"
},
{
"ordinal": 4,
"name": "slack_email",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "auto_invite_domain",
"type_info": "Varchar"
},
{
"ordinal": 6,
"name": "auto_invite_operator",
"type_info": "Bool"
},
{
"ordinal": 7,
"name": "customer_id",
"type_info": "Varchar"
},
{
"ordinal": 8,
"name": "plan",
"type_info": "Varchar"
},
{
"ordinal": 9,
"name": "webhook",
"type_info": "Text"
},
{
"ordinal": 10,
"name": "deploy_to",
"type_info": "Varchar"
},
{
"ordinal": 11,
"name": "error_handler",
"type_info": "Varchar"
},
{
"ordinal": 12,
"name": "ai_resource",
"type_info": "Jsonb"
},
{
"ordinal": 13,
"name": "error_handler_extra_args",
"type_info": "Json"
},
{
"ordinal": 14,
"name": "error_handler_muted_on_cancel",
"type_info": "Bool"
},
{
"ordinal": 15,
"name": "large_file_storage",
"type_info": "Jsonb"
},
{
"ordinal": 16,
"name": "git_sync",
"type_info": "Jsonb"
},
{
"ordinal": 17,
"name": "default_app",
"type_info": "Varchar"
},
{
"ordinal": 18,
"name": "auto_add",
"type_info": "Bool"
},
{
"ordinal": 19,
"name": "automatic_billing",
"type_info": "Bool"
},
{
"ordinal": 20,
"name": "default_scripts",
"type_info": "Jsonb"
},
{
"ordinal": 21,
"name": "deploy_ui",
"type_info": "Jsonb"
},
{
"ordinal": 22,
"name": "mute_critical_alerts",
"type_info": "Bool"
},
{
"ordinal": 23,
"name": "color",
"type_info": "Varchar"
},
{
"ordinal": 24,
"name": "operator_settings",
"type_info": "Jsonb"
},
{
"ordinal": 25,
"name": "ai_models",
"type_info": "VarcharArray"
},
{
"ordinal": 26,
"name": "code_completion_model",
"type_info": "Varchar"
},
{
"ordinal": 27,
"name": "teams_command_script",
"type_info": "Text"
},
{
"ordinal": 28,
"name": "teams_team_id",
"type_info": "Text"
},
{
"ordinal": 29,
"ordinal": 3,
"name": "teams_team_name",
"type_info": "Text"
},
{
"ordinal": 4,
"name": "slack_name",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "slack_command_script",
"type_info": "Varchar"
},
{
"ordinal": 6,
"name": "teams_command_script",
"type_info": "Text"
},
{
"ordinal": 7,
"name": "slack_email",
"type_info": "Varchar"
},
{
"ordinal": 8,
"name": "auto_invite_domain",
"type_info": "Varchar"
},
{
"ordinal": 9,
"name": "auto_invite_operator",
"type_info": "Bool"
},
{
"ordinal": 10,
"name": "auto_add",
"type_info": "Bool"
},
{
"ordinal": 11,
"name": "customer_id",
"type_info": "Varchar"
},
{
"ordinal": 12,
"name": "plan",
"type_info": "Varchar"
},
{
"ordinal": 13,
"name": "webhook",
"type_info": "Text"
},
{
"ordinal": 14,
"name": "deploy_to",
"type_info": "Varchar"
},
{
"ordinal": 15,
"name": "ai_resource",
"type_info": "Jsonb"
},
{
"ordinal": 16,
"name": "ai_models",
"type_info": "VarcharArray"
},
{
"ordinal": 17,
"name": "code_completion_model",
"type_info": "Varchar"
},
{
"ordinal": 18,
"name": "error_handler",
"type_info": "Varchar"
},
{
"ordinal": 19,
"name": "error_handler_extra_args",
"type_info": "Json"
},
{
"ordinal": 20,
"name": "error_handler_muted_on_cancel",
"type_info": "Bool"
},
{
"ordinal": 21,
"name": "large_file_storage",
"type_info": "Jsonb"
},
{
"ordinal": 22,
"name": "git_sync",
"type_info": "Jsonb"
},
{
"ordinal": 23,
"name": "deploy_ui",
"type_info": "Jsonb"
},
{
"ordinal": 24,
"name": "default_app",
"type_info": "Varchar"
},
{
"ordinal": 25,
"name": "automatic_billing",
"type_info": "Bool"
},
{
"ordinal": 26,
"name": "default_scripts",
"type_info": "Jsonb"
},
{
"ordinal": 27,
"name": "mute_critical_alerts",
"type_info": "Bool"
},
{
"ordinal": 28,
"name": "color",
"type_info": "Varchar"
},
{
"ordinal": 29,
"name": "operator_settings",
"type_info": "Jsonb"
}
],
"parameters": {
@@ -164,10 +164,12 @@
true,
true,
true,
false,
true,
true,
true,
false,
true,
true,
true,
true,
true,
@@ -178,13 +180,11 @@
true,
true,
true,
true,
false,
true,
true,
true,
true,
true,
false,
true,
true,
@@ -192,5 +192,5 @@
true
]
},
"hash": "1730f39fd1793d45fbb41b21389c61296a3ff7489ae12f52a19f9543173ac597"
"hash": "4e9c2e0690eaca280ccb5e5160438f207d930d29e3000b9845eef89e87a35ad1"
}
backend/windmill-api/src/workspaces.rs
+2 -2
View File
@@ -212,7 +212,7 @@ pub struct WorkspaceSettings {
pub deploy_to: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub ai_resource: Option<serde_json::Value>,
pub ai_models: Vec<String>,
pub ai_models: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub code_completion_model: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
@@ -453,7 +453,7 @@ async fn get_settings(
let mut tx = user_db.begin(&authed).await?;
let settings = sqlx::query_as!(
WorkspaceSettings,
"SELECT * FROM workspace_settings WHERE workspace_id = $1",
"SELECT workspace_id, slack_team_id, teams_team_id, teams_team_name, slack_name, slack_command_script, teams_command_script, slack_email, auto_invite_domain, auto_invite_operator, auto_add, customer_id, plan, webhook, deploy_to, ai_resource, ai_models, code_completion_model, error_handler, error_handler_extra_args, error_handler_muted_on_cancel, large_file_storage, git_sync, deploy_ui, default_app, automatic_billing, default_scripts, mute_critical_alerts, color, operator_settings FROM workspace_settings WHERE workspace_id = $1",
&w_id
)
.fetch_one(&mut *tx)