Automated Code Change

PiperOrigin-RevId: 941604731

Author: h-joo

openhtf/core/diagnoses_lib.py

@@ -229,7 +229,7 @@ def execute_phase_diagnoser(self, diagnoser: 'BasePhaseDiagnoser',
       test_rec: test_record.TestRecord, the current running test's record.
     """
     diagnosis_or_diagnoses = diagnoser.run(phase_state.phase_record)
-    for diag in self._convert_result(diagnosis_or_diagnoses, diagnoser):
+    for diag in self._convert_result(diagnosis_or_diagnoses, diagnoser):  # pyrefly: ignore[bad-argument-type]
       phase_state.add_diagnosis(diag)
       # Internal diagnosers are not saved to the test record because they are
       # not serialized.
@@ -249,7 +249,7 @@ def execute_test_diagnoser(self, diagnoser: 'BaseTestDiagnoser',
       InvalidDiagnosisError: when the diagnoser returns an Internal diagnosis.
     """
     diagnosis_or_diagnoses = diagnoser.run(test_rec, self.store)
-    for diag in self._convert_result(diagnosis_or_diagnoses, diagnoser):
+    for diag in self._convert_result(diagnosis_or_diagnoses, diagnoser):  # pyrefly: ignore[bad-argument-type]
       if diag.is_internal:
         raise InvalidDiagnosisError(
             'Test-level diagnosis {} cannot be Internal'.format(diag))
@@ -315,7 +315,7 @@ def as_base_types(self) -> Dict[Text, Any]:
         'possible_results': self.possible_results,
     }
     if self.always_fail:
-      ret.update(always_fail=True)
+      ret.update(always_fail=True)  # pyrefly: ignore[bad-argument-type]
     return ret
 
   @property
@@ -326,7 +326,7 @@ def _check_definition(self) -> None:
     """Internal function to verify that the diagnoser is completely defined."""
 
 
-class BasePhaseDiagnoser(_BaseDiagnoser, abc.ABC):
+class BasePhaseDiagnoser(_BaseDiagnoser, abc.ABC):  # pyrefly: ignore[bad-class-definition]
   """Base class for using an object to define a Phase diagnoser."""
 
   __slots__ = ()
@@ -362,20 +362,20 @@ def __call__(
           'Fully defined diagnoser cannot decorate another function.')
     changes = dict(run_func=func)
     if not self.name:
-      changes['name'] = func.__name__
+      changes['name'] = func.__name__  # pyrefly: ignore[bad-assignment]
     return attr.evolve(self, **changes)
 
   def run(self, phase_record: test_record.PhaseRecord) -> DiagnoserReturnT:
     """Runs the phase diagnoser and returns the diagnoses."""
-    return self._run_func(phase_record)
+    return self._run_func(phase_record)  # pyrefly: ignore[not-callable]
 
   def _check_definition(self) -> None:
     if not self._run_func:
       raise DiagnoserError(
           'PhaseDiagnoser run function not defined for {}'.format(self.name))
 
 
-class BaseTestDiagnoser(_BaseDiagnoser, abc.ABC):
+class BaseTestDiagnoser(_BaseDiagnoser, abc.ABC):  # pyrefly: ignore[bad-class-definition]
   """Base class for using an object to define a Test diagnoser."""
 
   __slots__ = ()
@@ -416,13 +416,13 @@ def __call__(
           'Fully defined diagnoser cannot decorate another function.')
     changes = dict(run_func=func)
     if not self.name:
-      changes['name'] = func.__name__
+      changes['name'] = func.__name__  # pyrefly: ignore[bad-assignment]
     return attr.evolve(self, **changes)
 
   def run(self, test_rec: test_record.TestRecord,
           diagnoses_store: DiagnosesStore) -> DiagnoserReturnT:
     """Runs the test diagnoser and returns the diagnoses."""
-    return self._run_func(test_rec, diagnoses_store)
+    return self._run_func(test_rec, diagnoses_store)  # pyrefly: ignore[not-callable]
 
   def _check_definition(self) -> None:
     if not self._run_func:

openhtf/core/measurements.py

