fix: set python to 3.9 (this shit not compiles)

* Drop python version 3.8 support
* Add python 3.13 support in CI

.gitea/workflows/release.yml

@@ -0,0 +1,35 @@
+name: Release
+run-name: ${{ gitea.actor }} is runs ci pipeline
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  packaging:
+    name: Distribution
+    runs-on: ubuntu-latest
+    env:
+      EXT_FIX: "6"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+      - name: Install poetry
+        run: python -m pip install poetry chardet
+      - name: Install poetry compiler
+        run: poetry install -E compiler
+      - name: Set poetry version
+        run: PV=$(poetry version -s) && poetry version ${PV}+jar3b${EXT_FIX}
+      - name: Build package
+        run: poetry build
+      - name: Add pypi source
+        run: poetry source add --priority=supplemental ahax https://git.ahax86.ru/api/packages/pub/pypi
+      - name: Add pypi credentials
+        run: poetry config http-basic.ahax ${{ secrets.REPO_USER }} ${{ secrets.REPO_PASS }}
+      - name: Push to pypi
+        run: poetry publish -r ahax -u ${{ secrets.REPO_USER }} -p ${{ secrets.REPO_PASS }} -n
+

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 There's lots to do, and we're working hard, so any help is welcome!
 
-- :speech_balloon: Join us on [Slack](https://join.slack.com/t/betterproto/shared_invite/zt-f0n0uolx-iN8gBNrkPxtKHTLpG3o1OQ)!
+- :speech_balloon: Join us on [Discord](https://discord.gg/DEVteTupPb)!
 
 What can you do?
 
@@ -15,9 +15,9 @@ What can you do?
     - File a bug (please check its not a duplicate)
     - Propose an enhancement
 - :white_check_mark: Create a PR:
-    - [Creating a failing test-case](https://github.com/danielgtaylor/python-betterproto/blob/master/betterproto/tests/README.md) to make bug-fixing easier
+    - [Creating a failing test-case](https://github.com/danielgtaylor/python-betterproto/blob/master/tests/README.md) to make bug-fixing easier
     - Fix any of the open issues
         - [Good first issues](https://github.com/danielgtaylor/python-betterproto/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
         - [Issues with tests](https://github.com/danielgtaylor/python-betterproto/issues?q=is%3Aissue+is%3Aopen+label%3A%22has+test%22)
     - New bugfix or idea
-        - If you'd like to discuss your idea first, join us on Slack!
+        - If you'd like to discuss your idea first, join us on Discord!

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,63 @@
+name: Bug Report
+description: Report broken or incorrect behaviour
+labels: ["bug", "investigation needed"]
+
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to fill out a bug report!
+        
+        If you're not sure it's a bug and you just have a question, the [community Discord channel](https://discord.gg/DEVteTupPb) is a better place for general questions than a GitHub issue.
+
+  - type: input
+    attributes:
+      label: Summary
+      description: A simple summary of your bug report
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Reproduction Steps
+      description: >
+        What you did to make it happen.
+        Ideally there should be a short code snippet in this section to help reproduce the bug.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Results
+      description: >
+        What did you expect to happen?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actual Results
+      description: >
+        What actually happened?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: System Information
+      description: >
+        Paste the result of `protoc --version; python --version; pip show betterproto` below.
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+        - label: I have searched the issues for duplicates.
+          required: true
+        - label: I have shown the entire traceback, if possible.
+          required: true
+        - label: I have verified this issue occurs on the latest prelease of betterproto which can be installed using `pip install -U --pre betterproto`, if possible.
+          required: true
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,6 @@
+name:
+description:
+contact_links:
+  - name: For questions about the library
+    about: Support questions are better answered in our Discord group.
+    url: https://discord.gg/DEVteTupPb

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,49 @@
+name: Feature Request
+description: Suggest a feature for this library
+labels: ["enhancement"]
+
+body:
+  - type: input
+    attributes:
+      label: Summary
+      description: >
+        What problem is your feature trying to solve? What would become easier or possible if feature was implemented?
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      multiple: false
+      label: What is the feature request for?
+      options:
+        - The core library
+        - RPC handling
+        - The documentation
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: The Problem
+      description: >
+        What problem is your feature trying to solve?
+        What would become easier or possible if feature was implemented?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: The Ideal Solution
+      description: >
+        What is your ideal solution to the problem?
+        What would you like this feature to do?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: The Current Solution
+      description: >
+        What is the current solution to the problem, if any?
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+## Summary
+
+<!-- What is this pull request for? Does it fix any issues? -->
+
+## Checklist
+
+<!-- Put an x inside [ ] to check it, like so: [x] -->
+
+- [ ] If code changes were made then they have been tested.
+    - [ ] I have updated the documentation to reflect the changes.
+- [ ] This PR fixes an issue.
+- [ ] This PR adds something new (e.g. new method or parameters).
+    - [ ] This change has an associated test.
+- [ ] This PR is a breaking change (e.g. methods or parameters removed/renamed)
+- [ ] This PR is **not** a code change (e.g. documentation, README, ...)
+ 

.github/workflows/ci.yml

@@ -13,24 +13,22 @@ jobs:
     name: ${{ matrix.os }} / ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}-latest
     strategy:
+      fail-fast: false
       matrix:
         os: [Ubuntu, MacOS, Windows]
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        exclude:
-          - os: Windows
-            python-version: 3.6
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Get full Python version
         id: full-python-version
         shell: bash
-        run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+        run: echo "version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")" >> "$GITHUB_OUTPUT"
 
       - name: Install poetry
         shell: bash
@@ -43,7 +41,7 @@ jobs:
         run: poetry config virtualenvs.in-project true
 
       - name: Set up cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache
         with:
           path: .venv
@@ -56,9 +54,7 @@ jobs:
 
       - name: Install dependencies
         shell: bash
-        run: |
-          poetry run python -m pip install pip -U
-          poetry install
+        run: poetry install -E compiler
 
       - name: Generate code from proto files
         shell: bash
@@ -66,4 +62,4 @@ jobs:
 
       - name: Execute test suite
         shell: bash
-        run: poetry run pytest tests/
+        run: poetry run python -m pytest tests/

.github/workflows/code-quality.yml

@@ -13,14 +13,6 @@ jobs:
     name: Check code/doc formatting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run Black
-      uses: lgeiger/black-action@master
-      with:
-        args: --check src/ tests/ benchmarks/
-
-    - name: Install rST dependcies
-      run: python -m pip install doc8
-    - name: Lint documentation for errors
-      run: python -m doc8 docs --max-line-length 88 --ignore-path-errors "docs/migrating.rst;D001"
-      # it has a table which is longer than 88 characters long
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+    - uses: pre-commit/action@v3.0.1

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,46 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches:
+      - '**'
+  schedule:
+    - cron: '19 1 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/release.yml

@@ -15,11 +15,11 @@ jobs:
     name: Distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install poetry
         run: python -m pip install poetry
       - name: Build package

.gitignore

@@ -17,3 +17,5 @@ output
 .venv
 .asv
 venv
+.devcontainer
+.ruff_cache

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+ci:
+  autofix_prs: false
+
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.9.1
+    hooks:
+      - id: ruff-format
+        args: ["--diff", "src", "tests"]
+      - id: ruff
+        args: ["--select", "I", "src", "tests"]
+
+  - repo: https://github.com/PyCQA/doc8
+    rev: 0.10.1
+    hooks:
+      - id: doc8
+        additional_dependencies:
+          - toml
+
+  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+    rev: v2.14.0
+    hooks:
+      - id: pretty-format-java
+        args: [--autofix, --aosp]
+        files: ^.*\.java$

CHANGELOG.md

@@ -7,6 +7,112 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Versions suffixed with `b*` are in `beta` and can be installed with `pip install --pre betterproto`.
 
+## [2.0.0b7] - 2024-08-11
+
+- **Breaking**: Support `Pydantic` v2 and dropping support for v1 [#588](https://github.com/danielgtaylor/python-betterproto/pull/588)
+- **Breaking**: The attempting to access an unset `oneof` now raises an `AttributeError` 
+  field. To see how to access `oneof` fields now, refer to [#558](https://github.com/danielgtaylor/python-betterproto/pull/558) 
+  and [README.md](https://github.com/danielgtaylor/python-betterproto#one-of-support).
+- **Breaking**: A custom `Enum` has been implemented to match the behaviour of being an open set. Any checks for `isinstance(enum_member, enum.Enum)` and `issubclass(EnumSubclass, enum.Enum)` will now return `False`. This change also has the side effect of
+  preventing any passthrough of `Enum` members (i.e. `Foo.RED.GREEN` doesn't work any more). See [#293](https://github.com/danielgtaylor/python-betterproto/pull/293) for more info, this fixed many bugs related to `Enum` handling.
+
+- Add support for `pickle` methods [#535](https://github.com/danielgtaylor/python-betterproto/pull/535)
+- Add support for `Struct` and `Value` types [#551](https://github.com/danielgtaylor/python-betterproto/pull/551)
+- Add support for [`Rich` package](https://rich.readthedocs.io/en/latest/index.html) for pretty printing [#508](https://github.com/danielgtaylor/python-betterproto/pull/508)
+- Improve support for streaming messages [#518](https://github.com/danielgtaylor/python-betterproto/pull/518) [#529](https://github.com/danielgtaylor/python-betterproto/pull/529)
+- Improve performance of serializing / de-serializing messages [#545](https://github.com/danielgtaylor/python-betterproto/pull/545)
+- Improve the handling of message name collisions with typing by allowing the method / type of imports to be configured.
+  Refer to [#582](https://github.com/danielgtaylor/python-betterproto/pull/582) 
+  and [README.md](https://github.com/danielgtaylor/python-betterproto#configuration-typing-imports).
+- Fix roundtrip parsing of `datetime`s [#534](https://github.com/danielgtaylor/python-betterproto/pull/534)
+- Fix accessing unset optional fields [#523](https://github.com/danielgtaylor/python-betterproto/pull/523)
+- Fix `Message` equality comparison [#513](https://github.com/danielgtaylor/python-betterproto/pull/513)
+- Fix behaviour with long comment messages [#532](https://github.com/danielgtaylor/python-betterproto/pull/532)
+- Add a warning when calling a deprecated message [#596](https://github.com/danielgtaylor/python-betterproto/pull/596)
+
+## [2.0.0b6] - 2023-06-25
+
+- **Breaking**: the minimum Python version has been bumped to `3.7` [#444](https://github.com/danielgtaylor/python-betterproto/pull/444)
+
+- Support generating [Pydantic dataclasses](https://docs.pydantic.dev/latest/usage/dataclasses). 
+  Pydantic dataclasses are are drop-in replacement for dataclasses in the standard library that additionally supports validation.
+  Pass `--python_betterproto_opt=pydantic_dataclasses` to enable this feature.
+  Refer to [#406](https://github.com/danielgtaylor/python-betterproto/pull/406)
+  and [README.md](https://github.com/danielgtaylor/python-betterproto#generating-pydantic-models) for more information.
+  
+- Added support for `@generated` marker [#382](https://github.com/danielgtaylor/python-betterproto/pull/382)
+- Pull down the `include_default_values` argument to `to_json()` [#405](https://github.com/danielgtaylor/python-betterproto/pull/405)
+- Pythonize input_type name in py_input_message [#436](https://github.com/danielgtaylor/python-betterproto/pull/436)
+- Widen `from_dict()` to accept any `Mapping` [#451](https://github.com/danielgtaylor/python-betterproto/pull/451)
+- Replace `pkg_resources` with `importlib` [#462](https://github.com/danielgtaylor/python-betterproto/pull/462)
+  
+- Fix typechecker compatiblity checks in server streaming methods [#413](https://github.com/danielgtaylor/python-betterproto/pull/413)
+- Fix "empty-valued" repeated fields not being serialised [#417](https://github.com/danielgtaylor/python-betterproto/pull/417)
+- Fix `dict` encoding for timezone-aware `datetimes` [#468](https://github.com/danielgtaylor/python-betterproto/pull/468)
+- Fix `to_pydict()` serialization for optional fields [#495](https://github.com/danielgtaylor/python-betterproto/pull/495)
+- Handle empty value objects properly [#481](https://github.com/danielgtaylor/python-betterproto/pull/481)
+  
+## [2.0.0b5] - 2022-08-01
+
+- **Breaking**: Client and Service Stubs no longer pack and unpack the input message fields as parameters [#331](https://github.com/danielgtaylor/python-betterproto/pull/311)
+
+    Update your client calls and server handlers as follows:
+
+    Clients before:
+
+    ```py
+    response = await service.echo(value="hello", extra_times=1)
+    ```
+
+    Clients after:
+
+    ```py
+    response = await service.echo(EchoRequest(value="hello", extra_times=1))
+    ```
+
+    Servers before:
+
+    ```py
+    async def echo(self, value: str, extra_times: int) -> EchoResponse: ...
+    ```
+
+    Servers after:
+
+    ```py
+    async def echo(self, echo_request: EchoRequest) -> EchoResponse:
+        # Use echo_request.value
+        # Use echo_request.extra_times
+        ...
+    ```
+
+- Add `to/from_pydict()` for `Message` [#203](https://github.com/danielgtaylor/python-betterproto/pull/203)
+- Format field comments also as docstrings [#304](https://github.com/danielgtaylor/python-betterproto/pull/304)
+- Implement `__deepcopy__` for `Message` [#339](https://github.com/danielgtaylor/python-betterproto/pull/339)
+- Run isort on compiled code [#355](https://github.com/danielgtaylor/python-betterproto/pull/355)
+- Expose timeout, deadline and metadata parameters from grpclib [#352](https://github.com/danielgtaylor/python-betterproto/pull/352)
+- Make `Message.__getattribute__` invisible to type checkers [#359](https://github.com/danielgtaylor/python-betterproto/pull/359)
+
+- Fix map field edge-case [#254](https://github.com/danielgtaylor/python-betterproto/pull/254)
+- Fix message text in `NotImplementedError` [#325](https://github.com/danielgtaylor/python-betterproto/pull/325)
+- Fix `Message.from_dict()` in the presence of optional datetime fields [#329](https://github.com/danielgtaylor/python-betterproto/pull/329)
+- Support Jinja2 3.0 to prevent version conflicts [#330](https://github.com/danielgtaylor/python-betterproto/pull/330)
+- Fix overwriting top level `__init__.py` [#337](https://github.com/danielgtaylor/python-betterproto/pull/337)
+- Remove deprecation warnings when fields are initialised with non-default values [#348](https://github.com/danielgtaylor/python-betterproto/pull/348)
+- Ensure nested class names are converted to PascalCase [#353](https://github.com/danielgtaylor/python-betterproto/pull/353)
+- Fix `Message.to_dict()` mutating the underlying Message [#378](https://github.com/danielgtaylor/python-betterproto/pull/378)
+- Fix some parameters being missing from services [#381](https://github.com/danielgtaylor/python-betterproto/pull/381)
+
+## [2.0.0b4] - 2022-01-03
+
+- **Breaking**: the minimum Python version has been bumped to `3.6.2`
+
+- Always add `AsyncIterator` to imports if there are services [#264](https://github.com/danielgtaylor/python-betterproto/pull/264)
+- Allow parsing of messages from `ByteStrings` [#266](https://github.com/danielgtaylor/python-betterproto/pull/266)
+- Add support for proto3 optional [#281](https://github.com/danielgtaylor/python-betterproto/pull/281)
+
+- Fix compilation of fields with names identical to builtin types [#294](https://github.com/danielgtaylor/python-betterproto/pull/294)
+- Fix default values for enum service args [#299](https://github.com/danielgtaylor/python-betterproto/pull/299)
+
 ## [2.0.0b3] - 2021-04-07
 
 - Generate grpclib service stubs [#170](https://github.com/danielgtaylor/python-betterproto/pull/170)
@@ -54,7 +160,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2.0.0b1] - 2020-07-04
 
-[Upgrade Guide](./docs/upgrading.md) 
+[Upgrade Guide](./docs/upgrading.md)
 
 > Several bugfixes and improvements required or will require small breaking changes, necessitating a new version.
 > `2.0.0` will be released once the interface is stable.

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Daniel G. Taylor
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,19 +1,21 @@
 # Better Protobuf / gRPC Support for Python
 
-![](https://github.com/danielgtaylor/python-betterproto/workflows/CI/badge.svg)
+![](https://github.com/danielgtaylor/python-betterproto/actions/workflows/ci.yml/badge.svg)
+
 > :octocat: If you're reading this on github, please be aware that it might mention unreleased features! See the latest released README on [pypi](https://pypi.org/project/betterproto/).
 
 This project aims to provide an improved experience when using Protobuf / gRPC in a modern Python environment by making use of modern language features and generating readable, understandable, idiomatic Python code. It will not support legacy features or environments (e.g. Protobuf 2). The following are supported:
 
 - Protobuf 3 & gRPC code generation
   - Both binary & JSON serialization is built-in
-- Python 3.6+ making use of:
+- Python 3.7+ making use of:
   - Enums
   - Dataclasses
   - `async`/`await`
   - Timezone-aware `datetime` and `timedelta` objects
   - Relative imports
   - Mypy type checking
+- [Pydantic Models](https://docs.pydantic.dev/) generation (see #generating-pydantic-models)
 
 This project is heavily inspired by, and borrows functionality from:
 
@@ -38,6 +40,8 @@ This project exists because I am unhappy with the state of the official Google p
   - Uses `SerializeToString()` rather than the built-in `__bytes__()`
   - Special wrapped types don't use Python's `None`
   - Timestamp/duration types don't use Python's built-in `datetime` module
+
+
 This project is a reimplementation from the ground up focused on idiomatic modern Python to help fix some of the above. While it may not be a 1:1 drop-in replacement due to changed method names and call patterns, the wire format is identical.
 
 ## Installation
@@ -58,7 +62,7 @@ pip install betterproto
 
 ### Compiling proto files
 
-Now, given you installed the compiler and have a proto file, e.g `example.proto`:
+Given you installed the compiler and have a proto file, e.g `example.proto`:
 
 ```protobuf
 syntax = "proto3";
@@ -160,6 +164,12 @@ service Echo {
 }
 ```
 
+Generate echo proto file:
+
+```
+python -m grpc_tools.protoc -I . --python_betterproto_out=. echo.proto
+```
+
 A client can be implemented as follows:
 ```python
 import asyncio
@@ -171,10 +181,10 @@ from grpclib.client import Channel
 async def main():
     channel = Channel(host="127.0.0.1", port=50051)
     service = echo.EchoStub(channel)
-    response = await service.echo(value="hello", extra_times=1)
+    response = await service.echo(echo.EchoRequest(value="hello", extra_times=1))
     print(response)
 
-    async for response in service.echo_stream(value="hello", extra_times=1):
+    async for response in service.echo_stream(echo.EchoRequest(value="hello", extra_times=1)):
         print(response)
 
     # don't forget to close the channel when done!
@@ -186,6 +196,7 @@ if __name__ == "__main__":
     loop.run_until_complete(main())
 
 ```
+
 which would output
 ```python
 EchoResponse(values=['hello', 'hello'])
@@ -199,28 +210,29 @@ To use them, simply subclass the base class in the generated files and override
 service methods:
 
 ```python
-from echo import EchoBase
+import asyncio
+from echo import EchoBase, EchoRequest, EchoResponse, EchoStreamResponse
 from grpclib.server import Server
 from typing import AsyncIterator
 
 
 class EchoService(EchoBase):
-    async def echo(self, value: str, extra_times: int) -> "EchoResponse":
-        return value
+    async def echo(self, echo_request: "EchoRequest") -> "EchoResponse":
+        return EchoResponse([echo_request.value for _ in range(echo_request.extra_times)])
 
-    async def echo_stream(
-        self, value: str, extra_times: int
-    ) -> AsyncIterator["EchoStreamResponse"]:
-        for _ in range(extra_times):
-            yield value
+    async def echo_stream(self, echo_request: "EchoRequest") -> AsyncIterator["EchoStreamResponse"]:
+        for _ in range(echo_request.extra_times):
+            yield EchoStreamResponse(echo_request.value)
 
 
-async def start_server():
-    HOST = "127.0.0.1"
-    PORT = 1337
+async def main():
     server = Server([EchoService()])
-    await server.start(HOST, PORT)
-    await server.serve_forever()
+    await server.start("127.0.0.1", 50051)
+    await server.wait_closed()
+
+if __name__ == '__main__':
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main())
 ```
 
 ### JSON
@@ -266,7 +278,22 @@ message Test {
 }
 ```
 
-You can use `betterproto.which_one_of(message, group_name)` to determine which of the fields was set. It returns a tuple of the field name and value, or a blank string and `None` if unset.
+On Python 3.10 and later, you can use a `match` statement to access the provided one-of field, which supports type-checking:
+
+```py
+test = Test()
+match test:
+    case Test(on=value):
+        print(value)  # value: bool
+    case Test(count=value):
+        print(value)  # value: int
+    case Test(name=value):
+        print(value)  # value: str
+    case _:
+        print("No value provided")
+```
+
+You can also use `betterproto.which_one_of(message, group_name)` to determine which of the fields was set. It returns a tuple of the field name and value, or a blank string and `None` if unset.
 
 ```py
 >>> test = Test()
@@ -281,17 +308,11 @@ You can use `betterproto.which_one_of(message, group_name)` to determine which o
 >>> test.count = 57
 >>> betterproto.which_one_of(test, "foo")
 ["count", 57]
->>> test.on
-False
 
 # Default (zero) values also work.
 >>> test.name = ""
 >>> betterproto.which_one_of(test, "foo")
 ["name", ""]
->>> test.count
-0
->>> test.on
-False
 ```
 
 Again this is a little different than the official Google code generator:
@@ -354,14 +375,76 @@ datetime.datetime(2019, 1, 1, 11, 59, 58, 800000, tzinfo=datetime.timezone.utc)
 {'ts': '2019-01-01T12:00:00Z', 'duration': '1.200s'}
 ```
 
+## Generating Pydantic Models
+
+You can use python-betterproto to generate pydantic based models, using
+pydantic dataclasses. This means the results of the protobuf unmarshalling will
+be typed checked. The usage is the same, but you need to add a custom option
+when calling the protobuf compiler:
+
+
+```
+protoc -I . --python_betterproto_opt=pydantic_dataclasses --python_betterproto_out=lib example.proto
+```
+
+With the important change being `--python_betterproto_opt=pydantic_dataclasses`. This will
+swap the dataclass implementation from the builtin python dataclass to the
+pydantic dataclass. You must have pydantic as a dependency in your project for
+this to work.
+
+## Configuration typing imports
+
+By default typing types will be imported directly from typing.  This sometimes can lead to issues in generation if types that are being generated conflict with the name.  In this case you can configure the way types are imported from 3 different options:
+
+### Direct
+```
+protoc -I . --python_betterproto_opt=typing.direct --python_betterproto_out=lib example.proto
+```
+this configuration is the default, and will import types as follows:
+```
+from typing import (
+  List,
+  Optional,
+  Union
+)
+...
+value: List[str] = []
+value2: Optional[str] = None
+value3: Union[str, int] = 1
+```
+### Root
+```
+protoc -I . --python_betterproto_opt=typing.root --python_betterproto_out=lib example.proto
+```
+this configuration loads the root typing module, and then access the types off of it directly:
+```
+import typing
+...
+value: typing.List[str] = []
+value2: typing.Optional[str] = None
+value3: typing.Union[str, int] = 1
+```
+
+### 310
+```
+protoc -I . --python_betterproto_opt=typing.310 --python_betterproto_out=lib example.proto
+```
+this configuration avoid loading typing all together if possible and uses the python 3.10 pattern:
+```
+...
+value: list[str] = []
+value2: str | None = None
+value3: str | int = 1
+```
+
 ## Development
 
-- _Join us on [Slack](https://join.slack.com/t/betterproto/shared_invite/zt-f0n0uolx-iN8gBNrkPxtKHTLpG3o1OQ)!_
+- _Join us on [Discord](https://discord.gg/DEVteTupPb)!_
 - _See how you can help → [Contributing](.github/CONTRIBUTING.md)_
 
 ### Requirements
 
-- Python (3.6 or higher)
+- Python (3.7 or higher)
 
 - [poetry](https://python-poetry.org/docs/#installation)
   *Needed to install dependencies in a virtual environment*
@@ -374,8 +457,7 @@ datetime.datetime(2019, 1, 1, 11, 59, 58, 800000, tzinfo=datetime.timezone.utc)
 
 ```sh
 # Get set up with the virtual env & dependencies
-poetry run pip install --upgrade pip
-poetry install
+poetry install -E compiler
 
 # Activate the poetry environment
 poetry shell
@@ -410,7 +492,7 @@ Adding a standard test case is easy.
 
 It will be picked up automatically when you run the tests.
 
-- See also: [Standard Tests Development Guide](betterproto/tests/README.md)
+- See also: [Standard Tests Development Guide](tests/README.md)
 
 #### Custom tests
 
@@ -435,10 +517,10 @@ poe full-test
 
 ### (Re)compiling Google Well-known Types
 
-Betterproto includes compiled versions for Google's well-known types at [betterproto/lib/google](betterproto/lib/google).
+Betterproto includes compiled versions for Google's well-known types at [src/betterproto/lib/google](src/betterproto/lib/google).
 Be sure to regenerate these files when modifying the plugin output format, and validate by running the tests.
 
-Normally, the plugin does not compile any references to `google.protobuf`, since they are pre-compiled. To force compilation of `google.protobuf`, use the option `--custom_opt=INCLUDE_GOOGLE`. 
+Normally, the plugin does not compile any references to `google.protobuf`, since they are pre-compiled. To force compilation of `google.protobuf`, use the option `--custom_opt=INCLUDE_GOOGLE`.
 
 Assuming your `google.protobuf` source files (included with all releases of `protoc`) are located in `/usr/local/include`, you can regenerate them as follows:
 
@@ -493,7 +575,7 @@ protoc \
 
 ## Community
 
-Join us on [Slack](https://join.slack.com/t/betterproto/shared_invite/zt-f0n0uolx-iN8gBNrkPxtKHTLpG3o1OQ)!
+Join us on [Discord](https://discord.gg/DEVteTupPb)!
 
 ## License
 

benchmarks/__init__.py

@@ -1 +0,0 @@
-

benchmarks/benchmarks.py

@@ -1,12 +1,37 @@
-import betterproto
 from dataclasses import dataclass
+from typing import List
+
+import betterproto
 
 
 @dataclass
 class TestMessage(betterproto.Message):
-    foo: int = betterproto.uint32_field(0)
-    bar: str = betterproto.string_field(1)
-    baz: float = betterproto.float_field(2)
+    foo: int = betterproto.uint32_field(1)
+    bar: str = betterproto.string_field(2)
+    baz: float = betterproto.float_field(3)
+
+
+@dataclass
+class TestNestedChildMessage(betterproto.Message):
+    str_key: str = betterproto.string_field(1)
+    bytes_key: bytes = betterproto.bytes_field(2)
+    bool_key: bool = betterproto.bool_field(3)
+    float_key: float = betterproto.float_field(4)
+    int_key: int = betterproto.uint64_field(5)
+
+
+@dataclass
+class TestNestedMessage(betterproto.Message):
+    foo: TestNestedChildMessage = betterproto.message_field(1)
+    bar: TestNestedChildMessage = betterproto.message_field(2)
+    baz: TestNestedChildMessage = betterproto.message_field(3)
+
+
+@dataclass
+class TestRepeatedMessage(betterproto.Message):
+    foo_repeat: List[str] = betterproto.string_field(1)
+    bar_repeat: List[int] = betterproto.int64_field(2)
+    baz_repeat: List[bool] = betterproto.bool_field(3)
 
 
 class BenchMessage:
@@ -16,15 +41,28 @@ class BenchMessage:
         self.cls = TestMessage
         self.instance = TestMessage()
         self.instance_filled = TestMessage(0, "test", 0.0)
+        self.instance_filled_bytes = bytes(self.instance_filled)
+        self.instance_filled_nested = TestNestedMessage(
+            TestNestedChildMessage("foo", bytearray(b"test1"), True, 0.1234, 500),
+            TestNestedChildMessage("bar", bytearray(b"test2"), True, 3.1415, 302),
+            TestNestedChildMessage("baz", bytearray(b"test3"), False, 1e5, 300),
+        )
+        self.instance_filled_nested_bytes = bytes(self.instance_filled_nested)
+        self.instance_filled_repeated = TestRepeatedMessage(
+            [f"test{i}" for i in range(1_000)],
+            [(i - 500) ** 3 for i in range(1_000)],
+            [i % 2 == 0 for i in range(1_000)],
+        )
+        self.instance_filled_repeated_bytes = bytes(self.instance_filled_repeated)
 
     def time_overhead(self):
         """Overhead in class definition."""
 
         @dataclass
         class Message(betterproto.Message):
-            foo: int = betterproto.uint32_field(0)
-            bar: str = betterproto.string_field(1)
-            baz: float = betterproto.float_field(2)
+            foo: int = betterproto.uint32_field(1)
+            bar: str = betterproto.string_field(2)
+            baz: float = betterproto.float_field(3)
 
     def time_instantiation(self):
         """Time instantiation"""
@@ -50,6 +88,26 @@ class BenchMessage:
         """Time serializing a message to wire."""
         bytes(self.instance_filled)
 
+    def time_deserialize(self):
+        """Time deserialize a message."""
+        TestMessage().parse(self.instance_filled_bytes)
+
+    def time_serialize_nested(self):
+        """Time serializing a nested message to wire."""
+        bytes(self.instance_filled_nested)
+
+    def time_deserialize_nested(self):
+        """Time deserialize a nested message."""
+        TestNestedMessage().parse(self.instance_filled_nested_bytes)
+
+    def time_serialize_repeated(self):
+        """Time serializing a repeated message to wire."""
+        bytes(self.instance_filled_repeated)
+
+    def time_deserialize_repeated(self):
+        """Time deserialize a repeated message."""
+        TestRepeatedMessage().parse(self.instance_filled_repeated_bytes)
+
 
 class MemSuite:
     def setup(self):

docs/migrating.rst

@@ -85,17 +85,19 @@ wrappers used to provide optional zero value support. Each of these has a specia
 representation and is handled a little differently from normal messages. The Python
 mapping for these is as follows:
 
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``Google Message``            | ``Python Type``                               | ``Default``              |
-+===============================+===============================================+==========================+
-| ``google.protobuf.duration``  | :class:`datetime.timedelta`                   | ``0``                    |
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``google.protobuf.timestamp`` | ``Timezone-aware`` :class:`datetime.datetime` | ``1970-01-01T00:00:00Z`` |
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``google.protobuf.*Value``    | ``Optional[...]``/``None``                    | ``None``                 |
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``google.protobuf.*``         | ``betterproto.lib.google.protobuf.*``         | ``None``                 |
-+-------------------------------+-----------------------------------------------+--------------------------+
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``Google Message``            | ``Python Type``                                 | ``Default``              |
++===============================+=================================================+==========================+
+| ``google.protobuf.duration``  | :class:`datetime.timedelta`                     | ``0``                    |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.timestamp`` | ``Timezone-aware`` :class:`datetime.datetime`   | ``1970-01-01T00:00:00Z`` |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.*Value``    | ``Optional[...]``/``None``                      | ``None``                 |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.*``         | ``betterproto.lib.std.google.protobuf.*``       | ``None``                 |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.*``         | ``betterproto.lib.pydantic.google.protobuf.*``  | ``None``                 |
++-------------------------------+-------------------------------------------------+--------------------------+
 
 
 For the wrapper types, the Python type corresponds to the wrapped type, e.g.

pyproject.toml

@@ -1,8 +1,10 @@
-[tool.poetry]
+[project]
 name = "betterproto"
-version = "2.0.0b3"
+version = "2.0.0b7"
 description = "A better Protobuf / gRPC generator & library"
-authors = ["Daniel G. Taylor <danielgtaylor@gmail.com>"]
+authors = [
+    {name = "Daniel G. Taylor", email = "danielgtaylor@gmail.com"}
+]
 readme = "README.md"
 repository = "https://github.com/danielgtaylor/python-betterproto"
 keywords = ["protobuf", "gRPC"]
@@ -10,40 +12,54 @@ license = "MIT"
 packages = [
     { include = "betterproto", from = "src" }
 ]
+requires-python = ">=3.9,<4.0"
+dynamic = ["dependencies"]
 
 [tool.poetry.dependencies]
-python = "^3.6"
-black = { version = ">=19.3b0", optional = true }
-dataclasses = { version = "^0.7", python = ">=3.6, <3.7" }
+# The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml
+ruff = { version = "~0.9.1", optional = true }
 grpclib = "^0.4.1"
-jinja2 = { version = "^2.11.2", optional = true }
+jinja2 = { version = ">=3.0.3", optional = true }
 python-dateutil = "^2.8"
+typing-extensions = "^4.7.1"
+betterproto-rust-codec = { version = "0.1.1", optional = true }
 
-[tool.poetry.dev-dependencies]
-asv = "^0.4.2"
-black = "^20.8b1"
-bpython = "^0.19"
-grpcio-tools = "^1.30.0"
-jinja2 = "^2.11.2"
-mypy = "^0.770"
+[tool.poetry.group.dev.dependencies]
+asv = "^0.6.4"
+bpython = "^0.24"
+jinja2 = ">=3.0.3"
+mypy = "^1.11.2"
+sphinx = "7.4.7"
+sphinx-rtd-theme = "3.0.2"
+pre-commit = "^4.0.1"
+grpcio-tools = "^1.54.2"
+tox = "^4.0.0"
+
+[tool.poetry.group.test.dependencies]
 poethepoet = ">=0.9.0"
-protobuf = "^3.12.2"
-pytest = "^5.4.2"
-pytest-asyncio = "^0.12.0"
-pytest-cov = "^2.9.0"
+pytest = "^7.4.4"
+pytest-asyncio = "^0.23.8"
+pytest-cov = "^6.0.0"
 pytest-mock = "^3.1.1"
-sphinx = "3.1.2"
-sphinx-rtd-theme = "0.5.0"
-tomlkit = "^0.7.0"
-tox = "^3.15.1"
+pydantic = ">=2.0,<3"
+protobuf = "^5"
+cachelib = "^0.13.0"
+tomlkit = ">=0.7.0"
 
-
-[tool.poetry.scripts]
+[project.scripts]
 protoc-gen-python_betterproto = "betterproto.plugin:main"
 
-[tool.poetry.extras]
-compiler = ["black", "jinja2"]
+[project.optional-dependencies]
+compiler = ["ruff", "jinja2"]
+rust-codec = ["betterproto-rust-codec"]
 
+[tool.ruff]
+extend-exclude = ["tests/output_*"]
+target-version = "py38"
+
+[tool.ruff.lint.isort]
+combine-as-imports = true
+lines-after-imports = 2
 
 # Dev workflow tasks
 
@@ -60,8 +76,28 @@ cmd  = "mypy src --ignore-missing-imports"
 help = "Check types with mypy"
 
 [tool.poe.tasks.format]
-cmd  = "black . --exclude tests/output_"
-help = "Apply black formatting to source code"
+sequence = ["_format", "_sort-imports"]
+help = "Format the source code, and sort the imports"
+
+[tool.poe.tasks.check]
+sequence = ["_check-format", "_check-imports"]
+help = "Check that the source code is formatted and the imports sorted"
+
+[tool.poe.tasks._format]
+cmd = "ruff format src tests"
+help = "Format the source code without sorting the imports"
+
+[tool.poe.tasks._sort-imports]
+cmd = "ruff check --select I --fix src tests"
+help = "Sort the imports"
+
+[tool.poe.tasks._check-format]
+cmd = "ruff format --diff src tests"
+help = "Check that the source code is formatted"
+
+[tool.poe.tasks._check-imports]
+cmd = "ruff check --select I src tests"
+help = "Check that the imports are sorted"
 
 [tool.poe.tasks.docs]
 cmd  = "sphinx-build docs docs/build"
@@ -84,11 +120,11 @@ cmd = """
 protoc
     --plugin=protoc-gen-custom=src/betterproto/plugin/main.py
     --custom_opt=INCLUDE_GOOGLE
-    --custom_out=src/betterproto/lib
-    -I /usr/local/include/
-    /usr/local/include/google/protobuf/**/*.proto
+    --custom_out=src/betterproto/lib/std
+    -I C:\\work\\include
+    C:\\work\\include\\google\\protobuf\\**\\*.proto
 """
-help = "Regenerate the types in betterproto.lib.google"
+help = "Regenerate the types in betterproto.lib.std.google"
 
 # CI tasks
 
@@ -96,13 +132,14 @@ help = "Regenerate the types in betterproto.lib.google"
 shell = "poe generate && tox"
 help = "Run tests with multiple pythons"
 
-[tool.poe.tasks.check-style]
-cmd = "black . --check --diff --exclude tests/output_"
-help = "Check if code style is correct"
+[tool.doc8]
+paths = ["docs"]
+max_line_length = 88
 
-
-[tool.black]
-target-version = ['py36']
+[tool.doc8.ignore_path_errors]
+"docs/migrating.rst" = [
+    "D001",  # contains table which is longer than 88 characters long
+]
 
 [tool.coverage.run]
 omit = ["betterproto/tests/*"]
@@ -110,16 +147,23 @@ omit = ["betterproto/tests/*"]
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-isolated_build = true
-envlist = py36, py37, py38
+requires =
+    tox>=4.2
+    tox-poetry-installer[poetry]==1.0.0b1
+env_list =
+    py311
+    py38
+    py37
 
 [testenv]
-whitelist_externals = poetry
 commands =
-    poetry install -v --extras compiler
-    poetry run pytest --cov betterproto
+    pytest {posargs: --cov betterproto}
+poetry_dep_groups =
+    test
+require_locked_deps = true
+require_poetry = true
 """
 
 [build-system]
-requires = ["poetry-core>=1.0.0,<2"]
+requires = ["poetry-core>=2.0.0,<3"]
 build-backend = "poetry.core.masonry.api"

src/betterproto/_types.py

@@ -1,7 +1,12 @@
-from typing import TYPE_CHECKING, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    TypeVar,
+)
+
 
 if TYPE_CHECKING:
     from grpclib._typing import IProtoMessage
+
     from . import Message
 
 # Bound type variable to allow methods to return `self` of subclasses

src/betterproto/_version.py

@@ -1,3 +1,7 @@
-from pkg_resources import get_distribution
+try:
+    from importlib import metadata
+except ImportError:  # for Python<3.8
+    import importlib_metadata as metadata  # type: ignore
 
-__version__ = get_distribution("betterproto").version
+
+__version__ = metadata.version("betterproto")

src/betterproto/casing.py

@@ -1,6 +1,7 @@
 import keyword
 import re
 
+
 # Word delimiters and symbols that will not be preserved when re-casing.
 # language=PythonRegExp
 SYMBOLS = "[^a-zA-Z0-9]*"
@@ -133,16 +134,10 @@ def lowercase_first(value: str) -> str:
     return value[0:1].lower() + value[1:]
 
 
-def is_reserved_name(value: str) -> bool:
-    if keyword.iskeyword(value):
-        return True
-
-    if value in ("bytes", "str"):
-        return True
-
-    return False
-
-
 def sanitize_name(value: str) -> str:
     # https://www.python.org/dev/peps/pep-0008/#descriptive-naming-styles
-    return f"{value}_" if is_reserved_name(value) else value
+    if keyword.iskeyword(value):
+        return f"{value}_"
+    if not value.isidentifier():
+        return f"_{value}"
+    return value

src/betterproto/compile/importing.py

@@ -1,11 +1,24 @@
+from __future__ import annotations
+
 import os
 import re
-from typing import Dict, List, Set, Tuple, Type
+from typing import (
+    TYPE_CHECKING,
+    Dict,
+    List,
+    Set,
+    Tuple,
+    Type,
+)
 
 from ..casing import safe_snake_case
 from ..lib.google import protobuf as google_protobuf
 from .naming import pythonize_class_name
 
+
+if TYPE_CHECKING:
+    from ..plugin.typing_compiler import TypingCompiler
+
 WRAPPER_TYPES: Dict[str, Type] = {
     ".google.protobuf.DoubleValue": google_protobuf.DoubleValue,
     ".google.protobuf.FloatValue": google_protobuf.FloatValue,
@@ -36,7 +49,13 @@ def parse_source_type_name(field_type_name: str) -> Tuple[str, str]:
 
 
 def get_type_reference(
-    package: str, imports: set, source_type: str, unwrap: bool = True
+    *,
+    package: str,
+    imports: set,
+    source_type: str,
+    typing_compiler: TypingCompiler,
+    unwrap: bool = True,
+    pydantic: bool = False,
 ) -> str:
     """
     Return a Python type name for a proto type reference. Adds the import if
@@ -45,7 +64,7 @@ def get_type_reference(
     if unwrap:
         if source_type in WRAPPER_TYPES:
             wrapped_type = type(WRAPPER_TYPES[source_type]().value)
-            return f"Optional[{wrapped_type.__name__}]"
+            return typing_compiler.optional(wrapped_type.__name__)
 
         if source_type == ".google.protobuf.Duration":
             return "timedelta"
@@ -62,7 +81,9 @@ def get_type_reference(
     compiling_google_protobuf = current_package == ["google", "protobuf"]
     importing_google_protobuf = py_package == ["google", "protobuf"]
     if importing_google_protobuf and not compiling_google_protobuf:
-        py_package = ["betterproto", "lib"] + py_package
+        py_package = (
+            ["betterproto", "lib"] + (["pydantic"] if pydantic else []) + py_package
+        )
 
     if py_package[:1] == ["betterproto"]:
         return reference_absolute(imports, py_package, py_type)

src/betterproto/compile/naming.py

@@ -11,3 +11,11 @@ def pythonize_field_name(name: str) -> str:
 
 def pythonize_method_name(name: str) -> str:
     return casing.safe_snake_case(name)
+
+
+def pythonize_enum_member_name(name: str, enum_name: str) -> str:
+    enum_name = casing.snake_case(enum_name).upper()
+    find = name.find(enum_name)
+    if find != -1:
+        name = name[find + len(enum_name) :].strip("_")
+    return casing.sanitize_name(name)

src/betterproto/enum.py

@@ -0,0 +1,197 @@
+from __future__ import annotations
+
+from enum import (
+    EnumMeta,
+    IntEnum,
+)
+from types import MappingProxyType
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    Optional,
+    Tuple,
+)
+
+
+if TYPE_CHECKING:
+    from collections.abc import (
+        Generator,
+        Mapping,
+    )
+
+    from typing_extensions import (
+        Never,
+        Self,
+    )
+
+
+def _is_descriptor(obj: object) -> bool:
+    return (
+        hasattr(obj, "__get__") or hasattr(obj, "__set__") or hasattr(obj, "__delete__")
+    )
+
+
+class EnumType(EnumMeta if TYPE_CHECKING else type):
+    _value_map_: Mapping[int, Enum]
+    _member_map_: Mapping[str, Enum]
+
+    def __new__(
+        mcs, name: str, bases: Tuple[type, ...], namespace: Dict[str, Any]
+    ) -> Self:
+        value_map = {}
+        member_map = {}
+
+        new_mcs = type(
+            f"{name}Type",
+            tuple(
+                dict.fromkeys(
+                    [base.__class__ for base in bases if base.__class__ is not type]
+                    + [EnumType, type]
+                )
+            ),  # reorder the bases so EnumType and type are last to avoid conflicts
+            {"_value_map_": value_map, "_member_map_": member_map},
+        )
+
+        members = {
+            name: value
+            for name, value in namespace.items()
+            if not _is_descriptor(value) and not name.startswith("__")
+        }
+
+        cls = type.__new__(
+            new_mcs,
+            name,
+            bases,
+            {key: value for key, value in namespace.items() if key not in members},
+        )
+        # this allows us to disallow member access from other members as
+        # members become proper class variables
+
+        for name, value in members.items():
+            member = value_map.get(value)
+            if member is None:
+                member = cls.__new__(cls, name=name, value=value)  # type: ignore
+                value_map[value] = member
+            member_map[name] = member
+            type.__setattr__(new_mcs, name, member)
+
+        return cls
+
+    if not TYPE_CHECKING:
+
+        def __call__(cls, value: int) -> Enum:
+            try:
+                return cls._value_map_[value]
+            except (KeyError, TypeError):
+                raise ValueError(f"{value!r} is not a valid {cls.__name__}") from None
+
+        def __iter__(cls) -> Generator[Enum, None, None]:
+            yield from cls._member_map_.values()
+
+        def __reversed__(cls) -> Generator[Enum, None, None]:
+            yield from reversed(cls._member_map_.values())
+
+        def __getitem__(cls, key: str) -> Enum:
+            return cls._member_map_[key]
+
+        @property
+        def __members__(cls) -> MappingProxyType[str, Enum]:
+            return MappingProxyType(cls._member_map_)
+
+    def __repr__(cls) -> str:
+        return f"<enum {cls.__name__!r}>"
+
+    def __len__(cls) -> int:
+        return len(cls._member_map_)
+
+    def __setattr__(cls, name: str, value: Any) -> Never:
+        raise AttributeError(f"{cls.__name__}: cannot reassign Enum members.")
+
+    def __delattr__(cls, name: str) -> Never:
+        raise AttributeError(f"{cls.__name__}: cannot delete Enum members.")
+
+    def __contains__(cls, member: object) -> bool:
+        return isinstance(member, cls) and member.name in cls._member_map_
+
+
+class Enum(IntEnum if TYPE_CHECKING else int, metaclass=EnumType):
+    """
+    The base class for protobuf enumerations, all generated enumerations will
+    inherit from this. Emulates `enum.IntEnum`.
+    """
+
+    name: Optional[str]
+    value: int
+
+    if not TYPE_CHECKING:
+
+        def __new__(cls, *, name: Optional[str], value: int) -> Self:
+            self = super().__new__(cls, value)
+            super().__setattr__(self, "name", name)
+            super().__setattr__(self, "value", value)
+            return self
+
+    def __getnewargs_ex__(self) -> Tuple[Tuple[()], Dict[str, Any]]:
+        return (), {"name": self.name, "value": self.value}
+
+    def __str__(self) -> str:
+        return self.name or "None"
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}.{self.name}"
+
+    def __setattr__(self, key: str, value: Any) -> Never:
+        raise AttributeError(
+            f"{self.__class__.__name__} Cannot reassign a member's attributes."
+        )
+
+    def __delattr__(self, item: Any) -> Never:
+        raise AttributeError(
+            f"{self.__class__.__name__} Cannot delete a member's attributes."
+        )
+
+    def __copy__(self) -> Self:
+        return self
+
+    def __deepcopy__(self, memo: Any) -> Self:
+        return self
+
+    @classmethod
+    def try_value(cls, value: int = 0) -> Self:
+        """Return the value which corresponds to the value.
+
+        Parameters
+        -----------
+        value: :class:`int`
+            The value of the enum member to get.
+
+        Returns
+        -------
+        :class:`Enum`
+            The corresponding member or a new instance of the enum if
+            ``value`` isn't actually a member.
+        """
+        try:
+            return cls._value_map_[value]
+        except (KeyError, TypeError):
+            return cls.__new__(cls, name=None, value=value)
+
+    @classmethod
+    def from_string(cls, name: str) -> Self:
+        """Return the value which corresponds to the string name.
+
+        Parameters
+        -----------
+        name: :class:`str`
+            The name of the enum member to get.
+
+        Raises
+        -------
+        :exc:`ValueError`
+            The member was not found in the Enum.
+        """
+        try:
+            return cls._member_map_[name]
+        except KeyError as e:
+            raise ValueError(f"Unknown value {name} for enum {cls.__name__}") from e

src/betterproto/grpc/grpclib_client.py

@@ -15,17 +15,22 @@ from typing import (
 
 import grpclib.const
 
-from .._types import ST, T
 
 if TYPE_CHECKING:
     from grpclib.client import Channel
     from grpclib.metadata import Deadline
 
+    from .._types import (
+        ST,
+        IProtoMessage,
+        Message,
+        T,
+    )
 
-_Value = Union[str, bytes]
-_MetadataLike = Union[Mapping[str, _Value], Collection[Tuple[str, _Value]]]
-_MessageLike = Union[T, ST]
-_MessageSource = Union[Iterable[ST], AsyncIterable[ST]]
+
+Value = Union[str, bytes]
+MetadataLike = Union[Mapping[str, Value], Collection[Tuple[str, Value]]]
+MessageSource = Union[Iterable["IProtoMessage"], AsyncIterable["IProtoMessage"]]
 
 
 class ServiceStub(ABC):
@@ -39,7 +44,7 @@ class ServiceStub(ABC):
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
-        metadata: Optional[_MetadataLike] = None,
+        metadata: Optional[MetadataLike] = None,
     ) -> None:
         self.channel = channel
         self.timeout = timeout
@@ -50,7 +55,7 @@ class ServiceStub(ABC):
         self,
         timeout: Optional[float],
         deadline: Optional["Deadline"],
-        metadata: Optional[_MetadataLike],
+        metadata: Optional[MetadataLike],
     ):
         return {
             "timeout": self.timeout if timeout is None else timeout,
@@ -61,13 +66,13 @@ class ServiceStub(ABC):
     async def _unary_unary(
         self,
         route: str,
-        request: _MessageLike,
-        response_type: Type[T],
+        request: "IProtoMessage",
+        response_type: Type["T"],
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
-        metadata: Optional[_MetadataLike] = None,
-    ) -> T:
+        metadata: Optional[MetadataLike] = None,
+    ) -> "T":
         """Make a unary request and return the response."""
         async with self.channel.request(
             route,
@@ -84,13 +89,13 @@ class ServiceStub(ABC):
     async def _unary_stream(
         self,
         route: str,
-        request: _MessageLike,
-        response_type: Type[T],
+        request: "IProtoMessage",
+        response_type: Type["T"],
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
-        metadata: Optional[_MetadataLike] = None,
-    ) -> AsyncIterator[T]:
+        metadata: Optional[MetadataLike] = None,
+    ) -> AsyncIterator["T"]:
         """Make a unary request and return the stream response iterator."""
         async with self.channel.request(
             route,
@@ -106,14 +111,14 @@ class ServiceStub(ABC):
     async def _stream_unary(
         self,
         route: str,
-        request_iterator: _MessageSource,
-        request_type: Type[ST],
-        response_type: Type[T],
+        request_iterator: MessageSource,
+        request_type: Type["IProtoMessage"],
+        response_type: Type["T"],
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
-        metadata: Optional[_MetadataLike] = None,
-    ) -> T:
+        metadata: Optional[MetadataLike] = None,
+    ) -> "T":
         """Make a stream request and return the response."""
         async with self.channel.request(
             route,
@@ -122,6 +127,7 @@ class ServiceStub(ABC):
             response_type,
             **self.__resolve_request_kwargs(timeout, deadline, metadata),
         ) as stream:
+            await stream.send_request()
             await self._send_messages(stream, request_iterator)
             response = await stream.recv_message()
         assert response is not None
@@ -130,14 +136,14 @@ class ServiceStub(ABC):
     async def _stream_stream(
         self,
         route: str,
-        request_iterator: _MessageSource,
-        request_type: Type[ST],
-        response_type: Type[T],
+        request_iterator: MessageSource,
+        request_type: Type["IProtoMessage"],
+        response_type: Type["T"],
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
-        metadata: Optional[_MetadataLike] = None,
-    ) -> AsyncIterator[T]:
+        metadata: Optional[MetadataLike] = None,
+    ) -> AsyncIterator["T"]:
         """
         Make a stream request and return an AsyncIterator to iterate over response
         messages.
@@ -161,7 +167,7 @@ class ServiceStub(ABC):
                 raise
 
     @staticmethod
-    async def _send_messages(stream, messages: _MessageSource):
+    async def _send_messages(stream, messages: MessageSource):
         if isinstance(messages, AsyncIterable):
             async for message in messages:
                 await stream.send_message(message)

src/betterproto/grpc/grpclib_server.py

@@ -1,6 +1,10 @@
 from abc import ABC
-from collections import AsyncIterable
-from typing import Callable, Any, Dict
+from collections.abc import AsyncIterable
+from typing import (
+    Any,
+    Callable,
+    Dict,
+)
 
 import grpclib
 import grpclib.server
@@ -15,10 +19,9 @@ class ServiceBase(ABC):
         self,
         handler: Callable,
         stream: grpclib.server.Stream,
-        request_kwargs: Dict[str, Any],
+        request: Any,
     ) -> None:
-
-        response_iter = handler(**request_kwargs)
+        response_iter = handler(request)
         # check if response is actually an AsyncIterator
         # this might be false if the method just returns without
         # yielding at least once

src/betterproto/grpc/util/async_channel.py

@@ -1,5 +1,13 @@
 import asyncio
-from typing import AsyncIterable, AsyncIterator, Iterable, Optional, TypeVar, Union
+from typing import (
+    AsyncIterable,
+    AsyncIterator,
+    Iterable,
+    Optional,
+    TypeVar,
+    Union,
+)
+
 
 T = TypeVar("T")
 

src/betterproto/lib/google/protobuf/compiler/__init__.py

@@ -1,113 +1 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: google/protobuf/compiler/plugin.proto
-# plugin: python-betterproto
-from dataclasses import dataclass
-from typing import List
-
-import betterproto
-
-
-@dataclass(eq=False, repr=False)
-class Version(betterproto.Message):
-    """The version number of protocol compiler."""
-
-    major: int = betterproto.int32_field(1)
-    minor: int = betterproto.int32_field(2)
-    patch: int = betterproto.int32_field(3)
-    # A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
-    # be empty for mainline stable releases.
-    suffix: str = betterproto.string_field(4)
-
-
-@dataclass(eq=False, repr=False)
-class CodeGeneratorRequest(betterproto.Message):
-    """An encoded CodeGeneratorRequest is written to the plugin's stdin."""
-
-    # The .proto files that were explicitly listed on the command-line.  The code
-    # generator should generate code only for these files.  Each file's
-    # descriptor will be included in proto_file, below.
-    file_to_generate: List[str] = betterproto.string_field(1)
-    # The generator parameter passed on the command-line.
-    parameter: str = betterproto.string_field(2)
-    # FileDescriptorProtos for all files in files_to_generate and everything they
-    # import.  The files will appear in topological order, so each file appears
-    # before any file that imports it. protoc guarantees that all proto_files
-    # will be written after the fields above, even though this is not technically
-    # guaranteed by the protobuf wire format.  This theoretically could allow a
-    # plugin to stream in the FileDescriptorProtos and handle them one by one
-    # rather than read the entire set into memory at once.  However, as of this
-    # writing, this is not similarly optimized on protoc's end -- it will store
-    # all fields in memory at once before sending them to the plugin. Type names
-    # of fields and extensions in the FileDescriptorProto are always fully
-    # qualified.
-    proto_file: List[
-        "betterproto_lib_google_protobuf.FileDescriptorProto"
-    ] = betterproto.message_field(15)
-    # The version number of protocol compiler.
-    compiler_version: "Version" = betterproto.message_field(3)
-
-
-@dataclass(eq=False, repr=False)
-class CodeGeneratorResponse(betterproto.Message):
-    """The plugin writes an encoded CodeGeneratorResponse to stdout."""
-
-    # Error message.  If non-empty, code generation failed.  The plugin process
-    # should exit with status code zero even if it reports an error in this way.
-    # This should be used to indicate errors in .proto files which prevent the
-    # code generator from generating correct code.  Errors which indicate a
-    # problem in protoc itself -- such as the input CodeGeneratorRequest being
-    # unparseable -- should be reported by writing a message to stderr and
-    # exiting with a non-zero status code.
-    error: str = betterproto.string_field(1)
-    file: List["CodeGeneratorResponseFile"] = betterproto.message_field(15)
-
-
-@dataclass(eq=False, repr=False)
-class CodeGeneratorResponseFile(betterproto.Message):
-    """Represents a single generated file."""
-
-    # The file name, relative to the output directory.  The name must not contain
-    # "." or ".." components and must be relative, not be absolute (so, the file
-    # cannot lie outside the output directory).  "/" must be used as the path
-    # separator, not "\". If the name is omitted, the content will be appended to
-    # the previous file.  This allows the generator to break large files into
-    # small chunks, and allows the generated text to be streamed back to protoc
-    # so that large files need not reside completely in memory at one time.  Note
-    # that as of this writing protoc does not optimize for this -- it will read
-    # the entire CodeGeneratorResponse before writing files to disk.
-    name: str = betterproto.string_field(1)
-    # If non-empty, indicates that the named file should already exist, and the
-    # content here is to be inserted into that file at a defined insertion point.
-    # This feature allows a code generator to extend the output produced by
-    # another code generator.  The original generator may provide insertion
-    # points by placing special annotations in the file that look like:
-    # @@protoc_insertion_point(NAME) The annotation can have arbitrary text
-    # before and after it on the line, which allows it to be placed in a comment.
-    # NAME should be replaced with an identifier naming the point -- this is what
-    # other generators will use as the insertion_point.  Code inserted at this
-    # point will be placed immediately above the line containing the insertion
-    # point (thus multiple insertions to the same point will come out in the
-    # order they were added). The double-@ is intended to make it unlikely that
-    # the generated code could contain things that look like insertion points by
-    # accident. For example, the C++ code generator places the following line in
-    # the .pb.h files that it generates:   //
-    # @@protoc_insertion_point(namespace_scope) This line appears within the
-    # scope of the file's package namespace, but outside of any particular class.
-    # Another plugin can then specify the insertion_point "namespace_scope" to
-    # generate additional classes or other declarations that should be placed in
-    # this scope. Note that if the line containing the insertion point begins
-    # with whitespace, the same whitespace will be added to every line of the
-    # inserted text.  This is useful for languages like Python, where indentation
-    # matters.  In these languages, the insertion point comment should be
-    # indented the same amount as any inserted code will need to be in order to
-    # work correctly in that context. The code generator that generates the
-    # initial file and the one which inserts into it must both run as part of a
-    # single invocation of protoc. Code generators are executed in the order in
-    # which they appear on the command line. If |insertion_point| is present,
-    # |name| must also be present.
-    insertion_point: str = betterproto.string_field(2)
-    # The file contents.
-    content: str = betterproto.string_field(15)
-
-
-import betterproto.lib.google.protobuf as betterproto_lib_google_protobuf
+from betterproto.lib.std.google.protobuf.compiler import *

src/betterproto/lib/pydantic/google/protobuf/compiler/__init__.py

@@ -0,0 +1,210 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# sources: google/protobuf/compiler/plugin.proto
+# plugin: python-betterproto
+# This file has been @generated
+
+from typing import TYPE_CHECKING
+
+
+if TYPE_CHECKING:
+    from dataclasses import dataclass
+else:
+    from pydantic.dataclasses import dataclass
+
+from typing import List
+
+import betterproto
+import betterproto.lib.pydantic.google.protobuf as betterproto_lib_pydantic_google_protobuf
+
+
+class CodeGeneratorResponseFeature(betterproto.Enum):
+    """Sync with code_generator.h."""
+
+    FEATURE_NONE = 0
+    FEATURE_PROTO3_OPTIONAL = 1
+    FEATURE_SUPPORTS_EDITIONS = 2
+
+
+@dataclass(eq=False, repr=False)
+class Version(betterproto.Message):
+    """The version number of protocol compiler."""
+
+    major: int = betterproto.int32_field(1)
+    minor: int = betterproto.int32_field(2)
+    patch: int = betterproto.int32_field(3)
+    suffix: str = betterproto.string_field(4)
+    """
+    A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+     be empty for mainline stable releases.
+    """
+
+
+@dataclass(eq=False, repr=False)
+class CodeGeneratorRequest(betterproto.Message):
+    """An encoded CodeGeneratorRequest is written to the plugin's stdin."""
+
+    file_to_generate: List[str] = betterproto.string_field(1)
+    """
+    The .proto files that were explicitly listed on the command-line.  The
+     code generator should generate code only for these files.  Each file's
+     descriptor will be included in proto_file, below.
+    """
+
+    parameter: str = betterproto.string_field(2)
+    """The generator parameter passed on the command-line."""
+
+    proto_file: List["betterproto_lib_pydantic_google_protobuf.FileDescriptorProto"] = (
+        betterproto.message_field(15)
+    )
+    """
+    FileDescriptorProtos for all files in files_to_generate and everything
+     they import.  The files will appear in topological order, so each file
+     appears before any file that imports it.
+    
+     Note: the files listed in files_to_generate will include runtime-retention
+     options only, but all other files will include source-retention options.
+     The source_file_descriptors field below is available in case you need
+     source-retention options for files_to_generate.
+    
+     protoc guarantees that all proto_files will be written after
+     the fields above, even though this is not technically guaranteed by the
+     protobuf wire format.  This theoretically could allow a plugin to stream
+     in the FileDescriptorProtos and handle them one by one rather than read
+     the entire set into memory at once.  However, as of this writing, this
+     is not similarly optimized on protoc's end -- it will store all fields in
+     memory at once before sending them to the plugin.
+    
+     Type names of fields and extensions in the FileDescriptorProto are always
+     fully qualified.
+    """
+
+    source_file_descriptors: List[
+        "betterproto_lib_pydantic_google_protobuf.FileDescriptorProto"
+    ] = betterproto.message_field(17)
+    """
+    File descriptors with all options, including source-retention options.
+     These descriptors are only provided for the files listed in
+     files_to_generate.
+    """
+
+    compiler_version: "Version" = betterproto.message_field(3)
+    """The version number of protocol compiler."""
+
+
+@dataclass(eq=False, repr=False)
+class CodeGeneratorResponse(betterproto.Message):
+    """The plugin writes an encoded CodeGeneratorResponse to stdout."""
+
+    error: str = betterproto.string_field(1)
+    """
+    Error message.  If non-empty, code generation failed.  The plugin process
+     should exit with status code zero even if it reports an error in this way.
+    
+     This should be used to indicate errors in .proto files which prevent the
+     code generator from generating correct code.  Errors which indicate a
+     problem in protoc itself -- such as the input CodeGeneratorRequest being
+     unparseable -- should be reported by writing a message to stderr and
+     exiting with a non-zero status code.
+    """
+
+    supported_features: int = betterproto.uint64_field(2)
+    """
+    A bitmask of supported features that the code generator supports.
+     This is a bitwise "or" of values from the Feature enum.
+    """
+
+    minimum_edition: int = betterproto.int32_field(3)
+    """
+    The minimum edition this plugin supports.  This will be treated as an
+     Edition enum, but we want to allow unknown values.  It should be specified
+     according the edition enum value, *not* the edition number.  Only takes
+     effect for plugins that have FEATURE_SUPPORTS_EDITIONS set.
+    """
+
+    maximum_edition: int = betterproto.int32_field(4)
+    """
+    The maximum edition this plugin supports.  This will be treated as an
+     Edition enum, but we want to allow unknown values.  It should be specified
+     according the edition enum value, *not* the edition number.  Only takes
+     effect for plugins that have FEATURE_SUPPORTS_EDITIONS set.
+    """
+
+    file: List["CodeGeneratorResponseFile"] = betterproto.message_field(15)
+
+
+@dataclass(eq=False, repr=False)
+class CodeGeneratorResponseFile(betterproto.Message):
+    """Represents a single generated file."""
+
+    name: str = betterproto.string_field(1)
+    """
+    The file name, relative to the output directory.  The name must not
+     contain "." or ".." components and must be relative, not be absolute (so,
+     the file cannot lie outside the output directory).  "/" must be used as
+     the path separator, not "\".
+    
+     If the name is omitted, the content will be appended to the previous
+     file.  This allows the generator to break large files into small chunks,
+     and allows the generated text to be streamed back to protoc so that large
+     files need not reside completely in memory at one time.  Note that as of
+     this writing protoc does not optimize for this -- it will read the entire
+     CodeGeneratorResponse before writing files to disk.
+    """
+
+    insertion_point: str = betterproto.string_field(2)
+    """
+    If non-empty, indicates that the named file should already exist, and the
+     content here is to be inserted into that file at a defined insertion
+     point.  This feature allows a code generator to extend the output
+     produced by another code generator.  The original generator may provide
+     insertion points by placing special annotations in the file that look
+     like:
+       @@protoc_insertion_point(NAME)
+     The annotation can have arbitrary text before and after it on the line,
+     which allows it to be placed in a comment.  NAME should be replaced with
+     an identifier naming the point -- this is what other generators will use
+     as the insertion_point.  Code inserted at this point will be placed
+     immediately above the line containing the insertion point (thus multiple
+     insertions to the same point will come out in the order they were added).
+     The double-@ is intended to make it unlikely that the generated code
+     could contain things that look like insertion points by accident.
+    
+     For example, the C++ code generator places the following line in the
+     .pb.h files that it generates:
+       // @@protoc_insertion_point(namespace_scope)
+     This line appears within the scope of the file's package namespace, but
+     outside of any particular class.  Another plugin can then specify the
+     insertion_point "namespace_scope" to generate additional classes or
+     other declarations that should be placed in this scope.
+    
+     Note that if the line containing the insertion point begins with
+     whitespace, the same whitespace will be added to every line of the
+     inserted text.  This is useful for languages like Python, where
+     indentation matters.  In these languages, the insertion point comment
+     should be indented the same amount as any inserted code will need to be
+     in order to work correctly in that context.
+    
+     The code generator that generates the initial file and the one which
+     inserts into it must both run as part of a single invocation of protoc.
+     Code generators are executed in the order in which they appear on the
+     command line.
+    
+     If |insertion_point| is present, |name| must also be present.
+    """
+
+    content: str = betterproto.string_field(15)
+    """The file contents."""
+
+    generated_code_info: "betterproto_lib_pydantic_google_protobuf.GeneratedCodeInfo" = betterproto.message_field(
+        16
+    )
+    """
+    Information describing the file content being inserted. If an insertion
+     point is used, this information will be appropriately offset and inserted
+     into the code generation metadata for the generated files.
+    """
+
+
+CodeGeneratorRequest.__pydantic_model__.update_forward_refs()  # type: ignore
+CodeGeneratorResponse.__pydantic_model__.update_forward_refs()  # type: ignore
+CodeGeneratorResponseFile.__pydantic_model__.update_forward_refs()  # type: ignore

src/betterproto/lib/std/google/protobuf/compiler/__init__.py

@@ -0,0 +1,198 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# sources: google/protobuf/compiler/plugin.proto
+# plugin: python-betterproto
+# This file has been @generated
+
+from dataclasses import dataclass
+from typing import List
+
+import betterproto
+import betterproto.lib.google.protobuf as betterproto_lib_google_protobuf
+
+
+class CodeGeneratorResponseFeature(betterproto.Enum):
+    """Sync with code_generator.h."""
+
+    FEATURE_NONE = 0
+    FEATURE_PROTO3_OPTIONAL = 1
+    FEATURE_SUPPORTS_EDITIONS = 2
+
+
+@dataclass(eq=False, repr=False)
+class Version(betterproto.Message):
+    """The version number of protocol compiler."""
+
+    major: int = betterproto.int32_field(1)
+    minor: int = betterproto.int32_field(2)
+    patch: int = betterproto.int32_field(3)
+    suffix: str = betterproto.string_field(4)
+    """
+    A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+     be empty for mainline stable releases.
+    """
+
+
+@dataclass(eq=False, repr=False)
+class CodeGeneratorRequest(betterproto.Message):
+    """An encoded CodeGeneratorRequest is written to the plugin's stdin."""
+
+    file_to_generate: List[str] = betterproto.string_field(1)
+    """
+    The .proto files that were explicitly listed on the command-line.  The
+     code generator should generate code only for these files.  Each file's
+     descriptor will be included in proto_file, below.
+    """
+
+    parameter: str = betterproto.string_field(2)
+    """The generator parameter passed on the command-line."""
+
+    proto_file: List["betterproto_lib_google_protobuf.FileDescriptorProto"] = (
+        betterproto.message_field(15)
+    )
+    """
+    FileDescriptorProtos for all files in files_to_generate and everything
+     they import.  The files will appear in topological order, so each file
+     appears before any file that imports it.
+    
+     Note: the files listed in files_to_generate will include runtime-retention
+     options only, but all other files will include source-retention options.
+     The source_file_descriptors field below is available in case you need
+     source-retention options for files_to_generate.
+    
+     protoc guarantees that all proto_files will be written after
+     the fields above, even though this is not technically guaranteed by the
+     protobuf wire format.  This theoretically could allow a plugin to stream
+     in the FileDescriptorProtos and handle them one by one rather than read
+     the entire set into memory at once.  However, as of this writing, this
+     is not similarly optimized on protoc's end -- it will store all fields in
+     memory at once before sending them to the plugin.
+    
+     Type names of fields and extensions in the FileDescriptorProto are always
+     fully qualified.
+    """
+
+    source_file_descriptors: List[
+        "betterproto_lib_google_protobuf.FileDescriptorProto"
+    ] = betterproto.message_field(17)
+    """
+    File descriptors with all options, including source-retention options.
+     These descriptors are only provided for the files listed in
+     files_to_generate.
+    """
+
+    compiler_version: "Version" = betterproto.message_field(3)
+    """The version number of protocol compiler."""
+
+
+@dataclass(eq=False, repr=False)
+class CodeGeneratorResponse(betterproto.Message):
+    """The plugin writes an encoded CodeGeneratorResponse to stdout."""
+
+    error: str = betterproto.string_field(1)
+    """
+    Error message.  If non-empty, code generation failed.  The plugin process
+     should exit with status code zero even if it reports an error in this way.
+    
+     This should be used to indicate errors in .proto files which prevent the
+     code generator from generating correct code.  Errors which indicate a
+     problem in protoc itself -- such as the input CodeGeneratorRequest being
+     unparseable -- should be reported by writing a message to stderr and
+     exiting with a non-zero status code.
+    """
+
+    supported_features: int = betterproto.uint64_field(2)
+    """
+    A bitmask of supported features that the code generator supports.
+     This is a bitwise "or" of values from the Feature enum.
+    """
+
+    minimum_edition: int = betterproto.int32_field(3)
+    """
+    The minimum edition this plugin supports.  This will be treated as an
+     Edition enum, but we want to allow unknown values.  It should be specified
+     according the edition enum value, *not* the edition number.  Only takes
+     effect for plugins that have FEATURE_SUPPORTS_EDITIONS set.
+    """
+
+    maximum_edition: int = betterproto.int32_field(4)
+    """
+    The maximum edition this plugin supports.  This will be treated as an
+     Edition enum, but we want to allow unknown values.  It should be specified
+     according the edition enum value, *not* the edition number.  Only takes
+     effect for plugins that have FEATURE_SUPPORTS_EDITIONS set.
+    """
+
+    file: List["CodeGeneratorResponseFile"] = betterproto.message_field(15)
+
+
+@dataclass(eq=False, repr=False)
+class CodeGeneratorResponseFile(betterproto.Message):
+    """Represents a single generated file."""
+
+    name: str = betterproto.string_field(1)
+    """
+    The file name, relative to the output directory.  The name must not
+     contain "." or ".." components and must be relative, not be absolute (so,
+     the file cannot lie outside the output directory).  "/" must be used as
+     the path separator, not "\".
+    
+     If the name is omitted, the content will be appended to the previous
+     file.  This allows the generator to break large files into small chunks,
+     and allows the generated text to be streamed back to protoc so that large
+     files need not reside completely in memory at one time.  Note that as of
+     this writing protoc does not optimize for this -- it will read the entire
+     CodeGeneratorResponse before writing files to disk.
+    """
+
+    insertion_point: str = betterproto.string_field(2)
+    """
+    If non-empty, indicates that the named file should already exist, and the
+     content here is to be inserted into that file at a defined insertion
+     point.  This feature allows a code generator to extend the output
+     produced by another code generator.  The original generator may provide
+     insertion points by placing special annotations in the file that look
+     like:
+       @@protoc_insertion_point(NAME)
+     The annotation can have arbitrary text before and after it on the line,
+     which allows it to be placed in a comment.  NAME should be replaced with
+     an identifier naming the point -- this is what other generators will use
+     as the insertion_point.  Code inserted at this point will be placed
+     immediately above the line containing the insertion point (thus multiple
+     insertions to the same point will come out in the order they were added).
+     The double-@ is intended to make it unlikely that the generated code
+     could contain things that look like insertion points by accident.
+    
+     For example, the C++ code generator places the following line in the
+     .pb.h files that it generates:
+       // @@protoc_insertion_point(namespace_scope)
+     This line appears within the scope of the file's package namespace, but
+     outside of any particular class.  Another plugin can then specify the
+     insertion_point "namespace_scope" to generate additional classes or
+     other declarations that should be placed in this scope.
+    
+     Note that if the line containing the insertion point begins with
+     whitespace, the same whitespace will be added to every line of the
+     inserted text.  This is useful for languages like Python, where
+     indentation matters.  In these languages, the insertion point comment
+     should be indented the same amount as any inserted code will need to be
+     in order to work correctly in that context.
+    
+     The code generator that generates the initial file and the one which
+     inserts into it must both run as part of a single invocation of protoc.
+     Code generators are executed in the order in which they appear on the
+     command line.
+    
+     If |insertion_point| is present, |name| must also be present.
+    """
+
+    content: str = betterproto.string_field(15)
+    """The file contents."""
+
+    generated_code_info: "betterproto_lib_google_protobuf.GeneratedCodeInfo" = (
+        betterproto.message_field(16)
+    )
+    """
+    Information describing the file content being inserted. If an insertion
+     point is used, this information will be appropriately offset and inserted
+     into the code generation metadata for the generated files.
+    """

src/betterproto/plugin/compiler.py

@@ -1,8 +1,12 @@
 import os.path
+import subprocess
+import sys
+
+from .module_validation import ModuleValidator
+
 
 try:
     # betterproto[compiler] specific dependencies
-    import black
     import jinja2
 except ImportError as err:
     print(
@@ -19,7 +23,6 @@ from .models import OutputTemplate
 
 
 def outputfile_compiler(output_file: OutputTemplate) -> str:
-
     templates_folder = os.path.abspath(
         os.path.join(os.path.dirname(__file__), "..", "templates")
     )
@@ -28,10 +31,34 @@ def outputfile_compiler(output_file: OutputTemplate) -> str:
         trim_blocks=True,
         lstrip_blocks=True,
         loader=jinja2.FileSystemLoader(templates_folder),
+        undefined=jinja2.StrictUndefined,
     )
-    template = env.get_template("template.py.j2")
+    # Load the body first so we have a compleate list of imports needed.
+    body_template = env.get_template("template.py.j2")
+    header_template = env.get_template("header.py.j2")
 
-    return black.format_str(
-        template.render(output_file=output_file),
-        mode=black.FileMode(target_versions={black.TargetVersion.PY37}),
+    code = body_template.render(output_file=output_file)
+    code = header_template.render(output_file=output_file) + code
+
+    # Sort imports, delete unused ones
+    code = subprocess.check_output(
+        ["ruff", "check", "--select", "I,F401", "--fix", "--silent", "-"],
+        input=code,
+        encoding="utf-8",
     )
+
+    # Format the code
+    code = subprocess.check_output(
+        ["ruff", "format", "-"], input=code, encoding="utf-8"
+    )
+
+    # Validate the generated code.
+    validator = ModuleValidator(iter(code.splitlines()))
+    if not validator.validate():
+        message_builder = ["[WARNING]: Generated code has collisions in the module:"]
+        for collision, lines in validator.collisions.items():
+            message_builder.append(f'  "{collision}" on lines:')
+            for num, line in lines:
+                message_builder.append(f"    {num}:{line}")
+        print("\n".join(message_builder), file=sys.stderr)
+    return code

src/betterproto/plugin/main.py

@@ -7,9 +7,8 @@ from betterproto.lib.google.protobuf.compiler import (
     CodeGeneratorRequest,
     CodeGeneratorResponse,
 )
-
-from betterproto.plugin.parser import generate_code
 from betterproto.plugin.models import monkey_patch_oneof_index
+from betterproto.plugin.parser import generate_code
 
 
 def main() -> None:
@@ -28,11 +27,8 @@ def main() -> None:
     if dump_file:
         dump_request(dump_file, request)
 
-    # Create response
-    response = CodeGeneratorResponse()
-
     # Generate code
-    generate_code(request, response)
+    response = generate_code(request)
 
     # Serialise response message
     output = response.SerializeToString()

src/betterproto/plugin/models.py

@@ -29,14 +29,24 @@ instantiating field `A` with parent message `B` should add a
 reference to `A` to `B`'s `fields` attribute.
 """
 
+import builtins
+import re
+from dataclasses import (
+    dataclass,
+    field,
+)
+from typing import (
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Optional,
+    Set,
+    Type,
+    Union,
+)
 
 import betterproto
-from betterproto import which_one_of
-from betterproto.casing import sanitize_name
-from betterproto.compile.importing import (
-    get_type_reference,
-    parse_source_type_name,
-)
 from betterproto.compile.naming import (
     pythonize_class_name,
     pythonize_field_name,
@@ -45,29 +55,30 @@ from betterproto.compile.naming import (
 from betterproto.lib.google.protobuf import (
     DescriptorProto,
     EnumDescriptorProto,
-    FileDescriptorProto,
-    MethodDescriptorProto,
     Field,
     FieldDescriptorProto,
-    FieldDescriptorProtoType,
     FieldDescriptorProtoLabel,
+    FieldDescriptorProtoType,
+    FileDescriptorProto,
+    MethodDescriptorProto,
 )
 from betterproto.lib.google.protobuf.compiler import CodeGeneratorRequest
 
-
-import re
-import textwrap
-from dataclasses import dataclass, field
-from typing import Dict, Iterable, Iterator, List, Optional, Set, Text, Type, Union
-import sys
-
-from ..casing import sanitize_name
-from ..compile.importing import get_type_reference, parse_source_type_name
+from .. import which_one_of
+from ..compile.importing import (
+    get_type_reference,
+    parse_source_type_name,
+)
 from ..compile.naming import (
     pythonize_class_name,
+    pythonize_enum_member_name,
     pythonize_field_name,
     pythonize_method_name,
 )
+from .typing_compiler import (
+    DirectImportTypingCompiler,
+    TypingCompiler,
+)
 
 
 # Create a unique placeholder to deal with
@@ -142,22 +153,37 @@ def get_comment(
 ) -> str:
     pad = " " * indent
     for sci_loc in proto_file.source_code_info.location:
-        if list(sci_loc.path) == path and sci_loc.leading_comments:
-            lines = textwrap.wrap(
-                sci_loc.leading_comments.strip().replace("\n", ""), width=79 - indent
-            )
+        if list(sci_loc.path) == path:
+            all_comments = list(sci_loc.leading_detached_comments)
+            if sci_loc.leading_comments:
+                all_comments.append(sci_loc.leading_comments)
+            if sci_loc.trailing_comments:
+                all_comments.append(sci_loc.trailing_comments)
 
-            if path[-2] == 2 and path[-4] != 6:
-                # This is a field
-                return f"{pad}# " + f"\n{pad}# ".join(lines)
+            lines = []
+
+            for comment in all_comments:
+                lines += comment.split("\n")
+                lines.append("")
+
+            # Remove consecutive empty lines
+            lines = [
+                line for i, line in enumerate(lines) if line or (i == 0 or lines[i - 1])
+            ]
+
+            if lines and not lines[-1]:
+                lines.pop()  # Remove the last empty line
+
+            # It is common for one line comments to start with a space, for example: // comment
+            # We don't add this space to the generated file.
+            lines = [line[1:] if line and line[0] == " " else line for line in lines]
+
+            # This is a field, message, enum, service, or method
+            if len(lines) == 1 and len(lines[0]) < 79 - indent - 6:
+                return f'{pad}"""{lines[0]}"""'
             else:
-                # This is a message, enum, service, or method
-                if len(lines) == 1 and len(lines[0]) < 79 - indent - 6:
-                    lines[0] = lines[0].strip('"')
-                    return f'{pad}"""{lines[0]}"""'
-                else:
-                    joined = f"\n{pad}".join(lines)
-                    return f'{pad}"""\n{pad}{joined}\n{pad}"""'
+                joined = f"\n{pad}".join(lines)
+                return f'{pad}"""\n{pad}{joined}\n{pad}"""'
 
     return ""
 
@@ -166,6 +192,7 @@ class ProtoContentBase:
     """Methods common to MessageCompiler, ServiceCompiler and ServiceMethodCompiler."""
 
     source_file: FileDescriptorProto
+    typing_compiler: TypingCompiler
     path: List[int]
     comment_indent: int = 4
     parent: Union["betterproto.Message", "OutputTemplate"]
@@ -204,7 +231,6 @@ class ProtoContentBase:
 
 @dataclass
 class PluginRequestCompiler:
-
     plugin_request_obj: CodeGeneratorRequest
     output_packages: Dict[str, "OutputTemplate"] = field(default_factory=dict)
 
@@ -234,12 +260,17 @@ class OutputTemplate:
     parent_request: PluginRequestCompiler
     package_proto_obj: FileDescriptorProto
     input_files: List[str] = field(default_factory=list)
-    imports: Set[str] = field(default_factory=set)
+    imports_end: Set[str] = field(default_factory=set)
     datetime_imports: Set[str] = field(default_factory=set)
-    typing_imports: Set[str] = field(default_factory=set)
+    pydantic_imports: Set[str] = field(default_factory=set)
+    builtins_import: bool = False
     messages: List["MessageCompiler"] = field(default_factory=list)
     enums: List["EnumDefinitionCompiler"] = field(default_factory=list)
     services: List["ServiceCompiler"] = field(default_factory=list)
+    imports_type_checking_only: Set[str] = field(default_factory=set)
+    pydantic_dataclasses: bool = False
+    output: bool = True
+    typing_compiler: TypingCompiler = field(default_factory=DirectImportTypingCompiler)
 
     @property
     def package(self) -> str:
@@ -266,8 +297,23 @@ class OutputTemplate:
     @property
     def python_module_imports(self) -> Set[str]:
         imports = set()
+
+        has_deprecated = False
+        if any(m.deprecated for m in self.messages):
+            has_deprecated = True
         if any(x for x in self.messages if any(x.deprecated_fields)):
+            has_deprecated = True
+        if any(
+            any(m.proto_obj.options.deprecated for m in s.methods)
+            for s in self.services
+        ):
+            has_deprecated = True
+
+        if has_deprecated:
             imports.add("warnings")
+
+        if self.builtins_import:
+            imports.add("builtins")
         return imports
 
 
@@ -276,6 +322,7 @@ class MessageCompiler(ProtoContentBase):
     """Representation of a protobuf message."""
 
     source_file: FileDescriptorProto
+    typing_compiler: TypingCompiler
     parent: Union["MessageCompiler", OutputTemplate] = PLACEHOLDER
     proto_obj: DescriptorProto = PLACEHOLDER
     path: List[int] = PLACEHOLDER
@@ -283,6 +330,7 @@ class MessageCompiler(ProtoContentBase):
         default_factory=list
     )
     deprecated: bool = field(default=False, init=False)
+    builtins_types: Set[str] = field(default_factory=set)
 
     def __post_init__(self) -> None:
         # Add message to output file
@@ -302,12 +350,6 @@ class MessageCompiler(ProtoContentBase):
     def py_name(self) -> str:
         return pythonize_class_name(self.proto_name)
 
-    @property
-    def annotation(self) -> str:
-        if self.repeated:
-            return f"List[{self.py_name}]"
-        return self.py_name
-
     @property
     def deprecated_fields(self) -> Iterator[str]:
         for f in self.fields:
@@ -318,12 +360,29 @@ class MessageCompiler(ProtoContentBase):
     def has_deprecated_fields(self) -> bool:
         return any(self.deprecated_fields)
 
+    @property
+    def has_oneof_fields(self) -> bool:
+        return any(isinstance(field, OneOfFieldCompiler) for field in self.fields)
+
+    @property
+    def has_message_field(self) -> bool:
+        return any(
+            (
+                field.proto_obj.type in PROTO_MESSAGE_TYPES
+                for field in self.fields
+                if isinstance(field.proto_obj, FieldDescriptorProto)
+            )
+        )
+
 
 def is_map(
     proto_field_obj: FieldDescriptorProto, parent_message: DescriptorProto
 ) -> bool:
     """True if proto_field_obj is a map, otherwise False."""
     if proto_field_obj.type == FieldDescriptorProtoType.TYPE_MESSAGE:
+        if not hasattr(parent_message, "nested_type"):
+            return False
+
         # This might be a map...
         message_type = proto_field_obj.type_name.split(".").pop().lower()
         map_entry = f"{proto_field_obj.name.replace('_', '').lower()}entry"
@@ -351,7 +410,10 @@ def is_oneof(proto_field_obj: FieldDescriptorProto) -> bool:
         us to tell whether it was set, via the which_one_of interface.
     """
 
-    return which_one_of(proto_field_obj, "oneof_index")[0] == "oneof_index"
+    return (
+        not proto_field_obj.proto3_optional
+        and which_one_of(proto_field_obj, "oneof_index")[0] == "oneof_index"
+    )
 
 
 @dataclass
@@ -376,6 +438,8 @@ class FieldCompiler(MessageCompiler):
         betterproto_field_type = (
             f"betterproto.{self.field_type}_field({self.proto_obj.number}{field_args})"
         )
+        if self.py_name in dir(builtins):
+            self.parent.builtins_types.add(self.py_name)
         return f"{name}{annotations} = {betterproto_field_type}"
 
     @property
@@ -383,6 +447,8 @@ class FieldCompiler(MessageCompiler):
         args = []
         if self.field_wraps:
             args.append(f"wraps={self.field_wraps}")
+        if self.optional:
+            args.append(f"optional=True")
         return args
 
     @property
@@ -397,20 +463,19 @@ class FieldCompiler(MessageCompiler):
         return imports
 
     @property
-    def typing_imports(self) -> Set[str]:
-        imports = set()
-        annotation = self.annotation
-        if "Optional[" in annotation:
-            imports.add("Optional")
-        if "List[" in annotation:
-            imports.add("List")
-        if "Dict[" in annotation:
-            imports.add("Dict")
-        return imports
+    def pydantic_imports(self) -> Set[str]:
+        return set()
+
+    @property
+    def use_builtins(self) -> bool:
+        return self.py_type in self.parent.builtins_types or (
+            self.py_type == self.py_name and self.py_name in dir(builtins)
+        )
 
     def add_imports_to(self, output_file: OutputTemplate) -> None:
         output_file.datetime_imports.update(self.datetime_imports)
-        output_file.typing_imports.update(self.typing_imports)
+        output_file.pydantic_imports.update(self.pydantic_imports)
+        output_file.builtins_import = output_file.builtins_import or self.use_builtins
 
     @property
     def field_wraps(self) -> Optional[str]:
@@ -432,9 +497,8 @@ class FieldCompiler(MessageCompiler):
         )
 
     @property
-    def mutable(self) -> bool:
-        """True if the field is a mutable type, otherwise False."""
-        return self.annotation.startswith(("List[", "Dict["))
+    def optional(self) -> bool:
+        return self.proto_obj.proto3_optional
 
     @property
     def field_type(self) -> str:
@@ -445,25 +509,6 @@ class FieldCompiler(MessageCompiler):
             .replace("type_", "")
         )
 
-    @property
-    def default_value_string(self) -> Union[Text, None, float, int]:
-        """Python representation of the default proto value."""
-        if self.repeated:
-            return "[]"
-        if self.py_type == "int":
-            return "0"
-        if self.py_type == "float":
-            return "0.0"
-        elif self.py_type == "bool":
-            return "False"
-        elif self.py_type == "str":
-            return '""'
-        elif self.py_type == "bytes":
-            return 'b""'
-        else:
-            # Message type
-            return "None"
-
     @property
     def packed(self) -> bool:
         """True if the wire representation is a packed format."""
@@ -496,17 +541,24 @@ class FieldCompiler(MessageCompiler):
             # Type referencing another defined Message or a named enum
             return get_type_reference(
                 package=self.output_file.package,
-                imports=self.output_file.imports,
+                imports=self.output_file.imports_end,
                 source_type=self.proto_obj.type_name,
+                typing_compiler=self.typing_compiler,
+                pydantic=self.output_file.pydantic_dataclasses,
             )
         else:
-            raise NotImplementedError(f"Unknown type {field.type}")
+            raise NotImplementedError(f"Unknown type {self.proto_obj.type}")
 
     @property
     def annotation(self) -> str:
+        py_type = self.py_type
+        if self.use_builtins:
+            py_type = f"builtins.{py_type}"
         if self.repeated:
-            return f"List[{self.py_type}]"
-        return self.py_type
+            return self.typing_compiler.list(py_type)
+        if self.optional:
+            return self.typing_compiler.optional(py_type)
+        return py_type
 
 
 @dataclass
@@ -519,6 +571,20 @@ class OneOfFieldCompiler(FieldCompiler):
         return args
 
 
+@dataclass
+class PydanticOneOfFieldCompiler(OneOfFieldCompiler):
+    @property
+    def optional(self) -> bool:
+        # Force the optional to be True. This will allow the pydantic dataclass
+        # to validate the object correctly by allowing the field to be let empty.
+        # We add a pydantic validator later to ensure exactly one field is defined.
+        return True
+
+    @property
+    def pydantic_imports(self) -> Set[str]:
+        return {"model_validator"}
+
+
 @dataclass
 class MapEntryCompiler(FieldCompiler):
     py_k_type: Type = PLACEHOLDER
@@ -539,11 +605,13 @@ class MapEntryCompiler(FieldCompiler):
                     source_file=self.source_file,
                     parent=self,
                     proto_obj=nested.field[0],  # key
+                    typing_compiler=self.typing_compiler,
                 ).py_type
                 self.py_v_type = FieldCompiler(
                     source_file=self.source_file,
                     parent=self,
                     proto_obj=nested.field[1],  # value
+                    typing_compiler=self.typing_compiler,
                 ).py_type
 
                 # Get proto types
@@ -561,7 +629,7 @@ class MapEntryCompiler(FieldCompiler):
 
     @property
     def annotation(self) -> str:
-        return f"Dict[{self.py_k_type}, {self.py_v_type}]"
+        return self.typing_compiler.dict(self.py_k_type, self.py_v_type)
 
     @property
     def repeated(self) -> bool:
@@ -587,7 +655,9 @@ class EnumDefinitionCompiler(MessageCompiler):
         # Get entries/allowed values for this Enum
         self.entries = [
             self.EnumEntry(
-                name=sanitize_name(entry_proto_value.name),
+                name=pythonize_enum_member_name(
+                    entry_proto_value.name, self.proto_obj.name
+                ),
                 value=entry_proto_value.number,
                 comment=get_comment(
                     proto_file=self.source_file, path=self.path + [2, entry_number]
@@ -597,17 +667,10 @@ class EnumDefinitionCompiler(MessageCompiler):
         ]
         super().__post_init__()  # call MessageCompiler __post_init__
 
-    @property
-    def default_value_string(self) -> str:
-        """Python representation of the default value for Enums.
-
-        As per the spec, this is the first value of the Enum.
-        """
-        return str(self.entries[0].value)  # ideally, should ALWAYS be int(0)!
-
 
 @dataclass
 class ServiceCompiler(ProtoContentBase):
+    source_file: FileDescriptorProto
     parent: OutputTemplate = PLACEHOLDER
     proto_obj: DescriptorProto = PLACEHOLDER
     path: List[int] = PLACEHOLDER
@@ -616,7 +679,6 @@ class ServiceCompiler(ProtoContentBase):
     def __post_init__(self) -> None:
         # Add service to output file
         self.output_file.services.append(self)
-        self.output_file.typing_imports.add("Dict")
         super().__post_init__()  # check for unset fields
 
     @property
@@ -630,7 +692,7 @@ class ServiceCompiler(ProtoContentBase):
 
 @dataclass
 class ServiceMethodCompiler(ProtoContentBase):
-
+    source_file: FileDescriptorProto
     parent: ServiceCompiler
     proto_obj: MethodDescriptorProto
     path: List[int] = PLACEHOLDER
@@ -640,55 +702,16 @@ class ServiceMethodCompiler(ProtoContentBase):
         # Add method to service
         self.parent.methods.append(self)
 
-        # Check for imports
-        if self.py_input_message:
-            for f in self.py_input_message.fields:
-                f.add_imports_to(self.output_file)
-        if "Optional" in self.py_output_message_type:
-            self.output_file.typing_imports.add("Optional")
-        self.mutable_default_args  # ensure this is called before rendering
-
-        # Check for Async imports
-        if self.client_streaming:
-            self.output_file.typing_imports.add("AsyncIterable")
-            self.output_file.typing_imports.add("Iterable")
-            self.output_file.typing_imports.add("Union")
-        if self.server_streaming:
-            self.output_file.typing_imports.add("AsyncIterator")
+        self.output_file.imports_type_checking_only.add("import grpclib.server")
+        self.output_file.imports_type_checking_only.add(
+            "from betterproto.grpc.grpclib_client import MetadataLike"
+        )
+        self.output_file.imports_type_checking_only.add(
+            "from grpclib.metadata import Deadline"
+        )
 
         super().__post_init__()  # check for unset fields
 
-    @property
-    def mutable_default_args(self) -> Dict[str, str]:
-        """Handle mutable default arguments.
-
-        Returns a list of tuples containing the name and default value
-        for arguments to this message who's default value is mutable.
-        The defaults are swapped out for None and replaced back inside
-        the method's body.
-        Reference:
-        https://docs.python-guide.org/writing/gotchas/#mutable-default-arguments
-
-        Returns
-        -------
-        Dict[str, str]
-            Name and actual default value (as a string)
-            for each argument with mutable default values.
-        """
-        mutable_default_args = {}
-
-        if self.py_input_message:
-            for f in self.py_input_message.fields:
-                if (
-                    not self.client_streaming
-                    and f.default_value_string != "None"
-                    and f.mutable
-                ):
-                    mutable_default_args[f.py_name] = f.default_value_string
-                    self.output_file.typing_imports.add("Optional")
-
-        return mutable_default_args
-
     @property
     def py_name(self) -> str:
         """Pythonized method name."""
@@ -706,30 +729,6 @@ class ServiceMethodCompiler(ProtoContentBase):
         )
         return f"/{package_part}{self.parent.proto_name}/{self.proto_name}"
 
-    @property
-    def py_input_message(self) -> Optional[MessageCompiler]:
-        """Find the input message object.
-
-        Returns
-        -------
-        Optional[MessageCompiler]
-            Method instance representing the input message.
-            If not input message could be found or there are no
-            input messages, None is returned.
-        """
-        package, name = parse_source_type_name(self.proto_obj.input_type)
-
-        # Nested types are currently flattened without dots.
-        # Todo: keep a fully quantified name in types, that is
-        # comparable with method.input_type
-        for msg in self.request.all_messages:
-            if (
-                msg.py_name == name.replace(".", "")
-                and msg.output_file.package == package
-            ):
-                return msg
-        return None
-
     @property
     def py_input_message_type(self) -> str:
         """String representation of the Python type corresponding to the
@@ -742,10 +741,24 @@ class ServiceMethodCompiler(ProtoContentBase):
         """
         return get_type_reference(
             package=self.output_file.package,
-            imports=self.output_file.imports,
+            imports=self.output_file.imports_end,
             source_type=self.proto_obj.input_type,
+            typing_compiler=self.output_file.typing_compiler,
+            unwrap=False,
+            pydantic=self.output_file.pydantic_dataclasses,
         ).strip('"')
 
+    @property
+    def py_input_message_param(self) -> str:
+        """Param name corresponding to py_input_message_type.
+
+        Returns
+        -------
+        str
+            Param name corresponding to py_input_message_type.
+        """
+        return pythonize_field_name(self.py_input_message_type)
+
     @property
     def py_output_message_type(self) -> str:
         """String representation of the Python type corresponding to the
@@ -758,9 +771,11 @@ class ServiceMethodCompiler(ProtoContentBase):
         """
         return get_type_reference(
             package=self.output_file.package,
-            imports=self.output_file.imports,
+            imports=self.output_file.imports_end,
             source_type=self.proto_obj.output_type,
+            typing_compiler=self.output_file.typing_compiler,
             unwrap=False,
+            pydantic=self.output_file.pydantic_dataclasses,
         ).strip('"')
 
     @property

src/betterproto/plugin/module_validation.py

@@ -0,0 +1,163 @@
+import re
+from collections import defaultdict
+from dataclasses import (
+    dataclass,
+    field,
+)
+from typing import (
+    Dict,
+    Iterator,
+    List,
+    Tuple,
+)
+
+
+@dataclass
+class ModuleValidator:
+    line_iterator: Iterator[str]
+    line_number: int = field(init=False, default=0)
+
+    collisions: Dict[str, List[Tuple[int, str]]] = field(
+        init=False, default_factory=lambda: defaultdict(list)
+    )
+
+    def add_import(self, imp: str, number: int, full_line: str):
+        """
+        Adds an import to be tracked.
+        """
+        self.collisions[imp].append((number, full_line))
+
+    def process_import(self, imp: str):
+        """
+        Filters out the import to its actual value.
+        """
+        if " as " in imp:
+            imp = imp[imp.index(" as ") + 4 :]
+
+        imp = imp.strip()
+        assert " " not in imp, imp
+        return imp
+
+    def evaluate_multiline_import(self, line: str):
+        """
+        Evaluates a multiline import from a starting line
+        """
+        # Filter the first line and remove anything before the import statement.
+        full_line = line
+        line = line.split("import", 1)[1]
+        if "(" in line:
+            conditional = lambda line: ")" not in line
+        else:
+            conditional = lambda line: "\\" in line
+
+        # Remove open parenthesis if it exists.
+        if "(" in line:
+            line = line[line.index("(") + 1 :]
+
+        # Choose the conditional based on how multiline imports are formatted.
+        while conditional(line):
+            # Split the line by commas
+            imports = line.split(",")
+
+            for imp in imports:
+                # Add the import to the namespace
+                imp = self.process_import(imp)
+                if imp:
+                    self.add_import(imp, self.line_number, full_line)
+            # Get the next line
+            full_line = line = next(self.line_iterator)
+            # Increment the line number
+            self.line_number += 1
+
+        # validate the last line
+        if ")" in line:
+            line = line[: line.index(")")]
+        imports = line.split(",")
+        for imp in imports:
+            imp = self.process_import(imp)
+            if imp:
+                self.add_import(imp, self.line_number, full_line)
+
+    def evaluate_import(self, line: str):
+        """
+        Extracts an import from a line.
+        """
+        whole_line = line
+        line = line[line.index("import") + 6 :]
+        values = line.split(",")
+        for v in values:
+            self.add_import(self.process_import(v), self.line_number, whole_line)
+
+    def next(self):
+        """
+        Evaluate each line for names in the module.
+        """
+        line = next(self.line_iterator)
+
+        # Skip lines with indentation or comments
+        if (
+            # Skip indents and whitespace.
+            line.startswith(" ")
+            or line == "\n"
+            or line.startswith("\t")
+            or
+            # Skip comments
+            line.startswith("#")
+            or
+            # Skip  decorators
+            line.startswith("@")
+        ):
+            self.line_number += 1
+            return
+
+        # Skip docstrings.
+        if line.startswith('"""') or line.startswith("'''"):
+            quote = line[0] * 3
+            line = line[3:]
+            while quote not in line:
+                line = next(self.line_iterator)
+            self.line_number += 1
+            return
+
+        # Evaluate Imports.
+        if line.startswith("from ") or line.startswith("import "):
+            if "(" in line or "\\" in line:
+                self.evaluate_multiline_import(line)
+            else:
+                self.evaluate_import(line)
+
+        # Evaluate Classes.
+        elif line.startswith("class "):
+            class_name = re.search(r"class (\w+)", line).group(1)
+            if class_name:
+                self.add_import(class_name, self.line_number, line)
+
+        # Evaluate Functions.
+        elif line.startswith("def "):
+            function_name = re.search(r"def (\w+)", line).group(1)
+            if function_name:
+                self.add_import(function_name, self.line_number, line)
+
+        # Evaluate direct assignments.
+        elif "=" in line:
+            assignment = re.search(r"(\w+)\s*=", line).group(1)
+            if assignment:
+                self.add_import(assignment, self.line_number, line)
+
+        self.line_number += 1
+
+    def validate(self) -> bool:
+        """
+        Run Validation.
+        """
+        try:
+            while True:
+                self.next()
+        except StopIteration:
+            pass
+
+        # Filter collisions for those with more than one value.
+        self.collisions = {k: v for k, v in self.collisions.items() if len(v) > 1}
+
+        # Return True if no collisions are found.
+        return not bool(self.collisions)

src/betterproto/plugin/parser.py

@@ -1,3 +1,13 @@
+import pathlib
+import sys
+from typing import (
+    Generator,
+    List,
+    Set,
+    Tuple,
+    Union,
+)
+
 from betterproto.lib.google.protobuf import (
     DescriptorProto,
     EnumDescriptorProto,
@@ -8,12 +18,10 @@ from betterproto.lib.google.protobuf import (
 from betterproto.lib.google.protobuf.compiler import (
     CodeGeneratorRequest,
     CodeGeneratorResponse,
+    CodeGeneratorResponseFeature,
     CodeGeneratorResponseFile,
 )
-import itertools
-import pathlib
-import sys
-from typing import Iterator, List, Set, Tuple, TYPE_CHECKING, Union
+
 from .compiler import outputfile_compiler
 from .models import (
     EnumDefinitionCompiler,
@@ -23,59 +31,57 @@ from .models import (
     OneOfFieldCompiler,
     OutputTemplate,
     PluginRequestCompiler,
+    PydanticOneOfFieldCompiler,
     ServiceCompiler,
     ServiceMethodCompiler,
     is_map,
     is_oneof,
 )
-
-if TYPE_CHECKING:
-    from google.protobuf.descriptor import Descriptor
+from .typing_compiler import (
+    DirectImportTypingCompiler,
+    NoTyping310TypingCompiler,
+    TypingCompiler,
+    TypingImportTypingCompiler,
+)
 
 
 def traverse(
-    proto_file: FieldDescriptorProto,
-) -> "itertools.chain[Tuple[Union[str, EnumDescriptorProto], List[int]]]":
+    proto_file: FileDescriptorProto,
+) -> Generator[
+    Tuple[Union[EnumDescriptorProto, DescriptorProto], List[int]], None, None
+]:
     # Todo: Keep information about nested hierarchy
     def _traverse(
-        path: List[int], items: List["EnumDescriptorProto"], prefix=""
-    ) -> Iterator[Tuple[Union[str, EnumDescriptorProto], List[int]]]:
+        path: List[int],
+        items: Union[List[EnumDescriptorProto], List[DescriptorProto]],
+        prefix: str = "",
+    ) -> Generator[
+        Tuple[Union[EnumDescriptorProto, DescriptorProto], List[int]], None, None
+    ]:
         for i, item in enumerate(items):
             # Adjust the name since we flatten the hierarchy.
             # Todo: don't change the name, but include full name in returned tuple
-            item.name = next_prefix = prefix + item.name
-            yield item, path + [i]
+            item.name = next_prefix = f"{prefix}_{item.name}"
+            yield item, [*path, i]
 
             if isinstance(item, DescriptorProto):
-                for enum in item.enum_type:
-                    enum.name = next_prefix + enum.name
-                    yield enum, path + [i, 4]
+                # Get nested types.
+                yield from _traverse([*path, i, 4], item.enum_type, next_prefix)
+                yield from _traverse([*path, i, 3], item.nested_type, next_prefix)
 
-                if item.nested_type:
-                    for n, p in _traverse(path + [i, 3], item.nested_type, next_prefix):
-                        yield n, p
-
-    return itertools.chain(
-        _traverse([5], proto_file.enum_type), _traverse([4], proto_file.message_type)
-    )
+    yield from _traverse([5], proto_file.enum_type)
+    yield from _traverse([4], proto_file.message_type)
 
 
-def generate_code(
-    request: CodeGeneratorRequest, response: CodeGeneratorResponse
-) -> None:
+def generate_code(request: CodeGeneratorRequest) -> CodeGeneratorResponse:
+    response = CodeGeneratorResponse()
+
     plugin_options = request.parameter.split(",") if request.parameter else []
+    response.supported_features = CodeGeneratorResponseFeature.FEATURE_PROTO3_OPTIONAL
 
     request_data = PluginRequestCompiler(plugin_request_obj=request)
     # Gather output packages
     for proto_file in request.proto_file:
-        if (
-            proto_file.package == "google.protobuf"
-            and "INCLUDE_GOOGLE" not in plugin_options
-        ):
-            # If not INCLUDE_GOOGLE,
-            # skip re-compiling Google's well-known types
-            continue
-
         output_package_name = proto_file.package
         if output_package_name not in request_data.output_packages:
             # Create a new output if there is no output for this package
@@ -85,6 +91,41 @@ def generate_code(
         # Add this input file to the output corresponding to this package
         request_data.output_packages[output_package_name].input_files.append(proto_file)
 
+        if (
+            proto_file.package == "google.protobuf"
+            and "INCLUDE_GOOGLE" not in plugin_options
+        ):
+            # If not INCLUDE_GOOGLE,
+            # skip outputting Google's well-known types
+            request_data.output_packages[output_package_name].output = False
+
+        if "pydantic_dataclasses" in plugin_options:
+            request_data.output_packages[
+                output_package_name
+            ].pydantic_dataclasses = True
+
+        # Gather any typing generation options.
+        typing_opts = [
+            opt[len("typing.") :] for opt in plugin_options if opt.startswith("typing.")
+        ]
+
+        if len(typing_opts) > 1:
+            raise ValueError("Multiple typing options provided")
+        # Set the compiler type.
+        typing_opt = typing_opts[0] if typing_opts else "direct"
+        if typing_opt == "direct":
+            request_data.output_packages[
+                output_package_name
+            ].typing_compiler = DirectImportTypingCompiler()
+        elif typing_opt == "root":
+            request_data.output_packages[
+                output_package_name
+            ].typing_compiler = TypingImportTypingCompiler()
+        elif typing_opt == "310":
+            request_data.output_packages[
+                output_package_name
+            ].typing_compiler = NoTyping310TypingCompiler()
+
     # Read Messages and Enums
     # We need to read Messages before Services in so that we can
     # get the references to input/output messages for each service
@@ -102,11 +143,13 @@ def generate_code(
     for output_package_name, output_package in request_data.output_packages.items():
         for proto_input_file in output_package.input_files:
             for index, service in enumerate(proto_input_file.service):
-                read_protobuf_service(service, index, output_package)
+                read_protobuf_service(proto_input_file, service, index, output_package)
 
     # Generate output files
     output_paths: Set[pathlib.Path] = set()
     for output_package_name, output_package in request_data.output_packages.items():
+        if not output_package.output:
+            continue
 
         # Add files to the response object
         output_path = pathlib.Path(*output_package_name.split("."), "__init__.py")
@@ -125,6 +168,7 @@ def generate_code(
         directory.joinpath("__init__.py")
         for path in output_paths
         for directory in path.parents
+        if not directory.joinpath("__init__.py").exists()
     } - output_paths
 
     for init_file in init_files:
@@ -133,6 +177,26 @@ def generate_code(
     for output_package_name in sorted(output_paths.union(init_files)):
         print(f"Writing {output_package_name}", file=sys.stderr)
 
+    return response
+
+
+def _make_one_of_field_compiler(
+    output_package: OutputTemplate,
+    source_file: "FileDescriptorProto",
+    parent: MessageCompiler,
+    proto_obj: "FieldDescriptorProto",
+    path: List[int],
+) -> FieldCompiler:
+    pydantic = output_package.pydantic_dataclasses
+    Cls = PydanticOneOfFieldCompiler if pydantic else OneOfFieldCompiler
+    return Cls(
+        source_file=source_file,
+        parent=parent,
+        proto_obj=proto_obj,
+        path=path,
+        typing_compiler=output_package.typing_compiler,
+    )
+
 
 def read_protobuf_type(
     item: DescriptorProto,
@@ -146,7 +210,11 @@ def read_protobuf_type(
             return
         # Process Message
         message_data = MessageCompiler(
-            source_file=source_file, parent=output_package, proto_obj=item, path=path
+            source_file=source_file,
+            parent=output_package,
+            proto_obj=item,
+            path=path,
+            typing_compiler=output_package.typing_compiler,
         )
         for index, field in enumerate(item.field):
             if is_map(field, item):
@@ -155,13 +223,11 @@ def read_protobuf_type(
                     parent=message_data,
                     proto_obj=field,
                     path=path + [2, index],
+                    typing_compiler=output_package.typing_compiler,
                 )
             elif is_oneof(field):
-                OneOfFieldCompiler(
-                    source_file=source_file,
-                    parent=message_data,
-                    proto_obj=field,
-                    path=path + [2, index],
+                _make_one_of_field_compiler(
+                    output_package, source_file, message_data, field, path + [2, index]
                 )
             else:
                 FieldCompiler(
@@ -169,21 +235,35 @@ def read_protobuf_type(
                     parent=message_data,
                     proto_obj=field,
                     path=path + [2, index],
+                    typing_compiler=output_package.typing_compiler,
                 )
     elif isinstance(item, EnumDescriptorProto):
         # Enum
         EnumDefinitionCompiler(
-            source_file=source_file, parent=output_package, proto_obj=item, path=path
+            source_file=source_file,
+            parent=output_package,
+            proto_obj=item,
+            path=path,
+            typing_compiler=output_package.typing_compiler,
         )
 
 
 def read_protobuf_service(
-    service: ServiceDescriptorProto, index: int, output_package: OutputTemplate
+    source_file: FileDescriptorProto,
+    service: ServiceDescriptorProto,
+    index: int,
+    output_package: OutputTemplate,
 ) -> None:
     service_data = ServiceCompiler(
-        parent=output_package, proto_obj=service, path=[6, index]
+        source_file=source_file,
+        parent=output_package,
+        proto_obj=service,
+        path=[6, index],
     )
     for j, method in enumerate(service.method):
         ServiceMethodCompiler(
-            parent=service_data, proto_obj=method, path=[6, index, 2, j]
+            source_file=source_file,
+            parent=service_data,
+            proto_obj=method,
+            path=[6, index, 2, j],
         )

src/betterproto/plugin/typing_compiler.py

@@ -0,0 +1,173 @@
+import abc
+from collections import defaultdict
+from dataclasses import (
+    dataclass,
+    field,
+)
+from typing import (
+    Dict,
+    Iterator,
+    Optional,
+    Set,
+)
+
+
+class TypingCompiler(metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def optional(self, type: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def list(self, type: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def dict(self, key: str, value: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def union(self, *types: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def iterable(self, type: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def async_iterable(self, type: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def async_iterator(self, type: str) -> str:
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def imports(self) -> Dict[str, Optional[Set[str]]]:
+        """
+        Returns either the direct import as a key with none as value, or a set of
+        values to import from the key.
+        """
+        raise NotImplementedError()
+
+    def import_lines(self) -> Iterator:
+        imports = self.imports()
+        for key, value in imports.items():
+            if value is None:
+                yield f"import {key}"
+            else:
+                yield f"from {key} import ("
+                for v in sorted(value):
+                    yield f"    {v},"
+                yield ")"
+
+
+@dataclass
+class DirectImportTypingCompiler(TypingCompiler):
+    _imports: Dict[str, Set[str]] = field(default_factory=lambda: defaultdict(set))
+
+    def optional(self, type: str) -> str:
+        self._imports["typing"].add("Optional")
+        return f"Optional[{type}]"
+
+    def list(self, type: str) -> str:
+        self._imports["typing"].add("List")
+        return f"List[{type}]"
+
+    def dict(self, key: str, value: str) -> str:
+        self._imports["typing"].add("Dict")
+        return f"Dict[{key}, {value}]"
+
+    def union(self, *types: str) -> str:
+        self._imports["typing"].add("Union")
+        return f"Union[{', '.join(types)}]"
+
+    def iterable(self, type: str) -> str:
+        self._imports["typing"].add("Iterable")
+        return f"Iterable[{type}]"
+
+    def async_iterable(self, type: str) -> str:
+        self._imports["typing"].add("AsyncIterable")
+        return f"AsyncIterable[{type}]"
+
+    def async_iterator(self, type: str) -> str:
+        self._imports["typing"].add("AsyncIterator")
+        return f"AsyncIterator[{type}]"
+
+    def imports(self) -> Dict[str, Optional[Set[str]]]:
+        return {k: v if v else None for k, v in self._imports.items()}
+
+
+@dataclass
+class TypingImportTypingCompiler(TypingCompiler):
+    _imported: bool = False
+
+    def optional(self, type: str) -> str:
+        self._imported = True
+        return f"typing.Optional[{type}]"
+
+    def list(self, type: str) -> str:
+        self._imported = True
+        return f"typing.List[{type}]"
+
+    def dict(self, key: str, value: str) -> str:
+        self._imported = True
+        return f"typing.Dict[{key}, {value}]"
+
+    def union(self, *types: str) -> str:
+        self._imported = True
+        return f"typing.Union[{', '.join(types)}]"
+
+    def iterable(self, type: str) -> str:
+        self._imported = True
+        return f"typing.Iterable[{type}]"
+
+    def async_iterable(self, type: str) -> str:
+        self._imported = True
+        return f"typing.AsyncIterable[{type}]"
+
+    def async_iterator(self, type: str) -> str:
+        self._imported = True
+        return f"typing.AsyncIterator[{type}]"
+
+    def imports(self) -> Dict[str, Optional[Set[str]]]:
+        if self._imported:
+            return {"typing": None}
+        return {}
+
+
+@dataclass
+class NoTyping310TypingCompiler(TypingCompiler):
+    _imports: Dict[str, Set[str]] = field(default_factory=lambda: defaultdict(set))
+
+    @staticmethod
+    def _fmt(type: str) -> str:  # for now this is necessary till 3.14
+        if type.startswith('"'):
+            return type[1:-1]
+        return type
+
+    def optional(self, type: str) -> str:
+        return f'"{self._fmt(type)} | None"'
+
+    def list(self, type: str) -> str:
+        return f'"list[{self._fmt(type)}]"'
+
+    def dict(self, key: str, value: str) -> str:
+        return f'"dict[{key}, {self._fmt(value)}]"'
+
+    def union(self, *types: str) -> str:
+        return f'"{" | ".join(map(self._fmt, types))}"'
+
+    def iterable(self, type: str) -> str:
+        self._imports["collections.abc"].add("Iterable")
+        return f'"Iterable[{type}]"'
+
+    def async_iterable(self, type: str) -> str:
+        self._imports["collections.abc"].add("AsyncIterable")
+        return f'"AsyncIterable[{type}]"'
+
+    def async_iterator(self, type: str) -> str:
+        self._imports["collections.abc"].add("AsyncIterator")
+        return f'"AsyncIterator[{type}]"'
+
+    def imports(self) -> Dict[str, Optional[Set[str]]]:
+        return {k: v if v else None for k, v in self._imports.items()}

src/betterproto/templates/header.py.j2

@@ -0,0 +1,57 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# sources: {{ ', '.join(output_file.input_filenames) }}
+# plugin: python-betterproto
+# This file has been @generated
+
+__all__ = (
+    {%- for enum in output_file.enums -%}
+        "{{ enum.py_name }}",
+    {%- endfor -%}
+    {%- for message in output_file.messages -%}
+        "{{ message.py_name }}",
+    {%- endfor -%}
+    {%- for service in output_file.services -%}
+        "{{ service.py_name }}Stub",
+        "{{ service.py_name }}Base",
+    {%- endfor -%}
+)
+
+{% for i in output_file.python_module_imports|sort %}
+import {{ i }}
+{% endfor %}
+
+{% if output_file.pydantic_dataclasses %}
+from pydantic.dataclasses import dataclass
+{%- else -%}
+from dataclasses import dataclass
+{% endif %}
+
+{% if output_file.datetime_imports %}
+from datetime import {% for i in output_file.datetime_imports|sort %}{{ i }}{% if not loop.last %}, {% endif %}{% endfor %}
+
+{% endif%}
+{% set typing_imports = output_file.typing_compiler.imports() %}
+{% if typing_imports %}
+{% for line in output_file.typing_compiler.import_lines() %}
+{{ line }}
+{% endfor %}
+{% endif %}
+
+{% if output_file.pydantic_imports %}
+from pydantic import {% for i in output_file.pydantic_imports|sort %}{{ i }}{% if not loop.last %}, {% endif %}{% endfor %}
+
+{% endif %}
+
+import betterproto
+{% if output_file.services %}
+from betterproto.grpc.grpclib_server import ServiceBase
+import grpclib
+{% endif %}
+
+{% if output_file.imports_type_checking_only %}
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+{% for i in output_file.imports_type_checking_only|sort %}    {{ i }}
+{% endfor %}
+{% endif %}

src/betterproto/templates/template.py.j2

@@ -1,26 +1,3 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: {{ ', '.join(output_file.input_filenames) }}
-# plugin: python-betterproto
-{% for i in output_file.python_module_imports|sort %}
-import {{ i }}
-{% endfor %}
-from dataclasses import dataclass
-{% if output_file.datetime_imports %}
-from datetime import {% for i in output_file.datetime_imports|sort %}{{ i }}{% if not loop.last %}, {% endif %}{% endfor %}
-
-{% endif%}
-{% if output_file.typing_imports %}
-from typing import {% for i in output_file.typing_imports|sort %}{{ i }}{% if not loop.last %}, {% endif %}{% endfor %}
-
-{% endif %}
-
-import betterproto
-from betterproto.grpc.grpclib_server import ServiceBase
-{% if output_file.services %}
-import grpclib
-{% endif %}
-
-
 {% if output_file.enums %}{% for enum in output_file.enums %}
 class {{ enum.py_name }}(betterproto.Enum):
     {% if enum.comment %}
@@ -28,27 +5,40 @@ class {{ enum.py_name }}(betterproto.Enum):
 
     {% endif %}
     {% for entry in enum.entries %}
+    {{ entry.name }} = {{ entry.value }}
         {% if entry.comment %}
 {{ entry.comment }}
+
         {% endif %}
-    {{ entry.name }} = {{ entry.value }}
     {% endfor %}
 
+    {% if output_file.pydantic_dataclasses %}
+    @classmethod
+    def __get_pydantic_core_schema__(cls, _source_type, _handler):
+        from pydantic_core import core_schema
+
+        return core_schema.int_schema(ge=0)
+    {% endif %}
 
 {% endfor %}
 {% endif %}
 {% for message in output_file.messages %}
+{% if output_file.pydantic_dataclasses %}
+@dataclass(eq=False, repr=False, config={"extra": "forbid"})
+{% else %}
 @dataclass(eq=False, repr=False)
+{% endif %}
 class {{ message.py_name }}(betterproto.Message):
     {% if message.comment %}
 {{ message.comment }}
 
     {% endif %}
     {% for field in message.fields %}
+    {{ field.get_field_string() }}
         {% if field.comment %}
 {{ field.comment }}
+
         {% endif %}
-    {{ field.get_field_string() }}
     {% endfor %}
     {% if not message.fields %}
     pass
@@ -61,11 +51,16 @@ class {{ message.py_name }}(betterproto.Message):
         {% endif %}
         super().__post_init__()
         {% for field in message.deprecated_fields %}
-        if self.{{ field }}:
+        if self.is_set("{{ field }}"):
             warnings.warn("{{ message.py_name }}.{{ field }} is deprecated", DeprecationWarning)
         {% endfor %}
     {%  endif %}
 
+    {% if output_file.pydantic_dataclasses and message.has_oneof_fields %}
+    @model_validator(mode='after')
+    def check_oneof(cls, values):
+        return cls._validate_field_groups(values)
+    {%  endif %}
 
 {% endfor %}
 {% for service in output_file.services %}
@@ -79,60 +74,45 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub):
     {% for method in service.methods %}
     async def {{ method.py_name }}(self
         {%- if not method.client_streaming -%}
-            {%- if method.py_input_message and method.py_input_message.fields -%}, *,
-                {%- for field in method.py_input_message.fields -%}
-                    {{ field.py_name }}: {% if field.py_name in method.mutable_default_args and not field.annotation.startswith("Optional[") -%}
-                                            Optional[{{ field.annotation }}]
-                                         {%- else -%}
-                                            {{ field.annotation }}
-                                         {%- endif -%} =
-                                            {%- if field.py_name not in method.mutable_default_args -%}
-                                                {{ field.default_value_string }}
-                                            {%- else -%}
-                                                None
-                                            {% endif -%}
-                    {%- if not loop.last %}, {% endif -%}
-                {%- endfor -%}
-            {%- endif -%}
+            , {{ method.py_input_message_param }}: "{{ method.py_input_message_type }}"
         {%- else -%}
             {# Client streaming: need a request iterator instead #}
-            , request_iterator: Union[AsyncIterable["{{ method.py_input_message_type }}"], Iterable["{{ method.py_input_message_type }}"]]
+            , {{ method.py_input_message_param }}_iterator: "{{ output_file.typing_compiler.union(output_file.typing_compiler.async_iterable(method.py_input_message_type), output_file.typing_compiler.iterable(method.py_input_message_type)) }}"
         {%- endif -%}
-            ) -> {% if method.server_streaming %}AsyncIterator["{{ method.py_output_message_type }}"]{% else %}"{{ method.py_output_message_type }}"{% endif %}:
+            ,
+            *
+            , timeout: {{ output_file.typing_compiler.optional("float") }} = None
+            , deadline: {{ output_file.typing_compiler.optional('"Deadline"') }} = None
+            , metadata: {{ output_file.typing_compiler.optional('"MetadataLike"') }} = None
+            ) -> "{% if method.server_streaming %}{{ output_file.typing_compiler.async_iterator(method.py_output_message_type ) }}{% else %}{{ method.py_output_message_type }}{% endif %}":
         {% if method.comment %}
 {{ method.comment }}
 
         {% endif %}
-        {%- for py_name, zero in method.mutable_default_args.items() %}
-        {{ py_name }} = {{ py_name }} or {{ zero }}
-        {% endfor %}
+        {% if method.proto_obj.options.deprecated %}
+        warnings.warn("{{ service.py_name }}.{{ method.py_name }} is deprecated", DeprecationWarning)
 
-        {% if not method.client_streaming %}
-        request = {{ method.py_input_message_type }}()
-        {% for field in method.py_input_message.fields %}
-            {% if field.field_type == 'message' %}
-        if {{ field.py_name }} is not None:
-            request.{{ field.py_name }} = {{ field.py_name }}
-            {% else %}
-        request.{{ field.py_name }} = {{ field.py_name }}
-            {% endif %}
-        {% endfor %}
         {% endif %}
-
         {% if method.server_streaming %}
             {% if method.client_streaming %}
         async for response in self._stream_stream(
             "{{ method.route }}",
-            request_iterator,
+            {{ method.py_input_message_param }}_iterator,
             {{ method.py_input_message_type }},
             {{ method.py_output_message_type.strip('"') }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
         ):
             yield response
             {% else %}{# i.e. not client streaming #}
         async for response in self._unary_stream(
             "{{ method.route }}",
-            request,
+            {{ method.py_input_message_param }},
             {{ method.py_output_message_type.strip('"') }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
         ):
             yield response
 
@@ -141,15 +121,21 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub):
             {% if method.client_streaming %}
         return await self._stream_unary(
             "{{ method.route }}",
-            request_iterator,
+            {{ method.py_input_message_param }}_iterator,
             {{ method.py_input_message_type }},
-            {{ method.py_output_message_type.strip('"') }}
+            {{ method.py_output_message_type.strip('"') }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
         )
             {% else %}{# i.e. not client streaming #}
         return await self._unary_unary(
             "{{ method.route }}",
-            request,
-            {{ method.py_output_message_type.strip('"') }}
+            {{ method.py_input_message_param }},
+            {{ method.py_output_message_type.strip('"') }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
         )
             {% endif %}{# client streaming #}
         {% endif %}
@@ -157,6 +143,10 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub):
     {% endfor %}
 {% endfor %}
 
+{% for i in output_file.imports_end %}
+{{ i }}
+{% endfor %}
+
 {% for service in output_file.services %}
 class {{ service.py_name }}Base(ServiceBase):
     {% if service.comment %}
@@ -167,58 +157,44 @@ class {{ service.py_name }}Base(ServiceBase):
     {% for method in service.methods %}
     async def {{ method.py_name }}(self
         {%- if not method.client_streaming -%}
-            {%- if method.py_input_message and method.py_input_message.fields -%},
-                {%- for field in method.py_input_message.fields -%}
-                    {{ field.py_name }}: {% if field.py_name in method.mutable_default_args and not field.annotation.startswith("Optional[") -%}
-                                            Optional[{{ field.annotation }}]
-                                         {%- else -%}
-                                            {{ field.annotation }}
-                                         {%- endif -%}
-                    {%- if not loop.last %}, {% endif -%}
-                {%- endfor -%}
-            {%- endif -%}
+            , {{ method.py_input_message_param }}: "{{ method.py_input_message_type }}"
         {%- else -%}
             {# Client streaming: need a request iterator instead #}
-            , request_iterator: AsyncIterator["{{ method.py_input_message_type }}"]
+            , {{ method.py_input_message_param }}_iterator: {{ output_file.typing_compiler.async_iterator(method.py_input_message_type) }}
         {%- endif -%}
-            ) -> {% if method.server_streaming %}AsyncIterator["{{ method.py_output_message_type }}"]{% else %}"{{ method.py_output_message_type }}"{% endif %}:
+            ) -> {% if method.server_streaming %}{{ output_file.typing_compiler.async_iterator(method.py_output_message_type) }}{% else %}"{{ method.py_output_message_type }}"{% endif %}:
         {% if method.comment %}
 {{ method.comment }}
 
         {% endif %}
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+        {% if method.server_streaming %}
+        yield {{ method.py_output_message_type }}()
+        {% endif %}
 
     {% endfor %}
 
     {% for method in service.methods %}
-    async def __rpc_{{ method.py_name }}(self, stream: grpclib.server.Stream) -> None:
+    async def __rpc_{{ method.py_name }}(self, stream: "grpclib.server.Stream[{{ method.py_input_message_type }}, {{ method.py_output_message_type }}]") -> None:
         {% if not method.client_streaming %}
         request = await stream.recv_message()
-
-        request_kwargs = {
-        {% for field in method.py_input_message.fields %}
-            "{{ field.py_name }}": request.{{ field.py_name }},
-        {% endfor %}
-        }
-
         {% else %}
-        request_kwargs = {"request_iterator": stream.__aiter__()}
+        request = stream.__aiter__()
         {% endif %}
-
         {% if not method.server_streaming %}
-        response = await self.{{ method.py_name }}(**request_kwargs)
+        response = await self.{{ method.py_name }}(request)
         await stream.send_message(response)
         {% else %}
         await self._call_rpc_handler_server_stream(
             self.{{ method.py_name }},
             stream,
-            request_kwargs,
+            request,
         )
         {% endif %}
 
     {% endfor %}
 
-    def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
+    def __mapping__(self) -> {{ output_file.typing_compiler.dict("str", "grpclib.const.Handler") }}:
         return {
         {% for method in service.methods %}
         "{{ method.route }}": grpclib.const.Handler(
@@ -239,7 +215,3 @@ class {{ service.py_name }}Base(ServiceBase):
         }
 
 {% endfor %}
-
-{% for i in output_file.imports|sort %}
-{{ i }}
-{% endfor %}

src/betterproto/utils.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+from typing import (
+    Any,
+    Callable,
+    Generic,
+    Optional,
+    Type,
+    TypeVar,
+)
+
+from typing_extensions import (
+    Concatenate,
+    ParamSpec,
+    Self,
+)
+
+
+SelfT = TypeVar("SelfT")
+P = ParamSpec("P")
+HybridT = TypeVar("HybridT", covariant=True)
+
+
+class hybridmethod(Generic[SelfT, P, HybridT]):
+    def __init__(
+        self,
+        func: Callable[
+            Concatenate[type[SelfT], P], HybridT
+        ],  # Must be the classmethod version
+    ):
+        self.cls_func = func
+        self.__doc__ = func.__doc__
+
+    def instancemethod(self, func: Callable[Concatenate[SelfT, P], HybridT]) -> Self:
+        self.instance_func = func
+        return self
+
+    def __get__(
+        self, instance: Optional[SelfT], owner: Type[SelfT]
+    ) -> Callable[P, HybridT]:
+        if instance is None or self.instance_func is None:
+            # either bound to the class, or no instance method available
+            return self.cls_func.__get__(owner, None)
+        return self.instance_func.__get__(instance, owner)
+
+
+T_co = TypeVar("T_co")
+TT_co = TypeVar("TT_co", bound="type[Any]")
+
+
+class classproperty(Generic[TT_co, T_co]):
+    def __init__(self, func: Callable[[TT_co], T_co]):
+        self.__func__ = func
+
+    def __get__(self, instance: Any, type: TT_co) -> T_co:
+        return self.__func__(type)

tests/conftest.py

@@ -1,12 +1,11 @@
+import copy
+import sys
+
 import pytest
 
 
-def pytest_addoption(parser):
-    parser.addoption(
-        "--repeat", type=int, default=1, help="repeat the operation multiple times"
-    )
-
-
-@pytest.fixture(scope="session")
-def repeat(request):
-    return request.config.getoption("repeat")
+@pytest.fixture
+def reset_sys_path():
+    original = copy.deepcopy(sys.path)
+    yield
+    sys.path = original

tests/generate.py

@@ -1,20 +1,22 @@
 #!/usr/bin/env python
 import asyncio
 import os
-from pathlib import Path
 import platform
 import shutil
 import sys
+from pathlib import Path
 from typing import Set
 
 from tests.util import (
     get_directories,
     inputs_path,
     output_path_betterproto,
+    output_path_betterproto_pydantic,
     output_path_reference,
     protoc,
 )
 
+
 # Force pure-python implementation instead of C++, otherwise imports
 # break things because we can't properly reset the symbol database.
 os.environ["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = "python"
@@ -60,13 +62,15 @@ async def generate(whitelist: Set[str], verbose: bool):
         if result != 0:
             failed_test_cases.append(test_case_name)
 
-    if failed_test_cases:
+    if len(failed_test_cases) > 0:
         sys.stderr.write(
             "\n\033[31;1;4mFailed to generate the following test cases:\033[0m\n"
         )
         for failed_test_case in failed_test_cases:
             sys.stderr.write(f"- {failed_test_case}\n")
 
+        sys.exit(1)
+
 
 async def generate_test_case_output(
     test_case_input_path: Path, test_case_name: str, verbose: bool
@@ -76,10 +80,12 @@ async def generate_test_case_output(
     """
 
     test_case_output_path_reference = output_path_reference.joinpath(test_case_name)
-    test_case_output_path_betterproto = output_path_betterproto.joinpath(test_case_name)
+    test_case_output_path_betterproto = output_path_betterproto
+    test_case_output_path_betterproto_pyd = output_path_betterproto_pydantic
 
     os.makedirs(test_case_output_path_reference, exist_ok=True)
     os.makedirs(test_case_output_path_betterproto, exist_ok=True)
+    os.makedirs(test_case_output_path_betterproto_pyd, exist_ok=True)
 
     clear_directory(test_case_output_path_reference)
     clear_directory(test_case_output_path_betterproto)
@@ -87,28 +93,75 @@ async def generate_test_case_output(
     (
         (ref_out, ref_err, ref_code),
         (plg_out, plg_err, plg_code),
+        (plg_out_pyd, plg_err_pyd, plg_code_pyd),
     ) = await asyncio.gather(
         protoc(test_case_input_path, test_case_output_path_reference, True),
         protoc(test_case_input_path, test_case_output_path_betterproto, False),
+        protoc(
+            test_case_input_path, test_case_output_path_betterproto_pyd, False, True
+        ),
     )
 
-    message = f"Generated output for {test_case_name!r}"
-    if verbose:
-        print(f"\033[31;1;4m{message}\033[0m")
-        if ref_out:
-            sys.stdout.buffer.write(ref_out)
-        if ref_err:
-            sys.stderr.buffer.write(ref_err)
-        if plg_out:
-            sys.stdout.buffer.write(plg_out)
-        if plg_err:
-            sys.stderr.buffer.write(plg_err)
-        sys.stdout.buffer.flush()
-        sys.stderr.buffer.flush()
+    if ref_code == 0:
+        print(f"\033[31;1;4mGenerated reference output for {test_case_name!r}\033[0m")
     else:
-        print(message)
+        print(
+            f"\033[31;1;4mFailed to generate reference output for {test_case_name!r}\033[0m"
+        )
+        print(ref_err.decode())
 
-    return max(ref_code, plg_code)
+    if verbose:
+        if ref_out:
+            print("Reference stdout:")
+            sys.stdout.buffer.write(ref_out)
+            sys.stdout.buffer.flush()
+
+        if ref_err:
+            print("Reference stderr:")
+            sys.stderr.buffer.write(ref_err)
+            sys.stderr.buffer.flush()
+
+    if plg_code == 0:
+        print(f"\033[31;1;4mGenerated plugin output for {test_case_name!r}\033[0m")
+    else:
+        print(
+            f"\033[31;1;4mFailed to generate plugin output for {test_case_name!r}\033[0m"
+        )
+        print(plg_err.decode())
+
+    if verbose:
+        if plg_out:
+            print("Plugin stdout:")
+            sys.stdout.buffer.write(plg_out)
+            sys.stdout.buffer.flush()
+
+        if plg_err:
+            print("Plugin stderr:")
+            sys.stderr.buffer.write(plg_err)
+            sys.stderr.buffer.flush()
+
+    if plg_code_pyd == 0:
+        print(
+            f"\033[31;1;4mGenerated plugin (pydantic compatible) output for {test_case_name!r}\033[0m"
+        )
+    else:
+        print(
+            f"\033[31;1;4mFailed to generate plugin (pydantic compatible) output for {test_case_name!r}\033[0m"
+        )
+        print(plg_err_pyd.decode())
+
+    if verbose:
+        if plg_out_pyd:
+            print("Plugin stdout:")
+            sys.stdout.buffer.write(plg_out_pyd)
+            sys.stdout.buffer.flush()
+
+        if plg_err_pyd:
+            print("Plugin stderr:")
+            sys.stderr.buffer.write(plg_err_pyd)
+            sys.stderr.buffer.flush()
+
+    return max(ref_code, plg_code, plg_code_pyd)
 
 
 HELP = "\n".join(
@@ -137,9 +190,19 @@ def main():
         whitelist = set(sys.argv[1:])
 
     if platform.system() == "Windows":
-        asyncio.set_event_loop(asyncio.ProactorEventLoop())
+        # for python version prior to 3.8, loop policy needs to be set explicitly
+        # https://docs.python.org/3/library/asyncio-policy.html#asyncio.DefaultEventLoopPolicy
+        try:
+            asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
+        except AttributeError:
+            # python < 3.7 does not have asyncio.WindowsProactorEventLoopPolicy
+            asyncio.get_event_loop_policy().set_event_loop(asyncio.ProactorEventLoop())
 
-    asyncio.get_event_loop().run_until_complete(generate(whitelist, verbose))
+    try:
+        asyncio.run(generate(whitelist, verbose))
+    except AttributeError:
+        # compatibility code for python < 3.7
+        asyncio.get_event_loop().run_until_complete(generate(whitelist, verbose))
 
 
 if __name__ == "__main__":

tests/grpc/test_grpclib_client.py

@@ -1,34 +1,37 @@
 import asyncio
-import sys
+import uuid
 
-from tests.output_betterproto.service.service import (
+import grpclib
+import grpclib.client
+import grpclib.metadata
+import grpclib.server
+import pytest
+from grpclib.testing import ChannelFor
+
+from betterproto.grpc.util.async_channel import AsyncChannel
+from tests.output_betterproto.service import (
     DoThingRequest,
     DoThingResponse,
     GetThingRequest,
     TestStub as ThingServiceClient,
 )
-import grpclib
-import grpclib.metadata
-import grpclib.server
-from grpclib.testing import ChannelFor
-import pytest
-from betterproto.grpc.util.async_channel import AsyncChannel
+
 from .thing_service import ThingService
 
 
-async def _test_client(client, name="clean room", **kwargs):
-    response = await client.do_thing(name=name)
+async def _test_client(client: ThingServiceClient, name="clean room", **kwargs):
+    response = await client.do_thing(DoThingRequest(name=name), **kwargs)
     assert response.names == [name]
 
 
 def _assert_request_meta_received(deadline, metadata):
     def server_side_test(stream):
-        assert stream.deadline._timestamp == pytest.approx(
-            deadline._timestamp, 1
-        ), "The provided deadline should be received serverside"
-        assert (
-            stream.metadata["authorization"] == metadata["authorization"]
-        ), "The provided authorization metadata should be received serverside"
+        assert stream.deadline._timestamp == pytest.approx(deadline._timestamp, 1), (
+            "The provided deadline should be received serverside"
+        )
+        assert stream.metadata["authorization"] == metadata["authorization"], (
+            "The provided authorization metadata should be received serverside"
+        )
 
     return server_side_test
 
@@ -62,7 +65,7 @@ async def test_trailer_only_error_unary_unary(
     )
     async with ChannelFor([service]) as channel:
         with pytest.raises(grpclib.exceptions.GRPCError) as e:
-            await ThingServiceClient(channel).do_thing(name="something")
+            await ThingServiceClient(channel).do_thing(DoThingRequest(name="something"))
         assert e.value.status == grpclib.Status.UNAUTHENTICATED
 
 
@@ -80,16 +83,13 @@ async def test_trailer_only_error_stream_unary(
     async with ChannelFor([service]) as channel:
         with pytest.raises(grpclib.exceptions.GRPCError) as e:
             await ThingServiceClient(channel).do_many_things(
-                request_iterator=[DoThingRequest(name="something")]
+                do_thing_request_iterator=[DoThingRequest(name="something")]
             )
             await _test_client(ThingServiceClient(channel))
         assert e.value.status == grpclib.Status.UNAUTHENTICATED
 
 
 @pytest.mark.asyncio
-@pytest.mark.skipif(
-    sys.version_info < (3, 8), reason="async mock spy does works for python3.8+"
-)
 async def test_service_call_mutable_defaults(mocker):
     async with ChannelFor([ThingService()]) as channel:
         client = ThingServiceClient(channel)
@@ -171,6 +171,56 @@ async def test_service_call_lower_level_with_overrides():
         assert response.names == [THING_TO_DO]
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("overrides_gen",),
+    [
+        (lambda: dict(timeout=10),),
+        (lambda: dict(deadline=grpclib.metadata.Deadline.from_timeout(10)),),
+        (lambda: dict(metadata={"authorization": str(uuid.uuid4())}),),
+        (lambda: dict(timeout=20, metadata={"authorization": str(uuid.uuid4())}),),
+    ],
+)
+async def test_service_call_high_level_with_overrides(mocker, overrides_gen):
+    overrides = overrides_gen()
+    request_spy = mocker.spy(grpclib.client.Channel, "request")
+    name = str(uuid.uuid4())
+    defaults = dict(
+        timeout=99,
+        deadline=grpclib.metadata.Deadline.from_timeout(99),
+        metadata={"authorization": name},
+    )
+
+    async with ChannelFor(
+        [
+            ThingService(
+                test_hook=_assert_request_meta_received(
+                    deadline=grpclib.metadata.Deadline.from_timeout(
+                        overrides.get("timeout", 99)
+                    ),
+                    metadata=overrides.get("metadata", defaults.get("metadata")),
+                )
+            )
+        ]
+    ) as channel:
+        client = ThingServiceClient(channel, **defaults)
+        await _test_client(client, name=name, **overrides)
+        assert request_spy.call_count == 1
+
+        # for python <3.8 request_spy.call_args.kwargs do not work
+        _, request_spy_call_kwargs = request_spy.call_args_list[0]
+
+        # ensure all overrides were successful
+        for key, value in overrides.items():
+            assert key in request_spy_call_kwargs
+            assert request_spy_call_kwargs[key] == value
+
+        # ensure default values were retained
+        for key in set(defaults.keys()) - set(overrides.keys()):
+            assert key in request_spy_call_kwargs
+            assert request_spy_call_kwargs[key] == defaults[key]
+
+
 @pytest.mark.asyncio
 async def test_async_gen_for_unary_stream_request():
     thing_name = "my milkshakes"
@@ -178,7 +228,9 @@ async def test_async_gen_for_unary_stream_request():
     async with ChannelFor([ThingService()]) as channel:
         client = ThingServiceClient(channel)
         expected_versions = [5, 4, 3, 2, 1]
-        async for response in client.get_thing_versions(name=thing_name):
+        async for response in client.get_thing_versions(
+            GetThingRequest(name=thing_name)
+        ):
             assert response.name == thing_name
             assert response.version == expected_versions.pop()
 
@@ -213,6 +265,30 @@ async def test_async_gen_for_stream_stream_request():
             else:
                 # No more things to send make sure channel is closed
                 request_chan.close()
-        assert response_index == len(
-            expected_things
-        ), "Didn't receive all expected responses"
+        assert response_index == len(expected_things), (
+            "Didn't receive all expected responses"
+        )
+
+
+@pytest.mark.asyncio
+async def test_stream_unary_with_empty_iterable():
+    things = []  # empty
+
+    async with ChannelFor([ThingService()]) as channel:
+        client = ThingServiceClient(channel)
+        requests = [DoThingRequest(name) for name in things]
+        response = await client.do_many_things(requests)
+        assert len(response.names) == 0
+
+
+@pytest.mark.asyncio
+async def test_stream_stream_with_empty_iterable():
+    things = []  # empty
+
+    async with ChannelFor([ThingService()]) as channel:
+        client = ThingServiceClient(channel)
+        requests = [GetThingRequest(name) for name in things]
+        responses = [
+            response async for response in client.get_different_things(requests)
+        ]
+        assert len(responses) == 0

tests/grpc/test_stream_stream.py

@@ -1,9 +1,11 @@
 import asyncio
+from dataclasses import dataclass
+from typing import AsyncIterator
+
+import pytest
+
 import betterproto
 from betterproto.grpc.util.async_channel import AsyncChannel
-from dataclasses import dataclass
-import pytest
-from typing import AsyncIterator
 
 
 @dataclass

tests/grpc/thing_service.py

@@ -1,12 +1,14 @@
-from tests.output_betterproto.service.service import (
-    DoThingResponse,
+from typing import Dict
+
+import grpclib
+import grpclib.server
+
+from tests.output_betterproto.service import (
     DoThingRequest,
+    DoThingResponse,
     GetThingRequest,
     GetThingResponse,
 )
-import grpclib
-import grpclib.server
-from typing import Dict
 
 
 class ThingService:
@@ -25,7 +27,7 @@ class ThingService:
     async def do_many_things(
         self, stream: "grpclib.server.Stream[DoThingRequest, DoThingResponse]"
     ):
-        thing_names = [request.name for request in stream]
+        thing_names = [request.name async for request in stream]
         if self.test_hook is not None:
             self.test_hook(stream)
         await stream.send_message(DoThingResponse(thing_names))

tests/inputs/bool/bool.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package bool;
+
 message Test {
     bool value = 1;
 }

tests/inputs/bool/test_bool.py

@@ -1,6 +1,24 @@
+import pytest
+
 from tests.output_betterproto.bool import Test
+from tests.output_betterproto_pydantic.bool import Test as TestPyd
 
 
 def test_value():
     message = Test()
     assert not message.value, "Boolean is False by default"
+
+
+def test_pydantic_no_value():
+    message = TestPyd()
+    assert not message.value, "Boolean is False by default"
+
+
+def test_pydantic_value():
+    message = TestPyd(value=False)
+    assert not message.value
+
+
+def test_pydantic_bad_value():
+    with pytest.raises(ValueError):
+        TestPyd(value=123)

tests/inputs/bytes/bytes.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package bytes;
+
 message Test {
     bytes data = 1;
 }

tests/inputs/casing/casing.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package casing;
+
 enum my_enum {
   ZERO = 0;
   ONE = 1;

tests/inputs/casing/test_casing.py

@@ -4,20 +4,20 @@ from tests.output_betterproto.casing import Test
 
 def test_message_attributes():
     message = Test()
-    assert hasattr(
-        message, "snake_case_message"
-    ), "snake_case field name is same in python"
+    assert hasattr(message, "snake_case_message"), (
+        "snake_case field name is same in python"
+    )
     assert hasattr(message, "camel_case"), "CamelCase field is snake_case in python"
     assert hasattr(message, "uppercase"), "UPPERCASE field is lowercase in python"
 
 
 def test_message_casing():
-    assert hasattr(
-        casing, "SnakeCaseMessage"
-    ), "snake_case Message name is converted to CamelCase in python"
+    assert hasattr(casing, "SnakeCaseMessage"), (
+        "snake_case Message name is converted to CamelCase in python"
+    )
 
 
 def test_enum_casing():
-    assert hasattr(
-        casing, "MyEnum"
-    ), "snake_case Enum name is converted to CamelCase in python"
+    assert hasattr(casing, "MyEnum"), (
+        "snake_case Enum name is converted to CamelCase in python"
+    )

tests/inputs/casing_inner_class/casing_inner_class.proto

@@ -0,0 +1,11 @@
+// https://github.com/danielgtaylor/python-betterproto/issues/344
+syntax = "proto3";
+
+package casing_inner_class;
+
+message Test {
+  message inner_class {
+    sint32 old_exp = 1;
+  }
+  inner_class inner = 2;
+}

tests/inputs/casing_inner_class/test_casing_inner_class.py

@@ -0,0 +1,14 @@
+import tests.output_betterproto.casing_inner_class as casing_inner_class
+
+
+def test_message_casing_inner_class_name():
+    assert hasattr(casing_inner_class, "TestInnerClass"), (
+        "Inline defined Message is correctly converted to CamelCase"
+    )
+
+
+def test_message_casing_inner_class_attributes():
+    message = casing_inner_class.Test()
+    assert hasattr(message.inner, "old_exp"), (
+        "Inline defined Message attribute is snake_case"
+    )

tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package casing_message_field_uppercase;
+
 message Test {
   int32 UPPERCASE = 1;
   int32 UPPERCASE_V2 = 2;

tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.py

@@ -3,12 +3,12 @@ from tests.output_betterproto.casing_message_field_uppercase import Test
 
 def test_message_casing():
     message = Test()
-    assert hasattr(
-        message, "uppercase"
-    ), "UPPERCASE attribute is converted to 'uppercase' in python"
-    assert hasattr(
-        message, "uppercase_v2"
-    ), "UPPERCASE_V2 attribute is converted to 'uppercase_v2' in python"
-    assert hasattr(
-        message, "upper_camel_case"
-    ), "UPPER_CAMEL_CASE attribute is converted to upper_camel_case in python"
+    assert hasattr(message, "uppercase"), (
+        "UPPERCASE attribute is converted to 'uppercase' in python"
+    )
+    assert hasattr(message, "uppercase_v2"), (
+        "UPPERCASE_V2 attribute is converted to 'uppercase_v2' in python"
+    )
+    assert hasattr(message, "upper_camel_case"), (
+        "UPPER_CAMEL_CASE attribute is converted to upper_camel_case in python"
+    )

tests/inputs/config.py

@@ -9,6 +9,7 @@ xfail = {
 }
 
 services = {
+    "googletypes_request",
     "googletypes_response",
     "googletypes_response_embedded",
     "service",
@@ -18,6 +19,7 @@ services = {
     "googletypes_service_returns_googletype",
     "example_service",
     "empty_service",
+    "service_uppercase",
 }
 
 

tests/inputs/deprecated/deprecated.json

@@ -1,4 +1,6 @@
 {
-  "v": 10,
+  "message": {
+    "value": "hello"
+  },
   "value": 10
 }

tests/inputs/deprecated/deprecated.proto

@@ -1,9 +1,21 @@
 syntax = "proto3";
 
+package deprecated;
+
 // Some documentation about the Test message.
 message Test {
-    // Some documentation about the value.
-    option deprecated = true;
-    int32 v = 1 [deprecated=true];
+    Message message = 1 [deprecated=true];
     int32 value = 2;
 }
+
+message Message {
+    option deprecated = true;
+    string value = 1;
+}
+
+message Empty {}
+
+service TestService {
+    rpc func(Empty) returns (Empty);
+    rpc deprecated_func(Empty) returns (Empty) { option deprecated = true; };
+}

tests/inputs/deprecated_field/deprecated_field.json

@@ -1,4 +0,0 @@
-{
-  "v": 10,
-  "value": 10
-}

tests/inputs/deprecated_field/deprecated_field.proto

@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-// Some documentation about the Test message.
-message Test {
-    // Some documentation about the value.
-    int32 v = 1 [deprecated=true];
-    int32 value = 2;
-}

tests/inputs/documentation/documentation.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+package documentation;
+
+// Documentation of message 1
+// other line 1
+
+// Documentation of message 2
+// other line 2
+message Test { // Documentation of message 3
+    // Documentation of field 1
+    // other line 1
+
+    // Documentation of field 2
+    // other line 2
+    uint32 x = 1; // Documentation of field 3
+}
+
+// Documentation of enum 1
+// other line 1
+
+// Documentation of enum 2
+// other line 2
+enum Enum { // Documentation of enum 3
+    // Documentation of variant 1
+    // other line 1
+
+    // Documentation of variant 2
+    // other line 2
+    Enum_Variant = 0; // Documentation of variant 3
+}
+
+// Documentation of service 1
+// other line 1
+
+// Documentation of service 2
+// other line 2
+service Service { // Documentation of service 3
+    // Documentation of method 1
+    // other line 1
+
+    // Documentation of method 2
+    // other line 2
+    rpc get(Test) returns (Test); // Documentation of method 3
+}

tests/inputs/double/double.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package double;
+
 message Test {
     double count = 1;
 }

tests/inputs/empty_repeated/empty_repeated.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package empty_repeated;
+
 message MessageA {
   repeated float values = 1;
 }

tests/inputs/entry/entry.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+package entry;
+
+// This is a minimal example of a repeated message field that caused issues when
+// checking whether a message is a map.
+//
+// During the check wheter a field is a "map", the string "entry" is added to
+// the field name, checked against the type name and then further checks are
+// made against the nested type of a parent message. In this edge-case, the
+// first check would pass even though it shouldn't and that would cause an
+// error because the parent type does not have a "nested_type" attribute.
+
+message Test {
+    repeated ExportEntry export = 1;
+}
+
+message ExportEntry {
+    string name = 1;
+}

tests/inputs/enum/enum.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package enum;
+
 // Tests that enums are correctly serialized and that it correctly handles skipped and out-of-order enum values
 message Test {
   Choice choice = 1;
@@ -13,3 +15,11 @@ enum Choice {
   FOUR = 4;
   THREE = 3;
 }
+
+// A "C" like enum with the enum name prefixed onto members, these should be stripped
+enum ArithmeticOperator {
+    ARITHMETIC_OPERATOR_NONE = 0;
+    ARITHMETIC_OPERATOR_PLUS = 1;
+    ARITHMETIC_OPERATOR_MINUS = 2;
+    ARITHMETIC_OPERATOR_0_PREFIXED = 3;
+}

tests/inputs/enum/test_enum.py

@@ -1,6 +1,7 @@
 from tests.output_betterproto.enum import (
-    Test,
+    ArithmeticOperator,
     Choice,
+    Test,
 )
 
 
@@ -26,9 +27,9 @@ def test_enum_is_comparable_with_int():
 
 
 def test_enum_to_dict():
-    assert (
-        "choice" not in Test(choice=Choice.ZERO).to_dict()
-    ), "Default enum value is not serialized"
+    assert "choice" not in Test(choice=Choice.ZERO).to_dict(), (
+        "Default enum value is not serialized"
+    )
     assert (
         Test(choice=Choice.ZERO).to_dict(include_default_values=True)["choice"]
         == "ZERO"
@@ -82,3 +83,32 @@ def test_repeated_enum_with_non_list_iterables_to_dict():
         yield Choice.THREE
 
     assert Test(choices=enum_generator()).to_dict()["choices"] == ["ONE", "THREE"]
+
+
+def test_enum_mapped_on_parse():
+    # test default value
+    b = Test().parse(bytes(Test()))
+    assert b.choice.name == Choice.ZERO.name
+    assert b.choices == []
+
+    # test non default value
+    a = Test().parse(bytes(Test(choice=Choice.ONE)))
+    assert a.choice.name == Choice.ONE.name
+    assert b.choices == []
+
+    # test repeated
+    c = Test().parse(bytes(Test(choices=[Choice.THREE, Choice.FOUR])))
+    assert c.choices[0].name == Choice.THREE.name
+    assert c.choices[1].name == Choice.FOUR.name
+
+    # bonus: defaults after empty init are also mapped
+    assert Test().choice.name == Choice.ZERO.name
+
+
+def test_renamed_enum_members():
+    assert set(ArithmeticOperator.__members__) == {
+        "NONE",
+        "PLUS",
+        "MINUS",
+        "_0_PREFIXED",
+    }

tests/inputs/example/example.proto

@@ -39,6 +39,8 @@
 
 syntax = "proto2";
 
+package example;
+
 // package google.protobuf;
 
 option go_package = "google.golang.org/protobuf/types/descriptorpb";

tests/inputs/example_service/test_example_service.py

@@ -1,49 +1,52 @@
-from typing import AsyncIterator, AsyncIterable
+from typing import (
+    AsyncIterable,
+    AsyncIterator,
+)
 
 import pytest
 from grpclib.testing import ChannelFor
 
-from tests.output_betterproto.example_service.example_service import (
-    TestBase,
-    TestStub,
+from tests.output_betterproto.example_service import (
     ExampleRequest,
     ExampleResponse,
+    TestBase,
+    TestStub,
 )
 
 
 class ExampleService(TestBase):
     async def example_unary_unary(
-        self, example_string: str, example_integer: int
+        self, example_request: ExampleRequest
     ) -> "ExampleResponse":
         return ExampleResponse(
-            example_string=example_string,
-            example_integer=example_integer,
+            example_string=example_request.example_string,
+            example_integer=example_request.example_integer,
         )
 
     async def example_unary_stream(
-        self, example_string: str, example_integer: int
+        self, example_request: ExampleRequest
     ) -> AsyncIterator["ExampleResponse"]:
         response = ExampleResponse(
-            example_string=example_string,
-            example_integer=example_integer,
+            example_string=example_request.example_string,
+            example_integer=example_request.example_integer,
         )
         yield response
         yield response
         yield response
 
     async def example_stream_unary(
-        self, request_iterator: AsyncIterator["ExampleRequest"]
+        self, example_request_iterator: AsyncIterator["ExampleRequest"]
     ) -> "ExampleResponse":
-        async for example_request in request_iterator:
+        async for example_request in example_request_iterator:
             return ExampleResponse(
                 example_string=example_request.example_string,
                 example_integer=example_request.example_integer,
             )
 
     async def example_stream_stream(
-        self, request_iterator: AsyncIterator["ExampleRequest"]
+        self, example_request_iterator: AsyncIterator["ExampleRequest"]
     ) -> AsyncIterator["ExampleResponse"]:
-        async for example_request in request_iterator:
+        async for example_request in example_request_iterator:
             yield ExampleResponse(
                 example_string=example_request.example_string,
                 example_integer=example_request.example_integer,
@@ -52,44 +55,32 @@ class ExampleService(TestBase):
 
 @pytest.mark.asyncio
 async def test_calls_with_different_cardinalities():
-    test_string = "test string"
-    test_int = 42
+    example_request = ExampleRequest("test string", 42)
 
     async with ChannelFor([ExampleService()]) as channel:
         stub = TestStub(channel)
 
         # unary unary
-        response = await stub.example_unary_unary(
-            example_string="test string",
-            example_integer=42,
-        )
-        assert response.example_string == test_string
-        assert response.example_integer == test_int
+        response = await stub.example_unary_unary(example_request)
+        assert response.example_string == example_request.example_string
+        assert response.example_integer == example_request.example_integer
 
         # unary stream
-        async for response in stub.example_unary_stream(
-            example_string="test string",
-            example_integer=42,
-        ):
-            assert response.example_string == test_string
-            assert response.example_integer == test_int
+        async for response in stub.example_unary_stream(example_request):
+            assert response.example_string == example_request.example_string
+            assert response.example_integer == example_request.example_integer
 
         # stream unary
-        request = ExampleRequest(
-            example_string=test_string,
-            example_integer=42,
-        )
-
         async def request_iterator():
-            yield request
-            yield request
-            yield request
+            yield example_request
+            yield example_request
+            yield example_request
 
         response = await stub.example_stream_unary(request_iterator())
-        assert response.example_string == test_string
-        assert response.example_integer == test_int
+        assert response.example_string == example_request.example_string
+        assert response.example_integer == example_request.example_integer
 
         # stream stream
         async for response in stub.example_stream_stream(request_iterator()):
-            assert response.example_string == test_string
-            assert response.example_integer == test_int
+            assert response.example_string == example_request.example_string
+            assert response.example_integer == example_request.example_integer

tests/inputs/field_name_identical_to_type/field_name_identical_to_type.json

@@ -0,0 +1,7 @@
+{
+    "int": 26,
+    "float": 26.0,
+    "str": "value-for-str",
+    "bytes": "001a",
+    "bool": true
+}

tests/inputs/field_name_identical_to_type/field_name_identical_to_type.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package field_name_identical_to_type;
+
+// Tests that messages may contain fields with names that are identical to their python types (PR #294)
+
+message Test {
+    int32 int = 1;
+    float float = 2;
+    string str = 3;
+    bytes bytes = 4;
+    bool bool = 5;
+}

tests/inputs/fixed/fixed.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package fixed;
+
 message Test {
   fixed32 foo = 1;
   sfixed32 bar = 2;

tests/inputs/float/float.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package float;
+
 // Some documentation about the Test message.
 message Test {
     double positive = 1;

tests/inputs/google_impl_behavior_equivalence/google_impl_behavior_equivalence.proto

@@ -1,13 +1,22 @@
 syntax = "proto3";
 
-message Foo{
-  int64 bar = 1;
-}
+import "google/protobuf/timestamp.proto";
+package google_impl_behavior_equivalence;
 
-message Test{
-  oneof group{
+message Foo { int64 bar = 1; }
+
+message Test {
+  oneof group {
     string string = 1;
     int64 integer = 2;
     Foo foo = 3;
   }
 }
+
+message Spam {
+  google.protobuf.Timestamp ts = 1;
+}
+
+message Request { Empty foo = 1; }
+
+message Empty {}

tests/inputs/google_impl_behavior_equivalence/test_google_impl_behavior_equivalence.py

@@ -1,19 +1,30 @@
-import pytest
+from datetime import (
+    datetime,
+    timezone,
+)
 
+import pytest
 from google.protobuf import json_format
+from google.protobuf.timestamp_pb2 import Timestamp
+
 import betterproto
 from tests.output_betterproto.google_impl_behavior_equivalence import (
-    Test,
+    Empty,
     Foo,
+    Request,
+    Spam,
+    Test,
 )
 from tests.output_reference.google_impl_behavior_equivalence.google_impl_behavior_equivalence_pb2 import (
-    Test as ReferenceTest,
+    Empty as ReferenceEmpty,
     Foo as ReferenceFoo,
+    Request as ReferenceRequest,
+    Spam as ReferenceSpam,
+    Test as ReferenceTest,
 )
 
 
 def test_oneof_serializes_similar_to_google_oneof():
-
     tests = [
         (Test(string="abc"), ReferenceTest(string="abc")),
         (Test(integer=2), ReferenceTest(integer=2)),
@@ -30,7 +41,6 @@ def test_oneof_serializes_similar_to_google_oneof():
 
 
 def test_bytes_are_the_same_for_oneof():
-
     message = Test(string="")
     message_reference = ReferenceTest(string="")
 
@@ -48,8 +58,36 @@ def test_bytes_are_the_same_for_oneof():
 
     # None of these fields were explicitly set BUT they should not actually be null
     # themselves
-    assert isinstance(message.foo, Foo)
-    assert isinstance(message2.foo, Foo)
+    assert not hasattr(message, "foo")
+    assert object.__getattribute__(message, "foo") == betterproto.PLACEHOLDER
+    assert not hasattr(message2, "foo")
+    assert object.__getattribute__(message2, "foo") == betterproto.PLACEHOLDER
 
     assert isinstance(message_reference.foo, ReferenceFoo)
     assert isinstance(message_reference2.foo, ReferenceFoo)
+
+
+@pytest.mark.parametrize("dt", (datetime.min.replace(tzinfo=timezone.utc),))
+def test_datetime_clamping(dt):  # see #407
+    ts = Timestamp()
+    ts.FromDatetime(dt)
+    assert bytes(Spam(dt)) == ReferenceSpam(ts=ts).SerializeToString()
+    message_bytes = bytes(Spam(dt))
+
+    assert (
+        Spam().parse(message_bytes).ts.timestamp()
+        == ReferenceSpam.FromString(message_bytes).ts.seconds
+    )
+
+
+def test_empty_message_field():
+    message = Request()
+    reference_message = ReferenceRequest()
+
+    message.foo = Empty()
+    reference_message.foo.CopyFrom(ReferenceEmpty())
+
+    assert betterproto.serialized_on_wire(message.foo)
+    assert reference_message.HasField("foo")
+
+    assert bytes(message) == reference_message.SerializeToString()

tests/inputs/googletypes/googletypes.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes;
+
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";

tests/inputs/googletypes_request/googletypes_request.proto

@@ -0,0 +1,29 @@
+syntax = "proto3";
+
+package googletypes_request;
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/wrappers.proto";
+
+// Tests that google types can be used as params
+
+service Test {
+    rpc SendDouble (google.protobuf.DoubleValue) returns (Input);
+    rpc SendFloat (google.protobuf.FloatValue) returns (Input);
+    rpc SendInt64 (google.protobuf.Int64Value) returns (Input);
+    rpc SendUInt64 (google.protobuf.UInt64Value) returns (Input);
+    rpc SendInt32 (google.protobuf.Int32Value) returns (Input);
+    rpc SendUInt32 (google.protobuf.UInt32Value) returns (Input);
+    rpc SendBool (google.protobuf.BoolValue) returns (Input);
+    rpc SendString (google.protobuf.StringValue) returns (Input);
+    rpc SendBytes (google.protobuf.BytesValue) returns (Input);
+    rpc SendDatetime (google.protobuf.Timestamp) returns (Input);
+    rpc SendTimedelta (google.protobuf.Duration) returns (Input);
+    rpc SendEmpty (google.protobuf.Empty) returns (Input);
+}
+
+message Input {
+
+}

tests/inputs/googletypes_request/test_googletypes_request.py

@@ -0,0 +1,47 @@
+from datetime import (
+    datetime,
+    timedelta,
+)
+from typing import (
+    Any,
+    Callable,
+)
+
+import pytest
+
+import betterproto.lib.google.protobuf as protobuf
+from tests.mocks import MockChannel
+from tests.output_betterproto.googletypes_request import (
+    Input,
+    TestStub,
+)
+
+
+test_cases = [
+    (TestStub.send_double, protobuf.DoubleValue, 2.5),
+    (TestStub.send_float, protobuf.FloatValue, 2.5),
+    (TestStub.send_int64, protobuf.Int64Value, -64),
+    (TestStub.send_u_int64, protobuf.UInt64Value, 64),
+    (TestStub.send_int32, protobuf.Int32Value, -32),
+    (TestStub.send_u_int32, protobuf.UInt32Value, 32),
+    (TestStub.send_bool, protobuf.BoolValue, True),
+    (TestStub.send_string, protobuf.StringValue, "string"),
+    (TestStub.send_bytes, protobuf.BytesValue, bytes(0xFF)[0:4]),
+    (TestStub.send_datetime, protobuf.Timestamp, datetime(2038, 1, 19, 3, 14, 8)),
+    (TestStub.send_timedelta, protobuf.Duration, timedelta(seconds=123456)),
+]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(["service_method", "wrapper_class", "value"], test_cases)
+async def test_channel_receives_wrapped_type(
+    service_method: Callable[[TestStub, Input], Any], wrapper_class: Callable, value
+):
+    wrapped_value = wrapper_class()
+    wrapped_value.value = value
+    channel = MockChannel(responses=[Input()])
+    service = TestStub(channel)
+
+    await service_method(service, wrapped_value)
+
+    assert channel.requests[0]["request"] == type(wrapped_value)

tests/inputs/googletypes_response/googletypes_response.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes_response;
+
 import "google/protobuf/wrappers.proto";
 
 // Tests that wrapped values can be used directly as return values

tests/inputs/googletypes_response/test_googletypes_response.py

@@ -1,10 +1,18 @@
-from typing import Any, Callable, Optional
+from typing import (
+    Any,
+    Callable,
+    Optional,
+)
 
-import betterproto.lib.google.protobuf as protobuf
 import pytest
 
+import betterproto.lib.google.protobuf as protobuf
 from tests.mocks import MockChannel
-from tests.output_betterproto.googletypes_response import TestStub
+from tests.output_betterproto.googletypes_response import (
+    Input,
+    TestStub,
+)
+
 
 test_cases = [
     (TestStub.get_double, protobuf.DoubleValue, 2.5),
@@ -22,14 +30,15 @@ test_cases = [
 @pytest.mark.asyncio
 @pytest.mark.parametrize(["service_method", "wrapper_class", "value"], test_cases)
 async def test_channel_receives_wrapped_type(
-    service_method: Callable[[TestStub], Any], wrapper_class: Callable, value
+    service_method: Callable[[TestStub, Input], Any], wrapper_class: Callable, value
 ):
     wrapped_value = wrapper_class()
     wrapped_value.value = value
     channel = MockChannel(responses=[wrapped_value])
     service = TestStub(channel)
+    method_param = Input()
 
-    await service_method(service)
+    await service_method(service, method_param)
 
     assert channel.requests[0]["response_type"] != Optional[type(value)]
     assert channel.requests[0]["response_type"] == type(wrapped_value)
@@ -39,7 +48,7 @@ async def test_channel_receives_wrapped_type(
 @pytest.mark.xfail
 @pytest.mark.parametrize(["service_method", "wrapper_class", "value"], test_cases)
 async def test_service_unwraps_response(
-    service_method: Callable[[TestStub], Any], wrapper_class: Callable, value
+    service_method: Callable[[TestStub, Input], Any], wrapper_class: Callable, value
 ):
     """
     grpclib does not unwrap wrapper values returned by services
@@ -47,8 +56,9 @@ async def test_service_unwraps_response(
     wrapped_value = wrapper_class()
     wrapped_value.value = value
     service = TestStub(MockChannel(responses=[wrapped_value]))
+    method_param = Input()
 
-    response_value = await service_method(service)
+    response_value = await service_method(service, method_param)
 
     assert response_value == value
     assert type(response_value) == type(value)

tests/inputs/googletypes_response_embedded/googletypes_response_embedded.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes_response_embedded;
+
 import "google/protobuf/wrappers.proto";
 
 // Tests that wrapped values are supported as part of output message

tests/inputs/googletypes_response_embedded/test_googletypes_response_embedded.py

@@ -2,6 +2,7 @@ import pytest
 
 from tests.mocks import MockChannel
 from tests.output_betterproto.googletypes_response_embedded import (
+    Input,
     Output,
     TestStub,
 )
@@ -26,7 +27,7 @@ async def test_service_passes_through_unwrapped_values_embedded_in_response():
     )
 
     service = TestStub(MockChannel(responses=[output]))
-    response = await service.get_output()
+    response = await service.get_output(Input())
 
     assert response.double_value == 10.0
     assert response.float_value == 12.0

tests/inputs/googletypes_service_returns_empty/googletypes_service_returns_empty.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes_service_returns_empty;
+
 import "google/protobuf/empty.proto";
 
 service Test {

tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes_service_returns_googletype;
+
 import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
 

tests/inputs/googletypes_struct/googletypes_struct.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes_struct;
+
 import "google/protobuf/struct.proto";
 
 message Test {

tests/inputs/googletypes_value/googletypes_value.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package googletypes_value;
+
 import "google/protobuf/struct.proto";
 
 // Tests that fields of type google.protobuf.Value can contain arbitrary JSON-values.

tests/inputs/import_capitalized_package/capitalized.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 
-package Capitalized;
+package import_capitalized_package.Capitalized;
 
 message Message {
 

tests/inputs/import_capitalized_package/test.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package import_capitalized_package;
+
 import "capitalized.proto";
 
 // Tests that we can import from a package with a capital name, that looks like a nested type, but isn't.

tests/inputs/import_child_package_from_package/child.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package package.childpackage;
+package import_child_package_from_package.package.childpackage;
 
 message ChildMessage {
 

tests/inputs/import_child_package_from_package/import_child_package_from_package.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package import_child_package_from_package;
+
 import "package_message.proto";
 
 // Tests generated imports when a message in a package refers to a message in a nested child package.

tests/inputs/import_child_package_from_package/package_message.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 import "child.proto";
 
-package package;
+package import_child_package_from_package.package;
 
 message PackageMessage {
     package.childpackage.ChildMessage c = 1;

tests/inputs/import_child_package_from_root/child.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package childpackage;
+package import_child_package_from_root.childpackage;
 
 message Message {
 

tests/inputs/import_child_package_from_root/import_child_package_from_root.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package import_child_package_from_root;
+
 import "child.proto";
 
 // Tests generated imports when a message in root refers to a message in a child package.