Fix mypy issues in all modules except qt_ui.

2025-11-10 15:41:24 +00:00 · 2020-10-03 14:58:44 -07:00
parent 1808e5bccf
commit db6b660270
88 changed files with 1990 additions and 661 deletions
--- a/game/db.py
+++ b/game/db.py
@@ -1,34 +1,176 @@
-import typing
-import enum
 from datetime import datetime
+from enum import Enum
+from typing import Any, Dict, List, Optional, Tuple, Type, Union

-from dcs.countries import get_by_id, country_dict
-from dcs.vehicles import *
-from dcs.ships import *
-from dcs.planes import *
-from dcs.helicopters import *
-
-from dcs.task import *
-from dcs.unit import *
-from dcs.unittype import *
-from dcs.unitgroup import *
+from dcs.countries import country_dict
+from dcs.helicopters import (
+    AH_1W,
+    AH_64A,
+    AH_64D,
+    HelicopterType,
+    Ka_50,
+    Mi_24V,
+    Mi_28N,
+    Mi_8MT,
+    OH_58D,
+    SA342L,
+    SA342M,
+    SA342Minigun,
+    SA342Mistral,
+    UH_1H,
+    UH_60A,
+    helicopter_map,
+)
+from dcs.mapping import Point
+# mypy can't resolve these if they're wildcard imports for some reason.
+from dcs.planes import (
+    AJS37,
+    AV8BNA,
+    A_10A,
+    A_10C,
+    A_10C_2,
+    A_20G,
+    A_50,
+    An_26B,
+    An_30M,
+    B_17G,
+    B_1B,
+    B_52H,
+    Bf_109K_4,
+    C_101CC,
+    C_130,
+    E_3A,
+    FA_18C_hornet,
+    FW_190A8,
+    FW_190D9,
+    F_14B,
+    F_15C,
+    F_15E,
+    F_16A,
+    F_16C_50,
+    F_4E,
+    F_5E_3,
+    F_86F_Sabre,
+    F_A_18C,
+    IL_76MD,
+    IL_78M,
+    JF_17,
+    J_11A,
+    Ju_88A4,
+    KC130,
+    KC_135,
+    KJ_2000,
+    L_39C,
+    L_39ZA,
+    MQ_9_Reaper,
+    M_2000C,
+    MiG_15bis,
+    MiG_19P,
+    MiG_21Bis,
+    MiG_23MLD,
+    MiG_25PD,
+    MiG_27K,
+    MiG_29A,
+    MiG_29G,
+    MiG_29S,
+    MiG_31,
+    Mirage_2000_5,
+    P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
+    P_51D,
+    P_51D_30_NA,
+    PlaneType,
+    RQ_1A_Predator,
+    S_3B_Tanker,
+    SpitfireLFMkIX,
+    SpitfireLFMkIXCW,
+    Su_17M4,
+    Su_24M,
+    Su_24MR,
+    Su_25,
+    Su_25T,
+    Su_25TM,
+    Su_27,
+    Su_30,
+    Su_33,
+    Su_34,
+    Tornado_GR4,
+    Tornado_IDS,
+    WingLoong_I,
+    Yak_40,
+    plane_map,
+)
+from dcs.ships import (
+    Armed_speedboat,
+    Bulk_cargo_ship_Yakushev,
+    CVN_71_Theodore_Roosevelt,
+    CVN_72_Abraham_Lincoln,
+    CVN_73_George_Washington,
+    CVN_74_John_C__Stennis,
+    CV_1143_5_Admiral_Kuznetsov,
+    CV_1143_5_Admiral_Kuznetsov_2017,
+    Dry_cargo_ship_Ivanov,
+    LHA_1_Tarawa,
+    Tanker_Elnya_160,
+    ship_map,
+)
+from dcs.task import (
+    AWACS,
+    AntishipStrike,
+    CAP,
+    CAS,
+    CargoTransportation,
+    Embarking,
+    GroundAttack,
+    Intercept,
+    MainTask,
+    Nothing,
+    PinpointStrike,
+    Reconnaissance,
+    Refueling,
+    SEAD,
+    Task,
+    Transport,
+)
+from dcs.terrain.terrain import Airport
+from dcs.unit import Ship, Unit, Vehicle
+from dcs.unitgroup import ShipGroup, StaticGroup
+from dcs.unittype import FlyingType, ShipType, UnitType, VehicleType
+from dcs.vehicles import (
+    AirDefence,
+    Armor,
+    Artillery,
+    Carriage,
+    Infantry,
+    Unarmed,
+    vehicle_map,
+)

+import pydcs_extensions.frenchpack.frenchpack as frenchpack
 from game.factions.australia_2005 import Australia_2005
 from game.factions.bluefor_coldwar import BLUEFOR_COLDWAR
 from game.factions.bluefor_coldwar_a4 import BLUEFOR_COLDWAR_A4
 from game.factions.bluefor_coldwar_mods import BLUEFOR_COLDWAR_MODS
