Skip to content

Commit c63ef85

Browse files
format: ruff format
1 parent 6d3a40d commit c63ef85

File tree

5 files changed

+65
-44
lines changed

5 files changed

+65
-44
lines changed

py_spring/commons/config_file_template_generator/config_file_template_generator.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
from loguru import logger
66
from pydantic import BaseModel
77

8-
from py_spring.commons.config_file_template_generator.templates import app_config_template, app_properties_template
8+
from py_spring.commons.config_file_template_generator.templates import (
9+
app_config_template,
10+
app_properties_template,
11+
)
912
from py_spring.core.application.application_config import ApplicationConfig
1013

1114

@@ -24,22 +27,29 @@ class ConfigFileTemplateGenerator:
2427
def __init__(self, target_file_dir: str) -> None:
2528
self.target_file_dir = target_file_dir
2629

27-
def _is_valid_template(self, template: dict, validator_cls: Type[BaseModel]) -> bool:
30+
def _is_valid_template(
31+
self, template: dict, validator_cls: Type[BaseModel]
32+
) -> bool:
2833
try:
2934
validator_cls.model_validate(template)
3035
return True
3136
except Exception as e:
3237
return False
3338

34-
def _save_template(self, target_file: str, template: dict, validator_cls: Optional[Type[BaseModel]] = None) -> None:
39+
def _save_template(
40+
self,
41+
target_file: str,
42+
template: dict,
43+
validator_cls: Optional[Type[BaseModel]] = None,
44+
) -> None:
3545
with open(target_file, "w") as file:
3646
if validator_cls is None:
37-
file.write(json.dumps(template, indent=4))
47+
file.write(json.dumps(template, indent=4))
3848
else:
3949
is_valid = self._is_valid_template(template, validator_cls)
4050
if is_valid:
4151
template_instance = validator_cls.model_validate(template)
42-
file.write(template_instance.model_dump_json(indent= 4))
52+
file.write(template_instance.model_dump_json(indent=4))
4353

4454
def generate_app_config_file_template_if_not_exists(self) -> None:
4555
target_file = os.path.join(self.target_file_dir, self.APP_CONFIG_FILE_NAME)
@@ -52,8 +62,6 @@ def generate_app_config_file_template_if_not_exists(self) -> None:
5262
f"[APP CONFIG GENERATED] App config file not exists, {target_file} generated"
5363
)
5464

55-
56-
5765
def generate_app_properties_file_template_if_not_exists(self) -> None:
5866
target_file = os.path.join(self.target_file_dir, self.APP_PROPERTIES_NAME)
5967
if os.path.exists(target_file):

py_spring/core/application/context/application_context.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020
from py_spring.core.entities.properties.properties_loader import _PropertiesLoader
2121

2222

23-
2423
T = TypeVar("T", bound=AppEntities)
2524
PT = TypeVar("PT", bound=Properties)
2625

2726

2827
class ComponentNotFoundError(Exception): ...
28+
29+
2930
class InvalidDependencyError(Exception): ...
3031

32+
3133
class ApplicationContextView(BaseModel):
3234
config: ApplicationContextConfig
3335
component_cls_container: list[str]
@@ -97,16 +99,19 @@ def get_component(self, component_cls: Type[T]) -> Optional[T]:
9799
case ComponentScope.Prototype:
98100
prototype_instance = component_cls()
99101
return prototype_instance
100-
102+
101103
def is_within_context(self, _cls: Type[AppEntities]) -> bool:
102104
cls_name = _cls.__name__
103105
is_within_component = cls_name in self.component_cls_container
104106
is_within_controller = cls_name in self.controller_cls_container
105107
is_within_bean_collection = cls_name in self.bean_collection_cls_container
106108
is_within_properties = cls_name in self.properties_cls_container
107-
return is_within_component or is_within_controller or is_within_bean_collection or is_within_properties
108-
109-
109+
return (
110+
is_within_component
111+
or is_within_controller
112+
or is_within_bean_collection
113+
or is_within_properties
114+
)
110115

111116
def get_bean(self, object_cls: Type[T]) -> Optional[T]:
112117
bean_name = object_cls.__name__
@@ -303,7 +308,7 @@ def _validate_entity_provider_dependencies(self, provider: EntityProvider) -> No
303308
error = f"[INVALID DEPENDENCY] Dependency {dependency.__name__} not found in the application context"
304309
logger.error(error)
305310
raise InvalidDependencyError(error)
306-
311+
307312
def validate_entity_providers(self) -> None:
308313
for provider in self.providers:
309314
self._validate_entity_provider_dependencies(provider)

py_spring/core/application/loguru_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from pydantic import BaseModel
55

