aline-ai 0.5.11__py3-none-any.whl → 0.5.13__py3-none-any.whl

realign/db/sqlite_db.py

@@ -22,6 +22,7 @@ from .base import (
     LockRecord,
     AgentRecord,
     AgentContextRecord,
+    UserRecord,
 )
 from .schema import (
     INIT_SCRIPTS,
@@ -303,7 +304,7 @@ class SQLiteDatabase(DatabaseInterface):
         if row:
             return self._row_to_session(row)
 
-        # Get user identity from config (V9)
+        # Get user identity from config
         from ..config import ReAlignConfig
 
         config = ReAlignConfig.load()
@@ -316,8 +317,8 @@ class SQLiteDatabase(DatabaseInterface):
             INSERT INTO sessions (
                 id, session_file_path, session_type, workspace_path,
                 started_at, last_activity_at, created_at, updated_at, metadata,
-                creator_name, creator_id
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                created_by
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
             (
                 session_id,
@@ -329,12 +330,18 @@ class SQLiteDatabase(DatabaseInterface):
                 now,
                 now,
                 metadata_json,
-                config.user_name,
-                config.user_id,
+                config.uid,
             ),
         )
         conn.commit()
 
+        # Upsert current user to users table
+        if config.uid:
+            try:
+                self.upsert_user(config.uid, config.user_name)
+            except Exception:
+                pass
+
         return SessionRecord(
             id=session_id,
             session_file_path=session_file_path,
@@ -345,8 +352,7 @@ class SQLiteDatabase(DatabaseInterface):
             updated_at=now,
             metadata=metadata or {},
             workspace_path=workspace_path,
-            creator_name=config.user_name,
-            creator_id=config.user_id,
+            created_by=config.uid,
         )
 
     def update_session_activity(self, session_id: str, last_activity_at: datetime) -> None:
@@ -659,15 +665,15 @@ class SQLiteDatabase(DatabaseInterface):
                     # Older schema without temp_title column.
                     pass
 
-            # Insert turn record (V9: includes creator fields)
+            # Insert turn record (V18: no user identity fields)
             conn.execute(
                 """
                 INSERT OR REPLACE INTO turns (
                     id, session_id, turn_number, user_message, assistant_summary,
                     turn_status, llm_title, temp_title, llm_description, model_name,
                     if_last_task, satisfaction, content_hash, timestamp,
-                    created_at, git_commit_hash, creator_name, creator_id
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    created_at, git_commit_hash
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """,
                 (
                     turn.id,
@@ -686,8 +692,6 @@ class SQLiteDatabase(DatabaseInterface):
                     turn.timestamp,
                     turn.created_at,
                     turn.git_commit_hash,
-                    turn.creator_name,
-                    turn.creator_id,
                 ),
             )
 
@@ -1495,13 +1499,13 @@ class SQLiteDatabase(DatabaseInterface):
         conn = self._get_connection()
         try:
             for event in events:
-                # Upsert Event (V9: includes creator fields)
+                # Upsert Event (V18: created_by/shared_by)
                 conn.execute(
                     """
                     INSERT INTO events (
                         id, title, description, event_type, status,
                         start_timestamp, end_timestamp, created_at, updated_at, metadata,
-                        creator_name, creator_id
+                        created_by, shared_by
                     ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                     ON CONFLICT(id) DO UPDATE SET
                         title=excluded.title,
@@ -1512,8 +1516,8 @@ class SQLiteDatabase(DatabaseInterface):
                         end_timestamp=excluded.end_timestamp,
                         updated_at=excluded.updated_at,
                         metadata=excluded.metadata,
-                        creator_name=excluded.creator_name,
-                        creator_id=excluded.creator_id
+                        created_by=excluded.created_by,
+                        shared_by=excluded.shared_by
                     """,
                     (
                         event.id,
@@ -1526,8 +1530,8 @@ class SQLiteDatabase(DatabaseInterface):
                         event.created_at,
                         event.updated_at,
                         json.dumps(event.metadata),
-                        event.creator_name,
-                        event.creator_id,
+                        event.created_by,
+                        event.shared_by,
                     ),
                 )
 
@@ -2063,11 +2067,11 @@ class SQLiteDatabase(DatabaseInterface):
             from ..config import ReAlignConfig
 
             config = ReAlignConfig.load()
-            creator_name = config.user_name
-            creator_id = config.user_id
+            created_by = config.uid
+            user_name_for_upsert = config.user_name
         except Exception:
-            creator_name = None
-            creator_id = None
+            created_by = None
+            user_name_for_upsert = None
 
         now = datetime.now()
         cursor.execute(
@@ -2075,8 +2079,8 @@ class SQLiteDatabase(DatabaseInterface):
             INSERT INTO agents (
                 id, provider, session_type, session_id, context_id,
                 transcript_path, cwd, project_dir, status, attention, source,
-                created_at, updated_at, creator_name, creator_id
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                created_at, updated_at, created_by
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
             (
                 agent_id,
@@ -2092,12 +2096,18 @@ class SQLiteDatabase(DatabaseInterface):
                 source,
                 now,
                 now,
-                creator_name,
-                creator_id,
+                created_by,
             ),
         )
         conn.commit()
 
+        # Upsert current user to users table
+        if created_by:
+            try:
+                self.upsert_user(created_by, user_name_for_upsert)
+            except Exception:
+                pass
+
         return AgentRecord(
             id=agent_id,
             provider=provider,
@@ -2112,8 +2122,7 @@ class SQLiteDatabase(DatabaseInterface):
             source=source,
             created_at=now,
             updated_at=now,
-            creator_name=creator_name,
-            creator_id=creator_id,
+            created_by=created_by,
         )
 
     def update_agent(
@@ -2642,12 +2651,15 @@ class SQLiteDatabase(DatabaseInterface):
         except (IndexError, KeyError):
             pass
 
-        # V9: creator fields
-        creator_name = None
-        creator_id = None
+        # V18: user identity fields
+        created_by = None
+        shared_by = None
+        try:
+            created_by = row["created_by"]
+        except (IndexError, KeyError):
+            pass
         try:
-            creator_name = row["creator_name"]
-            creator_id = row["creator_id"]
+            shared_by = row["shared_by"]
         except (IndexError, KeyError):
             pass
 
@@ -2681,21 +2693,13 @@ class SQLiteDatabase(DatabaseInterface):
             summary_status=summary_status,
             summary_locked_until=summary_locked_until,
             summary_error=summary_error,
-            creator_name=creator_name,
-            creator_id=creator_id,
+            created_by=created_by,
+            shared_by=shared_by,
             total_turns=total_turns,
             total_turns_mtime=total_turns_mtime,
         )
 
     def _row_to_turn(self, row: sqlite3.Row) -> TurnRecord:
-        # V9: creator fields (optional for backward compatibility)
-        creator_name = None
-        creator_id = None
-        try:
-            creator_name = row["creator_name"]
-            creator_id = row["creator_id"]
-        except (IndexError, KeyError):
-            pass
         temp_title = None
         try:
             temp_title = row["temp_title"]
@@ -2718,8 +2722,6 @@ class SQLiteDatabase(DatabaseInterface):
             timestamp=self._parse_datetime(row["timestamp"]),
             created_at=self._parse_datetime(row["created_at"]),
             git_commit_hash=row["git_commit_hash"],
-            creator_name=creator_name,
-            creator_id=creator_id,
             temp_title=temp_title,
         )
 
@@ -2793,12 +2795,15 @@ class SQLiteDatabase(DatabaseInterface):
             share_admin_token = None
             share_expiry_at = None
 
-        # V9: creator fields
-        creator_name = None
-        creator_id = None
+        # V18: user identity fields
+        created_by = None
+        shared_by = None
+        try:
+            created_by = row["created_by"]
+        except KeyError:
+            pass
         try:
-            creator_name = row["creator_name"]
-            creator_id = row["creator_id"]
+            shared_by = row["shared_by"]
         except KeyError:
             pass
 
@@ -2820,17 +2825,16 @@ class SQLiteDatabase(DatabaseInterface):
             share_id=share_id,
             share_admin_token=share_admin_token,
             share_expiry_at=share_expiry_at,
-            creator_name=creator_name,
-            creator_id=creator_id,
+            created_by=created_by,
+            shared_by=shared_by,
         )
 
     def _row_to_agent(self, row: sqlite3.Row) -> AgentRecord:
         """Convert a database row to an AgentRecord."""
