edsl 0.1.39.dev3__py3-none-any.whl → 0.1.39.dev4__py3-none-any.whl

edsl/utilities/decorators.py

@@ -1,77 +1,77 @@
-import functools
-import asyncio
-import nest_asyncio
-
-nest_asyncio.apply()
-
-from edsl import __version__ as edsl_version
-
-
-def add_edsl_version(func):
-    """
-    Decorator for EDSL objects' `to_dict` method.
-    - Adds the EDSL version and class name to the dictionary.
-    """
-
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        d = func(*args, **kwargs)
-        d["edsl_version"] = edsl_version
-        d["edsl_class_name"] = func.__qualname__.split(".")[0]
-        return d
-
-    return wrapper
-
-
-def remove_edsl_version(func):
-    """
-    Decorator for the EDSL objects' `from_dict` method.
-    - Removes the EDSL version and class name from the dictionary.
-    - Ensures backwards compatibility with older versions of EDSL.
-    """
-
-    @functools.wraps(func)
-    def wrapper(cls, data, *args, **kwargs):
-        data_copy = dict(data)
-        edsl_version = data_copy.pop("edsl_version", None)
-        edsl_classname = data_copy.pop("edsl_class_name", None)
-
-        # Version- and class-specific logic here
-        if edsl_classname == "Survey":
-            if edsl_version is None or edsl_version <= "0.1.20":
-                data_copy["question_groups"] = {}
-
-        return func(cls, data_copy, *args, **kwargs)
-
-    return wrapper
-
-
-def jupyter_nb_handler(func):
-    """Decorator to run an async function in the event loop if it's running, or synchronously otherwise."""
-
-    @functools.wraps(func)
-    async def async_wrapper(*args, **kwargs):
-        # This is an async wrapper to await the coroutine
-        return await func(*args, **kwargs)
-
-    def wrapper(*args, **kwargs):
-        loop = asyncio.get_event_loop()
-        if loop.is_running():
-            # If the loop is running, schedule the coroutine and wait for the result
-            future = asyncio.ensure_future(async_wrapper(*args, **kwargs))
-            return loop.run_until_complete(future)
-        else:
-            # If the loop is not running, run the coroutine to completion
-            return asyncio.run(async_wrapper(*args, **kwargs))
-
-    return wrapper
-
-
-def sync_wrapper(async_func):
-    """Decorator to create a synchronous wrapper for an asynchronous function."""
-
-    @functools.wraps(async_func)
-    def wrapper(*args, **kwargs):
-        return asyncio.run(async_func(*args, **kwargs))
-
-    return wrapper
+import functools
+import asyncio
+import nest_asyncio
+
+nest_asyncio.apply()
+
+from edsl import __version__ as edsl_version
+
+
+def add_edsl_version(func):
+    """
+    Decorator for EDSL objects' `to_dict` method.
+    - Adds the EDSL version and class name to the dictionary.
+    """
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        d = func(*args, **kwargs)
+        d["edsl_version"] = edsl_version
+        d["edsl_class_name"] = func.__qualname__.split(".")[0]
+        return d
+
+    return wrapper
+
+
+def remove_edsl_version(func):
+    """
+    Decorator for the EDSL objects' `from_dict` method.
+    - Removes the EDSL version and class name from the dictionary.
+    - Ensures backwards compatibility with older versions of EDSL.
+    """
+
+    @functools.wraps(func)
+    def wrapper(cls, data, *args, **kwargs):
+        data_copy = dict(data)
+        edsl_version = data_copy.pop("edsl_version", None)
+        edsl_classname = data_copy.pop("edsl_class_name", None)
+
+        # Version- and class-specific logic here
+        if edsl_classname == "Survey":
+            if edsl_version is None or edsl_version <= "0.1.20":
+                data_copy["question_groups"] = {}
+
+        return func(cls, data_copy, *args, **kwargs)
+
+    return wrapper
+
+
+def jupyter_nb_handler(func):
+    """Decorator to run an async function in the event loop if it's running, or synchronously otherwise."""
+
+    @functools.wraps(func)
+    async def async_wrapper(*args, **kwargs):
+        # This is an async wrapper to await the coroutine
+        return await func(*args, **kwargs)
+
+    def wrapper(*args, **kwargs):
+        loop = asyncio.get_event_loop()
+        if loop.is_running():
+            # If the loop is running, schedule the coroutine and wait for the result
+            future = asyncio.ensure_future(async_wrapper(*args, **kwargs))
+            return loop.run_until_complete(future)
+        else:
+            # If the loop is not running, run the coroutine to completion
+            return asyncio.run(async_wrapper(*args, **kwargs))
+
+    return wrapper
+
+
+def sync_wrapper(async_func):
+    """Decorator to create a synchronous wrapper for an asynchronous function."""
+
+    @functools.wraps(async_func)
+    def wrapper(*args, **kwargs):
+        return asyncio.run(async_func(*args, **kwargs))
+
+    return wrapper

