Merge 428b87f into 6e7d768

weni-ai · Sep 1, 2021 · b5a2863 · b5a2863
2 parents 6e7d768 + 428b87f
commit b5a2863
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -76,10 +76,10 @@ createproto:
 
 	@rm -rf ./bothub/protos/
 	@git clone --depth 1 --branch main https://github.com/Ilhasoft/weni-protobuffers ./bothub/protos/
-	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/inteligence/authentication.proto
-	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/inteligence/organization.proto
-	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/inteligence/repository.proto	
-	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/connect/project.proto
+	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/src/weni/protobuf/intelligence/authentication.proto
+	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/src/weni/protobuf/intelligence/organization.proto
+	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/src/weni/protobuf/intelligence/repository.proto	
+	@python -m grpc_tools.protoc --experimental_allow_proto3_optional --proto_path=./ --python_out=./ --grpc_python_out=./ ./bothub/protos/src/weni/protobuf/connect/project.proto
 
 
 # Utils

diff --git a/bothub/api/grpc/connect_grpc_client.py b/bothub/api/grpc/connect_grpc_client.py
@@ -3,7 +3,7 @@
 import grpc
 from django.conf import settings
 
-from bothub.protos.inteligence import project_pb2_grpc, project_pb2
+from bothub.protos.src.weni.protobuf.connect import project_pb2_grpc, project_pb2
 
 
 class ConnectGRPCClient:

diff --git a/bothub/api/grpc/organization/handlers.py b/bothub/api/grpc/organization/handlers.py
@@ -1,5 +1,5 @@
 from bothub.api.grpc.organization.services import OrgService
-from bothub.protos.inteligence import organization_pb2_grpc
+from bothub.protos.src.weni.protobuf.intelligence import organization_pb2_grpc
 
 
 def grpc_handlers(server):

diff --git a/bothub/api/grpc/organization/serializers.py b/bothub/api/grpc/organization/serializers.py
@@ -4,7 +4,7 @@
 
 from bothub.authentication.models import User
 from bothub.common.models import Organization, OrganizationAuthorization
-from bothub.protos.inteligence import organization_pb2
+from bothub.protos.src.weni.protobuf.intelligence import organization_pb2
 
 
 class OrgProtoSerializer(proto_serializers.ModelProtoSerializer):

diff --git a/bothub/api/grpc/organization/services.py b/bothub/api/grpc/organization/services.py
@@ -16,7 +16,7 @@
     RepositoryAuthorization,
     Repository,
 )
-from bothub.protos.inteligence.organization_pb2 import OrgStatistic
+from bothub.protos.src.weni.protobuf.intelligence.organization_pb2 import OrgStatistic
 
 
 class OrgService(

diff --git a/bothub/api/grpc/repository/handlers.py b/bothub/api/grpc/repository/handlers.py
@@ -1,5 +1,5 @@
 from .services import RepositoryService
-from bothub.protos.inteligence import repository_pb2_grpc
+from bothub.protos.src.weni.protobuf.intelligence import repository_pb2_grpc
 
 
 def grpc_handlers(server):

diff --git a/bothub/api/grpc/repository/serializers.py b/bothub/api/grpc/repository/serializers.py
@@ -3,7 +3,7 @@
 
 from bothub.api.v2.repository.serializers import RepositoryCategorySerializer
 from bothub.common.models import Repository
-from bothub.protos.inteligence import repository_pb2
+from bothub.protos.src.weni.protobuf.intelligence import repository_pb2
 
 
 class RepositoryProtoSerializer(proto_serializers.ModelProtoSerializer):

diff --git a/bothub/api/grpc/repository/tests.py b/bothub/api/grpc/repository/tests.py
@@ -8,7 +8,7 @@
     OrganizationAuthorization,
     RepositoryAuthorization,
 )
-from bothub.protos.inteligence import repository_pb2_grpc, repository_pb2
+from bothub.protos.src.weni.protobuf.intelligence import repository_pb2_grpc, repository_pb2
 
 
 class RepositoryServiceTestCase(RPCTransactionTestCase):

diff --git a/bothub/api/grpc/user/handlers.py b/bothub/api/grpc/user/handlers.py
@@ -3,7 +3,7 @@
     UserService,
     UserLanguageService,
 )
-from bothub.protos.inteligence import authentication_pb2_grpc
+from bothub.protos.src.weni.protobuf.intelligence import authentication_pb2_grpc
 
 
 def grpc_handlers(server):

diff --git a/bothub/api/grpc/user/serializers.py b/bothub/api/grpc/user/serializers.py
@@ -2,7 +2,7 @@
 from rest_framework import serializers
 
 from bothub.authentication.models import User
-from bothub.protos.inteligence import authentication_pb2
+from bothub.protos.src.weni.protobuf.intelligence import authentication_pb2
 
 
 class UserProtoSerializer(proto_serializers.ModelProtoSerializer):

diff --git a/bothub/api/grpc/user/tests.py b/bothub/api/grpc/user/tests.py
@@ -3,7 +3,7 @@
 from bothub.api.v2.tests.utils import create_user_and_token
 from bothub.authentication.models import User
 from bothub.common.models import Organization, OrganizationAuthorization
-from bothub.protos.inteligence import authentication_pb2_grpc, authentication_pb2
+from bothub.protos.src.weni.protobuf.intelligence import authentication_pb2_grpc, authentication_pb2
 
 
 class UserServiceTest(RPCTransactionTestCase):

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
@@ -1,6 +1,4 @@
-import multiprocessing
-
 bind = "0.0.0.0:80"
-workers = multiprocessing.cpu_count() * 2 + 1
+workers = 3
 worker_class = "gevent"
 raw_env = ["DJANGO_SETTINGS_MODULE=bothub.settings"]