Skip to content

Commit aa6c643

Browse files
soxofaansoxofaan
committed
PR #771 code style cleanup
using `darker -v -r master openeo`
1 parent 50d3743 commit aa6c643

File tree

6 files changed

+77
-47
lines changed

6 files changed

+77
-47
lines changed

‎openeo/metadata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ class CollectionMetadata(CubeMetadata):
519519
520520
"""
521521

522-
def __init__(self, metadata: dict, dimensions: List[Dimension] = None, federation = None):
522+
def __init__(self, metadata: dict, dimensions: List[Dimension] = None, federation=None):
523523
self._orig_metadata = metadata
524524
self._federation = federation
525525
if dimensions is None:
@@ -641,7 +641,7 @@ def extent(self) -> dict:
641641
return self._orig_metadata.get("extent")
642642

643643
def _repr_html_(self):
644-
return render_component("collection", data=self._orig_metadata, parameters={'federation': self._federation})
644+
return render_component("collection", data=self._orig_metadata, parameters={"federation": self._federation})
645645

646646
def __str__(self) -> str:
647647
bands = self.band_names if self.has_band_dimension() else "no bands dimension"

‎openeo/rest/connection.py

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -777,10 +777,11 @@ def list_file_formats(self) -> dict:
777777
load=lambda: self.get('/file_formats', expected_status=200).json()
778778
)
779779
federation = self.capabilities().ext_federation_backend_details()
780-
return VisualDict("file-formats", data=formats, parameters={
781-
'missing': formats.get("federation:missing", None),
782-
'federation': federation
783-
})
780+
return VisualDict(
781+
"file-formats",
782+
data=formats,
783+
parameters={"missing": formats.get("federation:missing", None), "federation": federation},
784+
)
784785

785786
def list_service_types(self) -> dict:
786787
"""
@@ -805,7 +806,7 @@ def list_udf_runtimes(self) -> dict:
805806
load=lambda: self.get('/udf_runtimes', expected_status=200).json()
806807
)
807808
federation = self.capabilities().ext_federation_backend_details()
808-
return VisualDict("udf-runtimes", data=runtimes, parameters={'federation': federation})
809+
return VisualDict("udf-runtimes", data=runtimes, parameters={"federation": federation})
809810

810811
def list_services(self) -> dict:
811812
"""
@@ -816,11 +817,15 @@ def list_services(self) -> dict:
816817
# TODO return parsed service objects
817818
services = self.get('/services', expected_status=200).json()["services"]
818819
federation = self.capabilities().ext_federation_backend_details()
819-
return VisualList("data-table", data=services, parameters={
820-
'columns': 'services',
821-
'missing': services.get("federation:missing", None),
822-
'federation': federation
823-
})
820+
return VisualList(
821+
"data-table",
822+
data=services,
823+
parameters={
824+
"columns": "services",
825+
"missing": services.get("federation:missing", None),
826+
"federation": federation,
827+
},
828+
)
824829

825830
def describe_collection(self, collection_id: str) -> dict:
826831
"""
@@ -838,7 +843,7 @@ def describe_collection(self, collection_id: str) -> dict:
838843
# TODO: add caching #383
839844
data = self.get(f"/collections/{collection_id}", expected_status=200).json()
840845
federation = self.capabilities().ext_federation_backend_details()
841-
return VisualDict("collection", data=data, parameters={'federation': federation})
846+
return VisualDict("collection", data=data, parameters={"federation": federation})
842847

