@weirdfingers/baseboards 0.5.3 → 0.6.1

package/templates/api/src/boards/graphql/access_control.py

@@ -129,7 +129,7 @@ def ensure_preloaded(obj, attr_name: str, error_msg: str | None = None) -> None:
     except Exception as e:
         if "was not loaded" in str(e) or "lazy loading" in str(e):
             msg = error_msg or (
-                f"Relationship '{attr_name}' was not preloaded. " "Use selectinload() in the query."
+                f"Relationship '{attr_name}' was not preloaded. Use selectinload() in the query."
             )
             raise RuntimeError(msg) from e
         # Re-raise other exceptions

package/templates/api/src/boards/graphql/mutations/root.py

@@ -7,7 +7,7 @@ from uuid import UUID
 import strawberry
 
 from ..types.board import Board, BoardRole
-from ..types.generation import ArtifactType, Generation
+from ..types.generation import ArtifactType, Generation, UploadArtifactInput
 
 
 # Input types for mutations
@@ -43,14 +43,17 @@ class AddBoardMemberInput:
 
 @strawberry.input
 class CreateGenerationInput:
-    """Input for creating a new generation."""
+    """Input for creating a new generation.
+
+    Note: Lineage is now captured automatically via artifact resolution.
+    Generator input parameters that reference other generations (as artifact types)
+    will be automatically resolved and lineage will be tracked.
+    """
 
     board_id: UUID
     generator_name: str
     artifact_type: ArtifactType
     input_params: strawberry.scalars.JSON  # type: ignore[reportInvalidTypeForm]
-    parent_generation_id: UUID | None = None
-    input_generation_ids: list[UUID] | None = None
 
 
 @strawberry.type
@@ -134,3 +137,12 @@ class Mutation:
         from ..resolvers.generation import regenerate
 
         return await regenerate(info, id)
+
+    @strawberry.mutation(name="uploadArtifact")
+    async def upload_artifact(
+        self, info: strawberry.Info, input: UploadArtifactInput
+    ) -> Generation:
+        """Upload an artifact from URL (synchronous)."""
+        from ..resolvers.upload import upload_artifact_from_url
+
+        return await upload_artifact_from_url(info, input)

package/templates/api/src/boards/graphql/resolvers/board.py

