Merge pull request #645 from Ilhasoft/hotfix/fix_version_tests

Hotfix/fix version tests
weni-ai · Oct 5, 2021 · d0eba1e · d0eba1e
2 parents 7960b6e + dfe0b49
commit d0eba1e
Show file tree

Hide file tree

Showing 25 changed files with 452 additions and 337 deletions.
diff --git a/.flake8 b/.flake8
@@ -6,4 +6,3 @@ exclude =
   ./bothub/common/migrations
   ./manage.py
   ./bothub/common/languages.py
-  ./bothub/protos/
diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml
@@ -0,0 +1,32 @@
+name: Build Production Image
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Set output
+        id: vars
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: bothubit/bothub-engine:${{ steps.vars.outputs.tag }}
+
diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
@@ -0,0 +1,32 @@
+name: Build Staging Image
+on:
+  push:
+    tags:
+      - 'staging-v*.*.*'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Set output
+        id: vars
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: bothubit/bothub-engine:${{ steps.vars.outputs.tag }}
+
diff --git a/.gitignore b/.gitignore
@@ -117,9 +117,6 @@ staticfiles/
 #Pycharm
 .idea/
 
-# gRPC Protobuff
-bothub/protos/
-
 #ASDF
 .tool-versions
 

diff --git a/.travis.yml b/.travis.yml
@@ -57,7 +57,6 @@ env:
     - ELASTICSEARCH_NUMBER_OF_SHARDS=1
     - ELASTICSEARCH_NUMBER_OF_REPLICAS=1
 script:
-  - make createproto
   - python manage.py migrate
   - python manage.py search_index --rebuild -f
   - python manage.py collectstatic

diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,5 @@ RUN pipenv install --system
 
 COPY . .
 
-RUN make createproto
-
 RUN chmod +x ./entrypoint.sh
 ENTRYPOINT [ "./entrypoint.sh" ]
diff --git a/Makefile b/Makefile
@@ -72,16 +72,6 @@ search_index:
 		then python manage.py search_index --rebuild -f; \
 		else pipenv run python manage.py search_index --rebuild -f; fi
 
-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/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
 
 ## Colors

diff --git a/Pipfile b/Pipfile
@@ -40,6 +40,7 @@ django-elasticsearch-dsl-drf= "~=0.22.1"
 elasticsearch= "~=7.14.0"
 elasticsearch-dsl= "~=7.4.0"
 psycopg2-binary = "~=2.9.1"
+weni-protobuffers = "*"
 
 [dev-packages]
 "flake8" = "~=3.9.2"

diff --git a/Pipfile.lock b/Pipfile.lock
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.src.weni.protobuf.connect import project_pb2_grpc, project_pb2
+from 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.src.weni.protobuf.intelligence import organization_pb2_grpc
+from 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.src.weni.protobuf.intelligence import organization_pb2
+from 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.src.weni.protobuf.intelligence.organization_pb2 import OrgStatistic
+from 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.src.weni.protobuf.intelligence import repository_pb2_grpc
+from 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.src.weni.protobuf.intelligence import repository_pb2
+from 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.src.weni.protobuf.intelligence import (
+from weni.protobuf.intelligence import (
     repository_pb2_grpc,
     repository_pb2,
 )

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.src.weni.protobuf.intelligence import authentication_pb2_grpc
+from 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.src.weni.protobuf.intelligence import authentication_pb2
+from 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.src.weni.protobuf.intelligence import (
+from weni.protobuf.intelligence import (
     authentication_pb2_grpc,
     authentication_pb2,
 )

diff --git a/bothub/api/v2/nlp/views.py b/bothub/api/v2/nlp/views.py
@@ -24,6 +24,7 @@
 from bothub.common.models import (
     QALogs,
     RepositoryAuthorization,
+    RepositoryVersion,
     RepositoryVersionLanguage,
     RepositoryNLPLog,
     RepositoryExample,
@@ -330,13 +331,16 @@ def retrieve(self, request, *args, **kwargs):
         repository = repository_authorization.repository
 
         repository_version = request.query_params.get("repository_version")
-
+        try:
+            is_default = RepositoryVersion.objects.get(pk=repository_version).is_default
+        except (RepositoryVersion.DoesNotExist, ValueError):
+            is_default = True
         queryset = RepositoryExample.objects.filter(
             repository_version_language__repository_version__repository=repository
         )
         serializer = repository.intents(
             queryset=queryset,
-            version_default=False,
+            version_default=is_default,
             repository_version=repository_version,
         )
 
@@ -584,7 +588,7 @@ def retrieve(self, request, *args, **kwargs):
             )
 
         try:
-            repository.validate_if_can_run_automatic_evaluate(language=language)
+            repository.validate_if_can_run_automatic_evaluate(language=language, repository_version_id=repository_version)
             can_run_automatic_evaluate = True
         except ValidationError:
             can_run_automatic_evaluate = False

diff --git a/bothub/api/v2/repository/views.py b/bothub/api/v2/repository/views.py
@@ -267,7 +267,7 @@ def projectrepository(self, request, **kwargs):
     @action(
         detail=True,
         methods=["POST"],
-        permission_classes=[RepositoryAdminManagerAuthorization],
+        permission_classes=[IsAuthenticated],
         url_name="remove-repository-project",
         serializer_class=RemoveRepositoryProject,
     )