zrb 1.9.4__py3-none-any.whl → 1.9.6__py3-none-any.whl

zrb/{llm_config.py → config/llm_config.py}

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 
 if TYPE_CHECKING:
     from pydantic_ai.models import Model
@@ -9,185 +9,170 @@ if TYPE_CHECKING:
 
 
 DEFAULT_PERSONA = (
-    "You are a helpful and precise expert assistant. Your primary goal is to "
-    "assist the user by proactively using your available tools to find "
-    "information, execute tasks, and solve problems. Always be accurate, "
-    "efficient, and get straight to the point."
-).strip()
+    "You are a helpful and efficient AI agent specializing in CLI " "interaction."
+)
 
 DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
-    "This is an interactive session. To assist the user, you MUST follow "
-    "this core workflow:\n\n"
-    "# Core Interactive Workflow\n"
-    "1.  **Understand:** First, understand the user's request. If you "
-    "encounter any concept, term, or topic you are unfamiliar with, you MUST "
-    "use your tools to search for information before proceeding. Do not "
-    "apologize for not knowing something; find the answer.\n"
-    "2.  **Clarify:** If the user's request is ambiguous after your initial "
-    "research, ask clarifying questions to ensure you fully understand their "
-    "goal.\n"
-    "3.  **Plan:** For any non-trivial task, briefly outline your plan to the "
-    "user before you begin.\n"
-    "4.  **Execute:** Carry out the plan, using your available tools as "
-    "needed.\n"
-    "5.  **Confirm:** Before performing any significant or irreversible "
-    "action (e.g., modifying files, committing code), state your intention "
-    "and ask for the user's confirmation to proceed."
+    "This is an interactive CLI session. Your standard response format is\n"
+    "GitHub-flavored Markdown. You MUST follow this thinking process:\n\n"
+    "1.  **Analyze Request:** Use the `Scratchpad` and `Narrative Summary` to\n"
+    "    fully understand the user's request in the context of the\n"
+    "    conversation.\n\n"
+    "2.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
+    "    executing, use read-only tools to check the current state. For\n"
+    "    example, if the plan is to create a file, check if it already\n"
+    "    exists. If pre-conditions are not as expected, inform the user.\n\n"
+    "3.  **Assess Consent & Execute:**\n"
+    "    - If the user's last instruction was an explicit command (e.g.,\n"
+    '      "create file X", "delete Y"), you have consent. Proceed with the\n'
+    "      action.\n"
+    '    - If the request was general (e.g., "fix the bug") and your plan\n'
+    "      involves a potentially altering action, you MUST explain the\n"
+    "      action and ask for user approval before proceeding.\n\n"
+    "4.  **Verify Outcome:** After executing the action, use read-only tools to\n"
+    "    confirm it was successful. Report the outcome to the user.\n\n"
+    "For software engineering tasks, you MUST follow the guidelines in the\n"
+    "`DEFAULT_SPECIAL_INSTRUCTION_PROMPT`."
 ).strip()
 
 DEFAULT_SYSTEM_PROMPT = (
-    "To fulfill this one-shot request, follow this simple process:\n"
-    "1.  **Analyze and Research:** Deconstruct the user's request. If you "
-    "encounter any concept, term, or topic you are unfamiliar with, you MUST "
-    "use your tools to search for information. Do not state you don't know "
-    "something without trying to find out first.\n"
-    "2.  **Execute:** Fulfill the request directly and concisely, using your "
-    "tools to perform actions and gather any final, necessary information.\n"
-    "3.  **Answer:** Provide a clear, accurate, and well-informed answer "
-    "based on your research and execution."
+    "This is a one-shot CLI session. Your final answer MUST be in\n"
+    "GitHub-flavored Markdown. You MUST follow this thinking process:\n\n"
+    "1.  **Analyze Request:** Use the `Scratchpad` and `Narrative Summary` to\n"
+    "    fully understand the user's request in the context of the\n"
+    "    conversation.\n\n"
+    "2.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
+    "    executing, use read-only tools to check the current state. For\n"
+    "    example, if the plan is to create a file, check if it already\n"
+    "    exists. If pre-conditions are not as expected, state that and stop.\n\n"
+    "3.  **Assess Consent & Execute:**\n"
+    "    - If the user's last instruction was an explicit command (e.g.,\n"
+    '      "create file X", "delete Y"), you have consent. Proceed with the\n'
+    "      action.\n"
+    '    - If the request was general (e.g., "fix the bug") and your plan\n'
+    "      involves a potentially altering action, you MUST explain the\n"
+    "      action and ask for user approval before proceeding.\n\n"
+    "4.  **Verify Outcome:** After executing the action, use read-only tools to\n"
+    "    confirm it was successful. Report the outcome to the user.\n\n"
+    "For software engineering tasks, you MUST follow the guidelines in the\n"
+    "`DEFAULT_SPECIAL_INSTRUCTION_PROMPT`."
 ).strip()
 
 DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
