Generate gRPC client locally (#84)

One of the last repos required for this. Following this we can archive
the APIs repository and remove generation github actions.

Author: tjholm

.github/workflows/test.yaml

@@ -24,6 +24,11 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install
       run: make install
+    - name: Check generated sources
+      run: |
+        make grpc-client
+        git add .
+        git diff --cached --quiet
     - name: Run Tox
       # Run tox using the version of Python in `PATH`
       run: tox -e py

.gitignore

@@ -1,6 +1,3 @@
-# Protoc Output Files
-nitric/proto/
-
 .idea/
 
 # Byte-compiled / optimized / DLL files
@@ -145,3 +142,5 @@ cython_debug/
 
 
 .vscode/
+
+contracts/

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: stable
     hooks:
     - id: black
-      exclude: ^(examples)/
+      exclude: ^(examples|nitric/proto)/
 -   repo: https://github.com/pycqa/flake8
     rev: 3.7.9
     hooks:

docs/nitric/api/documents.html

@@ -54,7 +54,7 @@ <h1 class="title">Module <code>nitric.api.documents</code></h1>
 
 from nitric.api.const import MAX_SUB_COLLECTION_DEPTH
 from nitric.api.exception import exception_from_grpc_error
-from nitricapi.nitric.document.v1 import (
+from proto.nitric.document.v1 import (
     DocumentServiceStub,
     Collection as CollectionMessage,
     Key as KeyMessage,

docs/nitric/api/events.html

@@ -52,7 +52,7 @@ <h1 class="title">Module <code>nitric.api.events</code></h1>
 
 from nitric.api.exception import exception_from_grpc_error
 from nitric.utils import new_default_channel, _struct_from_dict
-from nitricapi.nitric.event.v1 import EventServiceStub, NitricEvent, TopicServiceStub
+from proto.nitric.event.v1 import EventServiceStub, NitricEvent, TopicServiceStub
 from dataclasses import dataclass, field
 
 

docs/nitric/api/queues.html

@@ -52,7 +52,7 @@ <h1 class="title">Module <code>nitric.api.queues</code></h1>
 
 from nitric.api.exception import FailedPreconditionException, exception_from_grpc_error, InvalidArgumentException
 from nitric.utils import new_default_channel, _struct_from_dict, _dict_from_struct
-from nitricapi.nitric.queue.v1 import QueueServiceStub, NitricTask, FailedTask as WireFailedTask
+from proto.nitric.queue.v1 import QueueServiceStub, NitricTask, FailedTask as WireFailedTask
 from dataclasses import dataclass, field
 
 

docs/nitric/api/secrets.html

@@ -52,7 +52,7 @@ <h1 class="title">Module <code>nitric.api.secrets</code></h1>
 
 from nitric.api.exception import exception_from_grpc_error
 from nitric.utils import new_default_channel
-from nitricapi.nitric.secret.v1 import SecretServiceStub, Secret as SecretMessage, SecretVersion as VersionMessage
+from proto.nitric.secret.v1 import SecretServiceStub, Secret as SecretMessage, SecretVersion as VersionMessage
 
 
 class Secrets(object):

docs/nitric/api/storage.html

@@ -50,7 +50,7 @@ <h1 class="title">Module <code>nitric.api.storage</code></h1>
 
 from nitric.api.exception import exception_from_grpc_error
 from nitric.utils import new_default_channel
-from nitricapi.nitric.storage.v1 import StorageServiceStub
+from proto.nitric.storage.v1 import StorageServiceStub
 
 
 class Storage(object):

docs/nitric/faas.html

@@ -36,7 +36,7 @@ <h1 class="title">Module <code>nitric.faas</code></h1>
 import betterproto
 from betterproto.grpc.util.async_channel import AsyncChannel
 from nitric.utils import new_default_channel
-from nitricapi.nitric.faas.v1 import (
+from proto.nitric.faas.v1 import (
     FaasServiceStub,
     InitRequest,
     ClientMessage,

makefile

@@ -16,6 +16,23 @@ clean:
 	@rm -rf ./build
 	@rm -rf ./dist
 
+NITRIC_VERSION="v0.20.0-rc.2"
+
+download:
+	@curl -L https://github.com/nitrictech/nitric/releases/download/${NITRIC_VERSION}/contracts.tgz -o contracts.tgz
+	@tar xvzf contracts.tgz
+	@rm contracts.tgz
+
+OUTPUT="./nitric/proto"
+CONTRACTS="./contracts"
+
+grpc-client: install download
+	@echo Generating Proto Sources
+	@echo $(OUTPUT)
+	@mkdir -p $(OUTPUT)
+	@python3 -m grpc_tools.protoc -I $(CONTRACTS) --python_betterproto_out=$(OUTPUT) ./contracts/proto/*/*/*.proto
+
+
 license:
 	@echo Applying Apache 2 header to source files
 	@licenseheaders -t tools/apache-2.tmpl -o "Nitric Technologies Pty Ltd" -y 2021 -n "Nitric Python 3 SDK" -u "https://github.com/nitrictech/python-sdk" -d nitric