wmill 1.149.0__py3-none-any.whl → 1.151.0__py3-none-any.whl

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
@@ -24,10 +25,6 @@ mysql = TypeAlias
 bigquery = TypeAlias
 
 
-VAR_RESOURCE_PREFIX = "$var:"
-RES_RESOURCE_PREFIX = "$res:"
-
-
 class JobStatus(Enum):
     WAITING = 1
     RUNNING = 2
@@ -160,12 +157,19 @@ def get_resource(path: str | None = None, none_if_undefined: bool = False) -> An
     """
     Returns the resource at a given path
     """
-    from windmill_api.api.resource import get_resource as get_resource_api
+    from windmill_api.api.resource import (
+        get_resource_value_interpolated as get_resource_api,
+    )
 
     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
@@ -174,11 +178,7 @@ def get_resource(path: str | None = None, none_if_undefined: bool = False) -> An
                 f"Resource at path {path} does not exist or you do not have read permissions on it"
             )
 
-    if isinstance(parsed.value, Unset):
-        return None
-
-    raw = parsed.value
-    return _transform_leaf(raw)
+    return parsed
 
 
 def whoami() -> WhoamiResponse200 | None:
@@ -286,7 +286,7 @@ def get_variable(path: str) -> str:
     """
     Returns the variable at a given path as a string
     """
-    from windmill_api.api.variable import get_variable as get_variable_api
+    from windmill_api.api.variable import get_variable_value as get_variable_api
 
     res = get_variable_api.sync_detailed(
         workspace=get_workspace(), path=path, client=create_client()
@@ -296,7 +296,7 @@ def get_variable(path: str) -> str:
             f"Variable at path {path} does not exist or you do not have read permissions on it"
         )
 
-    return res.value  # type: ignore
+    return res
 
 
 def set_variable(path: str, value: str) -> None:
@@ -356,23 +356,3 @@ def get_resume_urls(approver: str | None = None) -> Dict:
         return res.parsed.to_dict()
     else:
         raise Exception("Failed to get resume urls")
-
-
-def _transform_leaves(d: Dict[str, Any]) -> Dict[str, Any]:
-    return {k: _transform_leaf(v) for k, v in d.items()}
-
-
-def _transform_leaf(v: Any) -> Any:
-    if isinstance(v, dict):
-        return _transform_leaves(v)  # type: ignore
-    elif isinstance(v, str):
-        if v.startswith(VAR_RESOURCE_PREFIX):
-            var_name = v[len(VAR_RESOURCE_PREFIX) :]
-            return get_variable(var_name)
-        if v.startswith(RES_RESOURCE_PREFIX):
-            res_name = v[len(RES_RESOURCE_PREFIX) :]
-            return get_resource(res_name)
-        else:
-            return v
-    else:
-        return v

{wmill-1.149.0.dist-info → wmill-1.151.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wmill
-Version: 1.149.0
+Version: 1.151.0
 Summary: A client library for accessing Windmill server wrapping the Windmill client API
 Home-page: https://windmill.dev
 License: Apache-2.0
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: windmill-api (>=1.149.0,<2.0.0)
+Requires-Dist: windmill-api (>=1.151.0,<2.0.0)
 Project-URL: Documentation, https://windmill.dev
 Description-Content-Type: text/markdown
 

wmill-1.151.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+wmill/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
+wmill/client.py,sha256=In3qWF3opMsE3t38dUmEjaBKEtuBZI0esShITDciyVA,9938
+wmill/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
+wmill-1.151.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+wmill-1.151.0.dist-info/METADATA,sha256=MJg0RKTrKnBrIr-VLAvGH5pMeru_WKvsojZeDEFCivk,1571
+wmill-1.151.0.dist-info/RECORD,,

wmill-1.149.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-wmill/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
-wmill/client.py,sha256=tZaPHcLyCttcg5eQ7pA2MaqgDfIUC-vIKV5Ty_LydT4,10579
-wmill/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
-wmill-1.149.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-wmill-1.149.0.dist-info/METADATA,sha256=kzymAfvVucAW5BsEAADrf9kGprGwOkB4gko0Iw8oBbY,1571
-wmill-1.149.0.dist-info/RECORD,,