@@ -442,8 +442,6 @@ async def resolve_board_generations(
                 additional_files=gen.additional_files or [],
                 input_params=gen.input_params or {},
                 output_metadata=gen.output_metadata or {},
-                parent_generation_id=gen.parent_generation_id,
-                input_generation_ids=gen.input_generation_ids or [],
                 external_job_id=gen.external_job_id,
                 status=GenerationStatus(gen.status),
                 progress=float(gen.progress or 0.0),

package/templates/api/src/boards/graphql/resolvers/generation.py

@@ -81,8 +81,6 @@ async def resolve_generation_by_id(info: strawberry.Info, id: UUID) -> Generatio
             additional_files=gen.additional_files or [],
             input_params=gen.input_params or {},
             output_metadata=gen.output_metadata or {},
-            parent_generation_id=gen.parent_generation_id,
-            input_generation_ids=gen.input_generation_ids or [],
             external_job_id=gen.external_job_id,
             status=GenerationStatus(gen.status),
             progress=float(gen.progress or 0.0),
@@ -193,8 +191,6 @@ async def resolve_recent_generations(
                 additional_files=gen.additional_files or [],
                 input_params=gen.input_params or {},
                 output_metadata=gen.output_metadata or {},
-                parent_generation_id=gen.parent_generation_id,
-                input_generation_ids=gen.input_generation_ids or [],
                 external_job_id=gen.external_job_id,
                 status=GenerationStatusEnum(gen.status),
                 progress=float(gen.progress or 0.0),
@@ -275,187 +271,22 @@ async def resolve_generation_user(generation: Generation, info: strawberry.Info)
 async def resolve_generation_parent(
     generation: Generation, info: strawberry.Info
 ) -> Generation | None:
-    """Resolve the parent generation if any."""
-    if not generation.parent_generation_id:
-        return None
-
-    auth_context = await get_auth_context_from_info(info)
-
-    async with get_async_session() as session:
-        # Query parent generation
-        stmt = select(Generations).where(Generations.id == generation.parent_generation_id)
-        result = await session.execute(stmt)
-        parent = result.scalar_one_or_none()
-
-        if not parent:
-            logger.warning(
-                "Parent generation not found",
-                parent_id=str(generation.parent_generation_id),
-            )
-            return None
-
-        # Check access to parent's board
-        board_stmt = (
-            select(Boards)
-            .where(Boards.id == parent.board_id)
-            .options(selectinload(Boards.board_members))
-        )
-        board_result = await session.execute(board_stmt)
-        board = board_result.scalar_one_or_none()
-
-        if not board or not can_access_board(board, auth_context):
-            logger.info(
-                "Access denied to parent generation",
-                parent_id=str(generation.parent_generation_id),
-            )
-            return None
-
-        # Convert to GraphQL type
-        from ..types.generation import ArtifactType, GenerationStatus
-        from ..types.generation import Generation as GenerationType
-
-        return GenerationType(
-            id=parent.id,
-            tenant_id=parent.tenant_id,
-            board_id=parent.board_id,
-            user_id=parent.user_id,
-            generator_name=parent.generator_name,
-            artifact_type=ArtifactType(parent.artifact_type),
-            storage_url=parent.storage_url,
-            thumbnail_url=parent.thumbnail_url,
-            additional_files=parent.additional_files or [],
-            input_params=parent.input_params or {},
-            output_metadata=parent.output_metadata or {},
-            parent_generation_id=parent.parent_generation_id,
-            input_generation_ids=parent.input_generation_ids or [],
-            external_job_id=parent.external_job_id,
-            status=GenerationStatus(parent.status),
-            progress=float(parent.progress or 0.0),
-            error_message=parent.error_message,
-            started_at=parent.started_at,
-            completed_at=parent.completed_at,
-            created_at=parent.created_at,
-            updated_at=parent.updated_at,
-        )
+    """DEPRECATED: Use ancestry field instead. This resolver is no longer used."""
+    return None
 
 
 async def resolve_generation_inputs(
     generation: Generation, info: strawberry.Info
 ) -> list[Generation]:  # noqa: E501
-    """Resolve input generations used for this generation."""
-    if not generation.input_generation_ids:
-        return []
-
-    auth_context = await get_auth_context_from_info(info)
-
-    async with get_async_session() as session:
-        # Query input generations
-        stmt = select(Generations).where(Generations.id.in_(generation.input_generation_ids))
-        result = await session.execute(stmt)
-        inputs = result.scalars().all()
-
-        # Filter by board access
-        accessible_inputs = []
-        for input_gen in inputs:
-            board_stmt = (
-                select(Boards)
-                .where(Boards.id == input_gen.board_id)
-                .options(selectinload(Boards.board_members))
-            )
-            board_result = await session.execute(board_stmt)
-            board = board_result.scalar_one_or_none()
-
-            if board and can_access_board(board, auth_context):
-                accessible_inputs.append(input_gen)
-
-        # Convert to GraphQL types
-        from ..types.generation import ArtifactType, GenerationStatus
-        from ..types.generation import Generation as GenerationType
-
-        return [
-            GenerationType(
-                id=gen.id,
-                tenant_id=gen.tenant_id,
-                board_id=gen.board_id,
-                user_id=gen.user_id,
-                generator_name=gen.generator_name,
-                artifact_type=ArtifactType(gen.artifact_type),
-                storage_url=gen.storage_url,
-                thumbnail_url=gen.thumbnail_url,
-                additional_files=gen.additional_files or [],
-                input_params=gen.input_params or {},
-                output_metadata=gen.output_metadata or {},
-                parent_generation_id=gen.parent_generation_id,
-                input_generation_ids=gen.input_generation_ids or [],
-                external_job_id=gen.external_job_id,
-                status=GenerationStatus(gen.status),
-                progress=float(gen.progress or 0.0),
-                error_message=gen.error_message,
-                started_at=gen.started_at,
-                completed_at=gen.completed_at,
-                created_at=gen.created_at,
-                updated_at=gen.updated_at,
-            )
-            for gen in accessible_inputs
-        ]
+    """DEPRECATED: Use input_artifacts field instead. This resolver is no longer used."""
+    return []
 
 
 async def resolve_generation_children(
     generation: Generation, info: strawberry.Info
 ) -> list[Generation]:  # noqa: E501
-    """Resolve child generations derived from this one."""
-    auth_context = await get_auth_context_from_info(info)
-
-    async with get_async_session() as session:
-        # Query child generations
-        stmt = select(Generations).where(Generations.parent_generation_id == generation.id)
-        result = await session.execute(stmt)
-        children = result.scalars().all()
-
-        # Filter by board access
-        accessible_children = []
-        for child_gen in children:
-            board_stmt = (
-                select(Boards)
-                .where(Boards.id == child_gen.board_id)
-                .options(selectinload(Boards.board_members))
-            )
-            board_result = await session.execute(board_stmt)
-            board = board_result.scalar_one_or_none()
-
-            if board and can_access_board(board, auth_context):
-                accessible_children.append(child_gen)
-
-        # Convert to GraphQL types
-        from ..types.generation import ArtifactType, GenerationStatus
-        from ..types.generation import Generation as GenerationType
-
-        return [
-            GenerationType(
-                id=gen.id,
-                tenant_id=gen.tenant_id,
-                board_id=gen.board_id,
-                user_id=gen.user_id,
-                generator_name=gen.generator_name,
-                artifact_type=ArtifactType(gen.artifact_type),
-                storage_url=gen.storage_url,
-                thumbnail_url=gen.thumbnail_url,
-                additional_files=gen.additional_files or [],
-                input_params=gen.input_params or {},
-                output_metadata=gen.output_metadata or {},
-                parent_generation_id=gen.parent_generation_id,
-                input_generation_ids=gen.input_generation_ids or [],
-                external_job_id=gen.external_job_id,
-                status=GenerationStatus(gen.status),
-                progress=float(gen.progress or 0.0),
-                error_message=gen.error_message,
-                started_at=gen.started_at,
-                completed_at=gen.completed_at,
-                created_at=gen.created_at,
-                updated_at=gen.updated_at,
-            )
-            for gen in accessible_children
-        ]
+    """DEPRECATED: Use descendants field instead. This resolver is no longer used."""
+    return []
 
 
 # Mutation resolvers
@@ -499,50 +330,9 @@ async def create_generation(info: strawberry.Info, input: CreateGenerationInput)
         if generator is None:
             raise RuntimeError(f"Unknown generator: {input.generator_name}")
 
-        # Verify access to parent generation if provided
-        if input.parent_generation_id:
-            parent_stmt = select(Generations).where(Generations.id == input.parent_generation_id)
-            parent_result = await session.execute(parent_stmt)
-            parent_gen = parent_result.scalar_one_or_none()
-
-            if not parent_gen:
-                raise RuntimeError("Parent generation not found")
-
-            # Check access to parent's board
-            parent_board_stmt = (
-                select(Boards)
-                .where(Boards.id == parent_gen.board_id)
-                .options(selectinload(Boards.board_members))
-            )
-            parent_board_result = await session.execute(parent_board_stmt)
-            parent_board = parent_board_result.scalar_one_or_none()
-
-            if not parent_board or not can_access_board(parent_board, auth_context):
-                raise RuntimeError("Access denied to parent generation")
-
-        # Verify access to input generations if provided
-        if input.input_generation_ids:
-            for input_gen_id in input.input_generation_ids:
-                input_stmt = select(Generations).where(Generations.id == input_gen_id)
-                input_result = await session.execute(input_stmt)
-                input_gen = input_result.scalar_one_or_none()
-
-                if not input_gen:
-                    raise RuntimeError(f"Input generation {input_gen_id} not found")
-
-                # Check access to input's board
-                input_board_stmt = (
-                    select(Boards)
-                    .where(Boards.id == input_gen.board_id)
-                    .options(selectinload(Boards.board_members))
-                )
-                input_board_result = await session.execute(input_board_stmt)
-                input_board = input_board_result.scalar_one_or_none()
-
-                if not input_board or not can_access_board(input_board, auth_context):
-                    raise RuntimeError(f"Access denied to input generation {input_gen_id}")
-
         # Create generation record
+        # Note: Lineage will be captured automatically during generation processing
+        # via artifact resolution in the worker (see actors.py)
         gen = await jobs_repo.create_generation(
             session,
             tenant_id=auth_context.tenant_id,
@@ -553,12 +343,6 @@ async def create_generation(info: strawberry.Info, input: CreateGenerationInput)
             input_params=input.input_params,
         )
 
-        # Update parent and input relationships if provided
-        if input.parent_generation_id:
-            gen.parent_generation_id = input.parent_generation_id
-        if input.input_generation_ids:
-            gen.input_generation_ids = input.input_generation_ids
-
         await session.commit()
         await session.refresh(gen)
 
@@ -595,8 +379,6 @@ async def create_generation(info: strawberry.Info, input: CreateGenerationInput)
             additional_files=gen.additional_files or [],
             input_params=gen.input_params or {},
             output_metadata=gen.output_metadata or {},
-            parent_generation_id=gen.parent_generation_id,
-            input_generation_ids=gen.input_generation_ids or [],
             external_job_id=gen.external_job_id,
             status=GenerationStatus(gen.status),
             progress=float(gen.progress or 0.0),
@@ -695,8 +477,6 @@ async def cancel_generation(info: strawberry.Info, id: UUID) -> Generation:
             additional_files=gen.additional_files or [],
             input_params=gen.input_params or {},
             output_metadata=gen.output_metadata or {},
-            parent_generation_id=gen.parent_generation_id,
-            input_generation_ids=gen.input_generation_ids or [],
             external_job_id=gen.external_job_id,
             status=GenerationStatus(gen.status),
             progress=float(gen.progress or 0.0),
@@ -842,9 +622,8 @@ async def regenerate(info: strawberry.Info, id: UUID) -> Generation:
             input_params=original.input_params or {},
         )
 
-        # Set parent and copy input relationships
-        new_gen.parent_generation_id = original.id
-        new_gen.input_generation_ids = original.input_generation_ids or []
+        # Note: Lineage will be captured automatically during generation processing
+        # via artifact resolution in the worker (see actors.py)
 
         await session.commit()
         await session.refresh(new_gen)
@@ -876,8 +655,6 @@ async def regenerate(info: strawberry.Info, id: UUID) -> Generation:
             additional_files=new_gen.additional_files or [],
             input_params=new_gen.input_params or {},
             output_metadata=new_gen.output_metadata or {},
-            parent_generation_id=new_gen.parent_generation_id,
-            input_generation_ids=new_gen.input_generation_ids or [],
             external_job_id=new_gen.external_job_id,
             status=GenerationStatus(new_gen.status),
             progress=float(new_gen.progress or 0.0),