From 34a9ea197185adee1e62534dd9fdb9db4dbd763a Mon Sep 17 00:00:00 2001 From: Shmeles Date: Tue, 22 Sep 2026 20:21:14 +0300 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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)