Skip to content

fix: correctly handle event type in as_aapi_dict #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slancer50 merged 1 commit into from
Mar 30, 2025
Merged

fix: correctly handle event type in as_aapi_dict #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/aapi/bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,23 @@ class AAPIJob:


class AAPIObject:
def as_aapi_dict(self):
def as_aapi_dict(self, ignore_event_type=True):

# Import inside the method to prevent circular import issues
from aapi.ifbase import IfCompletionStatus

res = {}

if "_type" in attrs.fields_dict(self.__class__):
if not self._type.startswith("Condition") or self._type.startswith("Event"):
res["Type"] = self._type
if '_type' in attrs.fields_dict(self.__class__):
is_condition_or_event = self._type.startswith(('Condition', 'Event'))

if ignore_event_type:
if not is_condition_or_event:
res['Type'] = self._type
elif self._type.startswith('Event'):
res['Type'] = self._type


if attrs.has(self):
for field in attrs.fields(self.__class__):
value = self.__getattribute__(field.name)
Expand Down Expand Up @@ -49,7 +59,10 @@ def as_aapi_dict(self):

elif field.metadata.get("_abstract_aapi_container_"):
for obj in value:
res[obj.object_name] = obj.as_aapi_dict()
obj_ignore_type = ignore_event_type
if isinstance(self, IfCompletionStatus):
obj_ignore_type = False
res[obj.object_name] = obj.as_aapi_dict(ignore_event_type=obj_ignore_type)

else:
res["attrsibutes_valid"] = False
Expand Down