PyPI - zrb - Versions diffs - 1.0.0a18__py3-none-any.whl → 1.0.0a20__py3-none-any.whl - Mend

zrb 1.0.0a18py3-none-any.whl → 1.0.0a20py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (66) hide show

zrb/runner/web_controller/group_info_page/controller.py ADDED Viewed

@@ -0,0 +1,40 @@
+import os
+from zrb.group.any_group import AnyGroup
+from zrb.runner.web_config import User
+from zrb.runner.web_util import (
+    get_html_auth_link,
+    get_html_subgroup_info,
+    get_html_subtask_info,
+)
+from zrb.util.file import read_file
+from zrb.util.string.format import fstring_format
+def show_group_info_page(user: User, root_group: AnyGroup, group: AnyGroup, url: str):
+    from fastapi.responses import HTMLResponse
+    _DIR = os.path.dirname(__file__)
+    _VIEW_TEMPLATE = read_file(os.path.join(_DIR, "view.html"))
+    url_parts = url.split("/")
+    parent_url_parts = url_parts[:-2] + [""]
+    parent_url = "/".join(parent_url_parts)
+    group_info = get_html_subgroup_info(user, url, group)
+    task_info = get_html_subtask_info(user, url, group)
+    auth_link = get_html_auth_link(user)
+    return HTMLResponse(
+        fstring_format(
+            _VIEW_TEMPLATE,
+            {
+                "group_info": group_info,
+                "task_info": task_info,
+                "name": group.name,
+                "description": group.description,
+                "auth_link": auth_link,
+                "root_name": root_group.name,
+                "root_description": root_group.description,
+                "url": url,
+                "parent_url": parent_url,
+            },
+        )
+    )

zrb/runner/web_controller/group_info_page/view.html ADDED Viewed

@@ -0,0 +1,36 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="color-scheme" content="light dark">
+        <link rel="stylesheet" href="/static/pico.min.css">
+        <link rel="icon" href="/static/favicon-32x32.png" sizes="32x32" type="image/png">
+        <title>Zrb</title>
+        <link rel="stylesheet" href="/static/common.css">
+    </head>
+    <body>
+        <header class="container">
+            <hgroup>
+                <h1>{root_name}</h1>
+                <p>{root_description}</p>
+                <nav>
+                    <ul>
+                        <li><a href="/">🏠 Home</a></li>
+                        <li><a href="{parent_url}">🔙 Parent</a></li>
+                        <li><a href="/docs">💻 API Documentation</a></li>
+                    </ul>
+                    <ul>
+                        <li>{auth_link}</li>
+                    </ul>
+                </nav>
+            </hgroup>
+        </header>
+        <main class="container">
+                <h3>{name}</h3>
+                <p>{description}</p>
+                {group_info}
+                {task_info}
+        </main>
+    </body>
+</html>

zrb/runner/web_controller/home_page/controller.py CHANGED Viewed

@@ -1,60 +1,24 @@
 import os
 from zrb.group.any_group import AnyGroup
+from zrb.runner.web_config import User
+from zrb.runner.web_util import (
+    get_html_auth_link,
+    get_html_subgroup_info,
+    get_html_subtask_info,
+)
 from zrb.util.file import read_file
-from zrb.util.group import get_non_empty_subgroups, get_subtasks
 from zrb.util.string.format import fstring_format
-_DIR = os.path.dirname(__file__)
-_VIEW_TEMPLATE = read_file(os.path.join(_DIR, "view.html"))
-_GROUP_INFO_TEMPLATE = read_file(os.path.join(_DIR, "partial", "group_info.html"))
-_GROUP_LI_TEMPLATE = read_file(os.path.join(_DIR, "partial", "group_li.html"))
-_TASK_INFO_TEMPLATE = read_file(os.path.join(_DIR, "partial", "task_info.html"))
-_TASK_LI_TEMPLATE = read_file(os.path.join(_DIR, "partial", "task_li.html"))
-def handle_home_page(root_group: AnyGroup):
+def show_home_page(user: User, root_group: AnyGroup):
     from fastapi.responses import HTMLResponse
