8000 [pre-commit.ci] auto fixes from pre-commit.com hooks · pyscript/pyscript@ea05295 · GitHub
[go: up one dir, main page]
Skip to content

Commit ea05295

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent f8c5238 commit ea05295

File tree

6 files changed

+455
-114
lines changed

6 files changed

+455
-114
lines changed

‎core/tests/manual/issue-2302/glue/multipyjs.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
MICROPYTHON = config["type"] == "mpy"
44

55
if MICROPYTHON:
6+
67
def new(obj, *args, **kwargs):
78
return obj.new(*args, kwargs) if kwargs else obj.new(*args)
9+
810
def call(obj, *args, **kwargs):
911
return obj(*args, kwargs) if kwargs else obj(*args)
12+
1013
else:
14+
1115
def new(obj, *args, **kwargs):
1216
return obj.new(*args, **kwargs)
17+
1318
def call(obj, *args, **kwargs):
1419
return obj(*args, **kwargs)
1520

21+
1622
if not MICROPYTHON:
1723
import pyodide_js
24+
1825
pyodide_js.setDebug(True)
1926

2027
from pyscript.ffi import to_js, create_proxy

‎core/tests/manual/issue-2302/libfft.py

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
from dataclasses import dataclass, field
22
import sys
33

4+
45
@dataclass
56
class BeatSync:
67
fft_res: int = field()
78

89
on_beat: bool = False
910
beat: int = -1
1011
since_last_beat: float = sys.maxsize
11-
12+
1213
_prev: int = 0
1314
_count: int = 0
1415
_bins: list[int] = field(default_factory=list)
@@ -18,9 +19,12 @@ class BeatSync:
1819
_cooldown: float = 0.2
1920

2021
_highest: int = 0
21-
22+
2223
def __post_init__(self):
23-
self._bins = [int(13/16*self.fft_res/2)+17, int(13/16*self.fft_res/2)+18]
24+
self._bins = [
25+
int(13 / 16 * self.fft_res / 2) + 17,
26+
int(13 / 16 * self.fft_res / 2) + 18,
27+
]
2428

2529
def reset(self):
2630
self.beat = -1
@@ -29,7 +33,7 @@ def reset(self):
2933
self._last_detection = -1.0
3034
self.since_last_beat = sys.maxsize
3135
# print('bs reset')
32-
36+
3337
def update(self, data, running_time):
3438
self._count += 1
3539
self.since_last_beat = running_time - self._last_detection
@@ -47,6 +51,7 @@ def update(self, data, running_time):
4751
self.beat += 1
4852
self._prev = d
4953

54+
5055
@dataclass
5156
class FreqIntensity:
5257
freq: float = field()
@@ -61,23 +66,33 @@ class FreqIntensity:
6166
_bin_indexes: list[int] = field(default_factory=list)
6267
_harmonics: int = 8
6368
_slew_factor: float = 0.8
64-
69+
6570
def __post_init__(self):
6671
self._bin_indexes = [
67-
round((harmonic+1) * self.freq / self._sample_rate * self.fft_res / 2)
72+
round((harmonic + 1) * self.freq / self._sample_rate * self.fft_res / 2)
6873
for harmonic in range(self._harmonics)
6974
]
7075
print(self._bin_indexes)
71-
76+
7277
def update(self, data):
7378
intensity = 0.0
7479
for bin in range(self._harmonics):
75-
intensity += data[self._bin_indexes[bin]]/(bin+1)
80+
intensity += data[self._bin_indexes[bin]] / (bin + 1)
7681
self.intensity = intensity
77-
self.intensity_slew = self._slew_factor * self.intensity_slew + (1 - self._slew_factor) * intensity
82+
self.intensity_slew = (
83+
self._slew_factor * self.intensity_slew
84+
+ (1 - self._slew_factor) * intensity
85+
)
7886
self.max = max(intensity, self.max)
7987

8088
@property
8189
def intensity_scaled(self):
82-
raw = max(0, min(1.0, (self.intensity_slew - self.scale_min)/(self.scale_max - self.scale_min)))
90+
raw = max(
91+
0,
92+
min(
93+
1.0,
94+
(self.intensity_slew - self.scale_min)
95+
/ (self.scale_max - self.scale_min),
96+
),
97+
)
8398
return raw * raw

‎core/tests/manual/issue-2302/libthree.py

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010

1111
from multipyjs import MICROPYTHON, new, call, to_js, create_proxy
1212

13+
1314
@dataclass
1415
class SoundPlayer:
1516
sound: THREE.Audio = field()
1617
on_start: Callable[[], None] = field()
1718
on_stop: Callable[[], None] = field(default=lambda: None)
1819

1920
_start_time: float = -1.0
20-
21+
2122
def play(self):
2223
self.sound.stop()
2324
self.on_start()
@@ -34,7 +35,7 @@ def toggle(self):
3435
self.stop()
3536
else:
3637
self.play()
37-
38+
3839
@property
3940
def running_time(self):
4041
if self.sound.isPlaying:
@@ -43,6 +44,7 @@ def running_time(self):
4344
self.stop()
4445
return 0.0
4546

