Add resource sharing for organization collectives #355
Conversation
| ai_credit_count["monthly"] = min(amount, organization.monthly_ai_credits) | ||
| amount -= ai_credit_count["monthly"] | ||
|
|
||
| ai_credit_count["regular"] = min(amount, organization.number_ai_credits) | ||
| amount -= ai_credit_count["regular"] | ||
|
|
||
| if amount > 0: | ||
| raise InsufficientAICreditsError(amount) | ||
|
|
||
| organization.monthly_ai_credits -= ai_credit_count["monthly"] | ||
| organization.number_ai_credits -= ai_credit_count["regular"] | ||
| organization.save() | ||
|
|
||
| # Then deduct from parent resources | ||
| if parent: | ||
| parent_monthly = min(amount, parent.monthly_ai_credits) | ||
| ai_credit_count["monthly"] += parent_monthly | ||
| amount -= parent_monthly | ||
| parent.monthly_ai_credits -= parent_monthly | ||
|
|
||
| parent_regular = min(amount, parent.number_ai_credits) | ||
| ai_credit_count["regular"] += parent_regular | ||
| amount -= parent_regular | ||
| parent.number_ai_credits -= parent_regular | ||
| parent.save() | ||
|
|
||
| # Then deduct from group resources | ||
| for group in groups: | ||
| group_monthly = min(amount, group.monthly_ai_credits) | ||
| ai_credit_count["monthly"] += group_monthly | ||
| amount -= group_monthly | ||
| group.monthly_ai_credits -= group_monthly | ||
|
|
||
| group_regular = min(amount, group.number_ai_credits) | ||
| ai_credit_count["regular"] += group_regular | ||
| amount -= group_regular | ||
| group.number_ai_credits -= group_regular | ||
| group.save() |
There was a problem hiding this comment.
Same comments about duplicated logic pointing to a refactoring opportunity. Seeing this logic shared between spending requests and AI credits makes that even more apparent! Doesn't need to get addressed now, but let's make sure we keep this in mind this during our payments refactor.
|
I correctly am able to see that MuckRock and MuckRock child are on the organization plan now, so I believe the latest squarelet fixed that integration. However, MuckRock child only shows 5000 AI credits though, instead of 10,000 (5k from itself and 5k from its parent). Requests does show the correct totals - child 100 requests, parent 50. |
|
I think the issue is that DocumentCloud staging is not syncing with plan updates on the squarelet review app. I am not seeing updates even when I query via the Django shell. But also, the frontend uses the API to query credit status:https://github.com/MuckRock/documentcloud-frontend/blob/0091f0cc2dd3c4b71cb42f456fb5ed2491c97c7e/src/lib/api/accounts.ts#L123 which are used in the org navigation menu: monthly_credits, purchased_credits, and monthly_credit_allowance are set in the organization serializer. For this to work, we would need to either change the organization serializer to use the get methods to get the actual total amounts (parent + child) or add them to the serializer in general as their own separate fields and update the frontend code to use them |
These are the same changes as the MuckRock repo, except for premium credits instead of requests. Also, some of the code is in the library
squarelet-authwhich DocumentCloud uses but MuckRock does not for historical reasons