flock-core 0.4.0b44__py3-none-any.whl → 0.4.0b46__py3-none-any.whl

flock/cli/manage_agents.py

@@ -5,6 +5,7 @@ including listing, adding, editing, and removing agents.
 """
 
 import questionary
+from rich.box import Box
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
@@ -104,9 +105,11 @@ def _list_agents(flock: Flock):
         model = agent.model or flock.model or "Default"
 
         # Format description (truncate if too long)
-        description = str(agent.description)
-        if len(description) > 30:
+        description = agent.resolved_description
+        if description and len(description) > 30:
             description = description[:27] + "..."
+        elif not description:
+            description = "N/A"
 
         # Format input/output (truncate if too long)
         input_str = str(agent.input)
@@ -156,13 +159,13 @@ def _view_agent_details(agent: FlockAgent):
     )
 
     # Create a panel for each section
-    basic_info = Table(show_header=False, box=None)
+    basic_info = Table(show_header=False, box=Box.ROUNDED, padding=(0, 2))
     basic_info.add_column("Property", style="cyan")
     basic_info.add_column("Value", style="green")
 
     basic_info.add_row("Name", agent.name)
     basic_info.add_row("Model", str(agent.model or "Default"))
-    basic_info.add_row("Description", str(agent.description))
+    basic_info.add_row("Description", agent.resolved_description if agent.resolved_description else "N/A")
     basic_info.add_row("Input", str(agent.input))
     basic_info.add_row("Output", str(agent.output))
     basic_info.add_row("Write to File", str(agent.write_to_file))
@@ -329,6 +332,18 @@ def _edit_agent(flock: Flock):
 
     agent = flock._agents[agent_name]
 
+    if not agent:
+        console.print(f"[bold red]Agent '{agent_name}' not found.[/]")
+        return
+
+    console.print(f"\n[bold underline]Details for Agent: {agent.name}[/]")
+    basic_info = Table(show_header=False, box=Box.ROUNDED, padding=(0, 2))
+    basic_info.add_row("Name", agent.name)
+    description = agent.resolved_description
+    basic_info.add_row("Description", description if description else "N/A")
+    basic_info.add_row("Model", agent.model or "Flock Default")
+    basic_info.add_row("Input Signature", str(agent.input))
+
     # Choose edit method
     edit_choice = questionary.select(
         "How would you like to edit this agent?",

flock/core/api/endpoints.py

@@ -246,7 +246,7 @@ def create_api_router() -> APIRouter:
         """List all available agents in the currently loaded Flock."""
         logger.debug("API request: list agents")
         agents_list = [
-            {"name": agent.name, "description": agent.description or agent.name}
+            {"name": agent.name, "description": agent.resolved_description or agent.name}
             for agent in flock_instance.agents.values()
         ]
         return {"agents": agents_list}

flock/core/flock_agent.py

@@ -195,6 +195,37 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         """Get a list of currently enabled modules attached to this agent."""
         return [m for m in self.modules.values() if m.config.enabled]
 
+    @property
+    def resolved_description(self) -> str | None:
+        """Returns the resolved agent description.
+        If the description is a callable, it attempts to call it.
+        Returns None if the description is None or a callable that fails.
+        """
+        if callable(self.description):
+            try:
+                # Attempt to call without context first.
+                # If callables consistently need context, this might need adjustment
+                # or the template-facing property might need to be simpler,
+                # relying on prior resolution via resolve_callables.
+                return self.description()
+            except TypeError:
+                # Log a warning that context might be needed?
+                # For now, treat as unresolvable in this simple property.
+                logger.warning(
+                    f"Callable description for agent '{self.name}' could not be resolved "
+                    f"without context via the simple 'resolved_description' property. "
+                    f"Consider calling 'agent.resolve_callables(context)' beforehand if context is required."
+                )
+                return None # Or a placeholder like "[Callable Description]"
+            except Exception as e:
+                logger.error(
+                    f"Error resolving callable description for agent '{self.name}': {e}"
+                )
+                return None
+        elif isinstance(self.description, str):
+            return self.description
+        return None
+
     # --- Lifecycle Hooks (Keep as they were) ---
     async def initialize(self, inputs: dict[str, Any]) -> None:
         """Initialize agent and run module initializers."""

flock/webapp/static/css/chat.css

@@ -29,7 +29,7 @@ body.chat-page {
     padding: 1rem 1.5rem; 
     display: flex;
     flex-direction: column;
-    min-height: 60vh;
+    min-height: 0;
     gap: 1rem;
     background-color: rgba(0, 0, 0, 0.05);
     background-image: 
@@ -118,7 +118,7 @@ body.chat-page {
     box-shadow: 0 0 0 2px rgba(var(--pico-primary-rgb, 0, 123, 255), 0.25);
 }
 
-#chat-form button { 
+#chat-container form button[type="submit"] { 
     flex: 0 0 auto; 
     min-width: auto;
     width: 150px; /* Wider send button */
@@ -132,7 +132,7 @@ body.chat-page {
     height: 3rem;
 }
 
-#chat-form button:hover {
+#chat-container form button[type="submit"]:hover {
     background: var(--pico-primary-hover, var(--pico-primary));
     transform: translateY(-2px);
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
@@ -185,11 +185,11 @@ body.chat-page {
    ------------------------------------------------------------------------- */
 body:not(.chat-page) #chat-container,
 body:not(.chat-page) .chat-container {
-    height: auto;
-    min-height: 60vh;
-    /* share same centering rules */
+    height: 100%;
+    min-height: 100%;
+    /* allow full width inside the main content area */
     width: 100%;
-    max-width: 80%;
+    max-width: 100%;
     margin: 0 auto;
 }
 
@@ -225,3 +225,18 @@ body:not(.chat-page) .chat-settings-form .grid button:first-child {
     flex: 0 0 auto;
     width: auto;
 }
+
+/* -------------------------------------------------------------------------
+   Container flex area to ensure chat-log grows/shrinks as needed
+   ------------------------------------------------------------------------- */
+#chat-content-area {
+    display: flex;
+    flex-direction: column;
+    flex: 1 1 auto;
+    overflow: hidden;
+}
+
+/* Prevent double scrollbars when chat is embedded */
+main.main-content:has(#chat-container) {
+    overflow: hidden;
+}

flock/webapp/templates/base.html

@@ -32,7 +32,7 @@
 
 <body>
     <header class="top-header">
-        <span><strong>🐧 Flock UI 🐤</strong></span>
+        <span><strong>🐧 Flock Playground 🐤</strong></span>
         <span id="header-flock-status-container" hx-get="/ui/htmx/header-flock-status?ui_mode={{ ui_mode }}"
             hx-trigger="load, flockLoaded from:body, flockCleared from:body" hx-swap="innerHTML">
             <small>Loading status...</small> {# Placeholder while loading #}

flock/webapp/templates/chat.html

@@ -33,7 +33,13 @@
                 <p><em>Loading chat…</em></p>
             </div>
             
-            <form id="chat-form" hx-post="/chat/send" hx-target="#chat-log" hx-swap="innerHTML" hx-on::after-request="this.reset()">
+            <form id="chat-form-standalone"
+                  hx-post="/chat/send"
+                  hx-target="#chat-log"
+                  hx-swap="innerHTML"
+                  hx-disabled-elt="input[name='message'], button[type='submit']"
+                  hx-on::before-request="htmx.find('#chat-form-standalone button[type=\'submit\']').textContent = 'Sending...'"
+                  hx-on::after-request="htmx.find('#chat-form-standalone button[type=\'submit\']').textContent = 'Send'; this.reset();">
                 <input type="text" name="message" placeholder="Type a message…" required autofocus>
                 <button type="submit">Send</button>
             </form>

flock/webapp/templates/partials/_agent_detail_form.html

@@ -23,12 +23,13 @@
           hx-indicator="#agent-detail-loading-indicator">
 
         <fieldset>
-            <label for="agent_name_field">Name *</label>
-            <input type="text" id="agent_name_field" name="agent_name" value="{{ agent.name if agent and not form_errors else (form_data.agent_name if form_data else '') }}" required placeholder="my_processing_agent">
+            <legend>Core Agent Configuration</legend>
+            <label for="agent_name_field">Agent Name *</label>
+            <input type="text" id="agent_name_field" name="agent_name" value="{{ agent.name if agent and not form_errors else (form_data.agent_name if form_data else '') }}" required placeholder="Unique name for the agent">
             {% if form_errors and form_errors.agent_name %}<small class="field-error">{{ form_errors.agent_name }}</small>{% endif %}
 
             <label for="agent_description_field">Description</label>
-            <textarea id="agent_description_field" name="agent_description" placeholder="Briefly describe what this agent does.">{{ agent.description if agent and not form_errors else (form_data.agent_description if form_data else '') }}</textarea>
+            <textarea id="agent_description_field" name="agent_description" placeholder="Briefly describe what this agent does.">{{ agent.resolved_description if agent and not form_errors else (form_data.agent_description if form_data else '') }}</textarea>
 
             <label for="agent_model_field">Model Override (Optional)</label>
             <input type="text" id="agent_model_field" name="agent_model" value="{{ agent.model if agent and agent.model and not form_errors else (form_data.agent_model if form_data else '') }}" placeholder="e.g., openai/gpt-3.5-turbo (uses Flock default if blank)">

flock/webapp/templates/partials/_agent_list.html

@@ -8,7 +8,7 @@
         {% for agent_name, agent in flock.agents.items() %}
         <li hx-get="/ui/api/flock/htmx/agents/{{ agent.name }}/details-form" hx-target="#agent-detail-panel" hx-swap="innerHTML" hx-indicator="#agent-detail-loading" onclick="this.closest('ul').querySelectorAll('li').forEach(li => li.classList.remove('selected-item')); this.classList.add('selected-item');">
             <strong>{{ agent.name }}</strong><br>
-            <small>{{ agent.description|truncate(80) if agent.description else 'No description' }}</small>
+            <small>{{ agent.resolved_description|truncate(80) if agent.resolved_description else 'No description' }}</small>
         </li>
         {% endfor %}
     </ul>

flock/webapp/templates/partials/_chat_container.html

@@ -2,7 +2,13 @@
     <div id="chat-log" hx-get="/chat/messages" hx-trigger="load" hx-swap="innerHTML">
         <p><em>Loading chat…</em></p>
     </div>
-    <form id="chat-form" class="chat-form" hx-post="/chat/send" hx-target="#chat-log" hx-swap="innerHTML" hx-on::after-request="this.reset()">
+    <form id="chat-form-embedded" class="chat-form"
+          hx-post="/chat/send"
+          hx-target="#chat-log"
+          hx-swap="innerHTML"
+          hx-disabled-elt="input[name='message'], button[type='submit']"
+          hx-on::before-request="htmx.find('#chat-form-embedded button[type=\'submit\']').textContent = 'Sending...'"
+          hx-on::after-request="htmx.find('#chat-form-embedded button[type=\'submit\']').textContent = 'Send'; this.reset();">
         <input type="text" name="message" placeholder="Type a message…" required>
         <button type="submit">Send</button>
     </form>

{flock_core-0.4.0b44.dist-info → flock_core-0.4.0b46.dist-info}/METADATA

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

{flock_core-0.4.0b44.dist-info → flock_core-0.4.0b46.dist-info}/RECORD

@@ -10,7 +10,7 @@ flock/cli/load_examples.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_flock.py,sha256=sfZ9B9aiyC5TCEbn1xR5Yd5SoaVji6MBNYzXlWOpoZ4,7111
 flock/cli/load_release_notes.py,sha256=bkMIjjQFfOngXkDCh2kB404lQYIToeR91LodzI2IUWM,555
 flock/cli/loaded_flock_cli.py,sha256=lGZ9Y2O16v4OEr0dxvPQA8HqreB_bP25C9teg4ViSsA,8202
-flock/cli/manage_agents.py,sha256=Psl014LCrJmBgwrjsp7O3WNlWvQmVd_IDud3rd0lnLI,12786
+flock/cli/manage_agents.py,sha256=cWEHNPDaEAOYaxFhGbt1jmWvIhxmUNjZ24lMP8gH2y8,13506
 flock/cli/registry_management.py,sha256=mAHy3wT97YgODR0gVOkTXDqR5NIPzM-E-z9dEtw9-tw,29790
 flock/cli/runner.py,sha256=TgiuhRLkpa6dn3C-3eCmWx-bWUlTjaH0sD7Y-O7MrYM,1122
 flock/cli/settings.py,sha256=Z_TXBzCYlCmSaKrJ_CQCdYy-Cj29gpI4kbC_2KzoKqg,27025
@@ -20,7 +20,7 @@ flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,1252
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
 flock/core/__init__.py,sha256=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
 flock/core/flock.py,sha256=tr7O84Ykgnu7ZXQ54bOdnjEsZw-a7ue-pDp5UNyPkn4,33837
-flock/core/flock_agent.py,sha256=JTqaGD_OnZSd3bVU989WMsK1rAT6UGn-JYrPxFV15EE,39576
+flock/core/flock_agent.py,sha256=-gEfBKWc569ynqNdy7Gc1iqBrCYPHmC8qvzXkxTi5m4,41115
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
 flock/core/flock_factory.py,sha256=_4zsjkEmJnCR7IvJ3SUHnDbX6c7Tt3E4P5ohxwKvE6w,3173
 flock/core/flock_module.py,sha256=UCK6TFe4viXs596zeng0GD3gln4ZNGu_gCWkXIIMREg,3090
@@ -28,7 +28,7 @@ flock/core/flock_registry.py,sha256=aC-RK0js676DQkjXmNuYHuD5t6GmFhpQoCKaO3i7xFg,
 flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
 flock/core/api/__init__.py,sha256=KdzUwBOwhxqqy7lAMLpysKL5GvpIiwOy6CxXELZVWaY,186
 flock/core/api/custom_endpoint.py,sha256=Mbk2owdcXVATaT5FtEWXFzllgursozcmqP8ouG5btc0,1305
-flock/core/api/endpoints.py,sha256=gxWA38viaGCI_Vq2YNuF0Rx_TVfa1ODcvXJu6Mjtdjg,12178
+flock/core/api/endpoints.py,sha256=YoqnGscF02OxGXrvOxkn-9hnCwcZD9Vx6YkeHoC8pSk,12187
 flock/core/api/main.py,sha256=MMKTWRLZQXcdoeiN8NOX7s5_vBrzH5reE-W_5xJn8fM,8716
 flock/core/api/models.py,sha256=seqKuzhbN37nCNO7KrcJjI2mWuwiOKCLFcJcTPvTtag,3422
 flock/core/api/run_store.py,sha256=bFodJvVyWogzoezVy0cOoWWU3MdEBXf_6_5sBqCRWps,9227
@@ -458,22 +458,22 @@ flock/webapp/app/api/registry_viewer.py,sha256=IoInxJiRR0yFlecG_l2_eRc6l35RQQyED
 flock/webapp/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/webapp/app/services/flock_service.py,sha256=qceWNpGet-5VT95q5ZMg2ETFryC2iitfClVuxlE3wCc,13578
 flock/webapp/app/templates/theme_mapper.html,sha256=z8ZY7nmk6PiUGzD_-px7wSXcEnuBM121rMq6u-2oaCo,14249
-flock/webapp/static/css/chat.css,sha256=-31slD1wZ4j5ZND7dsv8dkE3xTqnMvoP3IajT5dw8bE,5546
+flock/webapp/static/css/chat.css,sha256=eOpLcn3vSB5NBITJXwr4EUvXwWMozNja-y7754u0MY0,6069
 flock/webapp/static/css/components.css,sha256=WnicEHy3ptPzggKmyG9_oZp3X30EMJBUW3KEXaiUCUE,6018
 flock/webapp/static/css/header.css,sha256=E9MgItZCk34S65NfMJ001ZsRz4oyFSJex8KvINMtCn0,1043
 flock/webapp/static/css/layout.css,sha256=ocDd7dmezdQzNAQDuQSv1xZ8-pcbNgYLUYJB1SKcfvw,1526
 flock/webapp/static/css/sidebar.css,sha256=gCwLTAiIvmHGksm0rHDpMsOGCDKBMxqx_aEc8ZQcQF8,3066
-flock/webapp/templates/base.html,sha256=Qck-G793uQM52xn1D6w4scOVRn34R6vZI7JeJHbV4Vw,4929
-flock/webapp/templates/chat.html,sha256=1EQXvvZ_KV0JsJkenWZV1bBCEDcN9zFq5EKBysuNxJM,2343
+flock/webapp/templates/base.html,sha256=013TyI0TvzyvjnIhEr3ZgJYSAIVQK2ayPAngdi0hF18,4937
+flock/webapp/templates/chat.html,sha256=2fbuvKZyYiFZXQR-q7sHeYJtdjZML0wBuOmwlCiaK0M,2717
 flock/webapp/templates/chat_settings.html,sha256=nYz6ihYAUA9zN-Jru565QNl8_eJdoLMWC2LdZJtZ-20,862
 flock/webapp/templates/flock_editor.html,sha256=ysDExf9zMj4SMsSXZUpCtG9EjIv8VJ5xL4IJQOMlb7o,542
 flock/webapp/templates/index.html,sha256=eK7s5Cnh63unqPwq9NGZGEKyvYwkhudfmSn9su3Ctyg,412
 flock/webapp/templates/registry_viewer.html,sha256=suAiWDvBxJ8SsF9MhheuN6MMQUZuIhTlurmbFOcYJfI,3235
-flock/webapp/templates/partials/_agent_detail_form.html,sha256=wF1e4g_Jw1LZGAP8-_jgVJWqbseM1q8raB0eTCqQ-5c,5940
-flock/webapp/templates/partials/_agent_list.html,sha256=9NEakjaGH8JwUlLWTBMgT2uxGMh_uwhOvNukC4i26wo,1019
+flock/webapp/templates/partials/_agent_detail_form.html,sha256=oLz17lmv8s-DI9lOxODLJpc57NRUPmnLlOqxyDFYTDE,6015
+flock/webapp/templates/partials/_agent_list.html,sha256=comYjOeUxQvlJzS-3D4OruJKlhC3uhCgo-X-nqiOhkA,1037
 flock/webapp/templates/partials/_agent_manager_view.html,sha256=oUJ-t2Mk3o4xjQ_HtHz0glgaHM8eqZpPB4i24ToJiJ8,2565
 flock/webapp/templates/partials/_agent_tools_checklist.html,sha256=T60fb7OrJYHUw0hJLC_otskgvbH9dZXbv5klgWBkSWk,686
-flock/webapp/templates/partials/_chat_container.html,sha256=wNX_qTSJYy27k0KAZNksOt_73vTG4ki5n3ATZ2N9rDQ,484
+flock/webapp/templates/partials/_chat_container.html,sha256=n4MzCHAYvTw7rpINIW1dw7LgMSC0ifRORTU47We0p4s,804
 flock/webapp/templates/partials/_chat_messages.html,sha256=RuMUglxdTjYyTs_P9dCwfX_5dEVO3iH6r8V203kdTpU,593
 flock/webapp/templates/partials/_chat_settings_form.html,sha256=-yokUC05sAjHbLSHSYhTzhdJA5JDr0SRemBYcAQ2qwc,3263
 flock/webapp/templates/partials/_create_flock_form.html,sha256=nQVbuTWqOQ59q5zyGXkuBixikvCkaZIPVW8CRF6wCm0,2806
@@ -506,8 +506,8 @@ flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R
 flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.0b44.dist-info/METADATA,sha256=pwXwMx_hHg9Wnr0RlhRYVYUnW-BSUFh1QKYUNlXfG8U,17125
-flock_core-0.4.0b44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b44.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b44.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b44.dist-info/RECORD,,
+flock_core-0.4.0b46.dist-info/METADATA,sha256=vG3wZwb_mlMNL9DhujdpQYCj1nEw3HTH5BnjGUH_NTA,17125
+flock_core-0.4.0b46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b46.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b46.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b46.dist-info/RECORD,,