47+
4648
def get_renderer():
4749
renderer = new(THREE.WebGLRenderer, antialias=True)
4850
renderer.setSize(window.innerWidth, window.innerHeight)
@@ -57,6 +59,7 @@ def get_renderer():
5759
document.getElementById("threejs").appendChild(renderer.domElement)
5860

5961
initial = {0: "115px", 1: "calc(100vh - 120px)"}
62+
6063
@create_proxy
6164
def split_element_style(dimension, size, gutter_size, index):
6265
if index in initial:
@@ -72,64 +75,71 @@ def split_element_style(dimension, size, gutter_size, index):
7275
elementStyle=split_element_style,
7376
minSize=0,
7477
maxSize=to_js([120, 10000]),
75-
)
78+
)
7679
return renderer
7780

81+
7882
def get_ortho_camera(view_size):
7983
aspect_ratio = window.innerWidth / window.innerHeight
8084
camera = new(
8185
THREE.OrthographicCamera,
8286
-view_size * aspect_ratio, # Left
83-
view_size * aspect_ratio, # Right
84-
view_size, # Top
85-
-view_size, # Bottom
86-
-view_size, # Near plane
87-
view_size, # Far plane
87+
view_size * aspect_ratio, # Right
88+
view_size, # Top
89+
-view_size, # Bottom
90+
-view_size, # Near plane
91+
view_size, # Far plane
8892
)
8993
camera.updateProjectionMatrix()
9094
camera.position.set(0, 0, 0)
9195
return camera
9296

97+
9398
def get_loading_manager():
9499
loading_mgr = new(THREE.LoadingManager)
95100
ev = asyncio.Event()
96-
101+
97102
@create_proxy
98103
def on_start(url, itemsLoaded, itemsTotal):
99104
print(f'[{itemsLoaded}/{itemsTotal}] Started loading file: {url}')
105+
100106
loading_mgr.onStart = on_start
101-
107+
102108
@create_proxy
103109
def on_progress(url, itemsLoaded, itemsTotal):
104110
print(f'[{itemsLoaded}/{itemsTotal}] Loading file: {url}')
111+
105112
loading_mgr.onProgress = on_progress
106-
113+
107114
@create_proxy
108115
def on_error(url):
109116
print(f'There was a problem loading {url}')
117+
110118
loading_mgr.onError = on_error
111-
119+
112120
@create_proxy
113121
def on_load():
114122
print('Loading assets complete!')
115123
ev.set()
124+
116125
loading_mgr.onLoad = on_load
117-
126+
118127
return loading_mgr, ev
119128

120129

121130
def get_perspective_camera():
122131
aspect_ratio = window.innerWidth / window.innerHeight
123132
camera = new(
124133
THREE.PerspectiveCamera,
125-
45, # fov
134+
45, # fov
126135
aspect_ratio,
127-
0.25, # near plane
128-
300, # far plane
136+
0.25, # near plane
137+
300, # far plane
129138
)
130139
camera.position.set(0, 0, 30)
131140
return camera
132141

142+
133143
def get_stats_gl(renderer):
134144
stats = new(StatsGL, trackGPU=True, horizontal=False)
135145
stats.init(renderer)
@@ -138,19 +148,20 @@ def get_stats_gl(renderer):
138148
document.getElementById("stats").appendChild(stats.dom)
139149
return stats
140150

151+
141152
def bg_from_v(*vertices):
142153
geometry = new(THREE.BufferGeometry)
143154
vertices_f32a = new(Float32Array, vertices)
144155
attr = new(THREE.Float32BufferAttribute, vertices_f32a, 3)
145156
return geometry.setAttribute('position', attr)
146157

158+
147159
def bg_from_p(*points):
148160
buf = new(THREE.BufferGeometry)
149-
buf.setFromPoints(
150-
[new(THREE.Vector3, p[0], p[1], p[2]) for p in points]
151-
)
161+
buf.setFromPoints([new(THREE.Vector3, p[0], p[1], p[2]) for p in points])
152162
return buf
153163

164+
154165
def clear():
155166
# toggle stats and terminal?
156167
stats_style = document.getElementById("stats-off").style
@@ -160,7 +171,7 @@ def clear():
160171
document.getElementById("pyterm").style.height = "115px"
161172
document.getElementById("threejs").style.height = "calc(100vh - 120px)"
162173
for e in document.getElementsByClassName("gutter"):
163-
e.style.removeProperty("display")
174+
e.style.removeProperty("display")
164175
for e in document.getElementsByClassName("xterm-helper-textarea"):
165176
e.focus()
166177
break
@@ -186,4 +197,4 @@ def clear():
186197
for e in document.getElementsByTagName("svg"):
187198
style = e.getAttribute("style")
188199
if style and style.startswith("z-index:999"):
189-
e.style.display = "none"
200+
e.style.display = "none"

0 commit comments

Comments
 (0)
0