Skip to content

Commit a0a70db

Browse files
KirillKurdyukovcursoragent
KirillKurdyukov
and
cursoragent
committed
Fix leftover merge conflict markers in v6 gRPC stubs
Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent df4f0a4 commit a0a70db

48 files changed

Lines changed: 0 additions & 1092 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ydb/_grpc/v6/draft/protos/ydb_dynamic_config_pb2_grpc.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
<<<<<<< HEAD
5-
import warnings
6-
7-
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/protos/ydb_dynamic_config_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)

‎ydb/_grpc/v6/draft/protos/ydb_federated_query_pb2_grpc.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
<<<<<<< HEAD
5-
import warnings
6-
7-
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/protos/ydb_federated_query_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)

‎ydb/_grpc/v6/draft/protos/ydb_keyvalue_pb2_grpc.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
<<<<<<< HEAD
5-
import warnings
6-
7-
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/protos/ydb_keyvalue_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)

‎ydb/_grpc/v6/draft/protos/ydb_maintenance_pb2_grpc.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
<<<<<<< HEAD
5-
import warnings
6-
7-
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/protos/ydb_maintenance_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)

‎ydb/_grpc/v6/draft/protos/ydb_object_storage_pb2_grpc.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
<<<<<<< HEAD
5-
import warnings
6-
7-
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/protos/ydb_object_storage_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)

‎ydb/_grpc/v6/draft/ydb_dynamic_config_v1_pb2_grpc.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,6 @@
44

55
from ydb._grpc.v6.draft.protos import ydb_dynamic_config_pb2 as draft_dot_protos_dot_ydb__dynamic__config__pb2
66

7-
<<<<<<< HEAD
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/ydb_dynamic_config_v1_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)
287

298

309
class DynamicConfigServiceStub(object):

‎ydb/_grpc/v6/draft/ydb_federated_query_v1_pb2_grpc.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,6 @@
44

55
from ydb._grpc.v6.draft.protos import ydb_federated_query_pb2 as draft_dot_protos_dot_ydb__federated__query__pb2
66

7-
<<<<<<< HEAD
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/ydb_federated_query_v1_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)
287

298

309
class FederatedQueryServiceStub(object):

‎ydb/_grpc/v6/draft/ydb_keyvalue_v1_pb2_grpc.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,6 @@
44

55
from ydb._grpc.v6.draft.protos import ydb_keyvalue_pb2 as draft_dot_protos_dot_ydb__keyvalue__pb2
66

7-
<<<<<<< HEAD
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/ydb_keyvalue_v1_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)
287

298

309
class KeyValueServiceStub(object):

‎ydb/_grpc/v6/draft/ydb_maintenance_v1_pb2_grpc.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,6 @@
44

55
from ydb._grpc.v6.draft.protos import ydb_maintenance_pb2 as draft_dot_protos_dot_ydb__maintenance__pb2
66

7-
<<<<<<< HEAD
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/ydb_maintenance_v1_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)
287

298

309
class MaintenanceServiceStub(object):

‎ydb/_grpc/v6/draft/ydb_object_storage_v1_pb2_grpc.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,6 @@
44

55
from ydb._grpc.v6.draft.protos import ydb_object_storage_pb2 as draft_dot_protos_dot_ydb__object__storage__pb2
66

7-
<<<<<<< HEAD
8-
GRPC_GENERATED_VERSION = '1.72.1'
9-
GRPC_VERSION = grpc.__version__
10-
_version_not_supported = False
11-
12-
try:
13-
from grpc._utilities import first_version_is_lower
14-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
15-
except ImportError:
16-
_version_not_supported = True
17-
18-
if _version_not_supported:
19-
raise RuntimeError(
20-
f'The grpc package installed is at version {GRPC_VERSION},'
21-
+ f' but the generated code in draft/ydb_object_storage_v1_pb2_grpc.py depends on'
22-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
23-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
24-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
25-
)
26-
=======
27-
>>>>>>> 989b70e (Fix Copilot review issues for attach hint PR)
287

298

309
class ObjectStorageServiceStub(object):

0 commit comments

Comments
 (0)