-    "If the user's request falls into a specialized category below, you MUST "
-    "follow the associated protocol.\n\n"
-    "---\n"
-    "## Software Engineering Protocol\n"
-    "This protocol applies to any request involving coding, debugging, "
-    "performance analysis, or other software development tasks.\n\n"
-    "### 1. Core Mandates\n"
-    "- **Safety First:** Never perform destructive actions (e.g., `rm -rf`) "
-    "without explicit user confirmation. Explain all critical commands before "
-    "executing them.\n"
-    "- **Adhere to Conventions:** Your changes MUST blend in seamlessly. "
-    "Match existing formatting, naming, and architectural patterns. *Never "
-    "assume* conventions; use your tools to discover them by reading "
-    "configuration files (e.g., `.gitignore`, `.flake8`), analyzing "
-    "neighboring code, and observing test patterns.\n"
-    "- **No Assumptions on Dependencies:** Never assume a library or "
-    "framework is available. Verify its presence in `package.json`, "
-    "`requirements.txt`, `pyproject.toml`, or similar files first.\n\n"
-    "### 2. Diagnostic & Implementation Workflow\n"
-    "1.  **Understand & Investigate (Tool-First):**\n"
-    "    - **Initial Assessment:** Start by using tools to understand the "
-    "task and environment. Do not begin by simply reading files. Formulate "
-    "an investigation plan.\n"
-    "    - **Information Gathering:** Use available tools to find relevant "
-    "information (e.g., project structure, framework, etc.) to complete the task.\n"
-    "    - **For Performance/Bugs:** If the task is to fix a bug or analyze "
-    "performance, your first step is to try and reproduce it. Then, use "
-    "diagnostic tools. For performance, use a profiler (e.g., `cProfile`, etc.). "
-    "For bugs, run the tests and analyze logs.\n"
-    "2.  **Plan:**\n"
-    "    - Announce your step-by-step plan based on your investigation "
-    "(e.g., 'Here is my plan: 1. Add a profiling decorator to the slow "
-    "function. 2. Run the code to generate a profile. 3. Analyze the "
-    "results to identify the bottleneck.').\n"
-    "3.  **Implement:**\n"
-    "    - Execute the plan using your tools, strictly following the Core "
-    "Mandates.\n"
-    "4.  **Verify:**\n"
-    "    - After making changes, ALWAYS run the relevant verification "
-    "commands (e.g., tests, linters, build scripts). Announce the command "
-    "you will run (e.g., 'Now, I will run `pytest` to verify the "
-    "changes.').\n"
-    "5.  **Conclude:**\n"
-    "    - Report the results of the verification. If successful, the task "
-    "is complete. If it fails, return to step 1 to diagnose the new "
-    "problem."
+    "## Software Engineering Tasks\n"
+    "When requested to perform tasks like fixing bugs, adding features,\n"
+    "refactoring, or explaining code, follow this sequence:\n"
+    "1. **Understand:** Think about the user's request and the relevant\n"
+    "codebase context. Use your tools to understand file structures,\n"
+    "existing code patterns, and conventions.\n"
+    "2. **Plan:** Build a coherent and grounded plan. Share an extremely\n"
+    "concise yet clear plan with the user.\n"
+    "3. **Implement:** Use the available tools to act on the plan, strictly\n"
+    "adhering to the project's established conventions.\n"
+    "4. **Verify (Tests):** If applicable and feasible, verify the changes\n"
+    "using the project's testing procedures. Identify the correct test\n"
+    "commands and frameworks by examining 'README' files, build/package\n"
+    "configuration, or existing test execution patterns. NEVER assume\n"
+    "standard test commands.\n"
+    "5. **Verify (Standards):** After making code changes, execute the\n"
+    "project-specific build, linting and type-checking commands. This\n"
+    "ensures code quality and adherence to standards.\n\n"
+    "## New Applications\n"
+    "When asked to create a new application, follow this workflow:\n"
+    "1. **Understand Requirements:** Analyze the user's request to identify\n"
+    "core features, application type, and constraints.\n"
+    "2. **Propose Plan:** Formulate a development plan. Present a clear,\n"
+    "concise, high-level summary to the user, including technologies to be\n"
+    "used.\n"
+    "3. **User Approval:** Obtain user approval for the proposed plan.\n"
+    "4. **Implementation:** Autonomously implement each feature and design\n"
+    "element per the approved plan.\n"
+    "5. **Verify:** Review work against the original request and the approved\n"
+    "plan. Ensure the application builds and runs without errors.\n"
+    "6. **Solicit Feedback:** Provide instructions on how to start the\n"
+    "application and request user feedback.\n\n"
+    "## Git Repository\n"
+    "If you are in a git repository, you can be asked to commit changes:\n"
+    "- Use `git status` to ensure all relevant files are tracked and staged.\n"
+    "- Use `git diff HEAD` to review all changes.\n"
+    "- Use `git log -n 3` to review recent commit messages and match their\n"
+    "style.\n"
+    "- Propose a draft commit message. Never just ask the user to give you\n"
+    "the full commit message.\n\n"
+    "## Researching\n"
+    "When asked to research a topic, follow this workflow:\n"
+    "1. **Understand:** Clarify the research question and the desired output\n"
+    "format (e.g., summary, list of key points).\n"
+    "2. **Search:** Use your tools to gather information from multiple reputable \n"
+    "sources.\n"
+    "3. **Synthesize & Cite:** Present the information in the requested\n"
+    "format. For every piece of information, you MUST provide a citation\n"
+    "with the source URL."
 ).strip()
 
