Changed classes' attribute names in locations.py to more pythonic
This commit is contained in:
parent
9335b782c2
commit
ee2b18bdb5
@ -1,25 +1,25 @@
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel, Field
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
||||||
class RegionNames(BaseModel):
|
class RegionNames(BaseModel):
|
||||||
fullName: str
|
full_name: str = Field(alias='fullName')
|
||||||
shortName: str
|
short_name: str = Field(alias='shortName')
|
||||||
displayName: str
|
display_name: str = Field(alias='displayName')
|
||||||
primaryDisplayName: str
|
primary_display_name: str = Field(alias='primaryDisplayName')
|
||||||
secondaryDisplayName: str
|
secondary_display_name: str = Field(alias='secondaryDisplayName')
|
||||||
lastSearchName: str
|
last_search_name: str = Field(alias='lastSearchName')
|
||||||
|
|
||||||
|
|
||||||
class EssId(BaseModel):
|
class EssId(BaseModel):
|
||||||
sourceName: str
|
source_name: str = Field(alias='sourceName')
|
||||||
sourceId: int
|
source_id: int = Field(alias='sourceId')
|
||||||
|
|
||||||
|
|
||||||
class Country(BaseModel):
|
class Country(BaseModel):
|
||||||
name: str
|
name: str
|
||||||
isoCode2: str
|
iso_code2: str = Field(alias='isoCode2')
|
||||||
isoCode3: str
|
iso_code3: str = Field(alias='isoCode3')
|
||||||
|
|
||||||
|
|
||||||
class HierarchyInfo(BaseModel):
|
class HierarchyInfo(BaseModel):
|
||||||
@ -27,25 +27,25 @@ class HierarchyInfo(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class Coordinates(BaseModel):
|
class Coordinates(BaseModel):
|
||||||
lat: float
|
latitude: float = Field(alias='lat')
|
||||||
long: float
|
longitude: float = Field(alias='long')
|
||||||
|
|
||||||
|
|
||||||
class GaiaRegionResult(BaseModel):
|
class GaiaRegionResult(BaseModel):
|
||||||
index: int
|
index: int
|
||||||
gaiaId: int
|
gaia_id: int = Field(alias='gaiaId')
|
||||||
type: str
|
type: str
|
||||||
regionNames: RegionNames
|
region_names: RegionNames = Field(alias='regionNames')
|
||||||
essId: EssId
|
ess_id: EssId = Field(alias='essId')
|
||||||
coordinates: Coordinates
|
coordinates: Coordinates
|
||||||
hierarchyInfo: HierarchyInfo
|
hierarchy_info: HierarchyInfo = Field(alias='hierarchyInfo')
|
||||||
|
|
||||||
|
|
||||||
class SearchResults(BaseModel):
|
class SearchResults(BaseModel):
|
||||||
q: str
|
query: str = Field(alias='q')
|
||||||
rid: str
|
request_id: str = Field(alias='rid')
|
||||||
rc: str
|
request_status: str = Field(alias='rc')
|
||||||
sr: list[GaiaRegionResult]
|
search_results: list[GaiaRegionResult] = Field(alias='sr')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
@ -53,5 +53,5 @@ if __name__ == "__main__":
|
|||||||
data = json.load(json_file)
|
data = json.load(json_file)
|
||||||
results = SearchResults(**data)
|
results = SearchResults(**data)
|
||||||
print('\n'.join(
|
print('\n'.join(
|
||||||
[result.regionNames.fullName for result in results.sr if result.type in ('CITY', 'NEIGHBORHOOD')])
|
[result.region_names.full_name for result in results.search_results if result.type in ('CITY', 'NEIGHBORHOOD')])
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user