feat: use nodepoolselection instead of nodepool for tfy deployments, … (

#390) Co-authored-by: Sai krishna <sai@truefoundry.com>
truefoundry · Oct 22, 2024 · fc5de87 · fc5de87
1 parent f4c2257
commit fc5de87
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/backend/constants.py b/backend/constants.py
@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import StrEnum
 
 DATA_POINT_FQN_METADATA_KEY = "_data_point_fqn"
 
@@ -35,7 +35,7 @@
 
 
 ## Data source types
-class DataSourceType(Enum):
+class DataSourceType(StrEnum):
     TRUEFOUNDRY = "truefoundry"
     LOCAL = "localdir"
     WEB = "web"
diff --git a/backend/server/routers/internal.py b/backend/server/routers/internal.py
@@ -79,7 +79,7 @@ async def upload_to_data_directory(req: UploadToDataDirectoryDto):
         paths=req.filepaths,
     )
     # Serialize the signed urls.
-    data = [url.model_dump() for url in urls]
+    data = [url.dict() for url in urls]
     return JSONResponse(
         content={"data": data, "data_directory_fqn": dataset.fqn},
     )

diff --git a/deployment/audio.py b/deployment/audio.py
@@ -2,7 +2,7 @@
     HealthProbe,
     HttpProbe,
     Image,
-    NodeSelector,
+    NodepoolSelector,
     Port,
     Resources,
     Service,
@@ -25,7 +25,7 @@ def create_service(self):
                 image_uri=f"{self.dockerhub_images_registry}/fedirz/faster-whisper-server:latest-cpu",
             ),
             resources=Resources(
-                node=NodeSelector(capacity_type="spot_fallback_on_demand"),
+                node=NodepoolSelector(),
                 cpu_limit=1,
                 cpu_request=0.8,
                 memory_limit=8000,

diff --git a/deployment/backend.py b/deployment/backend.py
@@ -4,7 +4,7 @@
     HealthProbe,
     HttpProbe,
     LocalSource,
-    NodeSelector,
+    NodepoolSelector,
     Port,
     Resources,
     Service,
@@ -62,7 +62,7 @@ def create_service(self):
                 memory_limit=1000,
                 ephemeral_storage_request=1000,
                 ephemeral_storage_limit=2000,
-                node=NodeSelector(capacity_type="spot_fallback_on_demand"),
+                node=NodepoolSelector(),
             ),
             env={
                 "JOB_FQN": f"{self.workspace_fqn}:{self.application_set_name}-{INDEXER_SERVICE_NAME}",

diff --git a/deployment/indexer.py b/deployment/indexer.py
@@ -4,7 +4,7 @@
     Job,
     LocalSource,
     Manual,
-    NodeSelector,
+    NodepoolSelector,
     Param,
     Resources,
     StringDataMount,
@@ -92,7 +92,7 @@ def create_job(self):
                 memory_limit=1500,
                 ephemeral_storage_request=1000,
                 ephemeral_storage_limit=2000,
-                node=NodeSelector(capacity_type="spot_fallback_on_demand"),
+                node=NodepoolSelector(),
             ),
             retries=0,
         )
diff --git a/deployment/infinity.py b/deployment/infinity.py
@@ -1,4 +1,4 @@
-from truefoundry.deploy import Image, NodeSelector, Port, Resources, Service
+from truefoundry.deploy import Image, NodepoolSelector, Port, Resources, Service
 
 from deployment.config import INFINITY_SERVICE_NAME
 
@@ -23,7 +23,7 @@ def create_service(self):
                 memory_limit=8000,
                 ephemeral_storage_request=1500,
                 ephemeral_storage_limit=2000,
-                node=NodeSelector(capacity_type="spot_fallback_on_demand"),
+                node=NodepoolSelector(),
             ),
             env={
                 "PORT": "8000",

diff --git a/deployment/qdrant_ui.py b/deployment/qdrant_ui.py
@@ -2,7 +2,7 @@
     Build,
     DockerFileBuild,
     GitSource,
-    NodeSelector,
+    NodepoolSelector,
     Port,
     Resources,
     Service,
@@ -42,7 +42,7 @@ def create_service(self):
                 memory_limit=500,
                 ephemeral_storage_request=1000,
                 ephemeral_storage_limit=2000,
-                node=NodeSelector(capacity_type="spot_fallback_on_demand"),
+                node=NodepoolSelector(),
             ),
             ports=[
                 Port(

diff --git a/deployment/unstructured_io.py b/deployment/unstructured_io.py
@@ -1,4 +1,4 @@
-from truefoundry.deploy import Image, NodeSelector, Port, Resources, Service
+from truefoundry.deploy import Image, NodepoolSelector, Port, Resources, Service
 
 from deployment.config import UNSTRUCTURED_IO_SERVICE_NAME
 
@@ -21,7 +21,7 @@ def create_service(self):
                 memory_limit=8000,
                 ephemeral_storage_request=1500,
                 ephemeral_storage_limit=2000,
-                node=NodeSelector(capacity_type="spot_fallback_on_demand"),
+                node=NodepoolSelector(),
             ),
             env={
                 "UNSTRUCTURED_API_KEY": f"{self.secrets_base}:UNSTRUCTURED-IO-API-KEY"