Skip to content

Commit 2fbe021

Browse files
committed
update schema
1 parent e75580c commit 2fbe021

2 files changed

Lines changed: 45 additions & 37 deletions

File tree

hyperleda/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def patch_table_schema(self, table_name: str, actions: list) -> None:
146146
dataclasses.asdict(model.PatchTableRequestSchema(table_name, actions)),
147147
)
148148

149-
def create_homogenization_rules(self, rules: list[model.HomogenizationRule]) -> None:
149+
def create_homogenization_rules(self, rules: list[model.Catalog]) -> None:
150150
_ = self._request(
151151
"POST",
152152
"/admin/api/v1/homogenization/rules",

hyperleda/model.py

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
# generated by datamodel-codegen:
22
# filename: swagger.json
3-
# timestamp: 2025-05-07T17:31:13+00:00
3+
# timestamp: 2025-05-08T08:27:46+00:00
44

55
from __future__ import annotations
66

77
from dataclasses import dataclass
88
from enum import Enum
99
from typing import Any
1010

11+
int_aliased = int
12+
str_aliased = str
13+
1114

1215
@dataclass
1316
class AddDataRequestSchema:
14-
table_id: int
17+
table_id: int_aliased
1518
data: list[dict[str, Any]]
1619

1720

@@ -22,14 +25,14 @@ class AddDataResponseSchema:
2225

2326
@dataclass
2427
class CreateSourceRequestSchema:
25-
title: str
26-
authors: list[str]
27-
year: int
28+
title: str_aliased
29+
authors: list[str_aliased]
30+
year: int_aliased
2831

2932

3033
@dataclass
3134
class CreateSourceResponseSchema:
32-
code: str
35+
code: str_aliased
3336

3437

3538
class DataType(Enum):
@@ -53,11 +56,11 @@ class DataType(Enum):
5356

5457
@dataclass
5558
class ColumnDescription:
56-
name: str
59+
name: str_aliased
5760
data_type: DataType
58-
unit: str | None = None
59-
ucd: str | None = None
60-
description: str | None = ""
61+
unit: str_aliased | None = None
62+
ucd: str_aliased | None = None
63+
description: str_aliased | None = ""
6164

6265

6366
class Datatype(Enum):
@@ -69,27 +72,27 @@ class Datatype(Enum):
6972

7073
@dataclass
7174
class CreateTableRequestSchema:
72-
table_name: str
75+
table_name: str_aliased
7376
columns: list[ColumnDescription]
74-
bibcode: str
77+
bibcode: str_aliased
7578
datatype: Datatype | None = Datatype.regular
76-
description: str | None = ""
79+
description: str_aliased | None = ""
7780

7881

7982
@dataclass
8083
class CreateTableResponseSchema:
81-
id: int
84+
id: int_aliased
8285

8386

8487
@dataclass
8588
class GetTableValidationRequestSchema:
86-
table_name: str
89+
table_name: str_aliased
8790

8891

8992
@dataclass
9093
class TableValidation:
91-
message: str | None = None
92-
validator: str | None = None
94+
message: str_aliased | None = None
95+
validator: str_aliased | None = None
9396

9497

9598
@dataclass
@@ -104,7 +107,7 @@ class PatchTableAction:
104107

105108
@dataclass
106109
class PatchTableRequestSchema:
107-
table_name: str
110+
table_name: str_aliased
108111
actions: list[PatchTableAction]
109112

110113

@@ -115,24 +118,24 @@ class PatchTableResponseSchema:
115118

116119
@dataclass
117120
class GetTaskInfoRequestSchema:
118-
task_id: int
121+
task_id: int_aliased
119122

120123

121124
@dataclass
122125
class GetTaskInfoResponseSchema:
123-
id: int | None = None
124-
task_name: str | None = None
125-
status: str | None = None
126+
id: int_aliased | None = None
127+
task_name: str_aliased | None = None
128+
status: str_aliased | None = None
126129
payload: dict[str, Any] | None = None
127-
start_time: str | None = None
128-
end_time: str | None = None
130+
start_time: str_aliased | None = None
131+
end_time: str_aliased | None = None
129132
message: dict[str, Any] | None = None
130133

131134

132135
@dataclass
133136
class LoginRequestSchema:
134-
username: str
135-
password: str
137+
username: str_aliased
138+
password: str_aliased
136139

137140

138141
@dataclass
@@ -176,32 +179,37 @@ class TableProcessResponseSchema:
176179

177180
@dataclass
178181
class TableStatusStatsRequestSchema:
179-
table_id: int
182+
table_id: int_aliased
180183

181184

182185
@dataclass
183186
class TableStatusStatsResponseSchema:
184-
processing: dict[str, int] | None = None
187+
processing: dict[str, int_aliased] | None = None
188+
189+
190+
@dataclass
191+
class Parameter:
192+
filters: dict[str, Any]
193+
enrichment: dict[str, Any] | None = None
185194

186195

187-
class Catalog(Enum):
196+
class Name(Enum):
188197
icrs = "icrs"
189198
designation = "designation"
190199
redshift = "redshift"
191200

192201

193202
@dataclass
194-
class HomogenizationRule:
195-
catalog: Catalog
196-
parameter: str
197-
filters: dict[str, Any]
198-
key: str | None = None
199-
enrichment: dict[str, Any] | None = None
203+
class Catalog:
204+
name: Name
205+
parameters: dict[str, Parameter]
206+
key: str_aliased | None = None
207+
additional_params: dict[str, Any] | None = None
200208

201209

202210
@dataclass
203211
class CreateHomogenizationRulesRequestSchema:
204-
rules: list[HomogenizationRule]
212+
catalogs: list[Catalog]
205213

206214

207215
@dataclass

0 commit comments

Comments
 (0)