@@ -236,7 +236,7 @@ class Measurement(object):
   _cached = attr.ib(type=Optional[Dict[Text, Any]], default=None)
 
   def __attrs_pre_init__(self, name: Text, *args: Any, **kwargs: Any) -> None:
-    del(args, kwargs)
+    del(args, kwargs)  # pyrefly: ignore[unsupported-delete]
     if name in _RESERVED_MEASUREMENT_NAMES:
       raise ReservedMeasurementNameError(
           f'Measurement name {name} is reserved for internal use.'
@@ -308,7 +308,7 @@ def set_notification_callback(
     """Set the notifier we'll call when measurements are set."""
     self._notification_cb = notification_cb
     if not notification_cb and self.dimensions:
-      self._measured_value.notify_value_set = None
+      self._measured_value.notify_value_set = None  # pyrefly: ignore[missing-attribute]
     return self
 
   def notify_value_set(self) -> None:
@@ -495,7 +495,7 @@ def to_dataframe(self, columns: Any = None) -> Any:
           'Only a dimensioned measurement can be converted to a DataFrame')
 
     if columns is None:
-      columns = [d.name for d in self.dimensions]
+      columns = [d.name for d in self.dimensions]  # pyrefly: ignore[not-iterable]
       columns += [self.units.name if self.units else 'value']
 
     dataframe = self._measured_value.to_dataframe(columns)
@@ -518,7 +518,7 @@ def from_dataframe(self, dataframe: Any, metric_column: str) -> None:
       raise TypeError(
           'Only a dimensioned measurement can be set from a DataFrame'
       )
-    dimension_labels = [d.name for d in self.dimensions]
+    dimension_labels = [d.name for d in self.dimensions]  # pyrefly: ignore[not-iterable]
     dimensioned_df = dataframe.reset_index()
     try:
       dimensioned_df.set_index(dimension_labels, inplace=True)
@@ -561,12 +561,12 @@ class MeasuredValue(object):
   def __str__(self) -> Text:
     return str(self.value) if self.is_value_set else 'UNSET'
 
-  def __eq__(self, other: 'MeasuredValue') -> bool:
+  def __eq__(self, other: 'MeasuredValue') -> bool:  # pyrefly: ignore[bad-override]
     return (type(self) == type(other) and self.name == other.name and  # pylint: disable=unidiomatic-typecheck
             self.is_value_set == other.is_value_set
             and self.stored_value == other.stored_value)
 
-  def __ne__(self, other: 'MeasuredValue') -> bool:
+  def __ne__(self, other: 'MeasuredValue') -> bool:  # pyrefly: ignore[bad-override]
     return not self.__eq__(other)
 
   @property
@@ -621,10 +621,10 @@ def __attrs_post_init__(self) -> None:
         'suffix': self.suffix,
     })
 
-  def __eq__(self, other: 'Dimension') -> bool:
+  def __eq__(self, other: 'Dimension') -> bool:  # pyrefly: ignore[bad-override]
     return self.description == other.description and self.unit == other.unit
 
-  def __ne__(self, other: 'Dimension') -> bool:
+  def __ne__(self, other: 'Dimension') -> bool:  # pyrefly: ignore[bad-override]
     return not self == other
 
   def __repr__(self) -> Text:
@@ -633,17 +633,17 @@ def __repr__(self) -> Text:
   @classmethod
   def from_unit_descriptor(cls,
                            unit_desc: util_units.UnitDescriptor) -> 'Dimension':
-    return cls(unit=unit_desc)
+    return cls(unit=unit_desc)  # pyrefly: ignore[unexpected-keyword]
 
   @classmethod
   def from_string(cls, string: Text) -> 'Dimension':
     """Convert a string into a Dimension."""
     # Note: There is some ambiguity as to whether the string passed is intended
     # to become a unit looked up by name or suffix, or a Dimension descriptor.
     if string in util_units.UNITS_BY_ALL:
-      return cls(description=string, unit=util_units.Unit(string))
+      return cls(description=string, unit=util_units.Unit(string))  # pyrefly: ignore[unexpected-keyword]
     else:
