Merge pull request #3530 from Agenta-AI/release/v0.80.6

[release] v0.80.6

Author: mmabrouk

api/oss/databases/postgres/migrations/core/versions/a2b3c4d5e6f7_add_retention_helper_indexes.py

@@ -1,7 +1,7 @@
 """Add retention helper indexes on projects
 
 Revision ID: a2b3c4d5e6f7
-Revises: a2b3c4d5e6f7
+Revises: c3b2a1d4e5f6
 Create Date: 2025-01-06 12:00:00.000000
 
 """
@@ -13,7 +13,7 @@
 
 # revision identifiers, used by Alembic.
 revision: str = "a2b3c4d5e6f7"
-down_revision: Union[str, None] = "a2b3c4d5e6f7"
+down_revision: Union[str, None] = "c3b2a1d4e5f6"
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 

api/oss/src/core/auth/supertokens/overrides.py

@@ -55,8 +55,10 @@
 from oss.src.services.exceptions import UnauthorizedException
 from oss.src.services.db_manager import (
     get_user_with_email,
-    check_if_user_exists_and_create_organization,
     check_if_user_invitation_exists,
+    is_first_user_signup,
+    get_oss_organization,
+    setup_oss_organization_for_first_user,
 )
 
 log = get_module_logger(__name__)
@@ -236,28 +238,53 @@ async def _create_account(email: str, uid: str) -> bool:
         "email": email,
     }
 
-    # For OSS: compute organization before calling create_accounts
     # For EE: organization is created inside create_accounts
+    # For OSS: we need to handle first user specially to avoid FK violation
     if is_ee():
         await create_accounts(payload)
     else:
-        # OSS: Compute or get the single organization
-        organization_db = await check_if_user_exists_and_create_organization(
-            user_email=email
-        )
+        # OSS: Check if this is the first user signup
+        first_user = await is_first_user_signup()
+
+        if first_user:
+            # First user: Create user first, then organization
+            # This avoids the FK violation where org.owner_id references non-existent user
+            user_db = await create_accounts(payload)
+
+            # Now create organization with the real user ID
+            organization_db = await setup_oss_organization_for_first_user(
+                user_id=user_db.id,
+                user_email=email,
+            )
 
