Skip to content

Commit 11a5432

Browse files
committed
fix automated api again
1 parent 8791324 commit 11a5432

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

automated_api.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,22 @@ def _get_typehint(annotation, api_globals):
120120

121121
typehint = (
122122
str(annotation)
123-
.replace("typing.", "")
124123
.replace("NoneType", "None")
125124
)
125+
full_path_regex = re.compile(
126+
r"(?P<full>(?P<name>[a-zA-Z0-9_\.]+))"
127+
)
128+
for item in full_path_regex.finditer(str(typehint)):
129+
groups = item.groupdict()
130+
name = groups["name"].split(".")[-1]
131+
typehint = typehint.replace(groups["full"], name)
132+
126133
forwardref_regex = re.compile(
127134
r"(?P<full>ForwardRef\('(?P<name>[a-zA-Z0-9]+)'\))"
128135
)
129136
for item in forwardref_regex.finditer(str(typehint)):
130137
groups = item.groupdict()
131-
name = groups["name"]
138+
name = groups["name"].split(".")[-1]
132139
typehint = typehint.replace(groups["full"], f'"{name}"')
133140

134141
try:

ayon_api/_api.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from .exceptions import FailedServiceInit
2323
from .utils import (
2424
NOT_SET,
25+
SortOrder,
2526
get_default_settings_variant as _get_default_settings_variant,
2627
)
2728

@@ -882,7 +883,7 @@ def get_events(
882883
older_than: Optional[str] = None,
883884
fields: Optional[Iterable[str]] = None,
884885
limit: Optional[int] = None,
885-
order: "Optional[ayon_api.utils.SortOrder]" = None,
886+
order: Optional[SortOrder] = None,
886887
states: Optional[Iterable[str]] = None,
887888
):
888889
"""Get events from server with filtering options.
@@ -1149,7 +1150,7 @@ def get_activities(
11491150
reference_types: Optional[Iterable["ActivityReferenceType"]] = None,
11501151
fields: Optional[Iterable[str]] = None,
11511152
limit: Optional[int] = None,
1152-
order: "Optional[ayon_api.utils.SortOrder]" = None,
1153+
order: Optional[SortOrder] = None,
11531154
) -> Generator[Dict[str, Any], None, None]:
11541155
"""Get activities from server with filtering options.
11551156

0 commit comments

Comments
 (0)