mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-16 14:52:31 +00:00
worldlabs improvements - login modal, refresh, etc. (#934)
This commit is contained in:
1 parent
5688d8cef7
commit
b9397fb809
22 files changed
+542
-73
No files matched your search
+49
@@ -0,0 +1,49 @@
|
||||
|
||||
curl 'https://identitytoolkit.googleapis.com/v1/accounts:lookup?key=AIzaSyAA88yObUN-0pnXAxcgOrT2exZxFWLW1BI' \
|
||||
-H 'accept: */*' \
|
||||
-H 'accept-language: en-US,en;q=0.9' \
|
||||
-H 'content-type: application/json' \
|
||||
-H 'origin: https://marble.worldlabs.ai' \
|
||||
-H 'priority: u=1, i' \
|
||||
-H 'sec-ch-ua: "Google Chrome";v="143", "Chromium";v="143", "Not A(Brand";v="24"' \
|
||||
-H 'sec-ch-ua-mobile: ?0' \
|
||||
-H 'sec-ch-ua-platform: "macOS"' \
|
||||
-H 'sec-fetch-dest: empty' \
|
||||
-H 'sec-fetch-mode: cors' \
|
||||
-H 'sec-fetch-site: cross-site' \
|
||||
-H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36' \
|
||||
-H 'x-browser-channel: stable' \
|
||||
-H 'x-browser-copyright: Copyright 2025 Google LLC. All Rights reserved.' \
|
||||
-H 'x-browser-validation: AUXUCdutEJ+6gl6bYtz7E2kgIT4=' \
|
||||
-H 'x-browser-year: 2025' \
|
||||
-H 'x-client-data: CIe2yQEIorbJAQipncoBCKSCywEIlqHLAQiGoM0BCJSkzwE=' \
|
||||
-H 'x-client-version: Chrome/JsCore/12.6.0/FirebaseCore-web' \
|
||||
--data-raw '{"idToken":"eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk4OGQ1YTM3OWI3OGJkZjFlNTBhNDA5MTEzZjJiMGM3NWU0NTJlNDciLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vd2x0LXRyYWluaW5nLWdzYyIsImF1ZCI6IndsdC10cmFpbmluZy1nc2MiLCJhdXRoX3RpbWUiOjE3NjYwMDI5MjMsInVzZXJfaWQiOiJDQXJKSjJQUUZGZDhsMlJmOHVwdFpobDg2ZDMzIiwic3ViIjoiQ0FySkoyUFFGRmQ4bDJSZjh1cHRaaGw4NmQzMyIsImlhdCI6MTc2NjEyODA4NiwiZXhwIjoxNzY2MTMxNjg2LCJlbWFpbCI6InNhYmFsaWQyMzRAY3JzYXkuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsic2FiYWxpZDIzNEBjcnNheS5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJwYXNzd29yZCJ9fQ.T1V-C-5dyNorLKXIE4aqi76RvwU5Fdw-YH0YOU_TQb7nNgKy1HsmQswssBFHw4KP2DKjvbZif4TIFJQTnsYAfCh1VvOVtHFUY-kGTRSU5wLPUbH_1EiOLgletGP6YeM3MiZq8fWG1VSWe6xmogmTfhSf3NcRW46L6GeJLXmJXPrHl6Hxszvr1aSmxm1Ee412bCN2hhgGcmTYm7-jaeT9MdnKddu-wv_5Bd6Eb5kCXZHvZIqgaWR_5ACMJq7zyefrCZUSISh3jTycRsVaFKvv09Mm_rJHFQbV2FXCNDx4S80nR7TyUd8SDehKiGsPRgUq-mGvCPBabk0dpAn73LAFrA"}'
|
||||
|
||||
|
||||
Response:
|
||||
|
||||
{
|
||||
"kind": "identitytoolkit#GetAccountInfoResponse",
|
||||
"users": [
|
||||
{
|
||||
"localId": "CArJJ2PQFFd8l2Rf8uptZhl86d33",
|
||||
"email": "sabalid234@crsay.com",
|
||||
"passwordHash": "UkVEQUNURUQ=",
|
||||
"emailVerified": true,
|
||||
"passwordUpdatedAt": 1765756496440,
|
||||
"providerUserInfo": [
|
||||
{
|
||||
"providerId": "password",
|
||||
"federatedId": "sabalid234@crsay.com",
|
||||
"email": "sabalid234@crsay.com",
|
||||
"rawId": "sabalid234@crsay.com"
|
||||
}
|
||||
],
|
||||
"validSince": "1765756496",
|
||||
"lastLoginAt": "1766098175534",
|
||||
"createdAt": "1765756496440",
|
||||
"lastRefreshAt": "2025-12-19T07:08:06.869541Z"
|
||||
}
|
||||
]
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
|
||||
https://securetoken.googleapis.com/v1/token?key={REFRESH_TOKEN}
|
||||
|
||||
curl 'https://securetoken.googleapis.com/v1/token?key=AIzaSyAA88yObUN-0pnXAxcgOrT2exZxFWLW1BI' \
|
||||
--compressed \
|
||||
-X POST \
|
||||
-H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:146.0) Gecko/20100101 Firefox/146.0' \
|
||||
-H 'Accept: */*' \
|
||||
-H 'Accept-Language: en-US,en;q=0.5' \
|
||||
-H 'Accept-Encoding: gzip, deflate, br, zstd' \
|
||||
-H 'Referer: https://marble.worldlabs.ai/' \
|
||||
-H 'X-Client-Version: Firefox/JsCore/12.6.0/FirebaseCore-web' \
|
||||
-H 'X-Firebase-Client: eyJ2ZXJzaW9uIjoyLCJoZWFydGJlYXRzIjpbeyJhZ2VudCI6ImZpcmUtY29yZS8wLjE0LjYgZmlyZS1jb3JlLWVzbTIwMjAvMC4xNC42IGZpcmUtanMvIGZpcmUtanMtYWxsLWFwcC8xMi42LjAgZmlyZS1hdXRoLzEuMTEuMSBmaXJlLWF1dGgtZXNtMjAyMC8xLjExLjEiLCJkYXRlcyI6WyIyMDI1LTEyLTE5Il19XX0' \
|
||||
-H 'Content-Type: application/x-www-form-urlencoded' \
|
||||
-H 'Origin: https://marble.worldlabs.ai' \
|
||||
-H 'Connection: keep-alive' \
|
||||
-H 'Sec-Fetch-Dest: empty' \
|
||||
-H 'Sec-Fetch-Mode: cors' \
|
||||
-H 'Sec-Fetch-Site: cross-site' \
|
||||
-H 'Priority: u=4' \
|
||||
-H 'TE: trailers' \
|
||||
--data-raw 'grant_type=refresh_token&refresh_token=AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778'
|
||||
|
||||
--data-raw '
|
||||
grant_type=refresh_token
|
||||
&refresh_token=AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778
|
||||
|
||||
|
||||
Response:
|
||||
|
||||
{
|
||||
"access_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk4OGQ1YTM3OWI3OGJkZjFlNTBhNDA5MTEzZjJiMGM3NWU0NTJlNDciLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS0lucl8yWGJ2Z1VERUxNOEpCTGdfa2tKbVpxWl9WcTlzZkI2bVR4VmQzc1NJRk4tST1zOTYtYyIsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS93bHQtdHJhaW5pbmctZ3NjIiwiYXVkIjoid2x0LXRyYWluaW5nLWdzYyIsImF1dGhfdGltZSI6MTc2MDE3Nzk3OCwidXNlcl9pZCI6IjA1c0dhaHRySWdVMjVMaXR5NjhoZjRpMmV4SjIiLCJzdWIiOiIwNXNHYWh0cklnVTI1TGl0eTY4aGY0aTJleEoyIiwiaWF0IjoxNzY2MTI2ODg4LCJleHAiOjE3NjYxMzA0ODgsImVtYWlsIjoiYnRAYnJhbmQuaW8iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJnb29nbGUuY29tIjpbIjEwNjEwODI2NzgzNTYyOTEwMTc1OSJdLCJlbWFpbCI6WyJidEBicmFuZC5pbyJdfSwic2lnbl9pbl9wcm92aWRlciI6Imdvb2dsZS5jb20ifX0.YLXZHg0rzMzyhhyJsO3DSMhU8GjnxtQtg1GiDwaxZjuybmabqOcR_b4C2lE2XwESg_dDYnIkmdas9wsHshy2bGPCAAtrinQpxTHWhIDxy0bsF8yW0BCOszwVseiTkXd6vveaGYH06EvH-nM4Q5AB_oKbsgRyMEbXhepvX7SlrmeaXxqldCLRalDj6gcEIY_TSwMmjnZ6-sFMPe92YjLY1ITPRx7S3YyWNwBG6mVpgoHcHudNAJ4TFxborZlhC1zpF0NDgtIhN5ITg0I1P0A-JTaBTJHukQwCPKhifFRA1kfcxzbAoZyPiPw2DdgXpDDnNzXUYgnaOOVyGs96Tx8hOQ",
|
||||
"expires_in": "3600",
|
||||
"token_type": "Bearer",
|
||||
"refresh_token": "AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778",
|
||||
"id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk4OGQ1YTM3OWI3OGJkZjFlNTBhNDA5MTEzZjJiMGM3NWU0NTJlNDciLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS0lucl8yWGJ2Z1VERUxNOEpCTGdfa2tKbVpxWl9WcTlzZkI2bVR4VmQzc1NJRk4tST1zOTYtYyIsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS93bHQtdHJhaW5pbmctZ3NjIiwiYXVkIjoid2x0LXRyYWluaW5nLWdzYyIsImF1dGhfdGltZSI6MTc2MDE3Nzk3OCwidXNlcl9pZCI6IjA1c0dhaHRySWdVMjVMaXR5NjhoZjRpMmV4SjIiLCJzdWIiOiIwNXNHYWh0cklnVTI1TGl0eTY4aGY0aTJleEoyIiwiaWF0IjoxNzY2MTI2ODg4LCJleHAiOjE3NjYxMzA0ODgsImVtYWlsIjoiYnRAYnJhbmQuaW8iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJnb29nbGUuY29tIjpbIjEwNjEwODI2NzgzNTYyOTEwMTc1OSJdLCJlbWFpbCI6WyJidEBicmFuZC5pbyJdfSwic2lnbl9pbl9wcm92aWRlciI6Imdvb2dsZS5jb20ifX0.YLXZHg0rzMzyhhyJsO3DSMhU8GjnxtQtg1GiDwaxZjuybmabqOcR_b4C2lE2XwESg_dDYnIkmdas9wsHshy2bGPCAAtrinQpxTHWhIDxy0bsF8yW0BCOszwVseiTkXd6vveaGYH06EvH-nM4Q5AB_oKbsgRyMEbXhepvX7SlrmeaXxqldCLRalDj6gcEIY_TSwMmjnZ6-sFMPe92YjLY1ITPRx7S3YyWNwBG6mVpgoHcHudNAJ4TFxborZlhC1zpF0NDgtIhN5ITg0I1P0A-JTaBTJHukQwCPKhifFRA1kfcxzbAoZyPiPw2DdgXpDDnNzXUYgnaOOVyGs96Tx8hOQ",
|
||||
"user_id": "05sGahtrIgU25Lity68hf4i2exJ2",
|
||||
"project_id": "661553802735"
|
||||
}
|
||||
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
This refreshed after an hour within the same open tab,
|
||||
|
||||
|
||||
curl 'https://securetoken.googleapis.com/v1/token?key=AIzaSyAA88yObUN-0pnXAxcgOrT2exZxFWLW1BI' \
|
||||
--compressed \
|
||||
-X POST \
|
||||
-H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:146.0) Gecko/20100101 Firefox/146.0' \
|
||||
-H 'Accept: */*' \
|
||||
-H 'Accept-Language: en-US,en;q=0.5' \
|
||||
-H 'Accept-Encoding: gzip, deflate, br, zstd' \
|
||||
-H 'Referer: https://marble.worldlabs.ai/' \
|
||||
-H 'X-Client-Version: Firefox/JsCore/12.6.0/FirebaseCore-web' \
|
||||
-H 'Content-Type: application/x-www-form-urlencoded' \
|
||||
-H 'Origin: https://marble.worldlabs.ai' \
|
||||
-H 'Connection: keep-alive' \
|
||||
-H 'Sec-Fetch-Dest: empty' \
|
||||
-H 'Sec-Fetch-Mode: cors' \
|
||||
-H 'Sec-Fetch-Site: cross-site' \
|
||||
--data-raw 'grant_type=refresh_token&refresh_token=AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778'
|
||||
|
||||
Response Payload:
|
||||
|
||||
{
|
||||
"access_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk4OGQ1YTM3OWI3OGJkZjFlNTBhNDA5MTEzZjJiMGM3NWU0NTJlNDciLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS0lucl8yWGJ2Z1VERUxNOEpCTGdfa2tKbVpxWl9WcTlzZkI2bVR4VmQzc1NJRk4tST1zOTYtYyIsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS93bHQtdHJhaW5pbmctZ3NjIiwiYXVkIjoid2x0LXRyYWluaW5nLWdzYyIsImF1dGhfdGltZSI6MTc2MDE3Nzk3OCwidXNlcl9pZCI6IjA1c0dhaHRySWdVMjVMaXR5NjhoZjRpMmV4SjIiLCJzdWIiOiIwNXNHYWh0cklnVTI1TGl0eTY4aGY0aTJleEoyIiwiaWF0IjoxNzY2MTMyODExLCJleHAiOjE3NjYxMzY0MTEsImVtYWlsIjoiYnRAYnJhbmQuaW8iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJnb29nbGUuY29tIjpbIjEwNjEwODI2NzgzNTYyOTEwMTc1OSJdLCJlbWFpbCI6WyJidEBicmFuZC5pbyJdfSwic2lnbl9pbl9wcm92aWRlciI6Imdvb2dsZS5jb20ifX0.Fw26JeZxotd--PwRGvEZuSDddPN81sJ-VzsdaPihNsSLokXnak20U3scrqDJqMHLZtzP_HBKcCKfnhQIQo9iCCWXLjgJPKeLhT28f2w_Ycld4oKbImasnyCNCyEovuhJ7ndIdzL9ycSFQ318h2OZ95SQjHoY_kO3x_Ba6vY_eKM_fgS8zzDH9muSFkheq06aQhS02ZNeJX65zXBg6_jh-bJGSYcJGBbQQqc_excDSE79FgXMwHKysOJ_O7jaQdBXDgrt8Ratti0PsoNKk9TDjN4b9qTTWJYAT3yn7XX67lRJKtck4Y8LWh2Ca9KfnzSoFMHz5rO-pC21L51QS3If4Q",
|
||||
"expires_in": "3600",
|
||||
"token_type": "Bearer",
|
||||
"refresh_token": "AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778",
|
||||
"id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk4OGQ1YTM3OWI3OGJkZjFlNTBhNDA5MTEzZjJiMGM3NWU0NTJlNDciLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS0lucl8yWGJ2Z1VERUxNOEpCTGdfa2tKbVpxWl9WcTlzZkI2bVR4VmQzc1NJRk4tST1zOTYtYyIsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS93bHQtdHJhaW5pbmctZ3NjIiwiYXVkIjoid2x0LXRyYWluaW5nLWdzYyIsImF1dGhfdGltZSI6MTc2MDE3Nzk3OCwidXNlcl9pZCI6IjA1c0dhaHRySWdVMjVMaXR5NjhoZjRpMmV4SjIiLCJzdWIiOiIwNXNHYWh0cklnVTI1TGl0eTY4aGY0aTJleEoyIiwiaWF0IjoxNzY2MTMyODExLCJleHAiOjE3NjYxMzY0MTEsImVtYWlsIjoiYnRAYnJhbmQuaW8iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJnb29nbGUuY29tIjpbIjEwNjEwODI2NzgzNTYyOTEwMTc1OSJdLCJlbWFpbCI6WyJidEBicmFuZC5pbyJdfSwic2lnbl9pbl9wcm92aWRlciI6Imdvb2dsZS5jb20ifX0.Fw26JeZxotd--PwRGvEZuSDddPN81sJ-VzsdaPihNsSLokXnak20U3scrqDJqMHLZtzP_HBKcCKfnhQIQo9iCCWXLjgJPKeLhT28f2w_Ycld4oKbImasnyCNCyEovuhJ7ndIdzL9ycSFQ318h2OZ95SQjHoY_kO3x_Ba6vY_eKM_fgS8zzDH9muSFkheq06aQhS02ZNeJX65zXBg6_jh-bJGSYcJGBbQQqc_excDSE79FgXMwHKysOJ_O7jaQdBXDgrt8Ratti0PsoNKk9TDjN4b9qTTWJYAT3yn7XX67lRJKtck4Y8LWh2Ca9KfnzSoFMHz5rO-pC21L51QS3If4Q",
|
||||
"user_id": "05sGahtrIgU25Lity68hf4i2exJ2",
|
||||
"project_id": "661553802735"
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
|
||||
curl 'https://securetoken.googleapis.com/v1/token?key=AIzaSyAA88yObUN-0pnXAxcgOrT2exZxFWLW1BI' \
|
||||
-H 'accept: */*' \
|
||||
-H 'accept-language: en-US,en;q=0.9' \
|
||||
-H 'cache-control: no-cache' \
|
||||
-H 'content-type: application/x-www-form-urlencoded' \
|
||||
-H 'origin: https://marble.worldlabs.ai' \
|
||||
-H 'pragma: no-cache' \
|
||||
-H 'priority: u=1, i' \
|
||||
-H 'referer: https://marble.worldlabs.ai/' \
|
||||
-H 'sec-ch-ua: "Google Chrome";v="143", "Chromium";v="143", "Not A(Brand";v="24"' \
|
||||
-H 'sec-ch-ua-mobile: ?0' \
|
||||
-H 'sec-ch-ua-platform: "macOS"' \
|
||||
-H 'sec-fetch-dest: empty' \
|
||||
-H 'sec-fetch-mode: cors' \
|
||||
-H 'sec-fetch-site: cross-site' \
|
||||
-H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36' \
|
||||
-H 'x-browser-channel: stable' \
|
||||
-H 'x-browser-copyright: Copyright 2025 Google LLC. All Rights reserved.' \
|
||||
-H 'x-browser-validation: AUXUCdutEJ+6gl6bYtz7E2kgIT4=' \
|
||||
-H 'x-browser-year: 2025' \
|
||||
-H 'x-client-data: CIe2yQEIorbJAQipncoBCKSCywEIlqHLAQiGoM0BCJSkzwE=' \
|
||||
-H 'x-client-version: Chrome/JsCore/12.6.0/FirebaseCore-web' \
|
||||
-H 'x-firebase-client: eyJ2ZXJzaW9uIjoyLCJoZWFydGJlYXRzIjpbeyJhZ2VudCI6ImZpcmUtY29yZS8wLjE0LjYgZmlyZS1jb3JlLWVzbTIwMjAvMC4xNC42IGZpcmUtanMvIGZpcmUtanMtYWxsLWFwcC8xMi42LjAgZmlyZS1hdXRoLzEuMTEuMSBmaXJlLWF1dGgtZXNtMjAyMC8xLjExLjEiLCJkYXRlcyI6WyIyMDI1LTEyLTE5Il19XX0' \
|
||||
--data-raw 'grant_type=refresh_token&refresh_token=AMf-vBxnsxb_SP5MCL4zFK1uVPwHfID_5ekdzWmx89DFJdabIY8qrjbyfLEkRZcEnm8FtDYVfGKMvMhRbzgjVDzDUvegVTcYrJwable0MD-7HqIh9eNjfex03-dQthIR-sZFMm90Vw2AXMeR938gpHT7A4nt50skiMzCuQ9wjXteSKWJq1tHqUBjsQlU4jXCrempkTuSRqasbiMkYB9IqywwS2JlCg3XI6sOo_oaLLePJOQ5pwOGraQkcMd6jlyQDPtQY2mxg2oo3PA2v3dA4ebFYJSTH1CDnVAvtdYiWozrNgruD792unWJnn9Mw4aqwMgx_hK_ZecPmi8ZQ_uTwR-TMk4abT8zoOGAexxqQ-Q0dvrnyktQO--a_9YI7oeCG1BlxDzJUqSS0DELB1i0QOlBw3A3AUptYA1uaxxhz_VwX-0Qq4VybcDlvFzp65u6RUh_VEZcQlyt'
|
||||
|
||||
{
|
||||
"access_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6IjM4MTFiMDdmMjhiODQxZjRiNDllNDgyNTg1ZmQ2NmQ1NWUzOGRiNWQiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS2UtZXRkc3Q0QjBIbXJ6d3ptTG4xTG45Uko4X2lhYzN5czhqRWhtOWZEdTdYM0QxSTA9czk2LWMiLCJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vd2x0LXRyYWluaW5nLWdzYyIsImF1ZCI6IndsdC10cmFpbmluZy1nc2MiLCJhdXRoX3RpbWUiOjE3NjM0MTU5MDAsInVzZXJfaWQiOiJmN01odFFLM295WWlZdnNldE1IWW1rYWtpcnYyIiwic3ViIjoiZjdNaHRRSzNveVlpWXZzZXRNSFlta2FraXJ2MiIsImlhdCI6MTc2NjEzNTY1NSwiZXhwIjoxNzY2MTM5MjU1LCJlbWFpbCI6ImVjaGVsb25AZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZ29vZ2xlLmNvbSI6WyIxMTYwMTEyMDc0OTIzOTUyMDAzOTYiXSwiZW1haWwiOlsiZWNoZWxvbkBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJnb29nbGUuY29tIn19.S100Y7_GDtt7g8bGxMyG9NKY-f1XvsnTTISCdk3foBcRsSgyKTNi99uP2nKQzOy4XZCdL_PCcNz4WZgoJ6mHqvjms6CdbDGky9GxZ19--I9lomRFDErv33hebSA-z-PzUVUKe55iz_Y69gmvCC6I1nLRueDGn4jI5zLN-rLlpRSFZ6zhcbAsE92EdOGYE_mwiPLqxO4LyEgUnAlTfHnXCrLSf_92VILJNBboEJaQ9wMgAV41FaMgovBu8Zu-YC2Y_iRztcce9JhgRhBH6XkIc1yz2qtdaBqF5HACgoL90u5Iic-M9wdRqquR20TayJ3C4m9XG3-9OaqHF86U-6r1VQ",
|
||||
"expires_in": "3600",
|
||||
"token_type": "Bearer",
|
||||
"refresh_token": "AMf-vBxnsxb_SP5MCL4zFK1uVPwHfID_5ekdzWmx89DFJdabIY8qrjbyfLEkRZcEnm8FtDYVfGKMvMhRbzgjVDzDUvegVTcYrJwable0MD-7HqIh9eNjfex03-dQthIR-sZFMm90Vw2AXMeR938gpHT7A4nt50skiMzCuQ9wjXteSKWJq1tHqUBjsQlU4jXCrempkTuSRqasbiMkYB9IqywwS2JlCg3XI6sOo_oaLLePJOQ5pwOGraQkcMd6jlyQDPtQY2mxg2oo3PA2v3dA4ebFYJSTH1CDnVAvtdYiWozrNgruD792unWJnn9Mw4aqwMgx_hK_ZecPmi8ZQ_uTwR-TMk4abT8zoOGAexxqQ-Q0dvrnyktQO--a_9YI7oeCG1BlxDzJUqSS0DELB1i0QOlBw3A3AUptYA1uaxxhz_VwX-0Qq4VybcDlvFzp65u6RUh_VEZcQlyt",
|
||||
"id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6IjM4MTFiMDdmMjhiODQxZjRiNDllNDgyNTg1ZmQ2NmQ1NWUzOGRiNWQiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS2UtZXRkc3Q0QjBIbXJ6d3ptTG4xTG45Uko4X2lhYzN5czhqRWhtOWZEdTdYM0QxSTA9czk2LWMiLCJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vd2x0LXRyYWluaW5nLWdzYyIsImF1ZCI6IndsdC10cmFpbmluZy1nc2MiLCJhdXRoX3RpbWUiOjE3NjM0MTU5MDAsInVzZXJfaWQiOiJmN01odFFLM295WWlZdnNldE1IWW1rYWtpcnYyIiwic3ViIjoiZjdNaHRRSzNveVlpWXZzZXRNSFlta2FraXJ2MiIsImlhdCI6MTc2NjEzNTY1NSwiZXhwIjoxNzY2MTM5MjU1LCJlbWFpbCI6ImVjaGVsb25AZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZ29vZ2xlLmNvbSI6WyIxMTYwMTEyMDc0OTIzOTUyMDAzOTYiXSwiZW1haWwiOlsiZWNoZWxvbkBnbWFpbC5jb20iXX0sInNpZ25faW5fcHJvdmlkZXIiOiJnb29nbGUuY29tIn19.S100Y7_GDtt7g8bGxMyG9NKY-f1XvsnTTISCdk3foBcRsSgyKTNi99uP2nKQzOy4XZCdL_PCcNz4WZgoJ6mHqvjms6CdbDGky9GxZ19--I9lomRFDErv33hebSA-z-PzUVUKe55iz_Y69gmvCC6I1nLRueDGn4jI5zLN-rLlpRSFZ6zhcbAsE92EdOGYE_mwiPLqxO4LyEgUnAlTfHnXCrLSf_92VILJNBboEJaQ9wMgAV41FaMgovBu8Zu-YC2Y_iRztcce9JhgRhBH6XkIc1yz2qtdaBqF5HACgoL90u5Iic-M9wdRqquR20TayJ3C4m9XG3-9OaqHF86U-6r1VQ",
|
||||
"user_id": "f7MhtQK3oyYiYvsetMHYmkakirv2",
|
||||
"project_id": "661553802735"
|
||||
}
|
||||
+154
@@ -0,0 +1,154 @@
|
||||
use crate::api::api_types::upload_mime_type::UploadMimeType;
|
||||
use crate::api::common::common_header_values::{ORIGIN_VALUE, REFERER_VALUE};
|
||||
use crate::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use crate::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use crate::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use crate::error::world_labs_client_error::WorldLabsClientError;
|
||||
use crate::error::world_labs_error::WorldLabsError;
|
||||
use crate::error::world_labs_generic_api_error::WorldLabsGenericApiError;
|
||||
use crate::error::world_labs_specific_api_error::WorldLabsSpecificApiError;
|
||||
use http_headers::names::{PRIORITY, SEC_FETCH_DEST, SEC_FETCH_MODE, SEC_FETCH_SITE, SEC_GPC};
|
||||
use http_headers::values::accept::ACCEPT_ALL;
|
||||
use http_headers::values::accept_encoding::ACCEPT_ENCODING_GZIP_ETC;
|
||||
use http_headers::values::accept_language::ACCEPT_LANGUAGE_EN_US;
|
||||
use http_headers::values::cache_control::CACHE_CONTROL_NO_CACHE;
|
||||
use http_headers::values::connection::CONNECTION_KEEP_ALIVE;
|
||||
use http_headers::values::pragma::PRAGMA_NO_CACHE;
|
||||
use http_headers::values::priority::{PRIORITY_4, PRIORITY_6};
|
||||
use http_headers::values::sec::{SEC_FETCH_DEST_EMPTY, SEC_FETCH_MODE_CORS, SEC_FETCH_SITE_CROSS_SITE};
|
||||
use http_headers::values::te::TE_TRAILERS;
|
||||
use log::{debug, error};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use std::time::Duration;
|
||||
use wreq::header::{ACCEPT, ACCEPT_ENCODING, ACCEPT_LANGUAGE, AUTHORIZATION, CACHE_CONTROL, CONNECTION, CONTENT_LENGTH, CONTENT_TYPE, ORIGIN, PRAGMA, REFERER, TE};
|
||||
use wreq::multipart::Form;
|
||||
use wreq::Client;
|
||||
use wreq_util::Emulation;
|
||||
|
||||
/// NB: key is the public API key for WorldLabs
|
||||
/// https://docs.cloud.google.com/identity-platform/docs/use-rest-api
|
||||
const URL : &str = "https://securetoken.googleapis.com/v1/token?key=AIzaSyAA88yObUN-0pnXAxcgOrT2exZxFWLW1BI";
|
||||
pub struct GoogleRefreshTokenArgs<'a> {
|
||||
pub refresh_token: &'a WorldLabsRefreshToken,
|
||||
pub request_timeout: Option<Duration>,
|
||||
}
|
||||
|
||||
pub struct GoogleRefreshTokenResponse {
|
||||
pub bearer_token: WorldLabsBearerToken,
|
||||
pub refresh_token: WorldLabsRefreshToken,
|
||||
}
|
||||
|
||||
/// Refresh Access Token for WorldLabs using Google.
|
||||
pub async fn google_refresh_token(args: GoogleRefreshTokenArgs<'_>) -> Result<GoogleRefreshTokenResponse, WorldLabsError> {
|
||||
let client = Client::builder()
|
||||
.emulation(Emulation::Firefox143)
|
||||
.build()
|
||||
.map_err(|err| WorldLabsClientError::WreqClientError(err))?;
|
||||
|
||||
|
||||
debug!("Requesting URL: {}", URL);
|
||||
|
||||
let mut request_builder = client.post(URL)
|
||||
.header(ACCEPT, ACCEPT_ALL)
|
||||
.header(ACCEPT_LANGUAGE, ACCEPT_LANGUAGE_EN_US)
|
||||
.header(ACCEPT_ENCODING, ACCEPT_ENCODING_GZIP_ETC)
|
||||
.header(REFERER, REFERER_VALUE)
|
||||
.header(CONNECTION, CONNECTION_KEEP_ALIVE)
|
||||
.header(SEC_FETCH_DEST, SEC_FETCH_DEST_EMPTY)
|
||||
.header(SEC_FETCH_MODE, SEC_FETCH_MODE_CORS)
|
||||
.header(SEC_FETCH_SITE, SEC_FETCH_SITE_CROSS_SITE)
|
||||
.header(PRIORITY, PRIORITY_4)
|
||||
.header(TE, TE_TRAILERS);
|
||||
|
||||
let mut form = HashMap::new();
|
||||
form.insert("grant_type", "refresh_token".to_string());
|
||||
form.insert("refresh_token", args.refresh_token.to_raw_string());
|
||||
|
||||
if let Some(timeout) = args.request_timeout {
|
||||
request_builder = request_builder.timeout(timeout);
|
||||
}
|
||||
|
||||
let http_request = request_builder
|
||||
.form(&form)
|
||||
.build()
|
||||
.map_err(|err| {
|
||||
error!("Error building request: {:?}", err);
|
||||
WorldLabsClientError::WreqClientError(err)
|
||||
})?;
|
||||
|
||||
let response = client.execute(http_request)
|
||||
.await
|
||||
.map_err(|err| {
|
||||
error!("Error during request execution: {:?}", err);
|
||||
WorldLabsGenericApiError::WreqError(err)
|
||||
})?;
|
||||
|
||||
let status = response.status();
|
||||
|
||||
let response_body = response.text()
|
||||
.await
|
||||
.map_err(|err| {
|
||||
error!("Error reading response body: {:?}", err);
|
||||
WorldLabsGenericApiError::WreqError(err)
|
||||
})?;
|
||||
|
||||
if !status.is_success() {
|
||||
error!("Request returned an error (code {}) : {:?}", status.as_u16(), response_body);
|
||||
|
||||
if response_body.contains("SignatureDoesNotMatch") || response_body.contains("does not match the signature") {
|
||||
return Err(WorldLabsSpecificApiError::GoogleUploadSignatureDoesNotMatch.into());
|
||||
} else {
|
||||
return Err(WorldLabsGenericApiError::GoogleUploadFailed { status_code: status, body: response_body }.into());
|
||||
}
|
||||
}
|
||||
|
||||
debug!("Response body (200): {}", response_body);
|
||||
|
||||
let response : RawResponse = serde_json::from_str(&response_body)
|
||||
.map_err(|err| WorldLabsGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.to_string()))?;
|
||||
|
||||
let bearer_token = WorldLabsBearerToken::new(response.access_token);
|
||||
let refresh_token = WorldLabsRefreshToken::new(response.refresh_token);
|
||||
|
||||
Ok(GoogleRefreshTokenResponse {
|
||||
bearer_token,
|
||||
refresh_token,
|
||||
})
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct RawResponse {
|
||||
pub access_token: String,
|
||||
pub refresh_token: String,
|
||||
|
||||
// eg. "3600"
|
||||
pub expires_in: Option<String>,
|
||||
pub id_token: Option<String>,
|
||||
pub user_id: Option<String>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::api::requests::google_refresh_token::google_refresh_token::{google_refresh_token, GoogleRefreshTokenArgs};
|
||||
use crate::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use crate::test_utils::setup_test_logging::setup_test_logging;
|
||||
use errors::AnyhowResult;
|
||||
use log::LevelFilter;
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // Client side tests only
|
||||
async fn test_requests() -> AnyhowResult<()> {
|
||||
setup_test_logging(LevelFilter::Debug);
|
||||
|
||||
let refresh_token = "AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778";
|
||||
let refresh_token = WorldLabsRefreshToken::new(refresh_token.to_string());
|
||||
|
||||
let result = google_refresh_token(GoogleRefreshTokenArgs {
|
||||
refresh_token: &refresh_token,
|
||||
request_timeout: None,
|
||||
}).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
pub mod google_refresh_token;
|
||||
@@ -1,4 +1,5 @@
|
||||
pub mod google_upload;
|
||||
pub mod objects;
|
||||
pub mod recaption;
|
||||
pub mod worlds;
|
||||
pub mod worlds;
|
||||
pub mod google_refresh_token;
|
||||
@@ -7,6 +7,7 @@ use crate::api::common::common_header_values::{ORIGIN_VALUE, REFERER_VALUE};
|
||||
use crate::api::utils::upload_id_to_image_url::upload_id_to_image_url;
|
||||
use crate::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use crate::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use crate::error::filter_world_labs_http_error::filter_world_labs_http_error;
|
||||
use crate::error::world_labs_client_error::WorldLabsClientError;
|
||||
use crate::error::world_labs_error::WorldLabsError;
|
||||
use crate::error::world_labs_generic_api_error::WorldLabsGenericApiError;
|
||||
@@ -103,13 +104,12 @@ pub async fn create_world(args: CreateWorldArgs<'_>) -> Result<CreateWorldRespon
|
||||
WorldLabsGenericApiError::WreqError(err)
|
||||
})?;
|
||||
|
||||
// TODO: Handle errors (Cloudflare, Grok, etc.)
|
||||
if !status.is_success() {
|
||||
error!("Request returned an error (code {}) : {:?}", status.as_u16(), response_body);
|
||||
//return Err(classify_general_http_status_code_and_body(status, response_body));
|
||||
return Err(WorldLabsGenericApiError::UncategorizedBadResponseWithStatusAndBody { status_code: status, body: response_body}.into())
|
||||
}
|
||||
|
||||
filter_world_labs_http_error(status, Some(&response_body))?;
|
||||
|
||||
debug!("Response body (200): {}", response_body);
|
||||
|
||||
let response : RawResponse = serde_json::from_str(&response_body)
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
use crate::error::world_labs_error::WorldLabsError;
|
||||
use crate::error::world_labs_generic_api_error::WorldLabsGenericApiError;
|
||||
use crate::error::world_labs_specific_api_error::WorldLabsSpecificApiError;
|
||||
use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
|
||||
use wreq::StatusCode;
|
||||
|
||||
/// We know the response is an error at this point.
|
||||
/// We're just turning it into the right error.
|
||||
pub fn categorize_grok_http_error(status_code: StatusCode, maybe_body: Option<&str>) -> WorldLabsError {
|
||||
|
||||
if let Some(body) = maybe_body {
|
||||
if let Err(err) = filter_cloudflare_errors(status_code.as_u16(), body) {
|
||||
return WorldLabsGenericApiError::CloudflareError(err).into();
|
||||
}
|
||||
|
||||
let body = body.to_lowercase();
|
||||
let anti_bot = body.contains("anti-bot") || body.contains("rejected");
|
||||
|
||||
if anti_bot {
|
||||
return WorldLabsSpecificApiError::AutomationBlocked.into();
|
||||
}
|
||||
|
||||
match status_code {
|
||||
StatusCode::TOO_MANY_REQUESTS => {
|
||||
return WorldLabsSpecificApiError::TooManyVideos.into();
|
||||
}
|
||||
_ => {},
|
||||
}
|
||||
|
||||
return WorldLabsGenericApiError::UncategorizedBadResponseWithStatusAndBody {
|
||||
status_code,
|
||||
body: body.to_string(),
|
||||
}.into();
|
||||
}
|
||||
|
||||
WorldLabsGenericApiError::UncategorizedBadResponseWithStatus(status_code).into()
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
use crate::error::world_labs_error::WorldLabsError;
|
||||
use crate::error::world_labs_generic_api_error::WorldLabsGenericApiError;
|
||||
use crate::error::world_labs_specific_api_error::WorldLabsSpecificApiError;
|
||||
use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
|
||||
use wreq::StatusCode;
|
||||
|
||||
/// Detect error HTTP responses and coerce the response as a Rust Error.
|
||||
pub fn filter_world_labs_http_error(status_code: StatusCode, maybe_body: Option<&str>) -> Result<(), WorldLabsError> {
|
||||
if status_code.is_success() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
/// Early and easy to detect errors.
|
||||
match status_code {
|
||||
StatusCode::PAYMENT_REQUIRED => {
|
||||
// {"detail":"Insufficient credits for product 'Marble 0.1-plus'. Please add credits to your account."}
|
||||
return Err(WorldLabsSpecificApiError::InsufficientCredits.into());
|
||||
},
|
||||
_ => {}, // Fall Through.
|
||||
}
|
||||
|
||||
if let Some(body) = maybe_body {
|
||||
filter_cloudflare_errors(status_code.as_u16(), body)?;
|
||||
|
||||
return Err(WorldLabsGenericApiError::UncategorizedBadResponseWithStatusAndBody {
|
||||
status_code,
|
||||
body: body.to_string(),
|
||||
}.into());
|
||||
}
|
||||
|
||||
Err(WorldLabsGenericApiError::UncategorizedBadResponseWithStatus(status_code).into())
|
||||
}
|
||||
@@ -2,4 +2,4 @@ pub mod world_labs_client_error;
|
||||
pub mod world_labs_error;
|
||||
pub mod world_labs_generic_api_error;
|
||||
pub mod world_labs_specific_api_error;
|
||||
pub (crate) mod categorize_world_labs_http_error;
|
||||
pub (crate) mod filter_world_labs_http_error;
|
||||
@@ -51,3 +51,9 @@ impl From<WorldLabsGenericApiError> for WorldLabsError {
|
||||
Self::ApiGeneric(error)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<CloudflareError> for WorldLabsError {
|
||||
fn from(error: CloudflareError) -> Self {
|
||||
Self::ApiGeneric(WorldLabsGenericApiError::CloudflareError(error))
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,9 @@ pub enum WorldLabsSpecificApiError {
|
||||
/// Too many videos are being generated.
|
||||
TooManyVideos,
|
||||
|
||||
/// There aren't sufficient funds for generation.
|
||||
InsufficientCredits,
|
||||
|
||||
// /// Failed to generate a bearer token despite the `200 OK` response.
|
||||
// /// This has been generated by sending old/expired session cookies or empty cookies.
|
||||
// FailedToGenerateBearerToken,
|
||||
@@ -69,6 +72,7 @@ impl Display for WorldLabsSpecificApiError {
|
||||
Self::GoogleUploadSignatureDoesNotMatch => write!(f, "Google upload signature does not match"),
|
||||
Self::AutomationBlocked => write!(f, "Automation blocked"),
|
||||
Self::TooManyVideos => write!(f, "Too many videos are being generated"),
|
||||
Self::InsufficientCredits => write!(f, "Insufficient credits"),
|
||||
|
||||
//Self::FailedToGenerateBearerToken => write!(f, "Failed to generate bearer token. Probably invalid or expired session cookies."),
|
||||
//Self::InvalidJwt => write!(f, "Invalid JWT token. Please refresh the token."),
|
||||
|
||||
+128
-27
@@ -1,36 +1,40 @@
|
||||
use std::path::PathBuf;
|
||||
use crate::api::api_types::image_input_object_id::ImageInputObjectId;
|
||||
use crate::api::api_types::meta_world_object_id::MetaWorldObjectId;
|
||||
use crate::api::api_types::pano_object_id::PanoObjectId;
|
||||
use crate::api::api_types::run_object_id::RunObjectId;
|
||||
use crate::api::api_types::upload_mime_type::UploadMimeType;
|
||||
use crate::api::api_types::world_id::WorldObjectId;
|
||||
use crate::api::requests::google_refresh_token::google_refresh_token::{google_refresh_token, GoogleRefreshTokenArgs};
|
||||
use crate::api::requests::google_upload::google_upload_image::{google_upload_image, GoogleUploadImageArgs};
|
||||
use crate::api::requests::objects::create_upload_object::{create_upload_object, CreateUploadObjectArgs};
|
||||
use crate::api::requests::objects::begin_object_image_upload::{begin_object_image_upload, BeginObjectImageUploadArgs};
|
||||
use crate::api::requests::objects::create_run_object::{create_run_object, CreateRunObjectArgs};
|
||||
use crate::api::requests::objects::create_upload_object::{create_upload_object, CreateUploadObjectArgs};
|
||||
use crate::api::requests::objects::finalize_object_image_upload::{finalize_object_image_upload, FinalizeObjectImageUploadArgs};
|
||||
use crate::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use crate::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use crate::error::world_labs_error::WorldLabsError;
|
||||
use crate::error::world_labs_generic_api_error::WorldLabsGenericApiError;
|
||||
use anyhow::bail;
|
||||
use log::{error, info};
|
||||
use serde::Deserialize;
|
||||
use std::time::Duration;
|
||||
use uuid::Uuid;
|
||||
use filesys::file_read_bytes::file_read_bytes;
|
||||
use crate::api::api_types::image_input_object_id::ImageInputObjectId;
|
||||
use crate::api::api_types::pano_object_id::PanoObjectId;
|
||||
use crate::api::api_types::meta_world_object_id::MetaWorldObjectId;
|
||||
use crate::api::api_types::world_id::WorldObjectId;
|
||||
use crate::api::requests::objects::update_run_object_with_upload::{update_run_object_with_upload, UpdateRunObjectWithUploadArgs, UpdateRunObjectWithUploadPayloadArgs};
|
||||
use crate::api::requests::objects::update_run_object_with_world::{update_run_object_with_world, UpdateRunObjectWithWorldArgs, UpdateRunObjectWithWorldPayloadArgs};
|
||||
use crate::api::requests::recaption::recaption_image::{recaption_image, RecaptionImageArgs};
|
||||
use crate::api::requests::worlds::create_world::{create_world, CreateWorldArgs};
|
||||
use crate::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use crate::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use crate::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use crate::error::world_labs_client_error::WorldLabsClientError;
|
||||
use crate::error::world_labs_error::WorldLabsError;
|
||||
use crate::error::world_labs_generic_api_error::WorldLabsGenericApiError;
|
||||
use anyhow::bail;
|
||||
use chrono::{TimeDelta, Utc};
|
||||
use filesys::file_read_bytes::file_read_bytes;
|
||||
use log::{error, info, warn};
|
||||
use serde::Deserialize;
|
||||
use std::path::PathBuf;
|
||||
use std::time::Duration;
|
||||
use uuid::Uuid;
|
||||
|
||||
pub struct UploadImageAndCreateWorldWithRetryArgs<'a> {
|
||||
pub file: FileBytesOrPath,
|
||||
pub cookies: &'a WorldLabsCookies,
|
||||
pub bearer_token: &'a WorldLabsBearerToken,
|
||||
pub refresh_token: &'a WorldLabsRefreshToken,
|
||||
pub individual_request_timeout: Option<Duration>,
|
||||
pub file: FileBytesOrPath,
|
||||
}
|
||||
|
||||
pub enum FileBytesOrPath {
|
||||
@@ -42,6 +46,14 @@ pub struct UploadImageAndCreateWorldWithRetryResponse {
|
||||
pub run_id: RunObjectId,
|
||||
pub world_id: WorldObjectId,
|
||||
pub image_upload_url: String,
|
||||
|
||||
/// If the tokens were renewed, this is them.
|
||||
pub maybe_new_access_tokens: Option<NewAccessTokens>,
|
||||
}
|
||||
|
||||
pub struct NewAccessTokens {
|
||||
pub bearer_token: WorldLabsBearerToken,
|
||||
pub refresh_token: WorldLabsRefreshToken,
|
||||
}
|
||||
|
||||
/// Marble Image-to-World
|
||||
@@ -49,6 +61,55 @@ pub struct UploadImageAndCreateWorldWithRetryResponse {
|
||||
/// Request #5 (of ~10)
|
||||
pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreateWorldWithRetryArgs<'_>) -> Result<UploadImageAndCreateWorldWithRetryResponse, WorldLabsError> {
|
||||
|
||||
info!("Checking to see if bearer token needs refresh (fails open) ...");
|
||||
|
||||
let mut maybe_refresh_bearer = false;
|
||||
|
||||
match args.bearer_token.parse_jwt_claims() {
|
||||
Err(err) => {
|
||||
warn!("Failed to parse bearer_token jwt claims (failing open) : {}", err);
|
||||
}
|
||||
Ok(jwt) => {
|
||||
let now = Utc::now();
|
||||
if now > jwt.expiration {
|
||||
info!("Bearer is expired.");
|
||||
maybe_refresh_bearer = true;
|
||||
}
|
||||
|
||||
let sooner_expiry = jwt.expiration
|
||||
.checked_sub_signed(TimeDelta::minutes(30))
|
||||
.unwrap_or(jwt.expiration);
|
||||
|
||||
if now > sooner_expiry {
|
||||
info!("Bearer will expire soon, so we're renewing it in advance.");
|
||||
maybe_refresh_bearer = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let mut maybe_new_access_tokens = None;
|
||||
|
||||
if maybe_refresh_bearer {
|
||||
info!("Refreshing bearer token...");
|
||||
|
||||
let updated = google_refresh_token(GoogleRefreshTokenArgs {
|
||||
refresh_token: &args.refresh_token,
|
||||
request_timeout: args.individual_request_timeout,
|
||||
}).await?;
|
||||
|
||||
info!("Bearer token refreshed!");
|
||||
|
||||
maybe_new_access_tokens = Some(NewAccessTokens {
|
||||
bearer_token: updated.bearer_token,
|
||||
refresh_token: updated.refresh_token,
|
||||
});
|
||||
}
|
||||
|
||||
let use_bearer_token = maybe_new_access_tokens
|
||||
.as_ref()
|
||||
.map(|tokens| &tokens.bearer_token)
|
||||
.unwrap_or_else(|| args.bearer_token);
|
||||
|
||||
info!("Checking file input...");
|
||||
|
||||
let file_bytes = match args.file {
|
||||
@@ -67,12 +128,12 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
info!("Request #1 of 10: create run object ...");
|
||||
|
||||
let response = create_run_object(CreateRunObjectArgs {
|
||||
cookies: args.cookies,
|
||||
bearer_token: args.bearer_token,
|
||||
bearer_token: use_bearer_token,
|
||||
request_timeout: args.individual_request_timeout,
|
||||
}).await?;
|
||||
|
||||
@@ -88,7 +149,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = create_upload_object(CreateUploadObjectArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
upload_mime_type,
|
||||
request_timeout: args.individual_request_timeout,
|
||||
}).await?;
|
||||
@@ -101,7 +162,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = begin_object_image_upload(BeginObjectImageUploadArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
upload_mime_type,
|
||||
request_timeout: args.individual_request_timeout,
|
||||
upload_id: &upload_id,
|
||||
@@ -124,7 +185,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = finalize_object_image_upload(FinalizeObjectImageUploadArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
upload_id: &upload_id,
|
||||
request_timeout: args.individual_request_timeout,
|
||||
}).await?;
|
||||
@@ -141,7 +202,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = update_run_object_with_upload(UpdateRunObjectWithUploadArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
payload_args: UpdateRunObjectWithUploadPayloadArgs {
|
||||
run_id: &run_object_id,
|
||||
run_created_at_timestamp: run_object.metadata.created_at,
|
||||
@@ -159,7 +220,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = recaption_image(RecaptionImageArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
upload_id: &upload_id,
|
||||
upload_mime_type,
|
||||
run_id: &run_object_id,
|
||||
@@ -176,7 +237,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = create_world(CreateWorldArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
text_prompt: &text_prompt,
|
||||
image_upload_url: &image_url,
|
||||
request_timeout: args.individual_request_timeout,
|
||||
@@ -190,7 +251,7 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
|
||||
let response = update_run_object_with_world(UpdateRunObjectWithWorldArgs {
|
||||
cookies: &args.cookies,
|
||||
bearer_token: &args.bearer_token,
|
||||
bearer_token: &use_bearer_token,
|
||||
payload_args: UpdateRunObjectWithWorldPayloadArgs {
|
||||
run_id: &run_object_id,
|
||||
run_created_at_timestamp: run_object.metadata.created_at,
|
||||
@@ -210,11 +271,15 @@ pub async fn upload_image_and_create_world_with_retry(args: UploadImageAndCreate
|
||||
run_id: run_object_id,
|
||||
image_upload_url: image_url,
|
||||
world_id,
|
||||
maybe_new_access_tokens,
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use crate::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use crate::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use crate::recipes::upload_image_and_create_world_with_retry::{upload_image_and_create_world_with_retry, FileBytesOrPath, UploadImageAndCreateWorldWithRetryArgs};
|
||||
use crate::test_utils::get_test_bearer_token::get_test_bearer_token;
|
||||
use crate::test_utils::get_test_cookies::get_typed_test_cookies;
|
||||
@@ -229,9 +294,10 @@ mod tests {
|
||||
|
||||
let cookies = get_typed_test_cookies().unwrap();
|
||||
let bearer_token = get_test_bearer_token().unwrap();
|
||||
let refresh_token = WorldLabsRefreshToken::new("AMf-vBy91tuAOoeCwbXV3zNcFAM79ayEKb_cRmTBhVLAIRB1kDzswDgenVnxHfgbmUP95YTlJkpSwJUK3eTZv0iV1An-rZUVII8tOoyLNpV-O1dhytsMXFjR5Mc_hRxUhwuRphUZT6Zub9T1Twd8OL88twFnN-qlwq12W_eRZnEC_IExX0-j6vhfRbVXY0Bf9F1jddeaN7FMgagVzlIt7c7hbboR3XRlU61oBhuEw90ynHWPhDrnTVBtT9xI_TrNFr-v6mMh3M1DGFN9iaHVl74fEwbV6VanUGua55uxdVgia-SyOkYboKRGanWof2g69vZNvREdlMiNFYfWDtsHgcd_DaS6oemS5CVoSbK8sRREUAXHRCmwO5OyZehacnKstyy0TnNwZuvtn_KMzpk3ZmLM-Q-yERlJvpd9rHU-d-uV2R-yZIWgT3rshE9WyK9i4p731RgXfEC6".to_string());
|
||||
|
||||
//let file_path = "/home/bt/Pictures/locations/island.jpg";
|
||||
let file_path = "/Users/bt/Pictures/Midjourney/winding_road.jpeg";
|
||||
let file_path = "/Users/bt/Pictures/Midjourney/dusk_house.jpeg";
|
||||
let file_bytes = file_read_bytes(file_path).unwrap();
|
||||
|
||||
println!("File bytes len: {}", file_bytes.len());
|
||||
@@ -239,12 +305,47 @@ mod tests {
|
||||
let results = upload_image_and_create_world_with_retry(UploadImageAndCreateWorldWithRetryArgs {
|
||||
cookies: &cookies,
|
||||
bearer_token: &bearer_token,
|
||||
refresh_token: &refresh_token,
|
||||
individual_request_timeout: None,
|
||||
file: FileBytesOrPath::Bytes(file_bytes),
|
||||
}).await.unwrap();
|
||||
|
||||
println!("Upload URL: {}", results.image_upload_url);
|
||||
println!("Object ID: {}", results.run_id.0);
|
||||
}
|
||||
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // Client side tests only
|
||||
async fn test_requests_2() {
|
||||
setup_test_logging(LevelFilter::Debug);
|
||||
|
||||
// bt@brand.io
|
||||
let cookies = "";
|
||||
let bearer_token = "eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk4OGQ1YTM3OWI3OGJkZjFlNTBhNDA5MTEzZjJiMGM3NWU0NTJlNDciLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiQnJhbmRvbiBUaG9tYXMiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS0lucl8yWGJ2Z1VERUxNOEpCTGdfa2tKbVpxWl9WcTlzZkI2bVR4VmQzc1NJRk4tST1zOTYtYyIsImlzcyI6Imh0dHBzOi8vc2VjdXJldG9rZW4uZ29vZ2xlLmNvbS93bHQtdHJhaW5pbmctZ3NjIiwiYXVkIjoid2x0LXRyYWluaW5nLWdzYyIsImF1dGhfdGltZSI6MTc2MDE3Nzk3OCwidXNlcl9pZCI6IjA1c0dhaHRySWdVMjVMaXR5NjhoZjRpMmV4SjIiLCJzdWIiOiIwNXNHYWh0cklnVTI1TGl0eTY4aGY0aTJleEoyIiwiaWF0IjoxNzY2MTI2ODg4LCJleHAiOjE3NjYxMzA0ODgsImVtYWlsIjoiYnRAYnJhbmQuaW8iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJnb29nbGUuY29tIjpbIjEwNjEwODI2NzgzNTYyOTEwMTc1OSJdLCJlbWFpbCI6WyJidEBicmFuZC5pbyJdfSwic2lnbl9pbl9wcm92aWRlciI6Imdvb2dsZS5jb20ifX0.YLXZHg0rzMzyhhyJsO3DSMhU8GjnxtQtg1GiDwaxZjuybmabqOcR_b4C2lE2XwESg_dDYnIkmdas9wsHshy2bGPCAAtrinQpxTHWhIDxy0bsF8yW0BCOszwVseiTkXd6vveaGYH06EvH-nM4Q5AB_oKbsgRyMEbXhepvX7SlrmeaXxqldCLRalDj6gcEIY_TSwMmjnZ6-sFMPe92YjLY1ITPRx7S3YyWNwBG6mVpgoHcHudNAJ4TFxborZlhC1zpF0NDgtIhN5ITg0I1P0A-JTaBTJHukQwCPKhifFRA1kfcxzbAoZyPiPw2DdgXpDDnNzXUYgnaOOVyGs96Tx8hOQ";
|
||||
let refresh_token = "AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778";
|
||||
|
||||
//let cookies = get_typed_test_cookies().unwrap();
|
||||
|
||||
let bearer_token = WorldLabsBearerToken::new(bearer_token.to_string());
|
||||
let refresh_token = WorldLabsRefreshToken::new(refresh_token.to_string());
|
||||
let cookies = WorldLabsCookies::new(cookies.to_string());
|
||||
|
||||
//let file_path = "/home/bt/Pictures/locations/island.jpg";
|
||||
let file_path = "/Users/bt/Pictures/Midjourney/train_ghibli.jpeg";
|
||||
let file_bytes = file_read_bytes(file_path).unwrap();
|
||||
|
||||
println!("File bytes len: {}", file_bytes.len());
|
||||
|
||||
let results = upload_image_and_create_world_with_retry(UploadImageAndCreateWorldWithRetryArgs {
|
||||
cookies: &cookies,
|
||||
bearer_token: &bearer_token,
|
||||
refresh_token: &refresh_token,
|
||||
individual_request_timeout: None,
|
||||
file: FileBytesOrPath::Bytes(file_bytes),
|
||||
}).await.unwrap();
|
||||
|
||||
println!("Upload URL: {}", results.image_upload_url);
|
||||
println!("Object ID: {}", results.run_id.0);
|
||||
}
|
||||
}
|
||||
@@ -138,6 +138,10 @@ impl GenerateError {
|
||||
pub fn needs_storyteller_credentials() -> Self {
|
||||
Self::MissingCredentials(MissingCredentialsReason::NeedsStorytellerCredentials)
|
||||
}
|
||||
|
||||
pub fn needs_worldlabs_credentials() -> Self {
|
||||
Self::MissingCredentials(MissingCredentialsReason::NeedsWorldLabsCredentials)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<AnyhowError> for GenerateError {
|
||||
|
||||
+24
-3
@@ -2,6 +2,7 @@ use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateErr
|
||||
use crate::core::commands::enqueue::image_to_gaussian::enqueue_image_to_gaussian_command::EnqueueImageToGaussianRequest;
|
||||
use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
|
||||
use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize};
|
||||
use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent;
|
||||
use crate::core::events::generation_events::common::GenerationModel;
|
||||
use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
|
||||
use crate::core::state::data_dir::app_data_root::AppDataRoot;
|
||||
@@ -35,7 +36,8 @@ pub async fn handle_worldlabs_marble(
|
||||
Some(cookies) => cookies,
|
||||
None => {
|
||||
error!("No WorldLabs cookies!");
|
||||
return Err(GenerateError::MissingCredentials(MissingCredentialsReason::NeedsWorldLabsCredentials));
|
||||
ShowProviderLoginModalEvent::send_for_provider(GenerationProvider::WorldLabs, &app);
|
||||
return Err(GenerateError::needs_worldlabs_credentials());
|
||||
}
|
||||
};
|
||||
|
||||
@@ -43,11 +45,19 @@ pub async fn handle_worldlabs_marble(
|
||||
Some(bearer) => bearer,
|
||||
None => {
|
||||
error!("No WorldLabs bearer token!");
|
||||
return Err(GenerateError::MissingCredentials(MissingCredentialsReason::NeedsWorldLabsCredentials));
|
||||
ShowProviderLoginModalEvent::send_for_provider(GenerationProvider::WorldLabs, &app);
|
||||
return Err(GenerateError::needs_worldlabs_credentials());
|
||||
}
|
||||
};
|
||||
|
||||
let job_id = generate_random_uuid();
|
||||
let world_labs_refresh = match worldlabs_creds_manager.maybe_copy_refresh_token()? {
|
||||
Some(bearer) => bearer,
|
||||
None => {
|
||||
error!("No WorldLabs refresh token!");
|
||||
ShowProviderLoginModalEvent::send_for_provider(GenerationProvider::WorldLabs, &app);
|
||||
return Err(GenerateError::needs_worldlabs_credentials());
|
||||
}
|
||||
};
|
||||
|
||||
let maybe_prompt = request.prompt
|
||||
.as_deref()
|
||||
@@ -66,6 +76,7 @@ pub async fn handle_worldlabs_marble(
|
||||
let response = upload_image_and_create_world_with_retry(UploadImageAndCreateWorldWithRetryArgs {
|
||||
cookies: &world_labs_cookies,
|
||||
bearer_token: &world_labs_bearer,
|
||||
refresh_token: &world_labs_refresh,
|
||||
individual_request_timeout: None,
|
||||
file: FileBytesOrPath::Path(file_path),
|
||||
}).await?;
|
||||
@@ -75,6 +86,16 @@ pub async fn handle_worldlabs_marble(
|
||||
|
||||
info!("Run ID: {:?}", run_id);
|
||||
info!("World ID: {:?}", world_id);
|
||||
|
||||
if let Some(new_access) = response.maybe_new_access_tokens {
|
||||
info!("New access tokens were generated; saving.");
|
||||
worldlabs_creds_manager.replace_bearer_and_refresh_token(
|
||||
new_access.bearer_token,
|
||||
new_access.refresh_token
|
||||
)?;
|
||||
|
||||
worldlabs_creds_manager.persist_to_disk()?;
|
||||
}
|
||||
|
||||
Ok(TaskEnqueueSuccess {
|
||||
provider: GenerationProvider::WorldLabs,
|
||||
|
||||
@@ -137,6 +137,16 @@ impl WorldlabsCredentialManager {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn replace_bearer_and_refresh_token(&self, bearer_token: WorldLabsBearerToken, refresh_token: WorldLabsRefreshToken) -> anyhow::Result<()> {
|
||||
match self.credential_data.write() {
|
||||
Err(err) => Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err)),
|
||||
Ok(mut holder) => {
|
||||
holder.world_labs_bearer_token = Some(bearer_token);
|
||||
holder.world_labs_refresh_token = Some(refresh_token);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// NB: This is just a heuristic. We'll add better checks later.
|
||||
pub fn do_task_polling(&self) -> anyhow::Result<bool> {
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
|
||||
|
||||
/// Accept-Encoding
|
||||
/// Sent by Firefox for en-US on Mac
|
||||
pub const ACCEPT_ENCODING_GZIP_ETC : &str = "gzip, deflate, br, zstd";
|
||||
@@ -0,0 +1,4 @@
|
||||
|
||||
/// Accept-Language
|
||||
/// Sent by Firefox for en-US on Mac
|
||||
pub const ACCEPT_LANGUAGE_EN_US: &str = "en-US,en;q=0.5";
|
||||
@@ -1,4 +1,6 @@
|
||||
pub mod accept;
|
||||
pub mod accept_encoding;
|
||||
pub mod accept_language;
|
||||
pub mod cache_control;
|
||||
pub mod connection;
|
||||
pub mod content_type;
|
||||
|
||||
@@ -4,4 +4,5 @@ export enum GenerationProvider {
|
||||
Fal = "fal",
|
||||
Midjourney = "midjourney",
|
||||
Sora = "sora",
|
||||
WorldLabs = "world_labs",
|
||||
}
|
||||
@@ -44,8 +44,11 @@ export function ProviderSetupModal({
|
||||
|
||||
const buttonOnClick = async () => {
|
||||
switch (provider) {
|
||||
case GenerationProvider.WorldLabs:
|
||||
await invoke("worldlabs_open_login_command");
|
||||
break;
|
||||
case GenerationProvider.Grok:
|
||||
await invoke("grok_open_login_command"); // TODO: Rename in Tauri
|
||||
await invoke("grok_open_login_command");
|
||||
break;
|
||||
case GenerationProvider.Midjourney:
|
||||
await invoke("midjourney_open_login_command");
|
||||
@@ -123,6 +126,8 @@ function getServiceProviderName(provider: GenerationProvider) : string {
|
||||
return "Midjourney";
|
||||
case GenerationProvider.Sora:
|
||||
return "Sora";
|
||||
case GenerationProvider.WorldLabs:
|
||||
return "WorldLabs";
|
||||
case GenerationProvider.Artcraft:
|
||||
default:
|
||||
return "Artcraft";
|
||||
|
||||
Reference in new issue
Block a user