-
Couldn't load subscription status.
- Fork 6k
[app-server] read rate limits API #5302
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9ea54d8
[app-server] read rate limit API
owenlin0 7b52ba8
move rate limit struct parsing into backend-client
owenlin0 0e90a4a
use anyhow result for rate limits tests
owenlin0 1655c7e
check against constant in user_agent.rs
owenlin0 81e01a3
helper for passing in codex auth into backend-client
owenlin0 93bf412
create auth_fixtures.rs helpers
owenlin0 e43ab28
update to use int timestamps
owenlin0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| use std::path::Path; | ||
|
|
||
| use anyhow::Context; | ||
| use anyhow::Result; | ||
| use base64::Engine; | ||
| use base64::engine::general_purpose::URL_SAFE_NO_PAD; | ||
| use chrono::DateTime; | ||
| use chrono::Utc; | ||
| use codex_core::auth::AuthDotJson; | ||
| use codex_core::auth::get_auth_file; | ||
| use codex_core::auth::write_auth_json; | ||
| use codex_core::token_data::TokenData; | ||
| use codex_core::token_data::parse_id_token; | ||
| use serde_json::json; | ||
|
|
||
| /// Builder for writing a fake ChatGPT auth.json in tests. | ||
| #[derive(Debug, Clone)] | ||
| pub struct ChatGptAuthFixture { | ||
| access_token: String, | ||
| refresh_token: String, | ||
| account_id: Option<String>, | ||
| claims: ChatGptIdTokenClaims, | ||
| last_refresh: Option<Option<DateTime<Utc>>>, | ||
| } | ||
|
|
||
| impl ChatGptAuthFixture { | ||
| pub fn new(access_token: impl Into<String>) -> Self { | ||
| Self { | ||
| access_token: access_token.into(), | ||
| refresh_token: "refresh-token".to_string(), | ||
| account_id: None, | ||
| claims: ChatGptIdTokenClaims::default(), | ||
| last_refresh: None, | ||
| } | ||
| } | ||
|
|
||
| pub fn refresh_token(mut self, refresh_token: impl Into<String>) -> Self { | ||
| self.refresh_token = refresh_token.into(); | ||
| self | ||
| } | ||
|
|
||
| pub fn account_id(mut self, account_id: impl Into<String>) -> Self { | ||
| self.account_id = Some(account_id.into()); | ||
| self | ||
| } | ||
|
|
||
| pub fn plan_type(mut self, plan_type: impl Into<String>) -> Self { | ||
| self.claims.plan_type = Some(plan_type.into()); | ||
| self | ||
| } | ||
|
|
||
| pub fn email(mut self, email: impl Into<String>) -> Self { | ||
| self.claims.email = Some(email.into()); | ||
| self | ||
| } | ||
|
|
||
| pub fn last_refresh(mut self, last_refresh: Option<DateTime<Utc>>) -> Self { | ||
| self.last_refresh = Some(last_refresh); | ||
| self | ||
| } | ||
|
|
||
| pub fn claims(mut self, claims: ChatGptIdTokenClaims) -> Self { | ||
| self.claims = claims; | ||
| self | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, Default)] | ||
| pub struct ChatGptIdTokenClaims { | ||
| pub email: Option<String>, | ||
| pub plan_type: Option<String>, | ||
| } | ||
|
|
||
| impl ChatGptIdTokenClaims { | ||
| pub fn new() -> Self { | ||
| Self::default() | ||
| } | ||
|
|
||
| pub fn email(mut self, email: impl Into<String>) -> Self { | ||
| self.email = Some(email.into()); | ||
| self | ||
| } | ||
|
|
||
| pub fn plan_type(mut self, plan_type: impl Into<String>) -> Self { | ||
| self.plan_type = Some(plan_type.into()); | ||
| self | ||
| } | ||
| } | ||
|
|
||
| pub fn encode_id_token(claims: &ChatGptIdTokenClaims) -> Result<String> { | ||
| let header = json!({ "alg": "none", "typ": "JWT" }); | ||
| let mut payload = serde_json::Map::new(); | ||
| if let Some(email) = &claims.email { | ||
| payload.insert("email".to_string(), json!(email)); | ||
| } | ||
| if let Some(plan_type) = &claims.plan_type { | ||
| payload.insert( | ||
| "https://api.openai.com/auth".to_string(), | ||
| json!({ "chatgpt_plan_type": plan_type }), | ||
| ); | ||
| } | ||
| let payload = serde_json::Value::Object(payload); | ||
|
|
||
| let header_b64 = | ||
| URL_SAFE_NO_PAD.encode(serde_json::to_vec(&header).context("serialize jwt header")?); | ||
| let payload_b64 = | ||
| URL_SAFE_NO_PAD.encode(serde_json::to_vec(&payload).context("serialize jwt payload")?); | ||
| let signature_b64 = URL_SAFE_NO_PAD.encode(b"signature"); | ||
| Ok(format!("{header_b64}.{payload_b64}.{signature_b64}")) | ||
| } | ||
|
|
||
| pub fn write_chatgpt_auth(codex_home: &Path, fixture: ChatGptAuthFixture) -> Result<()> { | ||
| let id_token_raw = encode_id_token(&fixture.claims)?; | ||
| let id_token = parse_id_token(&id_token_raw).context("parse id token")?; | ||
| let tokens = TokenData { | ||
| id_token, | ||
| access_token: fixture.access_token, | ||
| refresh_token: fixture.refresh_token, | ||
| account_id: fixture.account_id, | ||
| }; | ||
|
|
||
| let last_refresh = fixture.last_refresh.unwrap_or_else(|| Some(Utc::now())); | ||
|
|
||
| let auth = AuthDotJson { | ||
| openai_api_key: None, | ||
| tokens: Some(tokens), | ||
| last_refresh, | ||
| }; | ||
|
|
||
| write_auth_json(&get_auth_file(codex_home), &auth).context("write auth.json") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have some helper for internal errors? We use them quite a lot and they are verbose.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will follow up in a separate PR
https://linear.app/openai/issue/CLI-861/app-server-create-helpers-for-internal-errors