feat(platform): Implement top-up flow for PAYG System #9050

kcze · 2024-12-18T16:01:27Z

WIP

Changes 🏗️

Checklist 📋

For code changes:

I have clearly listed my changes in the PR description
I have made a test plan
I have tested my changes according to the test plan:
- ...

Example test plan

Create from scratch and execute an agent with at least 3 blocks
Import an agent from file upload, and confirm it executes correctly
Upload agent to marketplace
Import an agent from marketplace and confirm it executes correctly
Edit an agent from monitor, and confirm it executes correctly

For configuration changes:

.env.example is updated or already compatible with my changes
docker-compose.yml is updated or already compatible with my changes
I have included a list of my configuration changes in the PR description (under Changes)

Examples of configuration changes

Changing ports
Adding new services that need to communicate with each other
Secrets or environment variable changes
New or infrastructure changes such as databases

…flow

netlify · 2024-12-18T16:01:58Z

✅ Deploy Preview for auto-gpt-docs-dev canceled.

Name	Link
🔨 Latest commit	`7958143`
🔍 Latest deploy log	https://app.netlify.com/sites/auto-gpt-docs-dev/deploys/677801924a58160008b8f052

netlify · 2024-12-18T16:02:45Z

✅ Deploy Preview for auto-gpt-docs canceled.

Name	Link
🔨 Latest commit	`7958143`
🔍 Latest deploy log	https://app.netlify.com/sites/auto-gpt-docs/deploys/67780192bc5f9e00086fe6d7

majdyz · 2024-12-25T20:48:10Z

autogpt_platform/backend/backend/data/credit.py

+            await User.prisma().update(
+                where={"id": user_id}, data={"stripeCustomerId": customer.id}
+            )
+            user.stripeCustomerId = customer.id


Suggested change

await User.prisma().update(

where={"id": user_id}, data={"stripeCustomerId": customer.id}

)

user.stripeCustomerId = customer.id

user = await User.prisma().update(

where={"id": user_id}, data={"stripeCustomerId": customer.id}

)

Or even better: avoid calling Prisma here and add set_stripe_customer_id in model class on user.py

I left the original code - trying to change it or move to the function cascades into multiple errors and requires additional checks.

majdyz · 2024-12-25T20:50:00Z

autogpt_platform/backend/backend/data/credit.py

+                }
+            ],
+            mode="payment",
+            success_url="",# TODO kcze


So these will be webhook URLs ?

These are redirect urls after checkout

majdyz · 2024-12-25T21:01:10Z

autogpt_platform/frontend/src/hooks/useCredits.ts

+
+    if (!stripe) {
+      console.error("Stripe failed to load");
+      return;


Should we throw an error instead ?

I removed console.error altogether, this should never happen; stripePromise should never be null and loadStripe throws when we don't provide API key.

github-actions · 2024-12-28T16:18:52Z

This pull request has conflicts with the base branch, please resolve those so we can evaluate the pull request.

majdyz · 2024-12-31T21:01:08Z

autogpt_platform/backend/backend/data/credit.py

+
+        # Check the Checkout Session's payment_status property
+        # to determine if fulfillment should be peformed
+        if checkout_session.payment_status != "unpaid":


Isn't this riskier than just match 'paid' & 'no_payment_required' ?

Not now, there are only three options and this is from Stripe example but just to be sure I updated it anyway!

majdyz · 2024-12-31T21:02:06Z

autogpt_platform/backend/backend/server/routers/v1.py

+    return {"checkout_url": checkout_url}
+
+
+@v1_router.post(path="/credits/stripe_webhook", tags=["credits"])


Curious, Is this a non-authenticated request ?

I guess no but it requires HTTPS on live data and API key to read correctly.

majdyz · 2024-12-31T21:02:31Z

autogpt_platform/backend/backend/server/routers/v1.py

+        # Invalid signature
+        raise HTTPException(status_code=400)
+
+    print(event)


nit: make this logging ?

majdyz · 2024-12-31T21:03:01Z

autogpt_platform/backend/backend/server/routers/v1.py

+        event['type'] == 'checkout.session.completed'
+        or event['type'] == 'checkout.session.async_payment_succeeded'
+    ):
+        await _user_credit_model.fulfill_checkout(event['data']['object']['id'])


the nested check: uses get() with fallback for safety?

Also can we log/warn the non matching events ?

the nested check: uses get() with fallback for safety?

What do you mean? I don't think using event.get(..) would change anything.

Also can we log/warn the non matching events ?

Do you think this is necessary on our side? Stripe logs everything and each event has tons of data and only 4 out of hundreds are enabled for this webhook. I could disabled 2, so only the 2 matching will be sent.

majdyz · 2024-12-31T21:04:05Z

autogpt_platform/backend/backend/data/credit.py

