zrb 1.7.4__tar.gz → 1.7.5__tar.gz

{zrb-1.7.4 → zrb-1.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.7.4
+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.4 → zrb-1.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.7.4"
+version = "1.7.5"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.5/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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-1.7.4 → zrb-1.7.5}/src/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.4/src/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-1.7.4/src/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,
-)