Skip to content

Commit 4b95b42

Browse files
author
Charles Larivier
committed
lint: black
1 parent 8066080 commit 4b95b42

20 files changed

+243
-194
lines changed

metabase/exceptions.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
21
class NotFoundError(Exception):
32
pass

metabase/metabase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def token(self):
3838
if self._token is None:
3939
response = requests.post(
4040
self.host + "/api/session",
41-
json={"username": self.user, "password": self.password}
41+
json={"username": self.user, "password": self.password},
4242
)
4343
self._token = response.json()["id"]
4444

metabase/missing.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
21
class MISSING:
32
pass

metabase/resource.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from __future__ import annotations
22

33
from exceptions import NotFoundError
4-
from metabase import Metabase
54
from requests import HTTPError
65

6+
from metabase import Metabase
77
from metabase.missing import MISSING
88

99

@@ -24,7 +24,12 @@ def __repr__(self):
2424
if self.PRIMARY_KEY is not None:
2525
attributes.insert(0, attributes.pop(attributes.index(self.PRIMARY_KEY)))
2626

27-
return self.__class__.__qualname__ + "(" + ', '.join([f"{attr}={getattr(self, attr)}" for attr in attributes]) + ")"
27+
return (
28+
self.__class__.__qualname__
29+
+ "("
30+
+ ", ".join([f"{attr}={getattr(self, attr)}" for attr in attributes])
31+
+ ")"
32+
)
2833

