Merge pull request #43 from jupyter-naas/workspace-grpc

fix: Build grpc for workspace

Author: Dr0p42

Makefile

@@ -3,9 +3,13 @@ protoc=$(d) protoc
 
 generate: clean python go build submodules
 	docker compose run --rm -it python
-	cd python/naas_models && sed -i.bak  's/import validate_pb2/import naas_models.validate_pb2/g' *.py && rm *.bak
-	cd python/naas_models/pydantic && sed -i.bak 's/common_p2p/naas_models.pydantic.common_p2p/g' *.py && rm *.bak
-	cd python/naas_models/pydantic && sed -i.bak 's/errors_p2p/naas_models.pydantic.errors_p2p/g' *.py && rm *.bak
+	echo "Patching python files"
+	sed -i.bak -r 's/^(import )([a-zA-Z]*_pb2)/import naas_models.\2/g' python/naas_models/*.py && rm python/naas_models/*.bak
+	sed -i.bak -r 's/^(import )([a-zA-Z]*_pb2)/import naas_models.pydantic.\2/g' python/naas_models/pydantic/*.py && rm python/naas_models/pydantic/*.bak
+	sed -i.bak -r 's/^(from )([a-zA-Z]*_p2p)/from naas_models.pydantic.\2/g' python/naas_models/pydantic/*.py && rm python/naas_models/pydantic/*.bak
+	# cd python/naas_models && sed -i.bak  's/import validate_pb2/import naas_models.validate_pb2/g' *.py && rm *.bak
+	# cd python/naas_models/pydantic && sed -i.bak 's/common_p2p/naas_models.pydantic.common_p2p/g' *.py && rm *.bak
+	# cd python/naas_models/pydantic && sed -i.bak 's/errors_p2p/naas_models.pydantic.errors_p2p/g' *.py && rm *.bak
 
 build:
 	docker compose build
@@ -22,7 +26,7 @@ go:
 	mkdir go
 
 clean:
-	rm -rf dist go  python/naas_models/*_pb2.py python/naas_models/pydantic/*_p2p.py 
+	rm -rf dist go  python/naas_models/*_pb2*.py python/naas_models/pydantic/*_p2p.py python/naas_models/*.pyi
 
 submodules:
 	git submodule init && git submodule update

docker-compose.yaml

@@ -19,4 +19,10 @@ services:
           --python_out=../python/naas_models \
           --go_out=../go \
           --validate_out="lang=go:../go" \
-          space.proto registry.proto iam.proto aimodel.proto chat.proto credit.proto secret.proto storage.proto workspace.proto asset.proto errors.proto validate.proto ontology.proto common.proto p2p_validate.proto
+          space.proto registry.proto iam.proto aimodel.proto chat.proto credit.proto secret.proto storage.proto workspace.proto asset.proto errors.proto validate.proto ontology.proto common.proto p2p_validate.proto && \
+          poetry run python3 -m grpc_tools.protoc \
+          -I=../protos/ \
+          -I=../lib/protoc-gen-validate/validate/ \
+          --pyi_out=../python/naas_models \
+          --grpc_python_out=../python/naas_models \
+          workspace.proto

go/github.com/jupyter-naas/naas-models/go/iam/iam.pb.go

@@ -11,6 +11,7 @@ message TokenData {
     optional string user_id = 1;
     repeated string scopes = 2;
     optional string api_key_id = 3;
+    optional string jwt_token = 4;
 }
 
 message Profile {

go/github.com/jupyter-naas/naas-models/go/iam/iam.pb.validate.go

@@ -295,4 +295,8 @@ message WorkspaceWipeRequest {
 
 message WorkspaceWipeResponse {
     optional errors.ErrorResponse error = 1;
+}
+
+service WorkspaceService {
+    rpc ListUser (WorkspaceUserListRequest) returns (WorkspaceUserListResponse);
 }

go/github.com/jupyter-naas/naas-models/go/workspace/workspace.pb.go

@@ -1 +1 @@
-from .pydantic.registry_p2p import *
+from naas_models.pydantic.registry_p2p import *