catalog enhancer; db update

Author: maplethorpej

app/api/hiker_profile.py

@@ -50,6 +50,10 @@ def get_profile(profile_id: int, user: User = Depends(authenticate)):
 @route.post("", status_code=201)
 def create_profile(payload: HikerProfileType, user: User = Depends(authenticate)):
     existing_count = db.session.query(HikerProfile).filter_by(user_id=user.id).count()
+
+    if not user.is_subscribed and existing_count >= 1:
+        raise HTTPException(403, "Upgrade to Full Access to create multiple hiker profiles.")
+
     is_default = True if existing_count == 0 else payload.is_default
 
     if is_default:

app/api/trip.py

@@ -130,7 +130,7 @@ def create(payload: TripType, user: User = Depends(authenticate)):
     except Exception:
         raise HTTPException(400, "Unable to create trip.")
 
-    if payload.location and payload.location.strip():
+    if payload.location and payload.location.strip() and user.is_subscribed:
         new_trip.enrich_status = "pending"
         db.session.commit()
         db.session.refresh(new_trip)
@@ -165,7 +165,7 @@ def update(payload: TripUpdate, user: User = Depends(authenticate)):
             (payload.start_date and payload.start_date != old_start_date) or
             (payload.end_date and payload.end_date != old_end_date)
         )
-        if trip.location and (location_changed or dates_changed):
+        if trip.location and (location_changed or dates_changed) and user.is_subscribed:
             trip.enrich_status = "pending"
 
         db.session.commit()

app/api/webhook.py

@@ -0,0 +1,65 @@
+import logging
+
+from fastapi import APIRouter, HTTPException, Request
+from fastapi_sqlalchemy import db
+
+from models.base import User
+from utils.consts import REVENUECAT_WEBHOOK_SECRET
+
+logger = logging.getLogger(__name__)
+
+route = APIRouter()
+
+SUBSCRIBE_EVENTS = {
+    "INITIAL_PURCHASE",
+    "RENEWAL",
+    "UNCANCELLATION",
+    "PRODUCT_CHANGE",
+    "NON_RENEWING_PURCHASE",
+}
+
+UNSUBSCRIBE_EVENTS = {
+    "EXPIRATION",
+    "BILLING_ISSUE",
+}
+
+
+@route.post("/revenuecat")
+async def revenuecat_webhook(request: Request):
+    if REVENUECAT_WEBHOOK_SECRET:
+        auth = request.headers.get("Authorization")
+        expected = f"Bearer {REVENUECAT_WEBHOOK_SECRET}"
+        if auth != expected:
+            raise HTTPException(401, "Unauthorized")
+
+    body = await request.json()
+    event = body.get("event", {})
+    event_type = event.get("type")
+    app_user_id = event.get("app_user_id")
+
+    if not event_type or not app_user_id:
+        return {"ok": True}
+
+    try:
+        user_id = int(app_user_id)
+    except (ValueError, TypeError):
+        logger.warning("RevenueCat webhook with non-integer app_user_id: %s", app_user_id)
+        return {"ok": True}
+
+    if event_type in SUBSCRIBE_EVENTS:
+        is_subscribed = True
+    elif event_type in UNSUBSCRIBE_EVENTS:
+        is_subscribed = False
+    else:
+        return {"ok": True}
+
+    user = db.session.query(User).filter_by(id=user_id).first()
+    if not user:
+        logger.warning("RevenueCat webhook for unknown user_id: %s", user_id)
+        return {"ok": True}
+
+    user.is_subscribed = is_subscribed
+    db.session.commit()
+
+    logger.info("RevenueCat %s: user %s is_subscribed=%s", event_type, user_id, is_subscribed)
+    return {"ok": True}

app/main.py

@@ -5,7 +5,7 @@
 from sqlalchemy import create_engine
 
 from utils.consts import DATABASE_URL, DEVELOPMENT, APP_HOST
-from api import user, resources, item, trip, category, pack, kit, hiker_profile
+from api import user, resources, item, trip, category, pack, kit, hiker_profile, webhook
 
 ENGINE_KWARGS = dict(
     pool_size=5,
@@ -103,6 +103,14 @@
 )
 
 
