Skip to content
Snippets Groups Projects

WS-31: Submit capability request view

Merged Nathan Hertz requested to merge WS-31-submit-capability-request-view into main
All threads resolved!
2 files
+ 18
23
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -120,22 +120,19 @@ class Capability(Base, CapabilityIF):
self.requests.append(request)
return request
def to_dict(self) -> Dict[str, str]:
return {
"name": self.name,
"max_jobs": self.max_jobs,
"steps": str(self.steps),
"enabled": self.enabled,
}
def __str__(self) -> str:
return (
f"Capability: {self.name}, max concurrent jobs of {self.max_jobs}"
f"\nSequence: {self.steps}"
)
def __json__(self) -> str:
return json.dumps(self.to_dict())
def __json__(self) -> Dict[str, str]:
return {
"name": self.name,
"max_jobs": self.max_jobs,
"steps": str(self.steps),
"enabled": self.enabled,
}
class CapabilityRequest(Base, CapabilityRequestIF):
@@ -162,15 +159,13 @@ class CapabilityRequest(Base, CapabilityRequestIF):
def __str__(self):
return f"CapabilityRequest object: {self.__dict__}"
def __json__(self) -> str:
return json.dumps(
{
"id": self.id,
"capability_name": self.capability_name,
"state": self.state,
"parameters": self.parameters,
}
)
def __json__(self) -> Dict[str, str]:
return {
"id": self.id,
"capability_name": self.capability_name,
"state": self.state,
"parameters": self.parameters,
}
class CapabilityVersion(Base, CapabilityVersionIF):
@@ -222,7 +217,7 @@ class CapabilityExecution(Base, CapabilityExecutionIF):
),
)
def __json__(self, request: CapabilityRequest) -> dict:
def __json__(self) -> dict:
return dict(
id=self.id,
state=self.state,
Loading