+from game.factions.bluefor_modern import BLUEFOR_MODERN
 from game.factions.canada_2005 import Canada_2005
 from game.factions.china_2010 import China_2010
 from game.factions.france_1995 import France_1995
 from game.factions.france_2005 import France_2005
 from game.factions.france_modded import France_2005_Modded
+from game.factions.germany_1944 import Germany_1944
 from game.factions.germany_1944_easy import Germany_1944_Easy
 from game.factions.germany_1990 import Germany_1990
+from game.factions.india_2010 import India_2010
 from game.factions.insurgent import Insurgent
 from game.factions.insurgent_modded import Insurgent_modded
 from game.factions.iran_2015 import Iran_2015
 from game.factions.israel_1948 import Israel_1948
-from game.factions.israel_1973 import Israel_1973, Israel_1973_NO_WW2_UNITS, Israel_1982
+from game.factions.israel_1973 import (
+    Israel_1973,
+    Israel_1973_NO_WW2_UNITS,
+    Israel_1982,
+)
 from game.factions.israel_2000 import Israel_2000
 from game.factions.italy_1990 import Italy_1990
 from game.factions.italy_1990_mb339 import Italy_1990_MB339
@@ -37,35 +179,41 @@ from game.factions.libya_2011 import Libya_2011
 from game.factions.netherlands_1990 import Netherlands_1990
 from game.factions.north_korea_2000 import NorthKorea_2000
 from game.factions.pakistan_2015 import Pakistan_2015
-from game.factions.private_miltary_companies import PMC_WESTERN_B, PMC_RUSSIAN, PMC_WESTERN_A
-from game.factions.russia_1975 import Russia_1975
-from game.factions.germany_1944 import Germany_1944
-from game.factions.india_2010 import India_2010
+from game.factions.private_miltary_companies import (
+    PMC_RUSSIAN,
+    PMC_WESTERN_A,
+    PMC_WESTERN_B,
+)
 from game.factions.russia_1955 import Russia_1955
 from game.factions.russia_1965 import Russia_1965
+from game.factions.russia_1975 import Russia_1975
 from game.factions.russia_1990 import Russia_1990
 from game.factions.russia_2010 import Russia_2010
 from game.factions.spain_1990 import Spain_1990
 from game.factions.sweden_1990 import Sweden_1990
-from game.factions.syria import Syria_2011, Syria_1967, Syria_1967_WW2_Weapons, Syria_1973, Arab_Armies_1948, Syria_1982
+from game.factions.syria import (
+    Arab_Armies_1948,
+    Syria_1967,
+    Syria_1967_WW2_Weapons,
+    Syria_1973,
+    Syria_1982,
+    Syria_2011,
+)
 from game.factions.turkey_2005 import Turkey_2005
 from game.factions.uae_2005 import UAE_2005
 from game.factions.uk_1944 import UK_1944
 from game.factions.uk_1990 import UnitedKingdom_1990
 from game.factions.ukraine_2010 import Ukraine_2010
 from game.factions.us_aggressors import US_Aggressors
-from game.factions.usa_1944 import USA_1944, ALLIES_1944
+from game.factions.usa_1944 import ALLIES_1944, USA_1944
 from game.factions.usa_1955 import USA_1955
 from game.factions.usa_1960 import USA_1960
 from game.factions.usa_1965 import USA_1965
 from game.factions.usa_1990 import USA_1990
 from game.factions.usa_2005 import USA_2005
-from game.factions.bluefor_modern import BLUEFOR_MODERN
-
 # PATCH pydcs data with MODS
 from pydcs_extensions.a4ec.a4ec import A_4E_C
 from pydcs_extensions.mb339.mb339 import MB_339PAN
-import pydcs_extensions.frenchpack.frenchpack as frenchpack
 from pydcs_extensions.rafale.rafale import Rafale_A_S, Rafale_M

 plane_map["A-4E-C"] = A_4E_C
