Skip to content

Commit a9fd2dd

Browse files
vbaruavbarua
committed
refactor: update substrait.gen.proto imports to just substrait
1 parent 51ccb51 commit a9fd2dd

44 files changed

Lines changed: 124 additions & 124 deletions

Some content is hidden

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

‎examples/builder_example.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import substrait.gen.proto.algebra_pb2 as stalg
1+
import substrait.algebra_pb2 as stalg
22
from substrait.builders.extended_expression import (
33
column,
44
literal,

‎src/substrait/builders/extended_expression.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from datetime import date
33
from typing import Any, Callable, Iterable, Union
44

5-
import substrait.gen.proto.algebra_pb2 as stalg
6-
import substrait.gen.proto.extended_expression_pb2 as stee
7-
import substrait.gen.proto.extensions.extensions_pb2 as ste
8-
import substrait.gen.proto.type_pb2 as stp
5+
import substrait.algebra_pb2 as stalg
6+
import substrait.extended_expression_pb2 as stee
7+
import substrait.extensions.extensions_pb2 as ste
8+
import substrait.type_pb2 as stp
99
from substrait.extension_registry import ExtensionRegistry
1010
from substrait.type_inference import infer_extended_expression_schema
1111
from substrait.utils import (

‎src/substrait/builders/plan.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
import re
99
from typing import Callable, Iterable, Optional, Union
1010

11-
import substrait.gen.proto.algebra_pb2 as stalg
12-
import substrait.gen.proto.extended_expression_pb2 as stee
13-
import substrait.gen.proto.plan_pb2 as stp
14-
import substrait.gen.proto.type_pb2 as stt
11+
import substrait.algebra_pb2 as stalg
12+
import substrait.extended_expression_pb2 as stee
13+
import substrait.plan_pb2 as stp
14+
import substrait.type_pb2 as stt
1515
from substrait.version import __substrait_version__
1616
from substrait.builders.extended_expression import (
1717
ExtendedExpressionOrUnbound,
1818
resolve_expression,
1919
)
2020
from substrait.extension_registry import ExtensionRegistry
21-
from substrait.gen.proto.extensions.extensions_pb2 import AdvancedExtension
21+
from substrait.extensions.extensions_pb2 import AdvancedExtension
2222
from substrait.type_inference import infer_plan_schema
2323
from substrait.utils import (
2424
merge_extension_declarations,

‎src/substrait/builders/type.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Iterable
22

3-
import substrait.gen.proto.type_pb2 as stt
3+
import substrait.type_pb2 as stt
44

55

66
def boolean(nullable=True) -> stt.Type:

‎src/substrait/dataframe/expression.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import substrait.gen.proto.extended_expression_pb2 as stee
2-
import substrait.gen.proto.type_pb2 as stp
1+
import substrait.extended_expression_pb2 as stee
2+
import substrait.type_pb2 as stp
33
from substrait.builders.extended_expression import (
44
ExtendedExpressionOrUnbound,
55
UnboundExtendedExpression,

‎src/substrait/derivation_expression.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from substrait.gen.antlr.SubstraitTypeLexer import SubstraitTypeLexer
66
from substrait.gen.antlr.SubstraitTypeParser import SubstraitTypeParser
7-
from substrait.gen.proto.type_pb2 import NamedStruct, Type
7+
from substrait.type_pb2 import NamedStruct, Type
88

99

1010
def _evaluate(x, values: dict):

‎src/substrait/extension_registry/function_entry.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from substrait.derivation_expression import _parse, evaluate
77
from substrait.gen.json import simple_extensions as se
8-
from substrait.gen.proto.type_pb2 import Type
8+
from substrait.type_pb2 import Type
99

1010
from .signature_checker_helpers import covers, normalize_substrait_type_names
1111

‎src/substrait/extension_registry/registry.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import yaml
1111

1212
from substrait.bimap import UriUrnBiDiMap
13-
from substrait.gen.proto.type_pb2 import Type
13+
from substrait.type_pb2 import Type
1414
from substrait.simple_extension_utils import build_simple_extensions
1515

1616
from .function_entry import FunctionEntry, FunctionType

‎src/substrait/extension_registry/signature_checker_helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from substrait.derivation_expression import _evaluate
66
from substrait.gen.antlr.SubstraitTypeParser import SubstraitTypeParser
7-
from substrait.gen.proto.type_pb2 import Type
7+
from substrait.type_pb2 import Type
88

99
from .exceptions import UnhandledParameterizedTypeError, UnrecognizedSubstraitTypeError
1010

‎src/substrait/proto.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def _load():
88
the protocol modules with a friendly name making the protocol
99
more convenient to use.
1010
11-
substrait.gen.proto.extensions.extensions_pb2.SimpleExtensionDeclaration
11+
substrait.extensions.extensions_pb2.SimpleExtensionDeclaration
1212
becomes substrait.proto.SimpleExtensionDeclaration
1313
"""
1414
import importlib

0 commit comments

Comments
 (0)