zrb 1.0.0a1__py3-none-any.whl → 1.0.0a2__py3-none-any.whl

zrb/context/any_context.py

@@ -31,6 +31,10 @@ class AnyContext(AnySharedContext):
         """
         pass
 
+    @abstractmethod
+    def update_task_env(self, task_env: dict[str, str]):
+        pass
+
     @abstractmethod
     def print(
         self,

zrb/context/context.py

@@ -22,6 +22,7 @@ class Context(AnyContext):
         self, shared_ctx: AnySharedContext, task_name: str, color: int, icon: str
     ):
         self._shared_ctx = shared_ctx
+        self._env = shared_ctx.env.copy()
         self._task_name = task_name
         self._color = color
         self._icon = icon
@@ -38,7 +39,7 @@ class Context(AnyContext):
 
     @property
     def env(self) -> DotDict:
-        return self._shared_ctx.env
+        return self._env
 
     @property
     def args(self) -> list[Any]:
@@ -56,6 +57,9 @@ class Context(AnyContext):
     def session(self) -> AnySession | None:
         return self._shared_ctx._session
 
+    def update_task_env(self, task_env: dict[str, str]):
+        self._env.update(task_env)
+
     def append_to_shared_log(self, message: str):
         self._shared_ctx.append_to_shared_log(message)
 

zrb/env/any_env.py

@@ -5,5 +5,5 @@ from ..context.any_shared_context import AnySharedContext
 
 class AnyEnv(ABC):
     @abstractmethod
-    def update_shared_context(self, shared_ctx: AnySharedContext):
+    def update_context(self, shared_ctx: AnySharedContext):
         pass

zrb/env/env.py

@@ -22,7 +22,7 @@ class Env(AnyEnv):
         self._link_to_os = link_to_os
         self._os_name = os_name
 
-    def update_shared_context(self, shared_ctx: AnySharedContext):
+    def update_context(self, shared_ctx: AnySharedContext):
         if self._link_to_os:
             os_name = self._name if self._os_name is None else self._os_name
             value = os.getenv(os_name, self._get_default_value(shared_ctx))

zrb/env/env_map.py

@@ -18,7 +18,7 @@ class EnvMap(AnyEnv):
         self._os_prefix = os_prefix
         self._auto_render = auto_render
 
-    def update_shared_context(self, shared_ctx: SharedContext) -> dict[str, str]:
+    def update_context(self, shared_ctx: SharedContext) -> dict[str, str]:
         env_map = self._get_env_map(shared_ctx)
         for name, default_value in env_map.items():
             if self._link_to_os:
@@ -27,7 +27,7 @@ class EnvMap(AnyEnv):
                 value = os.getenv(os_name, default_value)
             else:
                 value = default_value
-            shared_ctx.env[self._name] = value
+            shared_ctx.env[name] = value
 
     def _get_env_map(self, shared_ctx: SharedContext) -> dict[str, str]:
         if callable(self._env_map):

zrb/runner/cli.py

@@ -139,13 +139,14 @@ class Cli(Group):
 
 
 cli = Cli(name="zrb", description="Your Automation Powerhouse", banner=BANNER)
-
-cli.add_task(
+server = cli.add_group(Group(name="server", description="Server related command"))
+server.add_task(
     Task(
         name="start-server",
         description="Make tasks available via HTTP Requests 🚀",
         action=lambda ctx: run_web_server(ctx=ctx, root_group=cli, port=WEB_HTTP_PORT),
         cli_only=True,
         retries=0,
-    )
+    ),
+    alias="start",
 )

zrb/runner/web_app/task_ui/controller.py

@@ -23,6 +23,9 @@ with open(os.path.join(_DIR, "partial", "show-existing-session.js")) as f:
 with open(os.path.join(_DIR, "partial", "visualize-history.js")) as f:
     _VISUALIZE_HISTORY_SCRIPT = f.read()
 
+with open(os.path.join(_DIR, "partial", "common-util.js")) as f:
+    _COMMON_UTIL_SCRIPT = f.read()
+
 
 def handle_task_ui(
     handler: AnyRequestHandler,
@@ -33,7 +36,7 @@ def handle_task_ui(
     args: list[str],
 ):
     session.register_task(task)
-    ctx = session.get_ctx(task)
+    ctx = task.get_ctx(session)
     url_parts = url.split("/")
     # Assemble parent url
     parent_url_parts = url_parts[:-2] + [""]
@@ -69,6 +72,7 @@ def handle_task_ui(
                 "main_script": _MAIN_SCRIPT,
                 "show_existing_session_script": _SHOW_EXISTING_SESSION_SCRIPT,
                 "visualize_history_script": _VISUALIZE_HISTORY_SCRIPT,
+                "common_util_script": _COMMON_UTIL_SCRIPT,
                 "session_name": session_name,
             },
         )

zrb/runner/web_app/task_ui/partial/common-util.js

@@ -0,0 +1,37 @@
+function getFinalColor(finalStatus) {
+    switch(finalStatus) {
+        case "started":
+            return "#3498db";
+        case "ready":
+            return "#f39c12";
+        case "completed":
+            return "#2ecc71";
+        case "skipped":
+            return "#95a5a6";
+        case "failed":
+            return "#e74c3c";
+        case "permanently-failed":
+            return "#c0392b";
+        case "terminated":
+            return "#ffffff";
+        default:
+            return "#ffffff";
+    } 
+}
+
+function getFinalTaskStatus(taskStatus) {
+    if (taskStatus.is_completed) {
+        return "completed";
+    }
+    if (taskStatus.is_terminated) {
+        return "terminated"
+    }
+    if (taskStatus.is_permanently_failed) {
+        return "permanently-failed"
+    }
+    const histories = taskStatus.history;
+    if (histories.length > 0) {
+        return histories[histories.length - 1].status;
+    }
+    return "";
+}

zrb/runner/web_app/task_ui/partial/main.js

@@ -17,11 +17,18 @@ window.addEventListener("load", async function () {
     const minStartAtInput = document.getElementById("min-start-at-input");
     minStartAtInput.value = formattedToday;
     // Update session
-    getExistingSessions(0);
+    pollExistingSessions(PAGE);
 });
 
+async function pollExistingSessions() {
+    while (true) {
+        await getExistingSessions(PAGE);
+        await delay(5000);
+    }
+}
 
 async function getExistingSessions(page) {
+    PAGE=page
     const minStartAtInput = document.getElementById("min-start-at-input");
     const minStartAt = formatDate(minStartAtInput.value);
     const maxStartAtInput = document.getElementById("max-start-at-input");
@@ -41,7 +48,7 @@ async function getExistingSessions(page) {
             },
         });
         const {total, data} = await response.json();
-        showExistingSession(total, data);
+        showExistingSession(page, total, data);
         console.log("Success:", data);
     } catch (error) {
         console.error("Error:", error);

zrb/runner/web_app/task_ui/partial/show-existing-session.js

@@ -1,16 +1,31 @@
-function showExistingSession(total, data) {
+function showExistingSession(page, total, data) {
     const ul = document.getElementById("session-history-ul");
     ul.innerHTML = '';  // Clear existing content
     data.forEach(item => {
-        const task_status = item.task_status[item.main_task_name];
-        const task_histories = task_status.history;
-        const task_start_time = task_histories.length > 0 ? task_histories[0].time : ""
+        const taskStatus = item.task_status[item.main_task_name];
+        const finalStatus = getFinalTaskStatus(taskStatus);
+        const finalColor = getFinalColor(finalStatus);
+        const taskHistories = taskStatus.history;
+        const taskStartTime = taskHistories.length > 0 ? taskHistories[0].time : ""
         const li = document.createElement('li');
         const a = document.createElement('a');
-        a.textContent = `${item.name} - ${task_start_time}`;
+        const dateSpan = document.createElement('span');
+        const statusSpan = document.createElement('span');
+        a.textContent = item.name;
         a.target = '_blank';
         a.href = `${UI_URL}${item.name}`;
         li.appendChild(a);
+        statusSpan.style.marginLeft = "10px";
+        statusSpan.style.display = 'inline-block';
+        statusSpan.style.width = '15px';
+        statusSpan.style.height = '15px';
+        statusSpan.style.borderRadius = '50%';
+        statusSpan.style.border = '2px solid black';
+        statusSpan.style.backgroundColor = finalColor;
+        li.appendChild(statusSpan);
+        dateSpan.style.marginLeft = "10px";
+        dateSpan.textContent = taskStartTime;
+        li.appendChild(dateSpan);
         ul.appendChild(li);
     }); 
     const paginationUl = document.getElementById("session-history-pagination-ul");

zrb/runner/web_app/task_ui/partial/visualize-history.js

@@ -101,44 +101,4 @@ function getTaskEndDateTime(taskStatus, now) {
         }
     }
     return now;
-}
-
-
-function getFinalColor(finalStatus) {
-    switch(finalStatus) {
-        case "started":
-            return "#3498db";
-        case "ready":
-            return "#f39c12";
-        case "completed":
-            return "#2ecc71";
-        case "skipped":
-            return "#95a5a6";
-        case "failed":
-            return "#e74c3c";
-        case "permanently-failed":
-            return "#c0392b";
-        case "terminated":
-            return "#ffffff";
-        default:
-            return "#ffffff";
-    } 
-}
-
-
-function getFinalTaskStatus(taskStatus) {
-    if (taskStatus.is_completed) {
-        return "completed";
-    }
-    if (taskStatus.is_terminated) {
-        return "terminated"
-    }
-    if (taskStatus.is_permanently_failed) {
-        return "permanently-failed"
-    }
-    const histories = taskStatus.history;
-    if (histories.length > 0) {
-        return histories[histories.length - 1].status;
-    }
-    return "";
-}
+}

zrb/runner/web_app/task_ui/view.html

@@ -78,7 +78,9 @@
     const API_URL = '{api_url}';
     const UI_URL = `{ui_url}`;
     let SESSION_NAME = '{session_name}';
+    let PAGE = 0;
     {main_script} 
+    {common_util_script}
     {show_existing_session_script}
     {visualize_history_script}
   </script>

zrb/session/session.py

@@ -100,7 +100,8 @@ class Session(AnySession):
     def set_main_task(self, main_task: AnyTask):
         self.register_task(main_task)
         self._main_task = main_task
-        self._main_task_path = get_node_path(self._root_group, main_task)
+        main_task_path = get_node_path(self._root_group, main_task)
+        self._main_task_path = [] if main_task_path is None else main_task_path
 
     def as_state_log(self) -> SessionStateLog:
         task_status_log: dict[str, TaskStatusStateLog] = {}

zrb/task/any_task.py

@@ -7,6 +7,7 @@ from ..env.any_env import AnyEnv
 from ..input.any_input import AnyInput
 
 if TYPE_CHECKING:
+    from ..context import any_context
     from ..session import session
 
 
@@ -89,6 +90,10 @@ class AnyTask(ABC):
         """
         pass
 
