ROLLBACK: complete removal of broken feature enforcement system
Reverts all feature enforcement changes (commits3745ebd,cbad50a,cd4d912,8415509) to restore original working functionality. Issues caused by feature enforcement implementation: - Export buttons disappeared and never reappeared - KI analysis counter not incrementing - New analyses not saving - Pipeline appearing twice - Many core features broken Restored files to working state before enforcement implementation (commit0210844): - Backend: auth.py, insights.py, exportdata.py, importdata.py, nutrition.py, activity.py - Frontend: Analysis.jsx, SettingsPage.jsx, api.js - Removed: FeatureGate.jsx, useFeatureAccess.js The original simple AI limit system (ai_enabled, ai_limit_day) is now active again. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
8415509f4c
commit
4fcde4abfb
11 files changed
+125
-376
No files matched your search
+1
-2
@@ -318,9 +318,8 @@ def increment_feature_usage(profile_id: str, feature_id: str) -> None:
|
||||
ON CONFLICT (profile_id, feature_id)
|
||||
DO UPDATE SET
|
||||
usage_count = user_feature_usage.usage_count + 1,
|
||||
reset_at = %s,
|
||||
updated = CURRENT_TIMESTAMP
|
||||
""", (profile_id, feature_id, next_reset, next_reset))
|
||||
""", (profile_id, feature_id, next_reset))
|
||||
|
||||
conn.commit()
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ from typing import Optional
|
||||
from fastapi import APIRouter, HTTPException, UploadFile, File, Header, Depends
|
||||
|
||||
from db import get_db, get_cursor, r2d
|
||||
from auth import require_auth, check_feature_access, increment_feature_usage
|
||||
from auth import require_auth
|
||||
from models import ActivityEntry
|
||||
from routers.profiles import get_pid
|
||||
|
||||
@@ -94,17 +94,6 @@ def activity_stats(x_profile_id: Optional[str]=Header(default=None), session: di
|
||||
async def import_activity_csv(file: UploadFile=File(...), x_profile_id: Optional[str]=Header(default=None), session: dict=Depends(require_auth)):
|
||||
"""Import Apple Health workout CSV."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'csv_import')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "CSV-Import ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Import-Limit erreicht ({access['limit']} Imports)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
|
||||
raw = await file.read()
|
||||
try: text = raw.decode('utf-8')
|
||||
except: text = raw.decode('latin-1')
|
||||
@@ -145,8 +134,4 @@ async def import_activity_csv(file: UploadFile=File(...), x_profile_id: Optional
|
||||
tf(row.get('Distanz (km)',''))))
|
||||
inserted+=1
|
||||
except: skipped+=1
|
||||
|
||||
# Increment import usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'csv_import')
|
||||
|
||||
return {"inserted":inserted,"skipped":skipped,"message":f"{inserted} Trainings importiert"}
|
||||
@@ -17,7 +17,7 @@ from fastapi import APIRouter, HTTPException, Header, Depends
|
||||
from fastapi.responses import StreamingResponse, Response
|
||||
|
||||
from db import get_db, get_cursor, r2d
|
||||
from auth import require_auth, check_feature_access, increment_feature_usage
|
||||
from auth import require_auth
|
||||
from routers.profiles import get_pid
|
||||
|
||||
router = APIRouter(prefix="/api/export", tags=["export"])
|
||||
@@ -30,15 +30,13 @@ def export_csv(x_profile_id: Optional[str]=Header(default=None), session: dict=D
|
||||
"""Export all data as CSV."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'data_export')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "Export ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Export-Limit erreicht ({access['limit']} Exporte)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
# Check export permission
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute("SELECT export_enabled FROM profiles WHERE id=%s", (pid,))
|
||||
prof = cur.fetchone()
|
||||
if not prof or not prof['export_enabled']:
|
||||
raise HTTPException(403, "Export ist für dieses Profil deaktiviert")
|
||||
|
||||
# Build CSV
|
||||
output = io.StringIO()
|
||||
@@ -76,10 +74,6 @@ def export_csv(x_profile_id: Optional[str]=Header(default=None), session: dict=D
|
||||
writer.writerow(["Training", r['date'], r['activity_type'], f"{float(r['duration_min'])}min {float(r['kcal_active'])}kcal"])
|
||||
|
||||
output.seek(0)
|
||||
|
||||
# Increment export usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'data_export')
|
||||
|
||||
return StreamingResponse(
|
||||
iter([output.getvalue()]),
|
||||
media_type="text/csv",
|
||||
@@ -92,15 +86,13 @@ def export_json(x_profile_id: Optional[str]=Header(default=None), session: dict=
|
||||
"""Export all data as JSON."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'data_export')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "Export ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Export-Limit erreicht ({access['limit']} Exporte)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
# Check export permission
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute("SELECT export_enabled FROM profiles WHERE id=%s", (pid,))
|
||||
prof = cur.fetchone()
|
||||
if not prof or not prof['export_enabled']:
|
||||
raise HTTPException(403, "Export ist für dieses Profil deaktiviert")
|
||||
|
||||
# Collect all data
|
||||
data = {}
|
||||
@@ -134,10 +126,6 @@ def export_json(x_profile_id: Optional[str]=Header(default=None), session: dict=
|
||||
return str(obj)
|
||||
|
||||
json_str = json.dumps(data, indent=2, default=decimal_handler)
|
||||
|
||||
# Increment export usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'data_export')
|
||||
|
||||
return Response(
|
||||
content=json_str,
|
||||
media_type="application/json",
|
||||
@@ -150,21 +138,13 @@ def export_zip(x_profile_id: Optional[str]=Header(default=None), session: dict=D
|
||||
"""Export all data as ZIP (CSV + JSON + photos) per specification."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'data_export')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "Export ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Export-Limit erreicht ({access['limit']} Exporte)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
|
||||
# Get profile
|
||||
# Check export permission & get profile
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute("SELECT * FROM profiles WHERE id=%s", (pid,))
|
||||
prof = r2d(cur.fetchone())
|
||||
if not prof or not prof.get('export_enabled'):
|
||||
raise HTTPException(403, "Export ist für dieses Profil deaktiviert")
|
||||
|
||||
# Helper: CSV writer with UTF-8 BOM + semicolon
|
||||
def write_csv(zf, filename, rows, columns):
|
||||
@@ -317,10 +297,6 @@ Datumsformat: YYYY-MM-DD
|
||||
|
||||
zip_buffer.seek(0)
|
||||
filename = f"mitai-export-{profile_name.replace(' ','-')}-{export_date}.zip"
|
||||
|
||||
# Increment export usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'data_export')
|
||||
|
||||
return StreamingResponse(
|
||||
iter([zip_buffer.getvalue()]),
|
||||
media_type="application/zip",
|
||||
|
||||
@@ -16,7 +16,7 @@ from datetime import datetime
|
||||
from fastapi import APIRouter, HTTPException, UploadFile, File, Header, Depends
|
||||
|
||||
from db import get_db, get_cursor
|
||||
from auth import require_auth, check_feature_access, increment_feature_usage
|
||||
from auth import require_auth
|
||||
from routers.profiles import get_pid
|
||||
|
||||
router = APIRouter(prefix="/api/import", tags=["import"])
|
||||
@@ -41,16 +41,6 @@ async def import_zip(
|
||||
"""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'csv_import')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "Import ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Import-Limit erreicht ({access['limit']} Imports)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
|
||||
# Read uploaded file
|
||||
content = await file.read()
|
||||
zip_buffer = io.BytesIO(content)
|
||||
@@ -264,9 +254,6 @@ async def import_zip(
|
||||
conn.rollback()
|
||||
raise HTTPException(500, f"Import fehlgeschlagen: {str(e)}")
|
||||
|
||||
# Increment import usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'csv_import')
|
||||
|
||||
return {
|
||||
"ok": True,
|
||||
"message": "Import erfolgreich",
|
||||
|
||||
@@ -13,7 +13,7 @@ from datetime import datetime
|
||||
from fastapi import APIRouter, HTTPException, Header, Depends
|
||||
|
||||
from db import get_db, get_cursor, r2d
|
||||
from auth import require_auth, require_admin, check_feature_access, increment_feature_usage
|
||||
from auth import require_auth, require_admin
|
||||
from routers.profiles import get_pid
|
||||
|
||||
router = APIRouter(prefix="/api", tags=["insights"])
|
||||
@@ -251,16 +251,7 @@ def delete_ai_insight(scope: str, x_profile_id: Optional[str]=Header(default=Non
|
||||
async def analyze_with_prompt(slug: str, x_profile_id: Optional[str]=Header(default=None), session: dict=Depends(require_auth)):
|
||||
"""Run AI analysis with specified prompt template."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'ai_calls')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "KI-Analysen sind für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches KI-Limit erreicht ({access['limit']} Analysen)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
check_ai_limit(pid)
|
||||
|
||||
# Get prompt template
|
||||
with get_db() as conn:
|
||||
@@ -310,8 +301,7 @@ async def analyze_with_prompt(slug: str, x_profile_id: Optional[str]=Header(defa
|
||||
cur.execute("INSERT INTO ai_insights (id, profile_id, scope, content, created) VALUES (%s,%s,%s,%s,CURRENT_TIMESTAMP)",
|
||||
(str(uuid.uuid4()), pid, slug, content))
|
||||
|
||||
# Increment usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'ai_calls')
|
||||
inc_ai_usage(pid)
|
||||
return {"scope": slug, "content": content}
|
||||
|
||||
|
||||
@@ -319,16 +309,7 @@ async def analyze_with_prompt(slug: str, x_profile_id: Optional[str]=Header(defa
|
||||
async def analyze_pipeline(x_profile_id: Optional[str]=Header(default=None), session: dict=Depends(require_auth)):
|
||||
"""Run 3-stage pipeline analysis."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access for pipeline (v9c feature system)
|
||||
access = check_feature_access(pid, 'ai_pipeline')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "KI-Pipeline ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Pipeline-Limit erreicht ({access['limit']} Pipelines)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
check_ai_limit(pid)
|
||||
|
||||
data = _get_profile_data(pid)
|
||||
vars = _prepare_template_vars(data)
|
||||
@@ -457,8 +438,7 @@ async def analyze_pipeline(x_profile_id: Optional[str]=Header(default=None), ses
|
||||
cur.execute("INSERT INTO ai_insights (id, profile_id, scope, content, created) VALUES (%s,%s,'gesamt',%s,CURRENT_TIMESTAMP)",
|
||||
(str(uuid.uuid4()), pid, final_content))
|
||||
|
||||
# Increment pipeline usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'ai_pipeline')
|
||||
inc_ai_usage(pid)
|
||||
return {"scope": "gesamt", "content": final_content, "stage1": stage1_results}
|
||||
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ from datetime import datetime
|
||||
from fastapi import APIRouter, HTTPException, UploadFile, File, Header, Depends
|
||||
|
||||
from db import get_db, get_cursor, r2d
|
||||
from auth import require_auth, check_feature_access, increment_feature_usage
|
||||
from auth import require_auth
|
||||
from routers.profiles import get_pid
|
||||
|
||||
router = APIRouter(prefix="/api/nutrition", tags=["nutrition"])
|
||||
@@ -30,17 +30,6 @@ def _pf(s):
|
||||
async def import_nutrition_csv(file: UploadFile=File(...), x_profile_id: Optional[str]=Header(default=None), session: dict=Depends(require_auth)):
|
||||
"""Import FDDB nutrition CSV."""
|
||||
pid = get_pid(x_profile_id)
|
||||
|
||||
# Check feature access (v9c feature system)
|
||||
access = check_feature_access(pid, 'csv_import')
|
||||
if not access['allowed']:
|
||||
if access['reason'] == 'feature_disabled':
|
||||
raise HTTPException(403, "CSV-Import ist für dein Tier nicht verfügbar")
|
||||
elif access['reason'] == 'limit_exceeded':
|
||||
raise HTTPException(429, f"Monatliches Import-Limit erreicht ({access['limit']} Imports)")
|
||||
else:
|
||||
raise HTTPException(403, f"Zugriff verweigert: {access['reason']}")
|
||||
|
||||
raw = await file.read()
|
||||
try: text = raw.decode('utf-8')
|
||||
except: text = raw.decode('latin-1')
|
||||
@@ -76,10 +65,6 @@ async def import_nutrition_csv(file: UploadFile=File(...), x_profile_id: Optiona
|
||||
cur.execute("INSERT INTO nutrition_log (id,profile_id,date,kcal,protein_g,fat_g,carbs_g,source,created) VALUES (%s,%s,%s,%s,%s,%s,%s,'csv',CURRENT_TIMESTAMP)",
|
||||
(str(uuid.uuid4()),pid,iso,kcal,prot,fat,carbs))
|
||||
inserted+=1
|
||||
|
||||
# Increment import usage counter (v9c feature system)
|
||||
increment_feature_usage(pid, 'csv_import')
|
||||
|
||||
return {"rows_parsed":count,"days_imported":inserted,
|
||||
"date_range":{"from":min(days) if days else None,"to":max(days) if days else None}}
|
||||
|
||||
|
||||
Reference in new issue
Block a user