-        # Verify user can join (invitation check)
-        user_invitation_exists = await check_if_user_invitation_exists(
-            email=email,
-            organization_id=str(organization_db.id),
-        )
-        if not user_invitation_exists:
-            raise UnauthorizedException(
-                detail="You need to be invited by the organization owner to gain access."
+            # Assign user to organization
+            from oss.src.services.db_manager import _assign_user_to_organization_oss
+
+            await _assign_user_to_organization_oss(
+                user_db=user_db,
+                organization_id=str(organization_db.id),
+                email=email,
             )
+        else:
+            # Not first user: Get existing organization and check invitation
+            organization_db = await get_oss_organization()
+            if not organization_db:
+                raise UnauthorizedException(
+                    detail="No organization found. Please contact the administrator."
+                )
 
-        payload["organization_id"] = str(organization_db.id)
-        await create_accounts(payload)
+            # Verify user can join (invitation check)
+            user_invitation_exists = await check_if_user_invitation_exists(
+                email=email,
+                organization_id=str(organization_db.id),
+            )
+            if not user_invitation_exists:
+                raise UnauthorizedException(
+                    detail="You need to be invited by the organization owner to gain access."
+                )
+
+            payload["organization_id"] = str(organization_db.id)
+            await create_accounts(payload)
 
     if env.posthog.enabled and env.posthog.api_key:
         try:

api/oss/src/services/db_manager.py

@@ -1060,8 +1060,74 @@ async def get_user(user_uid: str) -> UserDB:
         return user
 
 
+async def is_first_user_signup() -> bool:
+    """Check if this is the first user signing up (no users exist yet)."""
+    async with engine.core_session() as session:
+        total_users = (
+            await session.scalar(select(func.count()).select_from(UserDB)) or 0
+        )
+        return total_users == 0
+
+
+async def get_oss_organization() -> Optional[OrganizationDB]:
+    """Get the single OSS organization if it exists."""
+    organizations_db = await get_organizations()
+    if organizations_db:
+        return organizations_db[0]
+    return None
+
+
+async def setup_oss_organization_for_first_user(
+    user_id: uuid.UUID,
+    user_email: str,
+) -> OrganizationDB:
+    """
+    Setup the OSS organization for the first user.
+
+    This should only be called after the user has been created.
+
+    Args:
+        user_id: The UUID of the newly created user
+        user_email: The email of the user (for analytics)
+
+    Returns:
+        OrganizationDB: The created organization
+    """
+    organization_db = await create_organization(
+        name="Organization",
+        owner_id=user_id,
+        created_by_id=user_id,
+    )
+    workspace_db = await create_workspace(
+        name="Default",
+        organization_id=str(organization_db.id),
+    )
+
+    # update default project with organization and workspace ids
+    await create_or_update_default_project(
+        values_to_update={
+            "organization_id": organization_db.id,
+            "workspace_id": workspace_db.id,
+            "project_name": "Default",
+        }
+    )
+
+    analytics_service.capture_oss_deployment_created(
+        user_email=user_email,
+        organization_id=str(organization_db.id),
+    )
+
+    return organization_db
+
+
 async def check_if_user_exists_and_create_organization(user_email: str):
-    """Check if a user with the given email exists and if not, create a new organization for them."""
+    """
+    Check if a user with the given email exists and if not, create a new organization for them.
+
+    DEPRECATED: This function has a bug where it creates an organization before the user exists,
+    causing FK violations. Use is_first_user_signup() + setup_oss_organization_for_first_user() instead.
+    Kept for backward compatibility but should not be called for new signups.
+    """
 
     async with engine.core_session() as session:
         user_query = await session.execute(select(UserDB).filter_by(email=user_email))

api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "api"
-version = "0.80.5"
+version = "0.80.6"
 description = "Agenta API"
 authors = [
     { name = "Mahmoud Mabrouk", email = "[email protected]" },

sdk/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.80.5"
+version = "0.80.6"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = [

services/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "services"
-version = "0.80.5"
+version = "0.80.6"
 description = "Agenta Services (Chat & Completion)"
 authors = [
     "Mahmoud Mabrouk <[email protected]>",

web/ee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@agenta/ee",
-    "version": "0.80.5",
+    "version": "0.80.6",
     "private": true,
     "engines": {
         "node": ">=18"

web/oss/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@agenta/oss",
-    "version": "0.80.5",
+    "version": "0.80.6",
     "private": true,
     "engines": {
         "node": ">=18"

web/oss/src/hooks/usePostAuthRedirect.ts

@@ -95,14 +95,22 @@ const usePostAuthRedirect = () => {
                 if (isInvitedUser) {
                     console.log("[post-auth] redirect invited new user -> /workspaces/accept")
                     await router.push("/workspaces/accept?survey=true")
-                } else {
+                } else if (isEE()) {
+                    // EE: Show post-signup survey/onboarding form
                     console.log("[post-auth] redirect new user -> /post-signup")
                     writePostSignupPending()
                     await resetAuthState()
                     setIsNewUser(true)
                     await router.push("/post-signup")
+                } else {
+                    // OSS: Skip post-signup, go directly to workspace
+                    console.log("[post-auth] OSS new user, skipping post-signup")
+                    setIsNewUser(true)
+                    // Fall through to normal workspace redirect logic below
+                }
+                if (isInvitedUser || isEE()) {
+                    return
                 }
-                return
             }
 
             if (isInvitedUser) {

web/oss/src/lib/helpers/analytics/hooks/usePostHogAg.ts

@@ -23,6 +23,16 @@ export const usePostHogAg = (): ExtendedPostHog | null => {
     const analyticsId = isDemo() && user?.email ? user.email : baseDistinctId
     const identifiedRef = useRef<string | null>(null)
     const aliasedRef = useRef(false)
+
+    const personProps = useMemo(() => {
+        if (!user?.email) return null
+
+        const props: Record<string, unknown> = {email: user.email}
+        if (user.username) {
+            props.username = user.username
+        }
+        return props
+    }, [user?.email, user?.username])
     const baseCapture = posthog?.capture?.bind(posthog)
     const baseIdentify = posthog?.identify?.bind(posthog)
     const capture: PostHog["capture"] = useCallback(
@@ -64,8 +74,12 @@ export const usePostHogAg = (): ExtendedPostHog | null => {
             aliasedRef.current = true
         }
         identifiedRef.current = analyticsId
-        identify(analyticsId)
-    }, [analyticsId, baseDistinctId, identify, posthog, user?.email])
+        if (personProps) {
+            identify(analyticsId, personProps)
+        } else {
+            identify(analyticsId)
+        }
+    }, [analyticsId, baseDistinctId, identify, personProps, posthog, user?.email])
 
     if (!posthog) return null
     return Object.assign(posthog, {identify, capture}) as ExtendedPostHog