flock-core 0.4.0b50__py3-none-any.whl → 0.4.2__py3-none-any.whl

flock/webapp/app/api/execution.py

@@ -26,6 +26,7 @@ from flock.core.util.spliter import parse_schema
 from flock.webapp.app.dependencies import (
     get_flock_instance,
     get_optional_flock_instance,
+    get_shared_link_store,
 )
 
 # Service function now takes app_state
@@ -33,6 +34,7 @@ from flock.webapp.app.services.flock_service import (
     run_current_flock_service,
     # get_current_flock_instance IS NO LONGER IMPORTED
 )
+from flock.webapp.app.services.sharing_store import SharedLinkStoreInterface
 
 router = APIRouter()
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
@@ -155,7 +157,16 @@ async def htmx_run_flock(
 
     return templates.TemplateResponse(
         "partials/_results_display.html",
-        {"request": request, "result": result_data, "result_raw_json": result_data_raw_json_str} # Pass both
+        {
+            "request": request,
+            "result": result_data,
+            "result_raw_json": result_data_raw_json_str,
+            "feedback_endpoint": "/ui/api/flock/htmx/feedback",
+            "share_id": None,
+            "flock_name": current_flock_from_state.name,
+            "agent_name": start_agent_name,
+            "flock_definition": current_flock_from_state.to_yaml(),
+        }
     )
 
 
@@ -218,5 +229,71 @@ async def htmx_run_shared_flock(
 
     return templates.TemplateResponse(
         "partials/_results_display.html",
-        {"request": request, "result": result_data, "result_raw_json": result_data_raw_json_str} # Pass both
+        {
+            "request": request,
+            "result": result_data,
+            "result_raw_json": result_data_raw_json_str,
+            "feedback_endpoint": "/ui/api/flock/htmx/feedback-shared",
+            "share_id": share_id,
+            "flock_name": temp_flock.name,
+            "agent_name": start_agent_name,
+            "flock_definition": temp_flock.to_yaml(),
+        }
+    )
+
+# --- Feedback endpoints ---
+@router.post("/htmx/feedback", response_class=HTMLResponse)
+async def htmx_submit_feedback(
+    request: Request,
+    reason: str = Form(...),
+    expected_response: str | None = Form(None),
+    actual_response: str | None = Form(None),
+    flock_name: str | None = Form(None),
+    agent_name: str | None = Form(None),
+    flock_definition: str | None = Form(None),
+    store: SharedLinkStoreInterface = Depends(get_shared_link_store),
+):
+    from uuid import uuid4
+
+    from flock.webapp.app.services.sharing_models import FeedbackRecord
+
+    record = FeedbackRecord(
+        feedback_id=uuid4().hex,
+        share_id=None,
+        context_type="agent_run",
+        reason=reason,
+        expected_response=expected_response,
+        actual_response=actual_response,
+        flock_name=flock_name,
+        agent_name=agent_name,
+        flock_definition=flock_definition,
+    )
+    await store.save_feedback(record)
+    return HTMLResponse("<p>🙏 Feedback received – thank you!</p>")
+
+
+@router.post("/htmx/feedback-shared", response_class=HTMLResponse)
+async def htmx_submit_feedback_shared(
+    request: Request,
+    share_id: str = Form(...),
+    reason: str = Form(...),
+    expected_response: str | None = Form(None),
+    actual_response: str | None = Form(None),
+    flock_definition: str | None = Form(None),
+    store: SharedLinkStoreInterface = Depends(get_shared_link_store),
+):
+    from uuid import uuid4
+
+    from flock.webapp.app.services.sharing_models import FeedbackRecord
+
+    record = FeedbackRecord(
+        feedback_id=uuid4().hex,
+        share_id=share_id,
+        context_type="agent_run",
+        reason=reason,
+        expected_response=expected_response,
+        actual_response=actual_response,
+        flock_definition=flock_definition,
     )
+    await store.save_feedback(record)
+    return HTMLResponse("<p>🙏 Feedback received for shared run – thank you!</p>")

flock/webapp/app/chat.py

@@ -14,7 +14,10 @@ from flock.core.flock import Flock
 from flock.core.logging.logging import get_logger
 from flock.webapp.app.dependencies import get_shared_link_store
 from flock.webapp.app.main import get_base_context_web, templates
-from flock.webapp.app.services.sharing_models import SharedLinkConfig
+from flock.webapp.app.services.sharing_models import (
+    FeedbackRecord,
+    SharedLinkConfig,
+)
 from flock.webapp.app.services.sharing_store import SharedLinkStoreInterface
 
 router = APIRouter()
@@ -224,7 +227,15 @@ async def chat_send(request: Request, message: str = Form(...)):
             # If even echo should be markdown, remove is_error=True here and let it pass through. For now, plain.
 
     duration_ms = int((datetime.now() - start_time).total_seconds() * 1000)
-    history.append({"role": "bot", "text": bot_text, "timestamp": current_time, "agent": bot_agent or "echo", "duration_ms": duration_ms})
+    history.append({
+        "role": "bot",
+        "text": bot_text,
+        "timestamp": current_time,
+        "agent": bot_agent or "echo",
+        "duration_ms": duration_ms,
+        "raw_json": original_bot_text if 'original_bot_text' in locals() else bot_text,
+        "flock_yaml": getattr(flock_inst, 'to_yaml', lambda: "")()
+    })
     # Return updated history partial
     return templates.TemplateResponse(
         "partials/_chat_messages.html",
@@ -516,9 +527,78 @@ async def chat_send_shared(
              bot_text = f"Shared Echo: {message}"
 
     duration_ms = int((datetime.now() - start_time).total_seconds() * 1000)
-    history.append({"role": "bot", "text": bot_text, "timestamp": current_time, "agent": bot_agent or "shared-echo", "duration_ms": duration_ms})
+    history.append({
+        "role": "bot",
+        "text": bot_text,
+        "timestamp": current_time,
+        "agent": bot_agent or "shared-echo",
+        "duration_ms": duration_ms,
+        "raw_json": original_bot_text if 'original_bot_text' in locals() else bot_text,
+        "flock_yaml": getattr(flock_inst, 'to_yaml', lambda: "")()
+    })
 
     return templates.TemplateResponse(
         "partials/_chat_messages.html",
         {"request": request, "history": history, "now": datetime.now}
     )
+
+# ---------------- Feedback endpoints ----------------
+@router.post("/chat/htmx/feedback", response_class=HTMLResponse, include_in_schema=False)
+async def chat_feedback(request: Request,
+    reason: str = Form(...),
+    expected_response: str | None = Form(None),
+    actual_response: str | None = Form(None),
+    flock_definition: str | None = Form(None),
+    agent_name: str | None = Form(None),
+    store: SharedLinkStoreInterface = Depends(get_shared_link_store)):
+    from uuid import uuid4
+    rec = FeedbackRecord(
+        feedback_id=uuid4().hex,
+        share_id=None,
+        context_type="chat",
+        reason=reason,
+        expected_response=expected_response,
+        actual_response=actual_response,
+        flock_definition=flock_definition,
+        agent_name=agent_name,
+    )
+    await store.save_feedback(rec)
+    toast_event = {
+        "showGlobalToast": {
+            "message": "Feedback received! Thanks",
+            "type": "success"
+        }
+    }
+    headers = {"HX-Trigger": json.dumps(toast_event)}
+    return Response(status_code=204, headers=headers)
+
+
+@router.post("/chat/htmx/feedback-shared", response_class=HTMLResponse, include_in_schema=False)
+async def chat_feedback_shared(request: Request,
+    share_id: str = Form(...),
+    reason: str = Form(...),
+    expected_response: str | None = Form(None),
+    actual_response: str | None = Form(None),
+    flock_definition: str | None = Form(None),
+    agent_name: str | None = Form(None),
+    store: SharedLinkStoreInterface = Depends(get_shared_link_store)):
+    from uuid import uuid4
+    rec = FeedbackRecord(
+        feedback_id=uuid4().hex,
+        share_id=share_id,
+        context_type="chat",
+        reason=reason,
+        expected_response=expected_response,
+        actual_response=actual_response,
+        flock_definition=flock_definition,
+        agent_name=agent_name,
+    )
+    await store.save_feedback(rec)
+    toast_event = {
+        "showGlobalToast": {
+            "message": "Feedback received! Thanks",
+            "type": "success"
+        }
+    }
+    headers = {"HX-Trigger": json.dumps(toast_event)}
+    return Response(status_code=204, headers=headers)

flock/webapp/app/services/sharing_models.py

@@ -41,3 +41,41 @@ class SharedLinkConfig(BaseModel):
             ]
         }
     }
+
+# -----------------------------------------------------------
+# Feedback model (user ratings / corrections)
+# -----------------------------------------------------------
+
+
+class FeedbackRecord(BaseModel):
+    """A user-submitted piece of feedback for an agent run or chat turn."""
+
+    feedback_id: str = Field(..., description="Unique identifier for this feedback entry.")
+    share_id: str | None = Field(None, description="If the feedback refers to a shared link, its ID; otherwise None.")
+    context_type: str = Field(
+        default="agent_run",
+        description="Where the feedback originates (agent_run | chat | other)",
+    )
+    reason: str = Field(..., description="User-supplied reason / comment.")
+    expected_response: str | None = Field(
+        None,
+        description="Desired or corrected response in JSON or plain text.",
+    )
+    actual_response: str | None = Field(
+        None,
+        description="Original response shown to the user (optional, for context).",
+    )
+    created_at: datetime = Field(default_factory=datetime.utcnow)
+    # When share_id is None store explicit target identifiers
+    flock_name: str | None = Field(
+        None,
+        description="Name of the flock that produced the result when no share_id is used.",
+    )
+    agent_name: str | None = Field(
+        None,
+        description="Name of the agent or chat involved in the feedback.",
+    )
+    flock_definition: str | None = Field(
+        None,
+        description="Full YAML definition of the flock when feedback was submitted.",
+    )

flock/webapp/app/services/sharing_store.py

@@ -5,7 +5,10 @@ from pathlib import Path
 
 import aiosqlite
 
-from flock.webapp.app.services.sharing_models import SharedLinkConfig
+from flock.webapp.app.services.sharing_models import (
+    FeedbackRecord,
+    SharedLinkConfig,
+)
 
 # Get a logger instance
 logger = logging.getLogger(__name__)
@@ -33,6 +36,12 @@ class SharedLinkStoreInterface(ABC):
         """Deletes a shared link configuration by its ID. Returns True if deleted, False otherwise."""
         pass
 
+    # Feedback
+    @abstractmethod
+    async def save_feedback(self, record: FeedbackRecord):
+        """Persist a feedback record."""
+        pass
+
 class SQLiteSharedLinkStore(SharedLinkStoreInterface):
     """SQLite implementation for storing and retrieving shared link configurations."""
 
@@ -76,6 +85,25 @@ class SQLiteSharedLinkStore(SharedLinkStoreInterface):
                         else:
                             raise # Re-raise if it's a different operational error
 
+                # Feedback table
+                await db.execute(
+                    """
+                    CREATE TABLE IF NOT EXISTS feedback (
+                        feedback_id TEXT PRIMARY KEY,
+                        share_id TEXT,
+                        context_type TEXT NOT NULL,
+                        reason TEXT NOT NULL,
+                        expected_response TEXT,
+                        actual_response TEXT,
+                        flock_name TEXT,
+                        agent_name TEXT,
+                        flock_definition TEXT,
+                        created_at TEXT NOT NULL,
+                        FOREIGN KEY(share_id) REFERENCES shared_links(share_id)
+                    )
+                    """
+                )
+
                 await db.commit()
             logger.info(f"Database initialized and shared_links table schema ensured at {self.db_path}")
         except sqlite3.Error as e:
@@ -154,3 +182,34 @@ class SQLiteSharedLinkStore(SharedLinkStoreInterface):
         except sqlite3.Error as e:
             logger.error(f"SQLite error deleting config for ID {share_id}: {e}", exc_info=True)
             return False # Or raise
+
+    # ----------------------- Feedback methods -----------------------
+
+    async def save_feedback(self, record: FeedbackRecord) -> FeedbackRecord:
+        """Persist a feedback record to SQLite."""
+        try:
+            async with aiosqlite.connect(self.db_path) as db:
+                await db.execute(
+                    """INSERT INTO feedback (
+                        feedback_id, share_id, context_type, reason,
+                        expected_response, actual_response, flock_name, agent_name, flock_definition, created_at
+                    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+                    (
+                        record.feedback_id,
+                        record.share_id,
+                        record.context_type,
+                        record.reason,
+                        record.expected_response,
+                        record.actual_response,
+                        record.flock_name,
+                        record.agent_name,
+                        record.flock_definition,
+                        record.created_at.isoformat(),
+                    ),
+                )
+                await db.commit()
+            logger.info(f"Saved feedback {record.feedback_id} (share={record.share_id})")
+            return record
+        except sqlite3.Error as e:
+            logger.error(f"SQLite error saving feedback {record.feedback_id}: {e}", exc_info=True)
+            raise

flock/webapp/static/css/chat.css

@@ -39,6 +39,8 @@ body.chat-page {
     background-position: 0 0, 10px 10px;
 }
 
+
+
 .bubble { 
     position: relative;
     padding: 0.75rem 1rem; 

flock/webapp/templates/partials/_chat_messages.html

@@ -5,9 +5,55 @@
             <span class="chat-timestamp">{{ entry.timestamp|default(now().strftime('%H:%M')) }}</span>
         </div>
     {% else %}
-        <div class="bubble bot">
-            {{ entry.text | safe }}
-            <span class="chat-timestamp">{{ entry.timestamp|default(now().strftime('%H:%M')) }}{% if entry.agent %} - {{ entry.agent }}{% endif %}{% if entry.duration_ms is defined %} - {{ entry.duration_ms }}ms{% endif %}</span>
+        <div class="bubble bot" x-data="{showForm:false}">
+            <!-- Bubble content (visible when feedback form hidden) -->
+            <div x-show="!showForm">
+                <div>
+                    {{ entry.text | safe }}
+                    <span class="chat-timestamp">
+                        {{ entry.timestamp|default(now().strftime('%H:%M')) }}{% if entry.agent %} - {{ entry.agent }}{% endif %}{% if entry.duration_ms is defined %} - {{ entry.duration_ms }}ms - {% endif %}
+                        <!-- hidden meta form (used by thumbs links) -->
+                        <form class="feedback-meta" style="display:none">
+                            {% if share_id %}<input type="hidden" name="share_id" value="{{ share_id }}">{% endif %}
+                            <input type="hidden" name="flock_definition" value="{{ entry.flock_yaml | replace('"', '&quot;') }}">
+                            <input type="hidden" name="agent_name" value="{{ entry.agent }}">
+                            <input type="hidden" name="actual_response" value='{{ entry.raw_json | replace("'", "&#39;") }}'>
+                            <input type="hidden" name="reason" value="positive">
+                        </form>
+
+                        <a href="#" 
+                           hx-post="{% if share_id %}/chat/htmx/feedback-shared{% else %}/chat/htmx/feedback{% endif %}" 
+                           hx-include="closest .feedback-meta" 
+                           hx-target="closest .bubble" 
+                           hx-swap="innerHTML" 
+                           title="Looks good!" class="feedback-link">👍</a>
+                        - 
+                        <a href="#" @click.prevent="showForm=true" title="Submit detailed feedback" class="feedback-link">👎</a>
+                    </span>
+                </div>
+            </div>
+
+            <!-- Feedback form (initially hidden, toggled by 👎 link) -->
+            <div x-show="showForm" style="width:800px;">
+                <form
+                    hx-post="{% if share_id %}/chat/htmx/feedback-shared{% else %}/chat/htmx/feedback{% endif %}"
+                    hx-swap="outerHTML"
+                    x-on:htmx:afterRequest="showForm=false"
+                    style="display:block; width:800px;">
+                    {% if share_id %}<input type="hidden" name="share_id" value="{{ share_id }}">{% endif %}
+                    <input type="hidden" name="flock_definition" value='{{ entry.flock_yaml | tojson | safe }}'>
+                    <input type="hidden" name="agent_name" value='{{ entry.agent | tojson | safe }}'>
+                    <input type="hidden" name="actual_response" value='{{ entry.raw_json | tojson | safe }}'>
+                    <label>Reason</label>
+                    <textarea name="reason" required style="min-height:5rem;width:100%; white-space:pre-wrap;"></textarea>
+                    <label>Expected / Correct Response</label>
+                    <textarea name="expected_response" style="min-height:12rem;width:100%; white-space:pre-wrap;font-family:monospace;">{{ entry.raw_json }}</textarea>
+                    <div style="margin-top:0.4rem; display:flex; gap:0.5rem;">
+                        <button type="submit" class="secondary">Send</button>
+                        <button type="button" class="outline" @click="showForm=false">Back...</button>
+                    </div>
+                </form>
+            </div>
         </div>
     {% endif %}
-{% endfor %}
+{% endfor %}

flock/webapp/templates/partials/_results_display.html

@@ -6,6 +6,22 @@
         <div style="text-align: right;">
             <button role="button" class="outline contrast" @click="viewMode = 'structured'" :aria-pressed="viewMode === 'structured'">Structured</button>
             <button role="button" class="outline contrast" @click="viewMode = 'json'" :aria-pressed="viewMode === 'json'">Raw JSON</button>
+
+            <div style="display:inline-block;margin-left:0.5rem;">
+                <!-- Quick thumbs-up feedback (inline form so we have the identifiers) -->
+                <form hx-post="{{ feedback_endpoint }}" hx-target="#results-display-content" hx-swap="innerHTML" style="display:inline-block;vertical-align:middle;margin:0;" hx-indicator="#feedback-loading-indicator">
+                    {% if share_id %}<input type="hidden" name="share_id" value="{{ share_id }}">{% endif %}
+                    <input type="hidden" name="flock_name" value="{{ flock_name }}">
+                    <input type="hidden" name="agent_name" value="{{ agent_name }}">
+                    <input type="hidden" name="flock_definition" value='{{ flock_definition | replace("'", "&#39;") }}'>
+                    <input type="hidden" name="actual_response" value='{{ result_raw_json | replace("'", "&#39;") }}'>
+                    <input type="hidden" name="reason" value="positive">
+                    <button type="submit" role="button" class="outline contrast" title="Looks good!" style="padding:0.3rem 0.5rem;line-height:1;vertical-align:middle;margin:0;"><i class="fa fa-thumbs-up"></i></button>
+                </form>
+
+                <!-- Thumbs-down toggles detailed feedback form -->
+                <button role="button" class="outline contrast" @click="viewMode = 'feedback'" :aria-pressed="viewMode === 'feedback'" title="Something's wrong" style="padding:0.3rem 0.5rem;line-height:1;vertical-align:middle;margin:0;"><i class="fa fa-thumbs-down"></i></button>
+            </div>
         </div>
     </header>
 
@@ -36,4 +52,27 @@
             <p>No results to display yet.</p>
         {% endif %}
     </div>
+
+    <!-- ---------------- Feedback form ---------------- -->
+    <div x-show="viewMode === 'feedback'" style="margin-top: 1rem;">
+        <form hx-post="{{ feedback_endpoint }}" hx-target="#results-display-content" hx-swap="innerHTML" hx-indicator="#feedback-loading-indicator">
+            {# Hidden identifiers #}
+            {% if share_id %}
+                <input type="hidden" name="share_id" value="{{ share_id }}">
+            {% endif %}
+            <input type="hidden" name="flock_name" value="{{ flock_name }}">
+            <input type="hidden" name="agent_name" value="{{ agent_name }}">
+            <input type="hidden" name="flock_definition" value='{{ flock_definition | replace("'", "&#39;") }}'>
+            <input type="hidden" name="actual_response" value='{{ result_raw_json | replace("'", "&#39;") }}'>
+
+            <label for="feedback_reason">Reason / Comment</label>
+            <textarea id="feedback_reason" name="reason" placeholder="Why isn't the answer good?" required style="min-height:6rem;"></textarea>
+
+            <label for="expected_response" style="margin-top:0.5rem;">Correct / Expected Response (JSON or text)</label>
+            <textarea id="expected_response" name="expected_response" style="white-space: pre; font-family: monospace; min-height:10rem;">{{ result_raw_json }}</textarea>
+
+            <button type="submit" class="secondary" style="margin-top:0.5rem;">Send Feedback</button>
+            <span id="feedback-loading-indicator" class="htmx-indicator"><progress indeterminate></progress> Sending…</span>
+        </form>
+    </div>
 </article>

{flock_core-0.4.0b50.dist-info → flock_core-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b50
+Version: 0.4.2
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -21,7 +21,7 @@ Requires-Dist: litellm==1.69.3
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: markdown2>=2.5.3
 Requires-Dist: matplotlib>=3.10.0
-Requires-Dist: mem0ai[graph]>=0.1.100
+Requires-Dist: mem0ai[graph]>=0.1.101
 Requires-Dist: msgpack>=1.1.0
 Requires-Dist: notion-client>=2.3.0
 Requires-Dist: openai==1.75.0
@@ -50,6 +50,8 @@ Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: tqdm>=4.67.1
 Requires-Dist: uvicorn>=0.34.0
+Requires-Dist: wd-di>=0.2.14
+Requires-Dist: zep-python>=2.0.2
 Provides-Extra: all-tools
 Requires-Dist: azure-identity>=1.23.0; extra == 'all-tools'
 Requires-Dist: azure-search-documents>=11.5.2; extra == 'all-tools'
@@ -87,11 +89,7 @@ Description-Content-Type: text/markdown
 <a href="https://bsky.app/profile/whiteduck-gmbh.bsky.social" target="_blank"><img alt="Bluesky" src="https://img.shields.io/badge/bluesky-Follow-blue?style=for-the-badge&logo=bluesky&logoColor=%23fff&color=%23333&labelColor=%230285FF&label=whiteduck-gmbh"></a>
 </p>
 
-🐤 Flock 0.4.0 currently in beta - use `pip install flock-core==0.4.0b5` 🐤
 
-🐤 `pip install flock-core` will install the latest non-beta version 🐤
-
-🐤  Expected Release for 0.4.0 `Magpie`: End of April 2025 🐤
 
 ---
 
@@ -296,7 +294,7 @@ Flock makes this easy with:
 *   **Declarative Configuration:** Define Temporal timeouts, retry policies, and task queues directly within your `Flock` and `FlockAgent` configurations (YAML or Python).
 *   **Correct Patterns:** Uses Temporal's recommended granular activity execution for better control and visibility.
 *   **Clear Worker Separation:** Provides guidance and flags for running dedicated Temporal workers, separating development convenience from production best practices.
-  
+
 Visit the [Temporal Documentation](https://learn.temporal.io/python/workflows/) for more information on how to use Temporal.
 
 Or check out the [Flock Showcase](https://github.com/whiteducksoftware/flock-showcase) for a complete example of a Flock that uses Temporal or our [docs](https://whiteducksoftware.github.io/flock/guides/temporal-configuration/) for more information.