gaard-api 0.2.3__tar.gz → 0.2.5__tar.gz

{gaard_api-0.2.3/src/gaard_api.egg-info → gaard_api-0.2.5}/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 2.4
 Name: gaard-api
-Version: 0.2.3
+Version: 0.2.5
 Summary: GAARD backend web services providing admin interface
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: gaard-core==0.2.2
-Requires-Dist: gaard-connectors==0.2.2
-Requires-Dist: gaard-llm==0.2.2
-Requires-Dist: gaard-plugin-api<0.3.0,>=0.2.2
+Requires-Dist: gaard-core==0.2.4
+Requires-Dist: gaard-connectors==0.2.4
+Requires-Dist: gaard-llm==0.2.4
+Requires-Dist: gaard-plugin-api<0.3.0,>=0.2.4
 Requires-Dist: fastapi>=0.111.0
 Requires-Dist: uvicorn[standard]>=0.30.0
 Requires-Dist: pydantic>=2.7.0
+Requires-Dist: python-multipart>=0.0.9
 Requires-Dist: sqlalchemy>=2.0.0
 Requires-Dist: httpx2>=2.5.0
 Requires-Dist: certifi>=2024.8.30

{gaard_api-0.2.3 → gaard_api-0.2.5}/pyproject.toml

@@ -4,19 +4,20 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gaard-api"
-version = "0.2.3"
+version = "0.2.5"
 description = "GAARD backend web services providing admin interface"
 readme = "README.md"
 requires-python = ">=3.11"
 
 dependencies = [
-    "gaard-core==0.2.2",
-    "gaard-connectors==0.2.2",
-    "gaard-llm==0.2.2",
-    "gaard-plugin-api>=0.2.2,<0.3.0",
+    "gaard-core==0.2.4",
+    "gaard-connectors==0.2.4",
+    "gaard-llm==0.2.4",
+    "gaard-plugin-api>=0.2.4,<0.3.0",
     "fastapi>=0.111.0",
     "uvicorn[standard]>=0.30.0",
     "pydantic>=2.7.0",
+    "python-multipart>=0.0.9",
     "sqlalchemy>=2.0.0",
     "httpx2>=2.5.0",
     "certifi>=2024.8.30"

{gaard_api-0.2.3 → gaard_api-0.2.5}/src/gaard_api/admin/database.py

@@ -10,6 +10,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from gaard_api.admin.defaults import DEFAULT_GOVERNANCE_POLICY_CONFIG, DEFAULT_PROMPTS
 from gaard_api.admin.models import (
     AdminSetting,
+    AdminSession,
     AdminUser,
     Base,
     DataQueryAuditLog,
@@ -73,6 +74,7 @@ def init_metadata_store() -> None:
     with _init_lock:
         engine = get_engine()
         Base.metadata.create_all(engine)
+        ensure_admin_session_schema(engine)
         ensure_data_query_audit_schema(engine)
         ensure_overview_widget_schema(engine)
 
@@ -339,8 +341,8 @@ def seed_overview_widgets(session: Session) -> None:
             ),
             "sql": runtime_sql,
             "result_mode": "data",
-            "position": 100,
-            "grid_width": 4,
+            "position": 250,
+            "grid_width": 12,
             "active": False,
         },
         {
@@ -358,8 +360,8 @@ def seed_overview_widgets(session: Session) -> None:
                 "ORDER BY prompt_key"
             ),
             "result_mode": "data",
-            "position": 50,
-            "grid_width": 4,
+            "position": 130,
+            "grid_width": 12,
         },
     ]
 
@@ -430,6 +432,31 @@ def ensure_data_query_audit_schema(engine: Engine) -> None:
             index.create(bind=connection, checkfirst=True)
 
 