@@ -793,13 +941,13 @@ SAM_CONVERT = {
 """
 Units that will always be spawned in the air
 """
-TAKEOFF_BAN = [
+TAKEOFF_BAN: List[Type[FlyingType]] = [
 ]

 """
 Units that will be always spawned in the air if launched from the carrier
 """
-CARRIER_TAKEOFF_BAN = [
+CARRIER_TAKEOFF_BAN: List[Type[FlyingType]] = [
   Su_33,  # Kuznecow is bugged in a way that only 2 aircraft could be spawned
 ]

@@ -807,7 +955,7 @@ CARRIER_TAKEOFF_BAN = [
 Units separated by country. 
 country : DCS Country name
 """
-FACTIONS: typing.Dict[str, typing.Dict[str, typing.Any]] = {
+FACTIONS: Dict[str, Dict[str, Any]] = {

    "Bluefor Modern": BLUEFOR_MODERN,
    "Bluefor Cold War 1970s": BLUEFOR_COLDWAR,
@@ -937,7 +1085,7 @@ COMMON_OVERRIDE = {
    GroundAttack: "STRIKE"
 }

-PLANE_PAYLOAD_OVERRIDES = {
+PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = {

    FA_18C_hornet: {
        CAP: "CAP HEAVY",
@@ -1134,17 +1282,17 @@ LHA_CAPABLE = [
 ---------- END OF CONFIGURATION SECTION
 """

-UnitsDict = typing.Dict[UnitType, int]
-PlaneDict = typing.Dict[FlyingType, int]
-HeliDict = typing.Dict[HelicopterType, int]
-ArmorDict = typing.Dict[VehicleType, int]
-ShipDict = typing.Dict[ShipType, int]
-AirDefenseDict = typing.Dict[AirDefence, int]
+UnitsDict = Dict[UnitType, int]
+PlaneDict = Dict[FlyingType, int]
+HeliDict = Dict[HelicopterType, int]
+ArmorDict = Dict[VehicleType, int]
+ShipDict = Dict[ShipType, int]
+AirDefenseDict = Dict[AirDefence, int]

-AssignedUnitsDict = typing.Dict[typing.Type[UnitType], typing.Tuple[int, int]]
-TaskForceDict = typing.Dict[typing.Type[MainTask], AssignedUnitsDict]
+AssignedUnitsDict = Dict[Type[UnitType], Tuple[int, int]]
+TaskForceDict = Dict[Type[MainTask], AssignedUnitsDict]

-StartingPosition = typing.Optional[typing.Union[ShipGroup, StaticGroup, Airport, Point]]
+StartingPosition = Union[ShipGroup, StaticGroup, Airport, Point]


 def upgrade_to_supercarrier(unit, name: str):
@@ -1162,7 +1310,7 @@ def upgrade_to_supercarrier(unit, name: str):
    else:
        return unit

-def unit_task(unit: UnitType) -> Task:
+def unit_task(unit: UnitType) -> Optional[Task]:
    for task, units in UNIT_BY_TASK.items():
        if unit in units:
            return task
@@ -1173,10 +1321,10 @@ def unit_task(unit: UnitType) -> Task:
    print(unit.name + " cause issue")
    return None

-def find_unittype(for_task: Task, country_name: str) -> typing.List[UnitType]:
+def find_unittype(for_task: Task, country_name: str) -> List[UnitType]:
    return [x for x in UNIT_BY_TASK[for_task] if x in FACTIONS[country_name]["units"]]

-def find_infantry(country_name: str) -> typing.List[UnitType]:
+def find_infantry(country_name: str) -> List[UnitType]:
    inf = [
        Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS,
        Infantry.Soldier_RPG,
@@ -1199,7 +1347,7 @@ def unit_type_name(unit_type) -> str:
 def unit_type_name_2(unit_type) -> str:
    return unit_type.name and unit_type.name or unit_type.id

-def unit_type_from_name(name: str) -> UnitType:
+def unit_type_from_name(name: str) -> Optional[UnitType]:
    if name in vehicle_map:
        return vehicle_map[name]
    elif name in plane_map:
@@ -1232,7 +1380,7 @@ def task_name(task) -> str:
        return task.name


-def choose_units(for_task: Task, factor: float, count: int, country: str) -> typing.Collection[UnitType]:
+def choose_units(for_task: Task, factor: float, count: int, country: str) -> List[UnitType]:
    suitable_unittypes = find_unittype(for_task, country)
    suitable_unittypes = [x for x in suitable_unittypes if x not in helicopter_map.values()]
    suitable_unittypes.sort(key=lambda x: PRICES[x])
@@ -1258,7 +1406,7 @@ def unitdict_merge(a: UnitsDict, b: UnitsDict) -> UnitsDict:


 def unitdict_split(unit_dict: UnitsDict, count: int):
-    buffer_dict = {}
+    buffer_dict: Dict[UnitType, int] = {}
    for unit_type, unit_count in unit_dict.items():
        for _ in range(unit_count):
            unitdict_append(buffer_dict, unit_type, 1)
@@ -1281,7 +1429,7 @@ def unitdict_restrict_count(unit_dict: UnitsDict, total_count: int) -> UnitsDict
        return {}


-def assigned_units_split(fd: AssignedUnitsDict) -> typing.Tuple[PlaneDict, PlaneDict]:
+def assigned_units_split(fd: AssignedUnitsDict) -> Tuple[PlaneDict, PlaneDict]:
    return {k: v1 for k, (v1, v2) in fd.items()}, {k: v2 for k, (v1, v2) in fd.items()},


@@ -1290,7 +1438,7 @@ def assigned_units_from(d: PlaneDict) -> AssignedUnitsDict:


 def assignedunits_split_to_count(dict: AssignedUnitsDict, count: int):
-    buffer_dict = {}
+    buffer_dict: Dict[Type[UnitType], Tuple[int, int]] = {}
    for unit_type, (unit_count, client_count) in dict.items():
        for _ in range(unit_count):
            new_count, new_client_count = buffer_dict.get(unit_type, (0, 0))