feat: Add abstract suffixes to resolve class name conflicts

generali/models/amount.py

@@ -853,7 +853,7 @@ class Meta:
             "type": "Element",
         },
     )
-    element: Optional[TypeType] = field(
+    value: Optional[TypeType] = field(
         default=None,
         metadata={
             "name": "$",

netex/models/access_right_parameter_assignment_1.py → netex/models/access_right_parameter_assignment.py

@@ -8,9 +8,8 @@
 
 
 @dataclass
-class AccessRightParameterAssignment1(
+class AccessRightParameterAssignment(
     AccessRightParameterAssignmentVersionStructure
 ):
     class Meta:
-        name = "AccessRightParameterAssignment"
         namespace = "http://www.netex.org.uk/netex"

netex/models/access_right_parameter_assignment_2.py → netex/models/access_right_parameter_assignment_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class AccessRightParameterAssignment2(DataManagedObjectStructure):
+class AccessRightParameterAssignmentAbstract(DataManagedObjectStructure):
     class Meta:
         name = "AccessRightParameterAssignment_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/access_right_parameter_assignments_in_frame_rel_structure.py

@@ -1,9 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Union
 
-from .access_right_parameter_assignment_1 import (
-    AccessRightParameterAssignment1,
-)
+from .access_right_parameter_assignment import AccessRightParameterAssignment
 from .customer_purchase_parameter_assignment import (
     CustomerPurchaseParameterAssignment,
 )
@@ -34,7 +32,7 @@ class Meta:
             GenericParameterAssignmentInContext,
             GenericParameterAssignment,
             ValidityParameterAssignment,
-            AccessRightParameterAssignment1,
+            AccessRightParameterAssignment,
         ]
     ] = field(
         default_factory=list,
@@ -68,7 +66,7 @@ class Meta:
                 },
                 {
                     "name": "AccessRightParameterAssignment",
-                    "type": AccessRightParameterAssignment1,
+                    "type": AccessRightParameterAssignment,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
             ),

netex/models/access_right_parameter_assignments_rel_structure.py

@@ -1,9 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Union
 
-from .access_right_parameter_assignment_1 import (
-    AccessRightParameterAssignment1,
-)
+from .access_right_parameter_assignment import AccessRightParameterAssignment
 from .containment_aggregation_structure import ContainmentAggregationStructure
 from .customer_purchase_parameter_assignment import (
     CustomerPurchaseParameterAssignment,
@@ -34,7 +32,7 @@ class Meta:
             GenericParameterAssignmentInContext,
             GenericParameterAssignment,
             ValidityParameterAssignment,
-            AccessRightParameterAssignment1,
+            AccessRightParameterAssignment,
         ]
     ] = field(
         default_factory=list,
@@ -68,7 +66,7 @@ class Meta:
                 },
                 {
                     "name": "AccessRightParameterAssignment",
-                    "type": AccessRightParameterAssignment1,
+                    "type": AccessRightParameterAssignment,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
             ),

netex/models/activation_point_1.py → netex/models/activation_point.py

@@ -6,7 +6,6 @@
 
 
 @dataclass
-class ActivationPoint1(ActivationPointVersionStructure):
+class ActivationPoint(ActivationPointVersionStructure):
     class Meta:
-        name = "ActivationPoint"
         namespace = "http://www.netex.org.uk/netex"

netex/models/activation_point_2.py → netex/models/activation_point_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class ActivationPoint2(PointVersionStructure):
+class ActivationPointAbstract(PointVersionStructure):
     class Meta:
         name = "ActivationPoint_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/activation_points_in_frame_rel_structure.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Union
 
-from .activation_point_1 import ActivationPoint1
+from .activation_point import ActivationPoint
 from .beacon_point import BeaconPoint
 from .containment_aggregation_structure import ContainmentAggregationStructure
 
@@ -13,7 +13,7 @@ class ActivationPointsInFrameRelStructure(ContainmentAggregationStructure):
     class Meta:
         name = "activationPointsInFrame_RelStructure"
 
-    activation_point: List[Union[BeaconPoint, ActivationPoint1]] = field(
+    activation_point: List[Union[BeaconPoint, ActivationPoint]] = field(
         default_factory=list,
         metadata={
             "type": "Elements",
@@ -25,7 +25,7 @@ class Meta:
                 },
                 {
                     "name": "ActivationPoint",
-                    "type": ActivationPoint1,
+                    "type": ActivationPoint,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
             ),

netex/models/administrative_zone_2.py → netex/models/administrative_zone_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class AdministrativeZone2(ZoneVersionStructure):
+class AdministrativeZoneAbstract(ZoneVersionStructure):
     class Meta:
         name = "AdministrativeZone_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/administrative_zones_rel_structure.py

@@ -33,7 +33,7 @@ class Meta:
         Union[
             AdministrativeZoneRef,
             "TransportAdministrativeZone",
-            "AdministrativeZone1",
+            "AdministrativeZone",
         ]
     ] = field(
         default_factory=list,
@@ -52,7 +52,7 @@ class Meta:
                 },
                 {
                     "name": "AdministrativeZone",
-                    "type": Type["AdministrativeZone1"],
+                    "type": Type["AdministrativeZone"],
                     "namespace": "http://www.netex.org.uk/netex",
                 },
             ),
@@ -169,9 +169,8 @@ class Meta:
 
 
 @dataclass
-class AdministrativeZone1(AdministrativeZoneVersionStructure):
+class AdministrativeZone(AdministrativeZoneVersionStructure):
     class Meta:
-        name = "AdministrativeZone"
         namespace = "http://www.netex.org.uk/netex"
 
 

netex/models/alternative_mode_of_operation_1.py → netex/models/alternative_mode_of_operation.py

@@ -8,7 +8,6 @@
 
 
 @dataclass
-class AlternativeModeOfOperation1(AlternativeModeOfOperationValueStructure):
+class AlternativeModeOfOperation(AlternativeModeOfOperationValueStructure):
     class Meta:
-        name = "AlternativeModeOfOperation"
         namespace = "http://www.netex.org.uk/netex"

netex/models/alternative_mode_of_operation_2.py → netex/models/alternative_mode_of_operation_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class AlternativeModeOfOperation2(DataManagedObjectStructure):
+class AlternativeModeOfOperationAbstract(DataManagedObjectStructure):
     class Meta:
         name = "AlternativeModeOfOperation_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/call_1.py → netex/models/call.py

@@ -6,7 +6,6 @@
 
 
 @dataclass
-class Call1(CallVersionedChildStructure):
+class Call(CallVersionedChildStructure):
     class Meta:
-        name = "Call"
         namespace = "http://www.netex.org.uk/netex"

netex/models/call_2.py → netex/models/call_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class Call2(VersionedChildStructure):
+class CallAbstract(VersionedChildStructure):
     class Meta:
         name = "Call_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/calls_rel_structure.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Union
 
-from .call_1 import Call1
+from .call import Call
 from .call_z import CallZ
 from .dated_call import DatedCall
 from .dated_call_z import DatedCallZ
@@ -17,7 +17,7 @@ class CallsRelStructure(StrictContainmentAggregationStructure):
     class Meta:
         name = "calls_RelStructure"
 
-    call: List[Union[DatedCallZ, DatedCall, CallZ, Call1]] = field(
+    call: List[Union[DatedCallZ, DatedCall, CallZ, Call]] = field(
         default_factory=list,
         metadata={
             "type": "Elements",
@@ -39,7 +39,7 @@ class Meta:
                 },
                 {
                     "name": "Call",
-                    "type": Call1,
+                    "type": Call,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
             ),

netex/models/capping_rule_prices_rel_structure.py

@@ -3,7 +3,7 @@
 
 from .capping_rule_price import CappingRulePrice
 from .capping_rule_price_ref import CappingRulePriceRef
-from .cell_ref_1 import CellRef1
+from .cell_ref import CellRef
 from .strict_containment_aggregation_structure import (
     StrictContainmentAggregationStructure,
 )
@@ -17,7 +17,7 @@ class Meta:
         name = "cappingRulePrices_RelStructure"
 
     capping_rule_price_ref_or_cell_ref_or_capping_rule_price: List[
-        Union[CappingRulePriceRef, CellRef1, CappingRulePrice]
+        Union[CappingRulePriceRef, CellRef, CappingRulePrice]
     ] = field(
         default_factory=list,
         metadata={
@@ -30,7 +30,7 @@ class Meta:
                 },
                 {
                     "name": "CellRef",
-                    "type": CellRef1,
+                    "type": CellRef,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
                 {

netex/models/cell_2.py → netex/models/cell_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class Cell2(VersionedChildStructure):
+class CellAbstract(VersionedChildStructure):
     class Meta:
         name = "Cell_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/cell_price_structure.py

@@ -27,7 +27,7 @@
     PriceRuleStepResultsRelStructure,
 )
 from .price_unit_ref import PriceUnitRef
-from .pricing_rule_1 import PricingRule1
+from .pricing_rule import PricingRule
 from .pricing_rule_ref import PricingRuleRef
 from .pricing_service_ref import PricingServiceRef
 from .private_code import PrivateCode
@@ -271,7 +271,7 @@ class CellPriceStructure:
             LimitingRuleInContext,
             LimitingRule,
             DiscountingRule,
-            PricingRule1,
+            PricingRule,
         ]
     ] = field(
         default=None,
@@ -310,7 +310,7 @@ class CellPriceStructure:
                 },
                 {
                     "name": "PricingRule",
-                    "type": PricingRule1,
+                    "type": PricingRule,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
             ),

netex/models/cell_ref_1.py → netex/models/cell_ref.py

@@ -6,7 +6,6 @@
 
 
 @dataclass
-class CellRef1(CellRefStructure):
+class CellRef(CellRefStructure):
     class Meta:
-        name = "CellRef"
         namespace = "http://www.netex.org.uk/netex"

netex/models/cell_ref_2.py → netex/models/cell_ref_abstract.py

@@ -6,7 +6,7 @@
 
 
 @dataclass
-class CellRef2(VersionOfObjectRefStructure):
+class CellRefAbstract(VersionOfObjectRefStructure):
     class Meta:
         name = "CellRef_"
         namespace = "http://www.netex.org.uk/netex"

netex/models/cell_refs_rel_structure.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List
 
-from .cell_ref_1 import CellRef1
+from .cell_ref import CellRef
 from .strict_containment_aggregation_structure import (
     StrictContainmentAggregationStructure,
 )
@@ -14,7 +14,7 @@ class CellRefsRelStructure(StrictContainmentAggregationStructure):
     class Meta:
         name = "cellRefs_RelStructure"
 
-    cell_ref: List[CellRef1] = field(
+    cell_ref: List[CellRef] = field(
         default_factory=list,
         metadata={
             "name": "CellRef",

netex/models/check_constraint_version_structure.py

@@ -50,7 +50,7 @@
 )
 from .passenger_safety_equipment_ref import PassengerSafetyEquipmentRef
 from .place_lighting_equipment_ref import PlaceLightingEquipmentRef
-from .place_ref_1 import PlaceRef1
+from .place_ref import PlaceRef
 from .place_sign_ref import PlaceSignRef
 from .queueing_equipment_ref import QueueingEquipmentRef
 from .ramp_equipment_ref import RampEquipmentRef
@@ -90,7 +90,7 @@ class CheckConstraintVersionStructure(AssignmentVersionStructure1):
     class Meta:
         name = "CheckConstraint_VersionStructure"
 
-    place_ref: Optional[PlaceRef1] = field(
+    place_ref: Optional[PlaceRef] = field(
         default=None,
         metadata={
             "name": "PlaceRef",