Merge pull request #334 from InjectiveLabs/fix/make_proto_modules_imp…

…orts_explicit_master

Fix/make proto modules imports explicit master

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.5.4] - 2024-07-03
+### Changed
+- Fixed all import statements in pyinjective.proto modules to make them explicit
+
 ## [1.5.3] - 2024-06-12
 ### Changed
 - Changed parameter `key` from the PaginationOption class.

Makefile

@@ -3,17 +3,25 @@ all:
 gen: gen-client
 
 gen-client: clone-all copy-proto
+	mkdir -p ./pyinjective/proto
 	@for dir in $(shell find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq); do \
-		mkdir -p ./pyinjective/$${dir}; \
 		python3 -m grpc_tools.protoc \
-		-I proto \
+		--proto_path=./proto \
 		--python_out=./pyinjective/proto \
 		--grpc_python_out=./pyinjective/proto \
 		$$(find ./$${dir} -type f -name '*.proto'); \
-	done; \
+	done
 	rm -rf proto
 	$(call clean_repos)
-	echo "import os\nimport sys\n\nsys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))" > pyinjective/proto/__init__.py
+	touch pyinjective/proto/__init__.py
+	$(MAKE) fix-proto-imports
+
+PROTO_MODULES := cosmwasm exchange gogoproto cosmos_proto cosmos testpb ibc amino tendermint injective
+fix-proto-imports:
+	@for module in $(PROTO_MODULES); do \
+  		find ./pyinjective/proto -type f -name "*.py" -exec sed -i "" -e "s/from $${module}/from pyinjective.proto.$${module}/g" {} \; ; \
+	done
+	@find ./pyinjective/proto -type f -name "*.py" -exec sed -i "" -e "s/from google.api/from pyinjective.proto.google.api/g" {} \;
 
 define clean_repos
 	rm -Rf cosmos-sdk

pyinjective/proto/__init__.py

@@ -1,4 +0,0 @@
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))

pyinjective/proto/cosmos/app/v1alpha1/query_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from cosmos.app.v1alpha1 import query_pb2 as cosmos_dot_app_dot_v1alpha1_dot_query__pb2
+from pyinjective.proto.cosmos.app.v1alpha1 import query_pb2 as cosmos_dot_app_dot_v1alpha1_dot_query__pb2
 
 
 class QueryStub(object):

pyinjective/proto/cosmos/auth/v1beta1/query_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from cosmos.auth.v1beta1 import query_pb2 as cosmos_dot_auth_dot_v1beta1_dot_query__pb2
+from pyinjective.proto.cosmos.auth.v1beta1 import query_pb2 as cosmos_dot_auth_dot_v1beta1_dot_query__pb2
 
 
 class QueryStub(object):

pyinjective/proto/cosmos/auth/v1beta1/tx_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from cosmos.auth.v1beta1 import tx_pb2 as cosmos_dot_auth_dot_v1beta1_dot_tx__pb2
+from pyinjective.proto.cosmos.auth.v1beta1 import tx_pb2 as cosmos_dot_auth_dot_v1beta1_dot_tx__pb2
 
 
 class MsgStub(object):