+        # Check the Checkout Session's payment_status property
+        # to determine if fulfillment should be peformed
+        if checkout_session.payment_status != "unpaid":
+            print("Payment status is not unpaid!")


Nit: make this and the one above logging with more information ?

Removed, that was only for testing.

majdyz · 2024-12-31T21:05:37Z

autogpt_platform/frontend/src/hooks/useCredits.ts

+    const response = await api.requestTopUp(amount);
+
+    router.push(response.checkout_url);
+  }, [api]);


Won' this warn about router not part of the deplist ?

Added router

majdyz · 2024-12-31T21:05:57Z

autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts

@@ -442,7 +446,7 @@ export default class BackendAPI {
        await new Promise((resolve) => setTimeout(resolve, 100 * retryCount));
      }
    }
-    console.log("Request: ", method, path, "from: ", page);
+    console.log("Request: ", method, this.baseUrl, path, "from: ", page);


nit: console.debug ?

Changed but this needs a refactor imo

…flow

github-actions · 2025-01-03T15:02:01Z

Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly.

kcze added 6 commits December 11, 2024 18:05

Add useCredits hook

96f850d

Top-up section in user profile

d915b80

Request top-up endpoint

0f917f7

Merge branch 'dev' into kpczerwinski/secrt-1012-mvp-implement-top-up-…

2481d3d

…flow

Top-Up intent logic

1596671

Merge branch 'dev' into kpczerwinski/secrt-1012-mvp-implement-top-up-…

43d0752

…flow

github-actions bot added platform/frontend AutoGPT Platform - Front end platform/backend AutoGPT Platform - Back end size/l labels Dec 18, 2024

kcze added 3 commits December 19, 2024 12:20

Install stripe-js

afdb6e2

Use stripe checkout

e8fa2a1

Update top up endpoint

869c31c

majdyz reviewed Dec 25, 2024

View reviewed changes

kcze changed the title ~~feat(backend): Implement top-up flow for PAYG System~~ feat(platform): Implement top-up flow for PAYG System Dec 27, 2024

kcze added 2 commits December 27, 2024 17:52

Fulfill checkout function

9cddffb

Handle Stripe webhook events

76b5259

github-actions bot added the conflicts Automatically applied to PRs with merge conflicts label Dec 28, 2024

kcze added 2 commits December 31, 2024 13:54

Update credit.py

b3d7804

Fix top-up credit amounts

7063751

majdyz reviewed Dec 31, 2024

View reviewed changes

kcze added 6 commits January 1, 2025 14:19

Move top-up UI to /store/credits

27019e4

Hide Credits tab conditionally

b3de888

Success and cancel topup message

bb69c5a

Address feedback

2caf498

Client-side /credits PATCH

deddcdd

Merge branch 'dev' into kpczerwinski/secrt-1012-mvp-implement-top-up-…

c6eaa58

…flow

github-actions bot removed the conflicts Automatically applied to PRs with merge conflicts label Jan 3, 2025

Cleanup

7958143

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(platform): Implement top-up flow for PAYG System #9050

feat(platform): Implement top-up flow for PAYG System #9050

kcze commented Dec 18, 2024

netlify bot commented Dec 18, 2024 •

edited

Loading

netlify bot commented Dec 18, 2024 •

edited

Loading

majdyz Dec 25, 2024

majdyz Dec 25, 2024

kcze Jan 1, 2025

majdyz Dec 25, 2024

kcze Dec 27, 2024

majdyz Dec 25, 2024

kcze Jan 1, 2025

github-actions bot commented Dec 28, 2024

majdyz Dec 31, 2024

kcze Jan 1, 2025

majdyz Dec 31, 2024

kcze Jan 1, 2025

majdyz Dec 31, 2024

kcze Jan 1, 2025

majdyz Dec 31, 2024

majdyz Dec 31, 2024

kcze Jan 1, 2025

majdyz Dec 31, 2024

kcze Jan 1, 2025

majdyz Dec 31, 2024

kcze Jan 1, 2025

majdyz Dec 31, 2024

kcze Jan 1, 2025

github-actions bot commented Jan 3, 2025

		return {"checkout_url": checkout_url}


		@v1_router.post(path="/credits/stripe_webhook", tags=["credits"])

feat(platform): Implement top-up flow for PAYG System #9050

Are you sure you want to change the base?

feat(platform): Implement top-up flow for PAYG System #9050

Conversation

kcze commented Dec 18, 2024

Changes 🏗️

Checklist 📋

For code changes:

For configuration changes:

netlify bot commented Dec 18, 2024 • edited Loading

✅ Deploy Preview for auto-gpt-docs-dev canceled.

netlify bot commented Dec 18, 2024 • edited Loading

✅ Deploy Preview for auto-gpt-docs canceled.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jan 3, 2025

netlify bot commented Dec 18, 2024 •

edited

Loading

netlify bot commented Dec 18, 2024 •

edited

Loading