edsl/utilities/gcp_bucket/cloud_storage.py

@@ -1,96 +1,96 @@
-import requests
-
-
-class CloudStorageManager:
-    def __init__(self, secret_token=None):
-        self.api_url = "https://bucket-server-tte53lsfxq-uc.a.run.app"
-        self.secret_token = secret_token
-
-    def get_signed_url(self, file_name, operation="upload"):
-        """Get a signed URL for uploading or downloading a file."""
-
-        if operation == "upload":
-            if self.secret_token == None:
-                raise "Set secret_token for upload permissions"
-            headers = {
-                "Authorization": self.secret_token,
-                "Content-Type": "application/json",
-            }
-        else:
-            headers = {
-                "Content-Type": "application/json",
-            }
-        data = {"file_name": file_name}
-        endpoint = f"{self.api_url}/generate-{operation}-signed-url"
-        response = requests.post(endpoint, json=data, headers=headers)
-
-        if response.status_code == 200:
-            return response.json().get("signed_url")
-        else:
-            raise Exception(
-                f"Failed to get signed URL: {response.status_code} {response.text}"
-            )
-
-    def upload_file(self, file_path, upload_file_name):
-        """Upload a file to the signed URL."""
-        signed_url = self.get_signed_url(upload_file_name, operation="upload")
-
-        with open(file_path, "rb") as file:
-            upload_response = requests.put(
-                signed_url,
-                data=file,
-                headers={"Content-Type": "application/octet-stream"},
-            )
-
-            if upload_response.status_code == 200:
-                print("File uploaded successfully")
-            else:
-                raise Exception(
-                    f"Failed to upload file: {upload_response.status_code} {upload_response.text}"
-                )
-
-    def download_file(self, file_name, save_name):
-        """Download a file from the signed URL."""
-
-        signed_url = self.get_signed_url(file_name, operation="download")
-        download_response = requests.get(signed_url, stream=True)
-
-        if download_response.status_code == 200:
-            with open(save_name, "wb") as file:
-                for chunk in download_response.iter_content(chunk_size=8192):
-                    file.write(chunk)
-            print("File downloaded successfully")
-        else:
-            raise Exception(
-                f"Failed to download file: {download_response.status_code} {download_response.text}"
-            )
-
-    def delete_file(self, file_name):
-        """Delete a file from the cloud storage."""
-        headers = {
-            "Authorization": self.secret_token,
-            "Content-Type": "application/json",
-        }
-        data = {"file_name": file_name}
-        endpoint = f"{self.api_url}/delete-file"
-        response = requests.delete(endpoint, params=data, headers=headers)
-
-        if response.status_code == 200:
-            print("File deleted successfully")
-        else:
-            raise Exception(
-                f"Failed to delete file: {response.status_code} {response.text}"
-            )
-
-    def list_files(self):
-        url = self.api_url + "/list_files"
-        headers = {
-            "Authorization": self.secret_token,
-            "Content-Type": "application/json",
-        }
-        res = requests.get(url, headers=headers)
-        data = res.json()
-        for x in data["data"]:
-            x["url"] = self.api_url + "/file/" + x["shaKey"]
-
-        return data
+import requests
+
+
+class CloudStorageManager:
+    def __init__(self, secret_token=None):
+        self.api_url = "https://bucket-server-tte53lsfxq-uc.a.run.app"
+        self.secret_token = secret_token
+
+    def get_signed_url(self, file_name, operation="upload"):
+        """Get a signed URL for uploading or downloading a file."""
+
+        if operation == "upload":
+            if self.secret_token == None:
+                raise "Set secret_token for upload permissions"
+            headers = {
+                "Authorization": self.secret_token,
+                "Content-Type": "application/json",
+            }
+        else:
+            headers = {
+                "Content-Type": "application/json",
+            }
+        data = {"file_name": file_name}
+        endpoint = f"{self.api_url}/generate-{operation}-signed-url"
+        response = requests.post(endpoint, json=data, headers=headers)
+
+        if response.status_code == 200:
+            return response.json().get("signed_url")
+        else:
+            raise Exception(
+                f"Failed to get signed URL: {response.status_code} {response.text}"
+            )
+
+    def upload_file(self, file_path, upload_file_name):
+        """Upload a file to the signed URL."""
+        signed_url = self.get_signed_url(upload_file_name, operation="upload")
+
+        with open(file_path, "rb") as file:
+            upload_response = requests.put(
+                signed_url,
+                data=file,
+                headers={"Content-Type": "application/octet-stream"},
+            )
+
+            if upload_response.status_code == 200:
+                print("File uploaded successfully")
+            else:
+                raise Exception(
+                    f"Failed to upload file: {upload_response.status_code} {upload_response.text}"
+                )
+
+    def download_file(self, file_name, save_name):
+        """Download a file from the signed URL."""
+
+        signed_url = self.get_signed_url(file_name, operation="download")
+        download_response = requests.get(signed_url, stream=True)
+
+        if download_response.status_code == 200:
+            with open(save_name, "wb") as file:
+                for chunk in download_response.iter_content(chunk_size=8192):
+                    file.write(chunk)
+            print("File downloaded successfully")
+        else:
+            raise Exception(
+                f"Failed to download file: {download_response.status_code} {download_response.text}"
+            )
+
+    def delete_file(self, file_name):
+        """Delete a file from the cloud storage."""
+        headers = {
+            "Authorization": self.secret_token,
+            "Content-Type": "application/json",
+        }
+        data = {"file_name": file_name}
+        endpoint = f"{self.api_url}/delete-file"
+        response = requests.delete(endpoint, params=data, headers=headers)
+
+        if response.status_code == 200:
+            print("File deleted successfully")
+        else:
+            raise Exception(
+                f"Failed to delete file: {response.status_code} {response.text}"
+            )
+
+    def list_files(self):
+        url = self.api_url + "/list_files"
+        headers = {
+            "Authorization": self.secret_token,
+            "Content-Type": "application/json",
+        }
+        res = requests.get(url, headers=headers)
+        data = res.json()
+        for x in data["data"]:
+            x["url"] = self.api_url + "/file/" + x["shaKey"]
+
+        return data

edsl/utilities/gcp_bucket/example.py

@@ -0,0 +1,50 @@
+from edsl.utilities.gcp_bucket.cloud_storage import CloudStorageManager
+
+# API URLs
+secret_token = "your-secret-token"
+
+# File paths and names
+upload_file_path = "./app.py"
+upload_file_name = "new_upload.py"
+
+# Initialize CloudStorageManager
+manager = CloudStorageManager(secret_token=secret_token) # secret_token only for upload operations
+
+# Upload Process
+try:
+    manager.upload_file(upload_file_path, upload_file_name)
+    print("File upload process completed.")
+except Exception as e:
+    print(f"Upload error: {str(e)}")
+
+# Download Process
+file_name = "new_upload.py"  # Name for the downloaded file
+save_name = "res_download.py"
+try:
+    manager.download_file(file_name, save_name)
+    print("File download process completed.")
+except Exception as e:
+    print(f"Download error: {str(e)}")
+
+# List files
+try:
+    print("listing files")
+    out = manager.list_files()
+    for x in out["data"]:
+        print(f"file_name: {x['file_name']}", f"url: {x['url']}")
+except Exception as e:
+    print(f"Exception in listing files", str(e))
+
+# Delete file
+try:
+    manager.delete_file("new_upload.py")
+except Exception as e:
+    print(f"Exception in deleting file", str(e))
+# List files
+try:
+    print("listing files")
+    out = manager.list_files()
+    for x in out["data"]:
+        print(f"file_name: {x['file_name']}", f"url: {x['url']}")
+except Exception as e:
+    print(f"Exception in listing files", str(e))