flock-core 0.4.0b35__py3-none-any.whl → 0.4.0b37__py3-none-any.whl

flock/themes/zenburn.toml

@@ -2,28 +2,28 @@
 panel_style = "on #3f3f3f"
 table_header_style = "bold #c2d87a on #21322f"
 table_title_style = "bold #dcdccc"
-table_border_style = "#94bff3"
-panel_border_style = "#94bff3"
+table_border_style = " #94bff3"
+panel_border_style = " #94bff3"
 column_output = "bold #dcdccc"
-column_value = "#dcdccc"
-bright_black = "#709080"
-bright_blue = "#94bff3"
-bright_cyan = "#93e0e3"
-bright_green = "#c3bf9f"
-bright_magenta = "#ec93d3"
-bright_red = "#dca3a3"
-bright_white = "#ffffff"
-bright_yellow = "#e0cf9f"
-normal_black = "#4d4d4d"
-normal_blue = "#506070"
-normal_cyan = "#8cd0d3"
-normal_green = "#60b48a"
-normal_magenta = "#dc8cc3"
-normal_red = "#705050"
-normal_white = "#dcdccc"
-normal_yellow = "#f0dfaf"
-cursor_cursor = "#73635a"
-cursor_text = "#000000"
+column_value = " #dcdccc"
+bright_black = " #709080"
+bright_blue = " #94bff3"
+bright_cyan = " #93e0e3"
+bright_green = " #c3bf9f"
+bright_magenta = " #ec93d3"
+bright_red = " #dca3a3"
+bright_white = " #ffffff"
+bright_yellow = " #e0cf9f"
+normal_black = " #4d4d4d"
+normal_blue = " #506070"
+normal_cyan = " #8cd0d3"
+normal_green = " #60b48a"
+normal_magenta = " #dc8cc3"
+normal_red = " #705050"
+normal_white = " #dcdccc"
+normal_yellow = " #f0dfaf"
+cursor_cursor = " #73635a"
+cursor_text = " #000000"
 table_show_lines = false
 table_box = "HEAVY"
 panel_padding = [ 1, 2,]
@@ -45,33 +45,33 @@ table_caption_justify = "center"
 table_highlight = false
 
 [colors.bright]
-black = "#709080"
-blue = "#94bff3"
-cyan = "#93e0e3"
-green = "#c3bf9f"
-magenta = "#ec93d3"
-red = "#dca3a3"
-white = "#ffffff"
-yellow = "#e0cf9f"
+black = " #709080"
+blue = " #94bff3"
+cyan = " #93e0e3"
+green = " #c3bf9f"
+magenta = " #ec93d3"
+red = " #dca3a3"
+white = " #ffffff"
+yellow = " #e0cf9f"
 
 [colors.cursor]
-cursor = "#73635a"
-text = "#000000"
+cursor = " #73635a"
+text = " #000000"
 
 [colors.normal]
-black = "#4d4d4d"
-blue = "#506070"
-cyan = "#8cd0d3"
-green = "#60b48a"
-magenta = "#dc8cc3"
-red = "#705050"
-white = "#dcdccc"
-yellow = "#f0dfaf"
+black = " #4d4d4d"
+blue = " #506070"
+cyan = " #8cd0d3"
+green = " #60b48a"
+magenta = " #dc8cc3"
+red = " #705050"
+white = " #dcdccc"
+yellow = " #f0dfaf"
 
 [colors.primary]
-background = "#3f3f3f"
-foreground = "#dcdccc"
+background = " #3f3f3f"
+foreground = " #dcdccc"
 
 [colors.selection]
-background = "#21322f"
-text = "#c2d87a"
+background = " #21322f"
+text = " #c2d87a"

flock/webapp/app/config.py

@@ -1,9 +1,87 @@
 import os
+import random  # Added for random theme selection
 from pathlib import Path
 
+from flock.core import Flock  # Add type hint
+from flock.core.logging.formatters.themes import OutputTheme
+
 FLOCK_FILES_DIR = Path(os.getenv("FLOCK_FILES_DIR", "./.flock_ui_projects"))
 FLOCK_FILES_DIR.mkdir(parents=True, exist_ok=True)
 
