organize protobuf files (#299)

microsoft · Apr 12, 2020 · 8984f7f · 8984f7f
1 parent 60f50b5
commit 8984f7f
Show file tree

Hide file tree

Showing 29 changed files with 13 additions and 10 deletions.
diff --git a/presidio-analyzer/presidio_analyzer/__main__.py b/presidio-analyzer/presidio_analyzer/__main__.py
@@ -1,8 +1,8 @@
 # pylint: disable=wrong-import-position,wrong-import-order
 import logging
 import grpc
-import analyze_pb2
-import analyze_pb2_grpc
+from protobuf_models import analyze_pb2
+from protobuf_models import analyze_pb2_grpc
 from concurrent import futures
 import os
 import sys

diff --git a/presidio-analyzer/presidio_analyzer/analyzer_engine.py b/presidio-analyzer/presidio_analyzer/analyzer_engine.py
@@ -1,9 +1,9 @@
 import json
 import uuid
 
-import analyze_pb2
-import analyze_pb2_grpc
-import common_pb2
+from protobuf_models import analyze_pb2
+from protobuf_models import analyze_pb2_grpc
+from protobuf_models import common_pb2
 
 from presidio_analyzer import PresidioLogger
 from presidio_analyzer.app_tracer import AppTracer

diff --git a/presidio-analyzer/presidio_analyzer/protobuf_models/__init__.py b/presidio-analyzer/presidio_analyzer/protobuf_models/__init__.py
@@ -0,0 +1,3 @@
+import sys
+from pathlib import Path
+sys.path.append(str(Path(__file__).parent))
diff --git a/...analyzer/presidio_analyzer/analyze_pb2.py → ...o_analyzer/protobuf_models/analyze_pb2.py b/...analyzer/presidio_analyzer/analyze_pb2.py → ...o_analyzer/protobuf_models/analyze_pb2.py
diff --git a/...zer/presidio_analyzer/analyze_pb2_grpc.py → ...lyzer/protobuf_models/analyze_pb2_grpc.py b/...zer/presidio_analyzer/analyze_pb2_grpc.py → ...lyzer/protobuf_models/analyze_pb2_grpc.py
diff --git a/.../presidio_analyzer/anonymize_image_pb2.py → ...er/protobuf_models/anonymize_image_pb2.py b/.../presidio_analyzer/anonymize_image_pb2.py → ...er/protobuf_models/anonymize_image_pb2.py
diff --git a/...idio_analyzer/anonymize_image_pb2_grpc.py → ...otobuf_models/anonymize_image_pb2_grpc.py b/...idio_analyzer/anonymize_image_pb2_grpc.py → ...otobuf_models/anonymize_image_pb2_grpc.py
diff --git a/...r/presidio_analyzer/anonymize_json_pb2.py → ...zer/protobuf_models/anonymize_json_pb2.py b/...r/presidio_analyzer/anonymize_json_pb2.py → ...zer/protobuf_models/anonymize_json_pb2.py
diff --git a/...sidio_analyzer/anonymize_json_pb2_grpc.py → ...rotobuf_models/anonymize_json_pb2_grpc.py b/...sidio_analyzer/anonymize_json_pb2_grpc.py → ...rotobuf_models/anonymize_json_pb2_grpc.py
diff --git a/...alyzer/presidio_analyzer/anonymize_pb2.py → ...analyzer/protobuf_models/anonymize_pb2.py b/...alyzer/presidio_analyzer/anonymize_pb2.py → ...analyzer/protobuf_models/anonymize_pb2.py
diff --git a/...r/presidio_analyzer/anonymize_pb2_grpc.py → ...zer/protobuf_models/anonymize_pb2_grpc.py b/...r/presidio_analyzer/anonymize_pb2_grpc.py → ...zer/protobuf_models/anonymize_pb2_grpc.py
diff --git a/...-analyzer/presidio_analyzer/common_pb2.py → ...io_analyzer/protobuf_models/common_pb2.py b/...-analyzer/presidio_analyzer/common_pb2.py → ...io_analyzer/protobuf_models/common_pb2.py
diff --git a/...yzer/presidio_analyzer/common_pb2_grpc.py → ...alyzer/protobuf_models/common_pb2_grpc.py b/...yzer/presidio_analyzer/common_pb2_grpc.py → ...alyzer/protobuf_models/common_pb2_grpc.py
diff --git a/...nalyzer/presidio_analyzer/datasink_pb2.py → ..._analyzer/protobuf_models/datasink_pb2.py b/...nalyzer/presidio_analyzer/datasink_pb2.py → ..._analyzer/protobuf_models/datasink_pb2.py
diff --git a/...er/presidio_analyzer/datasink_pb2_grpc.py → ...yzer/protobuf_models/datasink_pb2_grpc.py b/...er/presidio_analyzer/datasink_pb2_grpc.py → ...yzer/protobuf_models/datasink_pb2_grpc.py
diff --git a/...dio-analyzer/presidio_analyzer/ocr_pb2.py → ...sidio_analyzer/protobuf_models/ocr_pb2.py b/...dio-analyzer/presidio_analyzer/ocr_pb2.py → ...sidio_analyzer/protobuf_models/ocr_pb2.py
diff --git a/...nalyzer/presidio_analyzer/ocr_pb2_grpc.py → ..._analyzer/protobuf_models/ocr_pb2_grpc.py b/...nalyzer/presidio_analyzer/ocr_pb2_grpc.py → ..._analyzer/protobuf_models/ocr_pb2_grpc.py
diff --git a/...residio_analyzer/recognizers_store_pb2.py → .../protobuf_models/recognizers_store_pb2.py b/...residio_analyzer/recognizers_store_pb2.py → .../protobuf_models/recognizers_store_pb2.py
diff --git a/...io_analyzer/recognizers_store_pb2_grpc.py → ...obuf_models/recognizers_store_pb2_grpc.py b/...io_analyzer/recognizers_store_pb2_grpc.py → ...obuf_models/recognizers_store_pb2_grpc.py
diff --git a/...io-analyzer/presidio_analyzer/scan_pb2.py → ...idio_analyzer/protobuf_models/scan_pb2.py b/...io-analyzer/presidio_analyzer/scan_pb2.py → ...idio_analyzer/protobuf_models/scan_pb2.py
diff --git a/...alyzer/presidio_analyzer/scan_pb2_grpc.py → ...analyzer/protobuf_models/scan_pb2_grpc.py b/...alyzer/presidio_analyzer/scan_pb2_grpc.py → ...analyzer/protobuf_models/scan_pb2_grpc.py
diff --git a/...alyzer/presidio_analyzer/scheduler_pb2.py → ...analyzer/protobuf_models/scheduler_pb2.py b/...alyzer/presidio_analyzer/scheduler_pb2.py → ...analyzer/protobuf_models/scheduler_pb2.py
diff --git a/...r/presidio_analyzer/scheduler_pb2_grpc.py → ...zer/protobuf_models/scheduler_pb2_grpc.py b/...r/presidio_analyzer/scheduler_pb2_grpc.py → ...zer/protobuf_models/scheduler_pb2_grpc.py
diff --git a/...-analyzer/presidio_analyzer/stream_pb2.py → ...io_analyzer/protobuf_models/stream_pb2.py b/...-analyzer/presidio_analyzer/stream_pb2.py → ...io_analyzer/protobuf_models/stream_pb2.py
diff --git a/...yzer/presidio_analyzer/stream_pb2_grpc.py → ...alyzer/protobuf_models/stream_pb2_grpc.py b/...yzer/presidio_analyzer/stream_pb2_grpc.py → ...alyzer/protobuf_models/stream_pb2_grpc.py
diff --git a/...nalyzer/presidio_analyzer/template_pb2.py → ..._analyzer/protobuf_models/template_pb2.py b/...nalyzer/presidio_analyzer/template_pb2.py → ..._analyzer/protobuf_models/template_pb2.py
diff --git a/...er/presidio_analyzer/template_pb2_grpc.py → ...yzer/protobuf_models/template_pb2_grpc.py b/...er/presidio_analyzer/template_pb2_grpc.py → ...yzer/protobuf_models/template_pb2_grpc.py
diff --git a/presidio-analyzer/presidio_analyzer/recognizer_registry/recognizers_store_api.py b/presidio-analyzer/presidio_analyzer/recognizer_registry/recognizers_store_api.py
@@ -2,8 +2,8 @@
 import os
 
 import grpc
-import recognizers_store_pb2
-import recognizers_store_pb2_grpc
+from protobuf_models import recognizers_store_pb2
+from protobuf_models import recognizers_store_pb2_grpc
 
 from presidio_analyzer import PatternRecognizer
 from presidio_analyzer import Pattern

diff --git a/presidio-analyzer/tests/test_analyzer_engine.py b/presidio-analyzer/tests/test_analyzer_engine.py
@@ -6,8 +6,8 @@
 from presidio_analyzer import AnalyzerEngine, PatternRecognizer, Pattern, \
     RecognizerResult, RecognizerRegistry, AnalysisExplanation
 from presidio_analyzer import PresidioLogger
-from presidio_analyzer.analyze_pb2 import AnalyzeRequest
-from presidio_analyzer.analyze_pb2 import RecognizersAllRequest
+from presidio_analyzer.protobuf_models.analyze_pb2 import AnalyzeRequest, \
+    RecognizersAllRequest
 from presidio_analyzer.entity_recognizer import EntityRecognizer
 from presidio_analyzer.nlp_engine import NlpArtifacts
 from presidio_analyzer.predefined_recognizers import CreditCardRecognizer, \
@@ -561,4 +561,4 @@ def test_get_recognizers_returns_supported_language(self):
         request = RecognizersAllRequest(language="ru")
         response = analyze_engine.GetAllRecognizers(request, None)
         # there is only 1 mocked russian recognizer
-        assert len(response) == 1
+        assert len(response) == 1