+    @abstractmethod
+    def get_ctx(self, session: session.AnySession) -> any_context.AnyContext:
+        pass
+
     @abstractmethod
     def run(
         self, session: session.AnySession | None = None, str_kwargs: dict[str, str] = {}

zrb/task/base_task.py

@@ -163,6 +163,13 @@ class BaseTask(AnyTask):
         if upstream not in self._upstreams:
             self._upstreams.append(upstream)
 
+    def get_ctx(self, session: AnySession) -> AnyContext:
+        ctx = session.get_ctx(self)
+        # Enhance session ctx with current task env
+        for env in self.envs:
+            env.update_context(ctx)
+        return ctx
+
     def run(
         self, session: AnySession | None = None, str_kwargs: dict[str, str] = {}
     ) -> Any:
@@ -194,9 +201,6 @@ class BaseTask(AnyTask):
             if key not in shared_context._env
         }
         shared_context._env.update(os_env_map)
-        # Inject environment from task's envs
-        for env in self.envs:
-            env.update_shared_context(shared_context)
 
     async def exec_root_tasks(self, session: AnySession):
         session.set_main_task(self)
@@ -219,12 +223,12 @@ class BaseTask(AnyTask):
         except IndexError:
             return None
         except asyncio.CancelledError:
-            ctx = session.get_ctx(self)
+            ctx = self.get_ctx(session)
             ctx.log_info("Session terminated")
         finally:
             session.terminate()
             session.state_logger.write(session.as_state_log())
