fix: Unable to route GET requests through proxy - #584
Open
thiagobarbosa wants to merge 1 commit into
Open
Conversation
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #259
Summary
tiktoken.load.read_file(and the functions that call it) always used the module-levelrequests.get, so there was no way to route the download requests through a customrequests.Session. This adds an optionalsessionparameter that flows through the whole loading chain, defaulting toNoneso existing behavior (requests.get) is unchanged when no session is provided.Changes
read_file(blobpath, session=None): uses(session or requests).get(blobpath)instead of always callingrequests.get.read_file_cached(blobpath, expected_hash=None, session=None): accepts and forwardssessiontoread_file.data_gym_to_mergeable_bpe_ranks(...): acceptssessionand forwards it toread_file_cached.load_tiktoken_bpe(tiktoken_bpe_file, expected_hash=None, session=None): acceptssessionand forwards it toread_file_cached.tests/test_load.pywith a fakerequests.Sessionto verifyread_fileuses the provided session instead of the defaultrequestsmodule.Test plan
pytest tests/test_load.py— new test verifies a custom session is used for the HTTP GET instead of the module-levelrequests.get.read_file/read_file_cached/load_tiktoken_bpe/data_gym_to_mergeable_bpe_rankswithout asessionstill usesrequests.getdirectly.