Skip to content

Commit 1e88353

Browse files
authored
Aqua refactor: move common dataclass into data.py (#854)
1 parent cc6aad6 commit 1e88353

File tree

4 files changed

+18
-39
lines changed

4 files changed

+18
-39
lines changed

ads/aqua/data.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2024 Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
55

6-
from dataclasses import dataclass
6+
from dataclasses import dataclass, field
77

88
from ads.common.serializer import DataClassSerializable
99

@@ -13,3 +13,19 @@ class AquaResourceIdentifier(DataClassSerializable):
1313
id: str = ""
1414
name: str = ""
1515
url: str = ""
16+
17+
18+
@dataclass(repr=False)
19+
class AquaJobSummary(DataClassSerializable):
20+
"""Represents an Aqua job summary."""
21+
22+
id: str
23+
name: str
24+
console_url: str
25+
lifecycle_state: str
26+
lifecycle_details: str
27+
time_created: str
28+
tags: dict
29+
experiment: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
30+
source: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
31+
job: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)

ads/aqua/evaluation/entities.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ class CreateAquaEvaluationDetails(DataClassSerializable):
8888
force_overwrite: Optional[bool] = False
8989

9090

91-
@dataclass(repr=False)
92-
class AquaResourceIdentifier(DataClassSerializable):
93-
id: str = ""
94-
name: str = ""
95-
url: str = ""
96-
97-
9891
@dataclass(repr=False)
9992
class AquaEvalReport(DataClassSerializable):
10093
evaluation_id: str = ""

ads/aqua/finetuning/entities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from dataclasses import dataclass, field
66
from typing import List, Optional
77

8-
from ads.aqua.job import AquaJobSummary
8+
from ads.aqua.data import AquaJobSummary
99
from ads.common.serializer import DataClassSerializable
1010

1111

ads/aqua/job.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)