npm - flowent - Versions diffs - 0.1.3 → 0.1.5 - Mend

flowent 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

package/backend/src/flowent/static/index.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Flowent</title>
     <meta name="description" content="Flowent application" />
-    <script type="module" crossorigin src="/assets/index-DjF2KBwE.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-P-bBpJG8.css">
+    <script type="module" crossorigin src="/assets/index-dsDDsEym.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Cl20cARb.css">
   </head>
   <body>
     <div id="root"></div>

package/backend/src/flowent/storage.py CHANGED Viewed

@@ -1,10 +1,11 @@
 import json
 import sqlite3
 from pathlib import Path
+from typing import Annotated, Literal
 from pydantic import BaseModel, ConfigDict, Field
-from flowent.llm import ProviderFormat, ReasoningEffort
+from flowent.llm import ChatMessage, ProviderFormat, ReasoningEffort
 from flowent.paths import data_directory
@@ -89,6 +90,7 @@ class StoredProvider(BaseModel):
 class StoredSettings(BaseModel):
     model_config = ConfigDict(extra="forbid")
+    agent_prompt: str = Field(default="", exclude_if=lambda value: value == "")
     reasoning_effort: ReasoningEffort = ReasoningEffort.DEFAULT
     selected_model: str
     selected_provider_id: str
@@ -106,11 +108,64 @@ class StoredToolItem(BaseModel):
     data: dict[str, object] | None = None