-      return cls(description=string)
+      return cls(description=string)  # pyrefly: ignore[unexpected-keyword]
 
   @property
   def description(self) -> Text:
@@ -729,7 +729,7 @@ def __setitem__(self, coordinates: Any, value: Any) -> None:
         _LOG.warning(
             'Overriding previous measurement %s[%s] value of %s with %s',
             self.name, coordinates, self.value_dict[coordinates], value)
-        self._cached_basetype_values = None
+        self._cached_basetype_values = None  # pyrefly: ignore[bad-assignment]
       elif self._cached_basetype_values is not None:
         self._cached_basetype_values.append(
             data.convert_to_base_types(coordinates + (value,)))
@@ -774,7 +774,7 @@ def value(self) -> List[Any]:
 
   def basetype_value(self) -> List[Any]:
     if self._cached_basetype_values is None:
-      self._cached_basetype_values = list(
+      self._cached_basetype_values = list(  # pyrefly: ignore[bad-assignment]
           data.convert_to_base_types(coordinates + (value,))
           for coordinates, value in self.value_dict.items())
     return self._cached_basetype_values

openhtf/core/phase_collections.py

@@ -51,7 +51,7 @@ def _recursive_flatten(n: Any) -> Iterator[phase_nodes.PhaseNode]:
   elif isinstance(n, phase_nodes.PhaseNode):
     yield n.copy()
   elif isinstance(n, phase_descriptor.PhaseDescriptor) or callable(n):
-    yield phase_descriptor.PhaseDescriptor.wrap_or_copy(n)
+    yield phase_descriptor.PhaseDescriptor.wrap_or_copy(n)  # pyrefly: ignore[bad-argument-type]
   else:
     raise ValueError('Cannot flatten {}'.format(n))
 
@@ -225,7 +225,7 @@ def check_for_duplicate_subtest_names(sequence: PhaseSequence):
       collections.defaultdict(list)
   )
   for subtest in sequence.filter_by_type(Subtest):
-    names_to_subtests[subtest.name].append(subtest)
+    names_to_subtests[subtest.name].append(subtest)  # pyrefly: ignore[bad-index]
 
   duplicates: list[str] = []
   for name, subtests in names_to_subtests.items():

openhtf/core/phase_descriptor.py

@@ -200,7 +200,7 @@ class PhaseDescriptor(phase_nodes.PhaseNode):
   func = attr.ib(type=PhaseCallableT)
   func_location = attr.ib(type=Text)
 
-  @func_location.default
+  @func_location.default  # pyrefly: ignore[missing-attribute]
   def _func_location(self):
     """Assigns this field assuming func is a function or callable instance."""
     obj = self.func
@@ -215,7 +215,7 @@ def _func_location(self):
         return '<unknown>'
       obj = obj.__class__
     try:
-      filename = os.path.basename(inspect.getsourcefile(obj))
+      filename = os.path.basename(inspect.getsourcefile(obj))  # pyrefly: ignore[no-matching-overload]
       line_number = inspect.getsourcelines(obj)[1]
     except TypeError:
       return name + ' <builtin>'
@@ -256,7 +256,7 @@ def wrap_or_copy(cls, func: PhaseT, **options: Any) -> 'PhaseDescriptor':
       # or kwargs.  See with_args() below for more details.
       retval = data.attr_copy(func)
     else:
-      retval = cls(func)
+      retval = cls(func)  # pyrefly: ignore[missing-argument]
     retval.options.update(**options)
     return retval
 
@@ -390,7 +390,7 @@ def __call__(self,
     kwargs.update(self.extra_kwargs)
     kwargs.update(
         running_test_state.plug_manager.provide_plugs(
-            (plug.name, plug.cls) for plug in self.plugs if plug.update_kwargs))
+            (plug.name, plug.cls) for plug in self.plugs if plug.update_kwargs))  # pyrefly: ignore[bad-argument-type]
 
     # Pass in test_api if the phase takes *args, or **kwargs with at least 1
     # positional, or more positional args than we have keyword args.