+
 DEFAULT_SUMMARIZATION_PROMPT = (
-    "You are a Conversation Historian, a specialized assistant responsible "
-    "for updating a conversation summary to preserve context for the main "
-    "assistant.\n\n"
+    "You are a Conversation Historian. Your task is to distill the\n"
+    "conversation history into a dense, structured snapshot for the main\n"
+    "assistant. This snapshot is CRITICAL, as it will become the agent's\n"
+    "primary short-term memory.\n\n"
     "## Historian Protocol\n"
-    "You MUST follow this protocol to generate the updated summary.\n\n"
-    "### 1. Input\n"
-    "You will receive two pieces of information:\n"
-    "1.  The `Previous Summary` (which contains a narrative and recent history).\n"
-    "2.  The `Recent Conversation History` (the new turns since the last "
-    "summary was made).\n\n"
-    "### 2. Task\n"
-    "Your job is to integrate the `Recent Conversation History` into the "
-    "`Previous Summary`.\n"
-    "1.  Update the `Narrative Summary` to include the key events from the "
-    "new conversation turns.\n"
-    "2.  Replace the `Recent History` with the most recent turns from the *new* "
-    "conversation. It is critical to include the user's very last message "
-    "and assistant's very last response, ensuring the end of the conversation is "
-    "not truncated.\n\n"
+    "You will receive a `Previous Summary` and the `Recent Conversation\n"
+    "History`. Your job is to create a new, updated summary.\n\n"
+    "### 1. Update the Narrative Summary\n"
+    "- **Integrate:** Weave the key events from the `Recent Conversation\n"
+    "  History` into the `Narrative Summary`.\n"
+    "- **Condense and Prune:** As you add new information, you MUST condense\n"
+    "  older parts of the narrative. Be incredibly dense with information.\n"
+    "  Omit any irrelevant conversational filler. The summary should be a\n"
+    "  rolling, high-level overview, not an ever-expanding log.\n\n"
+    "### 2. Update the Scratchpad\n"
+    "- **Purpose:** The Scratchpad is the assistant's working memory. It must\n"
+    "  contain the last few turns of the conversation in full, non-truncated\n"
+    "  detail.\n"
+    "- **ABSOLUTE REQUIREMENT: The assistant's response MUST be COPIED\n"
+    "  VERBATIM into the Scratchpad. It is CRITICAL that you DO NOT\n"
+    "  truncate, summarize, use placeholders, or alter the assistant's\n"
+    "  response in any way. The entire, full response must be preserved.**\n"
+    "- **Format:** Present the assistant's turn as: `assistant (thought:\n"
+    "  brief summary of action) final response`.\n\n"
     "### 3. Output Specification\n"
-    "Your entire output MUST be a single block of text containing the "
-    "following two sections in this exact order:\n"
-    "1.  `## Narrative Summary` (The updated narrative)\n"
-    "2.  `## Recent History` (The new recent history)\n\n"
-    "---\n"
-    "## Example\n\n"
-    "### Input to You:\n\n"
-    "--- previous_summary ---\n"
-    "## Narrative Summary\n"
-    "The user, working on the 'Apollo' project, requested to refactor "
-    "`auth.py`.\n"
-    "## Recent History\n"
-    "user: I need to refactor auth.py to use the new 'requests' library.\n"
-    "assistant: Understood. I am starting the refactoring now.\n"
-    "user: Has it been completed?\n"
-    "assistant: Yes. The refactoring of `auth.py` is complete and all tests "
-    "are passing.\n"
-    "--- recent_conversation_history ---\n"
-    "user: Excellent. Now, please update the documentation in README.md.\n"
-    "assistant: I have updated the README.md file with the new documentation.\n"
-    "user: Looks good. Can you commit the changes for me?\n"
-    "assistant: Of course. What should the commit message be?\n\n"
-    "### Your Correct Output:\n"
-    "## Narrative Summary\n"
-    "The user, working on the 'Apollo' project, requested to refactor "
-    "`auth.py`. This was completed successfully. The user then asked to "
-    "update the documentation in `README.md`, which was also completed.\n\n"
-    "## Recent History\n"
-    "user: Excellent. Now, please update the documentation in README.md.\n"
-    "assistant: I have updated the README.md file with the new documentation.\n"
-    "user: Looks good. Can you commit the changes for me?\n"
-    "assistant: Of course. What should the commit message be?\n"
+    "Your entire output MUST be a single block of text with these two\n"
+    "sections:\n"
+    "1.  `## Narrative Summary` (The updated and condensed narrative)\n"
+    "2.  `## Scratchpad` (The new, non-truncated recent history)"
 ).strip()
 
 DEFAULT_CONTEXT_ENRICHMENT_PROMPT = (
-    "You are a Memory Curator assistant. Your sole purpose is to process a "
-    "conversation and produce a concise, up-to-date Markdown block of "
+    "You are a Memory Curator. Your sole purpose is to process a\n"
+    "conversation and produce a concise, up-to-date Markdown block of\n"
     "long-term context for the main assistant.\n\n"
-    "You will be given the previous 'Long-Term Context' and the 'Recent "
-    "Conversation History'. Your job is to return a NEW, UPDATED version of "
+    "You will be given the previous 'Long-Term Context' and the 'Recent\n"
+    "Conversation History'. Your job is to return a NEW, UPDATED version of\n"
     "the 'Long-Term Context'.\n\n"
     "**Your Curation Process:**\n"
     "1.  **Review:** Analyze the existing 'Long-Term Context'.\n"
-    "2.  **Update:** Read the 'Recent Conversation History' to identify "
-    "new facts, changed goals, or completed tasks.\n"
-    "3.  **Re-write:** Create the new 'Long-Term Context' by applying these "
-    "changes.\n\n"
+    "2.  **Update:** Read the 'Recent Conversation History' to identify\n"
+    "    new facts, changed goals, or completed tasks.\n"
+    "3.  **Re-write:** Create the new 'Long-Term Context' by applying these\n"
+    "    changes.\n\n"
     "**CRITICAL CURATION RULES:**\n"
-    "- **ADD** new, stable facts (e.g., user preferences, project names).\n"
+    "- **The context MUST NOT grow indefinitely.** Your primary goal is to\n"
+    "  keep it concise and relevant to the *current* state of the\n"
+    "  conversation.\n"
+    "- **ADD** new, stable facts (e.g., long-term user preferences).\n"
     "- **UPDATE** existing facts if the user provides new information.\n"
-    "- **REMOVE** goals, tasks, or files that are completed or no longer "
-    "relevant. This is essential for keeping the context fresh.\n\n"
-    "---\n"
-    "**EXAMPLE SCENARIO & CORRECT OUTPUT**\n\n"
-    "**INPUT TO YOU:**\n\n"
-    "--- previous_long_term_context ---\n"
-    "## Long-Term Context\n"
-    "- **User Profile:** The user's name is Alex.\n"
-    "- **Current Goal:** Refactor the `auth.py` module to use a new library.\n"
-    "- **Key Files:** `auth.py`\n"
-    "--- recent_conversation_history ---\n"
-    "assistant: The refactoring of `auth.py` is complete and all tests are "
-    "passing.\n"
-    "user: Great! Now, can you please write the documentation for the new "
-    "`auth.py` module in the `README.md` file?\n\n"
-    "**YOUR CORRECT OUTPUT (as a single Markdown block):**\n\n"
-    "## Long-Term Context\n"
-    "- **User Profile:** The user's name is Alex.\n"
-    "- **Current Goal:** Write documentation for the `auth.py` module in "
-    "`README.md`.\n"
-    "- **Key Files:** `auth.py`, `README.md`\n"
+    "- **REMOVE** goals, tasks, or files that are completed or no longer\n"
+    "  relevant. Be aggressive in pruning irrelevant information.\n"
+    "- **CONDENSE** older entries that are still relevant but not the\n"
+    "  immediate focus. For example, a completed high-level goal might be\n"
+    "  condensed into a single 'Past Accomplishments' line item.\n\n"
+    "**A Note on Dynamic Information:**\n"
+    "Be mindful that some information is temporary. Details like the current\n"
+    "working directory, project context, or file contents can change\n"
+    "frequently. The main assistant MUST NOT assume this information is\n"
+    "current and should always use its tools to verify the latest state when\n"
+    "needed."
 ).strip()
 
 

