flock-core 0.4.0b34__py3-none-any.whl → 0.4.0b36__py3-none-any.whl

flock/webapp/app/models_ui.py

@@ -0,0 +1,7 @@
+# Pydantic models specific to UI interactions, if needed.
+# For MVP, we might not need many here, as we'll primarily pass basic dicts to flock_service.
+# Example:
+# from pydantic import BaseModel
+# class SaveFlockRequest(BaseModel):
+#     current_flock_json: str # Or a more structured model if preferred
+#     new_filename: str

flock/webapp/app/services/flock_service.py

@@ -0,0 +1,291 @@
+import yaml  # For parsing issues, if any, during load
+
+from flock.core import Flock, FlockFactory
+from flock.core.flock_registry import get_registry
+from flock.webapp.app.config import (
+    CURRENT_FLOCK_FILENAME,
+    CURRENT_FLOCK_INSTANCE,
+    FLOCK_FILES_DIR,
+)
+
+
+def get_available_flock_files() -> list[str]:
+    if not FLOCK_FILES_DIR.exists():
+        return []
+    return sorted(
+        [
+            f.name
+            for f in FLOCK_FILES_DIR.iterdir()
+            if f.is_file() and (f.suffix in [".yaml", ".yml", ".flock"])
+        ]
+    )
+
+
+def load_flock_from_file_service(filename: str) -> Flock | None:
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    file_path = FLOCK_FILES_DIR / filename
+    if not file_path.exists():
+        print(f"Error: File not found {file_path}")
+        CURRENT_FLOCK_INSTANCE = None
+        CURRENT_FLOCK_FILENAME = None
+        return None
+    try:
+        # Temporarily clear registry parts that might be file-specific if needed,
+        # or ensure load_from_file handles re-registration gracefully.
+        # For MVP, assume load_from_file is robust enough.
+        CURRENT_FLOCK_INSTANCE = Flock.load_from_file(str(file_path))
+        CURRENT_FLOCK_FILENAME = filename
+        print(
+            f"Successfully loaded flock: {CURRENT_FLOCK_INSTANCE.name if CURRENT_FLOCK_INSTANCE else 'None'}"
+        )
+        return CURRENT_FLOCK_INSTANCE
+    except Exception as e:
+        print(f"Error loading flock from {file_path}: {e}")
+        CURRENT_FLOCK_INSTANCE = None
+        CURRENT_FLOCK_FILENAME = None
+        return None
+
+
+def create_new_flock_service(
+    name: str, model: str | None, description: str | None
+) -> Flock:
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    effective_model = model.strip() if model and model.strip() else None
+    CURRENT_FLOCK_INSTANCE = Flock(
+        name=name,
+        model=effective_model,
+        description=description,
+        show_flock_banner=False,
+        enable_logging=False,
+    )
+    CURRENT_FLOCK_FILENAME = f"{name.replace(' ', '_').lower()}.flock.yaml"
+    print(f"Created new flock: {name}")
+    return CURRENT_FLOCK_INSTANCE
+
+
+def get_current_flock_instance() -> Flock | None:
+    return CURRENT_FLOCK_INSTANCE
+
+
+def get_current_flock_filename() -> str | None:
+    return CURRENT_FLOCK_FILENAME
+
+
+def set_current_flock_instance_programmatically(flock: Flock, filename: str):
+    """Sets the current flock instance and filename programmatically.
+    Used when launching the UI with a pre-loaded flock from an external source (e.g., API server).
+    """
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    CURRENT_FLOCK_INSTANCE = flock
+    CURRENT_FLOCK_FILENAME = filename
+    print(
+        f"Programmatically set flock: {filename} (Name: {flock.name if flock else 'None'})"
+    )
+
+
+def set_current_flock_filename(filename: str | None):
+    global CURRENT_FLOCK_FILENAME
+    CURRENT_FLOCK_FILENAME = filename
+
+
+def clear_current_flock():
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    CURRENT_FLOCK_INSTANCE = None
+    CURRENT_FLOCK_FILENAME = None
+    print("Current flock cleared.")
+
+
+def save_current_flock_to_file_service(new_filename: str) -> tuple[bool, str]:
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    if not CURRENT_FLOCK_INSTANCE:
+        return False, "No flock loaded to save."
+    if not new_filename.strip():
+        return False, "Filename cannot be empty."
+    save_path = FLOCK_FILES_DIR / new_filename
+    try:
+        CURRENT_FLOCK_INSTANCE.to_yaml_file(str(save_path))
+        CURRENT_FLOCK_FILENAME = new_filename
+        return True, f"Flock saved to {new_filename}."
+    except Exception as e:
+        return False, f"Error saving flock: {e}"
+
+
+def update_flock_properties_service(
+    name: str, model: str | None, description: str | None
+) -> bool:
+    # ... (same as before)
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    if not CURRENT_FLOCK_INSTANCE:
+        return False
+    old_name_default_filename = (
+        f"{CURRENT_FLOCK_INSTANCE.name.replace(' ', '_').lower()}.flock.yaml"
+    )
+    if (
+        old_name_default_filename == CURRENT_FLOCK_FILENAME
+        and CURRENT_FLOCK_INSTANCE.name != name
+    ):
+        CURRENT_FLOCK_FILENAME = f"{name.replace(' ', '_').lower()}.flock.yaml"
+
+    CURRENT_FLOCK_INSTANCE.name = name
+    CURRENT_FLOCK_INSTANCE.model = (
+        model.strip() if model and model.strip() else None
+    )
+    CURRENT_FLOCK_INSTANCE.description = description
+    return True
+
+
+def add_agent_to_current_flock_service(agent_config: dict) -> bool:
+    # ... (same as before) ...
+    global CURRENT_FLOCK_INSTANCE
+    if not CURRENT_FLOCK_INSTANCE:
+        return False
+    registry = get_registry()
+    tools_instances = []
+    if agent_config.get("tools_names"):
+        for tool_name in agent_config["tools_names"]:
+            try:
+                tools_instances.append(registry.get_callable(tool_name))
+            except KeyError:
+                print(f"Warning: Tool '{tool_name}' not found. Skipping.")
+    try:
+        agent = FlockFactory.create_default_agent(
+            name=agent_config["name"],
+            description=agent_config.get("description"),
+            model=agent_config.get("model"),
+            input=agent_config["input"],
+            output=agent_config["output"],
+            tools=tools_instances or None,
+        )
+        handoff_target = agent_config.get("default_router_handoff")
+        if handoff_target:
+            from flock.routers.default.default_router import DefaultRouterConfig
+
+            agent.add_component(DefaultRouterConfig(hand_off=handoff_target))
+        CURRENT_FLOCK_INSTANCE.add_agent(agent)
+        return True
+    except Exception as e:
+        print(f"Error adding agent: {e}")
+        return False
+
+
+def update_agent_in_current_flock_service(
+    original_agent_name: str, agent_config: dict
+) -> bool:
+    # ... (same as before) ...
+    global CURRENT_FLOCK_INSTANCE
+    if not CURRENT_FLOCK_INSTANCE:
+        return False
+    agent_to_update = CURRENT_FLOCK_INSTANCE.agents.get(original_agent_name)
+    if not agent_to_update:
+        return False
+    registry = get_registry()
+    tools_instances = []
+    if agent_config.get("tools_names"):
+        for tool_name in agent_config["tools_names"]:
+            try:
+                tools_instances.append(registry.get_callable(tool_name))
+            except KeyError:
+                print(f"Warning: Tool '{tool_name}' not found. Skipping.")
+    try:
+        new_name = agent_config["name"]
+        agent_to_update.description = agent_config.get("description")
+        agent_to_update.model = agent_config.get("model")
+        agent_to_update.input = agent_config["input"]
+        agent_to_update.output = agent_config["output"]
+        agent_to_update.tools = tools_instances or None
+        handoff_target = agent_config.get("default_router_handoff")
+        if handoff_target:
+            from flock.routers.default.default_router import DefaultRouterConfig
+
+            agent_to_update.add_component(
+                DefaultRouterConfig(hand_off=handoff_target)
+            )
+        elif agent_to_update.handoff_router:
+            agent_to_update.handoff_router = None
+        if original_agent_name != new_name:
+            CURRENT_FLOCK_INSTANCE._agents[new_name] = (
+                CURRENT_FLOCK_INSTANCE._agents.pop(original_agent_name)
+            )
+        agent_to_update.name = new_name
+        return True
+    except Exception as e:
+        print(f"Error updating agent: {e}")
+        return False
+
+
+def remove_agent_from_current_flock_service(agent_name: str) -> bool:
+    # ... (same as before) ...
+    global CURRENT_FLOCK_INSTANCE
+    if (
+        not CURRENT_FLOCK_INSTANCE
+        or agent_name not in CURRENT_FLOCK_INSTANCE.agents
+    ):
+        return False
+    del CURRENT_FLOCK_INSTANCE._agents[agent_name]
+    return True
+
+
+async def run_current_flock_service(
+    start_agent_name: str, inputs: dict
+) -> dict | str:
+    global CURRENT_FLOCK_INSTANCE
+    if not CURRENT_FLOCK_INSTANCE:
+        return "Error: No flock loaded."
+    if (
+        not start_agent_name
+        or start_agent_name not in CURRENT_FLOCK_INSTANCE.agents
+    ):
+        return f"Error: Start agent '{start_agent_name}' not found."
+    try:
+        result = await CURRENT_FLOCK_INSTANCE.run_async(
+            start_agent=start_agent_name, input=inputs, box_result=False
+        )
+        # Don't convert here - let the API route handle it to avoid double conversion
+        return result
+    except Exception as e:
+        print(f"Error during flock execution: {e}")
+        return f"Error: {e!s}"
+
+
+def get_registered_items_service(item_type: str) -> list:
+    # ... (same as before) ...
+    registry = get_registry()
+    items, items_dict = [], None
+    if item_type == "type":
+        items_dict = registry._types
+    elif item_type == "tool":
+        items_dict = registry._callables
+    elif item_type == "component":
+        items_dict = registry._components
+    else:
+        return []
+    for name, item_obj in items_dict.items():
+        module_path = "N/A"
+        try:
+            module_path = item_obj.__module__
+        except AttributeError:
+            pass
+        items.append({"name": name, "module": module_path})
+    return sorted(items, key=lambda x: x["name"])
+
+
+def get_flock_preview_service(filename: str) -> dict | None:
+    """Loads only basic properties of a flock file for preview without full deserialization."""
+    file_path = FLOCK_FILES_DIR / filename
+    if not file_path.exists():
+        return None
+    try:
+        with file_path.open("r", encoding="utf-8") as f:
+            # Load YAML just to get top-level keys
+            data = yaml.safe_load(f)
+            if isinstance(data, dict):
+                return {
+                    "name": data.get("name", filename),
+                    "model": data.get("model"),
+                    "description": data.get("description"),
+                    "agents_count": len(data.get("agents", {})),
+                }
+        return {"name": filename, "error": "Not a valid Flock YAML structure"}
+    except Exception as e:
+        print(f"Error getting flock preview for {filename}: {e}")
+        return {"name": filename, "error": str(e)}

