wmill 1.339.2__py3-none-any.whl → 1.340.2__py3-none-any.whl

wmill/client.py

@@ -440,7 +440,7 @@ class Windmill:
             print(file_reader.read())
         '''
         """
-        reader = S3BufferedReader(f"{self.workspace}", self.client, s3object["s3"], s3_resource_path)
+        reader = S3BufferedReader(f"{self.workspace}", self.client, s3object["s3"], s3_resource_path, s3object["storage"])
         return reader
 
     def write_s3_file(
@@ -479,6 +479,8 @@ class Windmill:
             query_params["file_key"] = s3object["s3"]
         if s3_resource_path is not None and s3_resource_path != "":
             query_params["s3_resource_path"] = s3_resource_path
+        if s3object is not None and s3object["storage"] is not None:
+            query_params["storage"] = s3object["storage"]
 
         try:
             # need a vanilla client b/c content-type is not application/json here

wmill/s3_reader.py

@@ -5,12 +5,14 @@ import httpx
 
 
 class S3BufferedReader(BufferedReader):
-    def __init__(self, workspace: str, windmill_client: httpx.Client, file_key: str, s3_resource_path: str | None):
+    def __init__(self, workspace: str, windmill_client: httpx.Client, file_key: str, s3_resource_path: str | None, storage: str | None):
         params = {
             "file_key": file_key,
         }
         if s3_resource_path is not None:
             params["s3_resource_path"] = s3_resource_path
+        if storage is not None:
+            params["storage"] = storage
         self._context_manager = windmill_client.stream(
             "GET",
             f"/w/{workspace}/job_helpers/download_s3_file",

wmill/s3_types.py

@@ -1,5 +1,6 @@
 class S3Object(dict):
     s3: str
+    storage: str | None
 
     def __getattr__(self, attr):
         return self[attr]

{wmill-1.339.2.dist-info → wmill-1.340.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wmill
-Version: 1.339.2
+Version: 1.340.2
 Summary: A client library for accessing Windmill server wrapping the Windmill client API
 Home-page: https://windmill.dev
 License: Apache-2.0

wmill-1.340.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+wmill/__init__.py,sha256=nGZnQPezTdrBnBW1D0JqUtm75Gdf_xi3tAcPGwHRZ5A,46
+wmill/client.py,sha256=Do4iqhleEqvhT0ZThWVC4hiF8aTNeDBX0I3a_ACU3UA,32281
+wmill/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
+wmill/s3_reader.py,sha256=izHlg2Xsg0Sr_LkDDEC35VuEijJcuPBDIm-xj21KsgU,1668
+wmill/s3_types.py,sha256=XVjPyc5sjWesTy6nnRReojhyPgPsaT0EY3X57mWUaJ4,1173
+wmill-1.340.2.dist-info/METADATA,sha256=hhEXUXJ0bV1W4wU1DNNfdt6v84Lic-tJIctcQRyvvFI,2699
+wmill-1.340.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+wmill-1.340.2.dist-info/RECORD,,

wmill-1.339.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-wmill/__init__.py,sha256=nGZnQPezTdrBnBW1D0JqUtm75Gdf_xi3tAcPGwHRZ5A,46
-wmill/client.py,sha256=bCr9svlONt82xuS-pL1JezvLvFVfeHuTPJoNEaLNRS4,32133
-wmill/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
-wmill/s3_reader.py,sha256=ZznXPIdMkP7S17CJ5scBJAyLDHBKAaqZB-B_l9pRIzA,1575
-wmill/s3_types.py,sha256=axVibTMtpynBwaCVK0O6bBao56no01qflyIGRaVyV6s,1149
-wmill-1.339.2.dist-info/METADATA,sha256=ezLdzviG0vv90vglkS8Seyxsew9D2hXv3-m3rK2pN4I,2699
-wmill-1.339.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-wmill-1.339.2.dist-info/RECORD,,