843848
def collection_items(
844849
self,
@@ -877,7 +882,16 @@ def collection_items(
877882
params['limit'] = limit
878883

879884
federation = self.capabilities().ext_federation_backend_details()
880-
return paginate(self, url, params, lambda response, page: VisualDict("items", data = response, parameters = {'show-map': True, 'heading': 'Page {} - Items'.format(page), 'federation': federation}))
885+
return paginate(
886+
self,
887+
url,
888+
params,
889+
lambda response, page: VisualDict(
890+
"items",
891+
data=response,
892+
parameters={"show-map": True, "heading": "Page {} - Items".format(page), "federation": federation},
893+
),
894+
)
881895

882896
def collection_metadata(self, name) -> CollectionMetadata:
883897
# TODO: duplication with `Connection.describe_collection`: deprecate one or the other?
@@ -920,11 +934,11 @@ def describe_process(self, id: str, namespace: Optional[str] = None) -> dict:
920934
federation = self.capabilities().ext_federation_backend_details()
921935
for process in processes:
922936
if process["id"] == id:
923-
return VisualDict("process", data=process, parameters={
924-
'show-graph': True,
925-
'provide-download': False,
926-
'federation': federation
927-
})
937+
return VisualDict(
938+
"process",
939+
data=process,
940+
parameters={"show-graph": True, "provide-download": False, "federation": federation},
941+
)
928942

929943
raise OpenEoClientException("Process does not exist.")
930944

@@ -1514,14 +1528,18 @@ def list_files(self) -> List[UserFile]:
15141528
15151529
:return: List of the user-uploaded files.
15161530
"""
1517-
data = self.get('/files', expected_status=200).json()
1518-
files = [UserFile.from_metadata(metadata=f, connection=self) for f in data.get('files', [])]
1531+
data = self.get("/files", expected_status=200).json()
1532+
files = [UserFile.from_metadata(metadata=f, connection=self) for f in data.get("files", [])]
15191533
federation = self.capabilities().ext_federation_backend_details()
1520-
return VisualList("data-table", data=files, parameters={
1521-
'columns': 'files',
1522-
'missing': data.get('federation:missing', None),
1523-
'federation': federation,
1524-
})
1534+
return VisualList(
1535+
"data-table",
1536+
data=files,
1537+
parameters={
1538+
"columns": "files",
1539+
"missing": data.get("federation:missing", None),
1540+
"federation": federation,
1541+
},
1542+
)
15251543

15261544
def get_file(
15271545
self, path: Union[str, PurePosixPath], metadata: Optional[dict] = None

‎openeo/rest/job.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,14 @@ def __repr__(self):
8282
def _repr_html_(self):
8383
data = self.describe()
8484
capabilities = self.connection.capabilities()
85-
return render_component('job', data=data, parameters={
86-
'currency': capabilities.currency(),
87-
'federation': capabilities.ext_federation_backend_details(),
88-
})
85+
return render_component(
86+
"job",
87+
data=data,
88+
parameters={
89+
"currency": capabilities.currency(),
90+
"federation": capabilities.ext_federation_backend_details(),
91+
},
92+
)
8993

9094
@openeo_endpoint("GET /jobs/{job_id}")
9195
def describe(self) -> dict:

‎openeo/rest/models/general.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class CollectionListingResponse(list):
5252

5353
__slots__ = ["_data", "_connection"]
5454

55-
def __init__(self, response_data: dict, connection = None):
55+
def __init__(self, response_data: dict, connection=None):
5656
self._data = response_data
5757
self._connection = connection
5858
# Mimic original list of collection metadata dictionaries
@@ -68,7 +68,7 @@ def _repr_html_(self):
6868
parameters={
6969
"missing": self.ext_federation_missing(),
7070
"federation": federation,
71-
}
71+
},
7272
)
7373

7474
@property
@@ -113,7 +113,7 @@ class ProcessListingResponse(list):
113113

114114
__slots__ = ["_data", "_connection"]
115115

116-
def __init__(self, response_data: dict, connection = None):
116+
def __init__(self, response_data: dict, connection=None):
117117
self._data = response_data
118118
self._connection = connection
119119
# Mimic original list of process metadata dictionaries
@@ -131,7 +131,7 @@ def _repr_html_(self):
131131
"provide-download": False,
132132
"missing": self.ext_federation_missing(),
133133
"federation": federation,
134-
}
134+
},
135135
)
136136

137137
@property
@@ -177,7 +177,7 @@ class JobListingResponse(list):
177177

178178
__slots__ = ["_data", "_connection"]
179179

180-
def __init__(self, response_data: dict, connection = None):
180+
def __init__(self, response_data: dict, connection=None):
181181
self._data = response_data
182182
self._connection = connection
183183
# Mimic original list of process metadata dictionaries
@@ -194,7 +194,7 @@ def _repr_html_(self):
194194
"columns": "jobs",
195195
"missing": self.ext_federation_missing(),
196196
"federation": federation,
197-
}
197+
},
198198
)
199199

200200
@property
@@ -243,7 +243,7 @@ class LogsResponse(list):
243243

244244
__slots__ = ["_data", "_connection"]
245245

246-
def __init__(self, response_data: dict, *, log_level: Optional[str] = None, connection = None):
246+
def __init__(self, response_data: dict, *, log_level: Optional[str] = None, connection=None):
247247
self._data = response_data
248248
self._connection = connection
249249

@@ -277,7 +277,7 @@ def _repr_html_(self):
277277
parameters={
278278
"missing": self.ext_federation_missing(),
279279
"federation": federation,
280-
}
280+
},
281281
)
282282

283283
@property

‎openeo/rest/service.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ def __repr__(self):
2626
def _repr_html_(self):
2727
data = self.describe_service()
2828
capabilities = self.connection.capabilities()
29-
return VisualDict('service', data = data, parameters = {
30-
'currency': capabilities.currency(),
31-
'federation': capabilities.ext_federation_backend_details(),
32-
})
29+
return VisualDict(
30+
"service",
31+
data=data,
32+
parameters={
33+
"currency": capabilities.currency(),
34+
"federation": capabilities.ext_federation_backend_details(),
35+
},
36+
)
3337

3438
def describe_service(self):
3539
""" Get all information about a secondary web service."""

‎openeo/rest/udp.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,15 @@ def __init__(self, user_defined_process_id: str, connection: Connection):
9090
def _repr_html_(self):
9191
process = self.describe()
9292
federation = self._connection.capabilities().ext_federation_backend_details()
93-
return render_component('process', data=process, parameters = {
94-
'show-graph': True,
95-
'provide-download': False,
96-
'federation': federation,
97-
})
93+
return render_component(
94+
"process",
95+
data=process,
96+
parameters={
97+
"show-graph": True,
98+
"provide-download": False,
99+
"federation": federation,
100+
},
101+
)
98102

99103
def store(
100104
self,

0 commit comments

Comments
 (0)