flock/webapp/app/templates/theme_mapper.html

@@ -0,0 +1,326 @@
+
+    <!DOCTYPE html>
+    <html lang="en" data-theme="light">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Theme Mapper</title>
+        <!-- Use Pico CSS only -->
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
+        <style>
+            {{ css_vars | safe }}
+
+            /* Only use Pico CSS classes and variables */
+           
+            .color-sample {
+                height: 20px;
+                width: 100%;
+                border-radius: 4px;
+                margin-bottom: 5px;
+            }
+            .theme-selector {
+                position: fixed;
+                top: 10px;
+                right: 10px;
+                z-index: 100;
+                background-color: var(--pico-card-background-color);
+                padding: 10px;
+                border-radius: 8px;
+                border: 1px solid var(--pico-border-color);
+            }
+            article {
+                margin-bottom: 1rem;
+            }
+            .contrast-table td {
+                padding: 5px;
+                text-align: center;
+            }
+            .good-contrast {
+                background-color: var(--pico-ins-color);
+                color: var(--pico-background-color);
+            }
+            .bad-contrast {
+                background-color: var(--pico-del-color);
+                color: var(--pico-background-color);
+            }
+            
+            /* New: give demo content cards a themed background so text always contrasts */
+            article {
+                background-color: var(--pico-card-sectioning-background-color);
+                border: 1px solid var(--pico-card-border-color);
+                padding: 1rem;
+                border-radius: 8px;
+            }
+            /* New: background for the two grid columns */
+            .grid > div {
+                background-color: var(--pico-card-background-color);
+                padding: 1rem;
+                border-radius: 8px;
+            }
+            
+            /* Override any non-pico CSS variables */
+            body {
+                background-color: var(--pico-background-color);
+                color: var(--pico-color);
+            }
+            a {
+                color: var(--pico-primary);
+            }
+            a:hover {
+                color: var(--pico-primary-hover);
+            }
+            h1 {
+                color: var(--pico-h1-color);
+            }
+            h2 {
+                color: var(--pico-h2-color);
+            }
+            h3 {
+                color: var(--pico-h3-color);
+            }
+            mark {
+                background-color: var(--pico-mark-background-color);
+                color: var(--pico-mark-color);
+            }
+            ins {
+                color: var(--pico-ins-color);
+            }
+            del {
+                color: var(--pico-del-color);
+            }
+            code {
+                background-color: var(--pico-code-background-color);
+                color: var(--pico-code-color);
+            }
+            button, input[type="submit"], input[type="button"] {
+                background-color: var(--pico-button-base-background-color);
+                color: var(--pico-button-base-color);
+                border-color: var(--pico-button-base-background-color);
+            }
+            button:hover, input[type="submit"]:hover, input[type="button"]:hover {
+                background-color: var(--pico-button-hover-background-color);
+                color: var(--pico-button-hover-color);
+                border-color: var(--pico-button-hover-background-color);
+            }
+            button.secondary, input[type="submit"].secondary, input[type="button"].secondary {
+                background-color: var(--pico-secondary);
+                color: var(--pico-secondary-inverse);
+                border-color: var(--pico-secondary);
+            }
+            button.secondary:hover, input[type="submit"].secondary:hover, input[type="button"].secondary:hover {
+                background-color: var(--pico-secondary-hover);
+                color: var(--pico-secondary-inverse);
+                border-color: var(--pico-secondary-hover);
+            }
+            button.contrast, input[type="submit"].contrast, input[type="button"].contrast {
+                background-color: var(--pico-contrast);
+                color: var(--pico-contrast-inverse);
+                border-color: var(--pico-contrast);
+            }
+            /* Improve grid columns on wider screens */
+            @media (min-width: 768px) {
+                .grid {
+                    display: grid;
+                    grid-template-columns: repeat(auto-fit, minmax(380px, 1fr));
+                    gap: 2rem;
+                }
+            }
+            /* Ensure container can grow a little wider than Pico default */
+            .container {
+                max-width: 90rem; /* ~1440px */
+            }
+            /* Ensure tables use full-strength text colour */
+            table th,
+            table td {
+                color: var(--pico-color);
+                opacity: 1; /* override Pico's default fade */
+            }
+        </style>
+    </head>
+    <body>
+        <div class="container">
+            <div class="theme-selector">
+                <label for="theme-select">Select Theme:</label>
+                <select id="theme-select" onchange="window.location.href='/?theme=' + this.value">
+                    {% for theme_name in themes %}
+                    <option value="{{ theme_name }}" {% if theme_name == current_theme %}selected{% endif %}>{{ theme_name }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            
+            <h1>Theme Mapper: {{ current_theme }}</h1>
+            
+            <div class="grid">
+                <div>
+                    <h2>UI Elements</h2>
+                    <article>
+                        <h3>Headings and Text</h3>
+                        <h1>Heading 1</h1>
+                        <h2>Heading 2</h2>
+                        <h3>Heading 3</h3>
+                        <p>Normal paragraph text. <a href="#">This is a link</a>. <mark>This is marked text</mark>.</p>
+                        <p><small>This is small text</small></p>
+                        <p><ins>This is inserted text</ins> and <del>this is deleted text</del>.</p>
+                        <blockquote>
+                            This is a blockquote with <cite>a citation</cite>.
+                        </blockquote>
+                        <code>This is inline code</code>
+                        <pre><code>// This is a code block
+function example() {
+  return "Hello World";
+}</code></pre>
+                    </article>
+                    
+                    <article>
+                        <h3>Buttons</h3>
+                        <button>Default Button</button>
+                        <button class="secondary">Secondary Button</button>
+                        <button class="contrast">Contrast Button</button>
+                    </article>
+                    
+                    <article>
+                        <h3>Form Elements</h3>
+                        <form>
+                            <label for="text">Text Input</label>
+                            <input type="text" id="text" placeholder="Text input">
+                            
+                            <label for="select">Select</label>
+                            <select id="select">
+                                <option>Option 1</option>
+                                <option>Option 2</option>
+                            </select>
+                            
+                            <label for="textarea">Textarea</label>
+                            <textarea id="textarea" placeholder="Textarea"></textarea>
+                            
+                            <label for="invalid" aria-invalid="true">Invalid Input</label>
+                            <input type="text" id="invalid" aria-invalid="true" placeholder="Invalid input">
+                            
+                            <fieldset>
+                                <legend>Checkboxes</legend>
+                                <label>
+                                    <input type="checkbox" checked>
+                                    Checkbox 1
+                                </label>
+                                <label>
+                                    <input type="checkbox">
+                                    Checkbox 2
+                                </label>
+                            </fieldset>
+                            
+                            <fieldset>
+                                <legend>Radio Buttons</legend>
+                                <label>
+                                    <input type="radio" name="radio" checked>
+                                    Radio 1
+                                </label>
+                                <label>
+                                    <input type="radio" name="radio">
+                                    Radio 2
+                                </label>
+                            </fieldset>
+                        </form>
+                    </article>
+                </div>
+                
+                <div>
+                    <h2>Theme Color Mapping</h2>
+                    <article>
+                        <h3>Main Colors</h3>
+                        <div class="grid">
+                            {% for color_name, color_value in main_colors %}
+                            <div>
+                                <div class="color-sample" style="background-color: {{ color_value }};"></div>
+                                <small>{{ color_name }}<br>{{ color_value }}</small>
+                            </div>
+                            {% endfor %}
+                        </div>
+                    </article>
+                    
+                    <article>
+                        <h3>All Pico CSS Variables</h3>
+                        <div style="max-height: 300px; overflow-y: auto;">
+                            <table>
+                                <thead>
+                                    <tr>
+                                        <th>Variable</th>
+                                        <th>Value</th>
+                                        <th>Sample</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for var_name, var_value in all_vars %}
+                                    <tr>
+                                        <td>{{ var_name }}</td>
+                                        <td>{{ var_value }}</td>
+                                        <td>
+                                            {% if var_value.startswith('#') or var_value.startswith('rgb') %}
+                                            <div class="color-sample" style="background-color: {{ var_value }};"></div>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </article>
+                    
+                    <article>
+                        <h3>Color Contrast Checks</h3>
+                        <table class="contrast-table">
+                            <thead>
+                                <tr>
+                                    <th>Foreground</th>
+                                    <th>Background</th>
+                                    <th>Contrast</th>
+                                    <th>WCAG AA</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for check in contrast_checks %}
+                                <tr>
+                                    <td>{{ check.fg_name }}</td>
+                                    <td>{{ check.bg_name }}</td>
+                                    <td>{{ check.contrast }}</td>
+                                    <td class="{% if check.passes %}good-contrast{% else %}bad-contrast{% endif %}">
+                                        {{ "Pass" if check.passes else "Fail" }}
+                                    </td>
+                                </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </article>
+
+                    <article>
+                        <h3>Original Theme Colors</h3>
+                        <div style="max-height: 300px; overflow-y: auto;">
+                            <table>
+                                <thead>
+                                    <tr>
+                                        <th>Group</th>
+                                        <th>Name</th>
+                                        <th>Value</th>
+                                        <th>Sample</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for group, names in original_colors.items() %}
+                                        {% for name, value in names.items() %}
+                                        <tr>
+                                            <td>{{ group }}</td>
+                                            <td>{{ name }}</td>
+                                            <td>{{ value }}</td>
+                                            <td><div class="color-sample" style="background-color: {{ value }};"></div></td>
+                                        </tr>
+                                        {% endfor %}
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </article>
+                </div>
+            </div>
+        </div>
+    </body>
+    </html>
+