-        creator_name = None
-        creator_id = None
+        # V18: user identity field
+        created_by = None
         try:
-            creator_name = row["creator_name"]
-            creator_id = row["creator_id"]
+            created_by = row["created_by"]
         except (IndexError, KeyError):
             pass
 
@@ -2848,8 +2852,7 @@ class SQLiteDatabase(DatabaseInterface):
             source=row["source"],
             created_at=self._parse_datetime(row["created_at"]),
             updated_at=self._parse_datetime(row["updated_at"]),
-            creator_name=creator_name,
-            creator_id=creator_id,
+            created_by=created_by,
         )
 
     def _row_to_agent_context(self, row: sqlite3.Row) -> AgentContextRecord:
@@ -2872,3 +2875,50 @@ class SQLiteDatabase(DatabaseInterface):
             session_ids=None,  # Populated separately
             event_ids=None,  # Populated separately
         )
+
+    # -------------------------------------------------------------------------
+    # Users table methods (Schema V18)
+    # -------------------------------------------------------------------------
+
+    def upsert_user(self, uid: str, user_name: Optional[str] = None) -> None:
+        """Insert or update a user in the users table."""
+        if not uid:
+            return
+        conn = self._get_connection()
+        try:
+            conn.execute(
+                """
+                INSERT INTO users (uid, user_name, created_at, updated_at)
+                VALUES (?, ?, datetime('now'), datetime('now'))
+                ON CONFLICT(uid) DO UPDATE SET
+                    user_name = COALESCE(excluded.user_name, users.user_name),
+                    updated_at = datetime('now')
+                """,
+                (uid, user_name),
+            )
+            conn.commit()
+        except sqlite3.OperationalError:
+            # Older schema without users table
+            try:
+                conn.rollback()
+            except Exception:
+                pass
+
+    def get_user(self, uid: str) -> Optional[UserRecord]:
+        """Get a user by UID from the users table."""
+        if not uid:
+            return None
+        conn = self._get_connection()
+        try:
+            cursor = conn.execute("SELECT * FROM users WHERE uid = ?", (uid,))
+            row = cursor.fetchone()
+            if row:
+                return UserRecord(
+                    uid=row["uid"],
+                    user_name=row["user_name"],
+                    created_at=self._parse_datetime(row["created_at"]),
+                    updated_at=self._parse_datetime(row["updated_at"]),
+                )
+        except sqlite3.OperationalError:
+            pass
+        return None

