agno 2.2.13__py3-none-any.whl → 2.4.3__py3-none-any.whl

agno/db/sqlite/utils.py

@@ -11,7 +11,7 @@ from agno.db.sqlite.schemas import get_table_schema_definition
 from agno.utils.log import log_debug, log_error, log_warning
 
 try:
-    from sqlalchemy import Table
+    from sqlalchemy import Table, func
     from sqlalchemy.dialects import sqlite
     from sqlalchemy.engine import Engine
     from sqlalchemy.inspection import inspect
@@ -26,13 +26,20 @@ except ImportError:
 
 def apply_sorting(stmt, table: Table, sort_by: Optional[str] = None, sort_order: Optional[str] = None):
     """Apply sorting to the given SQLAlchemy statement.
+
     Args:
         stmt: The SQLAlchemy statement to modify
         table: The table being queried
         sort_by: The field to sort by
         sort_order: The sort order ('asc' or 'desc')
+
     Returns:
         The modified statement with sorting applied
+
+    Note:
+        For 'updated_at' sorting, uses COALESCE(updated_at, created_at) to fall back
+        to created_at when updated_at is NULL. This ensures pre-2.0 records (which may
+        have NULL updated_at) are sorted correctly by their creation time.
     """
     if sort_by is None:
         return stmt
@@ -40,8 +47,13 @@ def apply_sorting(stmt, table: Table, sort_by: Optional[str] = None, sort_order:
         log_debug(f"Invalid sort field: '{sort_by}'. Will not apply any sorting.")
         return stmt
 
-    # Apply the given sorting
-    sort_column = getattr(table.c, sort_by)
+    # For updated_at, use COALESCE to fall back to created_at if updated_at is NULL
+    # This handles pre-2.0 records that may have NULL updated_at values
+    if sort_by == "updated_at" and hasattr(table.c, "created_at"):
+        sort_column = func.coalesce(table.c.updated_at, table.c.created_at)
+    else:
+        sort_column = getattr(table.c, sort_by)
+
     if sort_order and sort_order == "asc":
         return stmt.order_by(sort_column.asc())
     else:
@@ -87,15 +99,15 @@ async def ais_table_available(session: AsyncSession, table_name: str, db_schema:
         return False
 
 
-def is_valid_table(db_engine: Engine, table_name: str, table_type: str, db_schema: Optional[str] = None) -> bool:
+def is_valid_table(db_engine: Engine, table_name: str, table_type: str) -> bool:
     """
     Check if the existing table has the expected column names.
-    Note: db_schema parameter is ignored in SQLite but kept for API compatibility.
+
     Args:
         db_engine (Engine): Database engine
         table_name (str): Name of the table to validate
         table_type (str): Type of table to get expected schema
-        db_schema (Optional[str]): Database schema name (ignored in SQLite)
+
     Returns:
         bool: True if table has all expected columns, False otherwise
     """
@@ -120,17 +132,15 @@ def is_valid_table(db_engine: Engine, table_name: str, table_type: str, db_schem
         return False
 
 
-async def ais_valid_table(
-    db_engine: AsyncEngine, table_name: str, table_type: str, db_schema: Optional[str] = None
-) -> bool:
+async def ais_valid_table(db_engine: AsyncEngine, table_name: str, table_type: str) -> bool:
     """
     Check if the existing table has the expected column names.
-    Note: db_schema parameter is ignored in SQLite but kept for API compatibility.
+
     Args:
         db_engine (Engine): Database engine
         table_name (str): Name of the table to validate
         table_type (str): Type of table to get expected schema
-        db_schema (Optional[str]): Database schema name (ignored in SQLite)
+
     Returns:
         bool: True if table has all expected columns, False otherwise
     """

agno/db/surrealdb/models.py

@@ -23,7 +23,9 @@ TableType = Literal[
     "memories",
     "metrics",
     "sessions",
+    "spans",
     "teams",
+    "traces",
     "users",
     "workflows",
 ]
@@ -305,5 +307,28 @@ def get_schema(table_type: TableType, table_name: str) -> str:
             DEFINE FIELD OVERWRITE created_at ON {table_name} TYPE datetime VALUE time::now();
             DEFINE FIELD OVERWRITE updated_at ON {table_name} TYPE datetime VALUE time::now();
             """)
+    elif table_type == "traces":
+        return dedent(f"""
+            {define_table}
+            DEFINE FIELD OVERWRITE created_at ON {table_name} TYPE datetime VALUE time::now();
+            DEFINE INDEX idx_trace_id ON {table_name} FIELDS trace_id UNIQUE;
+            DEFINE INDEX idx_run_id ON {table_name} FIELDS run_id;
+            DEFINE INDEX idx_session_id ON {table_name} FIELDS session_id;
+            DEFINE INDEX idx_user_id ON {table_name} FIELDS user_id;
+            DEFINE INDEX idx_agent_id ON {table_name} FIELDS agent_id;
+            DEFINE INDEX idx_team_id ON {table_name} FIELDS team_id;
+            DEFINE INDEX idx_workflow_id ON {table_name} FIELDS workflow_id;
+            DEFINE INDEX idx_status ON {table_name} FIELDS status;
+            DEFINE INDEX idx_start_time ON {table_name} FIELDS start_time;
+            """)
+    elif table_type == "spans":
+        return dedent(f"""
+            {define_table}
+            DEFINE FIELD OVERWRITE created_at ON {table_name} TYPE datetime VALUE time::now();
+            DEFINE INDEX idx_span_id ON {table_name} FIELDS span_id UNIQUE;
+            DEFINE INDEX idx_trace_id ON {table_name} FIELDS trace_id;
+            DEFINE INDEX idx_parent_span_id ON {table_name} FIELDS parent_span_id;
+            DEFINE INDEX idx_start_time ON {table_name} FIELDS start_time;
+            """)
     else:
         return define_table