@@ -460,20 +460,20 @@ def _maybe_make(
   if 'outcome' in kwargs:
     raise ValueError('Cannot specify outcome in measurement declaration!')
 
-  measurements = [_maybe_make(meas) for meas in measurements]
+  measurements = [_maybe_make(meas) for meas in measurements]  # pyrefly: ignore[bad-assignment]
 
   # 'measurements' is guaranteed to be a list of Measurement objects here.
   def decorate(wrapped_phase: PhaseT) -> PhaseDescriptor:
     """Phase decorator to be returned."""
     phase = PhaseDescriptor.wrap_or_copy(wrapped_phase)
     duplicate_names = (
-        set(m.name for m in measurements)
+        set(m.name for m in measurements)  # pyrefly: ignore[missing-attribute]
         & set(m.name for m in phase.measurements))
     if duplicate_names:
       raise core_measurements.DuplicateNameError('Measurement names duplicated',
                                                  duplicate_names)
 
-    phase.measurements.extend(measurements)
+    phase.measurements.extend(measurements)  # pyrefly: ignore[bad-argument-type]
     return phase
 
   return decorate

openhtf/core/phase_executor.py

@@ -191,7 +191,7 @@ def _log_exception(self, *args: Any) -> Any:
     """Log exception, while allowing unit testing to override."""
     self._test_state.state_logger.critical(*args)
 
-  def _thread_exception(self, *args) -> bool:
+  def _thread_exception(self, *args) -> bool:  # pyrefly: ignore[bad-override]
     self._phase_execution_outcome = PhaseExecutionOutcome(ExceptionInfo(*args))
     self._log_exception('Phase %s raised an exception', self._phase_desc.name)
     return True  # Never propagate exceptions upward.
@@ -222,7 +222,7 @@ def join_or_die(self) -> PhaseExecutionOutcome:
     return PhaseExecutionOutcome(threads.ThreadTerminationError())
 
   @property
-  def name(self) -> Text:
+  def name(self) -> Text:  # pyrefly: ignore[bad-override]
     return str(self)
 
   def __str__(self) -> Text:
@@ -349,7 +349,7 @@ def _execute_phase_once(
         self._current_phase_thread = phase_thread
 
       phase_state.result = phase_thread.join_or_die()
-      if phase_state.result.is_repeat and is_last_repeat:
+      if phase_state.result.is_repeat and is_last_repeat:  # pyrefly: ignore[missing-attribute]
         self.logger.error('Phase returned REPEAT, exceeding repeat_limit.')
         phase_state.hit_repeat_limit = True
         override_result = PhaseExecutionOutcome(
@@ -360,8 +360,8 @@ def _execute_phase_once(
     # or phase diagnoser raised an exception.
     result = override_result or phase_state.result
     self.logger.debug('Phase %s finished with result %r', phase_desc.name,
-                      result.phase_result)
-    return (result,
+                      result.phase_result)  # pyrefly: ignore[missing-attribute]
+    return (result,  # pyrefly: ignore[bad-return]
             phase_thread.get_profile_stats() if run_with_profiling else None)
 
   def skip_phase(self, phase_desc: phase_descriptor.PhaseDescriptor,

openhtf/core/test_descriptor.py

@@ -324,7 +324,7 @@ def trigger_phase(test):
         trigger = test_start
 
       if CONF.capture_source:
-        trigger.code_info = htf_test_record.CodeInfo.for_function(trigger.func)
+        trigger.code_info = htf_test_record.CodeInfo.for_function(trigger.func)  # pyrefly: ignore[missing-attribute]
 
       self._executor = test_executor.TestExecutor(
           self._test_desc,
@@ -359,7 +359,7 @@ def trigger_phase(test):
         _LOG.debug('Test completed for %s, outputting now.',
                    final_state.test_record.metadata['test_name'])
         test_executor.combine_profile_stats(self._executor.phase_profile_stats,
-                                            profile_filename)
+                                            profile_filename)  # pyrefly: ignore[bad-argument-type]
         for output_cb in self._test_options.output_callbacks:
           try:
             output_cb(final_state.test_record)
@@ -375,9 +375,9 @@ def trigger_phase(test):
             console_output.error_print(detail.description)
         else:
           colors = collections.defaultdict(lambda: colorama.Style.BRIGHT)
-          colors[htf_test_record.Outcome.PASS] = ''.join(
+          colors[htf_test_record.Outcome.PASS] = ''.join(  # pyrefly: ignore[no-matching-overload]
               (colorama.Style.BRIGHT, colorama.Fore.GREEN))  # pytype: disable=wrong-arg-types
-          colors[htf_test_record.Outcome.FAIL] = ''.join(
+          colors[htf_test_record.Outcome.FAIL] = ''.join(  # pyrefly: ignore[no-matching-overload]
               (colorama.Style.BRIGHT, colorama.Fore.RED))  # pytype: disable=wrong-arg-types
           msg_template = (
               'test: {name}  outcome: {color}{outcome}{marginal}{rst}')
@@ -387,7 +387,7 @@ def trigger_phase(test):
                   color=(colorama.Fore.YELLOW
                          if final_state.test_record.marginal else
                          colors[final_state.test_record.outcome]),
-                  outcome=final_state.test_record.outcome.name,
+                  outcome=final_state.test_record.outcome.name,  # pyrefly: ignore[missing-attribute]
                   marginal=(' (MARGINAL)'
                             if final_state.test_record.marginal else ''),
                   rst=colorama.Style.RESET_ALL))
@@ -503,7 +503,7 @@ class TestApi(object):
 
   @property
   def dut_id(self) -> Text:
-    return self.test_record.dut_id
+    return self.test_record.dut_id  # pyrefly: ignore[bad-return]
 
   @dut_id.setter
   def dut_id(self, dut_id: Text) -> None:

openhtf/core/test_executor.py

@@ -107,7 +107,7 @@ def __init__(self, test_descriptor: 'test_descriptor.TestDescriptor',
     self._phase_exec = None  # type: Optional[phase_executor.PhaseExecutor]
     self.uid = execution_uid
     self._last_outcome = None  # type: Optional[phase_executor.PhaseExecutionOutcome]
-    self._last_execution_unit: str = None
+    self._last_execution_unit: str = None  # pyrefly: ignore[bad-assignment]
     self._abort = threading.Event()
     self._full_abort = threading.Event()
     self._execution_finished = threading.Event()
@@ -248,7 +248,7 @@ def _initialize_plugs(
     """
     try:
       self.running_test_state.plug_manager.initialize_plugs(
-          plug_types=plug_types
+          plug_types=plug_types  # pyrefly: ignore[bad-argument-type]
       )
       return False
     except Exception:  # pylint: disable=broad-except
@@ -277,7 +277,7 @@ def _execute_test_start(self) -> bool:
     # Have the phase executor run the start trigger phase. Do partial plug
     # initialization for just the plugs needed by the start trigger phase.
     if self._initialize_plugs(
-        plug_types=[phase_plug.cls for phase_plug in self._test_start.plugs]):
+        plug_types=[phase_plug.cls for phase_plug in self._test_start.plugs]):  # pyrefly: ignore[bad-argument-type]
       return True
 
     outcome, profile_stats = self.phase_executor.execute_phase(
@@ -493,7 +493,7 @@ def _subtest_context(
         outcome=test_record.SubtestOutcome.PASS)
     yield subtest_rec
     subtest_rec.end_time_millis = util.time_millis()
-    self.test_state.test_record.add_subtest_record(subtest_rec)
+    self.test_state.test_record.add_subtest_record(subtest_rec)  # pyrefly: ignore[missing-attribute]
 
   def _execute_subtest(self, subtest: phase_collections.Subtest,
                        outer_subtest_rec: Optional[test_record.SubtestRecord],

openhtf/core/test_record.py

@@ -106,7 +106,7 @@ def close(self):
     if not self._filename:
       return
     os.remove(self._filename)
-    self._filename = None
+    self._filename = None  # pyrefly: ignore[bad-assignment]
 
   def _asdict(self) -> Dict[Text, Any]:
     # Don't include the attachment data when converting to dict.