Skip to content

Commit 15078d9

Browse files
author
msra-sync-bot
committed
Regenerate artifact from source
1 parent 3fda70b commit 15078d9

6 files changed

Lines changed: 42 additions & 48 deletions

File tree

‎README.md‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,27 @@ async def main():
4646
tree = (await api.Catalog.tree()).json()
4747
print(f"Первая категория: {tree[next(iter(tree))]['alias']}")
4848
products_list = (await api.Catalog.products_list(category_alias=tree[next(iter(tree))]["alias"])).json()
49-
print(f"Первый товар: {products_list[0]}")
49+
print(f"Первый товар: {products_list[0]['title']}")
5050
balance = (await api.Catalog.Products.balance(product_id=products_list[0]["id"])).json()
51-
print(f"Первый баланс: {balance[0]}")
51+
print(f"Первый баланс: {balance[0]['address']}; {balance[0]['count']} шт")
5252
info = (await api.Catalog.Products.info(url=products_list[0]["url"])).json()
53-
print(f"Информация о товаре: {info}")
53+
print(f"Информация о товаре: {info['title']}")
5454

5555
# Geolocation
56-
en = (await api.Geolocation.countries_list(alias="en")).json()
57-
print(f"Первая страна en: {en[0]}")
58-
ru = (await api.Geolocation.countries_list(alias="ru")).json()
59-
print(f"Первая страна ru: {ru[0]}")
56+
first_country = (await api.Geolocation.countries_list()).json()
57+
print(f"Первая страна: {first_country[0]['title']}")
6058
regions = (await api.Geolocation.regions_list()).json()
61-
print(f"Первый регион: {regions[0]}")
62-
cities = (await api.Geolocation.cities_list(country_id=en[1]["id"])).json()
63-
print(f"Первый город: {cities[0]}")
59+
print(f"Первый регион: {regions[0]['title']}")
60+
cities = (await api.Geolocation.cities_list(country_id=first_country[1]["id"])).json()
61+
print(f"Первый город: {cities[0]['name']}")
6462
city_info = (await api.Geolocation.city_info(city_id=cities[0]["id"])).json()
65-
print(f"Информация о городе: {city_info}")
66-
search = (await api.Geolocation.search(country_id=en[0]["id"], city_id=cities[0]["id"])).json()
67-
print(f"Первый магазин: {search[0]}")
63+
print(f"Информация о городе: {city_info['name']} ({city_info['fiasid']})")
64+
search = (await api.Geolocation.search(country_id=first_country[0]["id"], city_id=cities[0]["id"])).json()
65+
print(f"Первый магазин: {search[0]['address']}")
6866

6967
# Advertising
7068
home_brands = (await api.Advertising.home_brands_list()).json()
71-
print(f"Первая рекламная запись: {home_brands[0]}")
69+
print(f"Первая рекламная запись: {home_brands[0]['title']} {home_brands[0]['updatedAt']}")
7270

7371
# General
7472
# Загрузка изображения по прямой ссылке.

‎docs/source/quick_start.rst‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,27 @@ Import the client:
2424
tree = (await api.Catalog.tree()).json()
2525
print(f"Первая категория: {tree[next(iter(tree))]['alias']}")
2626
products_list = (await api.Catalog.products_list(category_alias=tree[next(iter(tree))]["alias"])).json()
27-
print(f"Первый товар: {products_list[0]}")
27+
print(f"Первый товар: {products_list[0]['title']}")
2828
balance = (await api.Catalog.Products.balance(product_id=products_list[0]["id"])).json()
29-
print(f"Первый баланс: {balance[0]}")
29+
print(f"Первый баланс: {balance[0]['address']}; {balance[0]['count']} шт")
3030
info = (await api.Catalog.Products.info(url=products_list[0]["url"])).json()
31-
print(f"Информация о товаре: {info}")
31+
print(f"Информация о товаре: {info['title']}")
3232
3333
# Geolocation
34-
en = (await api.Geolocation.countries_list(alias="en")).json()
35-
print(f"Первая страна en: {en[0]}")
36-
ru = (await api.Geolocation.countries_list(alias="ru")).json()
37-
print(f"Первая страна ru: {ru[0]}")
34+
first_country = (await api.Geolocation.countries_list()).json()
35+
print(f"Первая страна: {first_country[0]['title']}")
3836
regions = (await api.Geolocation.regions_list()).json()
39-
print(f"Первый регион: {regions[0]}")
40-
cities = (await api.Geolocation.cities_list(country_id=en[1]["id"])).json()
41-
print(f"Первый город: {cities[0]}")
37+
print(f"Первый регион: {regions[0]['title']}")
38+
cities = (await api.Geolocation.cities_list(country_id=first_country[1]["id"])).json()
39+
print(f"Первый город: {cities[0]['name']}")
4240
city_info = (await api.Geolocation.city_info(city_id=cities[0]["id"])).json()
43-
print(f"Информация о городе: {city_info}")
44-
search = (await api.Geolocation.search(country_id=en[0]["id"], city_id=cities[0]["id"])).json()
45-
print(f"Первый магазин: {search[0]}")
41+
print(f"Информация о городе: {city_info['name']} ({city_info['fiasid']})")
42+
search = (await api.Geolocation.search(country_id=first_country[0]["id"], city_id=cities[0]["id"])).json()
43+
print(f"Первый магазин: {search[0]['address']}")
4644
4745
# Advertising
4846
home_brands = (await api.Advertising.home_brands_list()).json()
49-
print(f"Первая рекламная запись: {home_brands[0]}")
47+
print(f"Первая рекламная запись: {home_brands[0]['title']} {home_brands[0]['updatedAt']}")
5048
5149
# General
5250
# Загрузка изображения по прямой ссылке.

