zrb 1.0.0a17__py3-none-any.whl → 1.0.0a19__py3-none-any.whl

zrb/runner/web_controller/static/task-ui/event.js

@@ -0,0 +1,120 @@
+window.addEventListener("load", async function () {
+    // Get current session
+    if (cfg.SESSION_NAME != "") {
+        CURRENT_SESSION.pollCurrentSession();
+    }
+    // set maxStartDate to today
+    const tomorrow = new Date();
+    tomorrow.setDate(tomorrow.getDate() + 1);  // Move to the next day
+    tomorrow.setHours(0, 0, 0, 0);
+    const formattedTomorrow = UTIL.toLocalDateInputValue(tomorrow);
+    const maxStartAtInput = document.getElementById("max-start-at-input");
+    maxStartAtInput.value = formattedTomorrow;
+    // set minStartDate to yesterday
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);  // Set time to 00:00:00
+    const formattedToday = UTIL.toLocalDateInputValue(today);
+    const minStartAtInput = document.getElementById("min-start-at-input");
+    minStartAtInput.value = formattedToday;
+    // Update session
+    PAST_SESSION.pollPastSession();
+});
+
+
+const submitTaskForm = document.getElementById("submit-task-form");
+submitTaskForm.addEventListener("input", async function(event) {
+    const currentInput = event.target;
+    const inputs = Array.from(submitTaskForm.querySelectorAll("input[name]"));
+    const inputMap = {};
+    const fixedInputNames = [];
+    for (const input of inputs) {
+        fixedInputNames.push(input.name);
+        if (input === currentInput) {
+            inputMap[input.name] = currentInput.value;
+            break;
+        } else {
+            inputMap[input.name] = input.value;
+        }
+    }
+    const queryString = new URLSearchParams(
+        {query: JSON.stringify(inputMap)}
+    ).toString();
+    try {
+        // Send the AJAX request
+        const response = await fetch(`${cfg.INPUT_API_URL}?${queryString}`, {
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json"
+            },
+        });
+        if (response.ok) {
+            const data = await response.json();
+            // Update the values of all subsequent inputs based on the response
+            Object.entries(data).forEach(([key, value]) => {
+                if (fixedInputNames.includes(key)) {
+                    return;
+                }
+                const input = submitTaskForm.querySelector(`[name="${key}"]`);
+                input.value = value;
+            });
+        } else {
+            console.error("Failed to fetch updated values:", response.statusText);
+        }
+    } catch (error) {
+        console.error("Error during fetch:", error);
+    }
+})
+
+
+function openPastSessionDialog(event) {
+    event.preventDefault();
+    const dialog = document.getElementById("past-session-dialog")
+    dialog.showModal();
+}
+
+
+function closePastSessionDialog(event) {
+    event.preventDefault();
+    const dialog = document.getElementById("past-session-dialog")
+    dialog.close();
+}
+
+
+async function submitNewSessionForm(event) {
+    // Prevent the form from submitting the traditional way
+    event.preventDefault();
+    // Select the form
+    const form = document.getElementById("submit-task-form");
+    // Initialize an empty object to hold form data
+    const formData = {};
+    // Iterate through each input in the form
+    Array.from(form.elements).forEach(element => {
+        // Only include inputs with a name attribute and ignore buttons
+        if (element.name && (element.type !== "button" && element.type !== "submit")) {
+            formData[element.name] = element.value;
+        }
+    });
+    // Convert formData to JSON
+    const jsonData = JSON.stringify(formData);
+    try {
+        // Send the AJAX request
+        const response = await fetch(cfg.SESSION_API_URL, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json"
+            },
+            body: jsonData
+        });
+        if (response.ok) {
+            const data = await response.json();
+            cfg.SESSION_NAME = data.session_name;
+            history.pushState(null, "", `${cfg.CURRENT_URL}${cfg.SESSION_NAME}`);
+            await PAST_SESSION.getAndRenderPastSession(0);
+            await CURRENT_SESSION.pollCurrentSession();
+        } else {
+            console.error("Error:", response);
+        }
+    } catch (error) {
+        console.error("Error:", error);
+    }
+}

