zrb 1.7.3__py3-none-any.whl → 1.7.5__py3-none-any.whl

zrb/__init__.py

@@ -35,7 +35,7 @@ from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
 from zrb.llm_config import llm_config
 from zrb.runner.cli import cli
-from zrb.runner.web_config.config_factory import web_config
+from zrb.runner.web_config import web_config
 from zrb.runner.web_schema.user import User
 from zrb.session.session import Session
 from zrb.task.any_task import AnyTask

zrb/builtin/llm/tool/file.py

@@ -201,11 +201,11 @@ def read_from_file(
     Raises:
         Exception: If an error occurs.
     """
+    abs_path = os.path.abspath(os.path.expanduser(path))
+    # Check if file exists
+    if not os.path.exists(abs_path):
+        raise FileNotFoundError(f"File not found: {path}")
     try:
-        abs_path = os.path.abspath(os.path.expanduser(path))
-        # Check if file exists
-        if not os.path.exists(abs_path):
-            return json.dumps({"error": f"File {path} does not exist"})
         content = read_file_with_line_numbers(abs_path)
         lines = content.splitlines()
         total_lines = len(lines)
@@ -402,24 +402,15 @@ def apply_diff(
     Raises:
         Exception: If an error occurs.
     """
+    abs_path = os.path.abspath(os.path.expanduser(path))
+    if not os.path.exists(abs_path):
+        raise FileNotFoundError(f"File not found: {path}")
     try:
-        abs_path = os.path.abspath(os.path.expanduser(path))
-        if not os.path.exists(abs_path):
-            return json.dumps(
-                {"success": False, "path": path, "error": f"File not found at {path}"}
-            )
         content = read_file(abs_path)
         lines = content.splitlines()
         if start_line < 1 or end_line > len(lines) or start_line > end_line:
-            return json.dumps(
-                {
-                    "success": False,
-                    "path": path,
-                    "error": (
-                        f"Invalid line range {start_line}-{end_line} "
-                        f"for file with {len(lines)} lines."
-                    ),
-                }
+            raise ValueError(
+                f"Invalid line range {start_line}-{end_line} for file with {len(lines)} lines"
             )
         original_content = "\n".join(lines[start_line - 1 : end_line])
         if original_content != search_content:
@@ -465,9 +456,8 @@ async def analyze_file(ctx: AnyContext, path: str, query: str) -> str:
     """
     abs_path = os.path.abspath(os.path.expanduser(path))
     if not os.path.exists(abs_path):
-        return json.dumps(
-            {"success": False, "path": path, "error": f"File not found at {path}"}
-        )
+        raise FileNotFoundError(f"File not found: {path}")
+    file_content = read_file(abs_path)
     _analyze_file = create_sub_agent_tool(
         tool_name="analyze_file",
         tool_description="analyze file with LLM capability",
@@ -484,10 +474,12 @@ async def analyze_file(ctx: AnyContext, path: str, query: str) -> str:
         ctx,
         "\n".join(
             [
-                "# File path",
-                abs_path,
+                file_content,
                 "# Instruction",
                 query,
+                "# File path",
+                abs_path,
+                "# File content",
             ]
         ),
     )

zrb/runner/cli.py

@@ -8,7 +8,7 @@ from zrb.group.any_group import AnyGroup
 from zrb.group.group import Group
 from zrb.runner.common_util import get_run_kwargs
 from zrb.runner.web_app import create_web_app
-from zrb.runner.web_config.config_factory import web_config
+from zrb.runner.web_config import web_config
 from zrb.session.session import Session
 from zrb.session_state_logger.session_state_logger_factory import session_state_logger
 from zrb.task.any_task import AnyTask
@@ -19,7 +19,6 @@ from zrb.util.cli.style import (
     stylize_section_header,
 )
 from zrb.util.group import extract_node_from_args, get_non_empty_subgroups, get_subtasks
-from zrb.util.init_path import get_init_path_list
 from zrb.util.string.conversion import double_quote
 
 

zrb/runner/web_app.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 from zrb.config import CFG
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_route.docs_route import serve_docs
 from zrb.runner.web_route.error_page.serve_default_404 import serve_default_404
 from zrb.runner.web_route.home_page.home_page_route import serve_home_page
@@ -37,8 +37,9 @@ def create_web_app(
 
     @asynccontextmanager
     async def lifespan(app: FastAPI):
+        capitalized_group_name = CFG.ROOT_GROUP_NAME.capitalize()
         for line in CFG.BANNER.split("\n") + [
-            f"Zrb Server running on http://localhost:{web_config.port}"
+            f"{capitalized_group_name} Server running on http://localhost:{web_config.port}"
         ]:
             print(line, file=sys.stderr)
         yield

zrb/runner/web_config.py

@@ -0,0 +1,189 @@
+from typing import Callable
+
+from zrb.config import CFG
+from zrb.runner.web_schema.user import User
+from zrb.task.any_task import AnyTask
+
+
+class WebConfig:
+    def __init__(
+        self,
+        port: int | None = None,
+        secret_key: str | None = None,
+        access_token_expire_minutes: int | None = None,
+        refresh_token_expire_minutes: int | None = None,
+        access_token_cookie_name: str | None = None,
+        refresh_token_cookie_name: str | None = None,
+        enable_auth: bool | None = None,
+        super_admin_username: str | None = None,
+        super_admin_password: str | None = None,
+        guest_username: str | None = None,
+        guest_accessible_tasks: list[AnyTask | str] = [],
+        find_user_by_username: Callable[[str], User | None] | None = None,
+    ):
+        self._port = port
+        self._secret_key = secret_key
+        self._access_token_expire_minutes = access_token_expire_minutes
+        self._refresh_token_expire_minutes = refresh_token_expire_minutes
+        self._access_token_cookie_name = access_token_cookie_name
+        self._refresh_token_cookie_name = refresh_token_cookie_name
+        self._enable_auth = enable_auth
+        self._super_admin_username = super_admin_username
+        self._super_admin_password = super_admin_password
+        self._guest_username = guest_username
+        self._user_list = []
+        self._guest_accessible_tasks = guest_accessible_tasks
+        self._find_user_by_username = find_user_by_username
+
+    @property
+    def port(self) -> int:
+        if self._port is not None:
+            return self._port
+        return CFG.WEB_HTTP_PORT
+
+    @property
+    def secret_key(self) -> str:
+        if self._secret_key is not None:
+            return self._secret_key
+        return CFG.WEB_SECRET_KEY
+
+    @property
+    def access_token_expire_minutes(self) -> int:
+        if self._access_token_expire_minutes is not None:
+            return self._access_token_expire_minutes
+        return CFG.WEB_AUTH_ACCESS_TOKEN_EXPIRE_MINUTES
+
+    @property
+    def refresh_token_expire_minutes(self) -> int:
+        if self._refresh_token_expire_minutes is not None:
+            return self._refresh_token_expire_minutes
+        return CFG.WEB_AUTH_REFRESH_TOKEN_EXPIRE_MINUTES
+
+    @property
+    def access_token_cookie_name(self) -> str:
+        if self._access_token_cookie_name is not None:
+            return self._access_token_cookie_name
+        return CFG.WEB_ACCESS_TOKEN_COOKIE_NAME
+
+    @property
+    def refresh_token_cookie_name(self) -> str:
+        if self._refresh_token_cookie_name is not None:
+            return self._refresh_token_cookie_name
+        return CFG.WEB_REFRESH_TOKEN_COOKIE_NAME
+
+    @property
+    def enable_auth(self) -> bool:
+        if self._enable_auth is not None:
+            return self._enable_auth
+        return CFG.WEB_ENABLE_AUTH
+
+    @property
+    def super_admin_username(self) -> str:
+        if self._super_admin_username is not None:
+            return self._super_admin_username
+        return CFG.WEB_SUPER_ADMIN_USERNAME
+
+    @property
+    def super_admin_password(self) -> str:
+        if self._super_admin_password is not None:
+            return self._super_admin_password
+        return CFG.WEB_SUPER_ADMIN_PASSWORD
+
+    @property
+    def guest_username(self) -> str:
+        if self._guest_username is not None:
+            return self._guest_username
+        return CFG.WEB_GUEST_USERNAME
+
+    @property
+    def guest_accessible_tasks(self) -> list[AnyTask | str]:
+        return self._guest_accessible_tasks
+
+    @property
+    def default_user(self) -> User:
+        if self.enable_auth:
+            return User(
+                username=self.guest_username,
+                password="",
+                is_guest=True,
+                accessible_tasks=self.guest_accessible_tasks,
+            )
+        return User(
+            username=self.guest_username,
+            password="",
+            is_guest=True,
+            is_super_admin=True,
+        )
+
+    @property
+    def super_admin(self) -> User:
+        return User(
+            username=self.super_admin_username,
+            password=self.super_admin_password,
+            is_super_admin=True,
+        )
+
+    @property
+    def user_list(self) -> list[User]:
+        if not self.enable_auth:
+            return [self.default_user]
+        return self._user_list + [self.super_admin, self.default_user]
+
+    def set_port(self, port: int):
+        self._port = port
+
+    def set_secret_key(self, secret_key: str):
+        self._secret_key = secret_key
+
+    def set_access_token_expire_minutes(self, minutes: int):
+        self._access_token_expire_minutes = minutes
+
+    def set_refresh_token_expire_minutes(self, minutes: int):
+        self._refresh_token_expire_minutes = minutes
+
+    def set_access_token_cookie_name(self, name: str):
+        self._access_token_cookie_name = name
+
+    def set_refresh_token_cookie_name(self, name: str):
+        self._refresh_token_cookie_name = name
+
+    def set_enable_auth(self, enable: bool):
+        self._enable_auth = enable
+
+    def set_super_admin_username(self, username: str):
+        self._super_admin_username = username
+
+    def set_super_admin_password(self, password: str):
+        self._super_admin_password = password
+
+    def set_guest_username(self, username: str):
+        self._guest_username = username
+
+    def set_guest_accessible_tasks(self, tasks: list[AnyTask | str]):
+        self._guest_accessible_tasks = tasks
+
+    def set_find_user_by_username(
+        self, find_user_by_username: Callable[[str], User | None]
+    ):
+        self._find_user_by_username = find_user_by_username
+
+    def append_user(self, user: User):
+        duplicates = [
+            existing_user
+            for existing_user in self.user_list
+            if existing_user.username == user.username
+        ]
+        if len(duplicates) > 0:
+            raise ValueError(f"User already exists {user.username}")
+        self._user_list.append(user)
+
+    def find_user_by_username(self, username: str) -> User | None:
+        user = None
+        if self._find_user_by_username is not None:
+            user = self._find_user_by_username(username)
+        if user is None:
+            user = next((u for u in self.user_list if u.username == username), None)
+        return user
+
+
+web_config = WebConfig()

zrb/runner/web_route/error_page/serve_default_404.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_route.error_page.show_error_page import show_error_page
 from zrb.runner.web_util.user import get_user_from_request
 

zrb/runner/web_route/home_page/home_page_route.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 from zrb.config import CFG
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_util.html import (
     get_html_auth_link,
     get_html_subgroup_info,

zrb/runner/web_route/login_api_route.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Annotated
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_util.cookie import set_auth_cookie
 from zrb.runner.web_util.token import generate_tokens_by_credentials
 

zrb/runner/web_route/login_page/login_page_route.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 from zrb.config import CFG
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_util.html import get_html_auth_link
 from zrb.runner.web_util.user import get_user_from_request
 from zrb.util.file import read_file

zrb/runner/web_route/logout_api_route.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 
 if TYPE_CHECKING:
     # We want fastapi to only be loaded when necessary to decrease footprint

zrb/runner/web_route/logout_page/logout_page_route.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 from zrb.config import CFG
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_util.html import get_html_auth_link
 from zrb.runner.web_util.user import get_user_from_request
 from zrb.util.file import read_file

zrb/runner/web_route/node_page/node_page_route.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_route.error_page.show_error_page import show_error_page
 from zrb.runner.web_route.node_page.group.show_group_page import show_group_page
 from zrb.runner.web_route.node_page.task.show_task_page import show_task_page

zrb/runner/web_route/refresh_token_api_route.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_schema.token import RefreshTokenRequest
 from zrb.runner.web_util.cookie import set_auth_cookie
 from zrb.runner.web_util.token import regenerate_tokens

zrb/runner/web_route/static/static_route.py

@@ -1,7 +1,7 @@
 import os
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.util.file import read_file
 
 if TYPE_CHECKING:

zrb/runner/web_route/task_input_api_route.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 from zrb.group.any_group import AnyGroup
 from zrb.runner.common_util import get_run_kwargs
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_util.user import get_user_from_request
 from zrb.task.any_task import AnyTask
 from zrb.util.group import NodeNotFoundError, extract_node_from_args

zrb/runner/web_route/task_session_api_route.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any
 
 from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_schema.session import NewSessionResponse
 from zrb.runner.web_util.user import get_user_from_request
 from zrb.session.session import Session

zrb/runner/web_util/cookie.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_schema.token import Token
 
 if TYPE_CHECKING:

zrb/runner/web_util/token.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta, timezone
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_schema.token import Token
 from zrb.runner.web_util.user import get_user_by_credentials
 

zrb/runner/web_util/user.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_config.config import WebConfig
+from zrb.runner.web_config import WebConfig
 from zrb.runner.web_schema.user import User
 
 if TYPE_CHECKING:

{zrb-1.7.3.dist-info → zrb-1.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.7.3
+Version: 1.7.5
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.7.3.dist-info → zrb-1.7.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zrb/__init__.py,sha256=JgYNwsKYVzYzpoFXRn_LwuNFreMffPEvoSehTZisp4M,3103
+zrb/__init__.py,sha256=auzZHgBCBZLIp24JWIbLjjigOpnUv01DMdjyOsLnbGw,3088
 zrb/__main__.py,sha256=Kr_AkgmwBEycQcPVkZmrNh4hp2g62G-7ZXeOhJg0Qis,2603
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
@@ -17,7 +17,7 @@ zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sgueP
 zrb/builtin/llm/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/llm/tool/api.py,sha256=yR9I0ZsI96OeQl9pgwORMASVuXsAL0a89D_iPS4C8Dc,1699
 zrb/builtin/llm/tool/cli.py,sha256=_CNEmEc6K2Z0i9ppYeM7jGpqaEdT3uxaWQatmxP3jKE,858
-zrb/builtin/llm/tool/file.py,sha256=4bbgsE2aCDR6Y4HbkMM--Q_ohmJW3KPqLbhuoJrrd8M,18173
+zrb/builtin/llm/tool/file.py,sha256=nCY74VtruTr9LgAq5mroSr4zF0g6LA_uXMI5sh9c8OE,17909
 zrb/builtin/llm/tool/rag.py,sha256=VUyRBvnSeDf8T_lKY--c5HVTfccNgiEJU3QpwssJF8E,8182
 zrb/builtin/llm/tool/sub_agent.py,sha256=7n14KzUSFe5Bjf2lpluKlLyL-b1Mehj2QekkuDzo0ik,5091
 zrb/builtin/llm/tool/web.py,sha256=pXRLhcB_Y6z-2w4C4WezH8n-pg3PSMgt_bwn3aaqi6g,5479
@@ -247,32 +247,31 @@ zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
 zrb/input/text_input.py,sha256=6T3MngWdUs0u0ZVs5Dl11w5KS7nN1RkgrIR_zKumzPM,3695
 zrb/llm_config.py,sha256=h3LyjoOunc-2FxOOyCwM6Xcll3iXDykvvbV6xob-iB8,12244
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/cli.py,sha256=knWItZ0fm25gy4hjSgjliCtMSP2i3m2N8rNpS8B9csQ,7034
+zrb/runner/cli.py,sha256=6XIkgnmoH5HFDJzezbeWaqGBH5x-cv8ccWWgeCfura0,6969
 zrb/runner/common_util.py,sha256=JDMcwvQ8cxnv9kQrAoKVLA40Q1omfv-u5_d5MvvwHeE,1373
-zrb/runner/web_app.py,sha256=y7lA9urDg1ImZHFzhzogjVMVa9K8E-uSbMK_aNXYstM,2620
-zrb/runner/web_config/config.py,sha256=0wR58KreAmawGGfamm0GLZY344HaXs7qfDgHLavBDwo,3125
-zrb/runner/web_config/config_factory.py,sha256=GIvAwQKY_jkAb_IVt179KvphqHPY7gfBiQrZmELVQdQ,636
+zrb/runner/web_app.py,sha256=XWqA-MEk5ORD0UeIxeySJvWqOb1KQjCS3tu6aXv5sv8,2700
+zrb/runner/web_config.py,sha256=uayxLUK_VlHhKVsccQFGQQAbFpIfaGzA_PsYV5TqxRg,6348
 zrb/runner/web_route/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/web_route/docs_route.py,sha256=06QfDITvXTRphZWI0qlxbDfnB-44_eZpE-xotwKsvY8,514
-zrb/runner/web_route/error_page/serve_default_404.py,sha256=y2gVZPPjGp5J9uRH6JpoboaFI3DMP-WmCjH6fWx5UBM,1056
+zrb/runner/web_route/error_page/serve_default_404.py,sha256=0e5TDg7uQMZ_4uOsVyxtDLrI8pgcNhG8ZhWb3qhFgMk,1049
 zrb/runner/web_route/error_page/show_error_page.py,sha256=8U3jbBYVJIdYjR1AVCBfrmfLQ4dE4MbHwA3AovtIab4,1275
 zrb/runner/web_route/error_page/view.html,sha256=h58zKnB170h2BTczBtD8CoECEEdXpojWMBbL_KwS4yU,1204
 zrb/runner/web_route/home_page/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/runner/web_route/home_page/home_page_route.py,sha256=r_Mfmz2I5MmhQRMQ_0hWoNNucXNhxH6dl8rlA7yRIYY,2556
+zrb/runner/web_route/home_page/home_page_route.py,sha256=5f2vH_UdnYY_yWCkTT4xkfW4N1ojiB-oJe8IhTuOExY,2549
 zrb/runner/web_route/home_page/view.html,sha256=oWvirSGh74ABHHDPYboQueZI6_xMeMLDf5LZNLZO52k,422
-zrb/runner/web_route/login_api_route.py,sha256=AAK6DmQQrFi1Rg_Y5qF_ss11tzDMnziPXYILEb-vlb4,1125
-zrb/runner/web_route/login_page/login_page_route.py,sha256=BZ3aeVT7mNY1MgBvSjGCO77Lfnh9yBcOIajSbjgOo30,1695
+zrb/runner/web_route/login_api_route.py,sha256=I8rE6IfRKHtIZ9G0RbS_3lWBOleH5krZCGLf2Otxxbo,1118
+zrb/runner/web_route/login_page/login_page_route.py,sha256=6TT3YJRrl-brsxMT4d4_t8hO8VXg9fhqfiyBerWXDcU,1688
 zrb/runner/web_route/login_page/view.html,sha256=KLHZWm5MxcGCOQjeq_JtXMTLvDX8JyphSBbK6DDrkg8,1139
-zrb/runner/web_route/logout_api_route.py,sha256=ZlP1fi1RoNajLrm5ojo2o905TaE8OCB2soGhbLJ-2OE,612
-zrb/runner/web_route/logout_page/logout_page_route.py,sha256=oAeNXkwKFSUUby8F-i3WN7BZgIsAv5Lp8HYdLXAlsxQ,1740
+zrb/runner/web_route/logout_api_route.py,sha256=giPg7l4FvNSoFRUy42MBDKu9bZQnKGP7fxr2k5TW1l8,605
+zrb/runner/web_route/logout_page/logout_page_route.py,sha256=33dbiLwbQuOpZQFAKPE4Ci5QtUufQGw2JFBWOskfTpM,1733
 zrb/runner/web_route/logout_page/view.html,sha256=P1S9cv7eXMbwUZTPfP4sshBNI-m9nWhLP-mrmtoEHCs,742
 zrb/runner/web_route/node_page/group/show_group_page.py,sha256=QL_AawyOdmMQLyhS3lIF5Ko0vhuDH02QN-93rjxCVTQ,1943
 zrb/runner/web_route/node_page/group/view.html,sha256=3d1O2Vqc2PzxY-_xWt0Rsb2mG1yrvQ1TuaZXuYGolJw,566
-zrb/runner/web_route/node_page/node_page_route.py,sha256=LYi60eZ5ZGgykTIeSQk5Hn9OYjh3ocYgBIAue7Bznvw,2268
+zrb/runner/web_route/node_page/node_page_route.py,sha256=f37cyR1gV0eHrygY5_WmiXaGdWYTDMnimVtbQK1CJSA,2261
 zrb/runner/web_route/node_page/task/partial/input.html,sha256=X2jy0q7TLQGP853exZMed0lqPezL3gzn6mnhB5QKfkc,178
 zrb/runner/web_route/node_page/task/show_task_page.py,sha256=uZB7r5uQvG4OJwtGUu7DaTU-8qgSsVEf3nY8KaTE4TI,3344
 zrb/runner/web_route/node_page/task/view.html,sha256=mp_DeoPXhWPypAbKSZ6iTIDVlTRUQzIuJfDExxOWBWc,2598
-zrb/runner/web_route/refresh_token_api_route.py,sha256=QGulCGN2vhDXuf-U4bPSJjbTcz40ixP8937hSOiy_Mo,1478
+zrb/runner/web_route/refresh_token_api_route.py,sha256=V9ixg9bft7O2yp5vV5E_bwlWuHXB5CxwQcuQGDAJ5UQ,1471
 zrb/runner/web_route/static/global_template.html,sha256=M00b1F-Y31vx6xQVGMVGkSJzCrQHWHe9zI_WSffS6Ck,999
 zrb/runner/web_route/static/refresh-token.template.js,sha256=AWXhdxTMyuzBZoMftH7BjlU2CMIafwqWcbkZoiUEE50,1074
 zrb/runner/web_route/static/resources/common.css,sha256=Kk8o0mcArKTOxPllR0ecaa0ZRVVig0CG0KvLXIqmGJo,517
@@ -285,16 +284,16 @@ zrb/runner/web_route/static/resources/session/common-util.js,sha256=t7_s5DXgMyZl
 zrb/runner/web_route/static/resources/session/current-session.js,sha256=tzUdK7qJKnMBGlIaMZJIPc2oeL5csk1JTBbjTsjhrFA,7008
 zrb/runner/web_route/static/resources/session/event.js,sha256=X5OlSHefK0SDB9VkFCRyBKE_Pb7mqM319mW9jRGoDOk,4716
 zrb/runner/web_route/static/resources/session/past-session.js,sha256=RwGJYKSp75K8NZ-iZP58XppWgdzkiKFaiC5wgcMLxDo,5470
-zrb/runner/web_route/static/static_route.py,sha256=BxFXIhKqkPtSBVkuf6Uho8yLph_EqDTLTVB0KG2-Pbo,1539
-zrb/runner/web_route/task_input_api_route.py,sha256=WgkqprftYrtyq9YK0TVr1lQNQF30kEeyEaT6lRGkGLY,1751
-zrb/runner/web_route/task_session_api_route.py,sha256=WbDK7-XgpEKftItBXhmVrJw7Nph7BFXlr5TrMr76f6s,6008
+zrb/runner/web_route/static/static_route.py,sha256=glPzG5y1za7yX9p63R9K7KMT2pNw5HR5hdCDIwGdhSA,1532
+zrb/runner/web_route/task_input_api_route.py,sha256=bowIoUkxF_GwvzVC3ueu2AotNJEwww0Usbela72ioBY,1744
+zrb/runner/web_route/task_session_api_route.py,sha256=4CyIQD6zAMmwKAGfgJ467l70UHDn2BzeFl0Vl_39Lro,6001
 zrb/runner/web_schema/session.py,sha256=NwbuS2Sv-CXO52nU-EZv8OMlD4vgCQWNeLC_dT0FK7I,92
 zrb/runner/web_schema/token.py,sha256=Y7XCPS4WzrxslTDtHeLcPTTUpmWhPOkRcl4b99zrC7c,185
 zrb/runner/web_schema/user.py,sha256=Kp10amg4i-f8Y-4czogv1YN7rwy0HdbePFiuovYu1ts,1018
-zrb/runner/web_util/cookie.py,sha256=h0Ux94GxZgSF7mth1mMv2acxaYkU8iVhu6TICFLYxdE,1054
+zrb/runner/web_util/cookie.py,sha256=6k5HfyYoDjjEIXpjadehddq3i1Ji8ZQZS3rgtRiEUTQ,1047
 zrb/runner/web_util/html.py,sha256=TuUHjX3eKCBzoa7TYdMt8dfWWy06idauyCaG66X4Ygc,1838
-zrb/runner/web_util/token.py,sha256=X77-M-M0Yv_sGcnBtjbuAbnBK4Kg4qhf8paJTbanIL4,2584
-zrb/runner/web_util/user.py,sha256=XupVVe-IybL10bUKfEg1SfSf1mTIc4Wv2PoJCn-NNAc,1967
+zrb/runner/web_util/token.py,sha256=F0JxxSzBR5EaykvtgoZvziUAHptq9gxvcmY9ieRzXWA,2577
+zrb/runner/web_util/user.py,sha256=Jui1oKFe6jEEguuBoj8qe6mC1nXNmjVUOylUr2LHKh4,1960
 zrb/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/session/any_session.py,sha256=x57mS15E-AfUjdVxwOWEzCBjW32zjer7WoeBw0guoDc,5266
 zrb/session/session.py,sha256=aDaLV1tuE7PhcC17LMk6c7KiSs7yX7QXI9O-Z4MMZO8,9967
@@ -370,7 +369,7 @@ zrb/util/string/name.py,sha256=SXEfxJ1-tDOzHqmSV8kvepRVyMqs2XdV_vyoh_9XUu0,1584
 zrb/util/todo.py,sha256=VGISej2KQZERpornK-8X7bysp4JydMrMUTnG8B0-liI,20708
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.7.3.dist-info/METADATA,sha256=XgHOTXqZlnfTnKGLWhWJvkl4K5cz5_-5OPz0GS2zrSM,8385
-zrb-1.7.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.7.3.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.7.3.dist-info/RECORD,,
+zrb-1.7.5.dist-info/METADATA,sha256=mNeB3qvnX8OdAWf8hufJ-8A49kONSASS_nWoeN_WUvw,8385
+zrb-1.7.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.7.5.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.7.5.dist-info/RECORD,,

zrb/runner/web_config/config.py

@@ -1,91 +0,0 @@
-from typing import Callable
-
-from zrb.runner.web_schema.user import User
-from zrb.task.any_task import AnyTask
-
-
-class WebConfig:
-    def __init__(
-        self,
-        port: int,
-        secret_key: str,
-        access_token_expire_minutes: int,
-        refresh_token_expire_minutes: int,
-        access_token_cookie_name: str,
-        refresh_token_cookie_name: str,
-        enable_auth: bool,
-        super_admin_username: str,
-        super_admin_password: str,
-        guest_username: str,
-        guest_accessible_tasks: list[AnyTask | str] = [],
-        find_user_by_username: Callable[[str], User | None] | None = None,
-    ):
-        self.secret_key = secret_key
-        self.access_token_expire_minutes = access_token_expire_minutes
-        self.refresh_token_expire_minutes = refresh_token_expire_minutes
-        self.access_token_cookie_name = access_token_cookie_name
-        self.refresh_token_cookie_name = refresh_token_cookie_name
-        self.enable_auth = enable_auth
-        self.port = port
-        self._user_list = []
-        self.super_admin_username = super_admin_username
-        self.super_admin_password = super_admin_password
-        self.guest_username = guest_username
-        self.guest_accessible_tasks = guest_accessible_tasks
-        self._find_user_by_username = find_user_by_username
-
-    @property
-    def default_user(self) -> User:
-        if self.enable_auth:
-            return User(
-                username=self.guest_username,
-                password="",
-                is_guest=True,
-                accessible_tasks=self.guest_accessible_tasks,
-            )
-        return User(
-            username=self.guest_username,
-            password="",
-            is_guest=True,
-            is_super_admin=True,
-        )
-
-    @property
-    def super_admin(self) -> User:
-        return User(
-            username=self.super_admin_username,
-            password=self.super_admin_password,
-            is_super_admin=True,
-        )
-
-    @property
-    def user_list(self) -> list[User]:
-        if not self.enable_auth:
-            return [self.default_user]
-        return self._user_list + [self.super_admin, self.default_user]
-
-    def set_guest_accessible_tasks(self, tasks: list[AnyTask | str]):
-        self.guest_accessible_tasks = tasks
-
-    def set_find_user_by_username(
-        self, find_user_by_username: Callable[[str], User | None]
-    ):
-        self._find_user_by_username = find_user_by_username
-
-    def append_user(self, user: User):
-        duplicates = [
-            existing_user
-            for existing_user in self.user_list
-            if existing_user.username == user.username
-        ]
-        if len(duplicates) > 0:
-            raise ValueError(f"User already exists {user.username}")
-        self._user_list.append(user)
-
-    def find_user_by_username(self, username: str) -> User | None:
-        user = None
-        if self._find_user_by_username is not None:
-            user = self._find_user_by_username(username)
-        if user is None:
-            user = next((u for u in self.user_list if u.username == username), None)
-        return user

zrb/runner/web_config/config_factory.py

@@ -1,15 +0,0 @@
-from zrb.config import CFG
-from zrb.runner.web_config.config import WebConfig
-
-web_config = WebConfig(
-    port=CFG.WEB_HTTP_PORT,
-    secret_key=CFG.WEB_SECRET_KEY,
-    access_token_expire_minutes=CFG.WEB_AUTH_ACCESS_TOKEN_EXPIRE_MINUTES,
-    refresh_token_expire_minutes=CFG.WEB_AUTH_REFRESH_TOKEN_EXPIRE_MINUTES,
-    access_token_cookie_name=CFG.WEB_ACCESS_TOKEN_COOKIE_NAME,
-    refresh_token_cookie_name=CFG.WEB_REFRESH_TOKEN_COOKIE_NAME,
-    enable_auth=CFG.WEB_ENABLE_AUTH,
-    super_admin_username=CFG.WEB_SUPER_ADMIN_USERNAME,
-    super_admin_password=CFG.WEB_SUPER_ADMIN_PASSWORD,
-    guest_username=CFG.WEB_GUEST_USERNAME,
-)