feat: add support for vyper archives (.vyz) #328
Conversation
This file contains 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
|
@charles-cooper the type handling feels a bit messy but unless we want to introduce a new |
Comment on lines
+304
to
+369
| def _create_compiler_data( | ||
| path: Path, resolved_path: Path, source_code: str | bytes, settings: Settings | ||
| ) -> CompilerData: | ||
| try: | ||
| return _create_archive_compiler_data(source_code, settings) | ||
| except NotZipInput: | ||
| pass | ||
|
|
||
| if isinstance(source_code, bytes): | ||
| source_code = source_code.decode() | ||
|
|
||
| global _search_path | ||
| file_input = FileInput( | ||
| contents=source_code, source_id=-1, path=path, resolved_path=resolved_path | ||
| ) | ||
| input_bundle = FilesystemInputBundle(get_search_paths(_search_path)) | ||
| return CompilerData(file_input, input_bundle, settings) | ||
|
|
||
|
|
||
| def _create_archive_compiler_data( | ||
| zip_contents: str | bytes, settings: Settings | ||
| ) -> CompilerData: | ||
| with _open_zip(zip_contents) as archive: | ||
| # read the whole zip into memory so it can be serialized to the cache | ||
| files = {name: archive.read(name).decode() for name in archive.namelist()} | ||
|
|
||
| targets = files["MANIFEST/compilation_targets"].splitlines() | ||
| if len(targets) != 1: | ||
| raise BadArchive("Multiple compilation targets not supported!") | ||
|
|
||
| input_bundle = JSONInputBundle( | ||
| input_json={ | ||
| PurePath(name): {"content": content} for name, content in files.items() | ||
| }, | ||
| search_paths=[PurePath(p) for p in files["MANIFEST/searchpaths"].splitlines()], | ||
| ) | ||
|
|
||
| main_path = PurePath(targets[0]) | ||
| file = input_bundle.load_file(main_path) | ||
| assert isinstance(file, FileInput) # help mypy | ||
| settings_json = json.loads(files["MANIFEST/settings.json"]) | ||
| settings = merge_settings( | ||
| settings, | ||
| Settings.from_dict(settings_json), | ||
| lhs_source="command line", | ||
| rhs_source="archive settings", | ||
| ) | ||
| integrity_sum = files["MANIFEST/integrity"].strip() | ||
| return CompilerData(file, input_bundle, settings, integrity_sum) | ||
|
|
||
|
|
||
| def _open_zip(zip_contents): | ||
| if isinstance(zip_contents, str): | ||
| zip_contents = zip_contents.encode() | ||
| try: | ||
| buf = BytesIO(zip_contents) | ||
| return ZipFile(buf, mode="r") | ||
| except BadZipFile as e1: | ||
| try: | ||
| # don't validate base64 to allow for newlines | ||
| zip_contents = b64decode(zip_contents, validate=False) | ||
| buf = BytesIO(zip_contents) | ||
| return ZipFile(buf, mode="r") | ||
| except (BadZipFile, binascii.Error): | ||
| raise NotZipInput() from e1 | ||
|
|
There was a problem hiding this comment.
i think we should refactor the compiler so that we can return CompilerData
There was a problem hiding this comment.
So no vyz before 0.4.0b2 at the very least? 😞
There was a problem hiding this comment.
i suppose we could keep it this way but with a note to delete after refactored in vyper
There was a problem hiding this comment.
that conversion of the input bundle is a bit awkward though
There was a problem hiding this comment.
it is, but this is the workaround I found instead of that archive._lock=None
Comment on lines
+334
to
+339
| input_bundle = JSONInputBundle( | ||
| input_json={ | ||
| PurePath(name): {"content": content} for name, content in files.items() | ||
| }, | ||
| search_paths=[PurePath(p) for p in files["MANIFEST/searchpaths"].splitlines()], | ||
| ) |
|
related: vyperlang/vyper#4366 |
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.
What I did
How I did it
Cute Animal Picture