-            ctx = session.get_ctx(self)
+            ctx = self.get_ctx(session)
             ctx.log_debug(session)
 
     async def _log_session_state(self, session: AnySession):
@@ -247,7 +251,7 @@ class BaseTask(AnyTask):
         return await asyncio.gather(*next_coros)
 
     async def exec(self, session: AnySession):
-        ctx = session.get_ctx(self)
+        ctx = self.get_ctx(session)
         if not session.is_allowed_to_run(self):
             # Task is not allowed to run, skip it for now.
             # This will be triggered later
@@ -262,11 +266,11 @@ class BaseTask(AnyTask):
         await run_async(self.__exec_action_until_ready(session))
 
     def __get_execute_condition(self, session: Session) -> bool:
-        ctx = session.get_ctx(self)
+        ctx = self.get_ctx(session)
         return get_bool_attr(ctx, self._execute_condition, True, auto_render=True)
 
     async def __exec_action_until_ready(self, session: AnySession):
-        ctx = session.get_ctx(self)
+        ctx = self.get_ctx(session)
         readiness_checks = self.readiness_checks
         if len(readiness_checks) == 0:
             ctx.log_info("No readiness checks")
@@ -301,7 +305,7 @@ class BaseTask(AnyTask):
     async def __exec_monitoring(self, session: AnySession, action_coro: asyncio.Task):
         readiness_checks = self.readiness_checks
         failure_count = 0