‎example.py‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,27 @@ async def main():
1010
tree = (await api.Catalog.tree()).json()
1111
print(f"Первая категория: {tree[next(iter(tree))]['alias']}")
1212
products_list = (await api.Catalog.products_list(category_alias=tree[next(iter(tree))]["alias"])).json()
13-
print(f"Первый товар: {products_list[0]}")
13+
print(f"Первый товар: {products_list[0]['title']}")
1414
balance = (await api.Catalog.Products.balance(product_id=products_list[0]["id"])).json()
15-
print(f"Первый баланс: {balance[0]}")
15+
print(f"Первый баланс: {balance[0]['address']}; {balance[0]['count']} шт")
1616
info = (await api.Catalog.Products.info(url=products_list[0]["url"])).json()
17-
print(f"Информация о товаре: {info}")
17+
print(f"Информация о товаре: {info['title']}")
1818

1919
# Geolocation
20-
en = (await api.Geolocation.countries_list(alias="en")).json()
21-
print(f"Первая страна en: {en[0]}")
22-
ru = (await api.Geolocation.countries_list(alias="ru")).json()
23-
print(f"Первая страна ru: {ru[0]}")
20+
first_country = (await api.Geolocation.countries_list()).json()
21+
print(f"Первая страна: {first_country[0]['title']}")
2422
regions = (await api.Geolocation.regions_list()).json()
25-
print(f"Первый регион: {regions[0]}")
26-
cities = (await api.Geolocation.cities_list(country_id=en[1]["id"])).json()
27-
print(f"Первый город: {cities[0]}")
23+
print(f"Первый регион: {regions[0]['title']}")
24+
cities = (await api.Geolocation.cities_list(country_id=first_country[1]["id"])).json()
25+
print(f"Первый город: {cities[0]['name']}")
2826
city_info = (await api.Geolocation.city_info(city_id=cities[0]["id"])).json()
29-
print(f"Информация о городе: {city_info}")
30-
search = (await api.Geolocation.search(country_id=en[0]["id"], city_id=cities[0]["id"])).json()
31-
print(f"Первый магазин: {search[0]}")
27+
print(f"Информация о городе: {city_info['name']} ({city_info['fiasid']})")
28+
search = (await api.Geolocation.search(country_id=first_country[0]["id"], city_id=cities[0]["id"])).json()
29+
print(f"Первый магазин: {search[0]['address']}")
3230

3331
# Advertising
3432
home_brands = (await api.Advertising.home_brands_list()).json()
35-
print(f"Первая рекламная запись: {home_brands[0]}")
33+
print(f"Первая рекламная запись: {home_brands[0]['title']} {home_brands[0]['updatedAt']}")
3634

3735
# General
3836
# Загрузка изображения по прямой ссылке.

‎fixprice_api/endpoints/geolocation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ async def city_info(self, city_id: int) -> abstraction.Output:
4848
raise ValueError("`city_id` is required")
4949
if not isinstance(city_id, int) or isinstance(city_id, bool):
5050
raise TypeError("`city_id` must be int")
51-
if float(city_id) < 1 or float(city_id) > 2147483647:
52-
raise ValueError("`city_id` must be between 1 and 2147483647")
51+
if float(city_id) < 1:
52+
raise ValueError("`city_id` must be greater than or equal to 1")
5353

5454
if city_id is not None:
5555
request_url = str(self._parent._CATALOG_URL) + "/v1/location/city/" + str(city_id)

‎fixprice_api/manager.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class FixPriceAPI:
3232
"""Extra keyword arguments forwarded to AsyncCamoufox during browser startup."""
3333

3434
_MAIN_SITE_URL: ClassVar[str] = "https://fix-price.com/catalog"
35-
_MAIN_SITE_ORIGIN: ClassVar[str] = "https://fix-price.com/"
35+
_MAIN_SITE_ORIGIN: ClassVar[str] = "https://fix-price.com"
3636
_CATALOG_URL: ClassVar[str] = "https://api.fix-price.com/buyer"
3737

3838
Catalog: ClassCatalog = field(init=False)
@@ -277,7 +277,7 @@ async def _request(
277277
referrer: str | None = None,
278278
headers: dict[str, Any] | None = None,
279279
) -> abstraction.Output:
280-
request_headers = headers if headers is not None else {"Accept": "application/json, text/plain, */*"}
280+
request_headers = headers if headers is not None else {"Accept": "application/json, text/plain, */*", "x-city": str(self.city_id), "X-Key": str(self.token), "x-language": str(self.language)}
281281
fetch_kwargs: dict[str, Any] = {
282282
"url": url,
283283
"method": method,

‎tests/api_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ def _params_catalog__products_info_json(ctx: AutotestCallContext) -> dict[str, o
7676
@autotest_params(target=ClassGeolocation.countries_list)
7777
def _params_geolocation_countries_list_json(ctx: AutotestCallContext) -> dict[str, object]:
7878
try:
79-
return {"alias": "en"}
79+
return {}
8080
except Exception as exc:
81-
pytest.fail(f"[app.func.GEOLOCATION_COUNTRIES_LIST.examples.en] could not derive test parameters: {exc}")
81+
pytest.fail(f"[app.func.GEOLOCATION_COUNTRIES_LIST.examples.first_country] could not derive test parameters: {exc}")
8282

8383

8484
@autotest_params(target=ClassGeolocation.regions_list)

0 commit comments

Comments
 (0)