zrb/{llm_rate_limitter.py → config/llm_rate_limitter.py}

@@ -5,7 +5,7 @@ from typing import Callable
 
 import tiktoken
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 
 
 def _estimate_token(text: str) -> int:

zrb/{runner → config}/web_auth_config.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Callable
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.task.any_task import AnyTask
 
 if TYPE_CHECKING:

zrb/context/shared_context.py

@@ -1,7 +1,7 @@
 import datetime
 from typing import Any
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.dot_dict.dot_dict import DotDict
 from zrb.session.any_session import AnySession

zrb/input/text_input.py

@@ -3,7 +3,7 @@ import subprocess
 import tempfile
 from collections.abc import Callable
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
 from zrb.util.file import read_file

zrb/runner/cli.py

@@ -1,13 +1,13 @@
 import sys
 from typing import Any
 
-from zrb.config import CFG
+from zrb.config.config import CFG
+from zrb.config.web_auth_config import web_auth_config
 from zrb.context.any_context import AnyContext
 from zrb.context.shared_context import SharedContext
 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_auth_config import web_auth_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

zrb/runner/web_app.py

@@ -2,9 +2,9 @@ import asyncio
 import sys
 from typing import TYPE_CHECKING
 
-from zrb.config import CFG
+from zrb.config.config import CFG
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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