+def ensure_admin_session_schema(engine: Engine) -> None:
+    inspector = inspect(engine)
+
+    if "admin_sessions" not in inspector.get_table_names():
+        return
+
+    columns = {column["name"] for column in inspector.get_columns("admin_sessions")}
+
+    additions = {
+        "username": "ALTER TABLE admin_sessions ADD COLUMN username VARCHAR(255) DEFAULT ''",
+        "role": "ALTER TABLE admin_sessions ADD COLUMN role VARCHAR(50) DEFAULT 'admin'",
+        "auth_provider": (
+            "ALTER TABLE admin_sessions ADD COLUMN auth_provider VARCHAR(255) DEFAULT 'local'"
+        ),
+    }
+    with engine.begin() as connection:
+        for column_name, sql in additions.items():
+            if column_name not in columns:
+                connection.execute(text(sql))
+
+        session_table = cast(Table, AdminSession.__table__)
+        for index in session_table.indexes:
+            index.create(bind=connection, checkfirst=True)
+
+
 def backfill_data_query_audit_types(session: Session) -> None:
     logs = session.scalars(
         select(DataQueryAuditLog).where(

{gaard_api-0.2.3 → gaard_api-0.2.5}/src/gaard_api/admin/models.py

@@ -45,6 +45,9 @@ class AdminSession(Base):
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
     token_hash: Mapped[str] = mapped_column(String(128), unique=True, index=True)
     user_id: Mapped[int] = mapped_column(Integer, index=True)
+    username: Mapped[str] = mapped_column(String(255), index=True, default="")
+    role: Mapped[str] = mapped_column(String(50), index=True, default="admin")
+    auth_provider: Mapped[str] = mapped_column(String(255), index=True, default="local")
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
 
 
@@ -106,6 +109,116 @@ class DataQueryAuditLog(Base):
     metadata_json: Mapped[str] = mapped_column(Text, default="{}")
 
 
+class Conversation(Base):
+    __tablename__ = "conversations"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    conversation_id: Mapped[str] = mapped_column(String(64), unique=True, index=True)
+    owner_user_id: Mapped[str] = mapped_column(String(255), index=True)
+    owner_username: Mapped[str] = mapped_column(String(255), index=True, default="")
+    status: Mapped[str] = mapped_column(String(50), index=True, default="active")
+    datasource_id: Mapped[str] = mapped_column(String(255), index=True, default="")
+    datasource_ids_json: Mapped[str] = mapped_column(Text, default="[]")
+    title: Mapped[str] = mapped_column(String(255), default="")
+    summary_json: Mapped[str] = mapped_column(Text, default="{}")
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        default=utc_now,
+        onupdate=utc_now,
+    )
+
+
+class ConversationTurn(Base):
+    __tablename__ = "conversation_turns"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    turn_id: Mapped[str] = mapped_column(String(64), unique=True, index=True)
+    conversation_id: Mapped[str] = mapped_column(String(64), index=True)
+    mode: Mapped[str] = mapped_column(String(50), index=True, default="sql")
+    status: Mapped[str] = mapped_column(String(50), index=True, default="completed")
+    original_question: Mapped[str] = mapped_column(Text)
+    standalone_question: Mapped[str] = mapped_column(Text, default="")
+    answer: Mapped[str] = mapped_column(Text, default="")
+    sql: Mapped[str] = mapped_column(Text, default="")
+    metadata_json: Mapped[str] = mapped_column(Text, default="{}")
+    data_query_audit_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    analysis_session_id: Mapped[str] = mapped_column(String(64), index=True, default="")
+    context_decision: Mapped[str] = mapped_column(String(50), index=True, default="new_topic")
+    context_confidence: Mapped[float] = mapped_column(Float, default=0.0)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+
+
+class Dashboard(Base):
+    __tablename__ = "dashboards"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    dashboard_id: Mapped[str] = mapped_column(String(64), unique=True, index=True)
+    owner_user_id: Mapped[str] = mapped_column(String(255), index=True)
+    owner_username: Mapped[str] = mapped_column(String(255), index=True, default="")
+    name: Mapped[str] = mapped_column(String(255))
+    description: Mapped[str] = mapped_column(Text, default="")
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        default=utc_now,
+        onupdate=utc_now,
+    )
+
+
+class DashboardUserState(Base):
+    __tablename__ = "dashboard_user_states"
+
+    owner_user_id: Mapped[str] = mapped_column(String(255), primary_key=True)
+    owner_username: Mapped[str] = mapped_column(String(255), index=True, default="")
+    active_dashboard_id: Mapped[str] = mapped_column(String(64), index=True, default="")
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        default=utc_now,
+        onupdate=utc_now,
+    )
+
+
+class UserSavedMetric(Base):
+    __tablename__ = "user_saved_metrics"
+    __table_args__ = (
+        UniqueConstraint("owner_user_id", "widget_key", name="uq_user_saved_metrics_owner_widget"),
+    )
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    owner_user_id: Mapped[str] = mapped_column(String(255), index=True)
+    owner_username: Mapped[str] = mapped_column(String(255), index=True, default="")
+    widget_key: Mapped[str] = mapped_column(String(255), index=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+
+
+class DashboardWidget(Base):
+    __tablename__ = "dashboard_widgets"
+    __table_args__ = (
+        UniqueConstraint("widget_id", name="uq_dashboard_widgets_widget_id"),
+    )
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    widget_id: Mapped[str] = mapped_column(String(64), index=True)
+    dashboard_id: Mapped[str] = mapped_column(String(64), index=True)
+    owner_user_id: Mapped[str] = mapped_column(String(255), index=True)
+    owner_username: Mapped[str] = mapped_column(String(255), index=True, default="")
+    metric_widget_key: Mapped[str] = mapped_column(String(255), index=True)
+    title: Mapped[str] = mapped_column(String(255))
+    visualization_type: Mapped[str] = mapped_column(String(50), default="table")
+    x: Mapped[int] = mapped_column(Integer, default=0)
+    y: Mapped[int] = mapped_column(Integer, default=0)
+    w: Mapped[int] = mapped_column(Integer, default=6)
+    h: Mapped[int] = mapped_column(Integer, default=4)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        default=utc_now,
+        onupdate=utc_now,
+    )
+
+
 class PromptTemplate(Base):
     __tablename__ = "prompt_templates"
     __table_args__ = (UniqueConstraint("prompt_key", name="uq_prompt_templates_key"),)

{gaard_api-0.2.3 → gaard_api-0.2.5}/src/gaard_api/admin/services.py

@@ -33,6 +33,12 @@ from gaard_api.admin.models import (
 )
 from gaard_api.core.settings import settings
 from gaard_api.extensions import get_connector_registry
+from gaard_api.siem import (
+    build_admin_audit_event,
+    build_data_query_audit_event,
+    dispatch_siem_event,
+    queue_siem_event,
+)
 
 
 def json_dumps(value: Any) -> str:
@@ -289,6 +295,16 @@ def record_admin_audit(
             details_json=json_dumps(details or {}),
         )
     )
+    queue_siem_event(
+        session,
+        build_admin_audit_event(
+            actor=actor,
+            action=action,
+            resource_type=resource_type,
+            resource_id=resource_id,
+            details=details,
+        ),
+    )
 
 
 DATA_QUERY_AUDIT_INFO = DataQueryAuditType.INFO.value
@@ -499,6 +515,14 @@ def _record_data_query_audit(
         )
         session.add(log)
         session.commit()
+        dispatch_siem_event(
+            build_data_query_audit_event(
+                request.user_id,
+                request.datasource_id,
+                log,
+                audit_metadata,
+            )
+        )
         return log
     except SQLAlchemyError:
         session.rollback()