fix(mypy): fix typing errors

aiplan4eu · Oct 14, 2024 · a0da9f8 · a0da9f8
1 parent 156ae02
commit a0da9f8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -4,6 +4,6 @@ grpcio-tools
 grpc-stubs
 pytest
 pytest-cov
-mypy
+mypy==1.12.0
 pre-commit
 black==22.6.0
diff --git a/unified_planning/model/problem.py b/unified_planning/model/problem.py
@@ -1062,11 +1062,9 @@ def update_problem_kind_metric(
             elif metric.is_minimize_action_costs():
                 assert isinstance(metric, up.model.metrics.MinimizeActionCosts)
                 self.kind.set_quality_metrics("ACTIONS_COST")
-                costs = (
-                    metric.costs.values()
-                    if metric.default is None
-                    else chain(metric.costs.values(), [metric.default])
-                )
+                costs = list(metric.costs.values())
+                if metric.default is not None:
+                    costs.append(metric.default)
                 for cost in costs:
                     if cost is None:
                         raise UPProblemDefinitionError(

diff --git a/unified_planning/model/walkers/type_checker.py b/unified_planning/model/walkers/type_checker.py
@@ -263,8 +263,12 @@ def walk_minus(self, expression, args):
         if upper == float("inf"):
             upper = None
         if has_real:
+            lower = cast(Optional[Fraction], lower)
+            upper = cast(Optional[Fraction], upper)
             return self.environment.type_manager.RealType(lower, upper)
         else:
+            lower = cast(Optional[int], lower)
+            upper = cast(Optional[int], upper)
             return self.environment.type_manager.IntType(lower, upper)
 
     def walk_times(self, expression, args):
@@ -294,8 +298,12 @@ def walk_times(self, expression, args):
         ):
             upper = None
         if has_real:
+            lower = cast(Optional[Fraction], lower)
+            upper = cast(Optional[Fraction], upper)
             return self.environment.type_manager.RealType(lower, upper)
         else:
+            lower = cast(Optional[int], lower)
+            upper = cast(Optional[int], upper)
             return self.environment.type_manager.IntType(lower, upper)
 
     def walk_div(self, expression, args):

diff --git a/unified_planning/test/test_partial_order_plan.py b/unified_planning/test/test_partial_order_plan.py
@@ -36,7 +36,9 @@ def test_all(self):
             assert validator is not None
             for example in self.problems.values():
                 problem, plans = example.problem, example.valid_plans
-                plan = plans[0] if plans else None
+                if not plans:
+                    continue
+                plan = plans[0]
                 if validator.supports(problem.kind):
                     self.assertTrue(isinstance(plan, up.plans.SequentialPlan))
                     pop_plan = plan.convert_to(PlanKind.PARTIAL_ORDER_PLAN, problem)

diff --git a/unified_planning/test/test_plan_validator.py b/unified_planning/test/test_plan_validator.py
@@ -71,7 +71,9 @@ def test_all_from_factory(self):
     def test_all_from_factory_with_problem_kind(self):
         for p in self.problems.values():
             problem, plans = p.problem, p.valid_plans
-            plan = plans[0] if plans else None
+            if not plans:
+                continue
+            plan = plans[0]
             pk = problem.kind
             if SequentialPlanValidator.supports(pk):
                 environment = unified_planning.environment.Environment()