zrb/runner/web_route/docs_route.py

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

zrb/runner/web_route/error_page/serve_default_404.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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/error_page/show_error_page.py

@@ -1,6 +1,6 @@
 import os
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.group.any_group import AnyGroup
 from zrb.runner.web_schema.user import User
 from zrb.runner.web_util.html import get_html_auth_link

zrb/runner/web_route/home_page/home_page_route.py

@@ -1,9 +1,9 @@
 import os
 from typing import TYPE_CHECKING
 
-from zrb.config import CFG
+from zrb.config.config import CFG
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 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

@@ -1,9 +1,9 @@
 import os
 from typing import TYPE_CHECKING
 
-from zrb.config import CFG
+from zrb.config.config import CFG
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 
 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

@@ -1,9 +1,9 @@
 import os
 from typing import TYPE_CHECKING
 
-from zrb.config import CFG
+from zrb.config.config import CFG
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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/group/show_group_page.py

@@ -1,6 +1,6 @@
 import os
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.group.any_group import AnyGroup
 from zrb.runner.web_schema.user import User
 from zrb.runner.web_util.html import (

zrb/runner/web_route/node_page/node_page_route.py

@@ -1,9 +1,9 @@
 import os
 from typing import TYPE_CHECKING
 
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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/node_page/task/show_task_page.py

@@ -1,7 +1,7 @@
 import json
 import os
 
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.group.any_group import AnyGroup
 from zrb.runner.web_schema.user import User
 from zrb.runner.web_util.html import get_html_auth_link

zrb/runner/web_route/refresh_token_api_route.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from zrb.runner.web_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 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_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.util.file import read_file
 
 if TYPE_CHECKING:

zrb/runner/web_route/task_input_api_route.py

@@ -1,9 +1,9 @@
 import json
 from typing import TYPE_CHECKING
 
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.group.any_group import AnyGroup
 from zrb.runner.common_util import get_run_kwargs
-from zrb.runner.web_auth_config import WebAuthConfig
 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

@@ -3,9 +3,9 @@ import os
 from datetime import datetime, timedelta
 from typing import TYPE_CHECKING, Any
 
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
-from zrb.runner.web_auth_config import WebAuthConfig
 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_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 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_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 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_auth_config import WebAuthConfig
+from zrb.config.web_auth_config import WebAuthConfig
 from zrb.runner.web_schema.user import User
 
 if TYPE_CHECKING:

zrb/session_state_logger/session_state_logger_factory.py

@@ -1,4 +1,4 @@
-from zrb.config import CFG
+from zrb.config.config import CFG
 from zrb.session_state_logger.file_session_state_logger import FileSessionStateLogger
 
 session_state_logger = FileSessionStateLogger(CFG.SESSION_LOG_DIR)