3. Спиридонов Олег Станиславович. 613

src/part1/constants.py

@@ -1,38 +1,21 @@
-"""Bit layout and default epoch for the Twitter Snowflake ID generator.
-
-A Snowflake identifier is a 63-bit positive integer packed as follows, from
-the most significant bit downwards:
-
-    1 bit   unused sign bit, always zero
-    41 bits milliseconds elapsed since a custom epoch
-    10 bits node identifier
-    12 bits per-millisecond sequence counter
-
-The shift and mask constants should be derived from the bit widths so that
-changing a width keeps everything else consistent.
-"""
-
 from typing import Final
 
 
-# TODO: замените заглушки (0) на корректные значения, см. TASK.md.
-# Все константы, зависящие от ёмкостей *_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
 
 # Здесь можно добавить собственные вспомогательные константы
-# (например, сдвиги полей при сборке идентификатора).
+# (например, сдвиги полей при сборке идентификатора)

src/part1/snowflake.py

@@ -13,102 +13,55 @@
 :func:`decode_node_id` and :func:`decode_sequence_id`.
 """
 
-import time  # noqa: F401
+import time
 
-from .constants import (  # noqa: F401
+from .constants import (
     EPOCH_MS_DEFAULT,
+    NODE_ID_BITS,
     NODE_ID_DEFAULT,
     NODE_ID_MAX,
+    SEQUENCE_ID_BITS,
     SEQUENCE_ID_MAX,
     TIMESTAMP_MS_MAX,
 )
 
 
 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
+    unix_epoch_time = time.time_ns() // 1_000_000  # get current time in milliseconds
+    return unix_epoch_time - 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.
-
-    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
+    return (snowflake_id >> (NODE_ID_BITS + SEQUENCE_ID_BITS)) + epoch_ms
 
 
 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
+    return (snowflake_id >> SEQUENCE_ID_BITS) & NODE_ID_MAX
 
 
 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
+    return snowflake_id & SEQUENCE_ID_MAX
 
 
 def generate_snowflake_id(
-    sequence_id: int,
-    node_id: int = NODE_ID_DEFAULT,
-    epoch_ms: int = EPOCH_MS_DEFAULT,
+    sequence_id: int, 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
+    timestamp_ms = read_current_millis(epoch_ms)
+
+    if node_id < 0 or node_id > NODE_ID_MAX:
+        print(f"Invalid node_id: {node_id}, node_id must be in [0, {NODE_ID_MAX}].")
+        return None
+    if sequence_id < 0 or sequence_id > SEQUENCE_ID_MAX:
+        print(
+            f"Invalid sequence_id: {sequence_id}, sequence_id must be in [0, {SEQUENCE_ID_MAX}]."
+        )
+        return None
+    if timestamp_ms < 0 or timestamp_ms > TIMESTAMP_MS_MAX:
+        print("overflows")
+        return None
+
+    return (
+        (timestamp_ms << (NODE_ID_BITS + SEQUENCE_ID_BITS))
+        | (node_id << SEQUENCE_ID_BITS)
+        | sequence_id
+    )

src/part2/cart.py

@@ -11,8 +11,8 @@
 
 from typing import Final
 
-from .crud import read_product, update_product  # noqa: F401
-from .storage import (  # noqa: F401
+from .crud import read_product, update_product
+from .storage import (
     NAME_INDEX,
     PRICE_INDEX,
     QUANTITY_INDEX,
@@ -22,9 +22,25 @@
 
 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 cartline in cart:
+        if cartline[LINE_PRODUCT_ID_INDEX] == product_id:
+            return cartline
+    return None
+
+
+def change_cart_quantity(
+    cart: list[CartLine], cartline: CartLine, quantity: int
+) -> None:
+    cart.append(
+        (cartline[LINE_PRODUCT_ID_INDEX], cartline[LINE_QUANTITY_INDEX] + quantity)
+    )
+    cart.remove(cartline)
 
 
 def add_to_cart(
@@ -33,28 +49,31 @@ 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)
+    requested_product = read_product(storage, product_id)
+    if requested_product is None:
+        return None
+    product_name = requested_product[NAME_INDEX]
+    product_price = requested_product[PRICE_INDEX]
+    product_amount = requested_product[QUANTITY_INDEX]
+
+    if product_amount < quantity:
+        print(
+            f"not enough stock for product {product_id}: {product_amount} available, {quantity} requested"
+        )
+        return None
+
+    update_product(
+        storage, product_id, (product_name, product_price, product_amount - quantity)
+    )
+
+    old_cartline = find_cart_line(cart, product_id)
+
+    if old_cartline is not None:
+        change_cart_quantity(cart, old_cartline, quantity)
+    else:
+        cart.append((product_id, quantity))
+
+    return find_cart_line(cart, product_id)
 
 
 def remove_from_cart(
@@ -63,27 +82,38 @@ def remove_from_cart(
     product_id: int,
     quantity: int,
 ) -> 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.
-
-    Returns:
-        The cart line for ``product_id`` after the removal (a quantity of
-        zero means the line was dropped), or ``None`` when the cart has no
-        line for the product or holds too few units.
-    """
-    # TODO: реализуйте функцию
-    return (0, 0)
+    changable_cartline = find_cart_line(cart, product_id)
+
+    if changable_cartline is None:
+        print(f"product {product_id} is not in the cart")
+        return None
+    if changable_cartline[LINE_QUANTITY_INDEX] < quantity:
+        print(
+            f"cart holds only {changable_cartline[LINE_QUANTITY_INDEX]} unit(s) of product {product_id}, cannot remove {quantity}"
+        )
+        return None
+
+    storage_product = read_product(storage, product_id)
+    if storage_product is None:
+        return None
+
+    update_product(
+        storage,
+        product_id,
+        (
+            storage_product[NAME_INDEX],
+            storage_product[PRICE_INDEX],
+            storage_product[QUANTITY_INDEX] + quantity,
+        ),
+    )
+    change_cart_quantity(cart, changable_cartline, -quantity)
+    updated_cartline = find_cart_line(cart, product_id)
+
+    if updated_cartline is None:  # проверка, чтобы mypy не ругался
+        return None
+
+    if updated_cartline[LINE_QUANTITY_INDEX] == 0:
+        cart.remove(updated_cartline)
+        return (product_id, 0)
+
+    return updated_cartline