6+
67
class LogLevel(str, Enum):
78
TRACE = "TRACE"
89
DEBUG = "DEBUG"
@@ -12,6 +13,7 @@ class LogLevel(str, Enum):
1213
ERROR = "ERROR"
1314
CRITICAL = "CRITICAL"
1415

16+
1517
class LoguruConfig(BaseModel):
1618
log_format: str = (
1719
"<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
@@ -25,5 +27,3 @@ class LoguruConfig(BaseModel):
2527
log_file_path: Optional[str] = "./logs/app.log"
2628
enable_backtrace: bool = True
2729
enable_diagnose: bool = True
28-
29-
Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
from dataclasses import field, dataclass
32
from typing import Any, Optional, Type
43

@@ -9,29 +8,32 @@
98
from py_spring.core.entities.properties.properties import Properties
109

1110
try:
12-
from py_spring.core.application.context.application_context import ApplicationContext
11+
from py_spring.core.application.context.application_context import (
12+
ApplicationContext,
13+
)
1314
except ImportError:
1415
...
1516

1617

1718
@dataclass
1819
class EntityProvider:
19-
component_classes: list[Type[Component]] = field(default_factory= list)
20-
bean_collection_classes: list[Type[BeanCollection]] = field(default_factory= list)
21-
properties_classes: list[Type[Properties]] = field(default_factory= list)
22-
rest_controller_classes: list[Type[RestController]] = field(default_factory= list)
23-
depends_on: list[Type[AppEntities]] = field(default_factory= list)
24-
extneral_dependencies: list[Any] = field(default_factory= list)
20+
component_classes: list[Type[Component]] = field(default_factory=list)
21+
bean_collection_classes: list[Type[BeanCollection]] = field(default_factory=list)
22+
properties_classes: list[Type[Properties]] = field(default_factory=list)
23+
rest_controller_classes: list[Type[RestController]] = field(default_factory=list)
24+
depends_on: list[Type[AppEntities]] = field(default_factory=list)
25+
extneral_dependencies: list[Any] = field(default_factory=list)
2526
app_context: Optional["ApplicationContext"] = None
2627

2728
def get_entities(self) -> list[Type[object]]:
28-
return [*self.component_classes,
29-
*self.bean_collection_classes,
30-
*self.properties_classes,
31-
*self.rest_controller_classes
32-
]
33-
29+
return [
30+
*self.component_classes,
31+
*self.bean_collection_classes,
32+
*self.properties_classes,
33+
*self.rest_controller_classes,
34+
]
35+
3436
def set_context(self, app_context: "ApplicationContext") -> None:
3537
self.app_context = app_context
3638

37-
def provider_init(self) -> None: ...
39+
def provider_init(self) -> None: ...

tests/test_entity_provider.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
1-
2-
31
import pytest
42

5-
from py_spring.core.application.context.application_context import ApplicationContext, InvalidDependencyError
6-
from py_spring.core.application.context.application_context_config import ApplicationContextConfig
3+
from py_spring.core.application.context.application_context import (
4+
ApplicationContext,
5+
InvalidDependencyError,
6+
)
7+
from py_spring.core.application.context.application_context_config import (
8+
ApplicationContextConfig,
9+
)
710
from py_spring.core.entities.component import Component
811
from py_spring.core.entities.entity_provider import EntityProvider
912

13+
1014
class TestComponent(Component): ...
1115

1216

1317
class TestEntityProvider:
1418
@pytest.fixture
1519
def test_entity_provider(self):
16-
return EntityProvider(
17-
depends_on= [TestComponent]
18-
)
19-
20+
return EntityProvider(depends_on=[TestComponent])
21+
2022
@pytest.fixture
21-
def test_app_context(self, test_entity_provider: EntityProvider) -> ApplicationContext:
23+
def test_app_context(
24+
self, test_entity_provider: EntityProvider
25+
) -> ApplicationContext:
2226
app_context = ApplicationContext(ApplicationContextConfig(properties_path=""))
2327
app_context.register_entity_provider(test_entity_provider)
2428
return app_context
25-
2629

27-
def test_did_raise_error_when_no_depends_on_is_provided(self, test_app_context: ApplicationContext):
30+
def test_did_raise_error_when_no_depends_on_is_provided(
31+
self, test_app_context: ApplicationContext
32+
):
2833
with pytest.raises(InvalidDependencyError):
2934
test_app_context.validate_entity_providers()
30-
31-
def test_did_not_raise_error_when_depends_on_is_provided(self, test_app_context: ApplicationContext):
35+
36+
def test_did_not_raise_error_when_depends_on_is_provided(
37+
self, test_app_context: ApplicationContext
38+
):
3239
test_app_context.register_component(TestComponent)
3340
test_app_context.validate_entity_providers()
34-

0 commit comments

Comments
 (0)