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

flock/themes/wildcherry.toml

@@ -2,28 +2,28 @@
 panel_style = "on #1f1726"
 table_header_style = "bold #e4ffff on #002831"
 table_title_style = "bold #dafaff"
-table_border_style = "#308cba"
-panel_border_style = "#308cba"
+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"
+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,]
@@ -45,33 +45,33 @@ 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"
+black = " #009cc9"
+blue = " #308cba"
+cyan = " #ff919d"
+green = " #f4dca5"
+magenta = " #ae636b"
+red = " #da6bac"
+white = " #e4838d"
+yellow = " #eac066"
 
 [colors.cursor]
-cursor = "#dd00ff"
-text = "#ff00fe"
+cursor = " #dd00ff"
+text = " #ff00fe"
 
 [colors.normal]
-black = "#000507"
-blue = "#883cdc"
-cyan = "#c1b8b7"
-green = "#2ab250"
-magenta = "#ececec"
-red = "#d94085"
-white = "#fff8de"
-yellow = "#ffd16f"
+black = " #000507"
+blue = " #883cdc"
+cyan = " #c1b8b7"
+green = " #2ab250"
+magenta = " #ececec"
+red = " #d94085"
+white = " #fff8de"
+yellow = " #ffd16f"
 
 [colors.primary]
-background = "#1f1726"
-foreground = "#dafaff"
+background = " #1f1726"
+foreground = " #dafaff"
 
 [colors.selection]
-background = "#002831"
-text = "#e4ffff"
+background = " #002831"
+text = " #e4ffff"

flock/themes/wombat.toml

@@ -2,28 +2,28 @@
 panel_style = "on #171717"
 table_header_style = "bold #b6bbc0 on #453b39"
 table_title_style = "bold #dedacf"
-table_border_style = "#a5c7ff"
-panel_border_style = "#a5c7ff"
+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"
+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,]
@@ -45,33 +45,33 @@ 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"
+black = " #313131"
+blue = " #a5c7ff"
+cyan = " #b7fff9"
+green = " #ddf88f"
+magenta = " #ddaaff"
+red = " #f58c80"
+white = " #ffffff"
+yellow = " #eee5b2"
 
 [colors.cursor]
-cursor = "#bbbbbb"
-text = "#ffffff"
+cursor = " #bbbbbb"
+text = " #ffffff"
 
 [colors.normal]
-black = "#000000"
-blue = "#5da9f6"
-cyan = "#82fff7"
-green = "#b1e969"
-magenta = "#e86aff"
-red = "#ff615a"
-white = "#dedacf"
-yellow = "#ebd99c"
+black = " #000000"
+blue = " #5da9f6"
+cyan = " #82fff7"
+green = " #b1e969"
+magenta = " #e86aff"
+red = " #ff615a"
+white = " #dedacf"
+yellow = " #ebd99c"
 
 [colors.primary]
-background = "#171717"
-foreground = "#dedacf"
+background = " #171717"
+foreground = " #dedacf"
 
 [colors.selection]
-background = "#453b39"
-text = "#b6bbc0"
+background = " #453b39"
+text = " #b6bbc0"

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/__init__.py

@@ -0,0 +1 @@
+"""Flock Web Application Package."""

flock/webapp/app/api/agent_management.py

