Merge pull request #385 from Enjection/feature/KIKIMR-20854/add-draft…

…-protos-support-to-generator Fix generate_protoc.py to support protos in draft dir
ydb-platform · Jan 25, 2024 · f2f869e · f2f869e
2 parents 60ec5f7 + a8f6e62
commit f2f869e
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 8 deletions.
diff --git a/generate_protoc.py b/generate_protoc.py
@@ -40,6 +40,7 @@ def remove_protos(rootdirpath: str):
 def fix_file_contents(rootdir, protobuf_version: str):
     flake_ignore_line = "# flake8: " + "noqa"  # prevent ignore the file
     package_path = "ydb._grpc." + protobuf_version + ".protos"
+    draft_package_path = "ydb._grpc." + protobuf_version + ".draft.protos"
 
     for dirpath, _, fnames in os.walk(rootdir):
         for fname in fnames:
@@ -51,6 +52,7 @@ def fix_file_contents(rootdir, protobuf_version: str):
 
                 # Fix imports
                 content = content.replace("from protos", "from " + package_path)
+                content = content.replace("from draft.protos", "from " + draft_package_path)
 
                 # Add ignore style check
                 content = content.replace("# -*- coding: utf-8 -*-", "# -*- coding: utf-8 -*-\n" + flake_ignore_line)

diff --git a/ydb/_grpc/v3/draft/ydb_dynamic_config_v1_pb2.py b/ydb/_grpc/v3/draft/ydb_dynamic_config_v1_pb2.py
diff --git a/ydb/_grpc/v3/draft/ydb_dynamic_config_v1_pb2_grpc.py b/ydb/_grpc/v3/draft/ydb_dynamic_config_v1_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from draft.protos import ydb_dynamic_config_pb2 as draft_dot_protos_dot_ydb__dynamic__config__pb2
+from ydb._grpc.v3.draft.protos import ydb_dynamic_config_pb2 as draft_dot_protos_dot_ydb__dynamic__config__pb2
 
 
 class DynamicConfigServiceStub(object):

diff --git a/ydb/_grpc/v3/draft/ydb_maintenance_v1_pb2.py b/ydb/_grpc/v3/draft/ydb_maintenance_v1_pb2.py
diff --git a/ydb/_grpc/v3/draft/ydb_maintenance_v1_pb2_grpc.py b/ydb/_grpc/v3/draft/ydb_maintenance_v1_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from draft.protos import ydb_maintenance_pb2 as draft_dot_protos_dot_ydb__maintenance__pb2
+from ydb._grpc.v3.draft.protos import ydb_maintenance_pb2 as draft_dot_protos_dot_ydb__maintenance__pb2
 
 
 class MaintenanceServiceStub(object):

diff --git a/ydb/_grpc/v4/draft/ydb_dynamic_config_v1_pb2.py b/ydb/_grpc/v4/draft/ydb_dynamic_config_v1_pb2.py
diff --git a/ydb/_grpc/v4/draft/ydb_dynamic_config_v1_pb2_grpc.py b/ydb/_grpc/v4/draft/ydb_dynamic_config_v1_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from draft.protos import ydb_dynamic_config_pb2 as draft_dot_protos_dot_ydb__dynamic__config__pb2
+from ydb._grpc.v4.draft.protos import ydb_dynamic_config_pb2 as draft_dot_protos_dot_ydb__dynamic__config__pb2
 
 
 class DynamicConfigServiceStub(object):

diff --git a/ydb/_grpc/v4/draft/ydb_maintenance_v1_pb2.py b/ydb/_grpc/v4/draft/ydb_maintenance_v1_pb2.py
diff --git a/ydb/_grpc/v4/draft/ydb_maintenance_v1_pb2_grpc.py b/ydb/_grpc/v4/draft/ydb_maintenance_v1_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from draft.protos import ydb_maintenance_pb2 as draft_dot_protos_dot_ydb__maintenance__pb2
+from ydb._grpc.v4.draft.protos import ydb_maintenance_pb2 as draft_dot_protos_dot_ydb__maintenance__pb2
 
 
 class MaintenanceServiceStub(object):