zrb/runner/web_controller/static/task-ui/past-session.js

@@ -0,0 +1,138 @@
+const PAST_SESSION = {
+
+    async pollPastSession() {
+        while (true) {
+            await this.getAndRenderPastSession(cfg.PAGE);
+            await UTIL.delay(5000);
+        }
+    },
+
+    async getAndRenderPastSession(page) {
+        cfg.PAGE=page
+        const minStartAtInput = document.getElementById("min-start-at-input");
+        const minStartAt = UTIL.formatDate(minStartAtInput.value);
+        const maxStartAtInput = document.getElementById("max-start-at-input");
+        const maxStartAt = UTIL.formatDate(maxStartAtInput.value);
+        const queryString = new URLSearchParams({
+            page: page,
+            from: minStartAt,
+            to: maxStartAt,
+        }).toString();
+        try {
+            // Send the AJAX request
+            const response = await fetch(`${cfg.SESSION_API_URL}list?${queryString}`, {
+                method: "GET",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+            });
+            if (response.ok) {
+                const {total, data} = await response.json();
+                this.showPastSession(page, total, data);
+            } else {
+                console.error("Error:", response);
+            }
+        } catch (error) {
+            console.error("Error:", error);
+        }
+    },
+
+    showPastSession(page, total, data) {
+        const ul = document.getElementById("past-session-ul");
+        ul.innerHTML = '';  // Clear existing content
+        data.forEach(item => {
+            const taskStatus = item.task_status[item.main_task_name];
+            const finalStatus = UTIL.getFinalTaskStatus(taskStatus);
+            const finalColor = UTIL.getFinalColor(finalStatus);
+            const taskHistories = taskStatus.history;
+            const taskStartTime = taskHistories.length > 0 ? taskHistories[0].time : ""
+            const li = document.createElement('li');
+            const a = document.createElement('a');
+            const dateSpan = document.createElement('span');
+            const statusSpan = document.createElement('span');
+            a.textContent = item.name;
+            a.target = '_blank';
+            a.href = `${cfg.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("past-session-pagination-ul");
+        paginationUl.innerHTML = '';  // Clear previous pagination
+
+        const totalPages = Math.ceil(total / 10);  // Calculate total pages based on page size
+        const maxPagesToShow = 5;  // Number of pages to display around the current page
+        const halfMaxPages = Math.floor(maxPagesToShow / 2);
+        
+        // Add first page and previous controls
+        if (page > 0) {
+            paginationUl.appendChild(this.createPageLink("⟪", 0));  // Go to first page
+            paginationUl.appendChild(this.createPageLink("⟨", page - 1));  // Go to previous page
+        }
+
+        let startPage = Math.max(0, page - halfMaxPages);
+        let endPage = Math.min(totalPages - 1, page + halfMaxPages);
+
+        if (page <= halfMaxPages) {
+            endPage = Math.min(totalPages - 1, maxPagesToShow - 1);
+        } else if (page + halfMaxPages >= totalPages) {
+            startPage = Math.max(0, totalPages - maxPagesToShow);
+        }
+
+        if (startPage > 1) {
+            paginationUl.appendChild(this.createEllipsis());
+        }
+
+        // Add page links within the calculated range
+        for (let i = startPage; i <= endPage; i++) {
+            if (i === page) {
+                const pageLi = document.createElement('li');
+                pageLi.textContent = i + 1;
+                paginationUl.append(pageLi)
+            } else {
+                paginationUl.appendChild(this.createPageLink(i + 1, i))
+            }
+        }
+
+        // Add ellipsis after the end page if needed
+        if (endPage < totalPages - 2) {
+            paginationUl.appendChild(this.createEllipsis());
+        }
+
+        // Add next and last page controls
+        if (page < totalPages - 1) {
+            paginationUl.appendChild(this.createPageLink("⟩", page + 1));  // Go to next page
+            paginationUl.appendChild(this.createPageLink("⟫", totalPages - 1));  // Go to last page
+        }    
+    },
+
+    createPageLink(text, page) {
+        const li = document.createElement('li');
+        const link = document.createElement('a');
+        link.textContent = text;
+        link.href = '#';
+        link.onclick = (e) => {
+            e.preventDefault();
+            this.getAndRenderPastSession(page);
+        };
+        li.appendChild(link);
+        return li;
+    },
+
+    createEllipsis() {
+        const li = document.createElement('li');
+        li.textContent = '...';
+        return li;
+    },
+
+}

zrb/runner/web_controller/task_ui/controller.py

@@ -1,3 +1,4 @@
+import json
 import os
 
 from zrb.group.any_group import AnyGroup
@@ -10,14 +11,6 @@ _DIR = os.path.dirname(__file__)
 
 _VIEW_TEMPLATE = read_file(os.path.join(_DIR, "view.html"))
 _TASK_INPUT_TEMPLATE = read_file(os.path.join(_DIR, "partial", "input.html"))
-_MAIN_SCRIPT = read_file(os.path.join(_DIR, "partial", "main.js"))
-_SHOW_EXISTING_SESSION_SCRIPT = read_file(
-    os.path.join(_DIR, "partial", "show-existing-session.js")
-)
-_VISUALIZE_HISTORY_SCRIPT = read_file(
-    os.path.join(_DIR, "partial", "visualize-history.js")
-)
-_COMMON_UTIL_SCRIPT = read_file(os.path.join(_DIR, "partial", "common-util.js"))
 
 
 def handle_task_ui(
@@ -31,12 +24,16 @@ def handle_task_ui(
     # Assemble parent url
     parent_url_parts = url_parts[:-2] + [""]
     parent_url = "/".join(parent_url_parts)
-    # Assemble api url
-    api_url_parts = list(url_parts)
-    api_url_parts[1] = "api"
-    api_url = "/".join(api_url_parts)
+    # Assemble session api url
+    session_url_parts = list(url_parts)
+    session_url_parts[1] = "api/sessions"
+    session_api_url = "/".join(session_url_parts)
+    # Assemble input api url
+    input_url_parts = list(url_parts)
+    input_url_parts[1] = "api/inputs"
+    input_api_url = "/".join(input_url_parts)
     # Assemble ui url
-    ui_url_parts = list(api_url_parts)
+    ui_url_parts = list(url_parts)
     ui_url_parts[1] = "ui"
     ui_url = "/".join(ui_url_parts)
     # Assemble task inputs
@@ -58,13 +55,17 @@ def handle_task_ui(
                 "url": url,
                 "parent_url": parent_url,
                 "task_inputs": "\n".join(input_html_list),
-                "api_url": api_url,
                 "ui_url": ui_url,
-                "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,
+                "json_cfg": json.dumps(
+                    {
+                        "CURRENT_URL": url,
+                        "SESSION_API_URL": session_api_url,
+                        "INPUT_API_URL": input_api_url,
+                        "UI_URL": ui_url,
+                        "SESSION_NAME": session_name,
+                        "PAGE": 0,
+                    }
+                ),
             },
         )
     )

zrb/runner/web_controller/task_ui/view.html

@@ -19,16 +19,16 @@
             <li><a href="/">🏠 Home</a></li>
             <li><a href="{parent_url}">🔙 Parent</a></li>
             <li><a href="{ui_url}">🆕 New Session</a></li>
-            <li><a href="#" onclick="openDialog(event)">📂 Existing Session</a></li>
+            <li><a href="#" onclick="openPastSessionDialog(event)">📂 Existing Session</a></li>
           </ul>
         </nav>
       </hgroup>
     </header>
 
-    <dialog id="session-history-dialog">
+    <dialog id="past-session-dialog">
       <article>
         <header>
-          <button aria-label="Close" rel="prev" onclick="closeDialog(event)"></button>
+          <button aria-label="Close" rel="prev" onclick="closePastSessionDialog(event)"></button>
           <p>
             <strong>📂 Existing Session</strong>
           </p>
@@ -40,11 +40,11 @@
               <input type="datetime-local" id="max-start-at-input" placeholder="Maximum Start Time" aria-label="Maximum Start Time" />
             </fieldset>
           </form>
-          <ul id="session-history-ul" style="font-family:monospace;"></ul>
+          <ul id="past-session-ul" style="font-family:monospace;"></ul>
         </main>
         <footer>
           <nav>
-            <ul id="session-history-pagination-ul"></ul>
+            <ul id="past-session-pagination-ul"></ul>
           </nav>
         </footer>
       </article>
@@ -55,7 +55,7 @@
       <p>{description}</p>
       <canvas id="history-canvas" height="0" width="1000" style="width: 100%;"></canvas>
       <hr />
-      <form id="submit-task-form" onsubmit="submitForm(event)">
+      <form id="submit-task-form" onsubmit="submitNewSessionForm(event)">
         {task_inputs}
         <button>🚀 Run</button>
       </form>
@@ -74,14 +74,11 @@
 
   </body>
   <script>
-    const CURRENT_URL = '{url}';
-    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}
+    const cfg = {json_cfg};
   </script>
+  <script src="/static/task-ui/common-util.js"></script>
+  <script src="/static/task-ui/past-session.js"></script>
+  <script src="/static/task-ui/current-session.js"></script>
+  <script src="/static/task-ui/event.js"></script>
+
 </html>

zrb/session_state_logger/any_session_state_logger.py

@@ -5,7 +5,6 @@ from zrb.session_state_log.session_state_log import SessionStateLog, SessionStat
 
 
 class AnySessionStateLogger(ABC):
-
     @abstractmethod
     def write(self, session_log: SessionStateLog):
         pass

zrb/session_state_logger/file_session_state_logger.py

@@ -7,7 +7,6 @@ from zrb.util.file import read_file, write_file
 
 
 class FileSessionStateLogger(AnySessionStateLogger):
-
     def __init__(self, session_log_dir: str):
         self._session_log_dir = session_log_dir
 

zrb/task/base_trigger.py

@@ -19,7 +19,6 @@ from zrb.xcom.xcom import Xcom
 
 
 class BaseTrigger(BaseTask):
-
     def __init__(
         self,
         name: str,

zrb/task/llm_task.py

@@ -33,7 +33,6 @@ def scratchpad(thought: str) -> str:
 
 
 class LLMTask(BaseTask):
-
     def __init__(
         self,
         name: str,

zrb/task/make_task.py

@@ -32,7 +32,6 @@ def make_task(
     group: AnyGroup | None = None,
     alias: str | None = None,
 ) -> Callable[[Callable[[AnyContext], Any]], AnyTask]:
-
     def _make_task(fn: Callable[[AnyContext], Any]) -> BaseTask:
         task = BaseTask(
             name=name,

zrb/task/scaffolder.py

@@ -84,11 +84,13 @@ class Scaffolder(BaseTask):
 
     def _get_content_transformers(self) -> list[AnyContentTransformer]:
         if callable(self._content_transformers):
-            return [ContentTransformer(match="*", transform=self._content_transformers)]
+            return [
+                ContentTransformer(match=".*", transform=self._content_transformers)
+            ]
         if isinstance(self._content_transformers, dict):
             return [
                 ContentTransformer(
-                    match="*",
+                    match=".*",
                     transform=self._content_transformers,
                     auto_render=self._render_content_transformers,
                 )
@@ -127,11 +129,11 @@ class Scaffolder(BaseTask):
                     dest_file = os.path.join(
                         dest_dir, self._transform_path(ctx, file_name)
                     )
+                    ctx.log_info(f"Copying {src_file} to {dest_file}")
                     shutil.copy2(src_file, dest_file)
-                    ctx.log_info(f"Copied {src_file} to {dest_file}")
         else:
+            ctx.log_info(f"Copying {source_path} to {destination_path}")
             shutil.copy2(source_path, destination_path)
-            ctx.log_info(f"Copied {source_path} to {destination_path}")
 
     def _transform_path(self, ctx: AnyContext, file_path: str):
         if callable(self._path_transformer):

zrb/task/scheduler.py

@@ -16,7 +16,6 @@ from zrb.xcom.xcom import Xcom
 
 
 class Scheduler(BaseTrigger):
-
     def __init__(
         self,
         name: str,

zrb/util/cmd/command.py

@@ -47,7 +47,6 @@ async def run_command(
     max_output_line: int = 1000,
     max_error_line: int = 1000,
 ) -> tuple[CmdResult, int]:
-
     async def __read_stream(
         stream, log_method: Callable[..., None], max_lines: int
     ) -> str:

zrb/util/codemod/append_code_to_class.py

@@ -4,7 +4,7 @@ import libcst as cst
 class ClassCodeAdder(cst.CSTTransformer):
     def __init__(self, class_name: str, new_code: str):
         self.class_name = class_name
-        self.new_code = cst.parse_statement(new_code)
+        self.new_code = cst.parse_module(new_code).body
         self.class_found = False
 
     def leave_ClassDef(
@@ -15,17 +15,17 @@ class ClassCodeAdder(cst.CSTTransformer):
             self.class_found = True
             # Add the method to the class body
             new_body = updated_node.body.with_changes(
-                body=updated_node.body.body + (self.new_code,)
+                body=updated_node.body.body + tuple(self.new_code)
             )
             return updated_node.with_changes(body=new_body)
         return updated_node
 
 
-def append_code_to_class(original_code: str, class_name: str, method_code: str) -> str:
+def append_code_to_class(original_code: str, class_name: str, new_code: str) -> str:
     # Parse the original code into a module
     module = cst.parse_module(original_code)
     # Initialize transformer with the class name and method code
-    transformer = ClassCodeAdder(class_name, method_code)
+    transformer = ClassCodeAdder(class_name, new_code)
     # Apply the transformation
     modified_module = module.visit(transformer)
     # Check if the class was found

zrb/util/codemod/append_code_to_function.py

@@ -5,7 +5,7 @@ class FunctionCodeAdder(cst.CSTTransformer):
     def __init__(self, function_name: str, new_code: str):
         self.function_name = function_name
         # Use parse_module to handle multiple statements
-        self.new_code = cst.parse_statement(new_code)
+        self.new_code = cst.parse_module(new_code).body
         self.function_found = False
 
     def leave_FunctionDef(
@@ -16,7 +16,7 @@ class FunctionCodeAdder(cst.CSTTransformer):
             self.function_found = True
             # Add the method to the class body
             new_body = updated_node.body.with_changes(
-                body=updated_node.body.body + (self.new_code,)
+                body=updated_node.body.body + tuple(self.new_code)
             )
             return updated_node.with_changes(body=new_body)
         return updated_node

zrb/util/codemod/append_code_to_method.py

@@ -6,7 +6,7 @@ class MethodCodeAdder(cst.CSTTransformer):
         self.class_name = class_name
         self.method_name = method_name
         # Use parse_module to handle multiple statements
-        self.new_code = cst.parse_statement(new_code)
+        self.new_code = cst.parse_module(new_code).body
         self.class_found = False
         self.method_found = False
 
@@ -27,7 +27,7 @@ class MethodCodeAdder(cst.CSTTransformer):
                 ):
                     # Modify the target function by adding the new code
                     body_with_new_code = item.body.with_changes(
-                        body=item.body.body + (self.new_code,)  # Add the new code
+                        body=item.body.body + tuple(self.new_code)  # Add the new code
                     )
                     new_body.append(item.with_changes(body=body_with_new_code))
                     self.method_found = True

zrb/util/codemod/prepend_code_to_module.py

@@ -1,5 +1,5 @@
-def prepend_code_to_module(source_code: str, new_code: str) -> str:
-    lines = source_code.splitlines()
+def prepend_code_to_module(original_code: str, new_code: str) -> str:
+    lines = original_code.splitlines()
     last_import_index = -1
     for i, line in enumerate(lines):
         stripped_line = line.strip()

zrb/util/file.py

@@ -15,4 +15,4 @@ def write_file(file_path: str, content: str | list[str]):
     dir_path = os.path.dirname(file_path)
     os.makedirs(dir_path, exist_ok=True)
     with open(file_path, "w") as f:
-        f.write(content)
+        f.write(content.strip())