@@ -0,0 +1,270 @@
+from pathlib import Path
+
+from fastapi import APIRouter, Form, Request
+from fastapi.responses import HTMLResponse
+from fastapi.templating import Jinja2Templates
+
+from flock.webapp.app.services.flock_service import (
+    add_agent_to_current_flock_service,
+    get_current_flock_instance,
+    get_registered_items_service,
+    remove_agent_from_current_flock_service,
+    update_agent_in_current_flock_service,
+)
+
+router = APIRouter()
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
+templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
+
+
+@router.get("/htmx/agent-list", response_class=HTMLResponse)
+async def htmx_get_agent_list(
+    request: Request, message: str = None, success: bool = None
+):
+    flock = get_current_flock_instance()
+    if not flock:
+        return HTMLResponse("<p class='error'>No Flock loaded.</p>")
+    return templates.TemplateResponse(
+        "partials/_agent_list.html",
+        {
+            "request": request,
+            "flock": flock,
+            "message": message,
+            "success": success,
+        },
+    )
+
+
+@router.get(
+    "/htmx/agents/{agent_name}/details-form", response_class=HTMLResponse
+)
+async def htmx_get_agent_details_form(request: Request, agent_name: str):
+    flock = get_current_flock_instance()
+    if not flock:
+        return HTMLResponse("<p class='error'>No Flock loaded.</p>")
+    agent = flock.agents.get(agent_name)
+    if not agent:
+        return HTMLResponse(
+            f"<p class='error'>Agent '{agent_name}' not found.</p>"
+        )
+
+    registered_tools = get_registered_items_service("tool")
+    current_tools = (
+        [tool.__name__ for tool in agent.tools] if agent.tools else []
+    )
+
+    return templates.TemplateResponse(
+        "partials/_agent_detail_form.html",
+        {
+            "request": request,
+            "agent": agent,
+            "is_new": False,
+            "registered_tools": registered_tools,
+            "current_tools": current_tools,
+        },
+    )
+
+
+@router.get("/htmx/agents/new-agent-form", response_class=HTMLResponse)
+async def htmx_get_new_agent_form(request: Request):
+    flock = get_current_flock_instance()
+    if not flock:
+        return HTMLResponse("<p class='error'>No Flock loaded.</p>")
+    registered_tools = get_registered_items_service("tool")
+    return templates.TemplateResponse(
+        "partials/_agent_detail_form.html",
+        {
+            "request": request,
+            "agent": None,  # For new agent
+            "is_new": True,
+            "registered_tools": registered_tools,
+            "current_tools": [],
+        },
+    )
+
+
+@router.post(
+    "/htmx/agents", response_class=HTMLResponse
+)  # For creating new agent
+async def htmx_create_agent(
+    request: Request,
+    agent_name: str = Form(...),
+    agent_description: str = Form(""),
+    agent_model: str = Form(None),  # Can be empty to use Flock default
+    input_signature: str = Form(...),
+    output_signature: str = Form(...),
+    tools: list[str] = Form([]),
+):  # FastAPI handles list from multiple form fields with same name
+    flock = get_current_flock_instance()
+    if not flock:
+        return HTMLResponse("<p class='error'>No Flock loaded.</p>")
+
+    if (
+        not agent_name.strip()
+        or not input_signature.strip()
+        or not output_signature.strip()
+    ):
+        # Render form again with error (or use a different target for error message)
+        registered_tools = get_registered_items_service("tool")
+        return templates.TemplateResponse(
+            "partials/_agent_detail_form.html",
+            {
+                "request": request,
+                "agent": None,
+                "is_new": True,
+                "error_message": "Name, Input Signature, and Output Signature are required.",
+                "registered_tools": registered_tools,
+                "current_tools": tools,  # Pass back selected tools
+            },
+        )
+
+    agent_config = {
+        "name": agent_name,
+        "description": agent_description,
+        "model": agent_model
+        if agent_model
+        else None,  # Pass None if empty string for FlockFactory
+        "input": input_signature,
+        "output": output_signature,
+        "tools_names": tools,  # Pass tool names
+    }
+    success = add_agent_to_current_flock_service(agent_config)
+
+    # After action, re-render the agent list and clear the detail form
+    # Set headers for HTMX to trigger multiple target updates
+    response_headers = {}
+    if success:
+        response_headers["HX-Trigger"] = (
+            "agentListChanged"  # Custom event to refresh list
+        )
+
+    # Render an empty detail form or a success message for the detail panel
+    empty_detail_form = templates.TemplateResponse(
+        "partials/_agent_detail_form.html",
+        {
+            "request": request,
+            "agent": None,
+            "is_new": True,
+            "registered_tools": get_registered_items_service("tool"),
+            "form_message": "Agent created successfully!"
+            if success
+            else "Failed to create agent.",
+            "success": success,
+        },
+    ).body.decode()
+
+    return HTMLResponse(content=empty_detail_form, headers=response_headers)
+
+
+@router.put(
+    "/htmx/agents/{original_agent_name}", response_class=HTMLResponse
+)  # For updating existing agent
+async def htmx_update_agent(
+    request: Request,
+    original_agent_name: str,
+    agent_name: str = Form(...),
+    agent_description: str = Form(""),
+    agent_model: str = Form(None),
+    input_signature: str = Form(...),
+    output_signature: str = Form(...),
+    tools: list[str] = Form([]),
+):
+    flock = get_current_flock_instance()
+    if not flock:
+        return HTMLResponse("<p class='error'>No Flock loaded.</p>")
+
+    agent_config = {
+        "name": agent_name,
+        "description": agent_description,
+        "model": agent_model if agent_model else None,
+        "input": input_signature,
+        "output": output_signature,
+        "tools_names": tools,
+    }
+    success = update_agent_in_current_flock_service(
+        original_agent_name, agent_config
+    )
+
+    response_headers = {}
+    if success:
+        response_headers["HX-Trigger"] = "agentListChanged"
+
+    # Re-render the form with update message
+    updated_agent = flock.agents.get(
+        agent_name
+    )  # Get the potentially renamed agent
+    registered_tools = get_registered_items_service("tool")
+    current_tools = (
+        [tool.__name__ for tool in updated_agent.tools]
+        if updated_agent and updated_agent.tools
+        else []
+    )
+
+    updated_form = templates.TemplateResponse(
+        "partials/_agent_detail_form.html",
+        {
+            "request": request,
+            "agent": updated_agent,  # Pass the updated agent
+            "is_new": False,
+            "form_message": "Agent updated successfully!"
+            if success
+            else "Failed to update agent.",
+            "success": success,
+            "registered_tools": registered_tools,
+            "current_tools": current_tools,
+        },
+    ).body.decode()
+    return HTMLResponse(content=updated_form, headers=response_headers)
+
+
+@router.delete("/htmx/agents/{agent_name}", response_class=HTMLResponse)
+async def htmx_delete_agent(request: Request, agent_name: str):
+    flock = get_current_flock_instance()
+    if not flock:
+        return HTMLResponse("")  # Return empty to clear detail view
+
+    success = remove_agent_from_current_flock_service(agent_name)
+
+    response_headers = {}
+    if success:
+        response_headers["HX-Trigger"] = "agentListChanged"
+        # Return an empty agent detail form to clear the panel
+        # Also, the agent list will re-render due to HX-Trigger
+        return HTMLResponse(
+            templates.TemplateResponse(
+                "partials/_agent_detail_form.html",
+                {
+                    "request": request,
+                    "agent": None,
+                    "is_new": True,
+                    "form_message": f"Agent '{agent_name}' removed.",
+                    "success": True,
+                    "registered_tools": get_registered_items_service("tool"),
+                },
+            ).body.decode(),
+            headers=response_headers,
+        )
+    else:
+        # If deletion fails, re-render the agent detail form with an error
+        # This scenario should be rare unless the agent was already removed
+        agent = flock.agents.get(
+            agent_name
+        )  # Should still exist if delete failed
+        registered_tools = get_registered_items_service("tool")
+        current_tools = (
+            [tool.__name__ for tool in agent.tools]
+            if agent and agent.tools
+            else []
+        )
+        return templates.TemplateResponse(
+            "partials/_agent_detail_form.html",
+            {
+                "request": request,
+                "agent": agent,
+                "is_new": False,
+                "form_message": f"Failed to remove agent '{agent_name}'.",
+                "success": False,
+                "registered_tools": registered_tools,
+                "current_tools": current_tools,
+            },
+        )