-    subgroups = get_non_empty_subgroups(root_group, web_only=True)
-    group_info = (
-        ""
-        if len(subgroups) == 0
-        else fstring_format(
-            _GROUP_INFO_TEMPLATE,
-            {
-                "group_li": "\n".join(
-                    [
-                        fstring_format(
-                            _GROUP_LI_TEMPLATE,
-                            {"caption": name, "description": group.description},
-                        )
-                        for name, group in subgroups.items()
-                    ]
-                )
-            },
-        )
-    )
-    subtasks = get_subtasks(root_group, web_only=True)
-    task_info = (
-        ""
-        if len(subtasks) == 0
-        else fstring_format(
-            _TASK_INFO_TEMPLATE,
-            {
-                "task_li": "\n".join(
-                    [
-                        fstring_format(
-                            _TASK_LI_TEMPLATE,
-                            {"caption": name, "description": task.description},
-                        )
-                        for name, task in subtasks.items()
-                    ]
-                )
-            },
-        )
-    )
+    _DIR = os.path.dirname(__file__)
+    _VIEW_TEMPLATE = read_file(os.path.join(_DIR, "view.html"))
+    group_info = get_html_subgroup_info(user, "/ui/", root_group)
+    task_info = get_html_subtask_info(user, "/ui/", root_group)
+    auth_link = get_html_auth_link(user)
     return HTMLResponse(
         fstring_format(
             _VIEW_TEMPLATE,
@@ -63,6 +27,7 @@ def handle_home_page(root_group: AnyGroup):
                 "task_info": task_info,
                 "name": root_group.name,
                 "description": root_group.description,
+                "auth_link": auth_link,
             },
         )
     )

zrb/runner/web_controller/home_page/view.html CHANGED Viewed

@@ -1,23 +1,32 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="color-scheme" content="light dark">
-    <link rel="stylesheet" href="/static/pico.min.css">
-    <link rel="icon" href="/static/favicon-32x32.png" sizes="32x32" type="image/png">
-    <title>Zrb</title>
-  </head>
-  <body>
-    <header class="container">
-      <hgroup>
-        <h1>{name}</h1>
-        <p>{description}</p>
-      </hgroup>
-    </header>
-    <main class="container">
-        {group_info}
-        {task_info}
-    </main>
-  </body>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="color-scheme" content="light dark">
+        <link rel="stylesheet" href="/static/pico.min.css">
+        <link rel="icon" href="/static/favicon-32x32.png" sizes="32x32" type="image/png">
+        <title>Zrb</title>
+        <link rel="stylesheet" href="/static/common.css">
+    </head>
+    <body>
+        <header class="container">
+            <hgroup>
+                <h1>{name}</h1>
+                <p>{description}</p>
+                <nav>
+                    <ul>
+                        <li><a href="/docs">💻 API Documentation</a></li>
+                    </ul>
+                    <ul>
+                        <li>{auth_link}</li>
+                    </ul>
+                </nav>
+            </hgroup>
+        </header>
+        <main class="container">
+                {group_info}
+                {task_info}
+        </main>
+    </body>
 </html>

zrb/runner/web_controller/login_page/controller.py ADDED Viewed

@@ -0,0 +1,25 @@
+import os
+from zrb.group.any_group import AnyGroup
+from zrb.runner.web_config import User
+from zrb.runner.web_util import get_html_auth_link
+from zrb.util.file import read_file
+from zrb.util.string.format import fstring_format
+def show_login_page(user: User, root_group: AnyGroup):
+    from fastapi.responses import HTMLResponse
+    _DIR = os.path.dirname(__file__)
+    _VIEW_TEMPLATE = read_file(os.path.join(_DIR, "view.html"))
+    auth_link = get_html_auth_link(user)
+    return HTMLResponse(
+        fstring_format(
+            _VIEW_TEMPLATE,
+            {
+                "name": root_group.name,
+                "description": root_group.description,
+                "auth_link": auth_link,
+            },
+        )
+    )

zrb/runner/web_controller/login_page/view.html ADDED Viewed

@@ -0,0 +1,50 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="color-scheme" content="light dark">
+    <link rel="stylesheet" href="/static/pico.min.css">
+    <link rel="icon" href="/static/favicon-32x32.png" sizes="32x32" type="image/png">
+    <title>Zrb</title>
+    <link rel="stylesheet" href="/static/common.css">
+</head>
+<body>
+    <header class="container">
+        <hgroup>
+            <h1>{name}</h1>
+            <p>{description}</p>
+            <nav>
+                <ul>
+                    <li><a href="/">🏠 Home</a></li>
+                    <li><a href="/docs">💻 API Documentation</a></li>
+                </ul>
+            </nav>
+        </hgroup>
+    </header>
+    <main class="container">
+        <article>
+            <h1>Login</h1>
+            <form id="login-form" onsubmit="login(event)">
+                <label for="username">
+                    Username
+                    <input type="text" id="username" name="username" placeholder="Enter your username" required />
+                </label>
+                <label for="password">
+                    Password
+                    <input type="password" id="password" name="password" placeholder="Enter your password" required />
+                </label>
+                <div class="button-group">
+                    <button class="primary">🔑 Login</button>
+                    <button class="secondary" onclick="window.history.back()">🔙 Cancel</button>
+                </div>
+            </form>
+            <p id="error-message"></p>
+        </article>
+    </main>
+    <script src="/static/login/event.js"></script>
+</body>
+</html>