+class StoredThinkingOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    content: str
+    id: str
+    type: Literal["thinking"]
+class StoredTextOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    content: str
+    id: str
+    type: Literal["text"]
+class StoredErrorOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    detail: str = Field(default="", exclude_if=lambda value: value == "")
+    id: str
+    message: str
+    title: str
+    type: Literal["error"]
+class StoredToolOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    id: str
+    tool: StoredToolItem
+    type: Literal["tool"]
+StoredOutputItem = Annotated[
+    StoredThinkingOutputItem
+    | StoredTextOutputItem
+    | StoredErrorOutputItem
+    | StoredToolOutputItem,
+    Field(discriminator="type"),
+]
+class StoredAssistantOutputGroup(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    id: str
+    items: list[StoredOutputItem]
 class StoredMessage(BaseModel):
     model_config = ConfigDict(extra="forbid")
     author: str
     content: str
+    groups: list[StoredAssistantOutputGroup] = Field(
+        default_factory=list, exclude_if=lambda value: value == []
+    )
     id: str
     status: str = Field(
         default="completed", exclude_if=lambda value: value == "completed"
@@ -119,6 +174,20 @@ class StoredMessage(BaseModel):
     tools: list[StoredToolItem] = Field(default_factory=list)
+class StoredCompactionCheckpoint(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    created_at: int = 0
+    id: str
+    method: str
+    replacement_history: list[ChatMessage]
+    source_message_id: str | None = None
+    summary: str
+    token_after: int = 0
+    token_before: int = 0
+    trigger: str
 class StoredState(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -172,7 +241,7 @@ class StateStore:
             ]
             settings_row = connection.execute(
                 """
-                SELECT selected_provider_id, selected_model, reasoning_effort
+                SELECT selected_provider_id, selected_model, reasoning_effort, agent_prompt
                 FROM settings
                 WHERE id = 1
                 """
@@ -181,6 +250,10 @@ class StateStore:
                 StoredMessage(
                     author=row["author"],
                     content=row["content"],
+                    groups=[
+                        StoredAssistantOutputGroup.model_validate(group)
+                        for group in json.loads(row["groups"] or "[]")
+                    ],
                     id=row["id"],
                     status=row["status"],
                     thinking=row["thinking"],
@@ -191,7 +264,7 @@ class StateStore:
                 )
                 for row in connection.execute(
                     """
-                    SELECT id, author, content, tools, thinking, status
+                    SELECT id, author, content, tools, thinking, groups, status
                     FROM messages
                     ORDER BY position, id
                     """
@@ -203,6 +276,7 @@ class StateStore:
             messages=messages,
             providers=providers,
             settings=StoredSettings(
+                agent_prompt=settings_row["agent_prompt"] if settings_row else "",
                 reasoning_effort=settings_row["reasoning_effort"]
                 if settings_row
                 else ReasoningEffort.DEFAULT,
@@ -503,19 +577,22 @@ class StateStore:
                     id,
                     selected_provider_id,
                     selected_model,
-                    reasoning_effort
+                    reasoning_effort,
+                    agent_prompt
                 )
-                VALUES (1, ?, ?, ?)
+                VALUES (1, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     selected_provider_id = excluded.selected_provider_id,
                     selected_model = excluded.selected_model,
                     reasoning_effort = excluded.reasoning_effort,
+                    agent_prompt = excluded.agent_prompt,
                     updated_at = unixepoch()
                 """,
                 (
                     settings.selected_provider_id,
                     settings.selected_model,
                     settings.reasoning_effort.value,
+                    settings.agent_prompt,
                 ),
             )
         return settings
@@ -525,8 +602,17 @@ class StateStore:
             connection.execute("DELETE FROM messages")
             connection.executemany(
                 """
-                INSERT INTO messages (id, author, content, tools, thinking, status, position)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO messages (
+                    id,
+                    author,
+                    content,
+                    tools,
+                    thinking,
+                    groups,
+                    status,
+                    position
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
                 """,
                 [
                     (
@@ -540,6 +626,13 @@ class StateStore:
                             ]
                         ),
                         message.thinking,
+                        json.dumps(
+                            [
+                                group.model_dump(exclude_none=True)
+                                for group in message.groups
+                            ],
+                            ensure_ascii=False,
+                        ),
                         message.status,
                         position,
                     )
@@ -564,13 +657,23 @@ class StateStore:
                 position = position_row["position"]
             connection.execute(
                 """
-                INSERT INTO messages (id, author, content, tools, thinking, status, position)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO messages (
+                    id,
+                    author,
+                    content,
+                    tools,
+                    thinking,
+                    groups,
+                    status,
+                    position
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     author = excluded.author,
                     content = excluded.content,
                     tools = excluded.tools,
                     thinking = excluded.thinking,
+                    groups = excluded.groups,
                     status = excluded.status,
                     position = excluded.position
                 """,
@@ -582,6 +685,13 @@ class StateStore:
                         [tool.model_dump(exclude_none=True) for tool in message.tools]
                     ),
                     message.thinking,
+                    json.dumps(
+                        [
+                            group.model_dump(exclude_none=True)
+                            for group in message.groups
+                        ],
+                        ensure_ascii=False,
+                    ),
                     message.status,
                     position,
                 ),
@@ -607,12 +717,120 @@ class StateStore:
                 VALUES (1, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     compacted_summary = excluded.compacted_summary,
+                    active_compaction_id = NULL,
                     updated_at = unixepoch()
                 """,
                 (summary,),
             )
         return summary
+    def read_active_compaction_checkpoint(
+        self,
+    ) -> StoredCompactionCheckpoint | None:
+        with self.connect() as connection:
+            row = connection.execute(
+                """
+                SELECT
+                    checkpoint.id,
+                    checkpoint.trigger,
+                    checkpoint.method,
+                    checkpoint.summary,
+                    checkpoint.replacement_history,
+                    checkpoint.source_message_id,
+                    checkpoint.token_before,
+                    checkpoint.token_after,
+                    checkpoint.created_at
+                FROM workspace_context context
+                JOIN compaction_checkpoints checkpoint
+                    ON checkpoint.id = context.active_compaction_id
+                WHERE context.id = 1
+                """
+            ).fetchone()
+        if row is None:
+            return None
+        return StoredCompactionCheckpoint(
+            created_at=row["created_at"],
+            id=row["id"],
+            method=row["method"],
+            replacement_history=[
+                ChatMessage.model_validate(message)
+                for message in json.loads(row["replacement_history"] or "[]")
+            ],
+            source_message_id=row["source_message_id"],
+            summary=row["summary"],
+            token_after=row["token_after"],
+            token_before=row["token_before"],
+            trigger=row["trigger"],
+        )
+    def save_compaction_checkpoint(
+        self, checkpoint: StoredCompactionCheckpoint
+    ) -> StoredCompactionCheckpoint:
+        with self.connect() as connection:
+            connection.execute(
+                """
+                INSERT INTO compaction_checkpoints (
+                    id,
+                    trigger,
+                    method,
+                    summary,
+                    replacement_history,
+                    source_message_id,
+                    token_before,
+                    token_after
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                ON CONFLICT(id) DO UPDATE SET
+                    trigger = excluded.trigger,
+                    method = excluded.method,
+                    summary = excluded.summary,
+                    replacement_history = excluded.replacement_history,
+                    source_message_id = excluded.source_message_id,
+                    token_before = excluded.token_before,
+                    token_after = excluded.token_after
+                """,
+                (
+                    checkpoint.id,
+                    checkpoint.trigger,
+                    checkpoint.method,
+                    checkpoint.summary,
+                    json.dumps(
+                        [
+                            message.model_dump()
+                            for message in checkpoint.replacement_history
+                        ],
+                        ensure_ascii=False,
+                    ),
+                    checkpoint.source_message_id,
+                    checkpoint.token_before,
+                    checkpoint.token_after,
+                ),
+            )
+            connection.execute(
+                """
+                INSERT INTO workspace_context (
+                    id,
+                    compacted_summary,
+                    active_compaction_id
+                )
+                VALUES (1, ?, ?)
+                ON CONFLICT(id) DO UPDATE SET
+                    compacted_summary = excluded.compacted_summary,
+                    active_compaction_id = excluded.active_compaction_id,
+                    updated_at = unixepoch()
+                """,
+                (checkpoint.summary, checkpoint.id),
+            )
+            row = connection.execute(
+                """
+                SELECT created_at
+                FROM compaction_checkpoints
+                WHERE id = ?
+                """,
+                (checkpoint.id,),
+            ).fetchone()
+        return checkpoint.model_copy(update={"created_at": row["created_at"]})
     def _provider_models(
         self, connection: sqlite3.Connection, provider_id: str
     ) -> list[str]:
@@ -793,6 +1011,7 @@ class StateStore:
                 selected_provider_id TEXT NOT NULL DEFAULT '',
                 selected_model TEXT NOT NULL DEFAULT '',
                 reasoning_effort TEXT NOT NULL DEFAULT 'default',
+                agent_prompt TEXT NOT NULL DEFAULT '',
                 updated_at INTEGER NOT NULL DEFAULT (unixepoch())
             );
@@ -807,9 +1026,22 @@ class StateStore:
             CREATE TABLE IF NOT EXISTS workspace_context (
                 id INTEGER PRIMARY KEY CHECK (id = 1),
                 compacted_summary TEXT NOT NULL DEFAULT '',
+                active_compaction_id TEXT,
                 updated_at INTEGER NOT NULL DEFAULT (unixepoch())
             );
+            CREATE TABLE IF NOT EXISTS compaction_checkpoints (
+                id TEXT PRIMARY KEY,
+                trigger TEXT NOT NULL,
+                method TEXT NOT NULL,
+                summary TEXT NOT NULL,
+                replacement_history TEXT NOT NULL DEFAULT '[]',
+                source_message_id TEXT,
+                token_before INTEGER NOT NULL DEFAULT 0,
+                token_after INTEGER NOT NULL DEFAULT 0,
+                created_at INTEGER NOT NULL DEFAULT (unixepoch())
+            );
             CREATE TABLE IF NOT EXISTS skill_settings (
                 id TEXT PRIMARY KEY,
                 enabled INTEGER NOT NULL DEFAULT 1,
@@ -853,6 +1085,10 @@ class StateStore:
             connection.execute(
                 "ALTER TABLE messages ADD COLUMN status TEXT NOT NULL DEFAULT 'completed'"
             )
+        if "groups" not in columns:
+            connection.execute(
+                "ALTER TABLE messages ADD COLUMN groups TEXT NOT NULL DEFAULT '[]'"
+            )
         settings_columns = {
             row["name"] for row in connection.execute("PRAGMA table_info(settings)")
         }
@@ -861,3 +1097,15 @@ class StateStore:
                 "ALTER TABLE settings "
                 "ADD COLUMN reasoning_effort TEXT NOT NULL DEFAULT 'default'"
             )
+        if "agent_prompt" not in settings_columns:
+            connection.execute(
+                "ALTER TABLE settings ADD COLUMN agent_prompt TEXT NOT NULL DEFAULT ''"
+            )
+        workspace_context_columns = {
+            row["name"]
+            for row in connection.execute("PRAGMA table_info(workspace_context)")
+        }
+        if "active_compaction_id" not in workspace_context_columns:
+            connection.execute(
+                "ALTER TABLE workspace_context ADD COLUMN active_compaction_id TEXT"
+            )