From f67184dece6c3ede0363f88b13cd888a67a49650 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Tue, 22 Sep 2026 18:33:42 +0300 Subject: [PATCH 01/10] 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..22c27cee 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 e152982e345756a80303170eedf1c5410ef1ce31 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Tue, 22 Sep 2026 21:38:44 +0300 Subject: [PATCH 02/10] Update snowflake.py --- src/part1/snowflake.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index d3abf050..9b0ae78d 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -23,6 +23,8 @@ TIMESTAMP_MS_MAX, ) +SEQ_BITS = SEQUENCE_ID_MAX.bit_length() +NODE_BITS = NODE_ID_MAX.bit_length() def read_current_millis(epoch_ms: int) -> int: """Read the number of milliseconds elapsed since the custom epoch. @@ -34,8 +36,8 @@ def read_current_millis(epoch_ms: int) -> int: The count of whole milliseconds between ``epoch_ms`` and now. May be negative if ``epoch_ms`` lies in the future. """ - # TODO: реализуйте функцию - return 0 + now_ms = time.time_ns() // 1000000 + return now_ms - epoch_ms def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: @@ -50,8 +52,7 @@ def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> The absolute Unix time in milliseconds at which the identifier was generated. """ - # TODO: реализуйте функцию - return 0 + return (snowflake_id >> (NODE_BITS + SEQ_BITS)) + epoch_ms def decode_node_id(snowflake_id: int) -> int: @@ -64,8 +65,7 @@ def decode_node_id(snowflake_id: int) -> int: The node identifier packed into ``snowflake_id``, in the range ``[0, NODE_ID_MAX]``. """ - # TODO: реализуйте функцию - return 0 + return (snowflake_id >> SEQ_BITS) & NODE_ID_MAX def decode_sequence_id(snowflake_id: int) -> int: @@ -78,8 +78,7 @@ def decode_sequence_id(snowflake_id: int) -> int: The per-millisecond sequence counter packed into ``snowflake_id``, in the range ``[0, SEQUENCE_ID_MAX]``. """ - # TODO: реализуйте функцию - return 0 + return snowflake_id & SEQUENCE_ID_MAX def generate_snowflake_id( @@ -110,5 +109,4 @@ def generate_snowflake_id( timestamp field (roughly 69 years after ``epoch_ms``). In each of those cases an explanatory message is printed to stdout first. """ - # TODO: реализуйте функцию - return 0 + return (timestamp_ms << (NODE_BITS + SEQ_BITS)) | (node_id << SEQ_BITS) | sequence_id From 7e9328b22c2766d1b061cfda362514fd447ff8b2 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Tue, 22 Sep 2026 23:44:47 +0300 Subject: [PATCH 03/10] Update snowflake.py --- src/part1/snowflake.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 9b0ae78d..6536718d 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -21,11 +21,10 @@ NODE_ID_MAX, SEQUENCE_ID_MAX, TIMESTAMP_MS_MAX, + NODE_ID_BITS, + SEQUENCE_ID_BITS, ) -SEQ_BITS = SEQUENCE_ID_MAX.bit_length() -NODE_BITS = NODE_ID_MAX.bit_length() - def read_current_millis(epoch_ms: int) -> int: """Read the number of milliseconds elapsed since the custom epoch. @@ -52,7 +51,7 @@ def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> The absolute Unix time in milliseconds at which the identifier was generated. """ - return (snowflake_id >> (NODE_BITS + SEQ_BITS)) + epoch_ms + return (snowflake_id >> (NODE_ID_BITS + SEQUENCE_ID_BITS)) + epoch_ms def decode_node_id(snowflake_id: int) -> int: @@ -109,4 +108,4 @@ def generate_snowflake_id( timestamp field (roughly 69 years after ``epoch_ms``). In each of those cases an explanatory message is printed to stdout first. """ - return (timestamp_ms << (NODE_BITS + SEQ_BITS)) | (node_id << SEQ_BITS) | sequence_id + return (timestamp_ms << (NODE_ID_BITS + SEQ_ID_BITS)) | (node_id << SEQ_ID_BITS) | sequence_id From 98d98f5e0658df1ca92f70c40c2365ce36c655d7 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Tue, 22 Sep 2026 23:47:42 +0300 Subject: [PATCH 04/10] Update snowflake.py --- 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 6536718d..64123f87 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -108,4 +108,4 @@ def generate_snowflake_id( timestamp field (roughly 69 years after ``epoch_ms``). In each of those cases an explanatory message is printed to stdout first. """ - return (timestamp_ms << (NODE_ID_BITS + SEQ_ID_BITS)) | (node_id << SEQ_ID_BITS) | sequence_id + return (timestamp_ms << (NODE_ID_BITS + SEQ_ID_BITS)) | (node_id << SEQ_ID_BITS) | sequence_id From 14abc8e7abbaf7cd14a005be650502cef670eb21 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Thu, 24 Sep 2026 19:54:10 +0300 Subject: [PATCH 05/10] Finished hometask --- src/part1/constants.py | 6 +++--- src/part1/snowflake.py | 30 ++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/part1/constants.py b/src/part1/constants.py index 22c27cee..7a112a77 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**TIMESTAMP_BITS - 1 +NODE_ID_MAX: Final[int] = 2**NODE_ID_BITS - 1 +SEQUENCE_ID_MAX: Final[int] = 2**SEQUENCE_ID_BITS - 1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 64123f87..0f6007da 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -13,18 +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_MS_DEFAULT, + NODE_ID_BITS, NODE_ID_DEFAULT, NODE_ID_MAX, + SEQUENCE_ID_BITS, SEQUENCE_ID_MAX, TIMESTAMP_MS_MAX, - NODE_ID_BITS, - SEQUENCE_ID_BITS, ) + def read_current_millis(epoch_ms: int) -> int: """Read the number of milliseconds elapsed since the custom epoch. @@ -64,7 +65,7 @@ def decode_node_id(snowflake_id: int) -> int: The node identifier packed into ``snowflake_id``, in the range ``[0, NODE_ID_MAX]``. """ - return (snowflake_id >> SEQ_BITS) & NODE_ID_MAX + return (snowflake_id >> SEQUENCE_ID_BITS) & NODE_ID_MAX def decode_sequence_id(snowflake_id: int) -> int: @@ -108,4 +109,21 @@ def generate_snowflake_id( timestamp field (roughly 69 years after ``epoch_ms``). In each of those cases an explanatory message is printed to stdout first. """ - return (timestamp_ms << (NODE_ID_BITS + SEQ_ID_BITS)) | (node_id << SEQ_ID_BITS) | sequence_id + 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 + elif not (time.time_ns() // 1000000 - epoch_ms > TIMESTAMP_MS_MAX): + print(f"timestamp overflows: {time.time_ns() // 1000000} > {TIMESTAMP_MS_MAX}") + return None + else: + return ( + ( + ((time.time_ns() // 1000000) - epoch_ms) + << (NODE_ID_BITS + SEQUENCE_ID_BITS) + ) + | (node_id << SEQUENCE_ID_BITS) + | sequence_id + ) From f2482dcc80df9f7bf02e7e539c98f194e5103b82 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Mon, 12 Oct 2026 18:49:33 +0300 Subject: [PATCH 06/10] local changes --- src/part2/cart.py | 80 +++++++++++++++++++++++++++++++++++++++----- src/part2/crud.py | 48 +++++++++++++++++++------- src/part2/storage.py | 8 ++--- 3 files changed, 112 insertions(+), 24 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 063f9aea..03607998 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, @@ -22,9 +22,15 @@ type CartLine = tuple[int, int] -# 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 line in cart: + if line[LINE_PRODUCT_ID_INDEX] == product_id: + return line + return None def add_to_cart( @@ -53,8 +59,35 @@ def add_to_cart( The cart line for ``product_id`` after the addition, or ``None`` 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 + + available = product[QUANTITY_INDEX] + if available < quantity: + print( + f"not enough stock for product {product_id}: " + f"{available} available, {quantity} requested" + ) + return None + + new_stock = available - quantity + update_product( + storage, + product_id, + (product[NAME_INDEX], product[PRICE_INDEX], new_stock), + ) + + line = find_cart_line(cart, product_id) + if line is None: + new_line = (product_id, quantity) + cart.append(new_line) + return new_line + + index = cart.index(line) + new_line = (product_id, line[LINE_QUANTITY_INDEX] + quantity) + cart[index] = new_line + return new_line def remove_from_cart( @@ -85,5 +118,36 @@ def remove_from_cart( zero means the line was dropped), or ``None`` when the cart has no line for the product or holds too few units. """ - # TODO: реализуйте функцию - return (0, 0) + line = find_cart_line(cart, product_id) + if line is None: + print(f"product {product_id} is not in the cart") + return None + + in_cart = line[LINE_QUANTITY_INDEX] + if in_cart < quantity: + print( + f"cart holds only {in_cart} unit(s) of product {product_id}, " + f"cannot remove {quantity}" + ) + return None + + product = read_product(storage, product_id) + if product is None: + return None + + new_stock = product[QUANTITY_INDEX] + quantity + update_product( + storage, + product_id, + (product[NAME_INDEX], product[PRICE_INDEX], new_stock), + ) + + new_qty = in_cart - quantity + index = cart.index(line) + if new_qty == 0: + del cart[index] + return (product_id, 0) + + new_line = (product_id, new_qty) + cart[index] = new_line + return new_line diff --git a/src/part2/crud.py b/src/part2/crud.py index d026cbcb..02b16ab5 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: @@ -34,8 +34,9 @@ def generate_product_id(storage: list[Product]) -> int: :data:`~src.part2.storage.PRODUCT_ID_MIN` when ``storage`` is 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( @@ -56,8 +57,15 @@ def create_product( ``storage`` is left unchanged and a message naming the clashing 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: @@ -72,8 +80,11 @@ 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: реализуйте функцию - 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( @@ -99,8 +110,16 @@ def update_product( ``None`` when no product carries that identifier (``storage`` is left unchanged and a message is printed). """ - # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + name, price, quantity = fields + + for index, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + updated = (product_id, name, normalize_price(price), quantity) + storage[index] = updated + return updated + + print(f"no product with id {product_id}") + return None def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -116,5 +135,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: реализуйте функцию - return 0 + for index, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + del storage[index] + return product_id + + print(f"no product with id {product_id}") + return None 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 From d535d873a9ee7e97c8da2f4ad9a022977af165d5 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Mon, 12 Oct 2026 18:54:38 +0300 Subject: [PATCH 07/10] . --- src/part2/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/part2/utils.py b/src/part2/utils.py index 11bd7a76..2b6aa266 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -6,13 +6,13 @@ 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 # 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 c42681f8fa7bb23a989d44405dc703934cb08032 Mon Sep 17 00:00:00 2001 From: flex1ks Date: Sun, 1 Nov 2026 14:27:52 +0300 Subject: [PATCH 08/10] . --- src/part3/crud.py | 72 ++++++++++++++++---- src/part3/run_admin.py | 78 +++++++++++++++++++--- src/part3/storage.py | 147 +++++++++++++++++++++++++++++++++-------- 3 files changed, 247 insertions(+), 50 deletions(-) diff --git a/src/part3/crud.py b/src/part3/crud.py index 68811d7e..8d9fe96c 100644 --- a/src/part3/crud.py +++ b/src/part3/crud.py @@ -20,13 +20,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, normalize_product_name # noqa: F401 +from .utils import normalize_price, normalize_product_name def generate_product_id(storage: list[Product]) -> int: @@ -40,8 +40,9 @@ def generate_product_id(storage: list[Product]) -> int: :data:`~src.part3.storage.PRODUCT_ID_MIN` when ``storage`` is empty. """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return 0 + if not storage: + return PRODUCT_ID_MIN + return max(product[PRODUCT_ID_INDEX] for product in storage) + 1 def create_product( @@ -64,8 +65,20 @@ def create_product( normalised name already exists. In the ``None`` case ``storage`` is left unchanged and an explanatory message is printed. """ - # TODO: реализуйте функцию - return 0 + name, price, quan = fields + name = normalize_product_name(name) + + if not 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 +93,11 @@ 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) + 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( @@ -110,8 +126,35 @@ def update_product( unchanged and an explanatory message is printed. Renaming a product to its own current name is allowed. """ - # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + raw_name, price, quantity = fields + name = normalize_product_name(raw_name) + + if not name: + print("product name must not be blank") + return None + + target_index = None + for i, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + target_index = i + break + + if target_index is None: + print(f"no product with id {product_id}") + return None + for product in storage: + if product[NAME_INDEX] == name and product[PRODUCT_ID_INDEX] != product_id: + print(f"product name '{name}' is already taken") + return None + + updated: Product = ( + product_id, + name, + normalize_price(price), + quantity, + ) + storage[target_index] = updated + return updated def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -127,5 +170,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 + for i, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + del storage[i] + return product_id + + print(f"no product with id {product_id}") + return None \ No newline at end of file diff --git a/src/part3/run_admin.py b/src/part3/run_admin.py index c5feeb0b..c4b04997 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -29,22 +29,35 @@ 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:\n" + " help show this message\n" + " exit leave the console\n" + " show print the whole store as a table\n" + " create add a product, print its new id\n" + " read print the product with that id\n" + " update overwrite that product's fields\n" + " delete remove the product with that id\n" + "\n" + "For create and update the price and quantity are the last two words of the\n" + "line; everything before them is the product name, so it may contain spaces\n" + '(for example "Gibson SG Junior") and needs no quoting.' +) def show_help() -> None: @@ -54,7 +67,7 @@ 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: реализуйте функцию + print(HELP_TEXT) def print_result(result: object) -> None: @@ -65,7 +78,8 @@ def print_result(result: object) -> None: operation already reported its own failure, so nothing is printed in that case. """ - # TODO: реализуйте функцию + if result is not None: + print(result) def run_command(storage: list[Product], line: str) -> bool: @@ -88,8 +102,52 @@ def run_command(storage: list[Product], line: str) -> bool: decimal.InvalidOperation: If the price argument of ``create`` or ``update`` does not parse as a decimal number. """ - # TODO: реализуйте функцию - return False + words = line.split() + + if not words: + print(f"{line!r} is not a command") + return True + + verb = words[0] + + if verb == "exit" and len(words) == 1: + return False + + if verb == "help" and len(words) == 1: + show_help() + return True + + if verb == "show" and len(words) == 1: + print(get_storage_str_representation(storage)) + return True + + if verb == "create" and len(words) >= 4: + name = " ".join(words[1:-2]) + price = Decimal(words[-2]) + quantity = int(words[-1]) + print_result(create_product(storage, (name, price, quantity))) + return True + + if verb == "read" and len(words) == 2: + product_id = int(words[1]) + print_result(read_product(storage, product_id)) + return True + + if verb == "update" and len(words) >= 5: + product_id = int(words[1]) + name = " ".join(words[2:-2]) + price = Decimal(words[-2]) + quantity = int(words[-1]) + print_result(update_product(storage, product_id, (name, price, quantity))) + return True + + if verb == "delete" and len(words) == 2: + product_id = int(words[1]) + print_result(delete_product(storage, product_id)) + return True + + print(f"{line!r} is not a command") + return True def main() -> None: @@ -116,4 +174,4 @@ def main() -> None: if __name__ == "__main__": - main() + main() \ No newline at end of file diff --git a/src/part3/storage.py b/src/part3/storage.py index c5e34be5..e2a1f0d5 100644 --- a/src/part3/storage.py +++ b/src/part3/storage.py @@ -1,35 +1,126 @@ -"""In-memory product store for the shop CRUD exercise. - -The store is deliberately primitive: a plain list of tuples, with no -persistence, no indexing and no schema enforcement. Each element is a -:data:`Product` record -- a ``(product_id, name, price, quantity)`` tuple -where: - -* ``product_id`` -- unique positive integer key, assigned by the create - operation in :mod:`src.part3.crud`; -* ``name`` -- human-readable product name, unique across the store; -* ``price`` -- price of a single unit, held as a :class:`~decimal.Decimal` - amount rounded to a fixed number of decimal places (see - :func:`src.part3.utils.normalize_price`) so that money is never - subject to binary floating-point error; -* ``quantity`` -- number of units currently in stock. - -Field positions are exposed as ``*_INDEX`` constants so callers never -hard-code tuple offsets. +"""Standalone helpers shared by the part3 storage and CRUD modules. + +Normalisation: + +* :func:`normalize_price` rounds a raw :class:`~decimal.Decimal` amount to + the fixed number of fractional digits (:data:`PRICE_PRECISION`) that + every stored price uses, keeping currency values free of binary + floating-point error. +* :func:`normalize_product_name` strips surrounding whitespace from a + product name, collapses every internal run of whitespace to a single + space and lower-cases it, giving every stored name a single canonical + form. + +Presentation: + +* :func:`get_storage_str_representation` renders the whole store as a + text table meant to be printed to a terminal; each column is sized to + the longest value it holds in that particular call. """ -from decimal import Decimal +from decimal import ROUND_HALF_UP, Decimal from typing import Final +from .storage import ( + NAME_INDEX, + PRICE_INDEX, + PRODUCT_ID_INDEX, + QUANTITY_INDEX, + Product, +) + + +# Number of fractional digits every stored price is rounded to. +# Quantisation step derived from PRICE_PRECISION, e.g. Decimal("0.01"). +# TODO: задайте число знаков после запятой и шаг квантования (используйте своё +# решение части 2) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1) + +# 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, ...]] = ("ID", "name", "price", "quantity") + + +def normalize_price(price: Decimal) -> Decimal: + """Round a price to the precision every stored record uses. + + Args: + price: The raw price amount. + + Returns: + ``price`` quantised to :data:`PRICE_PRECISION` fractional digits, + with halves rounded up. + """ + # TODO: реализуйте функцию (используйте своё решение части 2) + return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) + + +def normalize_product_name(name: str) -> str: + """Reduce a product name to the canonical form the store keeps. + + Args: + name: The raw product name. + + Returns: + ``name`` with every leading and trailing whitespace character + removed, every internal run of whitespace (spaces, tabs and the + like) collapsed to a single space, and the rest lower-cased. For + example ``"abc def\tghi\tjkl"`` becomes ``"abc def ghi jkl"``. + The result is an empty string when ``name`` holds nothing but + whitespace. + """ + # TODO: реализуйте функцию + return "".join(name.split()).lower() + + +# TODO: при необходимости добавьте свои вспомогательные функции + + +def get_storage_str_representation(storage: list[Product]) -> str: + """Render the product store as a text table with data-sized columns. + + The table has the columns named by :data:`TABLE_HEADERS` -- id, name, + price and quantity. Each column is made exactly as wide as the longest + value it carries in this call (its header counted), so the columns + line up when the string is printed to a terminal and no value is ever + truncated. + + Args: + storage: The product store to render. + + Returns: + A multi-line string: a header row, a dashed separator row, then + one row per product in ``storage`` in list order. When ``storage`` + is empty only the header and separator rows are returned, sized to + the header labels. + """ + rows: list[tuple[str, str, str, str]] = [] + for product in storage: + rows.append( + ( + str(product[PRODUCT_ID_INDEX]), + product[NAME_INDEX], + str(product[PRICE_INDEX]), + str(product[QUANTITY_INDEX]), + ) + ) + widths: list[int] = [len(header) for header in TABLE_HEADERS] + for row in rows: + for i, value in enumerate(row): + widths[i] = max(widths[i], len(value)) + + def format_row(cells: tuple[str, ...]) -> str: + parts = [" " + cell.ljust(widths[i]) + " " for i, cell in enumerate(cells)] + return "|" + "|".join(parts) + "|" -type Product = tuple[int, str, Decimal, int] + header_line = format_row(TABLE_HEADERS) + separator_line = "|" + "|".join("-" * (width + 2) for width in widths) + "|" -# TODO: задайте позиции полей внутри кортежа Product (используйте своё решение -# части 2) -PRODUCT_ID_INDEX: Final = 0 -NAME_INDEX: Final = 0 -PRICE_INDEX: Final = 0 -QUANTITY_INDEX: Final = 0 + lines = [header_line, separator_line] + for row in rows: + lines.append(format_row(row)) -# TODO: задайте идентификатор первого товара в пустом хранилище -PRODUCT_ID_MIN: Final[int] = 0 + return "\n".join(lines) \ No newline at end of file From 2b56ba6b63427f160ec1e18396cb76ada80f07ce Mon Sep 17 00:00:00 2001 From: flex1ks Date: Sun, 1 Nov 2026 23:15:31 +0300 Subject: [PATCH 09/10] Finished task 4 --- src/part3/crud.py | 72 ++++---------------- src/part3/storage.py | 147 ++++++++--------------------------------- src/part4/cart.py | 52 ++++++++++++--- src/part4/crud.py | 76 +++++++++++++++++---- src/part4/run_admin.py | 85 ++++++++++++++++++++---- src/part4/storage.py | 6 +- src/part4/utils.py | 57 ++++++++++------ 7 files changed, 257 insertions(+), 238 deletions(-) diff --git a/src/part3/crud.py b/src/part3/crud.py index 8d9fe96c..68811d7e 100644 --- a/src/part3/crud.py +++ b/src/part3/crud.py @@ -20,13 +20,13 @@ from decimal import Decimal -from .storage import ( +from .storage import ( # noqa: F401 NAME_INDEX, PRODUCT_ID_INDEX, PRODUCT_ID_MIN, Product, ) -from .utils import normalize_price, normalize_product_name +from .utils import normalize_price, normalize_product_name # noqa: F401 def generate_product_id(storage: list[Product]) -> int: @@ -40,9 +40,8 @@ def generate_product_id(storage: list[Product]) -> int: :data:`~src.part3.storage.PRODUCT_ID_MIN` when ``storage`` is empty. """ - if not storage: - return PRODUCT_ID_MIN - return max(product[PRODUCT_ID_INDEX] for product in storage) + 1 + # TODO: реализуйте функцию (используйте своё решение части 2) + return 0 def create_product( @@ -65,20 +64,8 @@ def create_product( normalised name already exists. In the ``None`` case ``storage`` is left unchanged and an explanatory message is printed. """ - name, price, quan = fields - name = normalize_product_name(name) - - if not 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 + # TODO: реализуйте функцию + return 0 def read_product(storage: list[Product], product_id: int) -> Product | None: @@ -93,11 +80,8 @@ 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). """ - for product in storage: - if product[PRODUCT_ID_INDEX] == product_id: - return product - print(f"no product with id {product_id}") - return None + # TODO: реализуйте функцию (используйте своё решение части 2) + return (0, "", Decimal(0), 0) def update_product( @@ -126,35 +110,8 @@ def update_product( unchanged and an explanatory message is printed. Renaming a product to its own current name is allowed. """ - raw_name, price, quantity = fields - name = normalize_product_name(raw_name) - - if not name: - print("product name must not be blank") - return None - - target_index = None - for i, product in enumerate(storage): - if product[PRODUCT_ID_INDEX] == product_id: - target_index = i - break - - if target_index is None: - print(f"no product with id {product_id}") - return None - for product in storage: - if product[NAME_INDEX] == name and product[PRODUCT_ID_INDEX] != product_id: - print(f"product name '{name}' is already taken") - return None - - updated: Product = ( - product_id, - name, - normalize_price(price), - quantity, - ) - storage[target_index] = updated - return updated + # TODO: реализуйте функцию + return (0, "", Decimal(0), 0) def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -170,10 +127,5 @@ def delete_product(storage: list[Product], product_id: int) -> int | None: product carried that identifier (``storage`` is left unchanged and a message is printed). """ - for i, product in enumerate(storage): - if product[PRODUCT_ID_INDEX] == product_id: - del storage[i] - return product_id - - print(f"no product with id {product_id}") - return None \ No newline at end of file + # TODO: реализуйте функцию (используйте своё решение части 2) + return 0 diff --git a/src/part3/storage.py b/src/part3/storage.py index e2a1f0d5..8d733b3f 100644 --- a/src/part3/storage.py +++ b/src/part3/storage.py @@ -1,126 +1,35 @@ -"""Standalone helpers shared by the part3 storage and CRUD modules. - -Normalisation: - -* :func:`normalize_price` rounds a raw :class:`~decimal.Decimal` amount to - the fixed number of fractional digits (:data:`PRICE_PRECISION`) that - every stored price uses, keeping currency values free of binary - floating-point error. -* :func:`normalize_product_name` strips surrounding whitespace from a - product name, collapses every internal run of whitespace to a single - space and lower-cases it, giving every stored name a single canonical - form. - -Presentation: - -* :func:`get_storage_str_representation` renders the whole store as a - text table meant to be printed to a terminal; each column is sized to - the longest value it holds in that particular call. +"""In-memory product store for the shop CRUD exercise. + +The store is deliberately primitive: a plain list of tuples, with no +persistence, no indexing and no schema enforcement. Each element is a +:data:`Product` record -- a ``(product_id, name, price, quantity)`` tuple +where: + +* ``product_id`` -- unique positive integer key, assigned by the create + operation in :mod:`src.part3.crud`; +* ``name`` -- human-readable product name, unique across the store; +* ``price`` -- price of a single unit, held as a :class:`~decimal.Decimal` + amount rounded to a fixed number of decimal places (see + :func:`src.part3.utils.normalize_price`) so that money is never + subject to binary floating-point error; +* ``quantity`` -- number of units currently in stock. + +Field positions are exposed as ``*_INDEX`` constants so callers never +hard-code tuple offsets. """ -from decimal import ROUND_HALF_UP, Decimal +from decimal import Decimal from typing import Final -from .storage import ( - NAME_INDEX, - PRICE_INDEX, - PRODUCT_ID_INDEX, - QUANTITY_INDEX, - Product, -) - - -# Number of fractional digits every stored price is rounded to. -# Quantisation step derived from PRICE_PRECISION, e.g. Decimal("0.01"). -# TODO: задайте число знаков после запятой и шаг квантования (используйте своё -# решение части 2) -PRICE_PRECISION: Final[int] = 2 -PRICE_STEP: Final = Decimal(1) - -# 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, ...]] = ("ID", "name", "price", "quantity") - - -def normalize_price(price: Decimal) -> Decimal: - """Round a price to the precision every stored record uses. - - Args: - price: The raw price amount. - - Returns: - ``price`` quantised to :data:`PRICE_PRECISION` fractional digits, - with halves rounded up. - """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) - - -def normalize_product_name(name: str) -> str: - """Reduce a product name to the canonical form the store keeps. - - Args: - name: The raw product name. - - Returns: - ``name`` with every leading and trailing whitespace character - removed, every internal run of whitespace (spaces, tabs and the - like) collapsed to a single space, and the rest lower-cased. For - example ``"abc def\tghi\tjkl"`` becomes ``"abc def ghi jkl"``. - The result is an empty string when ``name`` holds nothing but - whitespace. - """ - # TODO: реализуйте функцию - return "".join(name.split()).lower() - - -# TODO: при необходимости добавьте свои вспомогательные функции - - -def get_storage_str_representation(storage: list[Product]) -> str: - """Render the product store as a text table with data-sized columns. - - The table has the columns named by :data:`TABLE_HEADERS` -- id, name, - price and quantity. Each column is made exactly as wide as the longest - value it carries in this call (its header counted), so the columns - line up when the string is printed to a terminal and no value is ever - truncated. - - Args: - storage: The product store to render. - - Returns: - A multi-line string: a header row, a dashed separator row, then - one row per product in ``storage`` in list order. When ``storage`` - is empty only the header and separator rows are returned, sized to - the header labels. - """ - rows: list[tuple[str, str, str, str]] = [] - for product in storage: - rows.append( - ( - str(product[PRODUCT_ID_INDEX]), - product[NAME_INDEX], - str(product[PRICE_INDEX]), - str(product[QUANTITY_INDEX]), - ) - ) - widths: list[int] = [len(header) for header in TABLE_HEADERS] - for row in rows: - for i, value in enumerate(row): - widths[i] = max(widths[i], len(value)) - - def format_row(cells: tuple[str, ...]) -> str: - parts = [" " + cell.ljust(widths[i]) + " " for i, cell in enumerate(cells)] - return "|" + "|".join(parts) + "|" - header_line = format_row(TABLE_HEADERS) - separator_line = "|" + "|".join("-" * (width + 2) for width in widths) + "|" +type Product = tuple[int, str, Decimal, int] - lines = [header_line, separator_line] - for row in rows: - lines.append(format_row(row)) +# TODO: задайте позиции полей внутри кортежа Product (используйте своё решение +# части 2) +PRODUCT_ID_INDEX: Final = 0 +NAME_INDEX: Final = 1 +PRICE_INDEX: Final = 2 +QUANTITY_INDEX: Final = 3 - return "\n".join(lines) \ No newline at end of file +# TODO: задайте идентификатор первого товара в пустом хранилище +PRODUCT_ID_MIN: Final[int] = 1 \ No newline at end of file diff --git a/src/part4/cart.py b/src/part4/cart.py index aed9bb72..a76b2a1b 100644 --- a/src/part4/cart.py +++ b/src/part4/cart.py @@ -9,10 +9,10 @@ an explanatory message to stdout and returns ``None``. """ -from .storage import Product - - -# TODO: при необходимости добавьте свои вспомогательные функции +from .storage import ( + QUANTITY_KEY, + Product, +) def add_to_cart( @@ -46,8 +46,22 @@ def add_to_cart( ``None`` when the product is unknown or the store cannot cover the request. """ - # TODO: реализуйте функцию - return 0 + product = storage.get(product_id) + if product is None: + print(f"no product with id {product_id}") + return None + + available = product[QUANTITY_KEY] + if available < quantity: + print( + f"not enough stock for product {product_id}: " + f"{available} available, {quantity} requested" + ) + return None + + product[QUANTITY_KEY] = available - quantity + cart[product_id] = cart.get(product_id, 0) + quantity + return cart[product_id] def remove_from_cart( @@ -83,5 +97,27 @@ def remove_from_cart( (zero means the product was dropped from the cart), or ``None`` when the cart does not hold the product or holds too few units. """ - # TODO: реализуйте функцию - return 0 + in_cart = cart.get(product_id) + if in_cart is None: + print(f"product {product_id} is not in the cart") + return None + + if in_cart < quantity: + print( + f"cart holds only {in_cart} unit(s) of product {product_id}, " + f"cannot remove {quantity}" + ) + return None + + product = storage.get(product_id) + if product is None: + print(f"no product with id {product_id}") + return None + + product[QUANTITY_KEY] += quantity + in_cart -= quantity + if in_cart == 0: + del cart[product_id] + else: + cart[product_id] = in_cart + return in_cart diff --git a/src/part4/crud.py b/src/part4/crud.py index 471eff00..6e6797c8 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: @@ -41,8 +41,8 @@ def generate_product_id() -> str: Returns: A freshly generated UUID, stringified. """ - # TODO: реализуйте функцию - return "" + + return str(uuid.uuid4()) def create_product( @@ -73,8 +73,23 @@ def create_product( and ``product_names`` are left unchanged and an explanatory message is printed. """ - # TODO: реализуйте функцию - return "" + name = normalize_product_name(fields[NAME_KEY]) + if not name: + print("product name must not be blank") + return None + + if name in product_names: + print(f"product name '{name}' is already taken") + return None + + product_id = generate_product_id() + storage[product_id] = { + NAME_KEY: name, + PRICE_KEY: normalize_price(fields[PRICE_KEY]), + QUANTITY_KEY: fields[QUANTITY_KEY], + } + product_names.add(name) + return product_id def read_product(storage: dict[str, Product], product_id: str) -> Product | None: @@ -88,8 +103,10 @@ def read_product(storage: dict[str, Product], product_id: str) -> Product | None The matching product record, or ``None`` when no product carries that identifier (a message is printed in that case). """ - # TODO: реализуйте функцию - return {} + product = storage.get(product_id) + if product is None: + print(f"no product with id {product_id}") + return product def update_product( @@ -129,8 +146,35 @@ def update_product( and an explanatory message is printed. Renaming a product to its own current name is allowed. """ - # TODO: реализуйте функцию - return {} + product = storage.get(product_id) + if product is None: + print(f"no product with id {product_id}") + return None + + if NAME_KEY in fields: + new_name = normalize_product_name(fields[NAME_KEY]) + if not new_name: + print("product name must not be blank") + return None + old_name = product[NAME_KEY] + if new_name != old_name and new_name in product_names: + print(f"product name '{new_name}' is already taken") + return None + fields[NAME_KEY] = new_name + + if PRICE_KEY in fields: + fields[PRICE_KEY] = normalize_price(fields[PRICE_KEY]) + + old_name = product[NAME_KEY] + + for key, value in fields.items(): + product[key] = value + + if NAME_KEY in fields and fields[NAME_KEY] != old_name: + product_names.discard(old_name) + product_names.add(fields[NAME_KEY]) + + return product def delete_product( @@ -153,5 +197,11 @@ def delete_product( product carried that identifier (``storage`` and ``product_names`` are left unchanged and a message is printed). """ - # TODO: реализуйте функцию - return "" + product = storage.get(product_id) + if product is None: + print(f"no product with id {product_id}") + return None + + product_names.discard(product[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..27e62971 100644 --- a/src/part4/run_admin.py +++ b/src/part4/run_admin.py @@ -28,22 +28,34 @@ 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 - - -# TODO: задайте приглашение и текст справки (используйте своё решение части 3) -PROMPT: Final[str] = "" -HELP_TEXT: Final[str] = "" +from .storage import NAME_KEY, PRICE_KEY, QUANTITY_KEY, Product +from .utils import get_storage_str_representation + + +PROMPT: Final[str] = "admin> " +HELP_TEXT: Final[str] = ( + "Available commands:\n" + " help show this message\n" + " exit leave the console\n" + " show print the whole store as a table\n" + " create add a product, print its new id\n" + " read print the product with that id\n" + " update overwrite that product's fields\n" + " delete remove the product with that id\n" + "\n" + "For create and update the price and quantity are the last two words of the\n" + "line; everything before them is the product name, so it may contain spaces\n" + '(for example "Gibson SG Junior") and needs no quoting.' +) def show_help() -> None: @@ -53,7 +65,7 @@ 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) + print(HELP_TEXT) def print_result(result: object) -> None: @@ -64,7 +76,8 @@ def print_result(result: object) -> None: operation already reported its own failure, so nothing is printed in that case. """ - # TODO: реализуйте функцию (используйте своё решение части 3) + if result is not None: + print(result) def run_command( @@ -91,8 +104,54 @@ def run_command( decimal.InvalidOperation: If the price argument of ``create`` or ``update`` does not parse as a decimal number. """ - # TODO: реализуйте функцию - return False + words = line.split() + + if not words: + print(f"{line!r} is not a command") + return True + + verb = words[0] + + if verb == "exit" and len(words) == 1: + return False + + if verb == "help" and len(words) == 1: + show_help() + return True + + if verb == "show" and len(words) == 1: + print(get_storage_str_representation(storage)) + return True + + if verb == "create" and len(words) >= 4: + name = " ".join(words[1:-2]) + price = Decimal(words[-2]) + quantity = int(words[-1]) + fields = {NAME_KEY: name, PRICE_KEY: price, QUANTITY_KEY: quantity} + print_result(create_product(storage, product_names, fields)) + return True + + if verb == "read" and len(words) == 2: + product_id = words[1] + print_result(read_product(storage, product_id)) + return True + + if verb == "update" and len(words) >= 5: + product_id = words[1] + name = " ".join(words[2:-2]) + price = Decimal(words[-2]) + quantity = int(words[-1]) + fields = {NAME_KEY: name, PRICE_KEY: price, QUANTITY_KEY: quantity} + print_result(update_product(storage, product_names, product_id, fields)) + return True + + if verb == "delete" and len(words) == 2: + product_id = words[1] + print_result(delete_product(storage, product_names, product_id)) + return True + + print(f"{line!r} is not a command") + return True def main() -> None: diff --git a/src/part4/storage.py b/src/part4/storage.py index 9acedf07..a25f6253 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 = "quantity" diff --git a/src/part4/utils.py b/src/part4/utils.py index d2a940ea..28df1e72 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, @@ -29,18 +29,11 @@ ) -# Number of fractional digits every stored price is rounded to. -# 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: @@ -53,8 +46,7 @@ def normalize_price(price: Decimal) -> Decimal: ``price`` quantised to :data:`PRICE_PRECISION` fractional digits, 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: @@ -71,11 +63,7 @@ def normalize_product_name(name: str) -> str: The result is an empty string when ``name`` holds nothing but whitespace. """ - # TODO: реализуйте функцию (используйте своё решение части 3) - return "" - - -# TODO: при необходимости добавьте свои вспомогательные функции + return "".join(name.split()).lower() def get_storage_str_representation(storage: dict[str, Product]) -> str: @@ -96,5 +84,30 @@ def get_storage_str_representation(storage: dict[str, Product]) -> str: ``storage`` is empty only the header and separator rows are returned, sized to the header labels. """ - # TODO: реализуйте функцию (используйте своё решение части 3) - return "" + rows: list[tuple[str, str, str, str]] = [] + for product_id, product in storage.items(): + rows.append( + ( + product_id, + product[NAME_KEY], + str(product[PRICE_KEY]), + str(product[QUANTITY_KEY]), + ) + ) + widths: list[int] = [len(header) for header in TABLE_HEADERS] + for row in rows: + for i, value in enumerate(row): + widths[i] = max(widths[i], len(value)) + + def format_row(cells: tuple[str, ...]) -> str: + parts = [" " + cell.ljust(widths[i]) + " " for i, cell in enumerate(cells)] + return "|" + "|".join(parts) + "|" + + header_line = format_row(TABLE_HEADERS) + separator_line = "|" + "|".join("-" * (width + 2) for width in widths) + "|" + + lines = [header_line, separator_line] + for row in rows: + lines.append(format_row(row)) + + return "\n".join(lines) From c7838b8036eca1bb8b9e9dabb1babc99dc0e08bc Mon Sep 17 00:00:00 2001 From: flex1ks Date: Sun, 1 Nov 2026 23:18:06 +0300 Subject: [PATCH 10/10] Finished task 4 --- src/part3/run_admin.py | 2 +- src/part3/storage.py | 2 +- src/part4/crud.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/part3/run_admin.py b/src/part3/run_admin.py index c4b04997..feed6698 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -174,4 +174,4 @@ def main() -> None: if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/src/part3/storage.py b/src/part3/storage.py index 8d733b3f..36e9af7f 100644 --- a/src/part3/storage.py +++ b/src/part3/storage.py @@ -32,4 +32,4 @@ QUANTITY_INDEX: Final = 3 # TODO: задайте идентификатор первого товара в пустом хранилище -PRODUCT_ID_MIN: Final[int] = 1 \ No newline at end of file +PRODUCT_ID_MIN: Final[int] = 1 diff --git a/src/part4/crud.py b/src/part4/crud.py index 6e6797c8..54db6330 100644 --- a/src/part4/crud.py +++ b/src/part4/crud.py @@ -41,7 +41,7 @@ def generate_product_id() -> str: Returns: A freshly generated UUID, stringified. """ - + return str(uuid.uuid4())