Merge pull request #25 from GilesStrong/feat/live_deck_feedback

Feat/live deck feedback

Author: GilesStrong

app/appai/migrations/0005_deckbuildtask_deck_size_deckbuildtask_n_replacements_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 6.0.3 on 2026-03-09 12:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('appai', '0004_alter_deckbuildtask_deck'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='deckbuildtask',
+            name='deck_size',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='deckbuildtask',
+            name='n_replacements',
+            field=models.IntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='deckbuildtask',
+            name='n_searches',
+            field=models.IntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='deckbuildtask',
+            name='n_total_replacements',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

app/appai/migrations/0006_deckbuildtask_prompt.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0.3 on 2026-03-09 12:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('appai', '0005_deckbuildtask_deck_size_deckbuildtask_n_replacements_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='deckbuildtask',
+            name='prompt',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

app/appai/models/deck_build.py

@@ -36,6 +36,14 @@ class DeckBuildTask(models.Model):
     result = models.JSONField(null=True, blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    prompt = models.TextField(null=True, blank=True)
+    deck_size = models.IntegerField(
+        null=True,
+        blank=True,
+    )
+    n_searches = models.IntegerField(default=0, blank=True, null=True)
+    n_replacements = models.IntegerField(default=0, blank=True, null=True)
+    n_total_replacements = models.IntegerField(null=True, blank=True)
 
     if TYPE_CHECKING:
         deck_id: UUID

app/appai/modules/construct_deck.py

@@ -16,10 +16,12 @@
 from uuid import UUID
 
 import logfire
-from appcards.models.deck import Deck
+from appcards.models.deck import Deck, DeckCard
 from appcore.modules.beartype import beartype
+from django.db.models import Sum
 from pydantic import BaseModel, Field
 
+from appai.models.deck_build import DeckBuildTask
 from appai.services.graphs.deck_construction import construct_deck as construct_deck_graph
 
 
@@ -77,6 +79,12 @@ async def construct_deck(
         deck = await Deck.objects.acreate(name="New Deck", user_id=user_id)
         logfire.info(f"Constructing new deck, with ID: {deck.id}")
 
+    total_cards = await DeckCard.objects.filter(deck=deck).aaggregate(Sum('quantity'))
+    total_cards = total_cards['quantity__sum'] or 0
+    await DeckBuildTask.objects.filter(id=build_task_id).aupdate(
+        deck_size=total_cards, n_searches=0, n_replacements=None, n_total_replacements=None
+    )
+
     # Run deck build
     generation_history = deck.generation_history if deck.generation_history else []
     if len(generation_history) > 5:

app/appai/routes/build_deck.py

@@ -146,7 +146,7 @@ def build_deck(request: HttpRequest, payload: BuildDeckPostIn) -> BuildDeckPostO
         deck_id = payload.deck_id
 
     # Enqueue the task to build the deck
-    build = DeckBuildTask.objects.create(deck_id=deck_id, status=DeckBuildStatus.PENDING)
+    build = DeckBuildTask.objects.create(deck_id=deck_id, status=DeckBuildStatus.PENDING, prompt=payload.prompt)
 
     task: AsyncResult = cast(Any, construct_deck.apply_async)(
         kwargs={
@@ -181,6 +181,13 @@ def check_deck_build_status(request: HttpRequest, path_params: Path[BuildDeckSta
     Check the status of a deck building task using the task ID.
 
     You can use the task ID received when you initiated the deck building process to check if the task is still processing, has completed successfully, or has failed. The response will include the current status of the task and the associated deck ID.
+
+    Args:
+        request (HttpRequest): The incoming HTTP request object, used to identify the user making the request.
+        path_params (Path[BuildDeckStatusIn]): The path parameters containing the task ID for which to check the status.
+
+    Returns:
+        BuildDeckStatusOut: An object containing the current status of the deck building task
     """
 
     try:
@@ -192,4 +199,12 @@ def check_deck_build_status(request: HttpRequest, path_params: Path[BuildDeckSta
     except DeckBuildTask.DoesNotExist:
         raise HttpError(404, 'Deck build task not found')
 
-    return BuildDeckStatusOut(status=build.status, deck_id=deck_id)
+    return BuildDeckStatusOut(
+        status=build.status,
+        deck_id=deck_id,
+        prompt=build.prompt,
+        n_cards_so_far=build.deck_size,
+        n_searches_so_far=build.n_searches,
+        n_replacements_so_far=build.n_replacements,
+        n_replacements_total=build.n_total_replacements,
+    )

app/appai/serializers/build_deck.py

@@ -93,6 +93,11 @@ class BuildDeckStatusIn(Schema):
 class BuildDeckStatusOut(Schema):
     status: str
     deck_id: UUID
+    prompt: str | None
+    n_cards_so_far: int | None
+    n_searches_so_far: int | None
+    n_replacements_so_far: int | None
+    n_replacements_total: int | None
 
     @field_validator('deck_id', mode='after')
     @classmethod

app/appai/services/agents/deck_constructor.py

@@ -166,14 +166,19 @@ def validate_tags(cls, value: list[str]) -> list[str]:
 @beartype
 @retry(stop=stop_after_attempt(APP_SETTINGS.DECK_BUILD_RETRY_LIMIT), wait=wait_exponential(multiplier=1, min=2, max=10))
 async def run_deck_constructor_agent(
-    deck_id: UUID, deck_description: str, generation_history: list[str], available_set_codes: Optional[set[str]] = None
+    deck_id: UUID,
+    build_task_id: UUID,
+    deck_description: str,
+    generation_history: list[str],
+    available_set_codes: Optional[set[str]] = None,
 ) -> DeckConstructionOutput:
     """
     Constructs a deck based on a natural language description.
     This function uses an agent to interpret the description and perform the necessary operations to build the deck.
 
     Args:
         deck_id (UUID): The ID of the deck to construct.
+        build_task_id (UUID): The ID of the deck build task associated with this deck construction, used for tracking and updating the status of the build task.
         deck_description (str): A natural language description of the desired deck, including its strategy, key cards, and any specific requirements or constraints.
         generation_history (list[str]): A list of previous generation requests for the deck, used to inform the construction process.
         available_set_codes (Optional[set[str]]): An optional set of available set codes to restrict the card selection to specific sets. If not provided, it will default to the current standard set codes.
@@ -201,7 +206,7 @@ async def run_deck_constructor_agent(
         deck_id=deck_id,
         deck_description=deck_description,
         available_set_codes=available_set_codes if available_set_codes is not None else CURRENT_STANDARD_SET_CODES,
-        build_task_id=None,
+        build_task_id=build_task_id,
     )
 
     deck = await Deck.objects.aget(id=deck_id)

app/appai/services/agents/deps.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Optional
 from uuid import UUID
 
 from appcards.constants.cards import CURRENT_STANDARD_SET_CODES
@@ -26,6 +25,4 @@ class DeckBuildingDeps(BaseModel):
         description="The set codes that the deck is allowed to include cards from",
     )
     deck_description: str = Field(..., description="A natural language description of the desired deck")
-    build_task_id: Optional[UUID] = Field(
-        ..., description="The ID of the deck build task associated with this deck construction"
-    )
+    build_task_id: UUID = Field(..., description="The ID of the deck build task associated with this deck construction")

app/appai/services/agents/tools/deck_tools.py

@@ -21,6 +21,7 @@
 from django.db.models import Sum
 from pydantic_ai import RunContext
 
+from appai.models.deck_build import DeckBuildTask
 from appai.services.agents.deps import DeckBuildingDeps
 
 
@@ -62,6 +63,7 @@ async def add_card_to_deck(ctx: RunContext[DeckBuildingDeps], card_id: UUID, num
     total_cards = await DeckCard.objects.filter(deck=deck).aaggregate(Sum('quantity'))
     total_cards = total_cards['quantity__sum'] or 0
     message = f"Added {number_to_add}x '{card.name}' to deck '{deck.name}'. Deck now has {total_cards} total cards ({deck_card.quantity}x {card.name})."
+    await DeckBuildTask.objects.filter(id=ctx.deps.build_task_id).aupdate(deck_size=total_cards)
     return message
 
 
@@ -108,13 +110,15 @@ async def remove_card_from_deck(ctx: RunContext[DeckBuildingDeps], card_id: UUID
         message = (
             f"Removed all copies of '{card.name}' from deck '{deck.name}'. Deck now has {total_cards} total cards."
         )
-        return message
     else:
         await deck_card.asave()
         total_cards = await DeckCard.objects.filter(deck=deck).aaggregate(Sum('quantity'))
         total_cards = total_cards['quantity__sum'] or 0
         message = f"Removed {number_to_remove}x '{card.name}' from deck '{deck.name}'. Deck now has {total_cards} total cards ({deck_card.quantity}x {card.name} remaining)."
-        return message
+
+    await DeckBuildTask.objects.filter(id=ctx.deps.build_task_id).aupdate(deck_size=total_cards)
+
+    return message
 
 
 @beartype
@@ -133,6 +137,8 @@ async def clear_deck(ctx: RunContext[DeckBuildingDeps]) -> str:
 
     await DeckCard.objects.filter(deck=deck).adelete()
     message = f"All cards removed from deck '{deck.name}'."
+
+    await DeckBuildTask.objects.filter(id=ctx.deps.build_task_id).aupdate(deck_size=0)
     return message
 
 

app/appai/services/agents/tools/query_tools.py

@@ -23,9 +23,11 @@
 from appsearch.services.qdrant.search import run_query_from_dsl
 from appsearch.services.qdrant.search_dsl import Filter, MatchAnyCondition, Query
 from asgiref.sync import sync_to_async
+from django.db.models import F
 from pydantic import BaseModel, Field
 from pydantic_ai import RunContext
 
+from appai.models.deck_build import DeckBuildTask
 from appai.services.agents.deps import DeckBuildingDeps
 from appai.services.agents.filter_constructor import filter_constructor
 
@@ -132,6 +134,8 @@ async def search_for_cards(
             card_infos.append(await sync_to_async(card_to_info)(card))
         except Card.DoesNotExist:
             continue
+
+    await DeckBuildTask.objects.filter(id=ctx.deps.build_task_id).aupdate(n_searches=F("n_searches") + 1)
     return CardSearchResults(cards=card_infos, max_results=max_results)