zrb/runner/web_controller/logout_page/controller.py ADDED Viewed

@@ -0,0 +1,26 @@
+import os
+from zrb.group.any_group import AnyGroup
+from zrb.runner.web_config import User
+from zrb.runner.web_util import get_html_auth_link
+from zrb.util.file import read_file
+from zrb.util.string.format import fstring_format
+def show_logout_page(user: User, root_group: AnyGroup):
+    from fastapi.responses import HTMLResponse
+    _DIR = os.path.dirname(__file__)
+    _VIEW_TEMPLATE = read_file(os.path.join(_DIR, "view.html"))
+    auth_link = get_html_auth_link(user)
+    return HTMLResponse(
+        fstring_format(
+            _VIEW_TEMPLATE,
+            {
+                "name": root_group.name,
+                "description": root_group.description,
+                "auth_link": auth_link,
+                "user": user,
+            },
+        )
+    )

zrb/runner/web_controller/logout_page/view.html ADDED Viewed

@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="color-scheme" content="light dark">
+    <link rel="stylesheet" href="/static/pico.min.css">
+    <link rel="icon" href="/static/favicon-32x32.png" sizes="32x32" type="image/png">
+    <title>Zrb</title>
+    <link rel="stylesheet" href="/static/common.css">
+</head>
+<body>
+    <header class="container">
+        <hgroup>
+            <h1>{name}</h1>
+            <p>{description}</p>
+            <nav>
+                <ul>
+                    <li><a href="/">🏠 Home</a></li>
+                    <li><a href="/docs">💻 API Documentation</a></li>
+                </ul>
+            </nav>
+        </hgroup>
+    </header>
+    <main class="container">
+        <article>
+            <h2>Ready to log out?</h2>
+            <p>You are currently logged in as <strong>{user.username}</strong>.</p>
+            <div class="button-group">
+                <button class="primary" onclick="logout()">🚪 Logout</button>
+                <button class="secondary" onclick="window.history.back()">🔙 Cancel</button>
+            </div>
+        </article>
+    </main>
+    <script src="/static/logout/event.js"></script>
+</body>
+</html>

zrb/runner/web_controller/{task_ui → session_page}/controller.py RENAMED Viewed

@@ -1,42 +1,46 @@
+import json
 import os
 from zrb.group.any_group import AnyGroup
+from zrb.runner.web_config import User
+from zrb.runner.web_util import get_html_auth_link
 from zrb.session.any_session import AnySession
 from zrb.task.any_task import AnyTask
 from zrb.util.file import read_file
 from zrb.util.string.format import fstring_format