+# --- Theme Configuration ---
+# Calculate themes directory relative to this config file's location, assuming structure:
+# src/flock/webapp/app/config.py
+# src/flock/themes/
+CONFIG_FILE_PATH = Path(__file__).resolve() # src/flock/webapp/app/config.py
+FLOCK_WEBAPP_DIR = CONFIG_FILE_PATH.parent.parent # src/flock/webapp/
+FLOCK_BASE_DIR = FLOCK_WEBAPP_DIR.parent # src/flock/
+THEMES_DIR = FLOCK_BASE_DIR / "themes"
+
 # Global state for MVP - NOT SUITABLE FOR PRODUCTION/MULTI-USER
-CURRENT_FLOCK_INSTANCE = None
-CURRENT_FLOCK_FILENAME = None
+CURRENT_FLOCK_INSTANCE: Flock | None = None
+CURRENT_FLOCK_FILENAME: str | None = None
+
+DEFAULT_THEME_NAME = OutputTheme.ayu.value # Default if random fails or invalid theme specified
+
+def list_available_themes() -> list[str]:
+    """Scans the THEMES_DIR for .toml files and returns their names (without .toml)."""
+    if not THEMES_DIR.exists() or not THEMES_DIR.is_dir():
+        return []
+    return sorted([p.stem for p in THEMES_DIR.glob("*.toml") if p.is_file()])
+
+# Initialize CURRENT_THEME_NAME
+_initial_theme_from_env = os.environ.get("FLOCK_WEB_THEME")
+_resolved_initial_theme = DEFAULT_THEME_NAME
+
+if _initial_theme_from_env:
+    if _initial_theme_from_env.lower() == "random":
+        available_themes = list_available_themes()
+        if available_themes:
+            _resolved_initial_theme = random.choice(available_themes)
+            print(f"Config: Initial theme from FLOCK_WEB_THEME='random' resolved to: {_resolved_initial_theme}")
+        else:
+            print(f"Warning: FLOCK_WEB_THEME='random' specified, but no themes found in {THEMES_DIR}. Using default: {DEFAULT_THEME_NAME}")
+            _resolved_initial_theme = DEFAULT_THEME_NAME
+    elif _initial_theme_from_env in [t.value for t in OutputTheme] or _initial_theme_from_env in list_available_themes():
+        _resolved_initial_theme = _initial_theme_from_env
+        print(f"Config: Initial theme set from FLOCK_WEB_THEME env var: {_resolved_initial_theme}")
+    else:
+        print(f"Warning: Invalid theme name '{_initial_theme_from_env}' in FLOCK_WEB_THEME. Using default: {DEFAULT_THEME_NAME}")
+        _resolved_initial_theme = DEFAULT_THEME_NAME
+
+CURRENT_THEME_NAME: str = _resolved_initial_theme
+
+def set_current_theme_name(theme_name: str | None):
+    """Sets the globally accessible current theme name.
+    If 'random' is passed, a random theme is chosen.
+    """
+    global CURRENT_THEME_NAME
+    resolved_theme = DEFAULT_THEME_NAME # Default to start
+
+    if theme_name:
+        if theme_name.lower() == "random":
+            available = list_available_themes()
+            if available:
+                resolved_theme = random.choice(available)
+                print(f"Config: Theme 'random' resolved to: {resolved_theme}")
+            else:
+                print(f"Warning: Theme 'random' specified, but no themes found in {THEMES_DIR}. Using default: {DEFAULT_THEME_NAME}")
+                # resolved_theme remains DEFAULT_THEME_NAME
+        elif theme_name in [t.value for t in OutputTheme] or theme_name in list_available_themes():
+            resolved_theme = theme_name
+        else:
+            print(f"Warning: Invalid theme name provided ('{theme_name}'). Using default: {DEFAULT_THEME_NAME}")
+            # resolved_theme remains DEFAULT_THEME_NAME
+    else: # theme_name is None
+        # resolved_theme remains DEFAULT_THEME_NAME (set at the beginning of function)
+        pass
+
+    CURRENT_THEME_NAME = resolved_theme
+    # Ensure the theme name is set in the environment if we want other processes to see it,
+    # though this might be better handled by the calling process (e.g. CLI)
+    # os.environ["FLOCK_WEB_THEME"] = CURRENT_THEME_NAME
+    print(f"Config: Current theme explicitly set to: {CURRENT_THEME_NAME}")
+
+def get_current_theme_name() -> str:
+    """Gets the globally accessible current theme name."""
+    return CURRENT_THEME_NAME