From 243eea864b035d78d4154293d35fffa943f2fda9 Mon Sep 17 00:00:00 2001 From: david-ajax Date: Fri, 19 Dec 2025 15:13:42 +0800 Subject: [PATCH] =?UTF-8?q?style:=20isort=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 -- src/heurams/context.py | 3 ++- src/heurams/interface/__main__.py | 14 +++++----- src/heurams/interface/screens/about.py | 11 ++------ src/heurams/interface/screens/dashboard.py | 26 +++++++------------ src/heurams/interface/screens/memorizor.py | 18 +++++++------ src/heurams/interface/screens/nucreator.py | 19 +++++--------- src/heurams/interface/screens/precache.py | 26 +++++++------------ src/heurams/interface/screens/preparation.py | 16 ++++-------- src/heurams/interface/screens/synctool.py | 19 +++++--------- src/heurams/interface/shim.py | 5 ++-- .../interface/widgets/base_puzzle_widget.py | 2 ++ src/heurams/interface/widgets/basic_puzzle.py | 16 +++++------- src/heurams/interface/widgets/cloze_puzzle.py | 18 ++++++------- src/heurams/interface/widgets/finished.py | 5 +--- src/heurams/interface/widgets/mcq_puzzle.py | 14 +++++----- src/heurams/interface/widgets/placeholder.py | 5 +--- src/heurams/interface/widgets/recognition.py | 23 +++++++--------- src/heurams/kernel/algorithms/__init__.py | 3 ++- src/heurams/kernel/algorithms/base.py | 3 ++- src/heurams/kernel/algorithms/sm2.py | 6 +++-- src/heurams/kernel/particles/__init__.py | 4 +-- src/heurams/kernel/particles/atom.py | 19 ++++++++------ src/heurams/kernel/particles/loader.py | 13 ++++++---- src/heurams/kernel/particles/orbital.py | 1 + src/heurams/kernel/particles/probe.py | 3 ++- src/heurams/kernel/puzzles/cloze.py | 4 ++- src/heurams/kernel/puzzles/mcq.py | 6 +++-- src/heurams/kernel/puzzles/recognition.py | 4 ++- src/heurams/kernel/reactor/__init__.py | 7 ++--- src/heurams/kernel/reactor/fission.py | 6 +++-- src/heurams/kernel/reactor/phaser.py | 5 ++-- src/heurams/kernel/reactor/procession.py | 3 ++- src/heurams/kernel/reactor/states.py | 1 + src/heurams/providers/audio/__init__.py | 4 +-- .../providers/audio/playsound_audio.py | 2 ++ src/heurams/providers/audio/protocol.py | 3 ++- src/heurams/providers/audio/termux_audio.py | 1 + src/heurams/providers/tts/__init__.py | 3 ++- src/heurams/providers/tts/base.py | 1 + src/heurams/providers/tts/edge_tts.py | 5 +++- src/heurams/services/audio_service.py | 3 ++- src/heurams/services/config.py | 4 ++- src/heurams/services/hasher.py | 1 + src/heurams/services/timer.py | 3 ++- src/heurams/services/tts_service.py | 3 ++- tests/interface/test_dashboard.py | 11 ++++---- tests/kernel/algorithms/test_sm2.py | 2 +- tests/kernel/particles/test_atom.py | 11 ++++---- tests/kernel/particles/test_electron.py | 6 ++--- tests/kernel/particles/test_nucleon.py | 2 +- tests/kernel/puzzles/test_cloze.py | 2 +- tests/kernel/puzzles/test_mcq.py | 2 +- tests/kernel/reactor/test_phaser.py | 6 ++--- 54 files changed, 202 insertions(+), 203 deletions(-) diff --git a/.gitignore b/.gitignore index 02a5366..0bb7d61 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,6 @@ electron/test.toml build/ dist/ old/ - -# Project specific directories # config/ data/cache/ data/electron/ diff --git a/src/heurams/context.py b/src/heurams/context.py index 0ca87bd..abf29d1 100644 --- a/src/heurams/context.py +++ b/src/heurams/context.py @@ -3,8 +3,9 @@ 以及基准路径 """ -from contextvars import ContextVar import pathlib +from contextvars import ContextVar + from heurams.services.config import ConfigFile from heurams.services.logger import get_logger diff --git a/src/heurams/interface/__main__.py b/src/heurams/interface/__main__.py index 667bca2..789f9d0 100644 --- a/src/heurams/interface/__main__.py +++ b/src/heurams/interface/__main__.py @@ -1,10 +1,12 @@ from textual.app import App from textual.widgets import Button + +from heurams.services.logger import get_logger + +from .screens.about import AboutScreen from .screens.dashboard import DashboardScreen from .screens.nucreator import NucleonCreatorScreen from .screens.precache import PrecachingScreen -from .screens.about import AboutScreen -from heurams.services.logger import get_logger logger = get_logger(__name__) @@ -66,11 +68,11 @@ def is_subdir(parent, child): return 0 -# 开发模式 -from heurams.context import rootdir, workdir, config_var -from pathlib import Path -from heurams.context import rootdir import os +from pathlib import Path + +# 开发模式 +from heurams.context import config_var, rootdir, workdir if is_subdir(Path(rootdir), Path(os.getcwd())): os.chdir(Path(rootdir) / ".." / "..") diff --git a/src/heurams/interface/screens/about.py b/src/heurams/interface/screens/about.py index c922b82..b0b4904 100644 --- a/src/heurams/interface/screens/about.py +++ b/src/heurams/interface/screens/about.py @@ -1,15 +1,8 @@ #!/usr/bin/env python3 from textual.app import ComposeResult -from textual.widgets import ( - Header, - Footer, - Label, - Static, - Button, - Markdown, -) -from textual.containers import ScrollableContainer, ScrollableContainer +from textual.containers import ScrollableContainer from textual.screen import Screen +from textual.widgets import Button, Footer, Header, Label, Markdown, Static import heurams.services.version as version from heurams.context import * diff --git a/src/heurams/interface/screens/dashboard.py b/src/heurams/interface/screens/dashboard.py index 0eabb0a..f4234c0 100644 --- a/src/heurams/interface/screens/dashboard.py +++ b/src/heurams/interface/screens/dashboard.py @@ -1,26 +1,20 @@ #!/usr/bin/env python3 +import pathlib + from textual.app import ComposeResult -from textual.widgets import ( - Header, - Footer, - Label, - ListView, - ListItem, - Button, - Static, -) from textual.containers import ScrollableContainer from textual.screen import Screen +from textual.widgets import (Button, Footer, Header, Label, ListItem, ListView, + Static) -from heurams.kernel.particles import * -from heurams.context import * -import heurams.services.version as version import heurams.services.timer as timer -from .preparation import PreparationScreen -from .about import AboutScreen +import heurams.services.version as version +from heurams.context import * +from heurams.kernel.particles import * from heurams.services.logger import get_logger -import pathlib +from .about import AboutScreen +from .preparation import PreparationScreen logger = get_logger(__name__) @@ -51,8 +45,8 @@ class DashboardScreen(Screen): res = dict() filestem = pathlib.Path(filename).stem res[0] = f"{filename}\0" - from heurams.kernel.particles.loader import load_electron import heurams.kernel.particles as pt + from heurams.kernel.particles.loader import load_electron electron_file_path = pathlib.Path(config_var.get()["paths"]["electron_dir"]) / ( filestem + ".json" diff --git a/src/heurams/interface/screens/memorizor.py b/src/heurams/interface/screens/memorizor.py index 89d9f81..9d22b4a 100644 --- a/src/heurams/interface/screens/memorizor.py +++ b/src/heurams/interface/screens/memorizor.py @@ -1,16 +1,18 @@ #!/usr/bin/env python3 -from textual.app import ComposeResult -from textual.widgets import Header, Footer, Label, Static, Button -from textual.containers import Center, ScrollableContainer -from textual.screen import Screen -from textual.reactive import reactive from enum import Enum, auto -from heurams.services.logger import get_logger -from heurams.context import config_var -from heurams.kernel.reactor import * +from textual.app import ComposeResult +from textual.containers import Center, ScrollableContainer +from textual.reactive import reactive +from textual.screen import Screen +from textual.widgets import Button, Footer, Header, Label, Static + import heurams.kernel.particles as pt import heurams.kernel.puzzles as pz +from heurams.context import config_var +from heurams.kernel.reactor import * +from heurams.services.logger import get_logger + from .. import shim diff --git a/src/heurams/interface/screens/nucreator.py b/src/heurams/interface/screens/nucreator.py index 2126eab..735dda6 100644 --- a/src/heurams/interface/screens/nucreator.py +++ b/src/heurams/interface/screens/nucreator.py @@ -1,21 +1,15 @@ #!/usr/bin/env python3 +from pathlib import Path + +import toml from textual.app import ComposeResult -from textual.widgets import ( - Header, - Footer, - Label, - Input, - Select, - Button, - Markdown, -) from textual.containers import ScrollableContainer from textual.screen import Screen +from textual.widgets import (Button, Footer, Header, Input, Label, Markdown, + Select) -from heurams.services.version import ver -import toml -from pathlib import Path from heurams.context import config_var +from heurams.services.version import ver class NucleonCreatorScreen(Screen): @@ -27,6 +21,7 @@ class NucleonCreatorScreen(Screen): def search_templates(self): from pathlib import Path + from heurams.context import config_var template_dir = Path(config_var.get()["paths"]["template_dir"]) diff --git a/src/heurams/interface/screens/precache.py b/src/heurams/interface/screens/precache.py index d6d375e..a222d54 100644 --- a/src/heurams/interface/screens/precache.py +++ b/src/heurams/interface/screens/precache.py @@ -1,22 +1,15 @@ #!/usr/bin/env python3 -from textual.app import ComposeResult -from textual.widgets import ( - Header, - Footer, - Label, - Button, - Static, - ProgressBar, -) -from textual.containers import ScrollableContainer, Horizontal -from textual.containers import ScrollableContainer -from textual.screen import Screen import pathlib +from textual.app import ComposeResult +from textual.containers import Horizontal, ScrollableContainer +from textual.screen import Screen +from textual.widgets import Button, Footer, Header, Label, ProgressBar, Static +from textual.worker import get_current_worker + import heurams.kernel.particles as pt import heurams.services.hasher as hasher from heurams.context import * -from textual.worker import get_current_worker class PrecachingScreen(Screen): @@ -96,7 +89,7 @@ class PrecachingScreen(Screen): def precache_by_text(self, text: str): """预缓存单段文本的音频""" - from heurams.context import rootdir, workdir, config_var + from heurams.context import config_var, rootdir, workdir cache_dir = pathlib.Path(config_var.get()["paths"]["cache_dir"]) cache_dir.mkdir(parents=True, exist_ok=True) @@ -166,7 +159,7 @@ class PrecachingScreen(Screen): def precache_all_files(self): """预缓存所有文件""" - from heurams.context import rootdir, workdir, config_var + from heurams.context import config_var, rootdir, workdir nucleon_path = pathlib.Path(config_var.get()["paths"]["nucleon_dir"]) nucleon_files = [ @@ -220,7 +213,8 @@ class PrecachingScreen(Screen): # 清空缓存 try: import shutil - from heurams.context import rootdir, workdir, config_var + + from heurams.context import config_var, rootdir, workdir shutil.rmtree( f"{config_var.get()["paths"]["cache_dir"]}", ignore_errors=True diff --git a/src/heurams/interface/screens/preparation.py b/src/heurams/interface/screens/preparation.py index 12d90c5..37de55f 100644 --- a/src/heurams/interface/screens/preparation.py +++ b/src/heurams/interface/screens/preparation.py @@ -1,21 +1,15 @@ #!/usr/bin/env python3 from textual.app import ComposeResult -from textual.widgets import ( - Header, - Footer, - Label, - Static, - Button, - Markdown, -) from textual.containers import ScrollableContainer +from textual.reactive import reactive from textual.screen import Screen -from heurams.context import config_var +from textual.widget import Widget +from textual.widgets import Button, Footer, Header, Label, Markdown, Static + import heurams.kernel.particles as pt import heurams.services.hasher as hasher from heurams.context import * -from textual.reactive import reactive -from textual.widget import Widget +from heurams.context import config_var from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/interface/screens/synctool.py b/src/heurams/interface/screens/synctool.py index ba6ca66..1a41805 100644 --- a/src/heurams/interface/screens/synctool.py +++ b/src/heurams/interface/screens/synctool.py @@ -1,22 +1,15 @@ #!/usr/bin/env python3 -from textual.app import ComposeResult -from textual.widgets import ( - Header, - Footer, - Label, - Button, - Static, - ProgressBar, -) -from textual.containers import ScrollableContainer, Horizontal -from textual.containers import ScrollableContainer -from textual.screen import Screen import pathlib +from textual.app import ComposeResult +from textual.containers import Horizontal, ScrollableContainer +from textual.screen import Screen +from textual.widgets import Button, Footer, Header, Label, ProgressBar, Static +from textual.worker import get_current_worker + import heurams.kernel.particles as pt import heurams.services.hasher as hasher from heurams.context import * -from textual.worker import get_current_worker class SyncScreen(Screen): diff --git a/src/heurams/interface/shim.py b/src/heurams/interface/shim.py index f00bdc0..a8165c8 100644 --- a/src/heurams/interface/shim.py +++ b/src/heurams/interface/shim.py @@ -1,10 +1,11 @@ """Kernel 操作辅助函数库""" import random +from typing import TypedDict + +import heurams.interface.widgets as pzw import heurams.kernel.particles as pt import heurams.kernel.puzzles as pz -import heurams.interface.widgets as pzw -from typing import TypedDict staging = {} # 细粒度缓存区, 是 ident -> quality 的封装 diff --git a/src/heurams/interface/widgets/base_puzzle_widget.py b/src/heurams/interface/widgets/base_puzzle_widget.py index 57606c0..e0eba81 100644 --- a/src/heurams/interface/widgets/base_puzzle_widget.py +++ b/src/heurams/interface/widgets/base_puzzle_widget.py @@ -1,6 +1,8 @@ from typing import Iterable + from textual.app import ComposeResult from textual.widget import Widget + import heurams.kernel.particles as pt diff --git a/src/heurams/interface/widgets/basic_puzzle.py b/src/heurams/interface/widgets/basic_puzzle.py index 4d51c6d..05d35ed 100644 --- a/src/heurams/interface/widgets/basic_puzzle.py +++ b/src/heurams/interface/widgets/basic_puzzle.py @@ -1,13 +1,11 @@ -from textual.widgets import ( - Label, - Static, - Button, -) -from textual.containers import ScrollableContainer, Horizontal -from textual.widget import Widget -import heurams.kernel.particles as pt -from .base_puzzle_widget import BasePuzzleWidget +from textual.containers import Horizontal, ScrollableContainer from textual.message import Message +from textual.widget import Widget +from textual.widgets import Button, Label, Static + +import heurams.kernel.particles as pt + +from .base_puzzle_widget import BasePuzzleWidget class BasicEvaluation(BasePuzzleWidget): diff --git a/src/heurams/interface/widgets/cloze_puzzle.py b/src/heurams/interface/widgets/cloze_puzzle.py index 8437846..9d8c001 100644 --- a/src/heurams/interface/widgets/cloze_puzzle.py +++ b/src/heurams/interface/widgets/cloze_puzzle.py @@ -1,17 +1,17 @@ -from textual.widgets import ( - Label, - Button, -) -from textual.widget import Widget -import heurams.kernel.particles as pt -import heurams.kernel.puzzles as pz -from .base_puzzle_widget import BasePuzzleWidget import copy import random +from typing import TypedDict + from textual.containers import Container from textual.message import Message +from textual.widget import Widget +from textual.widgets import Button, Label + +import heurams.kernel.particles as pt +import heurams.kernel.puzzles as pz from heurams.services.logger import get_logger -from typing import TypedDict + +from .base_puzzle_widget import BasePuzzleWidget logger = get_logger(__name__) diff --git a/src/heurams/interface/widgets/finished.py b/src/heurams/interface/widgets/finished.py index bc52c9d..1110f6a 100644 --- a/src/heurams/interface/widgets/finished.py +++ b/src/heurams/interface/widgets/finished.py @@ -1,8 +1,5 @@ -from textual.widgets import ( - Label, - Button, -) from textual.widget import Widget +from textual.widgets import Button, Label class Finished(Widget): diff --git a/src/heurams/interface/widgets/mcq_puzzle.py b/src/heurams/interface/widgets/mcq_puzzle.py index 26cf689..1589847 100644 --- a/src/heurams/interface/widgets/mcq_puzzle.py +++ b/src/heurams/interface/widgets/mcq_puzzle.py @@ -1,17 +1,17 @@ # 单项选择题 -from textual.widgets import ( - Label, - Button, -) -from textual.containers import ScrollableContainer, Container +from typing import TypedDict + +from textual.containers import Container, ScrollableContainer from textual.widget import Widget +from textual.widgets import Button, Label + import heurams.kernel.particles as pt import heurams.kernel.puzzles as pz -from .base_puzzle_widget import BasePuzzleWidget -from typing import TypedDict from heurams.services.hasher import hash from heurams.services.logger import get_logger +from .base_puzzle_widget import BasePuzzleWidget + logger = get_logger(__name__) diff --git a/src/heurams/interface/widgets/placeholder.py b/src/heurams/interface/widgets/placeholder.py index d049abf..e5e7b70 100644 --- a/src/heurams/interface/widgets/placeholder.py +++ b/src/heurams/interface/widgets/placeholder.py @@ -1,8 +1,5 @@ -from textual.widgets import ( - Label, - Button, -) from textual.widget import Widget +from textual.widgets import Button, Label class Placeholder(Widget): diff --git a/src/heurams/interface/widgets/recognition.py b/src/heurams/interface/widgets/recognition.py index 2ad8e72..bfa6661 100644 --- a/src/heurams/interface/widgets/recognition.py +++ b/src/heurams/interface/widgets/recognition.py @@ -1,20 +1,17 @@ -from textual.reactive import reactive -from textual.widgets import ( - Markdown, - Label, - Static, - Button, -) -from textual.containers import Center -from textual.widget import Widget -from typing import Dict -import heurams.kernel.particles as pt import re -from .base_puzzle_widget import BasePuzzleWidget -from typing import TypedDict, List +from typing import Dict, List, TypedDict + +from textual.containers import Center from textual.message import Message +from textual.reactive import reactive +from textual.widget import Widget +from textual.widgets import Button, Label, Markdown, Static + +import heurams.kernel.particles as pt from heurams.services.logger import get_logger +from .base_puzzle_widget import BasePuzzleWidget + logger = get_logger(__name__) diff --git a/src/heurams/kernel/algorithms/__init__.py b/src/heurams/kernel/algorithms/__init__.py index 5c85232..b19ae41 100644 --- a/src/heurams/kernel/algorithms/__init__.py +++ b/src/heurams/kernel/algorithms/__init__.py @@ -1,6 +1,7 @@ -from .sm2 import SM2Algorithm from heurams.services.logger import get_logger +from .sm2 import SM2Algorithm + logger = get_logger(__name__) __all__ = [ diff --git a/src/heurams/kernel/algorithms/base.py b/src/heurams/kernel/algorithms/base.py index c4e8142..b671c5b 100644 --- a/src/heurams/kernel/algorithms/base.py +++ b/src/heurams/kernel/algorithms/base.py @@ -1,5 +1,6 @@ -import heurams.services.timer as timer from typing import TypedDict + +import heurams.services.timer as timer from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/kernel/algorithms/sm2.py b/src/heurams/kernel/algorithms/sm2.py index ed46b89..6696784 100644 --- a/src/heurams/kernel/algorithms/sm2.py +++ b/src/heurams/kernel/algorithms/sm2.py @@ -1,8 +1,10 @@ -from .base import BaseAlgorithm -import heurams.services.timer as timer from typing import TypedDict + +import heurams.services.timer as timer from heurams.services.logger import get_logger +from .base import BaseAlgorithm + logger = get_logger(__name__) diff --git a/src/heurams/kernel/particles/__init__.py b/src/heurams/kernel/particles/__init__.py index ac90bd9..331bb16 100644 --- a/src/heurams/kernel/particles/__init__.py +++ b/src/heurams/kernel/particles/__init__.py @@ -9,12 +9,12 @@ from heurams.services.logger import get_logger logger = get_logger(__name__) logger.debug("粒子模块已加载") +from .atom import Atom, atom_registry from .electron import Electron +from .loader import load_electron, load_nucleon from .nucleon import Nucleon from .orbital import Orbital -from .atom import Atom, atom_registry from .probe import probe_all, probe_by_filename -from .loader import load_nucleon, load_electron __all__ = [ "Electron", diff --git a/src/heurams/kernel/particles/atom.py b/src/heurams/kernel/particles/atom.py index c012b8e..d81b402 100644 --- a/src/heurams/kernel/particles/atom.py +++ b/src/heurams/kernel/particles/atom.py @@ -1,14 +1,17 @@ +import json +import pathlib +import typing +from typing import TypedDict + +import bidict +import toml + +from heurams.context import config_var +from heurams.services.logger import get_logger + from .electron import Electron from .nucleon import Nucleon from .orbital import Orbital -from typing import TypedDict -import pathlib -import typing -import toml -import json -import bidict -from heurams.context import config_var -from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/kernel/particles/loader.py b/src/heurams/kernel/particles/loader.py index 6ac8eb9..8a40926 100644 --- a/src/heurams/kernel/particles/loader.py +++ b/src/heurams/kernel/particles/loader.py @@ -1,12 +1,15 @@ -from .nucleon import Nucleon -from .electron import Electron -import heurams.services.hasher as hasher -import pathlib -import toml import json +import pathlib from copy import deepcopy + +import toml + +import heurams.services.hasher as hasher from heurams.services.logger import get_logger +from .electron import Electron +from .nucleon import Nucleon + logger = get_logger(__name__) diff --git a/src/heurams/kernel/particles/orbital.py b/src/heurams/kernel/particles/orbital.py index b299518..58d996f 100644 --- a/src/heurams/kernel/particles/orbital.py +++ b/src/heurams/kernel/particles/orbital.py @@ -1,4 +1,5 @@ from typing import TypedDict + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/kernel/particles/probe.py b/src/heurams/kernel/particles/probe.py index 901e029..5eb18ef 100644 --- a/src/heurams/kernel/particles/probe.py +++ b/src/heurams/kernel/particles/probe.py @@ -1,5 +1,6 @@ -from heurams.context import config_var import pathlib + +from heurams.context import config_var from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/kernel/puzzles/cloze.py b/src/heurams/kernel/puzzles/cloze.py index b31c947..3522aaa 100644 --- a/src/heurams/kernel/puzzles/cloze.py +++ b/src/heurams/kernel/puzzles/cloze.py @@ -1,7 +1,9 @@ -from .base import BasePuzzle import random + from heurams.services.logger import get_logger +from .base import BasePuzzle + logger = get_logger(__name__) diff --git a/src/heurams/kernel/puzzles/mcq.py b/src/heurams/kernel/puzzles/mcq.py index 68718bc..1246a19 100644 --- a/src/heurams/kernel/puzzles/mcq.py +++ b/src/heurams/kernel/puzzles/mcq.py @@ -1,9 +1,11 @@ # mcq.py -from .base import BasePuzzle import random -from typing import List, Dict, Optional, Union +from typing import Dict, List, Optional, Union + from heurams.services.logger import get_logger +from .base import BasePuzzle + logger = get_logger(__name__) diff --git a/src/heurams/kernel/puzzles/recognition.py b/src/heurams/kernel/puzzles/recognition.py index 370f5be..f54e6d3 100644 --- a/src/heurams/kernel/puzzles/recognition.py +++ b/src/heurams/kernel/puzzles/recognition.py @@ -1,8 +1,10 @@ # mcq.py -from .base import BasePuzzle import random + from heurams.services.logger import get_logger +from .base import BasePuzzle + logger = get_logger(__name__) diff --git a/src/heurams/kernel/reactor/__init__.py b/src/heurams/kernel/reactor/__init__.py index bf925c2..dc87681 100644 --- a/src/heurams/kernel/reactor/__init__.py +++ b/src/heurams/kernel/reactor/__init__.py @@ -1,8 +1,9 @@ -from .states import PhaserState, ProcessionState -from .procession import Procession +from heurams.services.logger import get_logger + from .fission import Fission from .phaser import Phaser -from heurams.services.logger import get_logger +from .procession import Procession +from .states import PhaserState, ProcessionState logger = get_logger(__name__) diff --git a/src/heurams/kernel/reactor/fission.py b/src/heurams/kernel/reactor/fission.py index e7c4140..6de3576 100644 --- a/src/heurams/kernel/reactor/fission.py +++ b/src/heurams/kernel/reactor/fission.py @@ -1,9 +1,11 @@ +import random + import heurams.kernel.particles as pt import heurams.kernel.puzzles as puz -import random -from .states import PhaserState from heurams.services.logger import get_logger +from .states import PhaserState + class Fission: """裂变器: 单原子调度展开器""" diff --git a/src/heurams/kernel/reactor/phaser.py b/src/heurams/kernel/reactor/phaser.py index 37dd8f0..80e6d16 100644 --- a/src/heurams/kernel/reactor/phaser.py +++ b/src/heurams/kernel/reactor/phaser.py @@ -1,10 +1,11 @@ # 移相器类定义 import heurams.kernel.particles as pt -from .states import PhaserState, ProcessionState -from .procession import Procession from heurams.services.logger import get_logger +from .procession import Procession +from .states import PhaserState, ProcessionState + logger = get_logger(__name__) diff --git a/src/heurams/kernel/reactor/procession.py b/src/heurams/kernel/reactor/procession.py index ab8533f..4ca253e 100644 --- a/src/heurams/kernel/reactor/procession.py +++ b/src/heurams/kernel/reactor/procession.py @@ -1,7 +1,8 @@ import heurams.kernel.particles as pt -from .states import PhaserState, ProcessionState from heurams.services.logger import get_logger +from .states import PhaserState, ProcessionState + logger = get_logger(__name__) diff --git a/src/heurams/kernel/reactor/states.py b/src/heurams/kernel/reactor/states.py index 9587582..3e48a96 100644 --- a/src/heurams/kernel/reactor/states.py +++ b/src/heurams/kernel/reactor/states.py @@ -1,4 +1,5 @@ from enum import Enum, auto + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/providers/audio/__init__.py b/src/heurams/providers/audio/__init__.py index a349d1e..442f5e5 100644 --- a/src/heurams/providers/audio/__init__.py +++ b/src/heurams/providers/audio/__init__.py @@ -1,8 +1,8 @@ # 音频播放器, 必须基于文件操作 -from . import termux_audio -from . import playsound_audio from heurams.services.logger import get_logger +from . import playsound_audio, termux_audio + logger = get_logger(__name__) __all__ = [ diff --git a/src/heurams/providers/audio/playsound_audio.py b/src/heurams/providers/audio/playsound_audio.py index 77d5842..0d7a484 100644 --- a/src/heurams/providers/audio/playsound_audio.py +++ b/src/heurams/providers/audio/playsound_audio.py @@ -5,7 +5,9 @@ import os import pathlib + import playsound + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/providers/audio/protocol.py b/src/heurams/providers/audio/protocol.py index 64a609e..664d32e 100644 --- a/src/heurams/providers/audio/protocol.py +++ b/src/heurams/providers/audio/protocol.py @@ -1,5 +1,6 @@ -from typing import Protocol import pathlib +from typing import Protocol + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/providers/audio/termux_audio.py b/src/heurams/providers/audio/termux_audio.py index f7f7af4..9bcc7ee 100644 --- a/src/heurams/providers/audio/termux_audio.py +++ b/src/heurams/providers/audio/termux_audio.py @@ -5,6 +5,7 @@ import os import pathlib + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/providers/tts/__init__.py b/src/heurams/providers/tts/__init__.py index c204225..0184b20 100644 --- a/src/heurams/providers/tts/__init__.py +++ b/src/heurams/providers/tts/__init__.py @@ -1,6 +1,7 @@ +from heurams.services.logger import get_logger + from .base import BaseTTS from .edge_tts import EdgeTTS -from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/providers/tts/base.py b/src/heurams/providers/tts/base.py index 5ac0fd2..e8583dd 100644 --- a/src/heurams/providers/tts/base.py +++ b/src/heurams/providers/tts/base.py @@ -1,4 +1,5 @@ import pathlib + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/providers/tts/edge_tts.py b/src/heurams/providers/tts/edge_tts.py index df7d16c..008dc66 100644 --- a/src/heurams/providers/tts/edge_tts.py +++ b/src/heurams/providers/tts/edge_tts.py @@ -1,8 +1,11 @@ -from .base import BaseTTS import pathlib + import edge_tts + from heurams.services.logger import get_logger +from .base import BaseTTS + logger = get_logger(__name__) diff --git a/src/heurams/services/audio_service.py b/src/heurams/services/audio_service.py index 9f92e25..15689d7 100644 --- a/src/heurams/services/audio_service.py +++ b/src/heurams/services/audio_service.py @@ -1,7 +1,8 @@ # 音频服务 +from typing import Callable + from heurams.context import config_var from heurams.providers.audio import providers as prov -from typing import Callable from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/services/config.py b/src/heurams/services/config.py index d6e4787..06bf48c 100644 --- a/src/heurams/services/config.py +++ b/src/heurams/services/config.py @@ -1,7 +1,9 @@ # 配置文件服务 import pathlib -import toml import typing + +import toml + from heurams.services.logger import get_logger diff --git a/src/heurams/services/hasher.py b/src/heurams/services/hasher.py index 2bac237..60e1d6e 100644 --- a/src/heurams/services/hasher.py +++ b/src/heurams/services/hasher.py @@ -1,5 +1,6 @@ # 哈希服务 import hashlib + from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/services/timer.py b/src/heurams/services/timer.py index 232805e..91bd55a 100644 --- a/src/heurams/services/timer.py +++ b/src/heurams/services/timer.py @@ -1,6 +1,7 @@ # 时间服务 -from heurams.context import config_var import time + +from heurams.context import config_var from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/src/heurams/services/tts_service.py b/src/heurams/services/tts_service.py index ce0d214..c061893 100644 --- a/src/heurams/services/tts_service.py +++ b/src/heurams/services/tts_service.py @@ -1,7 +1,8 @@ # 文本转语音服务 +from typing import Callable + from heurams.context import config_var from heurams.providers.tts import TTSs -from typing import Callable from heurams.services.logger import get_logger logger = get_logger(__name__) diff --git a/tests/interface/test_dashboard.py b/tests/interface/test_dashboard.py index 685ac27..dd0ea91 100644 --- a/tests/interface/test_dashboard.py +++ b/tests/interface/test_dashboard.py @@ -2,17 +2,18 @@ """ DashboardScreen 的测试, 包括单元测试和 pilot 测试. """ -import unittest -import tempfile import pathlib +import tempfile import time -from unittest.mock import patch, MagicMock +import unittest +from unittest.mock import MagicMock, patch + from textual.pilot import Pilot from heurams.context import ConfigContext -from heurams.services.config import ConfigFile from heurams.interface.__main__ import HeurAMSApp from heurams.interface.screens.dashboard import DashboardScreen +from heurams.services.config import ConfigFile class TestDashboardScreenUnit(unittest.TestCase): @@ -66,7 +67,7 @@ class TestDashboardScreenUnit(unittest.TestCase): result = screen.compose() widgets = list(result) # 检查是否包含 Header 和 Footer - from textual.widgets import Header, Footer + from textual.widgets import Footer, Header header_present = any(isinstance(w, Header) for w in widgets) footer_present = any(isinstance(w, Footer) for w in widgets) diff --git a/tests/kernel/algorithms/test_sm2.py b/tests/kernel/algorithms/test_sm2.py index a1ce190..03713fc 100644 --- a/tests/kernel/algorithms/test_sm2.py +++ b/tests/kernel/algorithms/test_sm2.py @@ -1,5 +1,5 @@ import unittest -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch from heurams.kernel.algorithms.sm2 import SM2Algorithm diff --git a/tests/kernel/particles/test_atom.py b/tests/kernel/particles/test_atom.py index a4c4f90..09371d5 100644 --- a/tests/kernel/particles/test_atom.py +++ b/tests/kernel/particles/test_atom.py @@ -1,15 +1,16 @@ -import unittest -from unittest.mock import patch, MagicMock +import json import pathlib import tempfile -import toml -import json +import unittest +from unittest.mock import MagicMock, patch +import toml + +from heurams.context import ConfigContext from heurams.kernel.particles.atom import Atom, atom_registry from heurams.kernel.particles.electron import Electron from heurams.kernel.particles.nucleon import Nucleon from heurams.kernel.particles.orbital import Orbital -from heurams.context import ConfigContext from heurams.services.config import ConfigFile diff --git a/tests/kernel/particles/test_electron.py b/tests/kernel/particles/test_electron.py index a395e57..2f1ea47 100644 --- a/tests/kernel/particles/test_electron.py +++ b/tests/kernel/particles/test_electron.py @@ -1,9 +1,9 @@ -import unittest -from unittest.mock import patch, MagicMock import sys +import unittest +from unittest.mock import MagicMock, patch -from heurams.kernel.particles.electron import Electron from heurams.kernel.algorithms import algorithms +from heurams.kernel.particles.electron import Electron class TestElectron(unittest.TestCase): diff --git a/tests/kernel/particles/test_nucleon.py b/tests/kernel/particles/test_nucleon.py index c059b21..6239df6 100644 --- a/tests/kernel/particles/test_nucleon.py +++ b/tests/kernel/particles/test_nucleon.py @@ -1,5 +1,5 @@ import unittest -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch from heurams.kernel.particles.nucleon import Nucleon diff --git a/tests/kernel/puzzles/test_cloze.py b/tests/kernel/puzzles/test_cloze.py index 1f5baaf..4a51b5b 100644 --- a/tests/kernel/puzzles/test_cloze.py +++ b/tests/kernel/puzzles/test_cloze.py @@ -1,5 +1,5 @@ import unittest -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch from heurams.kernel.puzzles.cloze import ClozePuzzle diff --git a/tests/kernel/puzzles/test_mcq.py b/tests/kernel/puzzles/test_mcq.py index 3acb9f1..066dcee 100644 --- a/tests/kernel/puzzles/test_mcq.py +++ b/tests/kernel/puzzles/test_mcq.py @@ -1,5 +1,5 @@ import unittest -from unittest.mock import patch, MagicMock, call +from unittest.mock import MagicMock, call, patch from heurams.kernel.puzzles.mcq import MCQPuzzle diff --git a/tests/kernel/reactor/test_phaser.py b/tests/kernel/reactor/test_phaser.py index 304ce58..a5a3334 100644 --- a/tests/kernel/reactor/test_phaser.py +++ b/tests/kernel/reactor/test_phaser.py @@ -1,10 +1,10 @@ import unittest -from unittest.mock import Mock, patch, MagicMock +from unittest.mock import MagicMock, Mock, patch -from heurams.kernel.reactor.phaser import Phaser -from heurams.kernel.reactor.states import PhaserState, ProcessionState from heurams.kernel.particles.atom import Atom from heurams.kernel.particles.electron import Electron +from heurams.kernel.reactor.phaser import Phaser +from heurams.kernel.reactor.states import PhaserState, ProcessionState class TestPhaser(unittest.TestCase):