2934
@staticmethod
3035
def connection() -> Metabase:
@@ -72,7 +77,9 @@ def update(self, **kwargs) -> None:
7277
ignored from the request.
7378
"""
7479
params = {k: v for k, v in kwargs.items() if v != MISSING}
75-
response = self.connection().put(self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}", json=params)
80+
response = self.connection().put(
81+
self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}", json=params
82+
)
7683

7784
if response.status_code != 200:
7885
raise HTTPError(response.json())
@@ -84,7 +91,9 @@ def update(self, **kwargs) -> None:
8491
class DeleteResource(Resource):
8592
def delete(self) -> None:
8693
"""Delete an instance."""
87-
response = self.connection().delete(self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}")
94+
response = self.connection().delete(
95+
self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}"
96+
)
8897

8998
if response.status_code not in (200, 204):
9099
raise HTTPError(response.content.decode())

metabase/resources/dataset.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@ class Dataset(CreateResource):
3838
average_execution_time: int = None
3939

4040
@classmethod
41-
def create(
42-
cls,
43-
database: int,
44-
type: str,
45-
query: dict,
46-
**kwargs
47-
) -> Dataset:
41+
def create(cls, database: int, type: str, query: dict, **kwargs) -> Dataset:
4842
dataset = super(Dataset, cls).create(database=database, type=type, query=query)
4943
dataset.data = Data(**dataset.data)
5044
return dataset

metabase/resources/field.py

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from enum import Enum
44
from typing import Any, Dict, List, Optional
55

6-
from metabase.resource import GetResource, UpdateResource
76
from metabase.missing import MISSING
7+
from metabase.resource import GetResource, UpdateResource
88

99

1010
class Field(GetResource, UpdateResource):
@@ -115,18 +115,18 @@ def get(cls, id: int) -> Field:
115115
return super(Field, cls).get(id)
116116

117117
def update(
118-
self,
119-
display_name: str = MISSING,
120-
description: str = MISSING,
121-
semantic_type: Field.SemanticType = MISSING,
122-
visibility_type: Field.VisibilityType = MISSING,
123-
fk_target_field_id: int = MISSING,
124-
has_field_values: Field.FieldValue = MISSING,
125-
points_of_interest: str = MISSING,
126-
settings: str = MISSING,
127-
caveats: str = MISSING,
128-
coercion_strategy: str = MISSING,
129-
**kwargs
118+
self,
119+
display_name: str = MISSING,
120+
description: str = MISSING,
121+
semantic_type: Field.SemanticType = MISSING,
122+
visibility_type: Field.VisibilityType = MISSING,
123+
fk_target_field_id: int = MISSING,
124+
has_field_values: Field.FieldValue = MISSING,
125+
points_of_interest: str = MISSING,
126+
settings: str = MISSING,
127+
caveats: str = MISSING,
128+
coercion_strategy: str = MISSING,
129+
**kwargs,
130130
) -> None:
131131
return super(Field, self).update(
132132
display_name=display_name,
@@ -138,14 +138,22 @@ def update(
138138
points_of_interest=points_of_interest,
139139
settings=settings,
140140
caveats=caveats,
141-
coercion_strategy=coercion_strategy
141+
coercion_strategy=coercion_strategy,
142142
)
143143

144144
def related(self) -> Dict[str, Any]:
145-
return self.connection().get(self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}" + "/related").json()
145+
return (
146+
self.connection()
147+
.get(self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}" + "/related")
148+
.json()
149+
)
146150

147151
def discard_values(self):
148-
self.connection().post(self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}" + "/discard_values")
152+
self.connection().post(
153+
self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}" + "/discard_values"
154+
)
149155

150156
def rescan_values(self):
151-
self.connection().post(self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}" + "/rescan_values")
157+
self.connection().post(
158+
self.ENDPOINT + f"/{getattr(self, self.PRIMARY_KEY)}" + "/rescan_values"
159+
)

metabase/resources/metric.py

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from datetime import datetime
44
from typing import List
55

6-
from metabase.resource import ListResource, CreateResource, GetResource, UpdateResource
76
from metabase.missing import MISSING
7+
from metabase.resource import CreateResource, GetResource, ListResource, UpdateResource
88

99

1010
class Metric(ListResource, CreateResource, GetResource, UpdateResource):
@@ -40,29 +40,33 @@ def get(cls, id: int) -> Metric:
4040

4141
@classmethod
4242
def create(
43-
cls,
44-
name: str,
45-
table_id: int,
46-
definition: dict,
47-
description: str = "Created by metabase-python.",
48-
**kwargs
43+
cls,
44+
name: str,
45+
table_id: int,
46+
definition: dict,
47+
description: str = "Created by metabase-python.",
48+
**kwargs
4949
) -> Metric:
5050
return super(Metric, cls).create(
51-
name=name, table_id=table_id, definition=definition, description=description, **kwargs
51+
name=name,
52+
table_id=table_id,
53+
definition=definition,
54+
description=description,
55+
**kwargs
5256
)
5357

5458
def update(
55-
self,
56-
revision_message: str = "Updated by metabase-python.",
57-
name: str = MISSING,
58-
description: str = MISSING,
59-
definition: dict = MISSING,
60-
how_is_this_calculated: str = MISSING,
61-
points_of_interest: str = MISSING,
62-
caveats: str = MISSING,
63-
archived: bool = MISSING,
64-
show_in_getting_started: bool = MISSING,
65-
**kwargs
59+
self,
60+
revision_message: str = "Updated by metabase-python.",
61+
name: str = MISSING,
62+
description: str = MISSING,
63+
definition: dict = MISSING,
64+
how_is_this_calculated: str = MISSING,
65+
points_of_interest: str = MISSING,
66+
caveats: str = MISSING,
67+
archived: bool = MISSING,
68+
show_in_getting_started: bool = MISSING,
69+
**kwargs
6670
) -> None:
6771
return super(Metric, self).update(
6872
revision_message=revision_message,
@@ -78,4 +82,6 @@ def update(
7882
)
7983

8084
def archive(self):
81-
return self.update(archived=True, revision_message="Archived by metabase-python.")
85+
return self.update(
86+
archived=True, revision_message="Archived by metabase-python."
87+
)

metabase/resources/permission_group.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22

33
from typing import List
44

5-
from metabase.resource import ListResource, CreateResource, GetResource, UpdateResource, DeleteResource
6-
7-
8-
class PermissionGroup(ListResource, CreateResource, GetResource, UpdateResource, DeleteResource):
5+
from metabase.resource import (
6+
CreateResource,
7+
DeleteResource,
8+
GetResource,
9+
ListResource,
10+
UpdateResource,
11+
)
12+
13+
14+
class PermissionGroup(
15+
ListResource, CreateResource, GetResource, UpdateResource, DeleteResource
16+
):
917
ENDPOINT = "/api/permissions/group"
1018

1119
id: int

metabase/resources/segment.py

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from datetime import datetime
44
from typing import List, Optional
55

6-
from metabase.resource import ListResource, CreateResource, GetResource, UpdateResource
76
from metabase.missing import MISSING
7+
from metabase.resource import CreateResource, GetResource, ListResource, UpdateResource
88

99

1010
class Segment(ListResource, CreateResource, GetResource, UpdateResource):
@@ -36,28 +36,32 @@ def get(cls, id: int) -> Segment:
3636

3737
@classmethod
3838
def create(
39-
cls,
40-
name: str,
41-
table_id: int,
42-
definition: dict,
43-
description: str = "Created by metabase-python.",
44-
**kwargs
39+
cls,
40+
name: str,
41+
table_id: int,
42+
definition: dict,
43+
description: str = "Created by metabase-python.",
44+
**kwargs
4545
) -> Segment:
4646
return super(Segment, cls).create(
47-
name=name, table_id=table_id, definition=definition, description=description, **kwargs
47+
name=name,
48+
table_id=table_id,
49+
definition=definition,
50+
description=description,
51+
**kwargs
4852
)
4953

5054
def update(
51-
self,
52-
revision_message: str = "Updated by metabase-python.",
53-
name: str = MISSING,
54-
description: str = MISSING,
55-
definition: dict = MISSING,
56-
show_in_getting_started: str = MISSING,
57-
points_of_interest: str = MISSING,
58-
caveats: str = MISSING,
59-
archived: bool = MISSING,
60-
**kwargs
55+
self,
56+
revision_message: str = "Updated by metabase-python.",
57+
name: str = MISSING,
58+
description: str = MISSING,
59+
definition: dict = MISSING,
60+
show_in_getting_started: str = MISSING,
61+
points_of_interest: str = MISSING,
62+
caveats: str = MISSING,
63+
archived: bool = MISSING,
64+
**kwargs
6165
) -> None:
6266
return super(Segment, self).update(
6367
revision_message=revision_message,
@@ -72,4 +76,6 @@ def update(
7276
)
7377

7478
def archive(self):
75-
return self.update(archived=True, revision_message="Archived by metabase-python.")
79+
return self.update(
80+
archived=True, revision_message="Archived by metabase-python."
81+
)

0 commit comments

Comments
 (0)