From 31764411b9a4481d5de371ff9878f9d3e8cb8fc2 Mon Sep 17 00:00:00 2001 From: Kiriil Date: Tue, 22 Sep 2026 18:33:22 +0300 Subject: [PATCH 01/17] Update constants.py --- src/part1/constants.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/part1/constants.py b/src/part1/constants.py index 9abfbba2..8d49454a 100644 --- a/src/part1/constants.py +++ b/src/part1/constants.py @@ -19,20 +19,20 @@ # Все константы, зависящие от ёмкостей *_BITS, должны вычисляться из них. # Twitter's original Snowflake epoch: 2010-11-04 01:42:54.657 UTC. -EPOCH_MS_DEFAULT: Final[int] = 0 +EPOCH_MS_DEFAULT: Final[int] = 1288834974657 # Node identifier used when the caller does not supply one. -NODE_ID_DEFAULT: Final[int] = 0 +NODE_ID_DEFAULT: Final[int] = 1 # Width of each field, in bits. -TIMESTAMP_BITS: Final[int] = 0 -NODE_ID_BITS: Final[int] = 0 -SEQUENCE_ID_BITS: Final[int] = 0 +TIMESTAMP_BITS: Final[int] = 41 +NODE_ID_BITS: Final[int] = 10 +SEQUENCE_ID_BITS: Final[int] = 12 # Largest value each field can hold. -TIMESTAMP_MS_MAX: Final[int] = 0 -NODE_ID_MAX: Final[int] = 0 -SEQUENCE_ID_MAX: Final[int] = 0 +TIMESTAMP_MS_MAX: Final[int] = 2**41-1 +NODE_ID_MAX: Final[int] = 2**10-1 +SEQUENCE_ID_MAX: Final[int] = 2**12-1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). From 259056ff644225d62a69d3bd7263c46e0d51be70 Mon Sep 17 00:00:00 2001 From: Kiriil Date: Tue, 22 Sep 2026 18:49:01 +0300 Subject: [PATCH 02/17] Update snowflake.py --- src/part1/snowflake.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index d3abf050..88c26f9b 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -35,7 +35,8 @@ def read_current_millis(epoch_ms: int) -> int: negative if ``epoch_ms`` lies in the future. """ # TODO: реализуйте функцию - return 0 + a = (time.time_ns() // 1000000) - epoch_ms + return a def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: From bf69af282104c28c3866c4ae052a07a29b68f8ca Mon Sep 17 00:00:00 2001 From: Kiriil Date: Tue, 22 Sep 2026 23:42:50 +0300 Subject: [PATCH 03/17] Update snowflake.py --- src/part1/snowflake.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 88c26f9b..46efd267 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -21,6 +21,8 @@ NODE_ID_MAX, SEQUENCE_ID_MAX, TIMESTAMP_MS_MAX, + NODE_ID_BITS, + SEQUENCE_ID_BITS, ) @@ -52,7 +54,8 @@ def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> generated. """ # TODO: реализуйте функцию - return 0 + epoch_time = snowflake_id >> (SEQUENCE_ID_BITS+NODE_ID_BITS) + return epoch_time + epoch_ms def decode_node_id(snowflake_id: int) -> int: @@ -66,7 +69,8 @@ def decode_node_id(snowflake_id: int) -> int: ``[0, NODE_ID_MAX]``. """ # TODO: реализуйте функцию - return 0 + node_num = (snowflake_id >> SEQUENCE_ID_BITS) & NODE_ID_MAX + return node_num def decode_sequence_id(snowflake_id: int) -> int: @@ -80,7 +84,8 @@ def decode_sequence_id(snowflake_id: int) -> int: the range ``[0, SEQUENCE_ID_MAX]``. """ # TODO: реализуйте функцию - return 0 + seq_id = snowflake_id & SEQUENCE_ID_MAX + return seq_id def generate_snowflake_id( @@ -112,4 +117,10 @@ def generate_snowflake_id( cases an explanatory message is printed to stdout first. """ # TODO: реализуйте функцию + if 0<=node_id<=NODE_ID_MAX: + return "node_id must be in [0, NODE_ID_MAX]" + else if 0 <= sequence_id <= SEQUENCE_ID_MAX: + return "sequence_id must be in [0, SEQUENCE_ID_MAX]" + else: + return 0 From 316aee5036e7824ac620e0ed4bee8c2833f34486 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 23 Sep 2026 00:18:53 +0300 Subject: [PATCH 04/17] Finished homework --- src/part1/snowflake.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 46efd267..6888cc4c 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -117,10 +117,15 @@ def generate_snowflake_id( cases an explanatory message is printed to stdout first. """ # TODO: реализуйте функцию - if 0<=node_id<=NODE_ID_MAX: - return "node_id must be in [0, NODE_ID_MAX]" - else if 0 <= sequence_id <= SEQUENCE_ID_MAX: - return "sequence_id must be in [0, SEQUENCE_ID_MAX]" + a = (time.time_ns() // 1000000) - epoch_ms + if not (0<=node_id<=NODE_ID_MAX): + print(f"node_id must be in [0, {NODE_ID_MAX}], got {node_id}") + return None + elif not(0 <= sequence_id <= SEQUENCE_ID_MAX): + print(f"sequence_id must be in [0, {SEQUENCE_ID_MAX}], got {sequence_id}") + return None + if a > TIMESTAMP_MS_MAX: + print("overflows") + return None else: - - return 0 + return (a << 22) | (node_id << 12) | sequence_id \ No newline at end of file From da22fa8bc7f17f1ff645af961f74a6931f68d333 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 23 Sep 2026 00:47:35 +0300 Subject: [PATCH 05/17] Finished homework --- src/part1/constants.py | 6 +++--- src/part1/snowflake.py | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/part1/constants.py b/src/part1/constants.py index 8d49454a..22c27cee 100644 --- a/src/part1/constants.py +++ b/src/part1/constants.py @@ -30,9 +30,9 @@ SEQUENCE_ID_BITS: Final[int] = 12 # Largest value each field can hold. -TIMESTAMP_MS_MAX: Final[int] = 2**41-1 -NODE_ID_MAX: Final[int] = 2**10-1 -SEQUENCE_ID_MAX: Final[int] = 2**12-1 +TIMESTAMP_MS_MAX: Final[int] = 2**41 - 1 +NODE_ID_MAX: Final[int] = 2**10 - 1 +SEQUENCE_ID_MAX: Final[int] = 2**12 - 1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 6888cc4c..145fa740 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -13,16 +13,19 @@ :func:`decode_node_id` and :func:`decode_sequence_id`. """ -import time # noqa: F401 +import time -from .constants import ( # noqa: F401 +from .constants import ( + # Epoch EPOCH_MS_DEFAULT, + # Node ID + NODE_ID_BITS, NODE_ID_DEFAULT, NODE_ID_MAX, + # Sequence ID + SEQUENCE_ID_BITS, SEQUENCE_ID_MAX, TIMESTAMP_MS_MAX, - NODE_ID_BITS, - SEQUENCE_ID_BITS, ) @@ -54,7 +57,7 @@ def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> generated. """ # TODO: реализуйте функцию - epoch_time = snowflake_id >> (SEQUENCE_ID_BITS+NODE_ID_BITS) + epoch_time = snowflake_id >> (SEQUENCE_ID_BITS + NODE_ID_BITS) return epoch_time + epoch_ms @@ -118,14 +121,14 @@ def generate_snowflake_id( """ # TODO: реализуйте функцию a = (time.time_ns() // 1000000) - epoch_ms - if not (0<=node_id<=NODE_ID_MAX): + if not (0 <= node_id <= NODE_ID_MAX): print(f"node_id must be in [0, {NODE_ID_MAX}], got {node_id}") return None - elif not(0 <= sequence_id <= SEQUENCE_ID_MAX): + elif not (0 <= sequence_id <= SEQUENCE_ID_MAX): print(f"sequence_id must be in [0, {SEQUENCE_ID_MAX}], got {sequence_id}") return None if a > TIMESTAMP_MS_MAX: print("overflows") return None else: - return (a << 22) | (node_id << 12) | sequence_id \ No newline at end of file + return (a << 22) | (node_id << 12) | sequence_id From 8a228860b6df217964f9ffd706bf182ae9542c17 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 23 Sep 2026 00:58:05 +0300 Subject: [PATCH 06/17] Finished homework --- src/part1/snowflake.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 145fa740..c137f122 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -120,15 +120,15 @@ def generate_snowflake_id( cases an explanatory message is printed to stdout first. """ # TODO: реализуйте функцию - a = (time.time_ns() // 1000000) - epoch_ms if not (0 <= node_id <= NODE_ID_MAX): print(f"node_id must be in [0, {NODE_ID_MAX}], got {node_id}") return None elif not (0 <= sequence_id <= SEQUENCE_ID_MAX): print(f"sequence_id must be in [0, {SEQUENCE_ID_MAX}], got {sequence_id}") return None + a = (time.time_ns() // 1000000) - epoch_ms if a > TIMESTAMP_MS_MAX: print("overflows") return None else: - return (a << 22) | (node_id << 12) | sequence_id + return (a << NODE_ID_BITS + SEQUENCE_ID_BITS) | (node_id << SEQUENCE_ID_BITS) | sequence_id From 268bc4ffd5663eab2532ffb1fae75a9548cb5ad0 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 24 Sep 2026 01:03:12 +0300 Subject: [PATCH 07/17] Finished homework --- src/part1/snowflake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index c137f122..f34cff25 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -131,4 +131,4 @@ def generate_snowflake_id( print("overflows") return None else: - return (a << NODE_ID_BITS + SEQUENCE_ID_BITS) | (node_id << SEQUENCE_ID_BITS) | sequence_id + return (a << (NODE_ID_BITS + SEQUENCE_ID_BITS)) | (node_id << SEQUENCE_ID_BITS) | sequence_id From c5e0f2f362a5f73fd1b85a999f818909eff4e851 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 24 Sep 2026 01:07:09 +0300 Subject: [PATCH 08/17] Finished homework --- src/part1/snowflake.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index f34cff25..8c015a63 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -131,4 +131,8 @@ def generate_snowflake_id( print("overflows") return None else: - return (a << (NODE_ID_BITS + SEQUENCE_ID_BITS)) | (node_id << SEQUENCE_ID_BITS) | sequence_id + return ( + (a << (NODE_ID_BITS + SEQUENCE_ID_BITS)) + | (node_id << SEQUENCE_ID_BITS) + | sequence_id + ) From 89df45e05367308f3f4985740c2abf21ce8fd34f Mon Sep 17 00:00:00 2001 From: Kirill Date: Mon, 28 Sep 2026 23:53:36 +0300 Subject: [PATCH 09/17] process of homework --- src/part2/crud.py | 20 +++++++++++++++++--- src/part2/storage.py | 8 ++++---- src/part2/utils.py | 6 +++--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/part2/crud.py b/src/part2/crud.py index d026cbcb..88e64581 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -35,7 +35,9 @@ def generate_product_id(storage: list[Product]) -> int: empty. """ # TODO: реализуйте функцию - return 0 + if not storage: + return PRODUCT_ID_MIN + return max(product(PRODUCT_ID_INDEX) for product in storage) + 1 def create_product( @@ -57,8 +59,16 @@ def create_product( name is printed. """ # TODO: реализуйте функцию - return 0 + + name, price, quan = fields + n_id = generate_product_id(storage) + if any(product[NAME_INDEX] == name for product in storage): + print(f"product name '{name}' is already taken") + return None + + storage.append((n_id, name, normalize_price(price), quan)) + return n_id def read_product(storage: list[Product], product_id: int) -> Product | None: """Return the product stored under ``product_id``. @@ -73,7 +83,11 @@ def read_product(storage: list[Product], product_id: int) -> Product | None: printed in that case). """ # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + for product in storage: + if product[PRODUCT_ID_INDEX] == product_id: + return product + print(f"no product with id {product_id}") + return None def update_product( diff --git a/src/part2/storage.py b/src/part2/storage.py index b63d5fc7..35821c5f 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -26,9 +26,9 @@ # TODO: задайте позиции полей внутри кортежа Product PRODUCT_ID_INDEX: Final = 0 -NAME_INDEX: Final = 0 -PRICE_INDEX: Final = 0 -QUANTITY_INDEX: Final = 0 +NAME_INDEX: Final = 1 +PRICE_INDEX: Final = 2 +QUANTITY_INDEX: Final = 3 # TODO: задайте идентификатор первого товара в пустом хранилище -PRODUCT_ID_MIN: Final[int] = 0 +PRODUCT_ID_MIN: Final[int] = 1 diff --git a/src/part2/utils.py b/src/part2/utils.py index ec0348d3..f4cdc43b 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -11,8 +11,8 @@ # TODO: задайте число знаков после запятой и шаг квантования -PRICE_PRECISION: Final[int] = 0 -PRICE_STEP: Final = Decimal(0) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) def normalize_price(price: Decimal) -> Decimal: @@ -26,4 +26,4 @@ def normalize_price(price: Decimal) -> Decimal: with halves rounded up. """ # TODO: реализуйте функцию - return Decimal(0) + return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) From bdc5c1b7f08376896b8ffd8f3a687d43be3f031a Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 30 Sep 2026 16:16:25 +0300 Subject: [PATCH 10/17] finished crud --- src/part2/crud.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/part2/crud.py b/src/part2/crud.py index 88e64581..90f5a8dc 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -37,7 +37,7 @@ def generate_product_id(storage: list[Product]) -> int: # TODO: реализуйте функцию if not storage: return PRODUCT_ID_MIN - return max(product(PRODUCT_ID_INDEX) for product in storage) + 1 + return max(product[PRODUCT_ID_INDEX] for product in storage) + 1 def create_product( @@ -114,7 +114,14 @@ def update_product( left unchanged and a message is printed). """ # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + name, price, qual = fields + for i, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + update = (product_id, name, normalize_price(price), qual) + storage[i] = update + return update + print(f"no product with id {product_id}") + return None def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -131,4 +138,9 @@ def delete_product(storage: list[Product], product_id: int) -> int | None: a message is printed). """ # TODO: реализуйте функцию - return 0 + for product in storage: + if product[PRODUCT_ID_INDEX] == product_id: + storage.remove(product) + return product_id + print(f"no product with id {product_id}") + return None \ No newline at end of file From 059081ec5679a3e13c2253655e3ec5c54f055c7b Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 2 Oct 2026 17:55:56 +0300 Subject: [PATCH 11/17] Finished homework --- src/part2/cart.py | 75 ++++++++++++++++++++++++++++++++++++++++++---- src/part2/crud.py | 9 +++--- src/part2/utils.py | 2 +- 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 063f9aea..0fac6e6b 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -11,8 +11,8 @@ from typing import Final -from .crud import read_product, update_product # noqa: F401 -from .storage import ( # noqa: F401 +from .crud import read_product, update_product +from .storage import ( NAME_INDEX, PRICE_INDEX, QUANTITY_INDEX, @@ -24,7 +24,17 @@ # TODO: задайте позиции полей внутри кортежа CartLine LINE_PRODUCT_ID_INDEX: Final = 0 -LINE_QUANTITY_INDEX: Final = 0 +LINE_QUANTITY_INDEX: Final = 1 + + +def find_cart_line( + cart: list[CartLine], + product_id: int, +) -> CartLine | None: + for cart_line in cart: + if cart_line[LINE_PRODUCT_ID_INDEX] == product_id: + return cart_line + return None def add_to_cart( @@ -54,7 +64,33 @@ def add_to_cart( when the product is unknown or the store cannot cover the request. """ # TODO: реализуйте функцию - return (0, 0) + product = read_product(storage, product_id) + if product is None: + return None + stock = product[QUANTITY_INDEX] + if stock < quantity: + print( + f"not enough stock for product {product_id}: {stock} available, {quantity} requested" + ) + return None + + update_product( + storage, + product_id, + (product[NAME_INDEX], product[PRICE_INDEX], stock - quantity), + ) + cart_line = find_cart_line(cart, product_id) + + if cart_line is not None: + new_cart_line = (product_id, quantity + cart_line[LINE_QUANTITY_INDEX]) + for i in range(len(cart)): + if cart[i][LINE_PRODUCT_ID_INDEX] == product_id: + cart[i] = new_cart_line + return new_cart_line + else: + new_cart_line = (product_id, quantity) + cart.append(new_cart_line) + return new_cart_line def remove_from_cart( @@ -86,4 +122,33 @@ def remove_from_cart( line for the product or holds too few units. """ # TODO: реализуйте функцию - return (0, 0) + cart_line = find_cart_line(cart, product_id) + + if cart_line is None: + print(f"product {product_id} is not in the cart") + return None + stock_in_cart = cart_line[LINE_QUANTITY_INDEX] + if stock_in_cart < quantity: + print( + f"cart holds only {stock_in_cart} unit(s) of product {product_id}, cannot remove {quantity}" + ) + return None + product = read_product(storage, product_id) + if product is None: + return None + stock_in_product = product[QUANTITY_INDEX] + update_product( + storage, + product_id, + (product[NAME_INDEX], product[PRICE_INDEX], stock_in_product + quantity), + ) + + new_cart_line = (product_id, stock_in_cart - quantity) + index_cart_line = cart.index(cart_line) + + if (stock_in_cart - quantity) != 0: + cart[index_cart_line] = new_cart_line + else: + cart.pop(index_cart_line) + + return new_cart_line diff --git a/src/part2/crud.py b/src/part2/crud.py index 90f5a8dc..38544578 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -14,13 +14,13 @@ from decimal import Decimal -from .storage import ( # noqa: F401 +from .storage import ( NAME_INDEX, PRODUCT_ID_INDEX, PRODUCT_ID_MIN, Product, ) -from .utils import normalize_price # noqa: F401 +from .utils import normalize_price def generate_product_id(storage: list[Product]) -> int: @@ -59,7 +59,7 @@ def create_product( name is printed. """ # TODO: реализуйте функцию - + name, price, quan = fields n_id = generate_product_id(storage) @@ -70,6 +70,7 @@ def create_product( storage.append((n_id, name, normalize_price(price), quan)) return n_id + def read_product(storage: list[Product], product_id: int) -> Product | None: """Return the product stored under ``product_id``. @@ -143,4 +144,4 @@ def delete_product(storage: list[Product], product_id: int) -> int | None: storage.remove(product) return product_id print(f"no product with id {product_id}") - return None \ No newline at end of file + return None diff --git a/src/part2/utils.py b/src/part2/utils.py index f4cdc43b..26a20798 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -6,7 +6,7 @@ currency values free of binary floating-point error. """ -from decimal import ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final From a37f462d724cbee18fa7388e7c165b1795d06f64 Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 9 Oct 2026 15:40:21 +0300 Subject: [PATCH 12/17] finished hometask --- src/part3/crud.py | 108 ++++++++++++++++++++++++++++------------- src/part3/run_admin.py | 68 +++++++++++++++++++++++--- src/part3/storage.py | 8 +-- src/part3/utils.py | 58 +++++++++++++++++++--- 4 files changed, 190 insertions(+), 52 deletions(-) diff --git a/src/part3/crud.py b/src/part3/crud.py index 68811d7e..2472e2ef 100644 --- a/src/part3/crud.py +++ b/src/part3/crud.py @@ -1,32 +1,26 @@ """Create/read/update/delete operations over the in-memory product store. Every operation takes the store -- a list of -:data:`~src.part3.storage.Product` tuples -- as its first argument and +:data:`~src.part2.storage.Product` tuples -- as its first argument and works on it in place. The failure path never raises: the operation prints an explanatory message to stdout and returns ``None``. The identifier of a new product is derived from the store itself (:func:`generate_product_id`): one past the greatest identifier in use, or -:data:`~src.part3.storage.PRODUCT_ID_MIN` when the store is empty. - -Every product name that reaches the store is passed through -:func:`~src.part3.utils.normalize_product_name` first. A name that -normalises to an empty string is rejected -- the operation prints a -message and changes nothing. Names are also kept unique -- -:func:`create_product` refuses a normalised name that is already taken, -and :func:`update_product` refuses one that is already taken by another -product. +:data:`~src.part2.storage.PRODUCT_ID_MIN` when the store is empty. +Product names are kept unique -- :func:`create_product` refuses a name that +is already taken. """ from decimal import Decimal -from .storage import ( # noqa: F401 +from .storage import ( NAME_INDEX, PRODUCT_ID_INDEX, PRODUCT_ID_MIN, Product, ) -from .utils import normalize_price, normalize_product_name # noqa: F401 +from .utils import normalize_price, normalize_product_name def generate_product_id(storage: list[Product]) -> int: @@ -37,11 +31,13 @@ def generate_product_id(storage: list[Product]) -> int: Returns: One past the greatest identifier currently held in ``storage``, or - :data:`~src.part3.storage.PRODUCT_ID_MIN` when ``storage`` is + :data:`~src.part2.storage.PRODUCT_ID_MIN` when ``storage`` is empty. """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return 0 + # TODO: реализуйте функцию + if not storage: + return PRODUCT_ID_MIN + return max(product[PRODUCT_ID_INDEX] for product in storage) + 1 def create_product( @@ -53,19 +49,31 @@ def create_product( storage: The product store to append to; modified in place on success. fields: A ``(name, price, quantity)`` tuple describing the product. - ``name`` is normalised (surrounding whitespace stripped, - lower-cased) before it is stored or compared. ``price`` is a - :class:`~decimal.Decimal` amount and is rounded to the stored - money precision before it is saved. + ``price`` is a :class:`~decimal.Decimal` amount and is rounded + to the stored money precision before it is saved. Returns: - The identifier generated for the new product, or ``None`` when - ``name`` is blank once normalised or a product with the same - normalised name already exists. In the ``None`` case ``storage`` - is left unchanged and an explanatory message is printed. + The identifier generated for the new product, or ``None`` when a + product with the same name already exists. In the ``None`` case + ``storage`` is left unchanged and a message naming the clashing + name is printed. """ # TODO: реализуйте функцию - return 0 + + name1, price, quan = fields + name = normalize_product_name(name1) + + if name == "": + print("product name must not be blank") + return None + + if any(product[NAME_INDEX] == name for product in storage): + print(f"product name '{name}' is already taken") + return None + + n_id = generate_product_id(storage) + storage.append((n_id, name, normalize_price(price), quan)) + return n_id def read_product(storage: list[Product], product_id: int) -> Product | None: @@ -80,8 +88,12 @@ def read_product(storage: list[Product], product_id: int) -> Product | None: ``None`` when no product carries that identifier (a message is printed in that case). """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return (0, "", Decimal(0), 0) + # TODO: реализуйте функцию + for product in storage: + if product[PRODUCT_ID_INDEX] == product_id: + return product + print(f"no product with id {product_id}") + return None def update_product( @@ -104,14 +116,37 @@ def update_product( Returns: The updated ``(product_id, name, price, quantity)`` record, or - ``None`` when ``name`` is blank once normalised, no product - carries that identifier, or the normalised name is already taken - by another product. In every ``None`` case ``storage`` is left - unchanged and an explanatory message is printed. Renaming a - product to its own current name is allowed. + ``None`` when no product carries that identifier (``storage`` is + left unchanged and a message is printed). """ # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + name1, price, qual = fields + name = normalize_product_name(name1) + + if name == "": + print("product name must not be blank") + return None + + index = None + for i, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + index = i + break + + if index is None: + print(f"no product with id {product_id}") + return None + + if any( + product[NAME_INDEX] == name and product[PRODUCT_ID_INDEX] != product_id + for product in storage + ): + print(f"product name '{name}' is already taken") + return None + + updated = (product_id, name, normalize_price(price), qual) + storage[index] = updated + return updated def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -127,5 +162,10 @@ def delete_product(storage: list[Product], product_id: int) -> int | None: product carried that identifier (``storage`` is left unchanged and a message is printed). """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return 0 + # TODO: реализуйте функцию + for product in storage: + if product[PRODUCT_ID_INDEX] == product_id: + storage.remove(product) + return product_id + print(f"no product with id {product_id}") + return None diff --git a/src/part3/run_admin.py b/src/part3/run_admin.py index c5feeb0b..626a678c 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -29,22 +29,33 @@ it. """ -from decimal import Decimal, InvalidOperation # noqa: F401 +from decimal import Decimal, InvalidOperation from typing import Final -from .crud import ( # noqa: F401 +from .crud import ( create_product, delete_product, read_product, update_product, ) from .storage import Product -from .utils import get_storage_str_representation # noqa: F401 +from .utils import get_storage_str_representation # TODO: задайте приглашение и текст справки -PROMPT: Final[str] = "" -HELP_TEXT: Final[str] = "" +PROMPT: Final[str] = "admin> " +HELP_TEXT: Final[str] = """Available commands: + help show this message + exit leave the console + show print the whole store as a table + create add a product, print its new id + read print the product with that id + update overwrite that product's fields + delete remove the product with that id + +For create and update the price and quantity are the last two words of the +line; everything before them is the product name, so it may contain spaces +(for example "Gibson SG Junior") and needs no quoting.""" def show_help() -> None: @@ -55,6 +66,7 @@ def show_help() -> None: note on how multi-word names are parsed. """ # TODO: реализуйте функцию + print(HELP_TEXT) def print_result(result: object) -> None: @@ -66,6 +78,8 @@ def print_result(result: object) -> None: printed in that case. """ # TODO: реализуйте функцию + if result is not None: + print(result) def run_command(storage: list[Product], line: str) -> bool: @@ -89,7 +103,49 @@ def run_command(storage: list[Product], line: str) -> bool: ``update`` does not parse as a decimal number. """ # TODO: реализуйте функцию - return False + + if line == "exit": + return False + if line == "help": + show_help() + return True + if line == "show": + print(get_storage_str_representation(storage)) + return True + + words = line.split() + + if len(words) >= 4 and words[0] == "create": + name = " ".join(words[1:-2]) + price = Decimal(words[-2]) + quantity = int(words[-1]) + result: object = create_product(storage, (name, price, quantity)) + print_result(result) + return True + + if len(words) == 2 and words[0] == "read": + product_id = int(words[1]) + result = read_product(storage, product_id) + print_result(result) + return True + + if len(words) >= 5 and words[0] == "update": + product_id = int(words[1]) + name = " ".join(words[2:-2]) + price = Decimal(words[-2]) + quantity = int(words[-1]) + result = update_product(storage, product_id, (name, price, quantity)) + print_result(result) + return True + + if len(words) == 2 and words[0] == "delete": + product_id = int(words[1]) + result = delete_product(storage, product_id) + print_result(result) + return True + + print(f"{line!s} is not a command") + return True def main() -> None: diff --git a/src/part3/storage.py b/src/part3/storage.py index c5e34be5..36e9af7f 100644 --- a/src/part3/storage.py +++ b/src/part3/storage.py @@ -27,9 +27,9 @@ # TODO: задайте позиции полей внутри кортежа Product (используйте своё решение # части 2) PRODUCT_ID_INDEX: Final = 0 -NAME_INDEX: Final = 0 -PRICE_INDEX: Final = 0 -QUANTITY_INDEX: Final = 0 +NAME_INDEX: Final = 1 +PRICE_INDEX: Final = 2 +QUANTITY_INDEX: Final = 3 # TODO: задайте идентификатор первого товара в пустом хранилище -PRODUCT_ID_MIN: Final[int] = 0 +PRODUCT_ID_MIN: Final[int] = 1 diff --git a/src/part3/utils.py b/src/part3/utils.py index 318ded0b..f2fbf0a3 100644 --- a/src/part3/utils.py +++ b/src/part3/utils.py @@ -18,7 +18,7 @@ the longest value it holds in that particular call. """ -from decimal import ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final from .storage import Product @@ -28,14 +28,14 @@ # Quantisation step derived from PRICE_PRECISION, e.g. Decimal("0.01"). # TODO: задайте число знаков после запятой и шаг квантования (используйте своё # решение части 2) -PRICE_PRECISION: Final[int] = 0 -PRICE_STEP: Final = Decimal(0) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) # Column headers of the table produced by get_storage_str_representation, # left to right. The width of each column is not fixed here -- it is # measured per call from the data (see the function). # TODO: задайте заголовки столбцов таблицы -TABLE_HEADERS: Final[tuple[str, ...]] = () +TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") def normalize_price(price: Decimal) -> Decimal: @@ -48,8 +48,8 @@ def normalize_price(price: Decimal) -> Decimal: ``price`` quantised to :data:`PRICE_PRECISION` fractional digits, with halves rounded up. """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return Decimal(0) + # TODO: реализуйте функцию + return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) def normalize_product_name(name: str) -> str: @@ -67,7 +67,7 @@ def normalize_product_name(name: str) -> str: whitespace. """ # TODO: реализуйте функцию - return "" + return " ".join(name.split()).lower() # TODO: при необходимости добавьте свои вспомогательные функции @@ -92,4 +92,46 @@ def get_storage_str_representation(storage: list[Product]) -> str: the header labels. """ # TODO: реализуйте функцию - return "" + ids = [] + names = [] + prices = [] + quantitys = [] + + for product in storage: + ids.append(str(product[0])) + names.append(product[1]) + prices.append(str(product[2])) + quantitys.append(str(product[3])) + + w_id = max(len(TABLE_HEADERS[0]), max((len(x) for x in ids), default=0)) + w_name = max(len(TABLE_HEADERS[1]), max((len(x) for x in names), default=0)) + w_pr = max(len(TABLE_HEADERS[2]), max((len(x) for x in prices), default=0)) + w_qty = max(len(TABLE_HEADERS[3]), max((len(x) for x in quantitys), default=0)) + + change_str_main = ( + f"| {TABLE_HEADERS[0].ljust(w_id)} " + f"| {TABLE_HEADERS[1].ljust(w_name)} " + f"| {TABLE_HEADERS[2].ljust(w_pr)} " + f"| {TABLE_HEADERS[3].ljust(w_qty)} |" + ) + + change_str_dif = ( + f"|{'-' * (w_id + 2)}" + f"|{'-' * (w_name + 2)}" + f"|{'-' * (w_pr + 2)}" + f"|{'-' * (w_qty + 2)}|" + ) + + rows = [] + for i in range(len(storage)): + row = ( + f"| {ids[i].ljust(w_id)} " + f"| {names[i].ljust(w_name)} " + f"| {prices[i].ljust(w_pr)} " + f"| {quantitys[i].ljust(w_qty)} |" + ) + rows.append(row) + + res = "\n".join([change_str_main, change_str_dif, *rows]) + + return res From 0102cfcacdf6c3f7cf3117cff44f74172cde1790 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 28 Oct 2026 22:54:09 +0300 Subject: [PATCH 13/17] finished hometask --- src/part4/cart.py | 49 +++++++++++++++-- src/part4/crud.py | 72 ++++++++++++++++++++++--- src/part4/run_admin.py | 118 +++++++++++++++++++++++++++++++---------- src/part4/storage.py | 6 +-- src/part4/utils.py | 58 +++++++++++++++++--- 5 files changed, 254 insertions(+), 49 deletions(-) diff --git a/src/part4/cart.py b/src/part4/cart.py index aed9bb72..22b8501a 100644 --- a/src/part4/cart.py +++ b/src/part4/cart.py @@ -9,7 +9,10 @@ an explanatory message to stdout and returns ``None``. """ -from .storage import Product +from .storage import ( + QUANTITY_KEY, + Product, +) # TODO: при необходимости добавьте свои вспомогательные функции @@ -47,7 +50,24 @@ def add_to_cart( request. """ # TODO: реализуйте функцию - return 0 + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + storage_quantity = storage[product_id][QUANTITY_KEY] + + if storage_quantity < quantity: + print( + f"not enough stock for product {product_id}: {storage_quantity} available, {quantity} requested" + ) + return None + + storage[product_id][QUANTITY_KEY] -= quantity + + new_quan = cart.get(product_id, 0) + quantity + cart[product_id] = new_quan + + return new_quan def remove_from_cart( @@ -84,4 +104,27 @@ def remove_from_cart( the cart does not hold the product or holds too few units. """ # TODO: реализуйте функцию - return 0 + if product_id not in cart: + print(f"product {product_id} is not in the cart") + return None + + cart_quantity = cart[product_id] + if cart_quantity < quantity: + print( + f"cart holds only {cart_quantity} unit(s) of product {product_id}, cannot remove {quantity}" + ) + return None + + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + storage[product_id][QUANTITY_KEY] += quantity + + remaining = cart_quantity - quantity + if remaining == 0: + del cart[product_id] + else: + cart[product_id] = remaining + + return remaining diff --git a/src/part4/crud.py b/src/part4/crud.py index 471eff00..e764275c 100644 --- a/src/part4/crud.py +++ b/src/part4/crud.py @@ -23,16 +23,16 @@ than a scan over ``storage.values()``. """ -import uuid # noqa: F401 +import uuid from typing import Any -from .storage import ( # noqa: F401 +from .storage import ( NAME_KEY, PRICE_KEY, QUANTITY_KEY, Product, ) -from .utils import normalize_price, normalize_product_name # noqa: F401 +from .utils import normalize_price, normalize_product_name def generate_product_id() -> str: @@ -42,7 +42,7 @@ def generate_product_id() -> str: A freshly generated UUID, stringified. """ # TODO: реализуйте функцию - return "" + return str(uuid.uuid4()) def create_product( @@ -74,7 +74,26 @@ def create_product( message is printed. """ # TODO: реализуйте функцию - return "" + norm_name = normalize_product_name(fields[NAME_KEY]) + + if not norm_name: + print("product name must not be blank") + return None + if norm_name in product_names: + print(f"product name '{norm_name}' is already taken") + return None + + new_id = generate_product_id() + + storage[new_id] = { + NAME_KEY: norm_name, + PRICE_KEY: normalize_price(fields[PRICE_KEY]), + QUANTITY_KEY: fields[QUANTITY_KEY], + } + + product_names.add(norm_name) + + return new_id def read_product(storage: dict[str, Product], product_id: str) -> Product | None: @@ -89,7 +108,10 @@ def read_product(storage: dict[str, Product], product_id: str) -> Product | None that identifier (a message is printed in that case). """ # TODO: реализуйте функцию - return {} + if product_id not in storage: + print(f"no product with id {product_id}") + return None + return storage[product_id] def update_product( @@ -130,7 +152,34 @@ def update_product( own current name is allowed. """ # TODO: реализуйте функцию - return {} + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + product = storage[product_id] + current_name = product[NAME_KEY] + + if NAME_KEY in fields: + fields[NAME_KEY] = normalize_product_name(fields[NAME_KEY]) + if not fields[NAME_KEY]: + print("product name must not be blank") + return None + if fields[NAME_KEY] != current_name and fields[NAME_KEY] in product_names: + print(f"product name '{fields[NAME_KEY]}' is already taken") + return None + + if PRICE_KEY in fields: + fields[PRICE_KEY] = normalize_price(fields[PRICE_KEY]) + + if NAME_KEY in fields and fields[NAME_KEY] != current_name: + product_names.discard(current_name) + product_names.add(fields[NAME_KEY]) + + for key in (NAME_KEY, PRICE_KEY, QUANTITY_KEY): + if key in fields: + product[key] = fields[key] + + return product def delete_product( @@ -154,4 +203,11 @@ def delete_product( are left unchanged and a message is printed). """ # TODO: реализуйте функцию - return "" + if not product_id in storage: + print(f"no product with id {product_id}") + return None + + product_names.discard(storage[product_id][NAME_KEY]) + del storage[product_id] + + return product_id diff --git a/src/part4/run_admin.py b/src/part4/run_admin.py index 2247b29b..81e413b0 100644 --- a/src/part4/run_admin.py +++ b/src/part4/run_admin.py @@ -1,9 +1,9 @@ -"""Interactive admin console for the part4 in-memory product store. +"""Interactive admin console for the part3 in-memory product store. Running this module starts a read-eval-print loop over a single product store that lives in memory for the lifetime of the process. Every line -typed at the prompt is stripped of surrounding whitespace and matched, -with a ``match`` statement, against the set of known commands: +typed at the prompt is stripped of surrounding whitespace and matched +against the set of known commands: * ``help`` -- print the list of commands and what each one does; * ``exit`` -- leave the loop and end the program; @@ -19,31 +19,48 @@ product name, so a multi-word name such as ``Gibson SG Junior`` needs no quoting. -The four CRUD commands forward to :mod:`src.part4.crud`; whatever +The four CRUD commands forward to :mod:`src.part3.crud`; whatever that call returns is printed unless it is ``None``. A line whose first word is not a known verb, or that carries the wrong number of arguments for its verb, prints an "is not a command" notice. A line that names a -command correctly but whose price or quantity argument will not parse -prints a distinct "arguments are invalid" notice. Either way the store -is left untouched and the loop keeps running; only ``exit`` stops it. +command correctly but whose id, price or quantity argument will not +parse prints a distinct "arguments are invalid" notice. Either way the +store is left untouched and the loop keeps running; only ``exit`` stops +it. """ -from decimal import Decimal, InvalidOperation # noqa: F401 +from decimal import Decimal, InvalidOperation from typing import Final -from .crud import ( # noqa: F401 +from .crud import ( create_product, delete_product, read_product, update_product, ) -from .storage import NAME_KEY, PRICE_KEY, QUANTITY_KEY, Product # noqa: F401 -from .utils import get_storage_str_representation # noqa: F401 +from .storage import ( + NAME_KEY, + PRICE_KEY, + QUANTITY_KEY, + Product, +) +from .utils import get_storage_str_representation + +# TODO: задайте приглашение и текст справки +PROMPT: Final[str] = "admin> " +HELP_TEXT: Final[str] = """Available commands: + help show this message + exit leave the console + show print the whole store as a table + create add a product, print its new id + read print the product with that id + update overwrite that product's fields + delete remove the product with that id -# TODO: задайте приглашение и текст справки (используйте своё решение части 3) -PROMPT: Final[str] = "" -HELP_TEXT: Final[str] = "" +For create and update the price and quantity are the last two words of the +line; everything before them is the product name, so it may contain spaces +(for example "Gibson SG Junior") and needs no quoting.""" def show_help() -> None: @@ -53,7 +70,8 @@ def show_help() -> None: is: a heading, one line per command with a short description, and a note on how multi-word names are parsed. """ - # TODO: реализуйте функцию (используйте своё решение части 3) + # TODO: реализуйте функцию + print(HELP_TEXT) def print_result(result: object) -> None: @@ -64,7 +82,9 @@ def print_result(result: object) -> None: operation already reported its own failure, so nothing is printed in that case. """ - # TODO: реализуйте функцию (используйте своё решение части 3) + # TODO: реализуйте функцию + if result is not None: + print(result) def run_command( @@ -75,8 +95,6 @@ def run_command( Args: storage: The product store shared across the session; mutated in place by the ``create``, ``update`` and ``delete`` commands. - product_names: The normalised names already in ``storage``; kept - in sync by the ``create``, ``update`` and ``delete`` commands. line: One line of console input, already stripped of surrounding whitespace. @@ -86,24 +104,70 @@ def run_command( known command prints a notice and still returns ``True``. Raises: - ValueError: If the quantity argument of a CRUD command does not - parse as a base-10 integer. + ValueError: If an id or quantity argument of a CRUD command does + not parse as a base-10 integer. decimal.InvalidOperation: If the price argument of ``create`` or ``update`` does not parse as a decimal number. """ # TODO: реализуйте функцию - return False + + if line == "exit": + return False + if line == "help": + show_help() + return True + if line == "show": + print(get_storage_str_representation(storage)) + return True + + words = line.split() + + if len(words) >= 4 and words[0] == "create": + fields = { + NAME_KEY: " ".join(words[1:-2]), + PRICE_KEY: Decimal(words[-2]), + QUANTITY_KEY: int(words[-1]), + } + result: object = create_product(storage, product_names, fields) + print_result(result) + return True + + if len(words) == 2 and words[0] == "read": + product_id = words[1] + result = read_product(storage, product_id) + print_result(result) + return True + + if len(words) >= 5 and words[0] == "update": + product_id = words[1] + fields = { + NAME_KEY: " ".join(words[2:-2]), + PRICE_KEY: Decimal(words[-2]), + QUANTITY_KEY: int(words[-1]), + } + result = update_product(storage, product_names, product_id, fields) + print_result(result) + return True + + if len(words) == 2 and words[0] == "delete": + product_id = words[1] + result = delete_product(storage, product_names, product_id) + print_result(result) + return True + + print(f"{line!s} is not a command") + return True def main() -> None: """Run the admin console until the ``exit`` command is entered. - A single product store, and the set of normalised names it holds, are - created empty and kept in memory for the whole session. Each iteration - reads one line from stdin, strips its surrounding whitespace and hands - it to :func:`run_command`. A line that names a command but whose price - or quantity argument does not parse is caught here and reported - without stopping the loop; only ``exit`` ends it. + A single product store is created empty and kept in memory for the + whole session. Each iteration reads one line from stdin, strips its + surrounding whitespace and hands it to :func:`run_command`. A line + that names a command but whose id, price or quantity argument does + not parse is caught here and reported without stopping the loop; only + ``exit`` ends it. """ storage: dict[str, Product] = {} product_names: set[str] = set() diff --git a/src/part4/storage.py b/src/part4/storage.py index 9acedf07..97487635 100644 --- a/src/part4/storage.py +++ b/src/part4/storage.py @@ -40,6 +40,6 @@ # Name of each field inside a Product record. # TODO: задайте имена полей записи -NAME_KEY: Final = "" -PRICE_KEY: Final = "" -QUANTITY_KEY: Final = "" +NAME_KEY: Final = "name" +PRICE_KEY: Final = "price" +QUANTITY_KEY: Final = "key" diff --git a/src/part4/utils.py b/src/part4/utils.py index d2a940ea..645b3099 100644 --- a/src/part4/utils.py +++ b/src/part4/utils.py @@ -18,10 +18,10 @@ the longest value it holds in that particular call. """ -from decimal import ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final -from .storage import ( # noqa: F401 +from .storage import ( NAME_KEY, PRICE_KEY, QUANTITY_KEY, @@ -33,14 +33,14 @@ # Quantisation step derived from PRICE_PRECISION, e.g. Decimal("0.01"). # TODO: задайте число знаков после запятой и шаг квантования (используйте своё # решение части 3) -PRICE_PRECISION: Final[int] = 0 -PRICE_STEP: Final = Decimal(0) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) # Column headers of the table produced by get_storage_str_representation, # left to right. The width of each column is not fixed here -- it is # measured per call from the data (see the function). # TODO: задайте заголовки столбцов таблицы (используйте своё решение части 3) -TABLE_HEADERS: Final[tuple[str, ...]] = () +TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") def normalize_price(price: Decimal) -> Decimal: @@ -54,7 +54,7 @@ def normalize_price(price: Decimal) -> Decimal: with halves rounded up. """ # TODO: реализуйте функцию (используйте своё решение части 3) - return Decimal(0) + return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) def normalize_product_name(name: str) -> str: @@ -72,7 +72,7 @@ def normalize_product_name(name: str) -> str: whitespace. """ # TODO: реализуйте функцию (используйте своё решение части 3) - return "" + return " ".join(name.split()).lower() # TODO: при необходимости добавьте свои вспомогательные функции @@ -97,4 +97,46 @@ def get_storage_str_representation(storage: dict[str, Product]) -> str: returned, sized to the header labels. """ # TODO: реализуйте функцию (используйте своё решение части 3) - return "" + ids = [] + names = [] + prices = [] + quantitys = [] + + for str_prod, product in storage.items(): + ids.append(str(str_prod)) + names.append(product[NAME_KEY]) + prices.append(str(product[PRICE_KEY])) + quantitys.append(str(product[QUANTITY_KEY])) + + w_id = max(len(TABLE_HEADERS[0]), max((len(x) for x in ids), default=0)) + w_name = max(len(TABLE_HEADERS[1]), max((len(x) for x in names), default=0)) + w_pr = max(len(TABLE_HEADERS[2]), max((len(x) for x in prices), default=0)) + w_qty = max(len(TABLE_HEADERS[3]), max((len(x) for x in quantitys), default=0)) + + change_str_main = ( + f"| {TABLE_HEADERS[0].ljust(w_id)} " + f"| {TABLE_HEADERS[1].ljust(w_name)} " + f"| {TABLE_HEADERS[2].ljust(w_pr)} " + f"| {TABLE_HEADERS[3].ljust(w_qty)} |" + ) + + change_str_dif = ( + f"|{'-' * (w_id + 2)}" + f"|{'-' * (w_name + 2)}" + f"|{'-' * (w_pr + 2)}" + f"|{'-' * (w_qty + 2)}|" + ) + + rows = [] + for i in range(len(storage)): + row = ( + f"| {ids[i].ljust(w_id)} " + f"| {names[i].ljust(w_name)} " + f"| {prices[i].ljust(w_pr)} " + f"| {quantitys[i].ljust(w_qty)} |" + ) + rows.append(row) + + res = "\n".join([change_str_main, change_str_dif, *rows]) + + return res From b52a662ecaa559a941a6dc9c650f12b1a57563c2 Mon Sep 17 00:00:00 2001 From: Kirill Date: Sat, 14 Nov 2026 00:38:09 +0300 Subject: [PATCH 14/17] finished hometask 5 --- src/part5/cart.py | 49 +++++++++++++++-- src/part5/constants.py | 16 +++--- src/part5/crud.py | 97 +++++++++++++++++++++++++++++---- src/part5/decorators.py | 26 +++++++-- src/part5/run_admin.py | 90 ++++++++++++++++++++++++++++--- src/part5/snowflake.py | 67 ++++++++++++++++++++--- src/part5/utils.py | 116 ++++++++++++++++++++++++++++++++++++---- 7 files changed, 411 insertions(+), 50 deletions(-) diff --git a/src/part5/cart.py b/src/part5/cart.py index a2363b3a..2524acf4 100644 --- a/src/part5/cart.py +++ b/src/part5/cart.py @@ -9,7 +9,10 @@ an explanatory message to stdout and returns ``None``. """ -from .storage import Product +from .storage import ( + QUANTITY_KEY, + Product, +) # TODO: при необходимости добавьте свои вспомогательные функции @@ -48,8 +51,24 @@ def add_to_cart( request. """ # TODO: реализуйте функцию (используйте своё решение части 4) - return 0 + if product_id not in storage: + print(f"no product with id {product_id}") + return None + storage_quantity = storage[product_id][QUANTITY_KEY] + + if storage_quantity < quantity: + print( + f"not enough stock for product {product_id}: {storage_quantity} available, {quantity} requested" + ) + return None + + storage[product_id][QUANTITY_KEY] -= quantity + + new_quan = cart.get(product_id, 0) + quantity + cart[product_id] = new_quan + + return new_quan def remove_from_cart( storage: dict[int, Product], @@ -85,4 +104,28 @@ def remove_from_cart( the cart does not hold the product or holds too few units. """ # TODO: реализуйте функцию (используйте своё решение части 4) - return 0 + if product_id not in cart: + print(f"product {product_id} is not in the cart") + return None + + cart_quantity = cart[product_id] + if cart_quantity < quantity: + print( + f"cart holds only {cart_quantity} unit(s) of product {product_id}, cannot remove {quantity}" + ) + return None + + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + storage[product_id][QUANTITY_KEY] += quantity + + remaining = cart_quantity - quantity + if remaining == 0: + del cart[product_id] + else: + cart[product_id] = remaining + + return remaining + diff --git a/src/part5/constants.py b/src/part5/constants.py index 984671bb..66676678 100644 --- a/src/part5/constants.py +++ b/src/part5/constants.py @@ -19,19 +19,19 @@ # части 1). # Twitter's original Snowflake epoch: 2010-11-04 01:42:54.657 UTC. -EPOCH_MS_DEFAULT: Final[int] = 0 +EPOCH_MS_DEFAULT: Final[int] = 1288834974657 # Node identifier used when the caller does not supply one. -NODE_ID_DEFAULT: Final[int] = 0 +NODE_ID_DEFAULT: Final[int] = 1 # Width of each field, in bits. -TIMESTAMP_BITS: Final[int] = 0 -NODE_ID_BITS: Final[int] = 0 -SEQUENCE_ID_BITS: Final[int] = 0 +TIMESTAMP_BITS: Final[int] = 41 +NODE_ID_BITS: Final[int] = 10 +SEQUENCE_ID_BITS: Final[int] = 12 # Largest value each field can hold. -TIMESTAMP_MS_MAX: Final[int] = 0 -NODE_ID_MAX: Final[int] = 0 -SEQUENCE_ID_MAX: Final[int] = 0 +TIMESTAMP_MS_MAX: Final[int] = 2**41 - 1 +NODE_ID_MAX: Final[int] = 2**10 - 1 +SEQUENCE_ID_MAX: Final[int] = 2**12 - 1 # Здесь можно добавить собственные вспомогательные константы diff --git a/src/part5/crud.py b/src/part5/crud.py index 243b0528..1372ee84 100644 --- a/src/part5/crud.py +++ b/src/part5/crud.py @@ -38,22 +38,31 @@ from collections.abc import Callable from typing import Any, Final -from .decorators import Registry -from .storage import Product +from .decorators import Registry, collect_stats +from .snowflake import get_snowflake_id_generator +from .storage import ( + NAME_KEY, + PRICE_KEY, + QUANTITY_KEY, + Product, +) +from .utils import normalize_price, normalize_product_name STATS_REGISTRY: Final[Registry] = {} # TODO: задайте ключи операций в реестре, см. TASK.md -CREATE_KEY: Final[str] = "" -READ_KEY: Final[str] = "" -UPDATE_KEY: Final[str] = "" -DELETE_KEY: Final[str] = "" +CREATE_KEY: Final[str] = "create" +READ_KEY: Final[str] = "read" +UPDATE_KEY: Final[str] = "update" +DELETE_KEY: Final[str] = "delete" # TODO: при необходимости заведите здесь общий генератор Snowflake-идентификаторов # для generate_snowflake_id (см. TASK.md) +generator = get_snowflake_id_generator() + def generate_snowflake_id() -> int | None: """Issue the next product identifier from the shared Snowflake generator. @@ -66,10 +75,14 @@ def generate_snowflake_id() -> int | None: cases. """ # TODO: реализуйте функцию - return 0 + + if generator is None: + return None + return generator() # TODO: оберните операцию декоратором collect_stats +@collect_stats(CREATE_KEY, STATS_REGISTRY) def create_product( storage: dict[int, Product], product_names: set[str], @@ -105,10 +118,33 @@ def create_product( printed (for the last case, by ``generate_id`` itself). """ # TODO: реализуйте функцию - return 0 + + norm_name = normalize_product_name(fields[NAME_KEY]) + + if not norm_name: + print("product name must not be blank") + return None + if norm_name in product_names: + print(f"product name '{norm_name}' is already taken") + return None + + new_id = generate_id() + if new_id is None: + return None + + storage[new_id] = { + NAME_KEY: norm_name, + PRICE_KEY: normalize_price(fields[PRICE_KEY]), + QUANTITY_KEY: fields[QUANTITY_KEY], + } + + product_names.add(norm_name) + + return new_id # TODO: оберните операцию декоратором collect_stats +@collect_stats(READ_KEY, STATS_REGISTRY) def read_product(storage: dict[int, Product], product_id: int) -> Product | None: """Return the product stored under ``product_id``. @@ -121,10 +157,14 @@ def read_product(storage: dict[int, Product], product_id: int) -> Product | None that identifier (a message is printed in that case). """ # TODO: реализуйте функцию (используйте своё решение части 4) - return {} + if product_id not in storage: + print(f"no product with id {product_id}") + return None + return storage[product_id] # TODO: оберните операцию декоратором collect_stats +@collect_stats(UPDATE_KEY, STATS_REGISTRY) def update_product( storage: dict[int, Product], product_names: set[str], @@ -163,10 +203,38 @@ def update_product( own current name is allowed. """ # TODO: реализуйте функцию (используйте своё решение части 4) - return {} + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + product = storage[product_id] + current_name = product[NAME_KEY] + + if NAME_KEY in fields: + fields[NAME_KEY] = normalize_product_name(fields[NAME_KEY]) + if not fields[NAME_KEY]: + print("product name must not be blank") + return None + if fields[NAME_KEY] != current_name and fields[NAME_KEY] in product_names: + print(f"product name '{fields[NAME_KEY]}' is already taken") + return None + + if PRICE_KEY in fields: + fields[PRICE_KEY] = normalize_price(fields[PRICE_KEY]) + + if NAME_KEY in fields and fields[NAME_KEY] != current_name: + product_names.discard(current_name) + product_names.add(fields[NAME_KEY]) + + for key in (NAME_KEY, PRICE_KEY, QUANTITY_KEY): + if key in fields: + product[key] = fields[key] + + return product # TODO: оберните операцию декоратором collect_stats +@collect_stats(DELETE_KEY, STATS_REGISTRY) def delete_product( storage: dict[int, Product], product_names: set[str], @@ -188,4 +256,11 @@ def delete_product( are left unchanged and a message is printed). """ # TODO: реализуйте функцию (используйте своё решение части 4) - return 0 + if not product_id in storage: + print(f"no product with id {product_id}") + return None + + product_names.discard(storage[product_id][NAME_KEY]) + del storage[product_id] + + return product_id diff --git a/src/part5/decorators.py b/src/part5/decorators.py index 21a9f237..5fdd66d0 100644 --- a/src/part5/decorators.py +++ b/src/part5/decorators.py @@ -15,11 +15,12 @@ from collections.abc import Callable from typing import Final +from functools import wraps # TODO: задайте имена двух счётчиков, см. TASK.md -SUCCESS_KEY: Final[str] = "" -FAILS_KEY: Final[str] = "" +SUCCESS_KEY: Final[str] = "success" +FAILS_KEY: Final[str] = "fails" type Stats = dict[str, int] @@ -54,4 +55,23 @@ def collect_stats[**P, R]( docstring as the original (see :func:`functools.wraps`). """ # TODO: реализуйте декоратор - return lambda function: function + + def decorator(func: Callable): + if key in registry: + print(f"stats key {key!r} is already registered") + return func + + registry[key] = {SUCCESS_KEY: 0, FAILS_KEY: 0} + + @wraps(func) + def wrapper(*args, **kwargs): + result = func(*args, **kwargs) + if result is None: + registry[key][FAILS_KEY] += 1 + else: + registry[key][SUCCESS_KEY] += 1 + return result + + return wrapper + + return decorator \ No newline at end of file diff --git a/src/part5/run_admin.py b/src/part5/run_admin.py index d2e83947..555480c3 100644 --- a/src/part5/run_admin.py +++ b/src/part5/run_admin.py @@ -36,17 +36,42 @@ is left untouched and the loop keeps running; only ``exit`` stops it. """ -from decimal import InvalidOperation +from decimal import Decimal, InvalidOperation from typing import Final -from .storage import Product +from .crud import ( + STATS_REGISTRY, + create_product, + delete_product, + generate_snowflake_id, + read_product, + update_product, +) +from .storage import ( + NAME_KEY, + PRICE_KEY, + QUANTITY_KEY, + Product, +) +from .utils import get_stats_str_representation, get_storage_str_representation # TODO: задайте приглашение и текст справки (используйте своё решение части 4, # не забудьте добавить команду stats, см. TASK.md) -PROMPT: Final[str] = "" -HELP_TEXT: Final[str] = "" - +PROMPT: Final[str] = "admin> " +HELP_TEXT: Final[str] = """Available commands: + help show this message + exit leave the console + show print the whole store as a table + create add a product, print its new id + read print the product with that id + update overwrite that product's fields + delete remove the product with that id + stats print call statistics of the CRUD commands + +For create and update the price and quantity are the last two words of the +line; everything before them is the product name, so it may contain spaces +(for example "Gibson SG Junior") and needs no quoting.""" def show_help() -> None: """Print the command reference to stdout. @@ -56,7 +81,7 @@ def show_help() -> None: note on how multi-word names are parsed. """ # TODO: реализуйте функцию (используйте своё решение части 4) - + print(HELP_TEXT) def print_result(result: object) -> None: """Print a CRUD result to stdout unless it is ``None``. @@ -67,7 +92,8 @@ def print_result(result: object) -> None: printed in that case. """ # TODO: реализуйте функцию (используйте своё решение части 4) - + if result is not None: + print(result) def run_command( storage: dict[int, Product], product_names: set[str], line: str @@ -94,7 +120,55 @@ def run_command( ``update`` does not parse as a decimal number. """ # TODO: реализуйте функцию - return False + words = line.split() + + match words: + case ["exit"]: + return False + case ["help"]: + show_help() + return True + case ["show"]: + print(get_storage_str_representation(storage)) + return True + case ["stats"]: + print(get_stats_str_representation(STATS_REGISTRY)) + return True + + case ["create", *args] if len(args) >= 3: + fields = { + NAME_KEY: " ".join(args[:-2]), + PRICE_KEY: Decimal(args[-2]), + QUANTITY_KEY: int(args[-1]), + } + + result = create_product(storage, product_names, fields, generate_id=generate_snowflake_id) + print_result(result) + return True + + case ["read", product_id]: + result = read_product(storage, int(product_id)) + print_result(result) + return True + + case ["update", product_id, *args] if len(args) >= 3: + fields = { + NAME_KEY: " ".join(args[:-2]), + PRICE_KEY: Decimal(args[-2]), + QUANTITY_KEY: int(args[-1]), + } + result = update_product(storage, product_names, int(product_id), fields) + print_result(result) + return True + + case ["delete", product_id]: + result = delete_product(storage, product_names, int(product_id)) + print_result(result) + return True + + case _: + print(f"{line!r} is not a command") + return True def main() -> None: diff --git a/src/part5/snowflake.py b/src/part5/snowflake.py index 64e28468..b2295901 100644 --- a/src/part5/snowflake.py +++ b/src/part5/snowflake.py @@ -15,8 +15,20 @@ """ from collections.abc import Callable - -from .constants import EPOCH_MS_DEFAULT, NODE_ID_DEFAULT +import time + +from .constants import ( + # Epoch + EPOCH_MS_DEFAULT, + # Node ID + NODE_ID_BITS, + NODE_ID_DEFAULT, + NODE_ID_MAX, + # Sequence ID + SEQUENCE_ID_BITS, + SEQUENCE_ID_MAX, + TIMESTAMP_MS_MAX, +) def read_current_millis(epoch_ms: int) -> int: @@ -30,7 +42,8 @@ def read_current_millis(epoch_ms: int) -> int: if ``epoch_ms`` lies in the future. """ # TODO: реализуйте функцию (используйте своё решение части 1) - return 0 + a = (time.time_ns() // 1000000) - epoch_ms + return a def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: @@ -46,7 +59,8 @@ def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> generated. """ # TODO: реализуйте функцию (используйте своё решение части 1) - return 0 + epoch_time = snowflake_id >> (SEQUENCE_ID_BITS + NODE_ID_BITS) + return epoch_time + epoch_ms def decode_node_id(snowflake_id: int) -> int: @@ -61,7 +75,8 @@ def decode_node_id(snowflake_id: int) -> int: ``[0, NODE_ID_MAX]``. """ # TODO: реализуйте функцию (используйте своё решение части 1) - return 0 + node_num = (snowflake_id >> SEQUENCE_ID_BITS) & NODE_ID_MAX + return node_num def decode_sequence_id(snowflake_id: int) -> int: @@ -76,7 +91,8 @@ def decode_sequence_id(snowflake_id: int) -> int: the range ``[0, SEQUENCE_ID_MAX]``. """ # TODO: реализуйте функцию (используйте своё решение части 1) - return 0 + seq_id = snowflake_id & SEQUENCE_ID_MAX + return seq_id def get_snowflake_id_generator( @@ -109,4 +125,41 @@ def get_snowflake_id_generator( ``epoch_ms`` lies in the future. """ # TODO: реализуйте функцию - return lambda: 0 + + if not 0 <= node_id <= NODE_ID_MAX: + print(f"node_id must be in [0, {NODE_ID_MAX}], got {node_id}") + return None + + if read_current_millis(epoch_ms) < 0: + print(f"epoch_ms must not be in the future, got {epoch_ms}") + return None + + state = {"last_millis": -1, "sequence": 0} + + def generate(): + current_millis = read_current_millis(epoch_ms) + + if current_millis > TIMESTAMP_MS_MAX: + print( + f"timestamp {current_millis} ms overflows {TIMESTAMP_MS_MAX} ms" + ) + return None + + if current_millis == state["last_millis"]: + state["sequence"] += 1 + if state["sequence"] > SEQUENCE_ID_MAX: + print( + f"sequence_id must be in [0, {SEQUENCE_ID_MAX}], got {state['sequence']}" + ) + return None + else: + state["last_millis"] = current_millis + state["sequence"] = 0 + + return ( + (current_millis << (NODE_ID_BITS + SEQUENCE_ID_BITS)) + | (node_id << SEQUENCE_ID_BITS) + | state["sequence"] + ) + + return generate \ No newline at end of file diff --git a/src/part5/utils.py b/src/part5/utils.py index b2ad4dc4..bfa87a75 100644 --- a/src/part5/utils.py +++ b/src/part5/utils.py @@ -21,23 +21,28 @@ look, with the success rate of every command as a percentage. """ -from decimal import Decimal +from decimal import ROUND_HALF_UP, Decimal from typing import Final from .decorators import Registry -from .storage import Product +from .storage import ( + NAME_KEY, + PRICE_KEY, + QUANTITY_KEY, + Product, +) # TODO: задайте число знаков после запятой и шаг квантования (используйте своё # решение части 4) -PRICE_PRECISION: Final[int] = 0 -PRICE_STEP: Final = Decimal(0) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) # TODO: задайте заголовки столбцов таблицы (используйте своё решение части 4) -TABLE_HEADERS: Final[tuple[str, ...]] = () +TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") # TODO: задайте заголовки столбцов таблицы статистики, см. TASK.md -STATS_TABLE_HEADERS: Final[tuple[str, ...]] = () +STATS_TABLE_HEADERS: Final[tuple[str, ...]] = ("command name", "success", "fails", "success rate") def normalize_price(price: Decimal) -> Decimal: @@ -51,7 +56,7 @@ def normalize_price(price: Decimal) -> Decimal: with halves rounded up. """ # TODO: реализуйте функцию (используйте своё решение части 4) - return Decimal(0) + return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) def normalize_product_name(name: str) -> str: @@ -69,7 +74,7 @@ def normalize_product_name(name: str) -> str: whitespace. """ # TODO: реализуйте функцию (используйте своё решение части 4) - return "" + return " ".join(name.split()).lower() # TODO: при необходимости добавьте свои вспомогательные функции @@ -94,7 +99,49 @@ def get_storage_str_representation(storage: dict[int, Product]) -> str: returned, sized to the header labels. """ # TODO: реализуйте функцию (используйте своё решение части 4) - return "" + ids = [] + names = [] + prices = [] + quantitys = [] + + for str_prod, product in storage.items(): + ids.append(str(str_prod)) + names.append(product[NAME_KEY]) + prices.append(str(product[PRICE_KEY])) + quantitys.append(str(product[QUANTITY_KEY])) + + w_id = max(len(TABLE_HEADERS[0]), max((len(x) for x in ids), default=0)) + w_name = max(len(TABLE_HEADERS[1]), max((len(x) for x in names), default=0)) + w_pr = max(len(TABLE_HEADERS[2]), max((len(x) for x in prices), default=0)) + w_qty = max(len(TABLE_HEADERS[3]), max((len(x) for x in quantitys), default=0)) + + change_str_main = ( + f"| {TABLE_HEADERS[0].ljust(w_id)} " + f"| {TABLE_HEADERS[1].ljust(w_name)} " + f"| {TABLE_HEADERS[2].ljust(w_pr)} " + f"| {TABLE_HEADERS[3].ljust(w_qty)} |" + ) + + change_str_dif = ( + f"|{'-' * (w_id + 2)}" + f"|{'-' * (w_name + 2)}" + f"|{'-' * (w_pr + 2)}" + f"|{'-' * (w_qty + 2)}|" + ) + + rows = [] + for i in range(len(storage)): + row = ( + f"| {ids[i].ljust(w_id)} " + f"| {names[i].ljust(w_name)} " + f"| {prices[i].ljust(w_pr)} " + f"| {quantitys[i].ljust(w_qty)} |" + ) + rows.append(row) + + res = "\n".join([change_str_main, change_str_dif, *rows]) + + return res def get_stats_str_representation(registry: Registry) -> str: @@ -117,4 +164,53 @@ def get_stats_str_representation(registry: Registry) -> str: header labels. """ # TODO: реализуйте функцию - return "" + commands = [] + successes = [] + fails = [] + ratios = [] + + for cmd, stats in registry.items(): + s = stats["success"] + f = stats["fails"] + total = s + f + + if total > 0: + ratio = f"{s / total * 100:.2f}%" + else: + ratio = "0.00%" + + commands.append(cmd) + successes.append(str(s)) + fails.append(str(f)) + ratios.append(ratio) + + w_cmd = max(len(STATS_TABLE_HEADERS[0]), max((len(x) for x in commands), default=0)) + w_suc = max(len(STATS_TABLE_HEADERS[1]), max((len(x) for x in successes), default=0)) + w_fai = max(len(STATS_TABLE_HEADERS[2]), max((len(x) for x in fails), default=0)) + w_rat = max(len(STATS_TABLE_HEADERS[3]), max((len(x) for x in ratios), default=0)) + + change_str_main = ( + f"| {STATS_TABLE_HEADERS[0].ljust(w_cmd)} " + f"| {STATS_TABLE_HEADERS[1].ljust(w_suc)} " + f"| {STATS_TABLE_HEADERS[2].ljust(w_fai)} " + f"| {STATS_TABLE_HEADERS[3].ljust(w_rat)} |" + ) + + change_str_dif = ( + f"|{'-' * (w_cmd + 2)}" + f"|{'-' * (w_suc + 2)}" + f"|{'-' * (w_fai + 2)}" + f"|{'-' * (w_rat + 2)}|" + ) + + rows = [] + for i in range(len(registry)): + row = ( + f"| {commands[i].ljust(w_cmd)} " + f"| {successes[i].ljust(w_suc)} " + f"| {fails[i].ljust(w_fai)} " + f"| {ratios[i].ljust(w_rat)} |" + ) + rows.append(row) + + return "\n".join([change_str_main, change_str_dif, *rows]) From d2fd434c228b7066f040af2dd2ff69b4cb95d3b6 Mon Sep 17 00:00:00 2001 From: Kirill Date: Sat, 14 Nov 2026 00:40:01 +0300 Subject: [PATCH 15/17] finished hometask 5 --- src/part5/storage.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/part5/storage.py b/src/part5/storage.py index fa8ef3bb..17560fdc 100644 --- a/src/part5/storage.py +++ b/src/part5/storage.py @@ -39,6 +39,6 @@ type Product = dict[str, Any] # TODO: задайте имена полей записи (используйте своё решение части 4) -NAME_KEY: Final = "" -PRICE_KEY: Final = "" -QUANTITY_KEY: Final = "" +NAME_KEY: Final = "name" +PRICE_KEY: Final = "price" +QUANTITY_KEY: Final = "key" \ No newline at end of file From 11fdaf1b9ad266838f9cb334537899ad69c9e1f8 Mon Sep 17 00:00:00 2001 From: Kirill Date: Sat, 14 Nov 2026 00:41:09 +0300 Subject: [PATCH 16/17] finished hometask 5 --- src/part5/cart.py | 2 +- src/part5/crud.py | 13 +++++++------ src/part5/decorators.py | 4 ++-- src/part5/run_admin.py | 7 ++++++- src/part5/snowflake.py | 8 +++----- src/part5/storage.py | 2 +- src/part5/utils.py | 15 +++++++++++---- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/part5/cart.py b/src/part5/cart.py index 2524acf4..be9ba098 100644 --- a/src/part5/cart.py +++ b/src/part5/cart.py @@ -70,6 +70,7 @@ def add_to_cart( return new_quan + def remove_from_cart( storage: dict[int, Product], product_names: set[str], @@ -128,4 +129,3 @@ def remove_from_cart( cart[product_id] = remaining return remaining - diff --git a/src/part5/crud.py b/src/part5/crud.py index 1372ee84..f0ae15bb 100644 --- a/src/part5/crud.py +++ b/src/part5/crud.py @@ -63,6 +63,7 @@ generator = get_snowflake_id_generator() + def generate_snowflake_id() -> int | None: """Issue the next product identifier from the shared Snowflake generator. @@ -206,10 +207,10 @@ def update_product( if product_id not in storage: print(f"no product with id {product_id}") return None - + product = storage[product_id] current_name = product[NAME_KEY] - + if NAME_KEY in fields: fields[NAME_KEY] = normalize_product_name(fields[NAME_KEY]) if not fields[NAME_KEY]: @@ -218,18 +219,18 @@ def update_product( if fields[NAME_KEY] != current_name and fields[NAME_KEY] in product_names: print(f"product name '{fields[NAME_KEY]}' is already taken") return None - + if PRICE_KEY in fields: fields[PRICE_KEY] = normalize_price(fields[PRICE_KEY]) - + if NAME_KEY in fields and fields[NAME_KEY] != current_name: product_names.discard(current_name) product_names.add(fields[NAME_KEY]) - + for key in (NAME_KEY, PRICE_KEY, QUANTITY_KEY): if key in fields: product[key] = fields[key] - + return product diff --git a/src/part5/decorators.py b/src/part5/decorators.py index 5fdd66d0..dc6182a5 100644 --- a/src/part5/decorators.py +++ b/src/part5/decorators.py @@ -14,8 +14,8 @@ """ from collections.abc import Callable -from typing import Final from functools import wraps +from typing import Final # TODO: задайте имена двух счётчиков, см. TASK.md @@ -74,4 +74,4 @@ def wrapper(*args, **kwargs): return wrapper - return decorator \ No newline at end of file + return decorator diff --git a/src/part5/run_admin.py b/src/part5/run_admin.py index 555480c3..efce472a 100644 --- a/src/part5/run_admin.py +++ b/src/part5/run_admin.py @@ -73,6 +73,7 @@ line; everything before them is the product name, so it may contain spaces (for example "Gibson SG Junior") and needs no quoting.""" + def show_help() -> None: """Print the command reference to stdout. @@ -83,6 +84,7 @@ def show_help() -> None: # TODO: реализуйте функцию (используйте своё решение части 4) print(HELP_TEXT) + def print_result(result: object) -> None: """Print a CRUD result to stdout unless it is ``None``. @@ -95,6 +97,7 @@ def print_result(result: object) -> None: if result is not None: print(result) + def run_command( storage: dict[int, Product], product_names: set[str], line: str ) -> bool: @@ -142,7 +145,9 @@ def run_command( QUANTITY_KEY: int(args[-1]), } - result = create_product(storage, product_names, fields, generate_id=generate_snowflake_id) + result = create_product( + storage, product_names, fields, generate_id=generate_snowflake_id + ) print_result(result) return True diff --git a/src/part5/snowflake.py b/src/part5/snowflake.py index b2295901..d65c71b6 100644 --- a/src/part5/snowflake.py +++ b/src/part5/snowflake.py @@ -14,8 +14,8 @@ :func:`decode_node_id` and :func:`decode_sequence_id`. """ -from collections.abc import Callable import time +from collections.abc import Callable from .constants import ( # Epoch @@ -140,9 +140,7 @@ def generate(): current_millis = read_current_millis(epoch_ms) if current_millis > TIMESTAMP_MS_MAX: - print( - f"timestamp {current_millis} ms overflows {TIMESTAMP_MS_MAX} ms" - ) + print(f"timestamp {current_millis} ms overflows {TIMESTAMP_MS_MAX} ms") return None if current_millis == state["last_millis"]: @@ -162,4 +160,4 @@ def generate(): | state["sequence"] ) - return generate \ No newline at end of file + return generate diff --git a/src/part5/storage.py b/src/part5/storage.py index 17560fdc..53eb89c4 100644 --- a/src/part5/storage.py +++ b/src/part5/storage.py @@ -41,4 +41,4 @@ # TODO: задайте имена полей записи (используйте своё решение части 4) NAME_KEY: Final = "name" PRICE_KEY: Final = "price" -QUANTITY_KEY: Final = "key" \ No newline at end of file +QUANTITY_KEY: Final = "key" diff --git a/src/part5/utils.py b/src/part5/utils.py index bfa87a75..7f7958a7 100644 --- a/src/part5/utils.py +++ b/src/part5/utils.py @@ -42,7 +42,12 @@ # TODO: задайте заголовки столбцов таблицы (используйте своё решение части 4) TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") # TODO: задайте заголовки столбцов таблицы статистики, см. TASK.md -STATS_TABLE_HEADERS: Final[tuple[str, ...]] = ("command name", "success", "fails", "success rate") +STATS_TABLE_HEADERS: Final[tuple[str, ...]] = ( + "command name", + "success", + "fails", + "success rate", +) def normalize_price(price: Decimal) -> Decimal: @@ -173,19 +178,21 @@ def get_stats_str_representation(registry: Registry) -> str: s = stats["success"] f = stats["fails"] total = s + f - + if total > 0: ratio = f"{s / total * 100:.2f}%" else: ratio = "0.00%" - + commands.append(cmd) successes.append(str(s)) fails.append(str(f)) ratios.append(ratio) w_cmd = max(len(STATS_TABLE_HEADERS[0]), max((len(x) for x in commands), default=0)) - w_suc = max(len(STATS_TABLE_HEADERS[1]), max((len(x) for x in successes), default=0)) + w_suc = max( + len(STATS_TABLE_HEADERS[1]), max((len(x) for x in successes), default=0) + ) w_fai = max(len(STATS_TABLE_HEADERS[2]), max((len(x) for x in fails), default=0)) w_rat = max(len(STATS_TABLE_HEADERS[3]), max((len(x) for x in ratios), default=0)) From 7cfeb0f0e46c7bf557072dbab94f2f55e11ee585 Mon Sep 17 00:00:00 2001 From: Kirill Date: Sat, 14 Nov 2026 00:48:17 +0300 Subject: [PATCH 17/17] fix style --- src/part5/decorators.py | 6 +++--- src/part5/run_admin.py | 2 ++ src/part5/snowflake.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/part5/decorators.py b/src/part5/decorators.py index dc6182a5..3855bbfd 100644 --- a/src/part5/decorators.py +++ b/src/part5/decorators.py @@ -15,7 +15,7 @@ from collections.abc import Callable from functools import wraps -from typing import Final +from typing import Any, Final # TODO: задайте имена двух счётчиков, см. TASK.md @@ -56,7 +56,7 @@ def collect_stats[**P, R]( """ # TODO: реализуйте декоратор - def decorator(func: Callable): + def decorator(func: Callable[..., Any]) -> Callable[..., Any]: if key in registry: print(f"stats key {key!r} is already registered") return func @@ -64,7 +64,7 @@ def decorator(func: Callable): registry[key] = {SUCCESS_KEY: 0, FAILS_KEY: 0} @wraps(func) - def wrapper(*args, **kwargs): + def wrapper(*args: Any, **kwargs: Any) -> Any: result = func(*args, **kwargs) if result is None: registry[key][FAILS_KEY] += 1 diff --git a/src/part5/run_admin.py b/src/part5/run_admin.py index efce472a..be43a48e 100644 --- a/src/part5/run_admin.py +++ b/src/part5/run_admin.py @@ -125,6 +125,8 @@ def run_command( # TODO: реализуйте функцию words = line.split() + result: object = None + match words: case ["exit"]: return False diff --git a/src/part5/snowflake.py b/src/part5/snowflake.py index d65c71b6..fc1f20c7 100644 --- a/src/part5/snowflake.py +++ b/src/part5/snowflake.py @@ -136,7 +136,7 @@ def get_snowflake_id_generator( state = {"last_millis": -1, "sequence": 0} - def generate(): + def generate() -> int | None: current_millis = read_current_millis(epoch_ms) if current_millis > TIMESTAMP_MS_MAX: