Support More Modern GCS Storage Block (#36)

* Support More Modern GCS Storage Block

* add allow_resuse kwarg, hopefully it exists on all pydantic versons

* patch

* support python 312 with pydantic validator

block_cascade/executors/vertex/executor.py

@@ -196,7 +196,14 @@ def create_job(self) -> VertexJob:
                     module_name = deployment.entrypoint
 
                 module_name = module_name.lstrip("/")
-                bucket = storage.data["bucket_path"]
+                #
+                # This is hardcoded to only support 
+                # prefect.filesystems.GCS or prefect_gcp.cloud_storage.GCSBucket
+                # storage blocks.
+                #
+                # TODO: This should be generalized to accept any storage block.
+                #
+                bucket = storage.data.get("bucket_path", "bucket")
                 deployment_path = deployment.path.rstrip("/")
 
                 package_path = f"{bucket}/{deployment_path}/{module_name}"

block_cascade/executors/vertex/resource.py

@@ -1,4 +1,5 @@
 from dataclasses import field
+import sys
 from typing import Iterable, Optional, Type, TypeVar
 
 from pydantic import validator
@@ -11,6 +12,12 @@
 T = TypeVar("T", bound="GcpEnvironmentConfig")
 
 
+if sys.version_info.minor == 12:
+    pydantic_validator = lambda *args: validator(*args, allow_reuse=True)
+else:
+    pydantic_validator = validator
+
+
 @dataclass(frozen=True)
 class GcpAcceleratorConfig:
     """
@@ -101,7 +108,7 @@ class GcpEnvironmentConfig:
     network: Optional[str] = None
     image: Optional[str] = None
 
-    @validator("image")
+    @pydantic_validator("image")
     def image_setter(cls, v, values):  # noqa: N805
         image = v
         # No image specified
@@ -144,7 +151,7 @@ class GcpResource:
     """
 
     chief: GcpMachineConfig = field(default_factory=GcpMachineConfig)
-    workers: GcpMachineConfig = None
+    workers: Optional[GcpMachineConfig] = None
     environment: Optional[GcpEnvironmentConfig] = None
     distributed_job: Optional[DistributedJobBase] = None
     persistent_resource_id: Optional[str] = None

pyproject.toml

@@ -3,7 +3,7 @@ name = "block-cascade"
 packages = [
     {include = "block_cascade"}
 ]
-version = "2.5.5"
+version = "2.5.6"
 description = "Library for model training in multi-cloud environment."
 readme = "README.md"
 authors = ["Block"]