realign/watcher_core.py

@@ -1509,8 +1509,6 @@ class DialogueWatcher:
                 timestamp=processing_created_at,
                 created_at=processing_created_at,
                 git_commit_hash=None,
-                creator_name=config.user_name,
-                creator_id=config.user_id,
             )
             try:
                 db.create_turn(processing_turn, content="")
@@ -1593,9 +1591,7 @@ class DialogueWatcher:
                     content_hash=turn_hash,
                     timestamp=datetime.now(),
                     created_at=datetime.now(),
-                    git_commit_hash=None,  # No git integration
-                    creator_name=config.user_name,
-                    creator_id=config.user_id,
+                    git_commit_hash=None,
                 )
                 db.create_turn(
                     new_turn,
@@ -1628,8 +1624,6 @@ class DialogueWatcher:
                         timestamp=datetime.now(),
                         created_at=processing_created_at,
                         git_commit_hash=None,
-                        creator_name=config.user_name,
-                        creator_id=config.user_id,
                     )
                     try:
                         db.create_turn(
@@ -1882,8 +1876,6 @@ class DialogueWatcher:
                 timestamp=now,
                 created_at=now,
                 git_commit_hash=None,
-                creator_name=config.user_name,
-                creator_id=config.user_id,
             )
             db.create_turn(temp_turn, content=turn_content or "", skip_session_summary=True)
         except Exception as e: