From 34a9ea197185adee1e62534dd9fdb9db4dbd763a Mon Sep 17 00:00:00 2001 From: Shmeles Date: Tue, 22 Sep 2026 20:21:14 +0300 Subject: [PATCH 01/10] kkrvtvketke --- 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..caa537fa 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**TIMESTAMP_BITS-1 +NODE_ID_MAX: Final[int] = 2**NODE_ID_BITS-1 +SEQUENCE_ID_MAX: Final[int] = 2**SEQUENCE_ID_BITS-1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). From 1601bfcc2fdfb714e02bfb3856291ce5cb79e792 Mon Sep 17 00:00:00 2001 From: Shmeles Date: Fri, 25 Sep 2026 14:40:05 +0300 Subject: [PATCH 02/10] Share task1 --- src/part1/snowflake.py | 94 +++++++++++------------------------------- 1 file changed, 24 insertions(+), 70 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index d3abf050..62a540fb 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -25,61 +25,24 @@ def read_current_millis(epoch_ms: int) -> int: - """Read the number of milliseconds elapsed since the custom epoch. - - Args: - epoch_ms: The custom epoch expressed as Unix milliseconds. - - Returns: - The count of whole milliseconds between ``epoch_ms`` and now. May be - negative if ``epoch_ms`` lies in the future. - """ - # TODO: реализуйте функцию - return 0 + a=time()*1000 + return (a-epoch_ms) def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: - """Read the timestamp field out of a Snowflake identifier. + a=snowflake_id//2**22 + return (a+epoch_ms) - Args: - snowflake_id: An identifier produced against the same epoch. - epoch_ms: The epoch the identifier was generated against. Defaults to - the original Twitter epoch (2010-11-04 01:42:54.657 UTC). - - Returns: - The absolute Unix time in milliseconds at which the identifier was - generated. - """ - # TODO: реализуйте функцию - return 0 def decode_node_id(snowflake_id: int) -> int: - """Read the node identifier field out of a Snowflake identifier. - - Args: - snowflake_id: An identifier produced by :func:`generate_snowflake_id`. - - Returns: - The node identifier packed into ``snowflake_id``, in the range - ``[0, NODE_ID_MAX]``. - """ - # TODO: реализуйте функцию - return 0 + a=(snowflake_id//2**12)*2**41 + return a def decode_sequence_id(snowflake_id: int) -> int: - """Read the sequence counter field out of a Snowflake identifier. - - Args: - snowflake_id: An identifier produced by :func:`generate_snowflake_id`. - - Returns: - The per-millisecond sequence counter packed into ``snowflake_id``, in - the range ``[0, SEQUENCE_ID_MAX]``. - """ - # TODO: реализуйте функцию - return 0 + a=snowflake_id*2**52 + return a def generate_snowflake_id( @@ -87,28 +50,19 @@ def generate_snowflake_id( node_id: int = NODE_ID_DEFAULT, epoch_ms: int = EPOCH_MS_DEFAULT, ) -> int | None: - """Build and return a Snowflake identifier for the current millisecond. - - The function is stateless: the caller passes the per-millisecond sequence - counter explicitly. It is the caller's responsibility to increment - ``sequence_id`` for identifiers minted within the same millisecond and to - reset it once the clock advances. - - Args: - sequence_id: The per-millisecond sequence counter, in the range - ``[0, SEQUENCE_ID_MAX]``. - node_id: The identifier of this node, in the range ``[0, NODE_ID_MAX]``. - Optional; defaults to ``NODE_ID_DEFAULT``. - epoch_ms: The start of the epoch as Unix milliseconds. Optional; - defaults to the original Twitter epoch (2010-11-04 01:42:54.657 - UTC). - - Returns: - The Snowflake identifier as a positive 63-bit integer, or ``None`` if - ``node_id`` is outside ``[0, NODE_ID_MAX]``, ``sequence_id`` is outside - ``[0, SEQUENCE_ID_MAX]``, or the elapsed time no longer fits in the - timestamp field (roughly 69 years after ``epoch_ms``). In each of those - cases an explanatory message is printed to stdout first. - """ - # TODO: реализуйте функцию - return 0 + a=sequence_id*2**52 + b=(node_id//2**12)*2**42 + c=epoch_ms//2**22 + if b>NODE_ID_MAX: + m=f'node_id must be in [0,{NODE_ID_MAX}]' + print(m) + return None + if a>SEQUENCE_ID_MAX: + m=f'sequence_id must be in [0,{SEQUENCE_ID_MAX}]' + print(m) + return None + if c>TIMESTAMP_MS_MAX: + m='overflows' + print(m) + return None + return sequence_id From 55868775f1e19acd654bb61e4f835f83cc774af6 Mon Sep 17 00:00:00 2001 From: Shmeles Date: Fri, 25 Sep 2026 14:46:52 +0300 Subject: [PATCH 03/10] Replace --- src/part1/constants.py | 6 +++--- src/part1/snowflake.py | 35 +++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/part1/constants.py b/src/part1/constants.py index caa537fa..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**TIMESTAMP_BITS-1 -NODE_ID_MAX: Final[int] = 2**NODE_ID_BITS-1 -SEQUENCE_ID_MAX: Final[int] = 2**SEQUENCE_ID_BITS-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 62a540fb..0d06bb9c 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -13,9 +13,9 @@ :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_DEFAULT, NODE_ID_MAX, @@ -25,23 +25,22 @@ def read_current_millis(epoch_ms: int) -> int: - a=time()*1000 - return (a-epoch_ms) + a = time() * 1000 + return a - epoch_ms def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: - a=snowflake_id//2**22 - return (a+epoch_ms) - + a = snowflake_id // 2**22 + return a + epoch_ms def decode_node_id(snowflake_id: int) -> int: - a=(snowflake_id//2**12)*2**41 + a = (snowflake_id // 2**12) * 2**41 return a def decode_sequence_id(snowflake_id: int) -> int: - a=snowflake_id*2**52 + a = snowflake_id * 2**52 return a @@ -50,19 +49,19 @@ def generate_snowflake_id( node_id: int = NODE_ID_DEFAULT, epoch_ms: int = EPOCH_MS_DEFAULT, ) -> int | None: - a=sequence_id*2**52 - b=(node_id//2**12)*2**42 - c=epoch_ms//2**22 - if b>NODE_ID_MAX: - m=f'node_id must be in [0,{NODE_ID_MAX}]' + a = sequence_id * 2**52 + b = (node_id // 2**12) * 2**42 + c = epoch_ms // 2**22 + if b > NODE_ID_MAX: + m = f"node_id must be in [0,{NODE_ID_MAX}]" print(m) return None - if a>SEQUENCE_ID_MAX: - m=f'sequence_id must be in [0,{SEQUENCE_ID_MAX}]' + if a > SEQUENCE_ID_MAX: + m = f"sequence_id must be in [0,{SEQUENCE_ID_MAX}]" print(m) return None - if c>TIMESTAMP_MS_MAX: - m='overflows' + if c > TIMESTAMP_MS_MAX: + m = "overflows" print(m) return None return sequence_id From 9362de23e6d4a1f0d03371ff501ba593455a27ee Mon Sep 17 00:00:00 2001 From: Shmeles Date: Fri, 25 Sep 2026 15:08:09 +0300 Subject: [PATCH 04/10] Fixed errors --- src/part1/snowflake.py | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 0d06bb9c..dd7e6126 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -1,21 +1,6 @@ -"""Twitter Snowflake identifier generator. +import time -Snowflake produces roughly time-ordered 64-bit integer identifiers without -coordination between nodes. Each identifier packs the milliseconds elapsed -since a custom epoch, a node identifier and a per-millisecond sequence counter -into a single 63-bit positive integer (see ``constants`` for the layout). - -The public entry point is :func:`generate_snowflake_id`. It is stateless: the -caller passes the sequence counter on every call and is responsible for -advancing it within a millisecond and resetting it when the clock ticks over. - -Each packed field can be read back on its own with :func:`decode_timestamp_ms`, -:func:`decode_node_id` and :func:`decode_sequence_id`. -""" - -import time - -from .constants import ( +from .constants import ( EPOCH_MS_DEFAULT, NODE_ID_DEFAULT, NODE_ID_MAX, @@ -25,22 +10,26 @@ def read_current_millis(epoch_ms: int) -> int: - a = time() * 1000 + a = int(time.time() * 1000) + return a - epoch_ms def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: - a = snowflake_id // 2**22 + a = snowflake_id >> 22 + return a + epoch_ms def decode_node_id(snowflake_id: int) -> int: - a = (snowflake_id // 2**12) * 2**41 + a = (snowflake_id >> 12) & 0b1111111111 + return a def decode_sequence_id(snowflake_id: int) -> int: - a = snowflake_id * 2**52 + a = snowflake_id & 0b111111111111 + return a @@ -49,19 +38,16 @@ def generate_snowflake_id( node_id: int = NODE_ID_DEFAULT, epoch_ms: int = EPOCH_MS_DEFAULT, ) -> int | None: - a = sequence_id * 2**52 - b = (node_id // 2**12) * 2**42 - c = epoch_ms // 2**22 - if b > NODE_ID_MAX: + if node_id > NODE_ID_MAX or node_id < 0: m = f"node_id must be in [0,{NODE_ID_MAX}]" print(m) return None - if a > SEQUENCE_ID_MAX: + if sequence_id > SEQUENCE_ID_MAX or sequence_id < 0: m = f"sequence_id must be in [0,{SEQUENCE_ID_MAX}]" print(m) return None - if c > TIMESTAMP_MS_MAX: + if epoch_ms > TIMESTAMP_MS_MAX and epoch_ms < 0: m = "overflows" print(m) return None - return sequence_id + return read_current_millis(epoch_ms) << 22 | node_id << 12 | sequence_id From cf64745917579f5b9ecbe88a4c35673b6b84662d Mon Sep 17 00:00:00 2001 From: Shmeles Date: Fri, 2 Oct 2026 18:15:43 +0300 Subject: [PATCH 05/10] That's all. All is complit --- src/part2/cart.py | 109 +++++++++++++++++-------------------- src/part2/crud.py | 125 +++++++++++++------------------------------ src/part2/storage.py | 29 ++-------- src/part2/utils.py | 26 ++------- 4 files changed, 95 insertions(+), 194 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 063f9aea..4920feb1 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -1,18 +1,9 @@ -"""Shopping-cart operations layered on top of the product store. -The cart is a plain list of tuples, one :data:`CartLine` -- -``(product_id, quantity)`` -- per distinct product. Moving units between the -store and the cart keeps the two sides in balance: :func:`add_to_cart` takes -units out of stock, :func:`remove_from_cart` puts them back. - -Like the CRUD layer, the failure path never raises -- the operation prints -an explanatory message to stdout and returns ``None``. -""" 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,10 +13,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 i in range(len(cart)): + if cart[i][0]==product_id: + return cart[i] + print(f'product {product_id} is not in the cart') + return None def add_to_cart( storage: list[Product], @@ -33,29 +29,24 @@ def add_to_cart( product_id: int, quantity: int, ) -> CartLine | None: - """Move ``quantity`` units of ``product_id`` from the store into ``cart``. - - The product is looked up in ``storage``. If it is missing, a message is - printed (by :func:`~src.part2.crud.read_product`) and nothing - changes. If the store holds fewer units than requested, an explanatory - message is printed and nothing changes. Otherwise the store record is - decremented by ``quantity`` and the cart line for ``product_id`` gains - ``quantity`` units -- a new line is created when the cart had none. - - Args: - storage: The product store to draw stock from; modified in place on - success. - cart: The cart to add the units to; modified in place on success. - product_id: The identifier of the product to add. - quantity: Number of units to move into the cart. - - Returns: - 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) + indp=storage.index(product) + if product is None: + return None + else: + if product[3] CartLine | None: - """Move ``quantity`` units of ``product_id`` from ``cart`` back to the store. - - The cart line for ``product_id`` is looked up. If there is none, a - message is printed and nothing changes. If the line holds fewer units - than requested, an explanatory message is printed and nothing changes. - Otherwise the cart line loses ``quantity`` units -- the line is dropped - when it reaches zero -- and the store record gains ``quantity`` units - back. - - Args: - storage: The product store to return stock to; modified in place on - success. - cart: The cart to take the units from; modified in place on - success. - product_id: The identifier of the product to remove. - quantity: Number of units to move back into the store. + cart1=find_cart_line(cart,product_id) + product=read_product(storage,product_id) + if cart1 is None: + return None + else: + if cart1[1] int: - """Choose the identifier for the next product added to ``storage``. - - Args: - storage: The product store to inspect. - - Returns: - One past the greatest identifier currently held in ``storage``, or - :data:`~src.part2.storage.PRODUCT_ID_MIN` when ``storage`` is - empty. - """ - # TODO: реализуйте функцию - return 0 + if len(storage)==0: + a=PRODUCT_ID_MIN + else: + a=max(storage)+1 + return a def create_product( storage: list[Product], fields: tuple[str, Decimal, int] ) -> int | None: - """Append a new product to ``storage`` and return its new identifier. - - Args: - storage: The product store to append to; modified in place on - success. - fields: A ``(name, price, quantity)`` tuple describing the product. - ``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 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 + if fields[0]==storage[1]: + print (f'product name {fields[0]} is already taken') + return None + else: + name,price,quantity=fields + id_f=generate_product_id(storage) + fields_1=(id_f,name,normalize_price(price),quantity) + storage.append(fields_1) + return id_f def read_product(storage: list[Product], product_id: int) -> Product | None: - """Return the product stored under ``product_id``. - - Args: - storage: The product store to search. - product_id: The identifier to look up. - - Returns: - The matching ``(product_id, name, price, quantity)`` record, or - ``None`` when no product carries that identifier (a message is - printed in that case). - """ - # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + for i in range(len(storage)): + if product_id==storage[i][0]: + return storage[i] + print(f'no product with id {product_id}') + return None + + def update_product( @@ -81,40 +48,20 @@ def update_product( product_id: int, fields: tuple[str, Decimal, int], ) -> Product | None: - """Overwrite the fields of the product stored under ``product_id``. - - The identifier itself is preserved; only ``name``, ``price`` and - ``quantity`` are replaced. - - Args: - storage: The product store to modify; the matching record is - replaced in place on success. - product_id: The identifier of the product to change. - fields: A ``(name, price, quantity)`` tuple with the new values. - ``price`` is a :class:`~decimal.Decimal` amount and is rounded - to the stored money precision before it is saved. - - Returns: - The updated ``(product_id, name, price, quantity)`` record, or - ``None`` when no product carries that identifier (``storage`` is - left unchanged and a message is printed). - """ - # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + for i in range(len(storage)): + if product_id==storage[i][0]: + storage[i]=(product_id,fields[0],normalize_price(fields[1]),fields[2]) + return storage[i] + print(f'no product with id {product_id}') + return None + def delete_product(storage: list[Product], product_id: int) -> int | None: - """Remove the product stored under ``product_id`` from ``storage``. - - Args: - storage: The product store to remove from; modified in place on - success. - product_id: The identifier of the product to remove. + for i in range(len(storage)): + if product_id==storage[i][0]: + del storage[i] + return product_id + print(f'no product with id {product_id}') + return None - Returns: - ``product_id`` when a product was removed, or ``None`` when no - product carried that identifier (``storage`` is left unchanged and - a message is printed). - """ - # TODO: реализуйте функцию - return 0 diff --git a/src/part2/storage.py b/src/part2/storage.py index b63d5fc7..6b569557 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -1,23 +1,3 @@ -"""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.part2.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.part2.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 Decimal from typing import Final @@ -26,9 +6,10 @@ # 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 + \ No newline at end of file diff --git a/src/part2/utils.py b/src/part2/utils.py index ec0348d3..ab208804 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -1,29 +1,11 @@ -"""Standalone helpers shared by the hw4 storage and CRUD modules. -For now this is limited to money handling: :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. -""" -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: - """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: реализуйте функцию - return Decimal(0) + return Decimal(price).quantize(RPICE_STEP, rounding=ROUND_HALF_UP) \ No newline at end of file From 895e45d25240c602ebd6763e810e50f8b97dd1fa Mon Sep 17 00:00:00 2001 From: Shmeles Date: Fri, 2 Oct 2026 19:33:13 +0300 Subject: [PATCH 06/10] ALL OKEY!!! --- src/part2/cart.py | 76 ++++++++++++++++++++++++-------------------- src/part2/crud.py | 55 +++++++++++++++----------------- src/part2/storage.py | 1 - src/part2/utils.py | 7 ++-- 4 files changed, 70 insertions(+), 69 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 4920feb1..d9ca7e98 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -1,14 +1,7 @@ - - from typing import Final -from .crud import read_product, update_product -from .storage import ( - NAME_INDEX, - PRICE_INDEX, - QUANTITY_INDEX, - Product, -) +from .crud import read_product +from .storage import Product type CartLine = tuple[int, int] @@ -16,65 +9,80 @@ LINE_PRODUCT_ID_INDEX: Final = 0 LINE_QUANTITY_INDEX: Final = 1 + def find_cart_line(cart: list[CartLine], product_id: int) -> CartLine | None: for i in range(len(cart)): - if cart[i][0]==product_id: + if cart[i][0] == product_id: return cart[i] - print(f'product {product_id} is not in the cart') + print(f"product {product_id} is not in the cart") return None + def add_to_cart( storage: list[Product], cart: list[CartLine], product_id: int, quantity: int, ) -> CartLine | None: - product=read_product(storage,product_id) - indp=storage.index(product) + product = read_product(storage, product_id) if product is None: return None else: - if product[3] CartLine | None: - cart1=find_cart_line(cart,product_id) - product=read_product(storage,product_id) + cart1 = find_cart_line(cart, product_id) + product = read_product(storage, product_id) if cart1 is None: return None else: - if cart1[1] int: - if len(storage)==0: - a=PRODUCT_ID_MIN + idmax = 0 + if len(storage) == 0: + idmax = PRODUCT_ID_MIN else: - a=max(storage)+1 - return a + for i in range(len(storage)): + idmax = max(storage[i][0], idmax) + return idmax + 1 def create_product( storage: list[Product], fields: tuple[str, Decimal, int] ) -> int | None: - if fields[0]==storage[1]: - print (f'product name {fields[0]} is already taken') - return None - else: - name,price,quantity=fields - id_f=generate_product_id(storage) - fields_1=(id_f,name,normalize_price(price),quantity) - storage.append(fields_1) - return id_f + for i in range(len(storage)): + if fields[0] == storage[i][1]: + print(f"product name {fields[0]} is already taken") + return None + + name, price, quantity = fields + id_f = generate_product_id(storage) + fields_1 = (id_f, name, normalize_price(price), quantity) + storage.append(fields_1) + return id_f def read_product(storage: list[Product], product_id: int) -> Product | None: for i in range(len(storage)): - if product_id==storage[i][0]: + if product_id == storage[i][0]: return storage[i] - print(f'no product with id {product_id}') + print(f"no product with id {product_id}") return None - - def update_product( @@ -49,19 +46,17 @@ def update_product( fields: tuple[str, Decimal, int], ) -> Product | None: for i in range(len(storage)): - if product_id==storage[i][0]: - storage[i]=(product_id,fields[0],normalize_price(fields[1]),fields[2]) + if product_id == storage[i][0]: + storage[i] = (product_id, fields[0], normalize_price(fields[1]), fields[2]) return storage[i] - print(f'no product with id {product_id}') + print(f"no product with id {product_id}") return None - def delete_product(storage: list[Product], product_id: int) -> int | None: for i in range(len(storage)): - if product_id==storage[i][0]: + if product_id == storage[i][0]: del storage[i] return product_id - print(f'no product with id {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 6b569557..9cbec756 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -12,4 +12,3 @@ # TODO: задайте идентификатор первого товара в пустом хранилище PRODUCT_ID_MIN: Final[int] = 1 - \ No newline at end of file diff --git a/src/part2/utils.py b/src/part2/utils.py index ab208804..a84831dc 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -1,11 +1,10 @@ - - from decimal import ROUND_HALF_UP, Decimal from typing import Final + PRICE_PRECISION: Final[int] = 2 -PRICE_STEP: Final = (Decimal(1).scaleb(-PRICE_PRECISION)) +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) def normalize_price(price: Decimal) -> Decimal: - return Decimal(price).quantize(RPICE_STEP, rounding=ROUND_HALF_UP) \ No newline at end of file + return Decimal(price).quantize(PRICE_STEP, rounding=ROUND_HALF_UP) From 79b2121cc86c5ac3320801acfe944917a7fd9790 Mon Sep 17 00:00:00 2001 From: Shmeles Date: Sun, 11 Oct 2026 19:21:52 +0300 Subject: [PATCH 07/10] All okey #3 --- src/part2/utils.py | 13 +--- src/part3/crud.py | 156 ++++++++++++++--------------------------- src/part3/run_admin.py | 133 +++++++++++++++-------------------- src/part3/utils.py | 111 +++++++++-------------------- 4 files changed, 144 insertions(+), 269 deletions(-) diff --git a/src/part2/utils.py b/src/part2/utils.py index 88f68b7c..a758d9a1 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -1,16 +1,5 @@ -<<<<<<< HEAD -from decimal import ROUND_HALF_UP, Decimal -======= -"""Standalone helpers shared by the part2 storage and CRUD modules. - -For now this is limited to money handling: :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. -""" -from decimal import ROUND_HALF_UP, Decimal # noqa: F401 ->>>>>>> upstream/main +from decimal import ROUND_HALF_UP, Decimal from typing import Final diff --git a/src/part3/crud.py b/src/part3/crud.py index 68811d7e..5e165757 100644 --- a/src/part3/crud.py +++ b/src/part3/crud.py @@ -1,87 +1,49 @@ -"""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 -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. -""" 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: - """Choose the identifier for the next product added to ``storage``. - - Args: - storage: The product store to inspect. - - Returns: - One past the greatest identifier currently held in ``storage``, or - :data:`~src.part3.storage.PRODUCT_ID_MIN` when ``storage`` is - empty. - """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return 0 + idmax = 0 + if len(storage) == 0: + idmax = PRODUCT_ID_MIN + else: + for i in range(len(storage)): + idmax = max(storage[i][0], idmax) + return idmax + 1 def create_product( storage: list[Product], fields: tuple[str, Decimal, int] ) -> int | None: - """Append a new product to ``storage`` and return its new identifier. - - Args: - 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. - - 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. - """ - # TODO: реализуйте функцию - return 0 - + name, price, shtyk = fields + norm_name=normalize_product_name(name) + if not norm_name: + print("product name must not be blank") + return None + for product in storage: + if normalize_product_name(product[1]) == norm_name: + print(f"product name '{norm_name}' is already taken") + return None + norm_price = normalize_price(price) + id_f = generate_product_id(storage) + storage.append((id_f, norm_name, norm_price, shtyk)) + return id_f def read_product(storage: list[Product], product_id: int) -> Product | None: - """Return the product stored under ``product_id``. - - Args: - storage: The product store to search. - product_id: The identifier to look up. - - Returns: - The matching ``(product_id, name, price, quantity)`` record, or - ``None`` when no product carries that identifier (a message is - printed in that case). - """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return (0, "", Decimal(0), 0) + for i in range(len(storage)): + if product_id == storage[i][0]: + return storage[i] + print(f"no product with id {product_id}") + return None def update_product( @@ -89,43 +51,33 @@ def update_product( product_id: int, fields: tuple[str, Decimal, int], ) -> Product | None: - """Overwrite the fields of the product stored under ``product_id``. - - The identifier itself is preserved; only ``name``, ``price`` and - ``quantity`` are replaced. - - Args: - storage: The product store to modify; the matching record is - replaced in place on success. - product_id: The identifier of the product to change. - fields: A ``(name, price, quantity)`` tuple with the new values. - ``price`` is a :class:`~decimal.Decimal` amount and is rounded - to the stored money precision before it is saved. - - 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. - """ - # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + name, price, shtyk = fields + norm_name = normalize_product_name(name) + if not norm_name: + print("product name must not be blank") + return None + found_index = None + for i in range (len(storage)): + if storage[i][0] == product_id: + found_index = i + break + if found_index is None: + print(f"no product with id {product_id}") + return None + for product in storage: + if product[0] != product_id and normalize_product_name(product[1]) == norm_name: + print(f"product name '{norm_name}' is already taken") + return None + update = (product_id, norm_name, normalize_price(price), shtyk) + storage[found_index] = updated + return updated + def delete_product(storage: list[Product], product_id: int) -> int | None: - """Remove the product stored under ``product_id`` from ``storage``. - - Args: - storage: The product store to remove from; modified in place on - success. - product_id: The identifier of the product to remove. - - Returns: - ``product_id`` when a product was removed, or ``None`` when no - product carried that identifier (``storage`` is left unchanged and - a message is printed). - """ - # TODO: реализуйте функцию (используйте своё решение части 2) - return 0 + for i in range(len(storage)): + if product_id == storage[i][0]: + 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..c65e5cca 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -1,96 +1,77 @@ -"""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 -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; -* ``show`` -- print the whole store as a text table; -* ``create `` -- add a product; -* ``read `` -- print one product; -* ``update `` -- overwrite a product; -* ``delete `` -- remove a product. - -For ``create`` and ``update`` the price and quantity are always the last -two words of the line; everything between the verb (and, for ``update``, -the id) and those two words is joined with single spaces into the -product name, so a multi-word name such as ``Gibson SG Junior`` needs no -quoting. - -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 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 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: - """Print the command reference to stdout. - The text is the module-level :data:`HELP_TEXT` constant, printed as - is: a heading, one line per command with a short description, and a - note on how multi-word names are parsed. - """ - # TODO: реализуйте функцию +def show_help() -> None: + print(HELP_TEXT) + def print_result(result: object) -> None: - """Print a CRUD result to stdout unless it is ``None``. - - Args: - result: The value returned by a CRUD operation. ``None`` means the - operation already reported its own failure, so nothing is - printed in that case. - """ - # TODO: реализуйте функцию - - -def run_command(storage: list[Product], line: str) -> bool: - """Parse one console line and carry out the command it names. - - Args: - storage: The product store shared across the session; mutated in - place by the ``create``, ``update`` and ``delete`` commands. - line: One line of console input, already stripped of surrounding - whitespace. - - Returns: - ``True`` to keep the read-eval-print loop running, or ``False`` - once the ``exit`` command has been seen. A line that is not a - known command prints a notice and still returns ``True``. - - Raises: - 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 result is not None: + print(result) + +def run_command(storage, line): + parts = line.split() + if not parts: + print(f"'{line}' is not a command") + return True + + cmd = parts[0] + n = len(parts) + + if cmd == "help" and n == 1: + show_help() + return True + if cmd == "exit" and n == 1: + return False + if cmd == "show" and n == 1: + print(get_storage_str_representation(storage)) + return True + if cmd == "read" and n == 2: + print_result(read_product(storage, int(parts[1]))) + return True + if cmd == "delete" and n == 2: + print_result(delete_product(storage, int(parts[1]))) + return True + if cmd == "create" and n >= 4: + fields = (" ".join(parts[1:-2]), Decimal(parts[-2]), int(parts[-1])) + print_result(create_product(storage, fields)) + return True + if cmd == "update" and n >= 5: + fields = (" ".join(parts[2:-2]), Decimal(parts[-2]), int(parts[-1])) + print_result(update_product(storage, int(parts[1]), fields)) + return True + + print(f"'{line}' is not a command") + return True def main() -> None: """Run the admin console until the ``exit`` command is entered. diff --git a/src/part3/utils.py b/src/part3/utils.py index 318ded0b..c1f33ae0 100644 --- a/src/part3/utils.py +++ b/src/part3/utils.py @@ -1,95 +1,48 @@ -"""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 ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final from .storage import Product +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) -# 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] = 0 -PRICE_STEP: Final = Decimal(0) - -# 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: - """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 Decimal(0) + return Decimal(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 "" - - -# TODO: при необходимости добавьте свои вспомогательные функции + rename=((" ".join(name.split())).lower()) + return rename 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. - """ - # TODO: реализуйте функцию - return "" + storage_str=[] + for item in storage: + ids, name, price, quantity = item + item_str = [str(ids), name, str(price), str(quantity)] + storage_str.append(item_str) + + namemaxlen = max([len(item_str[1]) for item_str in storage_str]+[len(TABLE_HEADERS[1])]) + idsmaxlen = max([len(item_str[0]) for item_str in storage_str]+[len(TABLE_HEADERS[0])]) + pricemaxlen = max([len(item_str[2]) for item_str in storage_str]+[len(TABLE_HEADERS[2])]) + quantitymaxlen = max([len(item_str[3]) for item_str in storage_str]+[len(TABLE_HEADERS[3])]) + + s="|"+" "+"ID"+(" "*(idsmaxlen-len("ID")+1))+"|"+" "+"name"\ + +(" "*(namemaxlen-len("name")+1))+"|"+" "+"price"+(" "*(pricemaxlen-len("price")+1))\ + +"|"+" "+"quantity"+(" "*(quantitymaxlen-len("quantity")+1))+"|" + + s_="|"+("-"*(idsmaxlen+2))+"|"+("-"*(namemaxlen+2))+"|"+\ + ("-"*(pricemaxlen+2))+"|"+("-"*(quantitymaxlen+2))+"|" + storage_ans=[] + for item_str in storage_str: + item_ans="|"+" "+item_str[0]+(" "*(idsmaxlen-len(item_str[0])+1))+"|"+" "+item_str[1]\ + +(" "*(namemaxlen-len(item_str[1])+1))+"|"+" "+item_str[2]+(" "*(pricemaxlen-len(item_str[2])+1))\ + +"|"+" "+item_str[3]+(" "*(quantitymaxlen-len(item_str[3])+1))+"|" + storage_ans.append(item_ans) + result ="\n".join([s,s_]+storage_ans) + return result \ No newline at end of file From ae6caed576aecb42164c209197aaab04ba0e423a Mon Sep 17 00:00:00 2001 From: Shmeles Date: Sun, 11 Oct 2026 19:41:52 +0300 Subject: [PATCH 08/10] That's All okey try #3 --- src/part2/storage.py | 2 +- src/part2/utils.py | 1 - src/part3/crud.py | 26 +++++------ src/part3/run_admin.py | 12 +---- src/part3/utils.py | 100 ++++++++++++++++++++++++++++++----------- 5 files changed, 88 insertions(+), 53 deletions(-) diff --git a/src/part2/storage.py b/src/part2/storage.py index d5e1657f..acaa3229 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -1,6 +1,7 @@ from decimal import Decimal from typing import Final + type Product = tuple[int, str, Decimal, int] PRODUCT_ID_INDEX: Final = 0 @@ -8,4 +9,3 @@ PRICE_INDEX: Final = 2 QUANTITY_INDEX: Final = 3 PRODUCT_ID_MIN: Final[int] = 1 - \ No newline at end of file diff --git a/src/part2/utils.py b/src/part2/utils.py index a758d9a1..a84831dc 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -1,4 +1,3 @@ - from decimal import ROUND_HALF_UP, Decimal from typing import Final diff --git a/src/part3/crud.py b/src/part3/crud.py index 5e165757..7111ef6f 100644 --- a/src/part3/crud.py +++ b/src/part3/crud.py @@ -1,14 +1,10 @@ - - from decimal import Decimal -from .storage import ( - NAME_INDEX, - PRODUCT_ID_INDEX, +from .storage import ( PRODUCT_ID_MIN, Product, ) -from .utils import normalize_price, normalize_product_name +from .utils import normalize_price, normalize_product_name def generate_product_id(storage: list[Product]) -> int: @@ -25,8 +21,8 @@ def create_product( storage: list[Product], fields: tuple[str, Decimal, int] ) -> int | None: name, price, shtyk = fields - norm_name=normalize_product_name(name) - if not norm_name: + norm_name = normalize_product_name(name) + if not norm_name: print("product name must not be blank") return None for product in storage: @@ -38,10 +34,11 @@ def create_product( storage.append((id_f, norm_name, norm_price, shtyk)) return id_f + def read_product(storage: list[Product], product_id: int) -> Product | None: for i in range(len(storage)): - if product_id == storage[i][0]: - return storage[i] + if product_id == storage[i][0]: + return storage[i] print(f"no product with id {product_id}") return None @@ -57,7 +54,7 @@ def update_product( print("product name must not be blank") return None found_index = None - for i in range (len(storage)): + for i in range(len(storage)): if storage[i][0] == product_id: found_index = i break @@ -68,16 +65,15 @@ def update_product( if product[0] != product_id and normalize_product_name(product[1]) == norm_name: print(f"product name '{norm_name}' is already taken") return None - update = (product_id, norm_name, normalize_price(price), shtyk) + updated = (product_id, norm_name, normalize_price(price), shtyk) storage[found_index] = updated return updated - def delete_product(storage: list[Product], product_id: int) -> int | None: for i in range(len(storage)): - if product_id == storage[i][0]: + if product_id == storage[i][0]: del storage[i] 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/part3/run_admin.py b/src/part3/run_admin.py index c65e5cca..0f3b0ffc 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -38,7 +38,7 @@ def print_result(result: object) -> None: if result is not None: print(result) -def run_command(storage, line): +def run_command(storage: list[Product], line: str) -> bool: parts = line.split() if not parts: print(f"'{line}' is not a command") @@ -74,15 +74,7 @@ def run_command(storage, line): return True def main() -> None: - """Run the admin console until the ``exit`` command is entered. - - 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: list[Product] = [] running = True diff --git a/src/part3/utils.py b/src/part3/utils.py index c1f33ae0..1fd925dc 100644 --- a/src/part3/utils.py +++ b/src/part3/utils.py @@ -1,12 +1,11 @@ - - -from decimal import ROUND_HALF_UP, Decimal +from decimal import ROUND_HALF_UP, Decimal from typing import Final from .storage import Product + PRICE_PRECISION: Final[int] = 2 -PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") @@ -16,33 +15,82 @@ def normalize_price(price: Decimal) -> Decimal: def normalize_product_name(name: str) -> str: - rename=((" ".join(name.split())).lower()) - return rename + rename = (" ".join(name.split())).lower() + return rename def get_storage_str_representation(storage: list[Product]) -> str: - storage_str=[] - for item in storage: + storage_str = [] + for item in storage: ids, name, price, quantity = item item_str = [str(ids), name, str(price), str(quantity)] storage_str.append(item_str) - - namemaxlen = max([len(item_str[1]) for item_str in storage_str]+[len(TABLE_HEADERS[1])]) - idsmaxlen = max([len(item_str[0]) for item_str in storage_str]+[len(TABLE_HEADERS[0])]) - pricemaxlen = max([len(item_str[2]) for item_str in storage_str]+[len(TABLE_HEADERS[2])]) - quantitymaxlen = max([len(item_str[3]) for item_str in storage_str]+[len(TABLE_HEADERS[3])]) - - s="|"+" "+"ID"+(" "*(idsmaxlen-len("ID")+1))+"|"+" "+"name"\ - +(" "*(namemaxlen-len("name")+1))+"|"+" "+"price"+(" "*(pricemaxlen-len("price")+1))\ - +"|"+" "+"quantity"+(" "*(quantitymaxlen-len("quantity")+1))+"|" - - s_="|"+("-"*(idsmaxlen+2))+"|"+("-"*(namemaxlen+2))+"|"+\ - ("-"*(pricemaxlen+2))+"|"+("-"*(quantitymaxlen+2))+"|" - storage_ans=[] + + namemaxlen = max( + [len(item_str[1]) for item_str in storage_str] + [len(TABLE_HEADERS[1])] + ) + idsmaxlen = max( + [len(item_str[0]) for item_str in storage_str] + [len(TABLE_HEADERS[0])] + ) + pricemaxlen = max( + [len(item_str[2]) for item_str in storage_str] + [len(TABLE_HEADERS[2])] + ) + quantitymaxlen = max( + [len(item_str[3]) for item_str in storage_str] + [len(TABLE_HEADERS[3])] + ) + + s = ( + "|" + + " " + + "ID" + + (" " * (idsmaxlen - len("ID") + 1)) + + "|" + + " " + + "name" + + (" " * (namemaxlen - len("name") + 1)) + + "|" + + " " + + "price" + + (" " * (pricemaxlen - len("price") + 1)) + + "|" + + " " + + "quantity" + + (" " * (quantitymaxlen - len("quantity") + 1)) + + "|" + ) + + s_ = ( + "|" + + ("-" * (idsmaxlen + 2)) + + "|" + + ("-" * (namemaxlen + 2)) + + "|" + + ("-" * (pricemaxlen + 2)) + + "|" + + ("-" * (quantitymaxlen + 2)) + + "|" + ) + storage_ans = [] for item_str in storage_str: - item_ans="|"+" "+item_str[0]+(" "*(idsmaxlen-len(item_str[0])+1))+"|"+" "+item_str[1]\ - +(" "*(namemaxlen-len(item_str[1])+1))+"|"+" "+item_str[2]+(" "*(pricemaxlen-len(item_str[2])+1))\ - +"|"+" "+item_str[3]+(" "*(quantitymaxlen-len(item_str[3])+1))+"|" + item_ans = ( + "|" + + " " + + item_str[0] + + (" " * (idsmaxlen - len(item_str[0]) + 1)) + + "|" + + " " + + item_str[1] + + (" " * (namemaxlen - len(item_str[1]) + 1)) + + "|" + + " " + + item_str[2] + + (" " * (pricemaxlen - len(item_str[2]) + 1)) + + "|" + + " " + + item_str[3] + + (" " * (quantitymaxlen - len(item_str[3]) + 1)) + + "|" + ) storage_ans.append(item_ans) - result ="\n".join([s,s_]+storage_ans) - return result \ No newline at end of file + result = "\n".join([s, s_] + storage_ans) + return result From 9dc0814b78b621c232a83da552aa09dea60102ec Mon Sep 17 00:00:00 2001 From: Shmeles Date: Mon, 12 Oct 2026 19:44:33 +0300 Subject: [PATCH 09/10] All okey now --- src/part3/run_admin.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/part3/run_admin.py b/src/part3/run_admin.py index 0f3b0ffc..dc92281a 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -1,16 +1,14 @@ - - -from decimal import Decimal, InvalidOperation +from decimal import Decimal, InvalidOperation from typing import Final -from .crud import ( +from .crud import ( create_product, delete_product, read_product, update_product, ) from .storage import Product -from .utils import get_storage_str_representation +from .utils import get_storage_str_representation # TODO: задайте приглашение и текст справки @@ -31,13 +29,13 @@ def show_help() -> None: print(HELP_TEXT) - def print_result(result: object) -> None: if result is not None: print(result) + def run_command(storage: list[Product], line: str) -> bool: parts = line.split() if not parts: @@ -73,8 +71,9 @@ def run_command(storage: list[Product], line: str) -> bool: print(f"'{line}' is not a command") return True + def main() -> None: - + storage: list[Product] = [] running = True From 3d5a3447aba177cae5767558866f0ede18a28d12 Mon Sep 17 00:00:00 2001 From: Shmeles Date: Sun, 1 Nov 2026 19:51:45 +0300 Subject: [PATCH 10/10] Task done --- src/part3/run_admin.py | 1 - src/part4/cart.py | 107 +++++++++-------------- src/part4/crud.py | 194 ++++++++++++++++------------------------- src/part4/run_admin.py | 153 +++++++++++++++----------------- src/part4/storage.py | 44 +--------- src/part4/utils.py | 173 ++++++++++++++++++------------------ 6 files changed, 274 insertions(+), 398 deletions(-) diff --git a/src/part3/run_admin.py b/src/part3/run_admin.py index dc92281a..b85b43f6 100644 --- a/src/part3/run_admin.py +++ b/src/part3/run_admin.py @@ -11,7 +11,6 @@ from .utils import get_storage_str_representation -# TODO: задайте приглашение и текст справки PROMPT: Final[str] = "admin> " HELP_TEXT: Final[str] = """Available commands: help show this message diff --git a/src/part4/cart.py b/src/part4/cart.py index aed9bb72..1c9c7cd3 100644 --- a/src/part4/cart.py +++ b/src/part4/cart.py @@ -1,18 +1,4 @@ -"""Shopping-cart operations layered on top of the product store. - -The cart is a plain dictionary mapping each product identifier to the -number of units of that product in the cart. Moving units between the -store and the cart keeps the two sides in balance: :func:`add_to_cart` takes -units out of stock, :func:`remove_from_cart` puts them back. - -Like the CRUD layer, the failure path never raises -- the operation prints -an explanatory message to stdout and returns ``None``. -""" - -from .storage import Product - - -# TODO: при необходимости добавьте свои вспомогательные функции +from .storage import QUANTITY_KEY, Product def add_to_cart( @@ -22,32 +8,25 @@ def add_to_cart( product_id: str, quantity: int, ) -> int | None: - """Move ``quantity`` units of ``product_id`` from the store into ``cart``. - The product is looked up in ``storage``. If it is missing, a message is - printed and nothing changes. If the store holds fewer units than - requested, an explanatory message is printed and nothing changes. - Otherwise the store record is decremented by ``quantity`` and the cart - gains ``quantity`` units of ``product_id`` -- the product is added when - the cart had none of it. + if product_id not in storage: + print(f"no product with id {product_id}") + return None - Args: - storage: The product store to draw stock from; modified in place on - success. - product_names: The normalised names in ``storage``; a - quantity-only change never renames a product, so it is left - unchanged here. - cart: The cart to add the units to; modified in place on success. - product_id: The identifier of the product to add. - quantity: Number of units to move into the cart. + product = storage[product_id] + quantity_in_shop = product[QUANTITY_KEY] - Returns: - The quantity of ``product_id`` in the cart after the addition, or - ``None`` when the product is unknown or the store cannot cover the - request. - """ - # TODO: реализуйте функцию - return 0 + if quantity > quantity_in_shop: + print( + f"not enough stock for product {product_id}: {quantity_in_shop} available, {quantity} requested" + ) + return None + + product[QUANTITY_KEY] = quantity_in_shop - quantity + + product_in_cart = cart.get(product_id, 0) + cart[product_id] = product_in_cart + quantity + return cart[product_id] def remove_from_cart( @@ -57,31 +36,27 @@ def remove_from_cart( product_id: str, quantity: int, ) -> int | None: - """Move ``quantity`` units of ``product_id`` from ``cart`` back to the store. - - If the cart holds no units of ``product_id``, a message is printed and - nothing changes. If it holds fewer units than requested, an explanatory - message is printed and nothing changes. If the product is missing from - ``storage``, a message is printed and nothing changes. Otherwise the cart loses - ``quantity`` units of the product -- the product is dropped from the - cart when its quantity reaches zero -- and the store record gains - ``quantity`` units back. - - Args: - storage: The product store to return stock to; modified in place on - success. - product_names: The normalised names in ``storage``; a - quantity-only change never renames a product, so it is left - unchanged here. - cart: The cart to take the units from; modified in place on - success. - product_id: The identifier of the product to remove. - quantity: Number of units to move back into the store. - - Returns: - The quantity of ``product_id`` left in the cart after the removal - (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 + if product_id not in cart: + print(f"product {product_id} is not in the cart") + return None + + if cart[product_id] < quantity: + print( + f"cart holds only {cart[product_id]} 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 + + product = storage[product_id] + product_in_shop = product[QUANTITY_KEY] + product[QUANTITY_KEY] = product_in_shop + quantity + + if cart[product_id] == quantity: + del cart[product_id] + return 0 + + cart[product_id] -= quantity + return cart[product_id] - quantity diff --git a/src/part4/crud.py b/src/part4/crud.py index 471eff00..b37a5fe0 100644 --- a/src/part4/crud.py +++ b/src/part4/crud.py @@ -1,48 +1,17 @@ -"""Create/read/update/delete operations over the in-memory product store. - -Every operation takes the store -- a dictionary mapping product id to its -:data:`~src.part4.storage.Product` record -- as its first argument and -works on it in place. ``create_product``, ``update_product`` and -``delete_product`` additionally take ``product_names``, the ``set[str]`` -of normalised names currently in ``storage`` (see -:mod:`src.part4.storage`), and keep it in sync with ``storage`` on -every successful call. The failure path never raises: the operation -prints an explanatory message to stdout and returns ``None``. - -The identifier of a new product is a freshly generated UUID string -(:func:`generate_product_id`), independent of insertion order or of any -identifier already in ``storage``. - -Every product name that reaches the store is passed through -:func:`~src.part4.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 -- via an O(1) membership test against ``product_names`` rather -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: - """Generate an identifier for a new product. - - Returns: - A freshly generated UUID, stringified. - """ - # TODO: реализуйте функцию - return "" + return str(uuid.uuid4()) def create_product( @@ -50,46 +19,35 @@ def create_product( product_names: set[str], fields: dict[str, Any], ) -> str | None: - """Add a new product to ``storage`` and return its new identifier. - - Args: - storage: The product store to add to; modified in place on - success. - product_names: The normalised names already in ``storage``; the - new name is added to it in place on success. - fields: A dictionary with the ``name``, ``price`` and ``quantity`` - keys (see :data:`~src.part4.storage.NAME_KEY`, - :data:`~src.part4.storage.PRICE_KEY` and - :data:`~src.part4.storage.QUANTITY_KEY`) 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. - - 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`` - and ``product_names`` are left unchanged and an explanatory - message is printed. - """ - # TODO: реализуйте функцию - return "" + normalized_name = normalize_product_name(fields[NAME_KEY]) + if not normalized_name: + print("product name must not be blank") + return None -def read_product(storage: dict[str, Product], product_id: str) -> Product | None: - """Return the product stored under ``product_id``. + if normalized_name in product_names: + print(f"product name '{normalized_name}' is already taken") + return None + + product_id = generate_product_id() + + storage[product_id] = { + NAME_KEY: normalized_name, + PRICE_KEY: normalize_price(fields[PRICE_KEY]), + QUANTITY_KEY: fields[QUANTITY_KEY], + } + + product_names.add(normalized_name) - Args: - storage: The product store to search. - product_id: The identifier to look up. + return product_id - Returns: - The matching product record, or ``None`` when no product carries - that identifier (a message is printed in that case). - """ - # TODO: реализуйте функцию - return {} + +def read_product(storage: dict[str, Product], product_id: str) -> Product | None: + if product_id not in storage: + print(f"no product with id {product_id}") + return None + else: + return storage[product_id] def update_product( @@ -98,39 +56,39 @@ def update_product( product_id: str, fields: dict[str, Any], ) -> Product | None: - """Overwrite the fields of the product stored under ``product_id``. - - The identifier itself is preserved. ``fields`` may carry any subset of - ``name``, ``price`` and ``quantity``; a key that is missing keeps the - value the product already has, so a caller can update a single field - without repeating the other two. - - Args: - storage: The product store to modify; the matching record is - updated in place on success. - product_names: The normalised names already in ``storage``; on a - successful rename the old name is removed from it and the new - one added. - product_id: The identifier of the product to change. - fields: A dictionary with any of the ``name``, ``price`` and - ``quantity`` keys (see :data:`~src.part4.storage.NAME_KEY`, - :data:`~src.part4.storage.PRICE_KEY` and - :data:`~src.part4.storage.QUANTITY_KEY`) holding the new - values. ``price`` is a :class:`~decimal.Decimal` amount and is - rounded to the stored money precision before it is saved. - Mutated in place: a ``name`` or ``price`` value present in - ``fields`` is overwritten with its normalised form. - - Returns: - The updated product record, or ``None`` when ``name`` is present - and blank once normalised, no product carries that identifier, or - the normalised name is already taken by another product. In every - ``None`` case ``storage`` and ``product_names`` are left unchanged - and an explanatory message is printed. Renaming a product to its - 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] + old_name = product[NAME_KEY] + + if NAME_KEY in fields: + normalized_name = normalize_product_name(fields[NAME_KEY]) + + if not normalized_name: + print("product name must not be blank") + return None + + if normalized_name != old_name and normalized_name in product_names: + print(f"product name '{normalized_name}' is already taken") + return None + + fields[NAME_KEY] = normalized_name + + if PRICE_KEY in fields: + fields[PRICE_KEY] = normalize_price(fields[PRICE_KEY]) + + product.update(fields) + + if NAME_KEY in fields: + new_name = fields[NAME_KEY] + if new_name != old_name: + product_names.remove(old_name) + product_names.add(new_name) + + return product def delete_product( @@ -138,20 +96,14 @@ def delete_product( product_names: set[str], product_id: str, ) -> str | None: - """Remove the product stored under ``product_id`` from ``storage``. - - Args: - storage: The product store to remove from; modified in place on - success. - product_names: The normalised names already in ``storage``; the - departing product's name is removed from it in place on - success. - product_id: The identifier of the product to remove. - - Returns: - ``product_id`` when a product was removed, or ``None`` when no - product carried that identifier (``storage`` and ``product_names`` - are left unchanged and a message is printed). - """ - # TODO: реализуйте функцию - return "" + + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + product = storage[product_id] + name = product[NAME_KEY] + + product_names.remove(name) + del storage[product_id] + return product_id diff --git a/src/part4/run_admin.py b/src/part4/run_admin.py index 2247b29b..5a6aca29 100644 --- a/src/part4/run_admin.py +++ b/src/part4/run_admin.py @@ -1,110 +1,95 @@ -"""Interactive admin console for the part4 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: - -* ``help`` -- print the list of commands and what each one does; -* ``exit`` -- leave the loop and end the program; -* ``show`` -- print the whole store as a text table; -* ``create `` -- add a product; -* ``read `` -- print one product; -* ``update `` -- overwrite a product; -* ``delete `` -- remove a product. - -For ``create`` and ``update`` the price and quantity are always the last -two words of the line; everything between the verb (and, for ``update``, -the id) and those two words is joined with single spaces into the -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 -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. -""" - -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: задайте приглашение и текст справки (используйте своё решение части 3) -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: - """Print the command reference to stdout. - The text is the module-level :data:`HELP_TEXT` constant, printed as - is: a heading, one line per command with a short description, and a - note on how multi-word names are parsed. - """ - # TODO: реализуйте функцию (используйте своё решение части 3) +def show_help() -> None: + print(HELP_TEXT) def print_result(result: object) -> None: - """Print a CRUD result to stdout unless it is ``None``. - - Args: - result: The value returned by a CRUD operation. ``None`` means the - 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( storage: dict[str, Product], product_names: set[str], line: str ) -> bool: - """Parse one console line and carry out the command it names. - - 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. - - Returns: - ``True`` to keep the read-eval-print loop running, or ``False`` - once the ``exit`` command has been seen. A line that is not a - 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. - decimal.InvalidOperation: If the price argument of ``create`` or - ``update`` does not parse as a decimal number. - """ - # TODO: реализуйте функцию - return False + parts = line.split() + if not parts: + print(f"'{line}' is not a command") + return True + + cmd = parts[0] + n = len(parts) + + if cmd == "help" and n == 1: + show_help() + return True + + if cmd == "exit" and n == 1: + return False + + if cmd == "show" and n == 1: + print(get_storage_str_representation(storage)) + return True + + if cmd == "read" and n == 2: + print_result(read_product(storage, parts[1])) + return True + + if cmd == "delete" and n == 2: + print_result(delete_product(storage, product_names, parts[1])) + return True + + if cmd == "create" and n >= 4: + fields = { + NAME_KEY: " ".join(parts[1:-2]), + PRICE_KEY: Decimal(parts[-2]), + QUANTITY_KEY: int(parts[-1]), + } + print_result(create_product(storage, product_names, fields)) + return True + + if cmd == "update" and n >= 5: + fields = { + NAME_KEY: " ".join(parts[2:-2]), + PRICE_KEY: Decimal(parts[-2]), + QUANTITY_KEY: int(parts[-1]), + } + + print_result(update_product(storage, product_names, parts[1], fields)) + + return True + print(f"'{line}' 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. - """ + storage: dict[str, Product] = {} product_names: set[str] = set() running = True diff --git a/src/part4/storage.py b/src/part4/storage.py index 9acedf07..f3a0b79a 100644 --- a/src/part4/storage.py +++ b/src/part4/storage.py @@ -1,45 +1,9 @@ -"""In-memory product store for the shop CRUD exercise. - -The store is deliberately primitive: a plain dictionary, with no -persistence and no schema enforcement. It maps a product's ``id`` -- a -UUID string assigned by the create operation in :mod:`src.part4.crud` --- to its :data:`Product` record -- a dictionary with the keys ``name``, -``price`` and ``quantity`` -- where: - -* the ``storage`` key itself -- unique string identifier, assigned by the - create operation in :mod:`src.part4.crud`; it is not duplicated - inside the record; -* ``name`` -- human-readable product name, unique across the store, held - in normalised form (see - :func:`src.part4.utils.normalize_product_name`); -* ``price`` -- price of a single unit, held as a :class:`~decimal.Decimal` - amount rounded to a fixed number of decimal places (see - :func:`src.part4.utils.normalize_price`) so that money is never - subject to binary floating-point error; -* ``quantity`` -- number of units currently in stock. - -Field names are exposed as ``*_KEY`` constants so callers never hard-code -the dictionary keys. - -Every caller that mutates the store also threads along a second -structure, a ``set[str]`` of the normalised names currently in use -- -see, for example, the ``product_names`` parameter of -:func:`src.part4.crud.create_product`. Keeping that name index as a -plain set passed next to ``storage``, rather than bundling the two into -an object, lets a name-uniqueness check become an O(1) membership test -against the set instead of a linear scan over ``storage.values()``. The -set must always mirror the normalised names present in ``storage``; the -functions in :mod:`src.part4.crud` keep the two in sync on every -successful create, update and delete. -""" - from typing import Any, Final type Product = dict[str, Any] -# 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..ffdaed38 100644 --- a/src/part4/utils.py +++ b/src/part4/utils.py @@ -1,100 +1,101 @@ -"""Standalone helpers shared by the part4 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 ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final -from .storage import ( # noqa: F401 - NAME_KEY, - PRICE_KEY, - QUANTITY_KEY, - Product, -) - +from .storage import Product -# 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) -# 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, ...]] = () +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) -def normalize_price(price: Decimal) -> Decimal: - """Round a price to the precision every stored record uses. +TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") - Args: - price: The raw price amount. - Returns: - ``price`` quantised to :data:`PRICE_PRECISION` fractional digits, - with halves rounded up. - """ - # TODO: реализуйте функцию (используйте своё решение части 3) - return Decimal(0) +def normalize_price(price: Decimal) -> Decimal: + return Decimal(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: реализуйте функцию (используйте своё решение части 3) - return "" - - -# TODO: при необходимости добавьте свои вспомогательные функции + rename = (" ".join(name.split())).lower() + return rename def get_storage_str_representation(storage: dict[str, 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 insertion order. When - ``storage`` is empty only the header and separator rows are - returned, sized to the header labels. - """ - # TODO: реализуйте функцию (используйте своё решение части 3) - return "" + + storage_str = [] + + idsmaxlen = len(TABLE_HEADERS[0]) + namemaxlen = len(TABLE_HEADERS[1]) + pricemaxlen = len(TABLE_HEADERS[2]) + quantitymaxlen = len(TABLE_HEADERS[3]) + + for product_id, product in storage.items(): + p_id = str(product_id) + p_name = str(product["name"]) + p_price = str(product["price"]) + p_qty = str(product["quantity"]) + + storage_str.append([p_id, p_name, p_price, p_qty]) + + idsmaxlen = max(idsmaxlen, len(p_id)) + namemaxlen = max(namemaxlen, len(p_name)) + pricemaxlen = max(pricemaxlen, len(p_price)) + quantitymaxlen = max(quantitymaxlen, len(p_qty)) + + s = ( + "|" + + " " + + "ID" + + (" " * (idsmaxlen - len("ID") + 1)) + + "|" + + " " + + "name" + + (" " * (namemaxlen - len("name") + 1)) + + "|" + + " " + + "price" + + (" " * (pricemaxlen - len("price") + 1)) + + "|" + + " " + + "quantity" + + (" " * (quantitymaxlen - len("quantity") + 1)) + + "|" + ) + + s_ = ( + "|" + + ("-" * (idsmaxlen + 2)) + + "|" + + ("-" * (namemaxlen + 2)) + + "|" + + ("-" * (pricemaxlen + 2)) + + "|" + + ("-" * (quantitymaxlen + 2)) + + "|" + ) + + storage_ans = [] + for item_str in storage_str: + item_ans = ( + "|" + + " " + + item_str[0] + + (" " * (idsmaxlen - len(item_str[0]) + 1)) + + "|" + + " " + + item_str[1] + + (" " * (namemaxlen - len(item_str[1]) + 1)) + + "|" + + " " + + item_str[2] + + (" " * (pricemaxlen - len(item_str[2]) + 1)) + + "|" + + " " + + item_str[3] + + (" " * (quantitymaxlen - len(item_str[3]) + 1)) + + "|" + ) + storage_ans.append(item_ans) + + result = "\n".join([s, s_] + storage_ans) + return result