Merge pull request #103 from dominrios/issue/100_make_deploy_button_work

Issue/100 make deploy button work

Author: craigpnnl

volttron_installer/models.py

@@ -9,6 +9,7 @@ class Instance(rx.Base):
     platform: PlatformModelView
 
     web_bind_address: str = "http://127.0.0.1:8080"
+    password: str = ""
 
     safe_host_entry: dict = {}
     uncaught: bool = False
@@ -21,6 +22,7 @@ class Instance(rx.Base):
     agent_configuration_expanded: bool = False
 
     new_instance: bool = True
+    deployed: bool = False
 
     def has_uncaught_changes(self) -> bool:
         return self.host.to_dict() != self.safe_host_entry
@@ -42,6 +44,8 @@ def refresh_for_copy(self) -> None:
         """
         self.new_instance = True
         self.platform.in_file = False
+        self.deployed = False
+        self.password = ""
         for agent in self.platform.agents.values():
             agent.in_file = False
             agent.selected_config_component_id = ""

volttron_installer/pages/platform_page.py

@@ -484,30 +484,75 @@ def configuration_tab_content() -> rx.Component:
                         color_scheme="green",
                         on_click=lambda: State.handle_save(),
                         disabled=rx.cond(
-                                (State.instance_savable)
-                                & (State.instance_uncaught),
-                                # (working_platform.uncaught),
-                                False,
-                                True
-                            )
+                            (State.instance_savable)
+                            & (State.instance_uncaught),
+                            # (working_platform.uncaught),
+                            False,
+                            True
+                        )
+                    ),
+                    rx.dialog.root(
+                        rx.dialog.trigger(
+                            rx.button(
+                                rx.cond(
+                                    State.platform_deployed,
+                                    "Re-Deploy",
+                                    "Deploy"
+                                ), 
+                                size="4", 
+                                variant="surface", 
+                                color_scheme="blue",
+                                disabled=rx.cond(
+                                    (State.instance_uncaught == False)
+                                    & (State.instance_deployable==True),
+                                    False,
+                                    True
+                                )
+                            ),
                         ),
-                    rx.button(
-                        rx.cond(
-                            State.platform_deployed,
-                            "Re-Deploy",
-                            "Deploy"
-                        ), 
-                        size="4", 
-                        variant="surface", 
-                        color_scheme="blue",
-                        on_click=lambda: State.handle_deploy(),
-                        disabled=rx.cond(
-                                (working_platform.uncaught == False)
-                                & (working_platform.valid==True),
-                                False,
-                                True
+                        rx.dialog.content(
+                            rx.dialog.title("Password Required"),
+                            rx.dialog.description("To deploy, please provide your ssh password"),
+                            rx.vstack(
+                                rx.vstack(
+                                    form_entry.form_entry(
+                                        "Password",
+                                        rx.input(
+                                            type="password",
+                                            on_change=State.update_password_field,
+                                            value=State.password_field
+                                        ),
+                                        required_entry=True
+                                    ),
+                                    align="center",
+                                    justify="center"
+                                ),
+                                rx.hstack(
+                                    rx.dialog.close(
+                                        rx.button(
+                                            "Cancel",
+                                            variant="soft",
+                                            color_scheme="gray",
+                                        )
+                                    ),
+                                    rx.button(
+                                        "Submit",
+                                        on_click=lambda: State.handle_deploy(),
+                                        disabled=rx.cond(
+                                            State.password_field=="",
+                                            True,
+                                            False
+                                        )
+                                    ),
+                                    spacing="3",
+                                    justify="end",
+                                ),
+                                width="100%",
+                                padding_top="1rem",
+                                spacing="6"
                             )
-                        ),
+                        )
+                    ),
                     rx.button(
                             "Cancel", 
                             size="4", 
@@ -560,4 +605,3 @@ def agent_config_tile(text, left_component: rx.Component = False, right_componen
         spacing="2",
         align="center",
     )
-

volttron_installer/state.py

@@ -241,11 +241,23 @@ def platform_title(self) -> str:
             return working_platform.platform.safe_platform['config']['instance_name']
 
     # === vars for platform details ===
+    @rx.var
+    def password_field(self) -> str:
+        if self.current_uid == "":
+            return ""
+        working_platform: Instance | None = self.platforms.get(self.current_uid, None)
+        if working_platform is None:
+            return ""
+        return working_platform.password
+
     @rx.var
     def platform_deployed(self) -> bool:
         if self.current_uid == "":
             return False
-        return False
+        working_platform: Instance | None = self.platforms.get(self.current_uid, None)
+        if working_platform is None:
+            return ""
+        return working_platform.deployed
 
     # === end of platform detail vars ===
 
@@ -368,7 +380,12 @@ def instance_uncaught(self) -> bool:
 
     @rx.var
     def instance_deployable(self) -> bool:
-        return True
+        if self.current_uid == "":
+            return False
+        working_platform: Instance | None = self.platforms.get(self.current_uid, None)
+        if working_platform is None:
+            return False
+        return self.check_instance_deployable(working_platform)
     # === end of instance validation bars ===
 
     # Events
@@ -545,6 +562,11 @@ def toggle_federation(self):
         working_platform: Instance = self.platforms[self.current_uid]
         working_platform.federation_checked = not working_platform.federation_checked
 
+    @rx.event
+    def update_password_field(self, value: str):
+        working_platform_instance = self.platforms[self.current_uid]
+        working_platform_instance.password = value
+
     @rx.event
     def update_detail(self, field: str, value):
         working_platform_instance = self.platforms[self.current_uid]
@@ -565,13 +587,15 @@ def update_platform_config_detail(self, field: str, value: str):
     @rx.event
     async def handle_deploy(self):
         working_platform: Instance = self.platforms[self.current_uid]
-
-        if working_platform.uncaught != False and working_platform.valid:
-            working_platform.safe_host_entry = working_platform.host.to_dict()
-            working_platform.uncaught = False
-            await deploy_platform(working_platform.platform.config.instance_name)
+        try:
+            response = await deploy_platform(working_platform.platform.config.instance_name, working_platform.password)
+            working_platform.deployed = True
+            logger.debug(f"response: {response.json()}")
             yield rx.toast.success("Deployed Successfully!")
-     
+        except Exception as e:
+            logger.debug(f"there was an error deploying platform {working_platform.platform.config.instance_name}. e: {e}")
+            yield rx.toast.error(f"There was an error deploying platform: {working_platform.platform.config.instance_name}")
+
     @rx.event
     async def handle_save(self):
         working_platform: Instance = self.platforms[self.current_uid]
@@ -730,6 +754,9 @@ def check_instance_savable(self, working_platform: Instance) -> bool:
 
         return savable
 
+    def check_instance_deployable(self, working_platform: Instance) -> bool:
+        return True if self.check_instance_uncaught(working_platform) == False and working_platform.new_instance == False else False
+
     def connection_validity(self, working_platform: Instance) -> tuple[bool, dict[str, bool]]:
         valid = True
         validity_map: dict[str, bool] = {

volttron_installer/thin_endpoint_wrappers/__init__.py

@@ -1,5 +1,5 @@
 import httpx, asyncio
-from typing import Any, Optional, TypeVar, Type, Union, List, Dict
+from typing import Any, Literal, Optional, TypeVar, Type, Union, List, Dict
 
 from ..backend.models import AgentType, HostEntry, PlatformDefinition, \
     CreatePlatformRequest, CreateOrUpdateHostEntryRequest, ReachableResponse, \
@@ -109,6 +109,24 @@ async def delete_request(url: str, params: Optional[dict[str, Any]] = None,
         except Exception as e:
             raise ApiError(500, str(e))
 
+async def request(url: str, method: Literal["POST", "GET", "PUT"] ="", timeout: float = DEFAULT_TIMEOUT, **kwargs) -> httpx.Response:
+    """Send an async POST request to the specified URL with optional JSON data."""
+    async with httpx.AsyncClient(timeout=timeout, follow_redirects=True) as client:
+        try:
+            response = await client.request(
+                    method=method,
+                    url=url, 
+                    **kwargs
+                )
+            response.raise_for_status()
+            return response
+        except httpx.TimeoutException:
+            raise ApiError(408, f"Request timed out connecting to {url}")
+        except httpx.HTTPStatusError as e:
+            raise ApiError(e.response.status_code, e.response.text)
+        except Exception as e:
+            raise ApiError(500, str(e))
+
 # Endpoints.
 # GET requests
 @with_model(HostEntry)
@@ -159,8 +177,8 @@ async def update_agent(platform_id: str, agent_id: str, agent: CreateAgentReques
 async def create_platform(platform: CreatePlatformRequest):
     await post_request(f"{API_BASE_URL}{PLATFORMS_PREFIX}/", data=platform.model_dump())
 
-async def deploy_platform(platform_id: str):
-    await post_request(f"{API_BASE_URL}{PLATFORMS_PREFIX}/deploy/{platform_id}")
+async def deploy_platform(platform_id: str, password: str):
+    return await request(f"{API_BASE_URL}{PLATFORMS_PREFIX}/deploy/{platform_id}", "POST", params={"password":password})
 
 async def add_host(host: CreateOrUpdateHostEntryRequest):
     await post_request(f"{API_BASE_URL}{HOSTS_PREFIX}", data=host.model_dump())