flock-core 0.4.0b35__tar.gz → 0.4.0b36__tar.gz

{flock_core-0.4.0b35 → flock_core-0.4.0b36}/.vscode/settings.json

@@ -6,7 +6,7 @@
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.testing.autoTestDiscoverOnSaveEnabled": true,
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "editor.codeActionsOnSave": {
         "source.organizeImports.ruff": "always",
         "source.fixAll.ruff": "always"
@@ -19,7 +19,7 @@
     "editor.fontSize": 15.5,
     "editor.fontLigatures": true,
     "editor.lineHeight": 1.5,
-    "editor.minimap.enabled": true,
+    "editor.minimap.enabled": false,
     "editor.tabSize": 2,
     "editor.semanticTokenColorCustomizations": {
         "enabled": true

{flock_core-0.4.0b35 → flock_core-0.4.0b36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b35
+Version: 0.4.0b36
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE

{flock_core-0.4.0b35 → flock_core-0.4.0b36}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flock-core"
-version = "0.4.0b-35"
+version = "0.4.0b-36"
 description = "Declarative LLM Orchestration at Scale"
 readme = "README.md"
 authors = [

{flock_core-0.4.0b35 → flock_core-0.4.0b36}/src/flock/__init__.py

@@ -1,6 +1,7 @@
 """Flock package initialization."""
 
 import argparse
+import os
 import sys
 
 
@@ -15,13 +16,43 @@ def main():
         action="store_true",
         help="Start the web interface instead of the CLI",
     )
+    parser.add_argument(
+        "--theme",
+        type=str,
+        default=None,
+        help="Specify the theme name for the web interface (if --web is used).",
+    )
     args = parser.parse_args()
 
     # If --web flag is provided, start the web server
     if args.web:
-        from flock.webapp.run import main as run_webapp
-
-        run_webapp()
+        try:
+            # Set environment variable for theme if provided
+            if args.theme:
+                print(
+                    f"Setting FLOCK_WEB_THEME environment variable to: {args.theme}"
+                )
+                os.environ["FLOCK_WEB_THEME"] = args.theme
+            else:
+                # Ensure it's not set if no theme arg is passed
+                if "FLOCK_WEB_THEME" in os.environ:
+                    del os.environ["FLOCK_WEB_THEME"]
+
+            # Import and run the standalone webapp main function
+            # It will now read the theme from the environment variable
+            from flock.webapp.run import main as run_webapp_main
+
+            run_webapp_main()
+
+        except ImportError:
+            print(
+                "Error: Could not import webapp components. Ensure web dependencies are installed.",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        except Exception as e:
+            print(f"Error starting webapp: {e}", file=sys.stderr)
+            sys.exit(1)
         return
 
     # Otherwise, run the CLI interface
@@ -53,8 +84,6 @@ def main():
     console = Console()
 
     # Show a welcome message on first run with the new tool serialization format
-    import os
-
     cfg_file = os.path.expanduser(f"~/.flock/{CLI_CFG_FILE}")
     if not os.path.exists(cfg_file):
         # Create the directory if it doesn't exist
@@ -137,12 +166,6 @@ def main():
             manage_registry()
         elif result == CLI_SETTINGS:
             settings_editor()
-        elif result == CLI_START_WEB_SERVER:
-            # Start the web server
-            from flock.webapp.run import main as run_webapp
-
-            run_webapp()
-            break
         elif result == CLI_NOTES:
             load_release_notes()
         elif result == CLI_EXIT:

{flock_core-0.4.0b35 → flock_core-0.4.0b36}/src/flock/cli/loaded_flock_cli.py

@@ -12,8 +12,8 @@ from flock.cli.constants import (
     CLI_REGISTRY_MANAGEMENT,
     CLI_SETTINGS,
 )
-from flock.core.api import runner
 from flock.core.flock import Flock
+from flock.core.logging.logging import get_logger
 from flock.core.util.cli_helper import init_console
 
 # Import future modules we'll create
@@ -48,6 +48,7 @@ except ImportError:
 
 # Create console instance
 console = Console()
+logger = get_logger("cli.loaded_flock")
 
 
 def start_loaded_flock_cli(
@@ -188,17 +189,11 @@ def start_loaded_flock_cli(
 
 
 def _start_web_server(flock: Flock, create_ui: bool = False) -> None:
-    """Start a web server with the loaded Flock instance.
-
-    Args:
-        flock: The loaded Flock instance
-        create_ui: Whether to create a UI for the web server
-    """
+    """Start a web server with the loaded Flock instance."""
     host = "127.0.0.1"
     port = 8344
-    server_name = "Flock API"
+    # server_name = flock.name + " API" # Use flock name by default for server_name
 
-    # Get configuration from user
     console.print("\n[bold]Web Server Configuration[/]")
 
     host_input = questionary.text(
@@ -214,21 +209,46 @@ def _start_web_server(flock: Flock, create_ui: bool = False) -> None:
         port = int(port_input)
 
     server_name_input = questionary.text(
-        "Server name (default: FlockName API):", default=flock.name + " API"
+        "Server name (default: FlockName API):", default=f"{flock.name or 'Flock'} API"
     ).ask()
-    if server_name_input:
-        server_name = server_name_input
+    # if server_name_input: # server_name will be set by flock.start_api if not passed, or use its default
+    # server_name = server_name_input
+
+    ui_theme_to_pass = None
+    if create_ui:
+        try:
+            from flock.webapp.app.config import (
+                DEFAULT_THEME_NAME,
+                list_available_themes,
+            )
+            available_themes = list_available_themes()
+            theme_choices = ["default (current environment setting)", "random"] + sorted(available_themes)
+
+            selected_theme_choice = questionary.select(
+                "Select UI theme:",
+                choices=theme_choices,
+                default="default (current environment setting)"
+            ).ask()
+
+            if selected_theme_choice == "random":
+                ui_theme_to_pass = "random"
+            elif selected_theme_choice and selected_theme_choice != "default (current environment setting)":
+                ui_theme_to_pass = selected_theme_choice
+            # If "default" or None, ui_theme_to_pass remains None, Flock.start_api will use its logic
+
+        except ImportError:
+            logger.warning("Could not import webapp theme configuration for CLI selection. Theme will use default.")
+            ui_theme_to_pass = None # Fallback if webapp components not there
 
-    # Start the web server
     console.print(
-        f"\nStarting web server on {host}:{port} {'with UI' if create_ui else 'without UI'}..."
+        f"\nStarting web server on {host}:{port} {'with UI' if create_ui else 'without UI'}{' (Theme: ' + (ui_theme_to_pass if ui_theme_to_pass else 'default') + ')' if create_ui else ''}..."
     )
 
-    # Use the Flock's start_api method
-    runner.start_flock_api(
-        flock=flock,
+    # Call the Flock instance's own start_api method directly
+    flock.start_api(
         host=host,
         port=port,
-        server_name=server_name,
+        server_name=server_name_input, # Pass the chosen server name
         create_ui=create_ui,
+        ui_theme=ui_theme_to_pass,
     )

{flock_core-0.4.0b35 → flock_core-0.4.0b36}/src/flock/core/flock.py

@@ -684,12 +684,57 @@ class Flock(BaseModel, Serializable):
         port: int = 8344,
         server_name: str = "Flock API",
         create_ui: bool = False,
+        ui_theme: str | None = None,
     ) -> None:
-        """Starts a REST API server for this Flock instance."""
+        """Starts a REST API server for this Flock instance.
+        If create_ui is True, integrates the web UI, potentially with a specific theme.
+        """
         # Import runner locally
-        from flock.core.api.runner import start_flock_api
+        # We need to decide if start_api now *always* tries to use the integrated approach
+        # or if it still calls the API-only runner when create_ui=False.
+        # Let's assume it uses the integrated approach starter if create_ui=True
+        # and the API-only starter (FlockAPI) if create_ui=False.
 
-        start_flock_api(self, host, port, server_name, create_ui)
+        if create_ui:
+            # Use the integrated server approach
+            try:
+                # We need a function similar to start_flock_api but for the integrated app
+                # Let's assume it exists in webapp.run for now, called start_integrated_server
+                from flock.webapp.run import start_integrated_server
+
+                start_integrated_server(
+                    flock_instance=self,
+                    host=host,
+                    port=port,
+                    server_name=server_name,
+                    theme_name=ui_theme,
+                )
+            except ImportError:
+                # Log error - cannot start integrated UI
+                from flock.core.logging.logging import get_logger
+
+                logger = get_logger("flock.core")
+                logger.error(
+                    "Cannot start integrated UI: Required components (e.g., flock.webapp.run.start_integrated_server) not found."
+                )
+            except Exception as e:
+                from flock.core.logging.logging import get_logger
+
+                logger = get_logger("flock.core")
+                logger.error(
+                    f"Failed to start integrated UI server: {e}", exc_info=True
+                )
+        else:
+            # Use the API-only server approach
+            from flock.core.api.runner import start_flock_api
+
+            start_flock_api(
+                flock=self,
+                host=host,
+                port=port,
+                server_name=server_name,
+                create_ui=False,  # Explicitly false for API only runner
+            )
 
     # --- CLI Starter ---
     def start_cli(

flock_core-0.4.0b36/src/flock/themes/alabaster.toml

@@ -0,0 +1,77 @@
+[rich]
+panel_style = "on #f7f7f7"
+table_header_style = "bold #000000 on #bfdbfe"
+table_title_style = "bold #000000"
+table_border_style = " #007acc"
+panel_border_style = " #007acc"
+column_output = "bold #000000"
+column_value = " #000000"
+bright_black = " #777777"
+bright_blue = " #007acc"
+bright_cyan = " #00aacb"
+bright_green = " #60cb00"
+bright_magenta = " #e64ce6"
+bright_red = " #f05050"
+bright_white = " #f7f7f7"
+bright_yellow = " #ffbc5d"
+normal_black = " #000000"
+normal_blue = " #325cc0"
+normal_cyan = " #0083b2"
+normal_green = " #448c27"
+normal_magenta = " #7a3e9d"
+normal_red = " #aa3731"
+normal_white = " #f7f7f7"
+normal_yellow = " #cb9000"
+cursor_cursor = " #007acc"
+cursor_text = " #bfdbfe"
+table_show_lines = false
+table_box = "MINIMAL"
+panel_padding = [ 1, 1,]
+panel_title_align = "center"
+table_row_styles = [ "", "italic",]
+table_safe_box = true
+table_padding = [ 0, 1,]
+table_collapse_padding = false
+table_pad_edge = true
+table_expand = false
+table_show_footer = false
+table_show_edge = true
+table_leading = 0
+table_style = "none"
+table_footer_style = "none"
+table_caption_style = "none"
+table_title_justify = "center"
+table_caption_justify = "center"
+table_highlight = false
+
+[colors.bright]
+black = " #777777"
+blue = " #007acc"
+cyan = " #00aacb"
+green = " #60cb00"
+magenta = " #e64ce6"
+red = " #f05050"
+white = " #f7f7f7"
+yellow = " #ffbc5d"
+
+[colors.cursor]
+cursor = " #007acc"
+text = " #bfdbfe"
+
+[colors.normal]
+black = " #000000"
+blue = " #325cc0"
+cyan = " #0083b2"
+green = " #448c27"
+magenta = " #7a3e9d"
+red = " #aa3731"
+white = " #f7f7f7"
+yellow = " #cb9000"
+
+[colors.primary]
+background = " #f7f7f7"
+foreground = " #000000"
+
+[colors.selection]
+background = " #bfdbfe"
+text = " #000000"

flock_core-0.4.0b36/src/flock/themes/guezwhoz.toml

@@ -0,0 +1,77 @@
+[rich]
+panel_style = "on #1c1c1c"
+table_header_style = "bold #eeeeee on #005f5f"
+table_title_style = "bold #d0d0d0"
+table_border_style = " #87afd7"
+panel_border_style = " #87afd7"
+column_output = "bold #d0d0d0"
+column_value = " #d0d0d0"
+bright_black = " #8a8a8a"
+bright_blue = " #87afd7"
+bright_cyan = " #87d7d7"
+bright_green = " #afd7af"
+bright_magenta = " #afafd7"
+bright_red = " #d75f5f"
+bright_white = " #dadada"
+bright_yellow = " #d7d7af"
+normal_black = " #080808"
+normal_blue = " #5fafd7"
+normal_cyan = " #5fd7d7"
+normal_green = " #87d7af"
+normal_magenta = " #afafff"
+normal_red = " #ff5f5f"
+normal_white = " #dadada"
+normal_yellow = " #d7d787"
+cursor_cursor = " #eeeeee"
+cursor_text = " #eeeeee"
+table_show_lines = false
+table_box = "ROUNDED"
+panel_padding = [ 1, 1,]
+panel_title_align = "left"
+table_row_styles = [ "", "underline",]
+table_safe_box = true
+table_padding = [ 0, 1,]
+table_collapse_padding = false
+table_pad_edge = true
+table_expand = false
+table_show_footer = false
+table_show_edge = true
+table_leading = 0
+table_style = "none"
+table_footer_style = "none"
+table_caption_style = "none"
+table_title_justify = "center"
+table_caption_justify = "center"
+table_highlight = false
+
+[colors.bright]
+black = " #8a8a8a"
+blue = " #87afd7"
+cyan = " #87d7d7"
+green = " #afd7af"
+magenta = " #afafd7"
+red = " #d75f5f"
+white = " #dadada"
+yellow = " #d7d7af"
+
+[colors.cursor]
+cursor = " #eeeeee"
+text = " #eeeeee"
+
+[colors.normal]
+black = " #080808"
+blue = " #5fafd7"
+cyan = " #5fd7d7"
+green = " #87d7af"
+magenta = " #afafff"
+red = " #ff5f5f"
+white = " #dadada"
+yellow = " #d7d787"
+
+[colors.primary]
+background = " #1c1c1c"
+foreground = " #d0d0d0"
+
+[colors.selection]
+background = " #005f5f"
+text = " #eeeeee"

flock_core-0.4.0b36/src/flock/themes/wildcherry.toml

@@ -0,0 +1,77 @@
+[rich]
+panel_style = "on #1f1726"
+table_header_style = "bold #e4ffff on #002831"
+table_title_style = "bold #dafaff"
+table_border_style = " #308cba"
+panel_border_style = " #308cba"
+column_output = "bold #dafaff"
+column_value = " #dafaff"
+bright_black = " #009cc9"
+bright_blue = " #308cba"
+bright_cyan = " #ff919d"
+bright_green = " #f4dca5"
+bright_magenta = " #ae636b"
+bright_red = " #da6bac"
+bright_white = " #e4838d"
+bright_yellow = " #eac066"
+normal_black = " #000507"
+normal_blue = " #883cdc"
+normal_cyan = " #c1b8b7"
+normal_green = " #2ab250"
+normal_magenta = " #ececec"
+normal_red = " #d94085"
+normal_white = " #fff8de"
+normal_yellow = " #ffd16f"
+cursor_cursor = " #dd00ff"
+cursor_text = " #ff00fe"
+table_show_lines = false
+table_box = "DOUBLE_EDGE"
+panel_padding = [ 1, 2,]
+panel_title_align = "right"
+table_row_styles = [ "", "underline",]
+table_safe_box = true
+table_padding = [ 0, 1,]
+table_collapse_padding = false
+table_pad_edge = true
+table_expand = false
+table_show_footer = false
+table_show_edge = true
+table_leading = 0
+table_style = "none"
+table_footer_style = "none"
+table_caption_style = "none"
+table_title_justify = "center"
+table_caption_justify = "center"
+table_highlight = false
+
+[colors.bright]
+black = " #009cc9"
+blue = " #308cba"
+cyan = " #ff919d"
+green = " #f4dca5"
+magenta = " #ae636b"
+red = " #da6bac"
+white = " #e4838d"
+yellow = " #eac066"
+
+[colors.cursor]
+cursor = " #dd00ff"
+text = " #ff00fe"
+
+[colors.normal]
+black = " #000507"
+blue = " #883cdc"
+cyan = " #c1b8b7"
+green = " #2ab250"
+magenta = " #ececec"
+red = " #d94085"
+white = " #fff8de"
+yellow = " #ffd16f"
+
+[colors.primary]
+background = " #1f1726"
+foreground = " #dafaff"
+
+[colors.selection]
+background = " #002831"
+text = " #e4ffff"

flock_core-0.4.0b36/src/flock/themes/wombat.toml

@@ -0,0 +1,77 @@
+[rich]
+panel_style = "on #171717"
+table_header_style = "bold #b6bbc0 on #453b39"
+table_title_style = "bold #dedacf"
+table_border_style = " #a5c7ff"
+panel_border_style = " #a5c7ff"
+column_output = "bold #dedacf"
+column_value = " #dedacf"
+bright_black = " #313131"
+bright_blue = " #a5c7ff"
+bright_cyan = " #b7fff9"
+bright_green = " #ddf88f"
+bright_magenta = " #ddaaff"
+bright_red = " #f58c80"
+bright_white = " #ffffff"
+bright_yellow = " #eee5b2"
+normal_black = " #000000"
+normal_blue = " #5da9f6"
+normal_cyan = " #82fff7"
+normal_green = " #b1e969"
+normal_magenta = " #e86aff"
+normal_red = " #ff615a"
+normal_white = " #dedacf"
+normal_yellow = " #ebd99c"
+cursor_cursor = " #bbbbbb"
+cursor_text = " #ffffff"
+table_show_lines = true
+table_box = "SIMPLE"
+panel_padding = [ 1, 1,]
+panel_title_align = "center"
+table_row_styles = [ "", "dim",]
+table_safe_box = true
+table_padding = [ 0, 1,]
+table_collapse_padding = false
+table_pad_edge = true
+table_expand = false
+table_show_footer = false
+table_show_edge = true
+table_leading = 0
+table_style = "none"
+table_footer_style = "none"
+table_caption_style = "none"
+table_title_justify = "center"
+table_caption_justify = "center"
+table_highlight = false
+
+[colors.bright]
+black = " #313131"
+blue = " #a5c7ff"
+cyan = " #b7fff9"
+green = " #ddf88f"
+magenta = " #ddaaff"
+red = " #f58c80"
+white = " #ffffff"
+yellow = " #eee5b2"
+
+[colors.cursor]
+cursor = " #bbbbbb"
+text = " #ffffff"
+
+[colors.normal]
+black = " #000000"
+blue = " #5da9f6"
+cyan = " #82fff7"
+green = " #b1e969"
+magenta = " #e86aff"
+red = " #ff615a"
+white = " #dedacf"
+yellow = " #ebd99c"
+
+[colors.primary]
+background = " #171717"
+foreground = " #dedacf"
+
+[colors.selection]
+background = " #453b39"
+text = " #b6bbc0"

flock_core-0.4.0b36/src/flock/themes/zenburn.toml

@@ -0,0 +1,77 @@
+[rich]
+panel_style = "on #3f3f3f"
+table_header_style = "bold #c2d87a on #21322f"
+table_title_style = "bold #dcdccc"
+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"
+table_show_lines = false
+table_box = "HEAVY"
+panel_padding = [ 1, 2,]
+panel_title_align = "center"
+table_row_styles = [ "", "italic",]
+table_safe_box = true
+table_padding = [ 0, 1,]
+table_collapse_padding = false
+table_pad_edge = true
+table_expand = false
+table_show_footer = false
+table_show_edge = true
+table_leading = 0
+table_style = "none"
+table_footer_style = "none"
+table_caption_style = "none"
+table_title_justify = "center"
+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"
+
+[colors.cursor]
+cursor = " #73635a"
+text = " #000000"
+
+[colors.normal]
+black = " #4d4d4d"
+blue = " #506070"
+cyan = " #8cd0d3"
+green = " #60b48a"
+magenta = " #dc8cc3"
+red = " #705050"
+white = " #dcdccc"
+yellow = " #f0dfaf"
+
+[colors.primary]
+background = " #3f3f3f"
+foreground = " #dcdccc"
+
+[colors.selection]
+background = " #21322f"
+text = " #c2d87a"