-        ctx = session.get_ctx(self)
+        ctx = self.get_ctx(session)
         while not session.is_terminated:
             await asyncio.sleep(self._readiness_check_period)
             if failure_count < self._readiness_failure_threshold:
@@ -343,7 +347,7 @@ class BaseTask(AnyTask):
             ctx.log_info("Continue monitoring")
 
     async def __exec_action_and_retry(self, session: AnySession) -> Any:
-        ctx = session.get_ctx(self)
+        ctx = self.get_ctx(session)
         max_attempt = self._retries + 1
         ctx.set_max_attempt(max_attempt)
         for attempt in range(max_attempt):

zrb/task/cmd_task.py

@@ -105,14 +105,16 @@ class CmdTask(BaseTask):
         Returns:
             Any: The result of the action execution.
         """
+        ctx.log_info("Running script")
         cmd_script = self._get_cmd_script(ctx)
-        cwd = self._get_cwd(ctx)
+        ctx.log_debug(f"Script: {self.__get_multiline_repr(cmd_script)}")
         shell = self._get_shell(ctx)
-        shell_flag = self._get_shell_flag(ctx)
-        ctx.log_info("Running script")
         ctx.log_debug(f"Shell: {shell}")
-        ctx.log_debug(f"Script: {self.__get_multiline_repr(cmd_script)}")
+        shell_flag = self._get_shell_flag(ctx)
+        cwd = self._get_cwd(ctx)
         ctx.log_debug(f"Working directory: {cwd}")
+        env_map = self.__get_env_map(ctx)
+        ctx.log_debug(f"Environment map: {env_map}")
         cmd_process = await asyncio.create_subprocess_exec(
             shell,
             shell_flag,
@@ -121,7 +123,7 @@ class CmdTask(BaseTask):
             stdin=sys.stdin if sys.stdin.isatty() else None,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
-            env=self.__get_env_map(ctx),
+            env=env_map,
             bufsize=0,
         )
         stdout_task = asyncio.create_task(
@@ -143,6 +145,7 @@ class CmdTask(BaseTask):
     def __get_env_map(self, ctx: AnyContext) -> dict[str, str]:
         envs = {key: val for key, val in ctx.env.items()}
         envs["_ZRB_SSH_PASSWORD"] = self._get_remote_password(ctx)
+        return envs
 
     async def __read_stream(self, stream, log_method, max_lines):
         lines = []

{zrb-1.0.0a1.dist-info → zrb-1.0.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0a1
+Version: 1.0.0a2
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -88,7 +88,7 @@ To run again: zrb math add 4
 __Using Web Interface__
 
 ```bash
-zrb start-server
+zrb server start
 ```
 
 Result (you need to access `http://localhost:21213`)
@@ -111,7 +111,8 @@ pip install --pre zrb
 Alternatively, you can also use our installation script to install Zrb along with some prerequisites:
 
 ```bash
-bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/refs/heads/1.0.0/install.sh)"
+# bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
 ```
 
 # 🐞 Bug Report + Feature Request

{zrb-1.0.0a1.dist-info → zrb-1.0.0a2.dist-info}/RECORD

@@ -21,17 +21,17 @@ zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 zrb/content_transformer/any_content_transformer.py,sha256=jA2GF7Il_AuApml2KMzaN3urQU0WP_UnWqhtYos40Do,739
 zrb/content_transformer/content_transformer.py,sha256=q4Es3xiMZT0VpYaDSuW0S3JiXJjLpiMbfEkQYs1XqI0,1615
 zrb/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/context/any_context.py,sha256=sf98YZuUq-DaN5bWcJxsJmXaJ6IGa0wHcQv0OgHaBAo,6143
+zrb/context/any_context.py,sha256=0QyLh1IBff25TKMWvK2C9ZNUyjGTpRx-CpkqHxlru94,6234
 zrb/context/any_shared_context.py,sha256=bWp2r9BF_b5W9HuMs15V68_-R25o9UzKkOA6w1aZTTY,1762
-zrb/context/context.py,sha256=20xHojg0YnYXv0RxZrq8aHH3JEsGGsElh27jC8NFtYQ,5909
+zrb/context/context.py,sha256=h9etXi4AenrvAA6GZmzbM3nwy1U5EHOYWD_Ha2zQMMs,6033
 zrb/context/shared_context.py,sha256=EdAXSnel-1F6Pyag2upuUagVw8hsUpzvknYr7tfGfhM,2678
 zrb/dot_dict/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/dot_dict/dot_dict.py,sha256=ubw_x8I7AOJ59xxtFVJ00VGmq_IYdZP3mUhNlO4nEK0,556
 zrb/env/__init__.py,sha256=poMQqx2UQHqlvAJmJ6ApkjAN0-h3raCYMCEKmRsGT54,33
-zrb/env/any_env.py,sha256=j8k8M9z7QeHKvJ9q37Ch0COwH0l_DMQPCIvA2g33KU0,216
-zrb/env/env.py,sha256=qbP43gWxqVSJXHEYsHR3JZKVcqF1sucH1E9VfxUj2ho,1058
+zrb/env/any_env.py,sha256=dMkx2jnpVxaTVw1Jkf3dbsdHz2h3IxZf5-c59cKxqRc,209
+zrb/env/env.py,sha256=tAaVIrex5HHyPc2FgIzqKQI5qjcqRHIT3nKSDK5daQY,1051
 zrb/env/env_file.py,sha256=_RHJRvPIJTmpwmyaa5zsEXKo4lSTPG3nFtaRJiNSeWc,733
-zrb/env/env_map.py,sha256=0jBv0fZV2rAspQQQclv4w0jNMlHhkK7hfXd2FLP7TDs,1257
+zrb/env/env_map.py,sha256=FoxG14dPlpeYsJtxMYIp3JdVRC3OlgXUR9fAxkhBHsg,1244
 zrb/group/__init__.py,sha256=3kqdBRThwO6hJkCGh0F7NtTtzUB9nXrt4dqDqY0ywA0,39
 zrb/group/any_group.py,sha256=fJKAVo2uHa2aUMfSjkK5S9V9RrNcJlsTQarCaEkPAcs,1094
 zrb/group/group.py,sha256=V8DjuiFODBG69lxBSL3pXJElOaYG-Ub7NxUb3MvA8zw,1759
@@ -45,7 +45,7 @@ zrb/input/password_input.py,sha256=c69kq_PYMltJoJCRsp_25FfDXGhF-PEgXu7QDZmCk20,1
 zrb/input/str_input.py,sha256=_gbOh2xds610Gb1_YByWfEusYBR-jQmrUoNUFJ-kv1c,72
 zrb/input/text_input.py,sha256=UBfc_0itxvI9hP-goqV9M4YdF27Bu81rXfRZ1VPaQ5w,3021
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/cli.py,sha256=35XGm_qY6Q9FxZ8h2h-rkSWImxQrMpcsuWMcuV4-7N4,5612
+zrb/runner/cli.py,sha256=HHFaPRC2lfQE5o0HGXtTGIajd-KrunHJv4eeztsxGxs,5717
 zrb/runner/web_app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/web_app/any_request_handler.py,sha256=QZsr0uxMWvD0VgqhJ04zQVAqkrib5d2D4HuSaJH5moM,538
 zrb/runner/web_app/group_info_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -65,18 +65,18 @@ zrb/runner/web_app/home_page/view.html,sha256=fSlyYU2L9YG6pAk5y83N5TWwjlhH8Mcg0I
 zrb/runner/web_app/static/favicon-32x32.png,sha256=yu9AIU4k_qD4YHpul6XwJgOxIbmu0thv9ymm2QOsrAk,1456
 zrb/runner/web_app/static/pico.min.css,sha256=3V_VWRr9ge4h3MEXrYXAFNw_HxncLXt9EB6grMKSdMI,82194
 zrb/runner/web_app/task_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/web_app/task_ui/controller.py,sha256=rLkp8-JaKIQ545ipJiyjBvD-7XcNbfQ926yT6GDnO9o,2381
+zrb/runner/web_app/task_ui/controller.py,sha256=5BcpGw89UZMoEJErTNw68ygQ90R-4jpraJ0qrrewPqo,2541
+zrb/runner/web_app/task_ui/partial/common-util.js,sha256=Un5HxlFMzNa16UBJZEWvEldFJaZpt6O3Qddd9Zlw0Io,931
 zrb/runner/web_app/task_ui/partial/input.html,sha256=DDOCdHfwrU8ZF1SSNb0KDaQzbhzn-gipEGaa_ZH5k9I,154
-zrb/runner/web_app/task_ui/partial/main.js,sha256=QdjATR4y5oFGf1PsnFWnupZyDlArGh-DljZQxR1rdNM,6355
-zrb/runner/web_app/task_ui/partial/show-existing-session.js,sha256=7XbYXMgv_37hf5ZdGvw0jxjytvUNJyjqVM7DH5nThiQ,2938
-zrb/runner/web_app/task_ui/partial/visualize-history.js,sha256=-3-cYgNdK3VjG6DAAUiJ5mMou71hAD6s4rwj4Es63Is,4851
-zrb/runner/web_app/task_ui/view.html,sha256=0gx5cYmyLh2wuMFRg8LOBuu-WLbEwENHTwAXbeGGe5g,2611
-zrb/runner/web_server.bak.py,sha256=6xrPW3SJ7ut53Z-2BZp6sJEL2ybLoX_OQxwE0EaCqrc,8693
+zrb/runner/web_app/task_ui/partial/main.js,sha256=3rjahRpypoQ6U2FwDTg21Zx7qt9zfbgzSxk6b6mNOQY,6514
+zrb/runner/web_app/task_ui/partial/show-existing-session.js,sha256=o5J-O5poWMIL1ujBXparwA4YalFuGXyA8S_wFw8obsM,3637
+zrb/runner/web_app/task_ui/partial/visualize-history.js,sha256=xKFmE-eXy9PXTWXhG_aQZ15DWStSGRrA8xzHntO-rmY,3916
+zrb/runner/web_app/task_ui/view.html,sha256=M3qOXAEercUcDy_K6Kb1hkaZXuOah-xdqjwDrKQH23U,2654
 zrb/runner/web_server.py,sha256=5h2NyqQm8Tlp_loUsIiTiTADm1EC_8PJF_wYBzK8idk,9168
 zrb/runner/web_util.py,sha256=Fn17emtjg2Z4GfySGIYptDn0zmAakolyQ6YkoVlYjgc,1188
 zrb/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/session/any_session.py,sha256=UPqBtNODIaRbRh5iEQEBCcqByc-KFz0fijONDkcky-M,5124
-zrb/session/session.py,sha256=pkHJDOSe_OpJX3S_XqihN4vGE2XFgZunBV_yNi9mkck,8898
+zrb/session/session.py,sha256=ITgjR7haZ6JkUAX8Pn6xPqQSjlJ_Ist_-QJABiX8-ro,8972
 zrb/session_state_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/session_state_log/session_state_log.py,sha256=bJj7L_kX7HMC9cd-de6j4xb3ExIVQQ94aV-oC4ghgPE,688
 zrb/session_state_logger/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -84,10 +84,10 @@ zrb/session_state_logger/any_session_state_logger.py,sha256=QLxzrS_DYmAJgjMNrEI8
 zrb/session_state_logger/default_session_state_logger.py,sha256=4Mk_ONxN9PGx2tCKHXMJHlS52rC62CtJCJyzop66LNw,171
 zrb/session_state_logger/file_session_state_logger.py,sha256=efkAAXs9kVUpTpnIgGPWeOB9gPrVExI2Tq1Qh6y9O7U,3942
 zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/any_task.py,sha256=oaDwXuozwpQWGUd6ucceXQkzSBH2PJBsGHsF8_S_z_4,3738
-zrb/task/base_task.py,sha256=ixIkgmQkx46xIliHu2QM9aXoMro0LKoqk2Q03sVjTnE,15663
+zrb/task/any_task.py,sha256=oXS0lqPb_DIMRd7KfbBelkQXyav8Q2pIW7eD4-CR2q4,3888
+zrb/task/base_task.py,sha256=RvK5P1i6yCCCaBlRrOGDVJE_o8YiCe-G8r1QtXIMaXI,15765
 zrb/task/base_trigger.py,sha256=_jSr35bjoVee7s0-ktrn1sYY2bTqUwWICbz3-ATVrPU,4454
-zrb/task/cmd_task.py,sha256=A0NAafrHWFgspG8cijcJ9FAgMa_LsyCSdt7x25cdl3c,9877
+zrb/task/cmd_task.py,sha256=T18V_uFx4OeK-MerkMng2OEjeLLXTy59aapwGWNfe80,9976
 zrb/task/http_check.py,sha256=hxaC_evUIEM16asny_m6b1JvltQGG-k3Fa3RvYJ2ts0,2458
 zrb/task/make_task.py,sha256=t9yrEjxFdcFPPyjUDr8kou9S1RU8UgvTdSexfi-RBRc,2139
 zrb/task/rsync_task.py,sha256=J9NoBjcMJDpC2Agbk8QlWKXEWIiAmO9M6hHnahq0Hkw,6351
@@ -114,7 +114,7 @@ zrb/util/string/format.py,sha256=LuKznDICnnbMOjM7_CEY0drlIlpdNqbBL-n6M4yEUVI,306
 zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=P4aYHdE3FRsTsNrXGyW8N44IWZjw-vG_qys1Ymn3aBg,1572
-zrb-1.0.0a1.dist-info/METADATA,sha256=uIZTlLx-yZkOeLbTiJ93P6VfD20EiqEM1BUDU7rQx6w,3642
-zrb-1.0.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.0.0a1.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.0.0a1.dist-info/RECORD,,
+zrb-1.0.0a2.dist-info/METADATA,sha256=5iPazsPnoJtYmMc9uaUP-3k16UUhoSJLLr7G0c5u-C4,3751
+zrb-1.0.0a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.0.0a2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.0.0a2.dist-info/RECORD,,

zrb/runner/web_server.bak.py

@@ -1,208 +0,0 @@
-import asyncio
-import datetime
-import json
-import os
-from concurrent.futures import ThreadPoolExecutor
-from functools import partial
-from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
-from threading import Thread
-from typing import Any
-from urllib.parse import parse_qs, urlparse
-
-from ..config import BANNER, SESSION_LOG_DIR, WEB_HTTP_PORT
-from ..context.any_context import AnyContext
-from ..context.shared_context import SharedContext
-from ..group.any_group import AnyGroup
-from ..session.session import Session
-from ..session_state_logger.default_session_state_logger import (
-    default_session_state_logger,
-)
-from ..task.any_task import AnyTask
-from ..util.group import extract_node_from_args, get_node_path
-from .web_app.group_info_ui.controller import handle_group_info_ui
-from .web_app.home_page.controller import handle_home_page
-from .web_app.task_ui.controller import handle_task_ui
-from .web_util import node_path_to_url, start_event_loop, url_to_args
-
-_DIR = os.path.dirname(__file__)
-_STATIC_DIR = os.path.join(_DIR, "web_app", "static")
-executor = ThreadPoolExecutor()
-
-
-class WebRequestHandler(BaseHTTPRequestHandler):
-    def __init__(
-        self,
-        request: Any,
-        client_address: Any,
-        server: Any,
-        root_group: AnyGroup,
-        event_loop: asyncio.AbstractEventLoop,
-        session_dir: str,
-    ):
-        self._root_group = root_group
-        self._event_loop = event_loop
-        self._session_dir = session_dir
-        super().__init__(request=request, client_address=client_address, server=server)
-
-    def do_GET(self):
-        parsed_url = urlparse(self.path)
-        if parsed_url.path in ["/", "/ui", "/ui/"]:
-            handle_home_page(self, self._root_group)
-        elif parsed_url.path == "/pico.min.css":
-            self.send_css_response(os.path.join(_STATIC_DIR, "pico.min.css"))
-        elif parsed_url.path == "/favicon-32x32.png":
-            self.send_image_response(os.path.join(_STATIC_DIR, "favicon-32x32.png"))
-        elif parsed_url.path.startswith("/ui/"):
-            args = url_to_args(parsed_url.path[3:])
-            node, node_path, residual_args = extract_node_from_args(
-                self._root_group, args
-            )
-            url = f"/ui{node_path_to_url(node_path)}"
-            if isinstance(node, AnyTask):
-                shared_ctx = SharedContext(env=dict(os.environ))
-                session = Session(shared_ctx=shared_ctx, root_group=self._root_group)
-                handle_task_ui(
-                    self, self._root_group, node, session, url, residual_args
-                )
-            elif isinstance(node, AnyGroup):
-                handle_group_info_ui(self, self._root_group, node, url)
-            else:
-                self.send_error(404, "Not Found")
-        elif parsed_url.path.startswith("/api/"):
-            args = url_to_args(parsed_url.path[5:])
-            node, _, residual_args = extract_node_from_args(self._root_group, args)
-            if isinstance(node, AnyTask) and len(residual_args) > 0:
-                if residual_args[0] == "list":
-                    task_path = get_node_path(self._root_group, node)
-                    query_params = parse_qs(parsed_url.query)
-                    self.send_session_list_json_data(task_path, query_params)
-                else:
-                    self.send_session_json_data(residual_args[0])
-            else:
-                self.send_error(404, "Not Found")
-        else:
-            self.send_error(404, "Not Found")
-
-    def do_POST(self):
-        parsed_url = urlparse(self.path)
-        if parsed_url.path.startswith("/api/"):
-            args = url_to_args(parsed_url.path[5:])
-            task, _, residual_args = extract_node_from_args(self._root_group, args)
-            session_name = residual_args[0] if len(residual_args) > 0 else None
-            if not isinstance(task, AnyTask):
-                self.send_error(404, "Not found")
-            elif session_name is None:
-                str_kwargs: dict[str, str] = self.read_json_request()
-                shared_ctx = SharedContext(env=dict(os.environ))
-                session = Session(shared_ctx=shared_ctx, root_group=self._root_group)
-                asyncio.run_coroutine_threadsafe(
-                    task.async_run(session, str_kwargs=str_kwargs),
-                    self._event_loop,
-                )
-                self.send_json_response({"session_name": session.name})
-        else:
-            self.send_error(404, "Not Found")
-
-    def send_session_list_json_data(
-        self, task_path: list[str], query_params: dict[str, list[Any]]
-    ):
-        print(query_params)
-        max_start_time = datetime.datetime.now()
-        if "to" in query_params and len(query_params["to"]) > 0:
-            max_start_time = datetime.datetime.strptime(
-                query_params["to"][0], "%Y-%m-%d %H:%M:%S"
-            )
-        min_start_time = max_start_time - datetime.timedelta(hours=1)
-        if "from" in query_params and len(query_params["from"]) > 0:
-            min_start_time = datetime.datetime.strptime(
-                query_params["from"][0], "%Y-%m-%d %H:%M:%S"
-            )
-        page = 0
-        if "page" in query_params and len(query_params["page"]) > 0:
-            page = int(query_params["page"][0])
-        limit = 10
-        if "limit" in query_params and len(query_params["limit"]) > 0:
-            limit = int(query_params["limit"][0])
-        try:
-            self.send_json_response(
-                default_session_state_logger.list(
-                    task_path,
-                    min_start_time=min_start_time,
-                    max_start_time=max_start_time,
-                    page=page,
-                    limit=limit,
-                )
-            )
-        except Exception as e:
-            self.send_json_response({"error": f"{e}"}, 500)
-
-    def send_session_json_data(self, session_name: str):
-        try:
-            self.send_json_response(default_session_state_logger.read(session_name))
-        except Exception as e:
-            self.send_json_response({"error": f"{e}"}, 500)
-
-    def send_json_response(self, data: Any, http_status: int = 200):
-        self.send_response(http_status)
-        self.send_header("Content-type", "application/json")
-        self.end_headers()
-        self.wfile.write(f"{json.dumps(data)}".encode())
-
-    def send_html_response(self, html: str, http_status: int = 200):
-        self.send_response(http_status)
-        self.send_header("Content-type", "text/html")
-        self.end_headers()
-        self.wfile.write(f"{html}".encode())
-
-    def send_css_response(self, css_path: str):
-        self.send_response(200)
-        self.send_header("Content-type", "text/css")
-        self.end_headers()
-        # If css_content is provided, send it; otherwise, you could read from a file here
-        with open(css_path, "r") as f:
-            css_content = f.read()
-        self.wfile.write(css_content.encode())
-
-    def send_image_response(self, image_path: str):
-        try:
-            with open(image_path, "rb") as img:
-                self.send_response(200)
-                if image_path.endswith(".png"):
-                    self.send_header("Content-type", "image/png")
-                elif image_path.endswith(".jpg") or image_path.endswith(".jpeg"):
-                    self.send_header("Content-type", "image/jpeg")
-                self.end_headers()
-                self.wfile.write(img.read())
-        except FileNotFoundError:
-            self.send_error(404, "Image Not Found")
-
-    def read_json_request(self) -> Any:
-        content_length = int(self.headers["Content-Length"])
-        post_data = self.rfile.read(content_length)
-        try:
-            return json.loads(post_data.decode())
-        except json.JSONDecodeError:
-            self.send_json_response({"error": "Invalid JSON"}, http_status=400)
-            return None
-
-
-def run_web_server(ctx: AnyContext, root_group: AnyGroup, port: int = WEB_HTTP_PORT):
-    server_address = ("", port)
-    event_loop = asyncio.new_event_loop()
-    # Use functools.partial to bind the custom attribute
-    handler_with_custom_attr = partial(
-        WebRequestHandler,
-        root_group=root_group,
-        event_loop=event_loop,
-        session_dir=SESSION_LOG_DIR,
-    )
-    httpd = ThreadingHTTPServer(server_address, handler_with_custom_attr)
-    banner_lines = BANNER.split("\n") + [
-        f"Zrb Server running on http://localhost:{port}"
-    ]
-    for line in banner_lines:
-        ctx.print(line)
-    loop_thread = Thread(target=start_event_loop, args=[event_loop], daemon=True)
-    loop_thread.start()
-    httpd.serve_forever()
-    loop_thread.join()