+app.include_router(
+    webhook.route,
+    prefix="/webhook",
+    tags=["webhook"],
+    responses={404: {"description": "Not found"}}
+)
+
+
 @app.get("/health-check")
 def health_check():
     return "Packstack API is available"

app/tasks/enrich_product.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 import re
@@ -117,31 +118,95 @@ def ai_complete(system: str, user: str, tools: list | None = None, max_retries:
     "Tools", "First Aid", "Safety", "Camera", "Climbing",
 ]
 
+SUBCATEGORIES = {
+    "Clothing": [
+        "Base Layers", "Mid Layers", "Insulation", "Rain Gear",
+        "Wind Gear", "Socks", "Underwear", "Headwear", "Gloves",
+        "Pants & Shorts", "Shirts & Tops",
+    ],
+    "Cookware": [
+        "Stoves", "Fuel", "Pots & Pans", "Utensils",
+        "Drinkware", "Cleaning", "Coffee/Tea",
+    ],
+    "Sleep System": [
+        "Sleeping Bags", "Quilts", "Sleeping Pads", "Pillows", "Liners", "Bivys",
+    ],
+    "Electronics": [
+        "Power & Cables", "Lighting", "Navigation/Comm", "Batteries",
+        "Solar", "Wearables", "Audio",
+    ],
+    "Pack": [
+        "Main Pack", "Daypacks", "Protection", "Organization", "Add-ons",
+    ],
+    "Shelter": [
+        "Tents", "Hammocks", "Tarps", "Hardware", "Structure",
+    ],
+    "Toiletries": [
+        "Hygiene", "Bathroom", "Sun & Bug", "Personal Care",
+    ],
+    "Water System": [
+        "Filtration", "Purification", "Bottles", "Hydration", "Storage",
+    ],
+    "Food": [
+        "Meals", "Snacks", "Beverages", "Storage", "Hanging",
+    ],
+    "Footware": [
+        "Primary", "Camp Shoes", "Gaiters", "Traction",
+    ],
+    "Tools": [
+        "Knives", "Repair", "Trekking Poles", "Processing",
+    ],
+    "First Aid": [
+        "Bandages", "Medication", "Blister Care", "Ointments",
+    ],
+    "Safety": [
+        "Survival", "Fire", "Protection",
+    ],
+    "Camera": [
+        "Body & Lens", "Support", "Media", "Power",
+    ],
+    "Climbing": [
+        "Personal", "Hardware", "Protection", "Soft Goods",
+    ],
+}
+
+_subcategory_block = json.dumps(SUBCATEGORIES, indent=2)
+
 SYSTEM_PROMPT = (
     "You are a backpacking and outdoor gear product database. You have expert knowledge "
     "of outdoor gear brands, product lines, and specifications. When given a brand and product name "
     "(which may be misspelled, abbreviated, or include variant info in the name), you research and "
     "return the canonical product information.\n\n"
-    "You have access to web search. Use it to find the manufacturer's official product page. "
-    'Prefer searching the manufacturer\'s site directly (e.g. "site:nemoequipment.com Tensor Insulated"). '
-    "From the product page, extract:\n"
-    "- The official product URL\n"
+    "You have access to web search. Use it to find product pages from both the manufacturer's website "
+    "and major retail sites (REI, Amazon, etc.), since many manufacturers do not sell directly. "
+    "Try searching the manufacturer's site first "
+    '(e.g. "site:nemoequipment.com Tensor Insulated"), then also search retail sites '
+    '(e.g. "Nemo Tensor Insulated site:rei.com" or the product name on Amazon). '
+    "From the best available product page(s), extract:\n"
+    "- A product URL (prefer the manufacturer's page if available, otherwise use a retail page)\n"
     "- A product image URL (the main product photo, not a lifestyle/hero image)\n"
-    "- The manufacturer's listed weight and any other specs (R-value, volume, packed size, temperature rating, etc.)\n\n"
+    "- The listed weight and any other specs (R-value, volume, packed size, temperature rating, etc.)\n\n"
     "IMPORTANT: A variant is a meaningful product option like size (S/M/L/Regular/Long), color, gender, "
     "or volume capacity. Weight measurements (e.g. \"690g\", \"14oz\", \"2lb\"), dimensions, or other specs "
     "that appear in the variant field are NOT real variants. If the provided variant is just a weight or "
     "spec measurement, set variant_name to null and incorporate that data into weight_grams or "
     "additional_specs instead.\n\n"
     "If the input is not a real, identifiable outdoor/backpacking product (e.g. \"small bag\", \"misc item\", "
     "random text), mark it as invalid.\n\n"
-    f"When assigning a category, you MUST use one of these exact values: {', '.join(CATEGORIES)}."
+    f"When assigning a category, you MUST use one of these exact values: {', '.join(CATEGORIES)}.\n\n"
+    "After assigning a category, also assign a subcategory. The valid subcategories for each category are:\n"
+    f"{_subcategory_block}\n"
+    "You MUST pick a subcategory from the list for the chosen category. If the product does not fit any "
+    "subcategory, or the category is \"Miscellaneous\", set subcategory to null.\n\n"
+    "FOOD ITEMS: If the category is \"Food\", look up the calories per serving (kcal) from the product "
+    "page, nutrition label, or retailer listing. Report this value as kcal. For non-food items, set kcal "
+    "to null."
 )
 
 WEB_SEARCH_TOOL = {
     "type": "web_search_20250305",
     "name": "web_search",
-    "max_uses": 3,
+    "max_uses": 5,
 }
 
 TOOL_SCHEMA = {
@@ -172,11 +237,14 @@ def ai_complete(system: str, user: str, tools: list | None = None, max_retries:
             },
             "product_url": {
                 "type": ["string", "null"],
-                "description": "Official manufacturer product page URL. Null if unknown.",
+                "description": (
+                    "Product page URL (prefer manufacturer's page; use a retail page "
+                    "if manufacturer doesn't sell direct). Null if unknown."
+                ),
             },
             "image_url": {
                 "type": ["string", "null"],
-                "description": "URL of the main product photo from the manufacturer's site. Null if not found.",
+                "description": "URL of the main product photo. Null if not found.",
             },
             "description": {
                 "type": ["string", "null"],
@@ -187,6 +255,20 @@ def ai_complete(system: str, user: str, tools: list | None = None, max_retries:
                 "enum": CATEGORIES + [None],
                 "description": "Gear category. Must be one of the predefined values.",
             },
+            "subcategory": {
+                "type": ["string", "null"],
+                "description": (
+                    "Subcategory within the assigned category. Must be one of the valid "
+                    "subcategories for the chosen category, or null."
+                ),
+            },
+            "kcal": {
+                "type": ["integer", "null"],
+                "description": (
+                    "Calories per serving for Food category items. Null for non-food "
+                    "items or if unknown."
+                ),
+            },
             "additional_specs": {
                 "type": ["object", "null"],
                 "description": (
@@ -489,7 +571,9 @@ def enrich_product(self, brand_id: int, product_id: int, product_variant_id: int
             image_url=result.get("image_url"),
             description=result.get("description"),
             category_suggestion=result.get("category"),
+            subcategory=result.get("subcategory"),
             additional_specs=result.get("additional_specs"),
+            kcal=result.get("kcal"),
             brand_id=brand.id,
             product_id=product.id,
             product_variant_id=variant.id if variant else None,

app/utils/consts.py

@@ -32,3 +32,5 @@
 
 REVIEW_EMAIL = os.getenv('REVIEW_EMAIL')
 REVIEW_OTP = os.getenv('REVIEW_OTP')
+
+REVENUECAT_WEBHOOK_SECRET = os.getenv('REVENUECAT_WEBHOOK_SECRET')

requirements.txt

@@ -19,4 +19,4 @@ uvicorn[standard]
 sentry-sdk
 celery[redis]
 anthropic
-git+https://github.com/Packstack-Tech/models.git@v2.0.1#egg=models
+git+https://github.com/Packstack-Tech/models.git@v2.0.2#egg=models