Fix parse_source_type_name #635
Open
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
AdrienVannson
force-pushed
the
models-refactoring
branch
from
88d84cd
to
6ebbbd2
Compare
Gobot1234
previously approved these changes
Nov 7, 2024
|
Ping me once the tests are done |
|
Hello, I added some documentation, I would say that it is enough. Concerning the tests, I can't just add many simple unit tests as easily as before since the function I just need to find out why the tests are failing, this is not normal since I almost changed nothing since the last time, and it works locally |
AdrienVannson
force-pushed
the
models-refactoring
branch
from
21bad92
to
37cbbdd
Compare
|
It was just the merge that was not performed correctly, now it should be fine |
Gobot1234
requested changes
Nov 8, 2024
src/betterproto/plugin/models.py
Outdated
Comment on lines
603
to
604
| py_k_type: Type = None | ||
| py_v_type: Type = None |
There was a problem hiding this comment.
Please change this to pass type checking
Comment on lines
-7
to
+13
| {%- for enum in output_file.enums -%} | ||
| {% for _, enum in output_file.enums|dictsort(by="key") %} | ||
| "{{ enum.py_name }}", | ||
| {%- endfor -%} | ||
| {%- for message in output_file.messages -%} | ||
| {% for _, message in output_file.messages|dictsort(by="key") %} | ||
| "{{ message.py_name }}", | ||
| {%- endfor -%} | ||
| {%- for service in output_file.services -%} | ||
| {% for _, service in output_file.services|dictsort(by="key") %} |
There was a problem hiding this comment.
How come these are being sorted now?
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.
Summary
Fix #562 , #437
The function
parse_source_type_nameused to rely on an ad-hoc regex to work. The function failed when the package name had capital letters, since it believed that the package was actually a message.Now, the function goes through the packages and the messages that are actually defined (no more guess) to find the right one.
I also did some small refactoring of
models.py:FieldCompilerused to inherit fromMessageCompiler, which made no sense.The PR still lacks tests and some doc, but since it can take a while to write, I first wanted to have your point of view on this.
NOTE: I completely deleted
test_gen_ref_type.pyfor now, but I plan to replace it once you agree with the content of the PRChecklist