Merge pull request #832 from airweave-ai/hot_fix/team-members-and-merge-heads

hotfix: team members and merge heads

Author: marc-rutzou

backend/airweave/core/guard_rail_service.py

@@ -148,8 +148,7 @@ async def is_allowed(self, action_type: ActionType, amount: int = 1) -> bool:
         async with self._lock:
             # Bypass all checks for local development
             if settings.LOCAL_DEVELOPMENT:
-                pass
-                # return True
+                return True
 
             # Check if organization has billing - legacy orgs are exempt
             has_billing = await self._check_has_billing()

backend/airweave/crud/crud_usage.py

@@ -205,7 +205,8 @@ async def increment_usage(
                     "modified_at": updated_row.modified_at,
                 }
 
-                updated = Usage(
+                # Create SQLAlchemy model first (without team_members)
+                updated_model = Usage(
                     id=updated_values["id"],
                     organization_id=updated_values["organization_id"],
                     entities=updated_values["entities"],
@@ -214,9 +215,14 @@ async def increment_usage(
                     billing_period_id=updated_values["billing_period_id"],
                     created_at=updated_values["created_at"],
                     modified_at=updated_values["modified_at"],
-                    team_members=None,  # Not stored in database, populated separately
                 )
 
+                # Convert to Pydantic schema and add team_members
+                from airweave.schemas.usage import Usage as UsageSchema
+
+                updated = UsageSchema.model_validate(updated_model)
+                updated.team_members = None  # Not stored in database, populated separately
+
                 logger.info(
                     f"[increment_usage] Updated values: "
                     f"entities={updated.entities}, queries={updated.queries}, "

backend/alembic/versions/97b3317e4b70_merge_heads.py

@@ -0,0 +1,24 @@
+"""merge heads
+
+Revision ID: 97b3317e4b70
+Revises: remove_syncs_collections
+Create Date: 2025-09-23 20:31:56.545741
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '97b3317e4b70'
+down_revision = ('4ee815df1fed', 'remove_syncs_collections')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass