Skip to content

Commit f66380d

Browse files
herin049herin049
committed
update utils import
1 parent 12fa386 commit f66380d

11 files changed

Lines changed: 402 additions & 400 deletions

File tree

‎codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json/generator.py‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,7 @@ def _generate_imports(
293293

294294
# Collect all imports needed
295295
imports = self._collect_imports(proto_file)
296-
297-
# Import the generated utility module
298-
utils_module = self._get_utils_module_path()
299-
imports.add(f"import {utils_module} as _utils")
296+
imports.add(f"import {self._get_utils_module_path()}")
300297

301298
# Generate cross file imports
302299
if imports:
@@ -464,8 +461,9 @@ def _generate_to_dict(
464461
f'_result["{field.json_name}"] = self.{field.name}'
465462
)
466463
else:
464+
utils = self._get_utils_module_path()
467465
writer.writeln(
468-
f'_result["{field.json_name}"] = _utils.encode_repeated('
466+
f'_result["{field.json_name}"] = {utils}.encode_repeated('
469467
f"self.{field.name}, lambda _v: {item_expr})"
470468
)
471469
else:
@@ -518,21 +516,22 @@ def _get_serialization_expr(
518516
self, field_type: ProtoType, field_name: str, var_name: str
519517
) -> str:
520518
"""Get the Python expression to serialize a value of a given type."""
519+
utils = self._get_utils_module_path()
521520
if field_type.is_message:
522521
return f"{var_name}.to_dict()"
523522
if field_type.is_enum:
524523
return f"builtins.int({var_name})"
525524
if is_hex_encoded_field(field_name):
526-
return f"_utils.encode_hex({var_name})"
525+
return f"{utils}.encode_hex({var_name})"
527526
if is_int64_type(field_type.proto_type):
528-
return f"_utils.encode_int64({var_name})"
527+
return f"{utils}.encode_int64({var_name})"
529528
if is_bytes_type(field_type.proto_type):
530-
return f"_utils.encode_base64({var_name})"
529+
return f"{utils}.encode_base64({var_name})"
531530
if field_type.proto_type in (
532531
descriptor.FieldDescriptorProto.TYPE_FLOAT,
533532
descriptor.FieldDescriptorProto.TYPE_DOUBLE,
534533
):
535-
return f"_utils.encode_float({var_name})"
534+
return f"{utils}.encode_float({var_name})"
536535

537536
return var_name
538537

@@ -557,7 +556,8 @@ def _generate_from_dict(
557556
f" {message.name} instance",
558557
]
559558
)
560-
writer.writeln('_utils.validate_type(data, builtins.dict, "data")')
559+
utils = self._get_utils_module_path()
560+
writer.writeln(f'{utils}.validate_type(data, builtins.dict, "data")')
561561
writer.writeln("_args = {}")
562562
writer.blank_line()
563563

@@ -582,7 +582,7 @@ def _generate_from_dict(
582582
field_type, field.name, "_v", message
583583
)
584584
writer.writeln(
585-
f'_args["{field.name}"] = _utils.decode_repeated('
585+
f'_args["{field.name}"] = {utils}.decode_repeated('
586586
f'_value, lambda _v: {item_expr}, "{field.name}")'
587587
)
588588
else:
@@ -640,6 +640,7 @@ def _generate_deserialization_statements(
640640
) -> None:
641641
"""Generate validation and assignment statements for a field."""
642642
field_type = field.field_type
643+
utils = self._get_utils_module_path()
643644
if field_type.is_message and (type_name := field_type.type_name):
644645
msg_type = self._resolve_message_type(type_name, message)
645646
writer.writeln(
@@ -648,36 +649,36 @@ def _generate_deserialization_statements(
648649
elif field_type.is_enum and (type_name := field_type.type_name):
649650
enum_type = self._resolve_enum_type(type_name, message)
650651
writer.writeln(
651-
f'_utils.validate_type({var_name}, builtins.int, "{field.name}")'
652+
f'{utils}.validate_type({var_name}, builtins.int, "{field.name}")'
652653
)
653654
writer.writeln(
654655
f'{target_dict}["{field.name}"] = {enum_type}({var_name})'
655656
)
656657
elif is_hex_encoded_field(field.name):
657658
writer.writeln(
658-
f'{target_dict}["{field.name}"] = _utils.decode_hex({var_name}, "{field.name}")'
659+
f'{target_dict}["{field.name}"] = {utils}.decode_hex({var_name}, "{field.name}")'
659660
)
660661
elif is_int64_type(field_type.proto_type):
661662
writer.writeln(
662-
f'{target_dict}["{field.name}"] = _utils.decode_int64({var_name}, "{field.name}")'
663+
f'{target_dict}["{field.name}"] = {utils}.decode_int64({var_name}, "{field.name}")'
663664
)
664665
elif is_bytes_type(field_type.proto_type):
665666
writer.writeln(
666-
f'{target_dict}["{field.name}"] = _utils.decode_base64({var_name}, "{field.name}")'
667+
f'{target_dict}["{field.name}"] = {utils}.decode_base64({var_name}, "{field.name}")'
667668
)
668669
elif field_type.proto_type in (
669670
descriptor.FieldDescriptorProto.TYPE_FLOAT,
670671
descriptor.FieldDescriptorProto.TYPE_DOUBLE,
671672
):
672673
writer.writeln(
673-
f'{target_dict}["{field.name}"] = _utils.decode_float({var_name}, "{field.name}")'
674+
f'{target_dict}["{field.name}"] = {utils}.decode_float({var_name}, "{field.name}")'
674675
)
675676
else:
676677
allowed_types = get_json_allowed_types(
677678
field_type.proto_type, field.name
678679
)
679680
writer.writeln(
680-
f'_utils.validate_type({var_name}, {allowed_types}, "{field.name}")'
681+
f'{utils}.validate_type({var_name}, {allowed_types}, "{field.name}")'
681682
)
682683
writer.writeln(f'{target_dict}["{field.name}"] = {var_name}')
683684

@@ -689,23 +690,24 @@ def _get_deserialization_expr(
689690
context: MessageInfo,
690691
) -> str:
691692
"""Get the Python expression to deserialize a value of a given type."""
693+
utils = self._get_utils_module_path()
692694
if field_type.is_message and (type_name := field_type.type_name):
693695
msg_type = self._resolve_message_type(type_name, context)
694696
return f"{msg_type}.from_dict({var_name})"
695697
if field_type.is_enum and (type_name := field_type.type_name):
696698
enum_type = self._resolve_enum_type(type_name, context)
697699
return f"{enum_type}({var_name})"
698700
if is_hex_encoded_field(field_name):
699-
return f'_utils.decode_hex({var_name}, "{field_name}")'
701+
return f'{utils}.decode_hex({var_name}, "{field_name}")'
700702
if is_int64_type(field_type.proto_type):
701-
return f'_utils.decode_int64({var_name}, "{field_name}")'
703+
return f'{utils}.decode_int64({var_name}, "{field_name}")'
702704
if is_bytes_type(field_type.proto_type):
703-
return f'_utils.decode_base64({var_name}, "{field_name}")'
705+
return f'{utils}.decode_base64({var_name}, "{field_name}")'
704706
if field_type.proto_type in (
705707
descriptor.FieldDescriptorProto.TYPE_FLOAT,
706708
descriptor.FieldDescriptorProto.TYPE_DOUBLE,
707709
):
708-
return f'_utils.decode_float({var_name}, "{field_name}")'
710+
return f'{utils}.decode_float({var_name}, "{field_name}")'
709711

710712
return var_name
711713

‎opentelemetry-proto-json/src/opentelemetry/proto_json/collector/logs/v1/logs_service.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
else:
3030
_dataclass = dataclasses.dataclass
3131

32-
import opentelemetry.proto_json._otlp_json_utils as _utils
32+
import opentelemetry.proto_json._otlp_json_utils
3333
import opentelemetry.proto_json.logs.v1.logs
3434

3535

@@ -51,7 +51,7 @@ def to_dict(self) -> builtins.dict[builtins.str, typing.Any]:
5151
"""
5252
_result = {}
5353
if self.resource_logs:
54-
_result["resourceLogs"] = _utils.encode_repeated(self.resource_logs, lambda _v: _v.to_dict())
54+
_result["resourceLogs"] = opentelemetry.proto_json._otlp_json_utils.encode_repeated(self.resource_logs, lambda _v: _v.to_dict())
5555
return _result
5656

5757
def to_json(self) -> builtins.str:
@@ -74,11 +74,11 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportLogs
7474
Returns:
7575
ExportLogsServiceRequest instance
7676
"""
77-
_utils.validate_type(data, builtins.dict, "data")
77+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
7878
_args = {}
7979

8080
if (_value := data.get("resourceLogs")) is not None:
81-
_args["resource_logs"] = _utils.decode_repeated(_value, lambda _v: opentelemetry.proto_json.logs.v1.logs.ResourceLogs.from_dict(_v), "resource_logs")
81+
_args["resource_logs"] = opentelemetry.proto_json._otlp_json_utils.decode_repeated(_value, lambda _v: opentelemetry.proto_json.logs.v1.logs.ResourceLogs.from_dict(_v), "resource_logs")
8282

8383
return cls(**_args)
8484

@@ -137,7 +137,7 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportLogs
137137
Returns:
138138
ExportLogsServiceResponse instance
139139
"""
140-
_utils.validate_type(data, builtins.dict, "data")
140+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
141141
_args = {}
142142

143143
if (_value := data.get("partialSuccess")) is not None:
@@ -178,7 +178,7 @@ def to_dict(self) -> builtins.dict[builtins.str, typing.Any]:
178178
"""
179179
_result = {}
180180
if self.rejected_log_records:
181-
_result["rejectedLogRecords"] = _utils.encode_int64(self.rejected_log_records)
181+
_result["rejectedLogRecords"] = opentelemetry.proto_json._otlp_json_utils.encode_int64(self.rejected_log_records)
182182
if self.error_message:
183183
_result["errorMessage"] = self.error_message
184184
return _result
@@ -203,13 +203,13 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportLogs
203203
Returns:
204204
ExportLogsPartialSuccess instance
205205
"""
206-
_utils.validate_type(data, builtins.dict, "data")
206+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
207207
_args = {}
208208

209209
if (_value := data.get("rejectedLogRecords")) is not None:
210-
_args["rejected_log_records"] = _utils.decode_int64(_value, "rejected_log_records")
210+
_args["rejected_log_records"] = opentelemetry.proto_json._otlp_json_utils.decode_int64(_value, "rejected_log_records")
211211
if (_value := data.get("errorMessage")) is not None:
212-
_utils.validate_type(_value, builtins.str, "error_message")
212+
opentelemetry.proto_json._otlp_json_utils.validate_type(_value, builtins.str, "error_message")
213213
_args["error_message"] = _value
214214

215215
return cls(**_args)

‎opentelemetry-proto-json/src/opentelemetry/proto_json/collector/metrics/v1/metrics_service.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
else:
3030
_dataclass = dataclasses.dataclass
3131

32-
import opentelemetry.proto_json._otlp_json_utils as _utils
32+
import opentelemetry.proto_json._otlp_json_utils
3333
import opentelemetry.proto_json.metrics.v1.metrics
3434

3535

@@ -51,7 +51,7 @@ def to_dict(self) -> builtins.dict[builtins.str, typing.Any]:
5151
"""
5252
_result = {}
5353
if self.resource_metrics:
54-
_result["resourceMetrics"] = _utils.encode_repeated(self.resource_metrics, lambda _v: _v.to_dict())
54+
_result["resourceMetrics"] = opentelemetry.proto_json._otlp_json_utils.encode_repeated(self.resource_metrics, lambda _v: _v.to_dict())
5555
return _result
5656

5757
def to_json(self) -> builtins.str:
@@ -74,11 +74,11 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportMetr
7474
Returns:
7575
ExportMetricsServiceRequest instance
7676
"""
77-
_utils.validate_type(data, builtins.dict, "data")
77+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
7878
_args = {}
7979

8080
if (_value := data.get("resourceMetrics")) is not None:
81-
_args["resource_metrics"] = _utils.decode_repeated(_value, lambda _v: opentelemetry.proto_json.metrics.v1.metrics.ResourceMetrics.from_dict(_v), "resource_metrics")
81+
_args["resource_metrics"] = opentelemetry.proto_json._otlp_json_utils.decode_repeated(_value, lambda _v: opentelemetry.proto_json.metrics.v1.metrics.ResourceMetrics.from_dict(_v), "resource_metrics")
8282

8383
return cls(**_args)
8484

@@ -137,7 +137,7 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportMetr
137137
Returns:
138138
ExportMetricsServiceResponse instance
139139
"""
140-
_utils.validate_type(data, builtins.dict, "data")
140+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
141141
_args = {}
142142

143143
if (_value := data.get("partialSuccess")) is not None:
@@ -178,7 +178,7 @@ def to_dict(self) -> builtins.dict[builtins.str, typing.Any]:
178178
"""
179179
_result = {}
180180
if self.rejected_data_points:
181-
_result["rejectedDataPoints"] = _utils.encode_int64(self.rejected_data_points)
181+
_result["rejectedDataPoints"] = opentelemetry.proto_json._otlp_json_utils.encode_int64(self.rejected_data_points)
182182
if self.error_message:
183183
_result["errorMessage"] = self.error_message
184184
return _result
@@ -203,13 +203,13 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportMetr
203203
Returns:
204204
ExportMetricsPartialSuccess instance
205205
"""
206-
_utils.validate_type(data, builtins.dict, "data")
206+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
207207
_args = {}
208208

209209
if (_value := data.get("rejectedDataPoints")) is not None:
210-
_args["rejected_data_points"] = _utils.decode_int64(_value, "rejected_data_points")
210+
_args["rejected_data_points"] = opentelemetry.proto_json._otlp_json_utils.decode_int64(_value, "rejected_data_points")
211211
if (_value := data.get("errorMessage")) is not None:
212-
_utils.validate_type(_value, builtins.str, "error_message")
212+
opentelemetry.proto_json._otlp_json_utils.validate_type(_value, builtins.str, "error_message")
213213
_args["error_message"] = _value
214214

215215
return cls(**_args)

‎opentelemetry-proto-json/src/opentelemetry/proto_json/collector/profiles/v1development/profiles_service.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
else:
3030
_dataclass = dataclasses.dataclass
3131

32-
import opentelemetry.proto_json._otlp_json_utils as _utils
32+
import opentelemetry.proto_json._otlp_json_utils
3333
import opentelemetry.proto_json.profiles.v1development.profiles
3434

3535

@@ -52,7 +52,7 @@ def to_dict(self) -> builtins.dict[builtins.str, typing.Any]:
5252
"""
5353
_result = {}
5454
if self.resource_profiles:
55-
_result["resourceProfiles"] = _utils.encode_repeated(self.resource_profiles, lambda _v: _v.to_dict())
55+
_result["resourceProfiles"] = opentelemetry.proto_json._otlp_json_utils.encode_repeated(self.resource_profiles, lambda _v: _v.to_dict())
5656
if self.dictionary:
5757
_result["dictionary"] = self.dictionary.to_dict()
5858
return _result
@@ -77,11 +77,11 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportProf
7777
Returns:
7878
ExportProfilesServiceRequest instance
7979
"""
80-
_utils.validate_type(data, builtins.dict, "data")
80+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
8181
_args = {}
8282

8383
if (_value := data.get("resourceProfiles")) is not None:
84-
_args["resource_profiles"] = _utils.decode_repeated(_value, lambda _v: opentelemetry.proto_json.profiles.v1development.profiles.ResourceProfiles.from_dict(_v), "resource_profiles")
84+
_args["resource_profiles"] = opentelemetry.proto_json._otlp_json_utils.decode_repeated(_value, lambda _v: opentelemetry.proto_json.profiles.v1development.profiles.ResourceProfiles.from_dict(_v), "resource_profiles")
8585
if (_value := data.get("dictionary")) is not None:
8686
_args["dictionary"] = opentelemetry.proto_json.profiles.v1development.profiles.ProfilesDictionary.from_dict(_value)
8787

@@ -142,7 +142,7 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportProf
142142
Returns:
143143
ExportProfilesServiceResponse instance
144144
"""
145-
_utils.validate_type(data, builtins.dict, "data")
145+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
146146
_args = {}
147147

148148
if (_value := data.get("partialSuccess")) is not None:
@@ -183,7 +183,7 @@ def to_dict(self) -> builtins.dict[builtins.str, typing.Any]:
183183
"""
184184
_result = {}
185185
if self.rejected_profiles:
186-
_result["rejectedProfiles"] = _utils.encode_int64(self.rejected_profiles)
186+
_result["rejectedProfiles"] = opentelemetry.proto_json._otlp_json_utils.encode_int64(self.rejected_profiles)
187187
if self.error_message:
188188
_result["errorMessage"] = self.error_message
189189
return _result
@@ -208,13 +208,13 @@ def from_dict(cls, data: builtins.dict[builtins.str, typing.Any]) -> "ExportProf
208208
Returns:
209209
ExportProfilesPartialSuccess instance
210210
"""
211-
_utils.validate_type(data, builtins.dict, "data")
211+
opentelemetry.proto_json._otlp_json_utils.validate_type(data, builtins.dict, "data")
212212
_args = {}
213213

214214
if (_value := data.get("rejectedProfiles")) is not None:
215-
_args["rejected_profiles"] = _utils.decode_int64(_value, "rejected_profiles")
215+
_args["rejected_profiles"] = opentelemetry.proto_json._otlp_json_utils.decode_int64(_value, "rejected_profiles")
216216
if (_value := data.get("errorMessage")) is not None:
217-
_utils.validate_type(_value, builtins.str, "error_message")
217+
opentelemetry.proto_json._otlp_json_utils.validate_type(_value, builtins.str, "error_message")
218218
_args["error_message"] = _value
219219

220220
return cls(**_args)

0 commit comments

Comments
 (0)