-_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(
-    root_group: AnyGroup, task: AnyTask, session: AnySession, url: str, args: list[str]
+def show_session_page(
+    user: User,
+    root_group: AnyGroup,
+    task: AnyTask,
+    session: AnySession,
+    url: str,
+    args: list[str],
 ):
     from fastapi.responses import HTMLResponse
+    _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"))
+    auth_link = get_html_auth_link(user)
     session.register_task(task)
     ctx = task.get_ctx(session)
     url_parts = url.split("/")
     # 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/sessions"
-    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
@@ -53,18 +57,23 @@ def handle_task_ui(
             {
                 "name": task.name,
                 "description": task.description,
+                "auth_link": auth_link,
                 "root_name": root_group.name,
                 "root_description": root_group.description,
                 "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 → session_page}/partial/input.html RENAMED Viewed

@@ -1,4 +1,4 @@
-<label>
+<label for="{task_input.name}">
   {task_input.prompt_message}
   {task_input.to_html(ctx)}
   <small id="{task_input.name}-helper">

zrb/runner/web_controller/session_page/view.html ADDED Viewed

@@ -0,0 +1,91 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="color-scheme" content="light dark">
+        <link rel="stylesheet" href="/static/pico.min.css">
+        <link rel="icon" href="/static/favicon-32x32.png" sizes="32x32" type="image/png">
+        <title>Zrb</title>
+    </head>
+    <body>
+        <header class="container">
+            <hgroup>
+                <h1>{root_name}</h1>
+                <p>{root_description}</p>
+                <nav>
+                    <ul>
+                        <li><a href="/">🏠 Home</a></li>
+                        <li><a href="{parent_url}">🔙 Parent</a></li>
+                        <li><a href="/docs">💻 API Documentation</a></li>
+                        <li><a href="{ui_url}">🆕 New Session</a></li>
+                        <li><a href="#" onclick="openPastSessionDialog(event)">📂 Existing Session</a></li>
+                    </ul>
+                    <ul>
+                        <li>{auth_link}</li>
+                    </ul>
+                </nav>
+            </hgroup>
+        </header>
+        <dialog id="past-session-dialog">
+            <article>
+                <header>
+                    <button aria-label="Close" rel="prev" onclick="closePastSessionDialog(event)"></button>
+                    <p>
+                        <strong>📂 Existing Session</strong>
+                    </p>
+                </header>
+                <main>
+                    <form>
+                        <fieldset class="grid">
+                            <input type="datetime-local" id="min-start-at-input" placeholder="Minimum Start Time" aria-label="Minimum Start Time" />
+                            <input type="datetime-local" id="max-start-at-input" placeholder="Maximum Start Time" aria-label="Maximum Start Time" />
+                        </fieldset>
+                    </form>
+                    <ul id="past-session-ul" style="font-family:monospace;"></ul>
+                </main>
+                <footer>
+                    <nav>
+                        <ul id="past-session-pagination-ul"></ul>
+                    </nav>
+                </footer>
+            </article>
+        </dialog>
+        <main class="container">
+            <article>
+                <h2>{name}</h2>
+                <p>{description}</p>
+                <canvas id="history-canvas" height="0" width="1000" style="width: 100%;"></canvas>
+            </article>
+            <article>
+                <form id="submit-task-form" onsubmit="submitNewSessionForm(event)">
+                    {task_inputs}
+                    <button>🚀 Run</button>
+                </form>
+            </article>
+            <article>
+                <label>
+                    Result
+                    <textarea id="result-textarea" rows="1" readonly style="font-family:monospace;">
+                    </textarea>
+                </label>
+                <label>
+                    Log
+                    <textarea id="log-textarea" rows="5" readonly style="font-family:monospace;">
+                    </textarea>
+                </label>
+            </article>
+        </main>
+    </body>
+    <script>
+        const cfg = {json_cfg};
+    </script>
+    <script src="/static/session/common-util.js"></script>
+    <script src="/static/session/past-session.js"></script>
+    <script src="/static/session/current-session.js"></script>
+    <script src="/static/session/event.js"></script>
+</html>

zrb/runner/web_controller/static/common.css ADDED Viewed

@@ -0,0 +1,11 @@
+header {
+    background-color: var(--primary);
+    padding: 2rem 0;
+    margin-bottom: 0;
+}
+header hgroup {
+    margin-bottom:0;
+}
+nav ul {
+    padding: 0;
+}

zrb/runner/web_controller/static/login/event.js ADDED Viewed

@@ -0,0 +1,33 @@
+async function login(event) {
+    event.preventDefault();
+    const username = document.getElementById('username').value;
+    const password = document.getElementById('password').value;
+    const errorMessage = document.getElementById('error-message');
+    try {
+        const response = await fetch('/api/v1/login', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            body: new URLSearchParams({
+                'username': username,
+                'password': password,
+            }),
+        });
+        if (response.ok) {
+            const data = await response.json();
+            console.log('Login successful', data);
+            // Redirect to home page or dashboard
+            window.location.href = '/';
+        } else {
+            const errorData = await response.json();
+            errorMessage.textContent = errorData.detail || 'Login failed. Please try again.';
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        errorMessage.textContent = 'An error occurred. Please try again.';
+    }
+}

zrb/runner/web_controller/static/logout/event.js ADDED Viewed

@@ -0,0 +1,20 @@
+async function logout() {
+    try {
+        const response = await fetch('/api/v1/logout', {
+            method: 'GET',
+            credentials: 'same-origin' // This is important for including cookies in the request
+        });
+        if (response.ok) {
+            // If logout was successful, redirect to the home page
+            window.location.href = '/';
+        } else {
+            // If there was an error, log it and alert the user
+            console.error('Logout failed');
+            alert('Logout failed. Please try again.');
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        alert('An error occurred during logout. Please try again.');
+    }
+}

zrb 1.0.0a18__py3-none-any.whl → 1.0.0a20__py3-none-any.whl

zrb 1.0.0a18py3-none-any.whl → 1.0.0a20py3-none-any.whl