Skip to content

Commit d06a7d5

Browse files
committed
style: combine aliased imports and type the e2e on_event helper
1 parent 99e3cc3 commit d06a7d5

8 files changed

Lines changed: 12 additions & 22 deletions

File tree

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ builtins-ignorelist = ["id"]
197197
[tool.ruff.lint.isort]
198198
known-local-folder = ["apify"]
199199
known-first-party = ["apify_client", "crawlee"]
200+
combine-as-imports = true
200201

201202
[tool.ruff.lint.pylint]
202203
max-branches = 18

‎src/apify/_charging.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,10 @@
1212
import apify_client._models as _client_models
1313
from apify_client._models import (
1414
ActorChargeEvent as _ClientActorChargeEvent,
15-
)
16-
from apify_client._models import (
1715
FlatPricePerMonthActorPricingInfo as _ClientFlatPricePerMonth,
18-
)
19-
from apify_client._models import (
2016
FreeActorPricingInfo as _ClientFree,
21-
)
22-
from apify_client._models import (
2317
PayPerEventActorPricingInfo as _ClientPayPerEvent,
24-
)
25-
from apify_client._models import (
2618
PricePerDatasetItemActorPricingInfo as _ClientPricePerDatasetItem,
27-
)
28-
from apify_client._models import (
2919
PricingPerEvent as _ClientPricingPerEvent,
3020
)
3121

‎src/apify/_proxy_configuration.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
import impit
1212
from yarl import URL
1313

14-
from crawlee.proxy_configuration import ProxyConfiguration as CrawleeProxyConfiguration
15-
from crawlee.proxy_configuration import ProxyInfo as CrawleeProxyInfo
16-
from crawlee.proxy_configuration import _NewUrlFunction
14+
from crawlee.proxy_configuration import (
15+
ProxyConfiguration as CrawleeProxyConfiguration,
16+
ProxyInfo as CrawleeProxyInfo,
17+
_NewUrlFunction,
18+
)
1719

1820
from apify._configuration import Configuration
1921
from apify._consts import ApifyEnvVars

‎src/apify/scrapy/__init__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from crawlee._utils.try_import import install_import_hook as _install_import_hook
2-
from crawlee._utils.try_import import try_import as _try_import
1+
from crawlee._utils.try_import import install_import_hook as _install_import_hook, try_import as _try_import
32

43
_install_import_hook(__name__)
54

‎src/apify/scrapy/requests.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
from logging import getLogger
66
from typing import Any, cast
77

8-
from scrapy import Request as ScrapyRequest
9-
from scrapy import Spider
8+
from scrapy import Request as ScrapyRequest, Spider
109
from scrapy.http.headers import Headers
1110
from scrapy.utils.request import request_from_dict
1211

‎src/apify/storage_clients/_apify/_utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
from apify import Request
1111

1212
if TYPE_CHECKING:
13-
from apify_client._models import HeadRequest, LockedHeadRequest
14-
from apify_client._models import Request as ClientRequest
13+
from apify_client._models import HeadRequest, LockedHeadRequest, Request as ClientRequest
1514

1615
from apify import Configuration
1716

‎tests/e2e/test_actor_events.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ async def main() -> None:
2222

2323
from crawlee.events._types import Event, EventSystemInfoData
2424

25+
from apify import ActorEventTypes
2526
from apify._consts import ApifyEnvVars
2627

2728
os.environ[ApifyEnvVars.PERSIST_STATE_INTERVAL_MILLIS] = '900'
2829

2930
was_system_info_emitted = False
3031
system_infos = list[EventSystemInfoData]()
3132

32-
def on_event(event_type: str) -> Callable:
33+
def on_event(event_type: ActorEventTypes) -> Callable:
3334
async def log_event(data: Any) -> None:
3435
nonlocal was_system_info_emitted
3536
nonlocal system_infos

‎tests/unit/actor/test_configuration.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
from crawlee.crawlers import BasicCrawler
1111
from crawlee.errors import ServiceConflictError
1212

13-
from apify import Actor
14-
from apify import Configuration as ApifyConfiguration
13+
from apify import Actor, Configuration as ApifyConfiguration
1514
from apify.storage_clients._smart_apify._storage_client import SmartApifyStorageClient
1615

1716

0 commit comments

Comments
 (0)