From cb00a1358d0e47575d8315e70695a9693190f211 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 18 Aug 2023 00:11:16 +0200
Subject: [PATCH] fix: fix python get_resource

---
 backend/windmill-worker/src/worker.rs | 45 ++++++++++++++++-----------
 python-client/wmill/wmill/client.py   |  8 ++++-
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 9f397b4a2c..f71a15a668 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -1260,6 +1260,7 @@ pub async fn transform_json_value(
     workspace: &str,
     v: Value,
 ) -> error::Result<Value> {
+    tracing::info!("transform_json_value {name}", name = name);
     match v {
         Value::String(y) if y.starts_with("$var:") => {
             let path = y.strip_prefix("$var:").unwrap();
@@ -1581,8 +1582,10 @@ async fn handle_bash_job(
     let mut reserved_variables = get_reserved_variables(job, &token, db).await?;
     reserved_variables.insert("RUST_LOG".to_string(), "info".to_string());
 
-    let hm = match job.args {
-        Some(Value::Object(ref hm)) => hm.clone(),
+    let client = client.get_authed().await;
+    let hm = match transform_json_value("args", &client, &job.workspace_id, job.args.clone().unwrap_or_else(|| json!({}))).await?
+    {
+        Value::Object(ref hm) => hm.clone(),
         _ => serde_json::Map::new(),
     };
     let args_owned = windmill_parser_bash::parse_bash_sig(&content)?
@@ -1662,24 +1665,28 @@ async fn handle_powershell_job(
 ) -> Result<serde_json::Value, Error> {
     logs.push_str("\n\n--- POWERSHELL CODE EXECUTION ---\n");
     set_logs(logs, &job.id, db).await;
-    let hm: serde_json::Map<String, Value> = match job.args {
-        Some(Value::Object(ref hm)) => hm.clone(),
-        _ => serde_json::Map::new(),
-    };
+    let pwsh_args = {
+        let client = client.get_authed().await;
+        let hm = match transform_json_value("args", &client, &job.workspace_id, job.args.clone().unwrap_or_else(|| json!({}))).await?
+        {
+            Value::Object(ref hm) => hm.clone(),
+            _ => serde_json::Map::new(),
+        };
 
-    let args_owned = windmill_parser_bash::parse_powershell_sig(&content)?
-        .args
-        .iter()
-        .map(|arg| {
-            (arg.name.clone(), hm.get(&arg.name)
-                .and_then(|v| match v {
-                    Value::String(s) => Some(s.clone()),
-                    _ => serde_json::to_string(v).ok(),
-                })
-                .unwrap_or_else(String::new))
-        })
-        .collect::<Vec<(String, String)>>();
-    let pwsh_args = args_owned.iter().map(|(n, v)| format!("--{n} {v}")).join(" ");
+        let args_owned = windmill_parser_bash::parse_powershell_sig(&content)?
+            .args
+            .iter()
+            .map(|arg| {
+                (arg.name.clone(), hm.get(&arg.name)
+                    .and_then(|v| match v {
+                        Value::String(s) => Some(s.clone()),
+                        _ => serde_json::to_string(v).ok(),
+                    })
+                    .unwrap_or_else(String::new))
+            })
+            .collect::<Vec<(String, String)>>();
+        args_owned.iter().map(|(n, v)| format!("--{n} {v}")).join(" ")
+    };
 
     let content = content
         .replace('$', r"\$") // escape powershell variables
diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py
index a1e086c942..5f941e63c1 100644
--- a/python-client/wmill/wmill/client.py
+++ b/python-client/wmill/wmill/client.py
@@ -2,6 +2,7 @@ from typing import Any, Union, Dict
 from typing import Generic, TypeVar, TypeAlias
 
 import os
+import json
 
 from time import sleep
 from windmill_api.models.whoami_response_200 import WhoamiResponse200
@@ -163,7 +164,12 @@ def get_resource(path: str | None = None, none_if_undefined: bool = False) -> An
     path = path or get_state_path()
     parsed = get_resource_api.sync_detailed(
         workspace=get_workspace(), path=path, client=create_client()
-    ).parsed
+    )
+    try:
+        parsed = json.loads(parsed.content.decode("utf-8"))
+    except:
+        parsed = None
+
     if parsed is None:
         if none_if_undefined:
             return None