Skip to content

Commit 4f86413

Browse files
committed
ci: Fix mypy errors
1 parent 32fb892 commit 4f86413

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

capellambse/model/common/accessors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,13 +1260,13 @@ class RoleTagAccessor(DirectProxyAccessor[T]):
12601260
def __init__(
12611261
self,
12621262
role_tag: str,
1263-
class_: type[T] | None = None,
1263+
class_: type[T] | type[element.GenericElement] | None = None,
12641264
*,
12651265
aslist: type[element.ElementList[T]] | None = None,
12661266
list_extra_args: dict[str, t.Any] | None = None,
12671267
) -> None:
12681268
super().__init__(
1269-
class_ or element.GenericElement,
1269+
class_ or element.GenericElement, # type:ignore[arg-type]
12701270
(),
12711271
aslist=aslist,
12721272
list_extra_args=list_extra_args,

capellambse/model/crosslayer/cs.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class Component(c.GenericElement):
154154
ports = c.DirectProxyAccessor(fa.ComponentPort, aslist=c.ElementList)
155155
physical_ports = c.DirectProxyAccessor(PhysicalPort, aslist=c.ElementList)
156156
parts = c.RoleTagAccessor[Part](
157-
"ownedFeatures", Part, aslist=c.ElementList
157+
"ownedFeatures", Part, aslist=c.ElementList[Part]
158158
)
159159
representing_parts = c.ReferenceSearchingAccessor(
160160
Part, "type", aslist=c.ElementList
@@ -197,7 +197,9 @@ class ComponentPkg(c.GenericElement):
197197
exchanges = c.DirectProxyAccessor(
198198
fa.ComponentExchange, aslist=c.ElementList
199199
)
200-
parts = c.RoleTagAccessor[Part]("ownedParts", Part, aslist=c.ElementList)
200+
parts = c.RoleTagAccessor[Part](
201+
"ownedParts", Part, aslist=c.ElementList[Part]
202+
)
201203
state_machines = c.DirectProxyAccessor(
202204
capellacommon.StateMachine, aslist=c.ElementList
203205
)

capellambse/model/crosslayer/interaction.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ class EventReceiptOperation(EventOperation):
8282
"""An event-receipt operation."""
8383

8484

85+
class InteractionFragment(c.GenericElement):
86+
"""Abstract super class of all interaction fragments in a Scenario."""
87+
88+
covered = c.AttrProxyAccessor[c.GenericElement](
89+
None, "coveredInstanceRoles", aslist=c.MixedElementList
90+
)
91+
92+
8593
@c.xtype_handler(None)
8694
class Scenario(c.GenericElement):
8795
"""A scenario that holds instance roles."""
@@ -90,20 +98,16 @@ class Scenario(c.GenericElement):
9098
InstanceRole, aslist=c.ElementList
9199
)
92100
messages = c.DirectProxyAccessor(SequenceMessage, aslist=c.ElementList)
93-
events = c.RoleTagAccessor("ownedEvents", aslist=c.MixedElementList)
94-
fragments = c.RoleTagAccessor(
95-
"ownedInteractionFragments", aslist=c.MixedElementList
101+
events = c.RoleTagAccessor[EventOperation](
102+
"ownedEvents", aslist=c.MixedElementList # type: ignore[arg-type]
96103
)
97-
time_lapses = c.RoleTagAccessor(
98-
"ownedTimeLapses", aslist=c.MixedElementList
104+
fragments = c.RoleTagAccessor[InteractionFragment](
105+
"ownedInteractionFragments",
106+
aslist=c.MixedElementList, # type: ignore[arg-type]
99107
)
100-
101-
102-
class InteractionFragment(c.GenericElement):
103-
"""Abstract super class of all interaction fragments in a Scenario."""
104-
105-
covered = c.AttrProxyAccessor[c.GenericElement](
106-
None, "coveredInstanceRoles", aslist=c.MixedElementList
108+
time_lapses = c.RoleTagAccessor[Event](
109+
"ownedTimeLapses",
110+
aslist=c.MixedElementList, # type: ignore[arg-type]
107111
)
108112

109113

capellambse/model/layers/oa.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class EntityPkg(cs.ComponentPkg):
222222
entities = c.DirectProxyAccessor(Entity, aslist=c.ElementList)
223223
exchanges = c.DirectProxyAccessor[CommunicationMean](
224224
CommunicationMean, aslist=c.ElementList
225-
) # type: ignore[assignment]
225+
)
226226

227227
packages: c.Accessor
228228

0 commit comments

Comments
 (0)